Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--net-dialup/ppp/ChangeLog9
-rw-r--r--net-dialup/ppp/Manifest56
-rw-r--r--net-dialup/ppp/files/digest-ppp-2.4.2-r6 (renamed from net-dialup/ppp/files/digest-ppp-2.4.2-r5)0
-rw-r--r--net-dialup/ppp/ppp-2.4.2-r6.ebuild (renamed from net-dialup/ppp/ppp-2.4.2-r5.ebuild)6
4 files changed, 41 insertions, 30 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 1f8278fa1282..3696989bce03 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.78 2004/09/27 11:49:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.79 2004/10/14 08:08:21 dragonheart Exp $
+
+*ppp-2.4.2-r6 (14 Oct 2004)
+
+ 14 Oct 2004; Daniel Black <dragonheart@gentoo.org> -ppp-2.4.2-r5.ebuild,
+ +ppp-2.4.2-r6.ebuild:
+ revision bump and remove old version to fix bug #67125. Thanks Ned for
+ the notification and Alin Nastac for the simple fix
*ppp-2.4.2-r5 (27 Sep 2004)
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index d08a98774fc5..af8c2012356c 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -1,45 +1,47 @@
-MD5 eb1eff05ccdf44acb38517cf39c5ba69 ppp-2.4.2-r5.ebuild 5303
+MD5 eb1eff05ccdf44acb38517cf39c5ba69 ppp-2.4.2-r6.ebuild 5303
+MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
MD5 3190fd8db6e5622f1106f3b332d068e5 ppp-2.4.1-r14.ebuild 4714
-MD5 210b3f9616a92005171f3f25c33c1638 ppp-2.4.2-r2.ebuild 4462
-MD5 24f264eef320520caee8597fb071405b ppp-2.4.2.ebuild 3957
-MD5 20502c85d128ae0dd4545dc3ae3eec6b ppp-2.4.2-r1.ebuild 4276
+MD5 eb1eff05ccdf44acb38517cf39c5ba69 ppp-2.4.2-r5.ebuild 5303
MD5 340bb315b1d52b0a256fc3213ff38c27 ChangeLog 13064
-MD5 ec2f84816306825d125d0c01bd86758d metadata.xml 163
-MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
-MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
-MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
+MD5 20502c85d128ae0dd4545dc3ae3eec6b ppp-2.4.2-r1.ebuild 4276
+MD5 24f264eef320520caee8597fb071405b ppp-2.4.2.ebuild 3957
+MD5 210b3f9616a92005171f3f25c33c1638 ppp-2.4.2-r2.ebuild 4462
MD5 140bc2a08334d3546f43259934da603e files/chat-default 347
+MD5 1a60baf88a301c6eed8472a01b3691eb files/confd.ppp0 3312
+MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
+MD5 c07c26f0d600a1fde9752fa06fc4b0c3 files/digest-ppp-2.4.2-r5 194
+MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207
+MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
MD5 c74b7e519f593babcfc3821832d72819 files/ip-up 282
+MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
+MD5 bb6c00f1cd9b06ff131a22dc92142e9d files/net.ppp0 4701
+MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146
+MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723
+MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957
MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607
-MD5 1a60baf88a301c6eed8472a01b3691eb files/confd.ppp0 3312
-MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65
+MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
+MD5 c07c26f0d600a1fde9752fa06fc4b0c3 files/digest-ppp-2.4.2-r6 194
MD5 f82a3ae0dba4ce6031bbf1405071e827 files/ppp-2.4.1-r10.patch 311
-MD5 bb6c00f1cd9b06ff131a22dc92142e9d files/net.ppp0 4701
-MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673
+MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2 61
-MD5 eb5dfeb9b6a2c8b4b2f23df4980952e0 files/ppp-2.4.1-MSCHAPv2-fix.patch 507
MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r1 61
MD5 8d2dfaf7418945cb19864167542b14c0 files/digest-ppp-2.4.2-r2 61
-MD5 c07c26f0d600a1fde9752fa06fc4b0c3 files/digest-ppp-2.4.2-r5 194
-MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268
-MD5 0713ffc9ae6e3ee4ef0f5c3cb752b3ea files/ip-down 285
-MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/pppoe.html 7605
-MD5 927fc5dafad76c9c1ee7f0259e9244b7 files/2.4.2/mpls.patch.gz 3151
-MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2/options-pptp 238
MD5 f7a8c95af55d9cca703c15cdf9386ad4 files/2.4.2/control_c.patch 402
+MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530
+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 4d031363e70aa42076bf484fa8bdc9d6 files/2.4.2/ip-down 743
MD5 0fea1d14ab99bdbbbb5b6e652e105bd3 files/2.4.2/ip-up 1083
MD5 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257
-MD5 ef28c96687409a340c6cd66e21dc58db files/2.4.2/confd.ppp0 2786
-MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2/options-pppoe 53
-MD5 9d798912edc0a47727afcd7aac100957 files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz 10108
-MD5 ae851489b48d5c639c8c6da1fe02a5af files/2.4.2/net.ppp0 4414
-MD5 971013ca1ccc5a25acffdb3ff9edff4e files/2.4.2/pppoatm.diff.gz 3567
-MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.2/README.mpls 530
MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.2/modules.ppp 268
+MD5 927fc5dafad76c9c1ee7f0259e9244b7 files/2.4.2/mpls.patch.gz 3151
+MD5 ae851489b48d5c639c8c6da1fe02a5af files/2.4.2/net.ppp0 4414
+MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2/options-pppoe 53
+MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.2/options-pptp 238
MD5 99aa8428a441ff748dc88892a8e98266 files/2.4.2/pcap.patch 728
-MD5 4d031363e70aa42076bf484fa8bdc9d6 files/2.4.2/ip-down 743
+MD5 971013ca1ccc5a25acffdb3ff9edff4e files/2.4.2/pppoatm.diff.gz 3567
MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2/pppoe.html 7605
-MD5 bc88eaf56862e5ebf8f45ec5ada4bb90 files/2.4.2/cflags.patch 1857
+MD5 9d798912edc0a47727afcd7aac100957 files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz 10108
MD5 bd6bee3df13537a8550d2f39131eab0d files/2.4.2/pppoatm-2.diff.gz 3489
diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r5 b/net-dialup/ppp/files/digest-ppp-2.4.2-r6
index 47080cb9dbd6..47080cb9dbd6 100644
--- a/net-dialup/ppp/files/digest-ppp-2.4.2-r5
+++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r6
diff --git a/net-dialup/ppp/ppp-2.4.2-r5.ebuild b/net-dialup/ppp/ppp-2.4.2-r6.ebuild
index 4bab57b08979..20cac7433827 100644
--- a/net-dialup/ppp/ppp-2.4.2-r5.ebuild
+++ b/net-dialup/ppp/ppp-2.4.2-r6.ebuild
@@ -1,6 +1,6 @@
# 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-r5.ebuild,v 1.1 2004/09/27 11:49:22 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r6.ebuild,v 1.1 2004/10/14 08:08:21 dragonheart Exp $
inherit eutils gnuconfig flag-o-matic
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
IUSE="ipv6 activefilter pam atm mppe-mppc dhcp"
RDEPEND="virtual/libc
- activefilter? ( <=net-libs/libpcap-0.7.2-r1 )
+ activefilter? ( >=net-libs/libpcap-0.8.3-r1 )
atm? ( net-dialup/linux-atm )"
DEPEND="${RDEPEND}
>=sys-apps/sed-4"
@@ -71,6 +71,8 @@ src_unpack() {
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
}
+
+ 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() {