changelog:p

4 files changed, 176 insertions, 8 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 1c401f1f0621..f7fb3f30235d 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.31 2003/09/06 11:11:27 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.32 2003/10/02 12:56:19 lanius Exp $
+
+*ppp-2.4.2_beta3 (02 Oct 2003)
+
+  02 Oct 2003; Heinrich Wendel <lanius@gentoo.org> ppp-2.4.2_beta3.ebuild:
+  version bump
 
   06 Sep 2003; Seemant Kulleen <seemant@gentoo.org> files/net.ppp0:
   surround username with quotes for the secrets file generation. This helps with
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index 927ef5c1f350..6ed4aadda445 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,13 +1,19 @@
+MD5 dd0dab6519f65acf0c65119a81174ab2 ppp-2.4.1-r14.ebuild 4608
+MD5 8c76dfcef79983fe7b2b7063f4750c97 ppp-2.4.1-r11.ebuild 3078
+MD5 a71553bea4ad60771b866ee256f592db ppp-2.4.1-r13.ebuild 4563
+MD5 1472a1c8a90f4e80e300a06e82f1ab80 ChangeLog 5228
+MD5 158a1bb8f34a4d2b1ed62513de95e47d ppp-2.4.2_beta3.ebuild 4342
+MD5 9e3a4dcb54e60375e054b4154d94e0f9 ppp-2.4.1-r12.ebuild 3816
 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
 MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
 MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
-MD5 5f6f3203688bc5a2eceef8301f482c9f files/chat-default 344
+MD5 03eb44456283c43760269a92083946d3 files/chat-default 345
 MD5 824964465508977f9d0836f029d6b02f files/ppp-2.4.1-openssl-0.9.6-mppe-patch.gz 36112
 MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207
 MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
 MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
 MD5 feb6723fa9b971cb443cff79693db0cd files/ppp-crypto-fix.patch.bz2 35770
-MD5 271b9ea36d7e7c5c6587036927d604e6 files/confd.ppp0 3309
+MD5 208e12ddd9a3e4c4ac470e9c4d7d7144 files/confd.ppp0 3310
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r11 65
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r12 65
 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r13 65
@@ -15,12 +21,8 @@ MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
 MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
 MD5 b783e9bd9ac5956c582499f0623195fe files/net.ppp0 4705
 MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
+MD5 6f7e70fee6e827ad992da785cba032c6 files/digest-ppp-2.4.2_beta3 63
 MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
 MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
