diff options
| -rw-r--r-- | net-dialup/ppp/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dialup/ppp/Manifest | 13 | ||||
| -rw-r--r-- | net-dialup/ppp/files/2.4.2/pcap.patch | 24 | ||||
| -rw-r--r-- | net-dialup/ppp/ppp-2.4.2.ebuild | 24 |
4 files changed, 49 insertions, 18 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog index 0745d76f6725..9e1ac28301c6 100644 --- a/net-dialup/ppp/ChangeLog +++ b/net-dialup/ppp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-dialup/ppp # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.47 2004/02/12 20:23:48 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.48 2004/02/15 03:21:18 agriffis Exp $ + + 14 Feb 2004; Aron Griffis <agriffis@gentoo.org> ppp-2.4.2.ebuild, + files/2.4.2/pcap.patch: + Patch for libpcap headers; fixes bug 41416 *ppp-2.4.2 (12 Feb 2004) diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 5f36fea8e8cd..24a12dcc5df8 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,20 +1,21 @@ MD5 51457a2491f5e903b350d582b49f7c51 ppp-2.4.2_beta3-r1.ebuild 3877 MD5 7226a185b85b8dd36ce1eefb89ec2505 ppp-2.4.1-r14.ebuild 4617 -MD5 ab3f56fd5725577885c00bb7f3a155bc ppp-2.4.2.ebuild 3764 +MD5 d470c24e588ef249d8010771a8b70abc ppp-2.4.2.ebuild 3860 MD5 4c77bb4e8ad8acba9e1c776cedb108c5 ChangeLog 8348 MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957 MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146 MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723 -MD5 03eb44456283c43760269a92083946d3 files/chat-default 345 +MD5 5f6f3203688bc5a2eceef8301f482c9f files/chat-default 344 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 208e12ddd9a3e4c4ac470e9c4d7d7144 files/confd.ppp0 3310 +MD5 271b9ea36d7e7c5c6587036927d604e6 files/confd.ppp0 3309 MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65 MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311 +MD5 99aa8428a441ff748dc88892a8e98266 files/ppp-2.4.2-pcap.patch 728 MD5 b783e9bd9ac5956c582499f0623195fe files/net.ppp0 4705 MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673 MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2 61 @@ -24,13 +25,13 @@ MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268 MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285 MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605 MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2/options-pptp 238 -MD5 7004513b8b14aad3e2f598535e672af4 files/2.4.2/chat-default 351 +MD5 3f9363730082b77d6d2cddf4ba2fb188 files/2.4.2/chat-default 349 MD5 aade0f158628e38b74a080bd40222bc3 files/2.4.2/ip-up 1055 MD5 2f3cb68239518190078d5830de5e1398 files/2.4.2/killaddr-smarter.patch 6106 -MD5 12500a756925e9d8f4b2b655e95a2541 files/2.4.2/confd.ppp0 2784 +MD5 ed4ee5550e1016ff405d410f8e37cdfe files/2.4.2/confd.ppp0 2782 MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2/options-pppoe 53 MD5 561a149f78198208724ab4527837eb8c files/2.4.2/mpls.patch 10470 -MD5 acb0f867e42e9a380eaf8e1c312ad63b files/2.4.2/net.ppp0 4343 +MD5 eae3621e2f615e9614b392d6d0f3ef81 files/2.4.2/net.ppp0 4341 MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2/modules.ppp 268 MD5 09fcad33830cb2af02446902cf6883c6 files/2.4.2/ip-down 801 diff --git a/net-dialup/ppp/files/2.4.2/pcap.patch b/net-dialup/ppp/files/2.4.2/pcap.patch new file mode 100644 index 000000000000..dfcb4c352e42 --- /dev/null +++ b/net-dialup/ppp/files/2.4.2/pcap.patch @@ -0,0 +1,24 @@ +diff -Nrau ppp-2.4.2.orig/pppd/demand.c ppp-2.4.2/pppd/demand.c +--- ppp-2.4.2.orig/pppd/demand.c 2003-03-03 06:11:45.000000000 +0100 ++++ ppp-2.4.2/pppd/demand.c 2004-02-14 01:41:55.359981689 +0100 +@@ -50,7 +50,7 @@ + #include <sys/socket.h> + #ifdef PPP_FILTER + #include <net/if.h> +-#include <net/bpf.h> ++#include <pcap-bpf.h> + #include <pcap.h> + #endif + +diff -Nrau ppp-2.4.2.orig/pppd/sys-linux.c ppp-2.4.2/pppd/sys-linux.c +--- ppp-2.4.2.orig/pppd/sys-linux.c 2004-01-13 05:05:20.000000000 +0100 ++++ ppp-2.4.2/pppd/sys-linux.c 2004-02-14 01:41:39.610089530 +0100 +@@ -141,7 +141,7 @@ + #endif /* IPX_CHANGE */ + + #ifdef PPP_FILTER +-#include <net/bpf.h> ++#include <pcap-bpf.h> + #include <linux/filter.h> + #endif /* PPP_FILTER */ + diff --git a/net-dialup/ppp/ppp-2.4.2.ebuild b/net-dialup/ppp/ppp-2.4.2.ebuild index bbb25ea63e26..40ec148be193 100644 --- a/net-dialup/ppp/ppp-2.4.2.ebuild +++ b/net-dialup/ppp/ppp-2.4.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 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.ebuild,v 1.1 2004/02/12 20:23:48 lanius Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2.ebuild,v 1.2 2004/02/15 03:21:18 agriffis Exp $ -DESCRIPTION="Point-to-point protocol - patched for pppoe" +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" @@ -11,8 +11,10 @@ SLOT="0" KEYWORDS="~x86 ~ppc ~sparc ~hppa -amd64 ~ia64" IUSE="ipv6 activefilter pam" -DEPEND="virtual/glibc - activefilter? ( net-libs/libpcap )" +RDEPEND="virtual/glibc + net-libs/libpcap" +DEPEND="${RDEPEND} + >=sys-apps/sed-4" src_unpack() { unpack ${A} @@ -21,33 +23,33 @@ src_unpack() { epatch ${FILESDIR}/${PV}/mpls.patch epatch ${FILESDIR}/${PV}/killaddr-smarter.patch epatch ${FILESDIR}/${PV}/cflags.patch + epatch ${FILESDIR}/${PV}/pcap.patch use activefilter && { einfo "Enabling active-filter" - sed -i -e "s/^#FILTER=y/FILTER=y/" pppd/Makefile.linux + 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 + 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 + 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 + 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 + sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe radius/' pppd/plugins/Makefile.linux || die } src_compile() { # compile radius better than their makefile does - (cd pppd/plugins/radius/radiusclient; econf; emake) || die - + (cd pppd/plugins/radius/radiusclient && econf && emake) || die ./configure --prefix=/usr || die emake COPTS="${CFLAGS}" || die } |