create resolv.conf with world readable

6 files changed, 225 insertions, 24 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 320244e9e771..e99f19696839 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.89 2004/11/09 17:50:47 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.90 2004/11/11 06:04:11 mrness Exp $
+
+*ppp-2.4.2-r9 (11 Nov 2004)
+
+  11 Nov 2004; Alin Nastac <mrness@gentoo.org>
+  files/2.4.2/ip-up, files/2.4.2/ip-down, +ppp-2.4.2-r9.ebuild:
+  Create a world readable resolv.conf (see #37886). 
+  Leave it stable it is a trivial script correction.
 
 *ppp-2.4.2-r8 (09 Nov 2004)
 
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 7e7e3630526c..3c180955366d 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fadd66373941d135342ca131be273b9b ChangeLog 14814
+MD5 e6a64ba5029191169dc125efe7a5e1ef ChangeLog 15061
 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
 MD5 b109af0767940076444e51dbf3275f16 ppp-2.4.1-r14.ebuild 4698
 MD5 20502c85d128ae0dd4545dc3ae3eec6b ppp-2.4.2-r1.ebuild 4276
@@ -10,6 +10,7 @@ MD5 5a971d8d59f8c462d8651882eba46297 ppp-2.4.2-r6.ebuild 5404
 MD5 4f202b0a345bf12dcd24f80891702040 ppp-2.4.2-r7.ebuild 5602
 MD5 24f264eef320520caee8597fb071405b ppp-2.4.2.ebuild 3957
 MD5 917e389e491522c945831ca1388ddf2e ppp-2.4.2-r8.ebuild 5601
+MD5 096623c2148c4284ed5c8b9a94360c1f ppp-2.4.2-r9.ebuild 5601
 MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
 MD5 1a60baf88a301c6eed8472a01b3691eb files/confd.ppp0 3312
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
@@ -32,14 +33,15 @@ MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
 MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
 MD5 c07c26f0d600a1fde9752fa06fc4b0c3 files/digest-ppp-2.4.2-r8 194
+MD5 c07c26f0d600a1fde9752fa06fc4b0c3 files/digest-ppp-2.4.2-r9 194
 MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530
 MD5 fe4d81182954a014493a830a24fb2f07 files/2.4.2/cbcp-dosfix.patch 3098
 MD5 bc88eaf56862e5ebf8f45ec5ada4bb90 files/2.4.2/cflags.patch 1857
 MD5 a2eaeceee980ff6e183abfa370fc685c files/2.4.2/chat-default 353
 MD5 ef28c96687409a340c6cd66e21dc58db files/2.4.2/confd.ppp0 2786
 MD5 f7a8c95af55d9cca703c15cdf9386ad4 files/2.4.2/control_c.patch 402
-MD5 6f40ddaa827b434d6d6a78c65e670975 files/2.4.2/ip-down 755
-MD5 7db378ace284707286fc611e41579f2d files/2.4.2/ip-up 1095
+MD5 279ae4050d2497441d3fb634d99a84f7 files/2.4.2/ip-down 759
+MD5 d6b84bc80ff914bb06f83e4c69259da2 files/2.4.2/ip-up 1106
 MD5 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2/modules.ppp 268
 MD5 927fc5dafad76c9c1ee7f0259e9244b7 files/2.4.2/mpls.patch.gz 3151
@@ -55,7 +57,7 @@ MD5 844c9d343d7511902b5380b27eca417e files/2.4.2/mppe-mppc-1.0.patch.gz 11442
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBkQODjtv59x0+BrURAv5YAJ9Uw9PalSmlhLKLw+oUylDfH78BkACfZ0VZ
-lTfLq9a5v2hzFdjUVH8zSDI=
-=vIoJ
+iD8DBQFBkwDljtv59x0+BrURAlPoAJ4wAYBHmecsZ1uBgwHvhUWSYQCmGwCfUnbe
+5I/IjTnGVRTLD5UEVi97KuY=
+=Ql9H
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/files/2.4.2/ip-down b/net-dialup/ppp/files/2.4.2/ip-down
index c3a1f2d4aa33..5764c1c73f25 100644
--- a/net-dialup/ppp/files/2.4.2/ip-down
+++ b/net-dialup/ppp/files/2.4.2/ip-down
@@ -19,10 +19,10 @@ if [ "$USEPEERDNS" ]; then
 
 	if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
 
-	# if an old resolv.conf file exists, restore it
-	if [ -e $REALRESOLVCONF.pppd-backup ]; then
-		mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
-	fi
+		# if an old resolv.conf file exists, restore it
+		if [ -e $REALRESOLVCONF.pppd-backup ]; then
+			mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
+		fi
 
 	fi
 
diff --git a/net-dialup/ppp/files/2.4.2/ip-up b/net-dialup/ppp/files/2.4.2/ip-up
index 760a4e57846d..d254a48c30c1 100644
--- a/net-dialup/ppp/files/2.4.2/ip-up
+++ b/net-dialup/ppp/files/2.4.2/ip-up
@@ -21,19 +21,19 @@ if [ "$USEPEERDNS" ]; then
 
 	if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
 
-	# merge the new nameservers with the other options from the old configuration
-	{
-		grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF
-		cat /etc/ppp/resolv.conf
-	} > $REALRESOLVCONF.tmp
-
-	# backup the old configuration and install the new one
-	cp -a $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
-	mv $REALRESOLVCONF.tmp $REALRESOLVCONF
-
-	# correct permissions
-	chmod 640 /etc/resolv.conf
-	chown root:users /etc/resolv.conf
+		# merge the new nameservers with the other options from the old configuration
+		{
+			grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF
+			cat /etc/ppp/resolv.conf
+		} > $REALRESOLVCONF.tmp
+
+		# backup the old configuration and install the new one
+		cp -a $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
+		mv $REALRESOLVCONF.tmp $REALRESOLVCONF
+
+		# correct permissions
+		chmod 0644 /etc/resolv.conf
+		chown root:root /etc/resolv.conf
 
 	fi
 
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r9 b/net-dialup/ppp/files/digest-ppp-2.4.2-r9
new file mode 100644
index 000000000000..47080cb9dbd6
--- /dev/null
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r9
@@ -0,0 +1,3 @@
+MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441
+MD5 0d2679907627f68dd6a2c32d1c7dda90 ppp-2.4.2-mppe-mppc-1.1.patch.gz 12532
+MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497
diff --git a/net-dialup/ppp/ppp-2.4.2-r9.ebuild b/net-dialup/ppp/ppp-2.4.2-r9.ebuild
new file mode 100644
index 000000000000..0d1d1eccebf0
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.2-r9.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r9.ebuild,v 1.1 2004/11/11 06:04:11 mrness Exp $
+
+inherit eutils gnuconfig flag-o-matic
+
+DESCRIPTION="Point-to-point protocol - patched for PPPOE"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
+	http://www.polbox.com/h/hs001/ppp-2.4.2-mppe-mppc-1.1.patch.gz
+	http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86 mips"
+IUSE="ipv6 activefilter pam atm mppe-mppc dhcp"
+
+RDEPEND="virtual/libc
+	activefilter? ( >=net-libs/libpcap-0.8.3-r1 )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PV}/cbcp-dosfix.patch || die "patch failed"
+	epatch ${FILESDIR}/${PV}/mpls.patch.gz || die "patch failed"
+	epatch ${FILESDIR}/${PV}/killaddr-smarter.patch.gz || die "patch failed"
+	epatch ${FILESDIR}/${PV}/cflags.patch || die "patch failed"
+	epatch ${FILESDIR}/${PV}/control_c.patch || die "patch failed"
+
+	use mppe-mppc && {
+		einfo "Enabling mppe-mppc support"
+		epatch ${DISTDIR}/ppp-2.4.2-mppe-mppc-1.1.patch.gz || die "patch failed"
+	}
+
+	if use atm; then
+		einfo "Enabling PPPoATM support"
+		epatch ${FILESDIR}/${PV}/pppoatm-2.diff.gz || die "patch failed"
+		sed -i -e "s/^LIBS =/LIBS = -latm/" pppd/Makefile.linux || die
+	fi
+
+	use activefilter || {
+		einfo "Disabling active-filter"
+		sed -i -e "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux || die
+	}
+
+	use pam && {
+		einfo "Enabling PAM"
+		sed -i -e "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux || die
+	}
+
+	use ipv6 && {
+		einfo "Enabling IPv6"
+		sed -i -e "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux || die
+	}
+
+	einfo "Enabling CBCP"
+	sed -i 's/^#CBCP=y/CBCP=y/' pppd/Makefile.linux || die
+
+	einfo "Enabling radius"
+	sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe radius/' pppd/plugins/Makefile.linux || die
+	sed -i -e '/^CFLAGS/s:$: -fPIC:' pppd/plugins/radius/radiusclient/lib/Makefile.in || die
+
+	use dhcp && {
+		# copy the ppp-dhcp plugin files
+		einfo "Copying ppp-dhcp plugin files..."
+		tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/
+		sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' pppd/plugins/Makefile.linux || die
+		sed -i -e "s/-O2/${CFLAGS}/" pppd/plugins/dhcp/Makefile.linux
+	}
+
+	#epatch ${FILESDIR}/${PV}/pcap.patch
+	sed -i -e "s:net/bpf.h:pcap-bpf.h:" pppd/sys-linux.c pppd/demand.c pppd/plugins/rp-pppoe/if.c
+}
+
+src_compile() {
+	export WANT_AUTOCONF=2.1
+	gnuconfig_update
+	# compile radius better than their makefile does
+	append-ldflags -Wl,-z,now
+	(cd pppd/plugins/radius/radiusclient && econf && emake) || die
+	./configure --prefix=/usr || die
+	emake COPTS="${CFLAGS}" || die
+}
+
+src_install() {
+	local y
+	for y in chat pppd pppdump pppstats
+	do
+		doman ${y}/${y}.8
+		dosbin ${y}/${y}
+	done
+	chmod u+s-w ${D}/usr/sbin/pppd
+
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	newins etc.ppp/pap-secrets pap-secrets.example
+	newins etc.ppp/chap-secrets chap-secrets.example
+
+	insopts -m0644
+	doins etc.ppp/options
+	doins ${FILESDIR}/${PV}/options-pptp
+	doins ${FILESDIR}/${PV}/options-pppoe
+	doins ${FILESDIR}/${PV}/chat-default
+
+	insopts -m0755
+	doins ${FILESDIR}/${PV}/ip-up
+	doins ${FILESDIR}/${PV}/ip-down
+
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/${PV}/net.ppp0
+
+	insinto /etc/conf.d
+	insopts -m0600
+	newins ${FILESDIR}/${PV}/confd.ppp0 net.ppp0
+
+	dolib.so pppd/plugins/minconn.so
+	dolib.so pppd/plugins/passprompt.so
+	dolib.so pppd/plugins/rp-pppoe/rp-pppoe.so
+	dolib.so pppd/plugins/radius/radius.so
+	dolib.so pppd/plugins/radius/radattr.so
+	dolib.so pppd/plugins/radius/radrealms.so
+	if use atm; then
+		dolib.so pppd/plugins/pppoatm.so
+	fi
+	if use dhcp; then
+		dolib.so pppd/plugins/dhcp/dhcpc.so
+	fi
+
+	dodir /usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+	mv ${D}/usr/lib/*.so ${D}/usr/lib/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h)
+
+	insinto /etc/modules.d
+	insopts -m0644
+	newins ${FILESDIR}/${PV}/modules.ppp ppp
+	if use mppe-mppc; then
+		echo 'alias ppp-compress-18 ppp_mppe_mppc' >> ${D}/etc/modules.d/ppp
+	fi
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dodoc ${FILESDIR}/${PV}/README.mpls
+	dohtml ${FILESDIR}/${PV}/pppoe.html
+
+	doman pppd/plugins/radius/pppd-radius.8
+	doman pppd/plugins/radius/pppd-radattr.8
+
+	dosbin scripts/pon
+	dosbin scripts/poff
+	dosbin scripts/plog
+	doman scripts/pon.1
+
+	# Adding misc. specialized scripts to doc dir
+	dodir /usr/share/doc/${PF}/scripts/chatchat
+	insinto	/usr/share/doc/${PF}/scripts/chatchat
+	doins scripts/chatchat/*
+	insinto /usr/share/doc/${PF}/scripts
+	doins scripts/*
+
+	# install radiusclient
+	cd pppd/plugins/radius/radiusclient
+	make DESTDIR=${D} install || die
+}
+
+pkg_postinst() {
+	if ! [ -e ${ROOT}dev/.devfsd ] || [ -e ${ROOT}dev/.udev ]
+	then
+		if [ ! -e ${ROOT}dev/ppp ]; then
+			mknod ${ROOT}dev/ppp c 108 0
+		fi
+	fi
+	if [ "$ROOT" = "/" ]
+	then
+		/sbin/update-modules
+	fi
+	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
+	ewarn "Note: the library name has changed from pppoe.so to rp-pppoe.so."
+	ewarn "Pon, poff and plog scripts have been supplied for experienced users."
+	ewarn "New users or those requiring something more should have a look at"
+	ewarn "the /etc/init.d/net.ppp0 script."
+	ewarn "Users needing particular scripts (ssh,rsh,etc.)should check out the"
+	ewarn "/usr/share/doc/ppp*/scripts directory."
+
+	# lib name has changed
+	sed -i -e "s:^pppoe.so:rp-pppoe.so:" ${ROOT}etc/ppp/options
+}