Security fix

4 files changed, 129 insertions, 2 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index b617baf03514..592ae267929d 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,14 @@
-# ChangeLog for net-dialuppppChangeLog/
+# ChangeLog for net-dialup/ppp
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.5 2002/07/17 03:11:56 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.6 2002/07/31 14:15:15 aliz Exp $
+
+*ppp-2.4.1-r10 (31 Jul 2002)
+
+  31 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> ppp-2.4.1-r10.ebuild :
+
+  Security fix - added a patch to prevent race condition.
+
+*ppp-2.4.1-r9
 
   16 Jul 2002; Ben Lutgens <lamer@gentoo.org> ppp-2.4.1-r[789].ebuild  :
 
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.1-r10 b/net-dialup/ppp/files/digest-ppp-2.4.1-r10
new file mode 100644
index 000000000000..b3c7b1676065
--- /dev/null
+++ b/net-dialup/ppp/files/digest-ppp-2.4.1-r10
@@ -0,0 +1 @@
+MD5 7f655448fbb6bebcede7a515fbcd481e ppp-2.4.1-pppoe4.tgz 556218
diff --git a/net-dialup/ppp/files/ppp-2.4.1-r10.patch b/net-dialup/ppp/files/ppp-2.4.1-r10.patch
new file mode 100644
index 000000000000..6f04149214f2
--- /dev/null
+++ b/net-dialup/ppp/files/ppp-2.4.1-r10.patch
@@ -0,0 +1,11 @@
+--- pppd/tty.c.	Wed Jul 31 15:26:47 2002
++++ pppd/tty.c	Wed Jul 31 15:27:04 2002
+@@ -745,7 +745,7 @@
+ 	if (tty_mode != (mode_t) -1) {
+ 		if (fchmod(real_ttyfd, tty_mode) != 0) {
+ 			/* XXX if devnam is a symlink, this will change the link */
+-			chmod(devnam, tty_mode);
++			fchmod(ttyfd, tty_mode);
+ 		}
+ 	}
+ 
diff --git a/net-dialup/ppp/ppp-2.4.1-r10.ebuild b/net-dialup/ppp/ppp-2.4.1-r10.ebuild
new file mode 100644
index 000000000000..f0d535a79c39
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.1-r10.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r10.ebuild,v 1.1 2002/07/31 14:15:15 aliz Exp $
+
+S=${WORKDIR}/${P}.pppoe4
+DESCRIPTION="Point-to-point protocol - patched for pppoe"
+SRC_URI="http://www.shoshin.uwaterloo.ca/~mostrows/${P}-pppoe4.tgz"
+HOMEPAGE="http://www.samba.org/ppp"
+
+DEPEND="virtual/glibc"
+PROVIDE="virtual/pppd"
+
+SLOT="0"
+LICENSE="BSD GPL"
+KEYWORDS="x86"
+
+src_compile() {
+
+    use crypt && {
+		zcat ${FILESDIR}/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz | patch -p1
+		patch -p1 < ${FILESDIR}/ppp-2.4.1-MSCHAPv2-fix.patch
+	}
+
+	patch -p0 < ${FILESDIR}/${P}-r10.patch
+
+	./configure --prefix=/usr || die
+    
+	#fix Makefiles to compile optimized
+	cd pppd
+	mv Makefile Makefile.orig
+	sed -e "s:COPTS = -O2 -pipe -Wall -g:COPTS = ${CFLAGS}:" \
+		-e "s/LIBS =/LIBS = -lcrypt/" \
+		Makefile.orig > Makefile
+	cd plugins
+	mv Makefile Makefile.orig
+	sed -e "s:CFLAGS\t= -g -O2:CFLAGS = ${CFLAGS}:" \
+		Makefile.orig > Makefile
+	cd pppoe
+	mv Makefile Makefile.orig
+	sed -e "s:CFLAGS\t= -g :CFLAGS = ${CFLAGS}:" \
+		Makefile.orig > Makefile
+	cd ../../../pppstats
+	mv Makefile Makefile.orig
+	sed -e "s:COPTS= -O:COPTS = ${CFLAGS}:" \
+		Makefile.orig > Makefile
+	cd ../chat
+	mv Makefile Makefile.orig
+	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	cd ../pppdump
+	mv Makefile Makefile.orig
+	sed -e "s:CFLAGS= -O:CFLAGS= ${CFLAGS}:" Makefile.orig > Makefile
+	cd ..
+    
+	export CC=gcc
+    
+	emake || die
+}
+
+src_install() {
+	for y in chat pppd pppdump pppstats
+	do
+		doman ${y}/${y}.8
+		dosbin ${y}/${y}
+	done
+    
+	chmod u+s-w ${D}/usr/sbin/pppd
+	chown root:daemon ${D}/usr/sbin/pppstats
+    
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+	insopts -m0644
+	doins etc.ppp/options
+
+	dolib.so pppd/plugins/minconn.so
+	dolib.so pppd/plugins/passprompt.so
+	dolib.so pppd/plugins/pppoe/pppoe.so
+	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
+	newins ${FILESDIR}/modules.ppp ppp
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dohtml ${FILESDIR}/pppoe.html
+
+# This will have to be updated to work with the new net.ppp0	
+#	# Added a couple scripts to simplify dialing up
+#	# borrowed from debian, man they got some nice little apps :-)
+#	dosbin ${FILESDIR}/pon
+#	dosbin ${FILESDIR}/poff
+#	doman  ${FILESDIR}/pon.1
+}
+
+pkg_postinst() {
+	if [ ! -e ${ROOT}dev/.devfsd ]
+	then
+		if [ ! -e ${ROOT}dev/ppp ]; then
+			mknod ${ROOT}dev/ppp c 108 0
+		fi
+	fi
+	if [ "$ROOT" = "/" ]
+	then
+		/usr/sbin/update-modules
+	fi
+	einfo "to enable kernel-pppoe read html/pppoe.html in the doc-directory"
+}