Fix conflict with dhcpcd, bug#440614, thanks to Renato Alves

(Portage version: 2.2.0_alpha176/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

3 files changed, 107 insertions, 1 deletions

diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog
index 2f545473b2d3..b12a43b95f07 100644
--- a/net-dns/openresolv/ChangeLog
+++ b/net-dns/openresolv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/openresolv
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.74 2013/05/04 15:36:48 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.75 2013/05/24 19:35:09 alonbl Exp $
+
+*openresolv-3.5.4-r3 (24 May 2013)
+
+  24 May 2013; Alon Bar-Lev <alonbl@gentoo.org>
+  +files/openresolv-3.5.4-config-conflict.patch, +openresolv-3.5.4-r3.ebuild:
+  Fix conflict with dhcpcd, bug#440614, thanks to Renato Alves
 
 *openresolv-3.5.4-r2 (04 May 2013)
 
diff --git a/net-dns/openresolv/files/openresolv-3.5.4-config-conflict.patch b/net-dns/openresolv/files/openresolv-3.5.4-config-conflict.patch
new file mode 100644
index 000000000000..489d00e441f9
--- /dev/null
+++ b/net-dns/openresolv/files/openresolv-3.5.4-config-conflict.patch
@@ -0,0 +1,46 @@
+From 406964b59113109d3f7bef2681aaf9362b10d661 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 12 May 2013 18:24:57 +0300
+Subject: [PATCH] resolvconf: enforce configuration defaults to avoid conflict
+
+dhcpcd, for example, uses interface_order environment variable
+which creates a conflict with resolv conf setting, as it takes
+that value as default configuration.
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ resolvconf.in | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/resolvconf.in b/resolvconf.in
+index 5015222..82b8b55 100644
+--- a/resolvconf.in
++++ b/resolvconf.in
+@@ -28,6 +28,13 @@ RESOLVCONF="$0"
+ SYSCONFDIR=@SYSCONFDIR@
+ LIBEXECDIR=@LIBEXECDIR@
+ VARDIR=@VARDIR@
++
++# set configuration defaults
++dynamic_order="tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*"
++interface_order="lo lo[0-9]*"
++name_server_blacklist="0.0.0.0"
++state_dir=""
++
+ # Support original resolvconf configuration layout
+ # as well as the openresolv config file
+ if [ -f "$SYSCONFDIR"/resolvconf.conf ]; then
+@@ -43,10 +50,6 @@ IFACEDIR="$VARDIR/interfaces"
+ METRICDIR="$VARDIR/metrics"
+ PRIVATEDIR="$VARDIR/private"
+ 
+-: ${dynamic_order:=tap[0-9]* tun[0-9]* vpn vpn[0-9]* ppp[0-9]* ippp[0-9]*}
+-: ${interface_order:=lo lo[0-9]*}
+-: ${name_server_blacklist:=0.0.0.0}
+-
+ error_exit()
+ {
+ 	echo "$*" >&2
+-- 
+1.8.1.5
+
diff --git a/net-dns/openresolv/openresolv-3.5.4-r3.ebuild b/net-dns/openresolv/openresolv-3.5.4-r3.ebuild
new file mode 100644
index 000000000000..ac2d0fe66727
--- /dev/null
+++ b/net-dns/openresolv/openresolv-3.5.4-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.5.4-r3.ebuild,v 1.1 2013/05/24 19:35:09 alonbl Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A framework for managing DNS information"
+HOMEPAGE="http://roy.marples.name/projects/openresolv"
+SRC_URI="http://roy.marples.name/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="!net-dns/resolvconf-gentoo
+	!<net-dns/dnsmasq-2.40-r1"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-config-conflict.patch"
+}
+
+src_configure() {
+	econf \
+		--prefix= \
+		--rundir=/var/run \
+		--libexecdir=/lib/resolvconf \
+		--restartcmd="/lib/resolvconf/helpers/restartcmd \1"
+}
+
+src_install() {
+	default
+	exeinto /lib/resolvconf/helpers
+	doexe "${FILESDIR}"/restartcmd
+}
+
+pkg_config() {
+	if [ "${ROOT}" != "/" ]; then
+		eerror "We cannot configure unless \$ROOT=/"
+		return 1
+	fi
+
+	if [ -n "$(resolvconf -l)" ]; then
+		einfo "${PN} already has DNS information"
+	else
+		ebegin "Copying /etc/resolv.conf to resolvconf -a dummy"
+		resolvconf -a dummy </etc/resolv.conf
+		eend $? || return $?
+		einfo "The dummy interface will disappear when you next reboot"
+	fi
+}