diff options
| author |   Alin Năstac <mrness@gentoo.org> | 2005-05-14 09:27:56 +0000 |
|---|---|---|
| committer | Alin Năstac <mrness@gentoo.org> | 2005-05-14 09:27:56 +0000 |
| commit | d22c565dfcb402e87275703d7c3fff5b20ec4247 (patch) | |
| tree | 991662620389ce40b84ba1114b20368ac2bcc1d7 /net-dialup | |
| parent | Version bump, thanks go to [steev] for testing (diff) | |
| download | gentoo-2-d22c565dfcb402e87275703d7c3fff5b20ec4247.tar.gz gentoo-2-d22c565dfcb402e87275703d7c3fff5b20ec4247.tar.bz2 gentoo-2-d22c565dfcb402e87275703d7c3fff5b20ec4247.zip | |
fix multilib-strict for 2.4.2 (#92111); remove old versions; reorganize patches & FILESDIR
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-dialup')
43 files changed, 86 insertions, 2553 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog index 28bd94029c0e..7ccb668e8b2c 100644 --- a/net-dialup/ppp/ChangeLog +++ b/net-dialup/ppp/ChangeLog @@ -1,6 +1,28 @@ # ChangeLog for net-dialup/ppp # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.108 2005/05/10 15:12:16 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.109 2005/05/14 09:27:56 mrness Exp $ + + 14 May 2005; Alin Nastac <mrness@gentoo.org> -files/2.4.2/README.mpls, + -files/2.4.2/cbcp-dosfix.patch, -files/2.4.2/cflags.patch, + -files/2.4.2/chat-default, -files/2.4.2/control_c.patch, + -files/2.4.2/killaddr-smarter.patch.gz, -files/2.4.2/modules.ppp, + -files/2.4.2/mpls.patch.gz, -files/2.4.2/mppe-mppc-1.0.patch.gz, + -files/2.4.2/options-pppoe, -files/2.4.2/options-pptp, + -files/2.4.2/pcap.patch, -files/2.4.2/pppoatm-2.diff.gz, + -files/2.4.2/pppoatm.diff.gz, -files/2.4.2/pppoe.html, + -files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz, -files/2.4.3/README.mpls, + -files/2.4.3/chat-default, -files/2.4.3/fixes-from-upstream-cvs.patch, + -files/2.4.3/killaddr-smarter.patch, -files/2.4.3/modules.ppp, + -files/2.4.3/mpls.patch, -files/2.4.3/options-pppoe, + -files/2.4.3/options-pptp, -files/2.4.3/ppp_flags.patch, + -files/2.4.3/pppoe.html, +files/README.mpls, + -files/gcc3.3-multiline.patch, -files/gcc33-amd64.patch, + +files/options-pppoe, +files/options-pptp, + -files/ppp-sys_error_to_strerror.patch, -ppp-2.4.1-r14.ebuild, + ppp-2.4.2-r10.ebuild, -ppp-2.4.3.ebuild, -ppp-2.4.3-r1.ebuild, + -ppp-2.4.3-r2.ebuild, ppp-2.4.3-r3.ebuild: + Fix multilib-strict issue (#92111) in 2.4.2. Remove obsolete versions. + Reorganize patches and FILESDIR stuff. 10 May 2005; Herbie Hopkins <herbs@gentoo.org> ppp-2.4.3-r3.ebuild: Fixed multilib-strict issue, bug #92111 diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest index 5ffc3da27af5..8d74deb43dbd 100644 --- a/net-dialup/ppp/Manifest +++ b/net-dialup/ppp/Manifest @@ -1,64 +1,20 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 7fabd0811dbf88750b8a7cd65f1b7cb2 ppp-2.4.3-r2.ebuild 5673 -MD5 f498fcc5704e842bdd3a13e71626f676 ppp-2.4.3.ebuild 5712 -MD5 c4e90e104aa550d26d90ee354e7a2136 ppp-2.4.1-r14.ebuild 4702 -MD5 558237b810ac812265ad87bb956270de ppp-2.4.3-r1.ebuild 5799 -MD5 6b74e36c1dad9293d8b473823cf931d7 ppp-2.4.3-r3.ebuild 6076 -MD5 e3076f0cd6dc92bc888476a8771ccbd6 ChangeLog 18386 +MD5 c92e4c2841eee7b092f29338ed6866f0 ppp-2.4.3-r3.ebuild 6045 +MD5 f355949380c473fca27d264e77ed3336 ChangeLog 19653 MD5 e6fdfdc4317d7fe324c50bd0477ca3f8 metadata.xml 295 -MD5 4dce8b15c7a47d9a225b1047fda9870e ppp-2.4.2-r10.ebuild 5899 +MD5 034f050a57ad3bb82295d04b4de32404 ppp-2.4.2-r10.ebuild 6209 MD5 4e62cdeb360ca0a22becbd2deb6f2dac files/pon 957 MD5 86cdaf133f7a79fb464f02d83afc7734 files/plog 146 MD5 05b7394b35a2342033b52134568bf6b8 files/poff 2723 +MD5 2890b47660f967a07ac5b211850e46c5 files/options-pptp 238 MD5 140bc2a08334d3546f43259934da603e files/chat-default 347 -MD5 47bae70427ec4cb3ea1cc87ae799d0e3 files/gcc33-amd64.patch 1207 MD5 054b3958fe0cfda4ac1420846fcc7a4b files/ip-up 1081 MD5 44cc662ba9aa61dd9add3ddd4c5ded57 files/pon.1 3607 MD5 c9117abf5fed623d5290779446e9855e files/confd.ppp0 2775 -MD5 4fda43c2f3f8b5b58a58e5d238991c0b files/digest-ppp-2.4.1-r14 65 -MD5 c07c26f0d600a1fde9752fa06fc4b0c3 files/digest-ppp-2.4.2-r10 194 +MD5 d90deeaef8dbdfcd18d1567681d03559 files/digest-ppp-2.4.2-r10 271 +MD5 fa2a5b8df496922fa2fb592115953b6b files/options-pppoe 53 MD5 2f3f8eb46b9d97a435a8694683f84651 files/net.ppp0 4408 -MD5 c032ff6a0c137f4996b7a5bf60e19a0a files/ppp-sys_error_to_strerror.patch 4920 -MD5 8368eb79ad4618c3c6753801b5c4c689 files/gcc3.3-multiline.patch 1673 -MD5 01ed8667e00028ff1c6a8ac4a0d7e1dc files/digest-ppp-2.4.3 194 -MD5 01ed8667e00028ff1c6a8ac4a0d7e1dc files/digest-ppp-2.4.3-r1 194 -MD5 3e67d7c036e1e23ae4aa96ad043cb3e8 files/digest-ppp-2.4.3-r2 195 -MD5 3e67d7c036e1e23ae4aa96ad043cb3e8 files/digest-ppp-2.4.3-r3 195 +MD5 4afa8dd77ad811492789477df07e47da files/digest-ppp-2.4.3-r3 195 +MD5 1fd88dda7f4996799c69a9501d42cc23 files/README.mpls 530 MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/modules.ppp 268 MD5 5a554e2a04b9e11bb5bea839213bf97c files/ip-down 931 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 a2eaeceee980ff6e183abfa370fc685c files/2.4.2/chat-default 353 -MD5 8eaba18dd4e6f49c9fd2d35ab8572458 files/2.4.2/killaddr-smarter.patch.gz 2257 -MD5 844c9d343d7511902b5380b27eca417e files/2.4.2/mppe-mppc-1.0.patch.gz 11442 -MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.2/options-pppoe 53 -MD5 9d798912edc0a47727afcd7aac100957 files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz 10108 -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 99aa8428a441ff748dc88892a8e98266 files/2.4.2/pcap.patch 728 -MD5 fe4d81182954a014493a830a24fb2f07 files/2.4.2/cbcp-dosfix.patch 3098 -MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.2/pppoe.html 7605 -MD5 bc88eaf56862e5ebf8f45ec5ada4bb90 files/2.4.2/cflags.patch 1857 -MD5 bd6bee3df13537a8550d2f39131eab0d files/2.4.2/pppoatm-2.diff.gz 3489 -MD5 2890b47660f967a07ac5b211850e46c5 files/2.4.3/options-pptp 238 -MD5 f1a623897655a8550dc09c7879b8479f files/2.4.3/ppp_flags.patch 4341 -MD5 161c955fd1a731fa7c8895e01d14d67b files/2.4.3/chat-default 348 -MD5 93217f52392558608bbf223aa22a483d files/2.4.3/killaddr-smarter.patch 4573 -MD5 fa2a5b8df496922fa2fb592115953b6b files/2.4.3/options-pppoe 53 -MD5 561a149f78198208724ab4527837eb8c files/2.4.3/mpls.patch 10470 -MD5 d166dfb51a6e7fa6a5a05120817dbccd files/2.4.3/fixes-from-upstream-cvs.patch 2862 -MD5 1fd88dda7f4996799c69a9501d42cc23 files/2.4.3/README.mpls 530 -MD5 5d83af7b897082a0b1ecd70a2cc2a0c7 files/2.4.3/modules.ppp 268 -MD5 f0ad3e0c62aec1771536caf00e28b9c6 files/2.4.3/pppoe.html 7605 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCgM9x2G5bA0cA/ScRAiboAKDLZKvSqEECiiddMugpBtJz6ZqjgwCfVJiN -CtYp2ktnuOAuEU7+Uz9xuUM= -=667r ------END PGP SIGNATURE----- diff --git a/net-dialup/ppp/files/2.4.2/cbcp-dosfix.patch b/net-dialup/ppp/files/2.4.2/cbcp-dosfix.patch deleted file mode 100644 index e482ccbf4ed2..000000000000 --- a/net-dialup/ppp/files/2.4.2/cbcp-dosfix.patch +++ /dev/null @@ -1,142 +0,0 @@ ---- ppp-2.4.2/pppd/cbcp.c 2004-10-28 15:14:19.231292272 -0400 -+++ pppd/cbcp.c 2004-10-27 20:15:36.000000000 -0400 -@@ -165,7 +165,8 @@ - inp = inpacket; - - if (pktlen < CBCP_MINLEN) { -- error("CBCP packet is too small"); -+ if (debug) -+ dbglog("CBCP packet is too small"); - return; - } - -@@ -173,12 +174,11 @@ - GETCHAR(id, inp); - GETSHORT(len, inp); - --#if 0 -- if (len > pktlen) { -- error("CBCP packet: invalid length"); -+ if (len > pktlen || len < CBCP_MINLEN) { -+ if (debug) -+ dbglog("CBCP packet: invalid length %d", len); - return; - } --#endif - - len -= CBCP_MINLEN; - -@@ -189,11 +189,12 @@ - break; - - case CBCP_RESP: -- dbglog("CBCP_RESP received"); -+ if (debug) -+ dbglog("CBCP_RESP received"); - break; - - case CBCP_ACK: -- if (id != us->us_id) -+ if (debug && id != us->us_id) - dbglog("id doesn't match: expected %d recv %d", - us->us_id, id); - -@@ -312,11 +313,13 @@ - - address[0] = 0; - -- while (len) { -+ while (len >= 2) { - dbglog("length: %d", len); - - GETCHAR(type, pckt); - GETCHAR(opt_len, pckt); -+ if (opt_len < 2 || opt_len > len) -+ break; - - if (opt_len > 2) - GETCHAR(delay, pckt); -@@ -348,6 +351,11 @@ - } - len -= opt_len; - } -+ if (len != 0) { -+ if (debug) -+ dbglog("cbcp_recvreq: malformed packet (%d bytes left)", len); -+ return; -+ } - - cbcp_resp(us); - } -@@ -360,6 +368,7 @@ - u_char buf[256]; - u_char *bufp = buf; - int len = 0; -+ int slen; - - cb_type = us->us_allowed & us->us_type; - dbglog("cbcp_resp cb_type=%d", cb_type); -@@ -371,12 +380,17 @@ - - if (cb_type & ( 1 << CB_CONF_USER ) ) { - dbglog("cbcp_resp CONF_USER"); -+ slen = strlen(us->us_number); -+ if (slen > 250) { -+ warn("callback number truncated to 250 characters"); -+ slen = 250; -+ } - PUTCHAR(CB_CONF_USER, bufp); -- len = 3 + 1 + strlen(us->us_number) + 1; -+ len = 3 + 1 + slen + 1; - PUTCHAR(len , bufp); - PUTCHAR(5, bufp); /* delay */ - PUTCHAR(1, bufp); -- BCOPY(us->us_number, bufp, strlen(us->us_number) + 1); -+ BCOPY(us->us_number, bufp, slen + 1); - cbcp_send(us, CBCP_RESP, buf, len); - return; - } -@@ -438,25 +452,29 @@ - int opt_len; - char address[256]; - -- if (len) { -+ if (len >= 2) { - GETCHAR(type, pckt); - GETCHAR(opt_len, pckt); -+ if (opt_len >= 2 && opt_len <= len) { - -- if (opt_len > 2) -- GETCHAR(delay, pckt); -+ if (opt_len > 2) -+ GETCHAR(delay, pckt); - -- if (opt_len > 4) { -- GETCHAR(addr_type, pckt); -- memcpy(address, pckt, opt_len - 4); -- address[opt_len - 4] = 0; -- if (address[0]) -- dbglog("peer will call: %s", address); -- } -- if (type == CB_CONF_NO) -- return; -- } -+ if (opt_len > 4) { -+ GETCHAR(addr_type, pckt); -+ memcpy(address, pckt, opt_len - 4); -+ address[opt_len - 4] = 0; -+ if (address[0]) -+ dbglog("peer will call: %s", address); -+ } -+ if (type == CB_CONF_NO) -+ return; - -- cbcp_up(us); -+ cbcp_up(us); -+ -+ } else if (debug) -+ dbglog("cbcp_recvack: malformed packet"); -+ } - } - - /* ok peer will do callback */ diff --git a/net-dialup/ppp/files/2.4.2/cflags.patch b/net-dialup/ppp/files/2.4.2/cflags.patch deleted file mode 100644 index 45195e2ee45f..000000000000 --- a/net-dialup/ppp/files/2.4.2/cflags.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Naur ppp-2.4.2b3-orig/pppd/Makefile.linux ppp-2.4.2b3/pppd/Makefile.linux ---- ppp-2.4.2b3-orig/pppd/Makefile.linux 2003-12-08 15:38:14.000000000 -0500 -+++ ppp-2.4.2b3/pppd/Makefile.linux 2003-12-08 15:41:52.000000000 -0500 -@@ -31,7 +31,7 @@ - - # CC = gcc - # --COPTS = -O2 -pipe -Wall -g -+COPTS = $(COPTS) -Wall - LIBS = - - # Uncomment the next 2 lines to include support for Microsoft's -diff -Naur ppp-2.4.2b3-orig/pppd/plugins/Makefile ppp-2.4.2b3/pppd/plugins/Makefile ---- ppp-2.4.2b3-orig/pppd/plugins/Makefile 2002-12-06 04:48:53.000000000 -0500 -+++ ppp-2.4.2b3/pppd/plugins/Makefile 2003-12-08 15:42:40.000000000 -0500 -@@ -1,5 +1,5 @@ - CC = gcc --COPTS = -O2 -g -+COPTS = ${COPTS} - CFLAGS = $(COPTS) -I.. -I../../include -fPIC - LDFLAGS = -shared - INSTALL = install -o root -diff -Naur ppp-2.4.2b3-orig/pppd/plugins/radius/Makefile.linux ppp-2.4.2b3/pppd/plugins/radius/Makefile.linux ---- ppp-2.4.2b3-orig/pppd/plugins/radius/Makefile.linux 2002-11-09 06:24:42.000000000 -0500 -+++ ppp-2.4.2b3/pppd/plugins/radius/Makefile.linux 2003-12-08 15:43:02.000000000 -0500 -@@ -5,7 +5,7 @@ - - MANDIR=/usr/man - PLUGIN=radius.so radattr.so radrealms.so --CFLAGS=-I../.. -I../../../include -Iradiusclient/include -O2 -+CFLAGS=$(COPTS) -I../.. -I../../../include -Iradiusclient/include - - # Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. -diff -Naur ppp-2.4.2b3-orig/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.2b3/pppd/plugins/rp-pppoe/Makefile.linux ---- ppp-2.4.2b3-orig/pppd/plugins/rp-pppoe/Makefile.linux 2001-12-13 21:55:20.000000000 -0500 -+++ ppp-2.4.2b3/pppd/plugins/rp-pppoe/Makefile.linux 2003-12-08 15:43:28.000000000 -0500 -@@ -16,7 +16,7 @@ - # Version is set ONLY IN THE MAKEFILE! Don't delete this! - VERSION=3.3 - --COPTS=-O2 -g -+COPTS=${COPTS} - CFLAGS=$(COPTS) -I../../../include/linux - all: rp-pppoe.so - diff --git a/net-dialup/ppp/files/2.4.2/chat-default b/net-dialup/ppp/files/2.4.2/chat-default deleted file mode 100644 index 9c744388b0a6..000000000000 --- a/net-dialup/ppp/files/2.4.2/chat-default +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/ppp/chat-default: -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.2/chat-default,v 1.2 2004/07/18 03:50:48 dragonheart Exp $ - -'ABORT' 'BUSY' -'ABORT' 'ERROR' -'ABORT' 'NO ANSWER' -'ABORT' 'NO CARRIER' -'ABORT' 'NO DIALTONE' -'ABORT' 'Invalid Login' -'ABORT' 'Login incorrect' -'' 'ATZ' -'OK' 'ATDT$NUMBER' -'CONNECT' '' -'TIMEOUT' '5' -'~--' '' diff --git a/net-dialup/ppp/files/2.4.2/control_c.patch b/net-dialup/ppp/files/2.4.2/control_c.patch deleted file mode 100644 index bf01f9e6b148..000000000000 --- a/net-dialup/ppp/files/2.4.2/control_c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nrau ppp-2.4.2.orig/pppd/main.c ppp-2.4.2/pppd/main.c ---- ppp-2.4.2.orig/pppd/main.c 2004-07-16 00:21:19.000000000 +0200 -+++ ppp-2.4.2/pppd/main.c 2004-07-16 00:16:36.000000000 +0200 -@@ -1338,8 +1338,8 @@ - - act.sa_handler = SIG_IGN; - act.sa_flags = 0; -- sigaction(sig, &act, &oldact); - kill(0, sig); -+ sigaction(sig, &act, &oldact); - sigaction(sig, &oldact, NULL); - }
\ No newline at end of file diff --git a/net-dialup/ppp/files/2.4.2/killaddr-smarter.patch.gz b/net-dialup/ppp/files/2.4.2/killaddr-smarter.patch.gz Binary files differdeleted file mode 100644 index a4cca63c6947..000000000000 --- a/net-dialup/ppp/files/2.4.2/killaddr-smarter.patch.gz +++ /dev/null diff --git a/net-dialup/ppp/files/2.4.2/modules.ppp b/net-dialup/ppp/files/2.4.2/modules.ppp deleted file mode 100644 index 1f5ad7f9938d..000000000000 --- a/net-dialup/ppp/files/2.4.2/modules.ppp +++ /dev/null @@ -1,9 +0,0 @@ -alias char-major-108 ppp_generic -alias /dev/ppp ppp_generic -alias tty-ldisc-3 ppp_async -alias tty-ldisc-13 n_hdlc -alias tty-ldisc-14 ppp_synctty -alias ppp-compress-21 bsd_comp -alias ppp-compress-24 ppp_deflate -alias ppp-compress-26 ppp_deflate -alias net-pf-24 pppoe diff --git a/net-dialup/ppp/files/2.4.2/mpls.patch.gz b/net-dialup/ppp/files/2.4.2/mpls.patch.gz Binary files differdeleted file mode 100644 index 50acff426221..000000000000 --- a/net-dialup/ppp/files/2.4.2/mpls.patch.gz +++ /dev/null diff --git a/net-dialup/ppp/files/2.4.2/mppe-mppc-1.0.patch.gz b/net-dialup/ppp/files/2.4.2/mppe-mppc-1.0.patch.gz Binary files differdeleted file mode 100644 index 92e4a28d8981..000000000000 --- a/net-dialup/ppp/files/2.4.2/mppe-mppc-1.0.patch.gz +++ /dev/null diff --git a/net-dialup/ppp/files/2.4.2/pcap.patch b/net-dialup/ppp/files/2.4.2/pcap.patch deleted file mode 100644 index dfcb4c352e42..000000000000 --- a/net-dialup/ppp/files/2.4.2/pcap.patch +++ /dev/null @@ -1,24 +0,0 @@ -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/files/2.4.2/pppoatm-2.diff.gz b/net-dialup/ppp/files/2.4.2/pppoatm-2.diff.gz Binary files differdeleted file mode 100644 index 98b851f3ed1b..000000000000 --- a/net-dialup/ppp/files/2.4.2/pppoatm-2.diff.gz +++ /dev/null diff --git a/net-dialup/ppp/files/2.4.2/pppoatm.diff.gz b/net-dialup/ppp/files/2.4.2/pppoatm.diff.gz Binary files differdeleted file mode 100644 index e37807c37315..000000000000 --- a/net-dialup/ppp/files/2.4.2/pppoatm.diff.gz +++ /dev/null diff --git a/net-dialup/ppp/files/2.4.2/pppoe.html b/net-dialup/ppp/files/2.4.2/pppoe.html deleted file mode 100644 index 512dc78329a1..000000000000 --- a/net-dialup/ppp/files/2.4.2/pppoe.html +++ /dev/null @@ -1,174 +0,0 @@ -<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en"> -<html> -<head> - - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - - <meta name="GENERATOR" content="Mozilla/4.75 [en] (X11; U; Linux 2.2.16-22 i686) [Netscape]"> - <title>Index of /~mostrows</title> -</head> - <body text="#000000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000"> - <b><font face="Arial,Helvetica"><font size="+4">PPPoE for Linux 2.4</font></font></b> - -<p><font size="+0">This is a driver for PPPoE for Linux 2.4.</font> </p> - -<p><font size="+0">This driver is for 2.4 kernels only. For a driver - for 2.2 kernels, the <a href="http://www.roaringpenguin.com">Roaring Penguin</a><br> - package is recommended.<br> - </font></p> - -<p>The software on this page is currently required if you wish to use kernel-mode<br> - PPPoE with Roaring Penguin (see the Roaring Penguin documentation for details),<br> - though this functionality is currently recommended for experts only.<br> - </p> - -<p><font size="+0">Files:</font> </p> - -<p><font size="+0"> <a href="ppp-2.4.1-pppoe.patch4"> - ppp-2.4.1-pppoe.patch4</a> Patch for ppp-2.4.1</font><br> - <font size="+0"> <a href="ppp-2.4.1-pppoe4.tgz"> - ppp-2.4.1-pppoe4.tgz</a> Source of ppp-2.4.1 with patches applied. -</font> <br> - <font size="+0"> <a href="ppp-cvs.pppoe1.tgz"> - ppp-cvs.pppoe1.tgz</a> Source of ppp CVS repository with patches applied. -</font> <br> - </p> - -<p><b><font size="+0">Installation & Usage:</font></b> </p> - -<p><font size="+0">1. Configure, compile and install a 2.4 kernel.</font> - <br> - <font size="+0"><br> - Make sure to enable PPP over Ethernet in the kernel -configuration, as</font> <br> - <font size="+0"> well as as the "Packet Socket" -option. You must also enable support</font> <br> - <font size="+0"> for experimental drivers.</font></p> - -<p><font size="+0"> If you are compiling as a module, -add the line "alias net-pf-24 pppoe" to<br> - /etc/modules.conf.</font></p> - -<p><font size="+0"> Make sure that the /dev/ppp device -exists: "mknod /dev/ppp c 108 0"<br> - </font> </p> - -<p><font size="+0">2. Configure, compile and install the modified pppd -package.</font> <br> - <font size="+0"> Links to the patch, or the complete - patched source are available above.</font> </p> - -<p><font size="+0">3. Include the following line in your ppp options - file:</font> </p> - -<p><font size="+0"> plugin pppoe</font> </p> - -<p><font size="+0"> If you experience problems, try replacing - the "pppoe" with the</font> <br> - <font size="+0"> full path and file name of the "pppoe.so" - file that is installed</font> <br> - <font size="+0"> by the pppd installation.</font> </p> - -<p><font size="+0"> Following these two lines should be - your other ppp options. My</font> <br> - <font size="+0"> options file includes only one other -line; a "name" statement for</font> <br> - <font size="+0"> PAP.</font> </p> - -<p><font size="+0">4. Invoke pppd (e.g.: "pppd eth0"). Before - doing this, make sure the ethernet</font> <br> - <font size="+0"> device is up ("ifconfig eth0 up" - has been executed).</font> <br> - <font size="+0"></font> <br> - </p> - -<p><b><font size="+0">Other Stuff:</font></b> </p> - -<p><font size="+0">1. You can restrict pppd to connect to specific access-concentrators</font> - <br> - <font size="+0"> or specific services by addin "pppoe_ac_name" - and "pppoe_srv_name"</font> <br> - <font size="+0"> options (respectively) to your options - file. Each of these options is</font> <br> - <font size="+0"> followed by a string specifying the -conecntrator or service name that</font> <br> - <font size="+0"> is to be matched. Most people should -not need this.</font> <br> - </p> - -<p><font size="+0">2. Here's how I've configured things to get a server - working:</font> </p> - -<p><font size="+0"> client's /etc/ppp/options:</font> </p> - -<p><font size="+0"> plugin /usr/lib/pppd/plugins/pppoe.so</font> - <br> - <font size="+0"> name papname</font> - </p> - -<p><font size="+0"> client's /etc/ppp/pap-secrets:</font> - </p> - -<p><font size="+0"> papname * papsecret</font> - </p> - -<p><font size="+0"> server's /etc/ppp/options:</font> </p> - -<p><font size="+0"> plugin /usr/lib/pppd/plugins/pppoe.so</font> - <br> - <font size="+0"> pppoe_server</font> - <br> - <font size="+0"> +pap</font> -<br> - <font size="+0"> 10.10.10.1:</font> - </p> - -<p><font size="+0"> server's /etc/ppp/pap-secrets:</font> - </p> - -<p><font size="+0"> papname * papsecret - 10.10.10.0/24+ !10.10.10.1</font> <br> - </p> - -<p><font size="+0"> On both the client and the server, pppd -is invoked as "pppd eth0".</font> <br> - <font size="+0"> With this setup you will have to invoke - a new pppd on the server for</font> <br> - <font size="+0"> each session.</font> </p> - -<p><font size="+0"> The patched pppd also builds a new pppoed -which can be used to create</font> <br> - <font size="+0"> a PPPoE server capable of serving multiple - clients. To use this ,</font> <br> - <font size="+0"> remove the "pppoe_server" line from -the server's /etc/ppp/options</font> <br> - <font size="+0"> file. Invoke pppoed as: "pppoed --S -I eth0 -A ac_name -S srv_name".</font> <br> - <font size="+0"> pppoed will now create a new pppd process - for each incoming connection.</font> <br> - <font size="+0"> Note: this is still rather flaky, use - with caution If pppoed seems to jam,</font> <br> - <font size="+0"> restarting it will not affect existing - connections.</font> <br> - </p> - -<p>3. If you're trying to run masquerading over your PPPoE link, check - out <a href="http://www.hgfelger.de/mss/mss.html">this</a> <br> - page for instructions on how to ensure that path - MTU's are properly <br> - reported across your network. Without - this your masquerading will <br> - not work. </p> - -<p> <a href="http://www.hgfelger.de/mss/mss.html"> - http://www.hgfelger.de/mss/mss.html</a> <br> - </p> - -<p><font size="+0">Michal Ostrowski</font> <br> - <font size="+0"><a href="mailto:mostrows@styx.uwaterloo.ca">mostrows@styx.uwaterloo.ca</a></font> - <br> - <br> - </p> - -</body> -</html> diff --git a/net-dialup/ppp/files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz b/net-dialup/ppp/files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz Binary files differdeleted file mode 100644 index d986981ce497..000000000000 --- a/net-dialup/ppp/files/2.4.2/stdopt-mppe-mppc-0.82.patch.gz +++ /dev/null diff --git a/net-dialup/ppp/files/2.4.3/README.mpls b/net-dialup/ppp/files/2.4.3/README.mpls deleted file mode 100644 index 1ae7ae46057a..000000000000 --- a/net-dialup/ppp/files/2.4.3/README.mpls +++ /dev/null @@ -1,15 +0,0 @@ -MPLS consists of 3 components: -1. MPLS forwarding -2. MPLS signalling -3. Mapping layer 3 traffic onto MPLS LSPs - -The document mpls-forwarding basics explains item 1. - -Examples of MPLS signalling protocols are: RSVP-TE LDP and CR-LDP. -The package ldp-portable is an implementation of LDP and contains more -information about LDP based MPLS signalling. - -Mapping of layer 3 traffic to MPLS LSPs is accomplised in a couple of -different ways. --Per FEC where FEC is an entry in the routing table --Virtual interface that represents an LSP diff --git a/net-dialup/ppp/files/2.4.3/chat-default b/net-dialup/ppp/files/2.4.3/chat-default deleted file mode 100644 index 8a74b9803b5e..000000000000 --- a/net-dialup/ppp/files/2.4.3/chat-default +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/ppp/chat-default: -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/files/2.4.3/chat-default,v 1.1 2004/11/27 10:48:15 mrness Exp $ - -'ABORT' 'BUSY' -'ABORT' 'ERROR' -'ABORT' 'NO ANSWER' -'ABORT' 'NO CARRIER' -'ABORT' 'NO DIALTONE' -'ABORT' 'Invalid Login' -'ABORT' 'Login incorrect' -'' 'ATZ' -'OK' 'ATDT$NUMBER' -'CONNECT' '' -'TIMEOUT' '5' -'~--' '' diff --git a/net-dialup/ppp/files/2.4.3/fixes-from-upstream-cvs.patch b/net-dialup/ppp/files/2.4.3/fixes-from-upstream-cvs.patch deleted file mode 100644 index 3998ea0e4c84..000000000000 --- a/net-dialup/ppp/files/2.4.3/fixes-from-upstream-cvs.patch +++ /dev/null @@ -1,105 +0,0 @@ -Patches from upstream CVS for bug IDs 1103-1106. -diff -Nru ppp-2.4.3.orig/pppd/auth.c ppp-2.4.3/pppd/auth.c ---- ppp-2.4.3.orig/pppd/auth.c 2004-11-12 12:30:51.000000000 +0200 -+++ ppp-2.4.3/pppd/auth.c 2005-01-09 15:42:42.938985272 +0200 -@@ -532,9 +532,12 @@ - link_required(unit) - int unit; - { -+ char *msg; -+ - new_phase(PHASE_SERIALCONN); - - devfd = the_channel->connect(); -+ msg = "Connect script failed"; - if (devfd < 0) - goto fail; - -@@ -547,6 +550,7 @@ - * gives us. Thus we don't need the tdb_writelock/tdb_writeunlock. - */ - fd_ppp = the_channel->establish_ppp(devfd); -+ msg = "ppp establishment failed"; - if (fd_ppp < 0) { - status = EXIT_FATAL_ERROR; - goto disconnect; -@@ -581,6 +585,8 @@ - if (the_channel->cleanup) - (*the_channel->cleanup)(); - -+ /* XXX not nice here but needs to go somewhere... */ -+ lcp_close(0, msg); - } - - /* -diff -Nru ppp-2.4.3.orig/pppd/options.c ppp-2.4.3/pppd/options.c ---- ppp-2.4.3.orig/pppd/options.c 2005-01-09 15:41:20.733482408 +0200 -+++ ppp-2.4.3/pppd/options.c 2005-01-09 15:43:57.593636040 +0200 -@@ -58,12 +58,12 @@ - #ifdef PPP_FILTER - #include <pcap.h> - /* -- * DLT_PPP_WITH_DIRECTION is in current libpcap cvs, and should be in -+ * DLT_PPP_WITHDIRECTION is in current libpcap cvs, and should be in - * libpcap-0.8.4. Until that is released, use DLT_PPP - but that means - * we lose the inbound and outbound qualifiers. - */ --#ifndef DLT_PPP_WITH_DIRECTION --#define DLT_PPP_WITH_DIRECTION DLT_PPP -+#ifndef DLT_PPP_WITHDIRECTION -+#define DLT_PPP_WITHDIRECTION DLT_PPP - #endif - #endif - -@@ -1455,13 +1455,13 @@ - char **argv; - { - pcap_t *pc; -- int ret = 0; -+ int ret = 1; - -- pc = pcap_open_dead(DLT_PPP_WITH_DIRECTION, 65535); -+ pc = pcap_open_dead(DLT_PPP_WITHDIRECTION, 65535); - if (pcap_compile(pc, &pass_filter, *argv, 1, netmask) == -1) { - option_error("error in pass-filter expression: %s\n", - pcap_geterr(pc)); -- ret = 1; -+ ret = 0; - } - pcap_close(pc); - -@@ -1476,13 +1476,13 @@ - char **argv; - { - pcap_t *pc; -- int ret = 0; -+ int ret = 1; - -- pc = pcap_open_dead(DLT_PPP_WITH_DIRECTION, 65535); -+ pc = pcap_open_dead(DLT_PPP_WITHDIRECTION, 65535); - if (pcap_compile(pc, &active_filter, *argv, 1, netmask) == -1) { - option_error("error in active-filter expression: %s\n", - pcap_geterr(pc)); -- ret = 1; -+ ret = 0; - } - pcap_close(pc); - -diff -Nru ppp-2.4.3.orig/pppd/tty.c ppp-2.4.3/pppd/tty.c ---- ppp-2.4.3.orig/pppd/tty.c 2004-11-13 14:07:29.000000000 +0200 -+++ ppp-2.4.3/pppd/tty.c 2005-01-09 15:42:42.937985424 +0200 -@@ -755,14 +755,6 @@ - close(pty_master); - pty_master = -1; - } -- if (pty_slave >= 0) { -- close(pty_slave); -- pty_slave = -1; -- } -- if (real_ttyfd >= 0) { -- close(real_ttyfd); -- real_ttyfd = -1; -- } - ttyfd = -1; - if (got_sigterm) - asked_to_quit = 1; diff --git a/net-dialup/ppp/files/2.4.3/killaddr-smarter.patch b/net-dialup/ppp/files/2.4.3/killaddr-smarter.patch deleted file mode 100644 index a1f7269c7ff4..000000000000 --- a/net-dialup/ppp/files/2.4.3/killaddr-smarter.patch +++ /dev/null @@ -1,134 +0,0 @@ -diff -urN ppp-2.4.1.pppoe4-orig/pppd/options.c ppp-2.4.1.pppoe4/pppd/options.c ---- ppp-2.4.1.pppoe4-orig/pppd/options.c 2001-03-30 19:33:55.000000000 -0500 -+++ ppp-2.4.1.pppoe4/pppd/options.c 2002-10-04 12:48:21.000000000 -0400 -@@ -67,6 +67,9 @@ - char user[MAXNAMELEN]; /* Username for PAP */ - char passwd[MAXSECRETLEN]; /* Password for PAP */ - bool persist = 0; /* Reopen link after it goes down */ -+bool killoldaddr = 0; /* If our IP is reassigned on -+ reconnect, kill active TCP -+ connections using the old IP. */ - char our_name[MAXNAMELEN]; /* Our name for authentication purposes */ - bool demand = 0; /* do dial-on-demand */ - char *ipparam = NULL; /* Extra parameter for ip up/down scripts */ -@@ -186,6 +189,11 @@ - { "demand", o_bool, &demand, - "Dial on demand", OPT_INITONLY | 1, &persist }, - -+ { "killoldaddr", o_bool, &killoldaddr, -+ "Kill connections from an old source address", 1}, -+ { "nokilloldaddr", o_bool,&killoldaddr, -+ "Don't kill connections from an old source address" }, -+ - { "--version", o_special_noarg, (void *)showversion, - "Show version number" }, - { "--help", o_special_noarg, (void *)showhelp, -diff -urN ppp-2.4.1.pppoe4-orig/pppd/pppd.h ppp-2.4.1.pppoe4/pppd/pppd.h ---- ppp-2.4.1.pppoe4-orig/pppd/pppd.h 2001-04-01 15:06:17.000000000 -0400 -+++ ppp-2.4.1.pppoe4/pppd/pppd.h 2002-10-04 12:46:49.000000000 -0400 -@@ -252,6 +252,9 @@ - extern char remote_name[MAXNAMELEN]; /* Peer's name for authentication */ - extern bool explicit_remote;/* remote_name specified with remotename opt */ - extern bool demand; /* Do dial-on-demand */ -+extern bool killoldaddr; /* If our IP is reassigned on -+ reconnect, kill active TCP -+ connections using the old IP. */ - extern char *ipparam; /* Extra parameter for ip up/down scripts */ - extern bool cryptpap; /* Others' PAP passwords are encrypted */ - extern int idle_time_limit;/* Shut down link if idle for this long */ -diff -urN ppp-2.4.1.pppoe4-orig/pppd/sys-linux.c ppp-2.4.1.pppoe4/pppd/sys-linux.c ---- ppp-2.4.1.pppoe4-orig/pppd/sys-linux.c 2001-07-26 16:19:33.000000000 -0400 -+++ ppp-2.4.1.pppoe4/pppd/sys-linux.c 2002-10-04 12:46:49.000000000 -0400 -@@ -114,6 +114,10 @@ - - #endif /* INET6 */ - -+#ifndef SIOCKILLADDR -+#define SIOCKILLADDR 0x8939 -+#endif -+ - /* We can get an EIO error on an ioctl if the modem has hung up */ - #define ok_error(num) ((num)==EIO) - -@@ -151,6 +155,7 @@ - static u_int32_t proxy_arp_addr; /* Addr for proxy arp entry added */ - static char proxy_arp_dev[16]; /* Device for proxy arp entry */ - static u_int32_t our_old_addr; /* for detecting address changes */ -+static u_int32_t our_current_addr; - static int dynaddr_set; /* 1 if ip_dynaddr set */ - static int looped; /* 1 if using loop */ - static int link_mtu; /* mtu for the link (not bundle) */ -@@ -504,6 +509,27 @@ - return -1; - } - -+static void do_killaddr(u_int32_t oldaddr) -+{ -+ struct ifreq ifr; -+ -+ memset(&ifr,0,sizeof ifr); -+ -+ SET_SA_FAMILY (ifr.ifr_addr, AF_INET); -+ SET_SA_FAMILY (ifr.ifr_dstaddr, AF_INET); -+ SET_SA_FAMILY (ifr.ifr_netmask, AF_INET); -+ -+ SIN_ADDR(ifr.ifr_addr) = oldaddr; -+ -+ strlcpy(ifr.ifr_name, ifname, sizeof (ifr.ifr_name)); -+ -+ if(ioctl(sock_fd,SIOCKILLADDR,&ifr) < 0) { -+ if (!ok_error (errno)) -+ error("ioctl(SIOCKILLADDR): %m(%d)", errno); -+ return; -+ } -+} -+ - /******************************************************************** - * - * tty_disestablish_ppp - Restore the serial port to normal operation. -@@ -2290,21 +2316,29 @@ - } - } - -- /* set ip_dynaddr in demand mode if address changes */ -- if (demand && tune_kernel && !dynaddr_set -- && our_old_addr && our_old_addr != our_adr) { -+ if(persist && our_old_addr && our_old_addr != our_adr) { -+ -+ if(killoldaddr) -+ do_killaddr(our_old_addr); -+ -+ -+ /* set ip_dynaddr in persist mode if address changes */ -+ if (tune_kernel && !dynaddr_set) { - /* set ip_dynaddr if possible */ - char *path; - int fd; - - path = path_to_procfs("/sys/net/ipv4/ip_dynaddr"); - if (path != 0 && (fd = open(path, O_WRONLY)) >= 0) { -- if (write(fd, "1", 1) != 1) -- error("Couldn't enable dynamic IP addressing: %m"); -- close(fd); -+ if (write(fd, "1", 1) != 1) -+ error("Couldn't enable dynamic IP addressing: %m"); -+ close(fd); - } - dynaddr_set = 1; /* only 1 attempt */ -+ } - } -+ -+ our_current_addr = our_adr; - our_old_addr = 0; - - return 1; -@@ -2360,7 +2394,8 @@ - } - - our_old_addr = our_adr; -- -+ our_current_addr = 0; -+ - return 1; - } - diff --git a/net-dialup/ppp/files/2.4.3/modules.ppp b/net-dialup/ppp/files/2.4.3/modules.ppp deleted file mode 100644 index 1f5ad7f9938d..000000000000 --- a/net-dialup/ppp/files/2.4.3/modules.ppp +++ /dev/null @@ -1,9 +0,0 @@ -alias char-major-108 ppp_generic -alias /dev/ppp ppp_generic -alias tty-ldisc-3 ppp_async -alias tty-ldisc-13 n_hdlc -alias tty-ldisc-14 ppp_synctty -alias ppp-compress-21 bsd_comp -alias ppp-compress-24 ppp_deflate -alias ppp-compress-26 ppp_deflate -alias net-pf-24 pppoe diff --git a/net-dialup/ppp/files/2.4.3/mpls.patch b/net-dialup/ppp/files/2.4.3/mpls.patch deleted file mode 100644 index b711ce328b72..000000000000 --- a/net-dialup/ppp/files/2.4.3/mpls.patch +++ /dev/null @@ -1,431 +0,0 @@ -diff -uarN ppp-2.4.2-orig/pppd/Makefile.linux ppp-2.4.2/pppd/Makefile.linux ---- ppp-2.4.2-orig/pppd/Makefile.linux 2003-01-31 06:11:17.000000000 -0500 -+++ ppp-2.4.2/pppd/Makefile.linux 2003-12-08 11:21:50.000000000 -0500 -@@ -12,16 +12,16 @@ - - PPPDSRCS = main.c magic.c fsm.c lcp.c ipcp.c upap.c chap-new.c md5.c ccp.c \ - ecp.c ipxcp.c auth.c options.c sys-linux.c md4.c chap_ms.c \ -- demand.c utils.c tty.c eap.c chap-md5.c -+ demand.c utils.c tty.c eap.c chap-md5.c mplscp.c - - HEADERS = ccp.h chap-new.h ecp.h fsm.h ipcp.h \ - ipxcp.h lcp.h magic.h md5.h patchlevel.h pathnames.h pppd.h \ -- upap.h eap.h -+ upap.h eap.h mplscp.h - - MANPAGES = pppd.8 - PPPDOBJS = main.o magic.o fsm.o lcp.o ipcp.o upap.o chap-new.o md5.o ccp.o \ - ecp.o auth.o options.o demand.o utils.o sys-linux.o ipxcp.o tty.o \ -- eap.o chap-md5.o -+ eap.o chap-md5.o mplscp.o - - # - # include dependencies if present -diff -uarN ppp-2.4.2-orig/pppd/main.c ppp-2.4.2/pppd/main.c ---- ppp-2.4.2-orig/pppd/main.c 2003-04-06 20:01:45.000000000 -0400 -+++ ppp-2.4.2/pppd/main.c 2003-12-08 11:20:42.000000000 -0500 -@@ -70,6 +70,9 @@ - #include "fsm.h" - #include "lcp.h" - #include "ipcp.h" -+ -+#include "mplscp.h" -+ - #ifdef INET6 - #include "ipv6cp.h" - #endif -@@ -246,6 +249,7 @@ - &cbcp_protent, - #endif - &ipcp_protent, -+ &mplscp_protent, - #ifdef INET6 - &ipv6cp_protent, - #endif -diff -uarN ppp-2.4.2-orig/pppd/mplscp.c ppp-2.4.2/pppd/mplscp.c ---- ppp-2.4.2-orig/pppd/mplscp.c 1969-12-31 19:00:00.000000000 -0500 -+++ ppp-2.4.2/pppd/mplscp.c 2003-12-08 11:20:44.000000000 -0500 -@@ -0,0 +1,371 @@ -+ -+/* MPLSCP - Serge.Krier@advalvas.be (C) 2001 */ -+ -+#include <stdio.h> -+#include <string.h> -+#include <netdb.h> -+#include <sys/param.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> -+ -+#include "pppd.h" -+#include "fsm.h" -+#include "mplscp.h" -+ -+ -+/* local vars */ -+/* static int mplscp_is_up; */ /* have called np_up() */ -+ -+/* -+ * Callbacks for fsm code. (CI = Configuration Information) -+ */ -+static void mplscp_resetci __P((fsm *)); /* Reset our CI */ -+static int mplscp_cilen __P((fsm *)); /* Return length of our CI */ -+static void mplscp_addci __P((fsm *, u_char *, int *)); /* Add our CI */ -+static int mplscp_ackci __P((fsm *, u_char *, int)); /* Peer ack'd our CI */ -+static int mplscp_nakci __P((fsm *, u_char *, int)); /* Peer nak'd our CI */ -+static int mplscp_rejci __P((fsm *, u_char *, int)); /* Peer rej'd our CI */ -+static int mplscp_reqci __P((fsm *, u_char *, int *, int)); /* Rcv CI */ -+static void mplscp_up __P((fsm *)); /* We're UP */ -+static void mplscp_down __P((fsm *)); /* We're DOWN */ -+static void mplscp_finished __P((fsm *)); /* Don't need lower layer */ -+ -+fsm mplscp_fsm[NUM_PPP]; /* MPLSCP fsm structure */ -+ -+static fsm_callbacks mplscp_callbacks = { /* MPLSCP callback routines */ -+ mplscp_resetci, /* Reset our Configuration Information */ -+ mplscp_cilen, /* Length of our Configuration Information */ -+ mplscp_addci, /* Add our Configuration Information */ -+ mplscp_ackci, /* ACK our Configuration Information */ -+ mplscp_nakci, /* NAK our Configuration Information */ -+ mplscp_rejci, /* Reject our Configuration Information */ -+ mplscp_reqci, /* Request peer's Configuration Information */ -+ mplscp_up, /* Called when fsm reaches OPENED state */ -+ mplscp_down, /* Called when fsm leaves OPENED state */ -+ NULL, /* Called when we want the lower layer up */ -+ mplscp_finished, /* Called when we want the lower layer down */ -+ NULL, /* Called when Protocol-Reject received */ -+ NULL, /* Retransmission is necessary */ -+ NULL, /* Called to handle protocol-specific codes */ -+ "MPLSCP" /* String name of protocol */ -+}; -+ -+static option_t mplscp_option_list[] = { -+ { "mpls", o_bool, &mplscp_protent.enabled_flag, -+ "Enable MPLSCP (and MPLS)", 1 }, -+ { NULL } }; -+ -+/* -+ * Protocol entry points from main code. -+ */ -+ -+static void mplscp_init __P((int)); -+static void mplscp_open __P((int)); -+static void mplscp_close __P((int, char *)); -+static void mplscp_lowerup __P((int)); -+static void mplscp_lowerdown __P((int)); -+static void mplscp_input __P((int, u_char *, int)); -+static void mplscp_protrej __P((int)); -+static int mplscp_printpkt __P((u_char *, int, -+ void (*) __P((void *, char *, ...)), void *)); -+ -+struct protent mplscp_protent = { -+ PPP_MPLSCP, -+ mplscp_init, -+ mplscp_input, -+ mplscp_protrej, -+ mplscp_lowerup, -+ mplscp_lowerdown, -+ mplscp_open, -+ mplscp_close, -+ mplscp_printpkt, -+ NULL, -+ 0, /* MPLS not enabled by default */ -+ "MPLSCP", -+ "MPLS", -+ mplscp_option_list, -+ NULL, -+ NULL, -+ NULL -+}; -+ -+/* -+ * mplscp_init - Initialize MPLSCP. -+ */ -+static void -+mplscp_init(int unit) { -+ -+ fsm *f = &mplscp_fsm[unit]; -+ -+ f->unit = unit; -+ f->protocol = PPP_MPLSCP; -+ f->callbacks = &mplscp_callbacks; -+ fsm_init(&mplscp_fsm[unit]); -+ -+} -+ -+/* -+ * mplscp_open - MPLSCP is allowed to come up. -+ */ -+static void -+mplscp_open(int unit) { -+ -+ fsm_open(&mplscp_fsm[unit]); -+ -+} -+ -+/* -+ * mplscp_close - Take MPLSCP down. -+ */ -+static void -+mplscp_close(int unit, char *reason) { -+ -+ fsm_close(&mplscp_fsm[unit], reason); -+ -+} -+ -+/* -+ * mplscp_lowerup - The lower layer is up. -+ */ -+static void -+mplscp_lowerup(int unit) { -+ -+ fsm_lowerup(&mplscp_fsm[unit]); -+} -+ -+/* -+ * mplscp_lowerdown - The lower layer is down. -+ */ -+static void -+mplscp_lowerdown(int unit) { -+ -+ fsm_lowerdown(&mplscp_fsm[unit]); -+} -+ -+/* -+ * mplscp_input - Input MPLSCP packet. -+ */ -+static void -+mplscp_input(int unit, u_char *p, int len) { -+ -+ fsm_input(&mplscp_fsm[unit], p, len); -+} -+ -+/* -+ * mplscp_protrej - A Protocol-Reject was received for MPLSCP. -+ * Pretend the lower layer went down, so we shut up. -+ */ -+static void -+mplscp_protrej(int unit) { -+ -+ fsm_lowerdown(&mplscp_fsm[unit]); -+} -+ -+/* -+ * mplscp_resetci - Reset our CI. -+ * Called by fsm_sconfreq, Send Configure Request. -+ */ -+static void -+mplscp_resetci(fsm *f) { -+ -+ return; -+} -+ -+/* -+ * mplscp_cilen - Return length of our CI. -+ * Called by fsm_sconfreq, Send Configure Request. -+ */ -+static int -+mplscp_cilen(fsm *f) { -+ -+ return 0; -+} -+ -+/* -+ * mplscp_addci - Add our desired CIs to a packet. -+ * Called by fsm_sconfreq, Send Configure Request. -+ */ -+static void -+mplscp_addci(fsm *f, u_char *ucp, int *lenp) { -+ -+} -+ -+/* -+ * ipcp_ackci - Ack our CIs. -+ * Called by fsm_rconfack, Receive Configure ACK. -+ * -+ * Returns: -+ * 0 - Ack was bad. -+ * 1 - Ack was good. -+ */ -+static int -+mplscp_ackci(fsm *f, u_char *p, int len) { -+ -+ return 1; -+ -+} -+ -+/* -+ * mplscp_nakci - Peer has sent a NAK for some of our CIs. -+ * This should not modify any state if the Nak is bad -+ * or if MPLSCP is in the OPENED state. -+ * Calback from fsm_rconfnakrej - Receive Configure-Nak or Configure-Reject. -+ * -+ * Returns: -+ * 0 - Nak was bad. -+ * 1 - Nak was good. -+ */ -+static int -+mplscp_nakci(fsm *f, u_char *p, int len) { -+ -+ return 1; -+} -+ -+/* -+ * MPLSVP_rejci - Reject some of our CIs. -+ * Callback from fsm_rconfnakrej. -+ */ -+static int -+mplscp_rejci(fsm *f, u_char *p, int len) { -+ -+ return 1; -+ -+} -+ -+/* -+ * mplscp_reqci - Check the peer's requested CIs and send appropriate response. -+ * Callback from fsm_rconfreq, Receive Configure Request -+ * -+ * Returns: CONFACK, CONFNAK or CONFREJ and input packet modified -+ * appropriately. If reject_if_disagree is non-zero, doesn't return -+ * CONFNAK; returns CONFREJ if it can't return CONFACK. -+ */ -+static int -+mplscp_reqci(fsm *f, u_char *inp, int *len, int reject_if_disagree) { -+ -+ -+ int rc = CONFACK; /* Final packet return code */ -+ -+ PUTCHAR(CONFACK,inp); -+ -+ return rc; -+ -+} -+ -+static void -+mplscp_up(fsm *f) { -+ -+ sifnpmode(f->unit, PPP_MPLS_UC, NPMODE_PASS); -+ /* sifnpmode(f->unit, PPP_MPLS_MC, NPMODE_PASS);*/ -+ -+ np_up(f->unit, PPP_MPLS_UC); -+ /* np_up(f->unit, PPP_MPLS_MC);*/ -+ /* ipcp_is_up = 1;*/ -+ -+ -+#if 1 -+ printf("MPLSCP is OPENED\n"); -+#endif -+ -+} -+ -+static void -+mplscp_down(fsm *f) { -+ -+ sifnpmode(f->unit, PPP_MPLS_UC, NPMODE_DROP); -+ /* sifnpmode(f->unit, PPP_MPLS_MC, NPMODE_DROP);*/ -+ -+ sifdown(f->unit); -+ -+#if 1 -+ printf("MPLSCP is CLOSED\n"); -+#endif -+ -+ -+} -+ -+static void -+mplscp_finished(fsm *f) { -+ -+ np_finished(f->unit, PPP_MPLS_UC); -+ /* np_finished(f->unit, PPP_MPLS_MC);*/ -+ -+} -+ -+/* -+ * mpls_printpkt - print the contents of an MPLSCP packet. -+ */ -+static char *mplscp_codenames[] = { -+ "ConfReq", "ConfAck", "ConfNak", "ConfRej", -+ "TermReq", "TermAck", "CodeRej" -+}; -+ -+static int -+mplscp_printpkt(u_char *p, int plen, -+ void (*printer) __P((void *, char *, ...)), -+ void *arg) { -+ -+ int code, id, len, olen; -+ u_char *pstart, *optend; -+ -+ if (plen < HEADERLEN) -+ return 0; -+ pstart = p; -+ GETCHAR(code, p); -+ GETCHAR(id, p); -+ GETSHORT(len, p); -+ if (len < HEADERLEN || len > plen) -+ return 0; -+ -+ if (code >= 1 && code <= sizeof(mplscp_codenames) / sizeof(char *)) -+ printer(arg, " %s", mplscp_codenames[code-1]); -+ else -+ printer(arg, " code=0x%x", code); -+ printer(arg, " id=0x%x", id); -+ len -= HEADERLEN; -+ switch (code) { -+ case CONFREQ: -+ case CONFACK: -+ case CONFNAK: -+ case CONFREJ: -+ /* print option list */ -+ while (len >= 2) { -+ GETCHAR(code, p); -+ GETCHAR(olen, p); -+ p -= 2; -+ if (olen < 2 || olen > len) { -+ break; -+ } -+ printer(arg, " <"); -+ len -= olen; -+ optend = p + olen; -+ while (p < optend) { -+ GETCHAR(code, p); -+ printer(arg, " %.2x", code); -+ } -+ printer(arg, ">"); -+ } -+ break; -+ -+ case TERMACK: -+ case TERMREQ: -+ if (len > 0 && *p >= ' ' && *p < 0x7f) { -+ printer(arg, " "); -+ print_string((char *)p, len, printer, arg); -+ p += len; -+ len = 0; -+ } -+ break; -+ } -+ -+ /* print the rest of the bytes in the packet */ -+ for (; len > 0; --len) { -+ GETCHAR(code, p); -+ printer(arg, " %.2x", code); -+ } -+ -+ return p - pstart; -+ -+} -diff -uarN ppp-2.4.2-orig/pppd/mplscp.h ppp-2.4.2/pppd/mplscp.h ---- ppp-2.4.2-orig/pppd/mplscp.h 1969-12-31 19:00:00.000000000 -0500 -+++ ppp-2.4.2/pppd/mplscp.h 2003-12-08 11:20:44.000000000 -0500 -@@ -0,0 +1,8 @@ -+ -+/* MPLSCP - Serge.Krier@advalvas.be (C) 2001 */ -+ -+#define PPP_MPLSCP 0x8281 -+#define PPP_MPLS_UC 0x0281 -+#define PPP_MPLS_MC 0x0283 -+ -+extern struct protent mplscp_protent; diff --git a/net-dialup/ppp/files/2.4.3/options-pppoe b/net-dialup/ppp/files/2.4.3/options-pppoe deleted file mode 100644 index 5988ee2d668a..000000000000 --- a/net-dialup/ppp/files/2.4.3/options-pppoe +++ /dev/null @@ -1,6 +0,0 @@ -noipdefault -hide-password -defaultroute -persist -lock - diff --git a/net-dialup/ppp/files/2.4.3/options-pptp b/net-dialup/ppp/files/2.4.3/options-pptp deleted file mode 100644 index af5749aac37c..000000000000 --- a/net-dialup/ppp/files/2.4.3/options-pptp +++ /dev/null @@ -1,18 +0,0 @@ -#192.168.1.0: -netmask 255.255.255.0 -#debug -#kdebug 1 -lock -mtu 1490 -mru 1490 -proxyarp -auth -require-chap -passive -ipcp-accept-local -ipcp-accept-remote -lcp-echo-failure 3 -lcp-echo-interval 5 -deflate 0 -#ms-dns 192.168.1.1 -#ms-wins 192.168.1.1 diff --git a/net-dialup/ppp/files/2.4.3/ppp_flags.patch b/net-dialup/ppp/files/2.4.3/ppp_flags.patch deleted file mode 100644 index bd41e2d71376..000000000000 --- a/net-dialup/ppp/files/2.4.3/ppp_flags.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -Nuar ppp-2.4.3_old/chat/Makefile.linux ppp-2.4.3/chat/Makefile.linux ---- ppp-2.4.3_old/chat/Makefile.linux 2004-11-03 12:51:47.000000000 +0100 -+++ ppp-2.4.3/chat/Makefile.linux 2004-11-24 00:01:06.606425768 +0100 -@@ -10,7 +10,6 @@ - CDEF4= -DFNDELAY=O_NDELAY # Old name value - CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4) - --COPTS= -O2 -g -pipe - CFLAGS= $(COPTS) $(CDEFS) - - INSTALL= install -diff -Nuar ppp-2.4.3_old/pppd/Makefile.linux ppp-2.4.3/pppd/Makefile.linux ---- ppp-2.4.3_old/pppd/Makefile.linux 2004-11-24 00:00:00.255512640 +0100 -+++ ppp-2.4.3/pppd/Makefile.linux 2004-11-24 00:01:07.017363296 +0100 -@@ -32,7 +32,7 @@ - - # CC = gcc - # --COPTS = -O2 -pipe -Wall -g -+COPTS+= -Wall - LIBS = - - # Uncomment the next 2 lines to include support for Microsoft's -diff -Nuar ppp-2.4.3_old/pppd/plugins/Makefile.linux ppp-2.4.3/pppd/plugins/Makefile.linux ---- ppp-2.4.3_old/pppd/plugins/Makefile.linux 2004-11-14 08:57:35.000000000 +0100 -+++ ppp-2.4.3/pppd/plugins/Makefile.linux 2004-11-24 00:01:06.618423944 +0100 -@@ -1,5 +1,4 @@ - CC = gcc --COPTS = -O2 -g - CFLAGS = $(COPTS) -I.. -I../../include -fPIC - LDFLAGS = -shared - INSTALL = install -diff -Nuar ppp-2.4.3_old/pppd/plugins/pppoatm/Makefile.linux ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux ---- ppp-2.4.3_old/pppd/plugins/pppoatm/Makefile.linux 2004-11-14 02:12:10.000000000 +0100 -+++ ppp-2.4.3/pppd/plugins/pppoatm/Makefile.linux 2004-11-24 00:01:06.961371808 +0100 -@@ -1,5 +1,4 @@ - CC = gcc --COPTS = -O2 -g - CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC - LDFLAGS = -shared - INSTALL = install -@@ -33,7 +32,7 @@ - all: $(PLUGIN) - - $(PLUGIN): $(PLUGIN_OBJS) -- $(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS) -+ $(CC) $(LDFLAGS) $(CFLAGS) -o $@ -shared $^ $(LIBS) - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -diff -Nuar ppp-2.4.3_old/pppd/plugins/radius/Makefile.linux ppp-2.4.3/pppd/plugins/radius/Makefile.linux ---- ppp-2.4.3_old/pppd/plugins/radius/Makefile.linux 2004-11-14 08:02:31.000000000 +0100 -+++ ppp-2.4.3/pppd/plugins/radius/Makefile.linux 2004-11-24 00:01:06.623423184 +0100 -@@ -12,7 +12,7 @@ - INSTALL = install - - PLUGIN=radius.so radattr.so radrealms.so --CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON -+CFLAGS=$(COPTS) -I. -I../.. -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON - - # Uncomment the next line to include support for Microsoft's - # MS-CHAP authentication protocol. -diff -Nuar ppp-2.4.3_old/pppd/plugins/rp-pppoe/Makefile.linux ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux ---- ppp-2.4.3_old/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-14 08:58:37.000000000 +0100 -+++ ppp-2.4.3/pppd/plugins/rp-pppoe/Makefile.linux 2004-11-24 00:01:06.963371504 +0100 -@@ -24,7 +24,6 @@ - # Version is set ONLY IN THE MAKEFILE! Don't delete this! - VERSION=3.3 - --COPTS=-O2 -g - CFLAGS=$(COPTS) -I../../../include/linux - all: rp-pppoe.so pppoe-discovery - -@@ -35,7 +34,7 @@ - $(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c - - rp-pppoe.so: libplugin.a plugin.o -- $(CC) -o rp-pppoe.so -shared plugin.o libplugin.a -+ $(CC) $(LDFLAGS) -o rp-pppoe.so -shared plugin.o libplugin.a - - install: all - $(INSTALL) -d -m 755 $(LIBDIR) -diff -Nuar ppp-2.4.3_old/pppdump/Makefile.linux ppp-2.4.3/pppdump/Makefile.linux ---- ppp-2.4.3_old/pppdump/Makefile.linux 2004-10-31 02:36:52.000000000 +0200 -+++ ppp-2.4.3/pppdump/Makefile.linux 2004-11-24 00:05:01.100777208 +0100 -@@ -2,7 +2,7 @@ - BINDIR = $(DESTDIR)/sbin - MANDIR = $(DESTDIR)/share/man/man8 - --CFLAGS= -O -I../include/net -+CFLAGS=$(COPTS) -I../include/net - OBJS = pppdump.o bsd-comp.o deflate.o zlib.o - - INSTALL= install -@@ -10,7 +10,7 @@ - all: pppdump - - pppdump: $(OBJS) -- $(CC) -o pppdump $(OBJS) -+ $(CC) $(LDFLAGS) -o pppdump $(OBJS) - - clean: - rm -f pppdump $(OBJS) *~ -diff -Nuar ppp-2.4.3_old/pppstats/Makefile.linux ppp-2.4.3/pppstats/Makefile.linux ---- ppp-2.4.3_old/pppstats/Makefile.linux 2004-10-31 23:09:03.000000000 +0100 -+++ ppp-2.4.3/pppstats/Makefile.linux 2004-11-24 00:04:01.848784880 +0100 -@@ -10,7 +10,6 @@ - PPPSTATOBJS = pppstats.o - - #CC = gcc --COPTS = -O - COMPILE_FLAGS = -I../include - LIBS = - -@@ -26,7 +25,7 @@ - $(INSTALL) -c -m 444 pppstats.8 $(MANDIR) - - pppstats: $(PPPSTATSRCS) -- $(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS) - - clean: - rm -f pppstats *~ #* core diff --git a/net-dialup/ppp/files/2.4.3/pppoe.html b/net-dialup/ppp/files/2.4.3/pppoe.html deleted file mode 100644 index 512dc78329a1..000000000000 --- a/net-dialup/ppp/files/2.4.3/pppoe.html +++ /dev/null @@ -1,174 +0,0 @@ -<!DOCTYPE html PUBLIC "-//w3c//dtd html 4.0 transitional//en"> -<html> -<head> - - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> - - <meta name="GENERATOR" content="Mozilla/4.75 [en] (X11; U; Linux 2.2.16-22 i686) [Netscape]"> - <title>Index of /~mostrows</title> -</head> - <body text="#000000" bgcolor="#ffffff" link="#0000ef" vlink="#51188e" alink="#ff0000"> - <b><font face="Arial,Helvetica"><font size="+4">PPPoE for Linux 2.4</font></font></b> - -<p><font size="+0">This is a driver for PPPoE for Linux 2.4.</font> </p> - -<p><font size="+0">This driver is for 2.4 kernels only. For a driver - for 2.2 kernels, the <a href="http://www.roaringpenguin.com">Roaring Penguin</a><br> - package is recommended.<br> - </font></p> - -<p>The software on this page is currently required if you wish to use kernel-mode<br> - PPPoE with Roaring Penguin (see the Roaring Penguin documentation for details),<br> - though this functionality is currently recommended for experts only.<br> - </p> - -<p><font size="+0">Files:</font> </p> - -<p><font size="+0"> <a href="ppp-2.4.1-pppoe.patch4"> - ppp-2.4.1-pppoe.patch4</a> Patch for ppp-2.4.1</font><br> - <font size="+0"> <a href="ppp-2.4.1-pppoe4.tgz"> - ppp-2.4.1-pppoe4.tgz</a> Source of ppp-2.4.1 with patches applied. -</font> <br> - <font size="+0"> <a href="ppp-cvs.pppoe1.tgz"> - ppp-cvs.pppoe1.tgz</a> Source of ppp CVS repository with patches applied. -</font> <br> - </p> - -<p><b><font size="+0">Installation & Usage:</font></b> </p> - -<p><font size="+0">1. Configure, compile and install a 2.4 kernel.</font> - <br> - <font size="+0"><br> - Make sure to enable PPP over Ethernet in the kernel -configuration, as</font> <br> - <font size="+0"> well as as the "Packet Socket" -option. You must also enable support</font> <br> - <font size="+0"> for experimental drivers.</font></p> - -<p><font size="+0"> If you are compiling as a module, -add the line "alias net-pf-24 pppoe" to<br> - /etc/modules.conf.</font></p> - -<p><font size="+0"> Make sure that the /dev/ppp device -exists: "mknod /dev/ppp c 108 0"<br> - </font> </p> - -<p><font size="+0">2. Configure, compile and install the modified pppd -package.</font> <br> - <font size="+0"> Links to the patch, or the complete - patched source are available above.</font> </p> - -<p><font size="+0">3. Include the following line in your ppp options - file:</font> </p> - -<p><font size="+0"> plugin pppoe</font> </p> - -<p><font size="+0"> If you experience problems, try replacing - the "pppoe" with the</font> <br> - <font size="+0"> full path and file name of the "pppoe.so" - file that is installed</font> <br> - <font size="+0"> by the pppd installation.</font> </p> - -<p><font size="+0"> Following these two lines should be - your other ppp options. My</font> <br> - <font size="+0"> options file includes only one other -line; a "name" statement for</font> <br> - <font size="+0"> PAP.</font> </p> - -<p><font size="+0">4. Invoke pppd (e.g.: "pppd eth0"). Before - doing this, make sure the ethernet</font> <br> - <font size="+0"> device is up ("ifconfig eth0 up" - has been executed).</font> <br> - <font size="+0"></font> <br> - </p> - -<p><b><font size="+0">Other Stuff:</font></b> </p> - -<p><font size="+0">1. You can restrict pppd to connect to specific access-concentrators</font> - <br> - <font size="+0"> or specific services by addin "pppoe_ac_name" - and "pppoe_srv_name"</font> <br> - <font size="+0"> options (respectively) to your options - file. Each of these options is</font> <br> - <font size="+0"> followed by a string specifying the -conecntrator or service name that</font> <br> - <font size="+0"> is to be matched. Most people should -not need this.</font> <br> - </p> - -<p><font size="+0">2. Here's how I've configured things to get a server - working:</font> </p> - -<p><font size="+0"> client's /etc/ppp/options:</font> </p> - -<p><font size="+0"> plugin /usr/lib/pppd/plugins/pppoe.so</font> - <br> - <font size="+0"> name papname</font> - </p> - -<p><font size="+0"> client's /etc/ppp/pap-secrets:</font> - </p> - -<p><font size="+0"> papname * papsecret</font> - </p> - -<p><font size="+0"> server's /etc/ppp/options:</font> </p> - -<p><font size="+0"> plugin /usr/lib/pppd/plugins/pppoe.so</font> - <br> - <font size="+0"> pppoe_server</font> - <br> - <font size="+0"> +pap</font> -<br> - <font size="+0"> 10.10.10.1:</font> - </p> - -<p><font size="+0"> server's /etc/ppp/pap-secrets:</font> - </p> - -<p><font size="+0"> papname * papsecret - 10.10.10.0/24+ !10.10.10.1</font> <br> - </p> - -<p><font size="+0"> On both the client and the server, pppd -is invoked as "pppd eth0".</font> <br> - <font size="+0"> With this setup you will have to invoke - a new pppd on the server for</font> <br> - <font size="+0"> each session.</font> </p> - -<p><font size="+0"> The patched pppd also builds a new pppoed -which can be used to create</font> <br> - <font size="+0"> a PPPoE server capable of serving multiple - clients. To use this ,</font> <br> - <font size="+0"> remove the "pppoe_server" line from -the server's /etc/ppp/options</font> <br> - <font size="+0"> file. Invoke pppoed as: "pppoed --S -I eth0 -A ac_name -S srv_name".</font> <br> - <font size="+0"> pppoed will now create a new pppd process - for each incoming connection.</font> <br> - <font size="+0"> Note: this is still rather flaky, use - with caution If pppoed seems to jam,</font> <br> - <font size="+0"> restarting it will not affect existing - connections.</font> <br> - </p> - -<p>3. If you're trying to run masquerading over your PPPoE link, check - out <a href="http://www.hgfelger.de/mss/mss.html">this</a> <br> - page for instructions on how to ensure that path - MTU's are properly <br> - reported across your network. Without - this your masquerading will <br> - not work. </p> - -<p> <a href="http://www.hgfelger.de/mss/mss.html"> - http://www.hgfelger.de/mss/mss.html</a> <br> - </p> - -<p><font size="+0">Michal Ostrowski</font> <br> - <font size="+0"><a href="mailto:mostrows@styx.uwaterloo.ca">mostrows@styx.uwaterloo.ca</a></font> - <br> - <br> - </p> - -</body> -</html> diff --git a/net-dialup/ppp/files/2.4.2/README.mpls b/net-dialup/ppp/files/README.mpls index 1ae7ae46057a..1ae7ae46057a 100644 --- a/net-dialup/ppp/files/2.4.2/README.mpls +++ b/net-dialup/ppp/files/README.mpls diff --git a/net-dialup/ppp/files/digest-ppp-2.4.1-r14 b/net-dialup/ppp/files/digest-ppp-2.4.1-r14 deleted file mode 100644 index b3c7b1676065..000000000000 --- a/net-dialup/ppp/files/digest-ppp-2.4.1-r14 +++ /dev/null @@ -1 +0,0 @@ -MD5 7f655448fbb6bebcede7a515fbcd481e ppp-2.4.1-pppoe4.tgz 556218 diff --git a/net-dialup/ppp/files/digest-ppp-2.4.2-r10 b/net-dialup/ppp/files/digest-ppp-2.4.2-r10 index 47080cb9dbd6..1f2afa2ee484 100644 --- a/net-dialup/ppp/files/digest-ppp-2.4.2-r10 +++ b/net-dialup/ppp/files/digest-ppp-2.4.2-r10 @@ -1,3 +1,4 @@ MD5 362bcf218fba8afbb9afbee7471e5dac ppp-2.4.2.tar.gz 774441 +MD5 760e970cad38d42766c72341f175604d ppp-2.4.2-patches-20050514.tar.gz 11707 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/files/digest-ppp-2.4.3 b/net-dialup/ppp/files/digest-ppp-2.4.3 deleted file mode 100644 index 9382fda204af..000000000000 --- a/net-dialup/ppp/files/digest-ppp-2.4.3 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092 -MD5 8453a29338cb96dd0c0dda35d3e872a4 ppp-2.4.3-mppe-mppc-1.1.patch.gz 11441 -MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497 diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r1 b/net-dialup/ppp/files/digest-ppp-2.4.3-r1 deleted file mode 100644 index 9382fda204af..000000000000 --- a/net-dialup/ppp/files/digest-ppp-2.4.3-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092 -MD5 8453a29338cb96dd0c0dda35d3e872a4 ppp-2.4.3-mppe-mppc-1.1.patch.gz 11441 -MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497 diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r2 b/net-dialup/ppp/files/digest-ppp-2.4.3-r2 deleted file mode 100644 index e7d9836f4ec4..000000000000 --- a/net-dialup/ppp/files/digest-ppp-2.4.3-r2 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092 -MD5 bb955eb708731473a0e609b14932ea09 ppp-2.4.3-patches-20050505.tar.gz 26751 -MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497 diff --git a/net-dialup/ppp/files/digest-ppp-2.4.3-r3 b/net-dialup/ppp/files/digest-ppp-2.4.3-r3 index e7d9836f4ec4..7e13042c0ec3 100644 --- a/net-dialup/ppp/files/digest-ppp-2.4.3-r3 +++ b/net-dialup/ppp/files/digest-ppp-2.4.3-r3 @@ -1,3 +1,3 @@ MD5 848f6c3cafeb6074ffeb293c3af79b7c ppp-2.4.3.tar.gz 688092 -MD5 bb955eb708731473a0e609b14932ea09 ppp-2.4.3-patches-20050505.tar.gz 26751 +MD5 2d414249802b9791117666a8a7b01370 ppp-2.4.3-patches-20050514.tar.gz 28072 MD5 9d2f3febf510c5b0cbb4dacba713a217 ppp-dhcpc.tgz 33497 diff --git a/net-dialup/ppp/files/gcc3.3-multiline.patch b/net-dialup/ppp/files/gcc3.3-multiline.patch deleted file mode 100644 index 47e08a2b0024..000000000000 --- a/net-dialup/ppp/files/gcc3.3-multiline.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ruN ppp-2.4.1.pppoe4.orig/pppd/plugins/pppoe/pppoe.c ppp-2.4.1.pppoe4/pppd/plugins/pppoe/pppoe.c ---- ppp-2.4.1.pppoe4.orig/pppd/plugins/pppoe/pppoe.c 2001-08-06 14:35:21.000000000 +0200 -+++ ppp-2.4.1.pppoe4/pppd/plugins/pppoe/pppoe.c 2003-05-25 23:43:42.000000000 +0200 -@@ -197,8 +197,8 @@ - - if (pppoe_srv_name !=NULL) { - if (strlen (pppoe_srv_name) > 255) { -- poe_error (ses," Service name too long -- (maximum allowed 256 chars)"); -+ poe_error (ses," Service name too long " -+ "(maximum allowed 256 chars)"); - poe_die(-1); - } - ses->filt->stag = make_filter_tag(PTT_SRV_NAME, -diff -ruN ppp-2.4.1.pppoe4.orig/pppd/plugins/pppoe/pppoed.c ppp-2.4.1.pppoe4/pppd/plugins/pppoe/pppoed.c ---- ppp-2.4.1.pppoe4.orig/pppd/plugins/pppoe/pppoed.c 2000-08-06 17:39:28.000000000 +0200 -+++ ppp-2.4.1.pppoe4/pppd/plugins/pppoe/pppoed.c 2003-05-25 23:51:02.000000000 +0200 -@@ -168,8 +168,8 @@ - case 'A': /* AC override */ - poe_info (sess,"AC name override to %s", optarg); - if (strlen (optarg) > 255) { -- poe_error (sess," AC name too long -- (maximum allowed 256 chars)"); -+ poe_error (sess," AC name too long" -+ "(maximum allowed 256 chars)"); - poe_die(-1); - } - if ((sess->filt->ntag= malloc (sizeof (struct pppoe_tag) + -@@ -186,8 +186,8 @@ - case 'E': /* AC service name override */ - poe_info (sess,"AC service name override to %s", optarg); - if (strlen (optarg) > 255) { -- poe_error (sess," Service name too long -- (maximum allowed 256 chars)"); -+ poe_error (sess," Service name too long" -+ "(maximum allowed 256 chars)"); - poe_die(-1); - } - diff --git a/net-dialup/ppp/files/gcc33-amd64.patch b/net-dialup/ppp/files/gcc33-amd64.patch deleted file mode 100644 index 1daa9fc433a5..000000000000 --- a/net-dialup/ppp/files/gcc33-amd64.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- pppd/utils.c.orig 2003-07-01 17:13:31.000000000 +0000 -+++ pppd/utils.c 2003-07-01 17:14:09.000000000 +0000 -@@ -253,11 +253,11 @@ - break; - case 'r': - f = va_arg(args, char *); --#ifndef __powerpc__ -- n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list)); --#else -+#if defined(__powerpc__) || defined(__x86_64__) - /* On the powerpc, a va_list is an array of 1 structure */ - n = vslprintf(buf, buflen + 1, f, va_arg(args, void *)); -+#else -+ n = vslprintf(buf, buflen + 1, f, va_arg(args, va_list)); - #endif - buf += n; - buflen -= n; ---- pppd/plugins/pppoe/utils.c.orig 2000-08-06 15:39:28.000000000 +0000 -+++ pppd/plugins/pppoe/utils.c 2003-07-01 17:13:20.000000000 +0000 -@@ -182,11 +182,11 @@ - continue; - case 'r': - f = va_arg (args, char *); --#ifndef __powerpc__ -- n = vpoe_slprintf (buf, buflen + 1, f, va_arg (args, va_list)); --#else -+#if defined(__powerpc__) || defined(__x86_64__) - /* On the powerpc, a va_list is an array of 1 structure */ - n = vpoe_slprintf (buf, buflen + 1, f, va_arg (args, void *)); -+#else -+ n = vpoe_slprintf (buf, buflen + 1, f, va_arg (args, va_list)); - #endif - buf += n; - buflen -= n; diff --git a/net-dialup/ppp/files/2.4.2/options-pppoe b/net-dialup/ppp/files/options-pppoe index 5988ee2d668a..5988ee2d668a 100644 --- a/net-dialup/ppp/files/2.4.2/options-pppoe +++ b/net-dialup/ppp/files/options-pppoe diff --git a/net-dialup/ppp/files/2.4.2/options-pptp b/net-dialup/ppp/files/options-pptp index af5749aac37c..af5749aac37c 100644 --- a/net-dialup/ppp/files/2.4.2/options-pptp +++ b/net-dialup/ppp/files/options-pptp diff --git a/net-dialup/ppp/files/ppp-sys_error_to_strerror.patch b/net-dialup/ppp/files/ppp-sys_error_to_strerror.patch deleted file mode 100644 index 12cc7d4508a1..000000000000 --- a/net-dialup/ppp/files/ppp-sys_error_to_strerror.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -uNr ppp-2.4.2.old/pppd/plugins/dhcp/dhcpc.c ppp-2.4.2/pppd/plugins/dhcp/dhcpc.c ---- ppp-2.4.2.old/pppd/plugins/dhcp/dhcpc.c 2002-09-30 10:27:08 +0000 -+++ ppp-2.4.2/pppd/plugins/dhcp/dhcpc.c 2005-01-22 03:58:47 +0000 -@@ -144,7 +144,7 @@ - fd = raw_socket(client_config.ifindex); - - if (listen_mode != LISTEN_NONE && fd < 0) { -- fatal("DHCPC: couldn't listen on socket, %s", sys_errlist[errno]); -+ fatal("DHCPC: couldn't listen on socket, %s", strerror(errno)); - } - - } -@@ -208,7 +208,7 @@ - len = get_packet(&packet, fd); - - if (len == -1 && errno != EINTR) { -- dbglog("DHCPC: error on read, %s, reopening socket", sys_errlist[errno]); -+ dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno)); - change_mode(LISTEN_KERNEL); - } - if (len < 0) continue; -@@ -380,7 +380,7 @@ - else len = get_raw_packet(&packet, fd); - - if (len == -1 && errno != EINTR) { -- dbglog("DHCPC: error on read, %s, reopening socket", sys_errlist[errno]); -+ dbglog("DHCPC: error on read, %s, reopening socket", strerror(errno)); - change_mode(listen_mode); /* just close and reopen */ - } - if (len < 0) continue; -@@ -445,7 +445,7 @@ - - } else { - /* An error occured */ -- dbglog("DHCPC: error on select, %s, reopening socket", sys_errlist[errno]); -+ dbglog("DHCPC: error on select, %s, reopening socket", strerror(errno)); - change_mode(listen_mode); /* just close and reopen */ - } - -diff -uNr ppp-2.4.2.old/pppd/plugins/dhcp/packet.c ppp-2.4.2/pppd/plugins/dhcp/packet.c ---- ppp-2.4.2.old/pppd/plugins/dhcp/packet.c 2002-08-27 11:58:49 +0000 -+++ ppp-2.4.2/pppd/plugins/dhcp/packet.c 2005-01-22 03:58:47 +0000 -@@ -125,7 +125,7 @@ - return kernel_packet(payload,payload->giaddr,CLIENT_PORT,dest_ip,dest_port); - - if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) { -- DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]); -+ DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno)); - return -1; - } - -@@ -138,7 +138,7 @@ - dest.sll_halen = 6; - memcpy(dest.sll_addr, dest_arp, 6); - if (bind(fd, (struct sockaddr *)&dest, sizeof(struct sockaddr_ll)) < 0) { -- DEBUG(LOG_ERR, "bind call failed: %s", sys_errlist[errno]); -+ DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno)); - close(fd); - return -1; - } -@@ -161,7 +161,7 @@ - - result = sendto(fd, &packet, sizeof(struct udp_dhcp_packet), 0, (struct sockaddr *) &dest, sizeof(dest)); - if (result <= 0) { -- DEBUG(LOG_ERR, "write on socket failed: %s", sys_errlist[errno]); -+ DEBUG(LOG_ERR, "write on socket failed: %s", strerror(errno)); - } - close(fd); - return result; -diff -uNr ppp-2.4.2.old/pppd/plugins/dhcp/socket.c ppp-2.4.2/pppd/plugins/dhcp/socket.c ---- ppp-2.4.2.old/pppd/plugins/dhcp/socket.c 2002-08-31 11:23:38 +0000 -+++ ppp-2.4.2/pppd/plugins/dhcp/socket.c 2005-01-22 03:58:47 +0000 -@@ -60,7 +60,7 @@ - *addr = sin->sin_addr.s_addr; - DEBUG(LOG_INFO, "%s (our ip) = %s", ifr.ifr_name, inet_ntoa(sin->sin_addr)); - } else { -- LOG(LOG_ERR, "SIOCGIFADDR failed!: %s", sys_errlist[errno]); -+ LOG(LOG_ERR, "SIOCGIFADDR failed!: %s", strerror(errno)); - return -1; - } - } -@@ -69,7 +69,7 @@ - DEBUG(LOG_INFO, "adapter index %d", ifr.ifr_ifindex); - *ifindex = ifr.ifr_ifindex; - } else { -- LOG(LOG_ERR, "SIOCGIFINDEX failed!: %s", sys_errlist[errno]); -+ LOG(LOG_ERR, "SIOCGIFINDEX failed!: %s", strerror(errno)); - return -1; - } - if (ioctl(fd, SIOCGIFHWADDR, &ifr) == 0) { -@@ -77,11 +77,11 @@ - DEBUG(LOG_INFO, "adapter hardware address %02x:%02x:%02x:%02x:%02x:%02x", - arp[0], arp[1], arp[2], arp[3], arp[4], arp[5]); - } else { -- LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %s", sys_errlist[errno]); -+ LOG(LOG_ERR, "SIOCGIFHWADDR failed!: %s", strerror(errno)); - return -1; - } - } else { -- LOG(LOG_ERR, "socket failed!: %s", sys_errlist[errno]); -+ LOG(LOG_ERR, "socket failed!: %s", strerror(errno)); - return -1; - } - close(fd); -@@ -98,7 +98,7 @@ - - DEBUG(LOG_INFO, "Opening listen socket on 0x%08x:%d %s\n", ip, port, inf ? inf : "*"); - if ((fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0) { -- DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]); -+ DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno)); - return -1; - } - -@@ -144,7 +144,7 @@ - - DEBUG(LOG_INFO, "Opening raw socket on ifindex %d\n", ifindex); - if ((fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP))) < 0) { -- DEBUG(LOG_ERR, "socket call failed: %s", sys_errlist[errno]); -+ DEBUG(LOG_ERR, "socket call failed: %s", strerror(errno)); - return -1; - } - -@@ -152,7 +152,7 @@ - sock.sll_protocol = htons(ETH_P_IP); - sock.sll_ifindex = ifindex; - if (bind(fd, (struct sockaddr *) &sock, sizeof(sock)) < 0) { -- DEBUG(LOG_ERR, "bind call failed: %s", sys_errlist[errno]); -+ DEBUG(LOG_ERR, "bind call failed: %s", strerror(errno)); - close(fd); - return -1; - } diff --git a/net-dialup/ppp/ppp-2.4.1-r14.ebuild b/net-dialup/ppp/ppp-2.4.1-r14.ebuild deleted file mode 100644 index 7d40aa2a4bf3..000000000000 --- a/net-dialup/ppp/ppp-2.4.1-r14.ebuild +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.1-r14.ebuild,v 1.26 2005/01/29 21:18:02 dragonheart Exp $ - -inherit eutils - -S=${WORKDIR}/${P}.pppoe4 -DESCRIPTION="Point-to-point protocol - patched for pppoe" -HOMEPAGE="http://www.samba.org/ppp" -SRC_URI="mirror://gentoo/${P}-pppoe4.tgz" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="x86 ppc sparc hppa amd64 ia64 alpha mips" -IUSE="crypt ipv6 activefilter" - -DEPEND="virtual/libc - activefilter? ( virtual/libpcap )" - -src_unpack() { - unpack ${A} - cd ${S} - use crypt && { - #I took the liberty of combining the two crypto patches - einfo "Applying ppp-crypto-fix.patch..." - bzcat ${DISTDIR}/ppp-crypto-fix.patch.bz2 | patch -p1 - - } - - epatch ${FILESDIR}/${P}-r10.patch - - use activefilter && { - # enable option active-filter - einfo "Enabling active-filter" - mv pppd/Makefile.linux pppd/Makefile.linux.orig - sed -e 's/^#FILTER=y/FILTER=y/' <pppd/Makefile.linux.orig > \ - pppd/Makefile.linux - } - epatch ${FILESDIR}/gcc3.3-multiline.patch - - epatch ${FILESDIR}/gcc33-amd64.patch - - epatch ${FILESDIR}/2.4.2/pcap.patch - -} - -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 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 .. - - emake || 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}/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/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 - 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 -} diff --git a/net-dialup/ppp/ppp-2.4.2-r10.ebuild b/net-dialup/ppp/ppp-2.4.2-r10.ebuild index 4140ad01b346..645e572d483f 100644 --- a/net-dialup/ppp/ppp-2.4.2-r10.ebuild +++ b/net-dialup/ppp/ppp-2.4.2-r10.ebuild @@ -1,14 +1,15 @@ # Copyright 1999-2005 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-r10.ebuild,v 1.8 2005/02/12 07:52:04 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.2-r10.ebuild,v 1.9 2005/05/14 09:27:56 mrness Exp $ inherit eutils gnuconfig flag-o-matic -DESCRIPTION="Point-to-point protocol - patched for PPPOE" +DESCRIPTION="Point-to-point protocol (PPP)" 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" + mirror://gentoo/${P}-patches-20050514.tar.gz + mppe-mppc? ( http://www.polbox.com/h/hs001/ppp-2.4.2-mppe-mppc-1.1.patch.gz ) + dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )" LICENSE="BSD GPL-2" SLOT="0" @@ -26,20 +27,20 @@ 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" + epatch ${WORKDIR}/patch/cbcp-dosfix.patch || die "patch failed" + epatch ${WORKDIR}/patch/mpls.patch || die "patch failed" + epatch ${WORKDIR}/patch/killaddr-smarter.patch || die "patch failed" + epatch ${WORKDIR}/patch/cflags.patch || die "patch failed" + epatch ${WORKDIR}/patch/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" + epatch ${WORKDIR}/ppp-2.4.2-mppe-mppc-1.1.patch || die "patch failed" } if use atm; then einfo "Enabling PPPoATM support" - epatch ${FILESDIR}/${PV}/pppoatm-2.diff.gz || die "patch failed" + epatch ${WORKDIR}/patch/pppoatm-2.patch || die "patch failed" sed -i -e "s/^LIBS =/LIBS = -latm/" pppd/Makefile.linux || die fi @@ -70,12 +71,16 @@ src_unpack() { 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}/ppp-sys_error_to_strerror.patch || die + sed -i -e "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux + epatch ${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch || die } #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 + + # Set correct libdir + sed -i -e "s:/lib/pppd:/$(get_libdir)/pppd:" \ + ${S}/pppd/{pathnames.h,pppd.8} || die } src_compile() { @@ -105,9 +110,9 @@ src_install() { insopts -m0644 doins etc.ppp/options - doins ${FILESDIR}/${PV}/options-pptp - doins ${FILESDIR}/${PV}/options-pppoe - doins ${FILESDIR}/${PV}/chat-default + doins ${FILESDIR}/options-pptp + doins ${FILESDIR}/options-pppoe + doins ${FILESDIR}/chat-default insopts -m0755 doins ${FILESDIR}/ip-up @@ -116,7 +121,7 @@ src_install() { exeinto /etc/init.d/ doexe ${FILESDIR}/net.ppp0 - if useq pam; then + if use pam; then insinto /etc/pam.d insopts -m0644 newins pppd/ppp.pam ppp || die "not found ppp.pam" @@ -126,32 +131,34 @@ src_install() { 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 - dolib.so pppd/plugins/radius/radius.so - dolib.so pppd/plugins/radius/radattr.so - dolib.so pppd/plugins/radius/radrealms.so - if useq atm; then - dolib.so pppd/plugins/pppoatm.so || die "pppoatm.so not build" + local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h) + #closing " for syntax coloring + dodir ${PLUGINS_DIR} + insinto ${PLUGINS_DIR} + insopts -m0755 + doins pppd/plugins/minconn.so || die "minconn.so not build" + doins pppd/plugins/passprompt.so || die "passprompt.so not build" + doins pppd/plugins/rp-pppoe/rp-pppoe.so || die "rp-pppoe.so not build" + doins pppd/plugins/radius/radius.so || die "radius.so not build" + doins pppd/plugins/radius/radattr.so || die "radattr.so not build" + doins pppd/plugins/radius/radrealms.so || die "radrealms.so not build" + if use atm; then + doins pppd/plugins/pppoatm.so || die "pppoatm.so not build" fi - if useq dhcp; then - dolib.so pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build" + if use dhcp; then + doins pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build" 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 + newins ${FILESDIR}/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 + dodoc ${FILESDIR}/README.mpls + dohtml ${FILESDIR}/pppoe.html doman pppd/plugins/radius/pppd-radius.8 doman pppd/plugins/radius/pppd-radattr.8 diff --git a/net-dialup/ppp/ppp-2.4.3-r1.ebuild b/net-dialup/ppp/ppp-2.4.3-r1.ebuild deleted file mode 100644 index 69aaf044fc76..000000000000 --- a/net-dialup/ppp/ppp-2.4.3-r1.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r1.ebuild,v 1.5 2005/04/15 01:50:04 tgall Exp $ - -inherit eutils gnuconfig flag-o-matic - -IUSE="gtk ipv6 activefilter pam atm mppe-mppc dhcp" - -DESCRIPTION="Point-to-point protocol" -HOMEPAGE="http://www.samba.org/ppp" -SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz - mppe-mppc? ( http://www.polbox.com/h/hs001/ppp-2.4.3-mppe-mppc-1.1.patch.gz ) - dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64" - -RDEPEND="virtual/libc - activefilter? ( virtual/libpcap ) - atm? ( net-dialup/linux-atm ) - pam? ( sys-libs/pam ) - gtk? ( =x11-libs/gtk+-1* )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PV}/ppp_flags.patch || die "patch failed" - epatch ${FILESDIR}/${PV}/mpls.patch || die "patch failed" - epatch ${FILESDIR}/${PV}/killaddr-smarter.patch || die "patch failed" - epatch ${FILESDIR}/${PV}/fixes-from-upstream-cvs.patch || die "patch failed" - - useq mppe-mppc && { - einfo "Enabling mppe-mppc support" - epatch ${DISTDIR}/ppp-2.4.3-mppe-mppc-1.1.patch.gz || die "patch failed" - } - - useq atm && { - einfo "Enabling PPPoATM support" - sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" ${S}/pppd/plugins/pppoatm/Makefile.linux - } - - useq activefilter || { - einfo "Disabling active filter" - sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux - } - - useq pam && { - einfo "Enabling PAM" - sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux - } - - useq ipv6 && { - einfo "Enabling IPv6" - sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux - } - - einfo "Enabling CBCP" - sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux - - useq 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 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux - sed -i "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux - epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die - } -} - -src_compile() { - #export WANT_AUTOCONF=2.1 - #gnuconfig_update - # compile radius better than their makefile does - append-ldflags -Wl,-z,now - econf || die "configuration failed" - emake COPTS="${CFLAGS}" || die "compile failed" - - #build pppgetpass - cd contrib/pppgetpass - if useq gtk; then - emake -f Makefile.linux || die "failed to build pppgetpass" - else - emake pppgetpass.vt || die "failed to build pppgetpass" - fi -} - -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 - - dosbin pppd/plugins/rp-pppoe/pppoe-discovery - - 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}/ip-up - doins ${FILESDIR}/ip-down - - exeinto /etc/init.d/ - doexe ${FILESDIR}/net.ppp0 - - if useq pam; then - insinto /etc/pam.d - insopts -m0644 - newins pppd/ppp.pam ppp || die "not found ppp.pam" - fi - - 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/passwordfd.so - dolib.so pppd/plugins/winbind.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 useq atm; then - dolib.so pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build" - fi - if useq dhcp; then - dolib.so pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build" - 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 useq 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/* - - if useq gtk; then - dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk} - newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass - else - newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass - fi - doman contrib/pppgetpass/pppgetpass.8 -} - -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 -} diff --git a/net-dialup/ppp/ppp-2.4.3-r2.ebuild b/net-dialup/ppp/ppp-2.4.3-r2.ebuild deleted file mode 100644 index 563d2922270a..000000000000 --- a/net-dialup/ppp/ppp-2.4.3-r2.ebuild +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r2.ebuild,v 1.1 2005/05/05 20:01:23 mrness Exp $ - -inherit eutils gnuconfig flag-o-matic - -DESCRIPTION="Point-to-point protocol" -HOMEPAGE="http://www.samba.org/ppp" -SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz - mirror://gentoo/${P}-patches-20050505.tar.gz - dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86 ~ppc64" -IUSE="gtk ipv6 activefilter pam atm mppe-mppc dhcp" - -RDEPEND="virtual/libc - activefilter? ( virtual/libpcap ) - atm? ( net-dialup/linux-atm ) - pam? ( sys-libs/pam ) - gtk? ( =x11-libs/gtk+-1* )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${WORKDIR}/patch/ppp_flags.patch - epatch ${WORKDIR}/patch/mpls.patch - epatch ${WORKDIR}/patch/killaddr-smarter.patch - - epatch ${WORKDIR}/patch/upstream-fixes.patch - epatch ${WORKDIR}/patch/fix_activefilter.patch - - use mppe-mppc && { - einfo "Enabling mppe-mppc support" - epatch ${WORKDIR}/patch/mppe-mppc-1.1.patch - } - - use atm && { - einfo "Enabling PPPoATM support" - sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" ${S}/pppd/plugins/pppoatm/Makefile.linux - } - - use activefilter || { - einfo "Disabling active filter" - sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux - } - - use pam && { - einfo "Enabling PAM" - sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux - } - - use ipv6 && { - einfo "Enabling IPv6" - sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux - } - - einfo "Enabling CBCP" - sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux - - 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 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux - sed -i "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux - epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die - } -} - -src_compile() { - #export WANT_AUTOCONF=2.1 - #gnuconfig_update - # compile radius better than their makefile does - append-ldflags -Wl,-z,now - econf || die "configuration failed" - emake COPTS="${CFLAGS}" || die "compile failed" - - #build pppgetpass - cd contrib/pppgetpass - if use gtk; then - emake -f Makefile.linux || die "failed to build pppgetpass" - else - emake pppgetpass.vt || die "failed to build pppgetpass" - fi -} - -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 - - dosbin pppd/plugins/rp-pppoe/pppoe-discovery - - 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}/ip-up - doins ${FILESDIR}/ip-down - - exeinto /etc/init.d/ - doexe ${FILESDIR}/net.ppp0 - - if use pam; then - insinto /etc/pam.d - insopts -m0644 - newins pppd/ppp.pam ppp || die "not found ppp.pam" - fi - - 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/passwordfd.so - dolib.so pppd/plugins/winbind.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/pppoatm.so || die "pppoatm.so not build" - fi - if use dhcp; then - dolib.so pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build" - 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/* - - if use gtk; then - dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk} - newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass - else - newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass - fi - doman contrib/pppgetpass/pppgetpass.8 -} - -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 -} diff --git a/net-dialup/ppp/ppp-2.4.3-r3.ebuild b/net-dialup/ppp/ppp-2.4.3-r3.ebuild index 7e83e263e4ed..80fe830ee606 100644 --- a/net-dialup/ppp/ppp-2.4.3-r3.ebuild +++ b/net-dialup/ppp/ppp-2.4.3-r3.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r3.ebuild,v 1.3 2005/05/10 15:12:16 herbs Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3-r3.ebuild,v 1.4 2005/05/14 09:27:56 mrness Exp $ inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="Point-to-Point Protocol (PPP)" HOMEPAGE="http://www.samba.org/ppp" SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz - mirror://gentoo/${P}-patches-20050505.tar.gz + mirror://gentoo/${P}-patches-20050514.tar.gz dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )" LICENSE="BSD GPL-2" @@ -66,9 +66,9 @@ src_unpack() { # copy the ppp-dhcp plugin files einfo "Copying ppp-dhcp plugin files..." tar -xzf ${DISTDIR}/ppp-dhcpc.tgz -C ${S}/pppd/plugins/ - sed -i 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux - sed -i "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux - epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die + sed -i -e 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux + sed -i -e "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux + epatch ${WORKDIR}/patch/dhcp-sys_error_to_strerror.patch } # Set correct libdir @@ -113,9 +113,9 @@ src_install() { insopts -m0644 doins etc.ppp/options - doins ${FILESDIR}/${PV}/options-pptp - doins ${FILESDIR}/${PV}/options-pppoe - doins ${FILESDIR}/${PV}/chat-default + doins ${FILESDIR}/options-pptp + doins ${FILESDIR}/options-pppoe + doins ${FILESDIR}/chat-default insopts -m0755 doins ${FILESDIR}/ip-up @@ -135,7 +135,7 @@ src_install() { newins ${FILESDIR}/confd.ppp0 net.ppp0 local PLUGINS_DIR=/usr/$(get_libdir)/pppd/$(awk -F '"' '/VERSION/ {print $2}' pppd/patchlevel.h) - #closing " for sintax coloring + #closing " for syntax coloring dodir ${PLUGINS_DIR} insinto ${PLUGINS_DIR} insopts -m0755 @@ -156,14 +156,14 @@ src_install() { insinto /etc/modules.d insopts -m0644 - newins ${FILESDIR}/${PV}/modules.ppp ppp + newins ${FILESDIR}/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 + dodoc ${FILESDIR}/README.mpls + dohtml ${FILESDIR}/pppoe.html doman pppd/plugins/radius/pppd-radius.8 doman pppd/plugins/radius/pppd-radattr.8 @@ -175,7 +175,7 @@ src_install() { # Adding misc. specialized scripts to doc dir dodir /usr/share/doc/${PF}/scripts/chatchat - insinto /usr/share/doc/${PF}/scripts/chatchat + insinto /usr/share/doc/${PF}/scripts/chatchat doins scripts/chatchat/* insinto /usr/share/doc/${PF}/scripts doins scripts/* diff --git a/net-dialup/ppp/ppp-2.4.3.ebuild b/net-dialup/ppp/ppp-2.4.3.ebuild deleted file mode 100644 index 42d2da9e1584..000000000000 --- a/net-dialup/ppp/ppp-2.4.3.ebuild +++ /dev/null @@ -1,203 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.3.ebuild,v 1.6 2005/02/06 09:22:13 mrness Exp $ - -inherit eutils gnuconfig flag-o-matic - -IUSE="gtk ipv6 activefilter pam atm mppe-mppc dhcp" - -DESCRIPTION="Point-to-point protocol" -HOMEPAGE="http://www.samba.org/ppp" -SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz - mppe-mppc? ( http://www.polbox.com/h/hs001/ppp-2.4.3-mppe-mppc-1.1.patch.gz ) - dhcp? ( http://www.netservers.co.uk/gpl/ppp-dhcpc.tgz )" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~sparc ~x86" - -RDEPEND="virtual/libc - activefilter? ( virtual/libpcap ) - atm? ( net-dialup/linux-atm ) - pam? ( sys-libs/pam ) - gtk? ( =x11-libs/gtk+-1* )" -DEPEND="${RDEPEND} - >=sys-apps/sed-4" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${PV}/ppp_flags.patch || die "patch failed" - epatch ${FILESDIR}/${PV}/mpls.patch || die "patch failed" - epatch ${FILESDIR}/${PV}/killaddr-smarter.patch || die "patch failed" - - useq mppe-mppc && { - einfo "Enabling mppe-mppc support" - epatch ${DISTDIR}/ppp-2.4.3-mppe-mppc-1.1.patch.gz || die "patch failed" - } - - useq atm && { - einfo "Enabling PPPoATM support" - sed -i "s/^#HAVE_LIBATM=yes/HAVE_LIBATM=yes/" ${S}/pppd/plugins/pppoatm/Makefile.linux - } - - useq activefilter || { - einfo "Disabling active filter" - sed -i "s/^FILTER=y/#FILTER=y/" pppd/Makefile.linux - } - - useq pam && { - einfo "Enabling PAM" - sed -i "s/^#USE_PAM=y/USE_PAM=y/" pppd/Makefile.linux - } - - useq ipv6 && { - einfo "Enabling IPv6" - sed -i "s/#HAVE_INET6/HAVE_INET6/" pppd/Makefile.linux - } - - einfo "Enabling CBCP" - sed -i "s/^#CBCP=y/CBCP=y/" ${S}/pppd/Makefile.linux - - useq 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 's/SUBDIRS := rp-pppoe/SUBDIRS := rp-pppoe dhcp/' ${S}/pppd/plugins/Makefile.linux - sed -i "s/-O2/${CFLAGS} -fPIC/" ${S}/pppd/plugins/dhcp/Makefile.linux - epatch ${FILESDIR}/ppp-sys_error_to_strerror.patch || die - } -} - -src_compile() { - #export WANT_AUTOCONF=2.1 - #gnuconfig_update - # compile radius better than their makefile does - append-ldflags -Wl,-z,now - econf || die "configuration failed" - emake COPTS="${CFLAGS}" || die "compile failed" - - #build pppgetpass - cd contrib/pppgetpass - if useq gtk; then - emake -f Makefile.linux || die "failed to build pppgetpass" - else - emake pppgetpass.vt || die "failed to build pppgetpass" - fi -} - -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 - - dosbin pppd/plugins/rp-pppoe/pppoe-discovery - - 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}/ip-up - doins ${FILESDIR}/ip-down - - exeinto /etc/init.d/ - doexe ${FILESDIR}/net.ppp0 - - if useq pam; then - insinto /etc/pam.d - insopts -m0644 - newins pppd/ppp.pam ppp || die "not found ppp.pam" - fi - - 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/passwordfd.so - dolib.so pppd/plugins/winbind.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 useq atm; then - dolib.so pppd/plugins/pppoatm/pppoatm.so || die "pppoatm.so not build" - fi - if useq dhcp; then - dolib.so pppd/plugins/dhcp/dhcpc.so || die "dhcpc.so not build" - 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 useq 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/* - - if useq gtk; then - dosbin contrib/pppgetpass/{pppgetpass.vt,pppgetpass.gtk} - newsbin contrib/pppgetpass/pppgetpass.sh pppgetpass - else - newsbin contrib/pppgetpass/pppgetpass.vt pppgetpass - fi - doman contrib/pppgetpass/pppgetpass.8 -} - -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 -} |