Fix the setup of NEWNS, #134346 thanks to Oldrich Jedlicka.

(Portage version: 2.1_rc2-r2)

3 files changed, 71 insertions, 1 deletions

diff --git a/net-misc/resolvconf-gentoo/ChangeLog b/net-misc/resolvconf-gentoo/ChangeLog
index d6ef9c347f8f..9a084b9e6390 100644
--- a/net-misc/resolvconf-gentoo/ChangeLog
+++ b/net-misc/resolvconf-gentoo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/resolvconf-gentoo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/resolvconf-gentoo/ChangeLog,v 1.5 2006/05/12 20:07:18 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/resolvconf-gentoo/ChangeLog,v 1.6 2006/05/25 18:40:23 uberlord Exp $
+
+*resolvconf-gentoo-0.6 (25 May 2006)
+
+  25 May 2006; Roy Marples <uberlord@gentoo.org>
+  +resolvconf-gentoo-0.6.ebuild:
+  Fix the setup of NEWNS, #134346 thanks to Oldrich Jedlicka.
 
 *resolvconf-gentoo-0.5 (12 May 2006)
 
diff --git a/net-misc/resolvconf-gentoo/files/digest-resolvconf-gentoo-0.6 b/net-misc/resolvconf-gentoo/files/digest-resolvconf-gentoo-0.6
new file mode 100644
index 000000000000..1017fb269f2e
--- /dev/null
+++ b/net-misc/resolvconf-gentoo/files/digest-resolvconf-gentoo-0.6
@@ -0,0 +1,3 @@
+MD5 92d0865a5b5e5dbb71a1417ed3f31fcf resolvconf-gentoo-0.6.tar.bz2 5325
+RMD160 47d0ab0e0a579ab49bef76c8abe2ef1e712e7d1b resolvconf-gentoo-0.6.tar.bz2 5325
+SHA256 67a8921dcf9c522f3bed30ff2990883c3bb4b9d51944e2dbc23799f840119983 resolvconf-gentoo-0.6.tar.bz2 5325
diff --git a/net-misc/resolvconf-gentoo/resolvconf-gentoo-0.6.ebuild b/net-misc/resolvconf-gentoo/resolvconf-gentoo-0.6.ebuild
new file mode 100644
index 000000000000..fa4d837c360a
--- /dev/null
+++ b/net-misc/resolvconf-gentoo/resolvconf-gentoo-0.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/resolvconf-gentoo/resolvconf-gentoo-0.6.ebuild,v 1.1 2006/05/25 18:40:23 uberlord Exp $
+
+DESCRIPTION="A framework for managing DNS information"
+HOMEPAGE="http://www.gentoo.org"
+SRC_URI="http://dev.gentoo.org/~uberlord/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-shells/bash"
+
+pkg_setup() {
+	if ! grep -q "^uniqify()" "${ROOT}"/etc/init.d/functions.sh ; then
+		eerror "/etc/init.d/functions.sh does not supply the uniqify function"
+		eerror "Please upgrade to a baselayout that support it"
+		eerror "(baselayout-1.12.0_pre17 and later versions do)"
+		die "function uniqify does not exist"
+	fi
+}
+
+src_install() {
+	make ROOT="${D}" install || die "Failed to install"
+}
+
+pkg_postinst() {
+	if [[ ! -"L ${ROOT}/etc/resolv.conf" ]] \
+		|| [[ $(readlink "${ROOT}/etc/resolv.conf") != \
+		"resolvconf/run/resolv.conf" ]] ; then
+		ewarn "resolvconf requires ${ROOT}/etc/resolv.conf to be a symbolic"
+		ewarn "to resolvconf/run/resolv.conf"
+		einfo "To set this up automatically type"
+		einfo "   emerge --config =${PF}"
+	fi
+}
+
+pkg_config() {
+	cd "${ROOT}/etc"
+	if [[ -L resolv.conf && $(readlink resolv.conf) == \
+		"resolvconf/run/resolv.conf" ]] ; then
+		einfo "${ROOT}/etc/resolv.conf is already configured for ${PN}"
+	else
+		if [[ -e resolv.conf ]] ; then
+			einfo "Your existing resolv.conf is will be mapped to an"
+			einfo "interface called \"dummy\" in resolvconf. This will"
+			einfo "disappear when you reboot."
+			cp resolv.conf resolvconf/run/resolv.conf
+			[[ ! -d resolvconf/run/interfaces ]] \
+				&& mkdir resolvconf/run/interfaces
+			cp resolv.conf resolvconf/run/interfaces/dummy
+			echo "dummy" > resolvconf/run/add_order
+		fi
+		rm -f resolv.conf
+		ln -snf resolvconf/run/resolv.conf .
+		einfo "${ROOT}/etc/resolv.conf is now correctly configured for ${PN}"
+	fi
+}