-MD5 dd0dab6519f65acf0c65119a81174ab2 ppp-2.4.1-r14.ebuild 4608
-MD5 8c76dfcef79983fe7b2b7063f4750c97 ppp-2.4.1-r11.ebuild 3078
-MD5 a71553bea4ad60771b866ee256f592db ppp-2.4.1-r13.ebuild 4563
-MD5 a001d3c6d18f06f5d7ee7e57e3b551e4 ChangeLog 5106
-MD5 9e3a4dcb54e60375e054b4154d94e0f9 ppp-2.4.1-r12.ebuild 3816
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2_beta3 b/net-dialup/ppp/files/digest-ppp-2.4.2_beta3
new file mode 100644
index 000000000000..cc38ea92d0de
--- /dev/null
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2_beta3
@@ -0,0 +1 @@
+MD5 c35c7ff5a1d80be5a2534cd9c7777b10 ppp-2.4.2b3.tar.gz 780590
diff --git a/net-dialup/ppp/ppp-2.4.2_beta3.ebuild b/net-dialup/ppp/ppp-2.4.2_beta3.ebuild
new file mode 100644
index 000000000000..a3801c8f8bab
--- /dev/null
+++ b/net-dialup/ppp/ppp-2.4.2_beta3.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2003 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.2_beta3.ebuild,v 1.1 2003/10/02 12:56:19 lanius Exp $
+
+MY_P=${P/_beta/b}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Point-to-point protocol - patched for pppoe"
+HOMEPAGE="http://www.samba.org/ppp"
+SRC_URI="ftp://ftp.samba.org/pub/ppp/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~hppa ~amd64 ~ia64"
+IUSE="ipv6 activefilter"
+
+DEPEND="virtual/glibc
+	activefilter? ( net-libs/libpcap )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use activefilter && {
+		# enable option active-filter
+		einfo "Enabling active-filter"
+		sed -i 's/^#FILTER=y/FILTER=y/' pppd/Makefile.linux
+	}
+	einfo "Enabling PAM"
+		sed -i 's/^#USE_PAM=y/USE_PAM=y/' pppd/Makefile.linux
+}
+
+src_compile() {
+	cd ${S}
+
+	./configure --prefix=/usr || die
+
+	#fix Makefiles to compile optimized
+	cd ${S}/pppd
+	mv Makefile Makefile.orig
+	if([ `use ipv6` ]) then
+		sed -e "s:COPTS = -O2 -pipe -Wall -g:COPTS = ${CFLAGS}:" \
+			-e "s/LIBS =/LIBS = -lcrypt/" \
+			-e "s/#HAVE_INET6/HAVE_INET6/" \
+			-e "s/# CBCP_SUPPORT/CBCP_SUPPORT/" Makefile.orig > Makefile
+	else
+		sed -e "s:COPTS = -O2 -pipe -Wall -g:COPTS = ${CFLAGS}:" \
+			-e "s/LIBS =/LIBS = -lcrypt/" \
+			-e "s/# CBCP_SUPPORT/CBCP_SUPPORT/" Makefile.orig > Makefile
+	fi
+
+	cd plugins
+	mv Makefile Makefile.orig
+	sed -e "s:CFLAGS\t= -g -O2:CFLAGS = ${CFLAGS}:" \
+		Makefile.orig > Makefile
+	cd rp-pppoe
+	mv Makefile Makefile.orig
+	sed -e "s:CFLAGS\t= -g :CFLAGS = ${CFLAGS}:" \
+		Makefile.orig > Makefile
+	cd ${S}/pppstats
+	mv Makefile Makefile.orig
+	sed -e "s:COPTS= -O:COPTS = ${CFLAGS}:" \
+		Makefile.orig > Makefile
+	cd ${S}/chat
+	mv Makefile Makefile.orig
+	sed -e "s:-O2:${CFLAGS}:" Makefile.orig > Makefile
+	cd ${S}/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
+	dodir /etc/ppp/peers
+	insinto /etc/ppp
+	insopts -m0600
+	doins etc.ppp/pap-secrets etc.ppp/chap-secrets
+	insopts -m0644
+	doins etc.ppp/options
+	doins ${FILESDIR}/chat-default
+	insopts -m0755
+	doins ${FILESDIR}/ip-up
+	doins ${FILESDIR}/ip-down
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/net.ppp0
+	insinto /etc/conf.d
+	insopts -m0600
+	newins ${FILESDIR}/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
+	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}/modules.ppp ppp
+
+	dodoc PLUGINS README* SETUP Changes-2.3 FAQ
+	dohtml ${FILESDIR}/pppoe.html
+
+# This has nothing to do with net.ppp0 now as net.ppp0 calls pppd
+# from the command line with the parameters.	
+	#New scripts acquired from cvs (cvs.samba.org)
+	#Changed $PATH back
+	dosbin ${FILESDIR}/pon
+	dosbin ${FILESDIR}/poff
+	dosbin ${FILESDIR}/plog
+	doman ${FILESDIR}/pon.1
+
+	#Adding misc. specialized scripts to doc dir
+	dodir /usr/share/doc/${PF}/scripts
+	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/*
+}
+
+
+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
+		/sbin/update-modules
+	fi
+	ewarn "To enable kernel-pppoe read html/pppoe.html in the doc-directory."
+	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."
+}
+
+pkg_preinst() {
+	# Fix those broken flags (755 -> 644)
+	# This is needed for updates from ppp-2.4.1-r11 to ppp-2.4.1-r12
+	if [ -e ${ROOT}/etc/modules.d/ppp ] ; then
+		FLAGS="`stat -c %a /etc/modules.d/ppp`"
+		echo ${FLAGS}
+		if [ ${FLAGS} == "755" ] ; then
+			chmod 644 ${ROOT}/etc/modules.d/ppp
+		fi
+	fi
+}