diff options
14 files changed, 0 insertions, 654 deletions
diff --git a/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1 b/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1 deleted file mode 100644 index 9a27a0d2..00000000 --- a/metadata/md5-cache/net-dialup/rp-pppoe-3.10-r1 +++ /dev/null @@ -1,13 +0,0 @@ -DEFINED_PHASES=compile install postinst preinst unpack -DEPEND=|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 ) net-dialup/ppp X? ( dev-lang/tk ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 -DESCRIPTION=A user-mode PPPoE client and server suite for Linux -EAPI=0 -HOMEPAGE=http://www.roaringpenguin.com/pppoe/ -IUSE=X -KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 -LICENSE=GPL-2 -RDEPEND=net-dialup/ppp X? ( dev-lang/tk ) -SLOT=0 -SRC_URI=http://www.roaringpenguin.com/files/download/rp-pppoe-3.10.tar.gz ftp://ftp.samba.org/pub/ppp/ppp-2.4.4.tar.gz -_eclasses_=autotools 542bf3f83917668f3893f4da1ca238ff eutils 43da5163ba106e87d22d2e7d6d67537f flag-o-matic 85dc1eac3c64d8141374490ed64122e5 libtool 7f78cd7d403808a350c9ae23f5821fb4 multilib df4e4d5cfd3d137d0c248e1991c0e4d6 toolchain-funcs 1dfcad7b3f439dbc511d76c49f23da0d -_md5_=a0aba295b1c671b69301bdb3a79e751d diff --git a/net-dialup/rp-pppoe/ChangeLog b/net-dialup/rp-pppoe/ChangeLog deleted file mode 100644 index 810a50c7..00000000 --- a/net-dialup/rp-pppoe/ChangeLog +++ /dev/null @@ -1,30 +0,0 @@ -# ChangeLog for net-dialup/rp-pppoe -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: $ - - 15 Aug 2015; Bertrand Jacquin <bertrand@jacquin.bzh> rp-pppoe-3.10-r1.ebuild: - Remove malformed Id headers - - 10 Jun 2013; Bertrand Jacquin <bertrand@jacquin.bzh> metadata.xml: - Fix manifest - - 28 May 2013; Bertrand Jacquin <bertrand@jacquin.bzh> rp-pppoe-3.10-r1.ebuild: - remove prepalldocs and addpredict fix quotes - - 28 May 2013; Bertrand Jacquin <bertrand@jacquin.bzh> +metadata.xml: - Add missing metadata.xml - -*rp-pppoe-3.10-r1 (26 Jul 2011) - - 26 Jul 2011; Bertrand Jacquin <bertrand@jacquin.bzh> - +files/rp-pppoe-3.10-BJA-configure-bit-fields-order.diff, - +files/rp-pppoe-3.10-BJA-configure-endianess.diff, - +files/rp-pppoe-3.10-autotools.patch, - +files/rp-pppoe-3.10-gentoo-netscripts.patch, - +files/rp-pppoe-3.10-linux-headers.patch, - +files/rp-pppoe-3.10-plugin-options.patch, - +files/rp-pppoe-3.10-posix-source-sigaction.patch, - +files/rp-pppoe-3.10-session-offset.patch, - +files/rp-pppoe-3.10-username-charset.patch, +rp-pppoe-3.10-r1.ebuild: - 374667 - https://bugs.gentoo.org/show_bug.cgi?id=374667 diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest deleted file mode 100644 index e77f4484..00000000 --- a/net-dialup/rp-pppoe/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -AUX rp-pppoe-3.10-BJA-configure-bit-fields-order.diff 1213 SHA256 7a134db4a9cf1b9880b69fb9c734ec6205df16cc1b8a05fe7fc86ac5f9af6ea3 WHIRLPOOL 8e950dc4a69c09100a4508ec42f8e26e8219364273123584e46f088455db452e3f268fb6ffb908d6899364d1dc2ed51bc2591a8a0f7f83a5af8d71a019059cce -AUX rp-pppoe-3.10-BJA-configure-endianess.diff 1018 SHA256 2b903fc37b352e80550094da1dcc0a6a45f52016b6daa19ed4c505c911b380c0 WHIRLPOOL 5cebfefac3f96d9b43ee07e9b9abaac8c798c1e739385db906020c080429ee29d0e155bd81e90ba0e6284fe1d44f5fae58dc49d7d43d751b8ffa144c185074dd -AUX rp-pppoe-3.10-autotools.patch 4176 SHA256 3bfa24576369a0223067d45af8671188893fbd84cb80f3f64f7a7f0d7787f77a WHIRLPOOL 9d33591021420bf826887a930f414d9338ba887ed9796b3944b67ddfcb34e69ecf90bb1576ac5a24b6f8bfa08ec306871c6b4f6bb205a818c2cdaa6bc430ae8f -AUX rp-pppoe-3.10-gentoo-netscripts.patch 5238 SHA256 c9c4997c3db1d0d350d285f371575b12cb15f15dfeac920b2fe573bff85754dc WHIRLPOOL 766283107d9ac2c2f3fbb3c03e28fca60802da4b694d0aa9c11ad4b29a4316d3e9f4ecaa664a4fd2fd2c2812812ec6a32e30291f965c8edf47c1fb184b7d347d -AUX rp-pppoe-3.10-linux-headers.patch 823 SHA256 39c854283b6a3d4ef382fb8aa1339b6a64be42c0922fa48ecc9b0c19e2a103e6 WHIRLPOOL d6121e14c8b7ff029c9d41977bdcd7e7580381f4710f5b9cf8fc1c17a198580eb7127f13412ab1837a9e60baa674269ff6e947f600e1f079f4ed5601131d5e1a -AUX rp-pppoe-3.10-plugin-options.patch 1491 SHA256 dc3fe5aa64c1880a701940e5636964eb90a3afec8ddf739aa4046fdf771d0374 WHIRLPOOL 4b07d32fd062cab31a744aa2c5cf297a82db0b154d2f0fc2ab9ab2825eb311eeeff1b9d78f5fdce17a43ea18c2aa7bf513d50e4925b59c05ce7b2fd66bda17b4 -AUX rp-pppoe-3.10-posix-source-sigaction.patch 512 SHA256 18ed348ac04cb5823bfe0b97aef89afaad0cb30ff821b8b78834d4c5cea40962 WHIRLPOOL 3d96d4ae46f443a814c567a1fe13490f153b3c00d1ea55b434f2e5e79a45f7fd424c4e67978a672863e7e94bcc533249eab71714539c08a20596331bae5c0261 -AUX rp-pppoe-3.10-session-offset.patch 832 SHA256 66499b084aab890c61399c703e21ba00a46d93da1f36e87674a27026b0c2f013 WHIRLPOOL b8406150e1fa63f8cca6092de65a323c2bbdb2ebe0a29b77488ac66c7480d0e639e00fd17ecc286036dfe6a7d63954b1ba3996f4dfe9e0f08ffa2b874d73f001 -AUX rp-pppoe-3.10-username-charset.patch 1950 SHA256 1a6df9197e108e310e90ca52f1d8b14b59fb368f59184aed3dc30abb9ca77417 WHIRLPOOL 6382ce336a5b4782b5300ce4838088d082529f58e43d9127b50b6357c61eb58b4e7da87f898d94bad90933b920c9a9ec02a1ad008f8786848aca69500cc24cad -DIST ppp-2.4.4.tar.gz 688763 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea WHIRLPOOL 12aa49200253afd3958c7fc078ac7333080c6d0ca96c541e39e70b05d6b8c8e90fe98553d4cbef7804cf66c74b2798e1839b44db9e0cc0e6093d87b53bf24b6f -DIST rp-pppoe-3.10.tar.gz 215288 SHA256 709ca7402594acc1d80b99c20219112b5c00e6ac48ae6049fc626fbaf4ce49f6 WHIRLPOOL 3cdb3d0d06ad8365a8f94139b7411e35e0bcfb84f305e163e9c5a076d39d19021d72738a5b01e66e022fb82d725ddf07de361a4388e51d3545314fa0f4f19332 -EBUILD rp-pppoe-3.10-r1.ebuild 2451 SHA256 bab7bb57bd343488cdd8f040877c13c19465e448cd20e740492df9a069240a3e WHIRLPOOL cdf0a039c4fd3d3d54d4947cf7ca1bffed77af2dc13faeae09e21ec206d6ad3f3127a2fd915fdd8ebe610576c1dad2e1e4632af4e244f6622a8614e801799444 -MISC ChangeLog 1149 SHA256 a1fe3fb9d9e91e6e6f380f288be2fa2fed11ed9b8c9e6e523f5956c3d3fbf53a WHIRLPOOL aa8e996ff90571feab9b9f4492a1ceb92d449ff04d1a7b1aa8d9f261ba1a9c1fced3654234487fb20d889ad657af15aebcaec1953cbbad772e479cf07ede8373 -MISC metadata.xml 167 SHA256 b0ab0797cf948aa303c7e5a4add9cdf49d27142735bd63d7d95ba0e97d578d28 WHIRLPOOL 2a526a0deb6f3946aac6635bcffbad2336bfb981905e4fb59a23a8325baa5975d357b02878d453396f8c5577144953c7365ca7a544fdffb968685adadcf07d2d diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-BJA-configure-bit-fields-order.diff b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-BJA-configure-bit-fields-order.diff deleted file mode 100644 index 0982ef21..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-BJA-configure-bit-fields-order.diff +++ /dev/null @@ -1,38 +0,0 @@ ---- rp-pppoe-3.10/src/configure.in.ori 2011-07-13 18:02:56.227142413 +0200 -+++ rp-pppoe-3.10/src/configure.in 2011-07-13 18:12:23.869661842 +0200 -@@ -230,8 +230,8 @@ - esac - - dnl Figure out packing order of structures --AC_MSG_CHECKING([packing order of bit fields]) --AC_TRY_RUN([ -+AC_CACHE_CHECK([packing order of bit fields], rpppoe_cv_pack_bitfields, -+[AC_TRY_RUN([ - union foo { - struct bar { - unsigned int ver:4; -@@ -253,15 +253,15 @@ - } else { - return 2; - } --}], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, --$ECHO "no defaults for cross-compiling"; exit 0) -- --if test "$rpppoe_cv_pack_bitfields" = "rev" ; then -- AC_MSG_RESULT(reversed) -- AC_DEFINE(PACK_BITFIELDS_REVERSED, 1, [Define if bitfields are packed in reverse order]) --else -- AC_MSG_RESULT(normal) --fi -+}], -+ rpppoe_cv_pack_bitfields=normal, -+ rpppoe_cv_pack_bitfields=rev, -+ [AC_MSG_ERROR([cross-compiling, -+ presetting rpppoe_cv_pack_bitfields=(normal|rev) will help])] -+)]) -+AS_IF([test $rpppoe_cv_pack_bitfields = rev], -+ AC_DEFINE(PACK_BITFIELDS_REVERSED, 1, [Define if bitfields are packed in reverse order]) -+) - - # Sigh... got to fix this up for tcl - test "x$prefix" = xNONE && prefix=$ac_default_prefix diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-BJA-configure-endianess.diff b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-BJA-configure-endianess.diff deleted file mode 100644 index 4aff94d7..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-BJA-configure-endianess.diff +++ /dev/null @@ -1,42 +0,0 @@ ---- rp-pppoe-3.10/src/configure.in.ori 2011-07-10 00:49:30.000000000 +0200 -+++ rp-pppoe-3.10/src/configure.in 2011-07-10 11:35:58.000000000 +0200 -@@ -230,37 +230,10 @@ - esac - - dnl Figure out packing order of structures --AC_MSG_CHECKING([packing order of bit fields]) --AC_TRY_RUN([ --union foo { -- struct bar { -- unsigned int ver:4; -- unsigned int type:4; -- } bb; -- unsigned char baz; --}; -+AC_C_BIGENDIAN() - --int --main(void) --{ -- union foo x; -- x.bb.ver = 1; -- x.bb.type = 2; -- if (x.baz == 0x21) { -- return 1; -- } else if (x.baz == 0x12) { -- return 0; -- } else { -- return 2; -- } --}], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, --$ECHO "no defaults for cross-compiling"; exit 0) -- --if test "$rpppoe_cv_pack_bitfields" = "rev" ; then -- AC_MSG_RESULT(reversed) -+if test "$ac_cv_c_bigendian" = "yes" ; then - AC_DEFINE(PACK_BITFIELDS_REVERSED, 1, [Define if bitfields are packed in reverse order]) --else -- AC_MSG_RESULT(normal) - fi - - # Sigh... got to fix this up for tcl diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch deleted file mode 100644 index e10e8ac7..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -Nru rp-pppoe-3.10.orig/gui/Makefile.in rp-pppoe-3.10/gui/Makefile.in ---- rp-pppoe-3.10.orig/gui/Makefile.in 2008-06-30 16:00:41.000000000 +0200 -+++ rp-pppoe-3.10/gui/Makefile.in 2008-06-30 22:30:56.000000000 +0200 -@@ -46,7 +46,7 @@ - -mkdir -p $(DESTDIR)$(sbindir) - -mkdir -p $(DESTDIR)$(bindir) - -mkdir -p $(DESTDIR)/etc/ppp/rp-pppoe-gui -- $(install) -m 4755 -s pppoe-wrapper $(DESTDIR)$(sbindir) -+ $(install) -m 4755 pppoe-wrapper $(DESTDIR)$(sbindir) - $(install) -m 755 tkpppoe $(DESTDIR)$(bindir) - -mkdir -p $(DESTDIR)$(mandir)/man1 - $(install) -m 644 pppoe-wrapper.1 $(DESTDIR)$(mandir)/man1 -diff -Nru rp-pppoe-3.10.orig/src/configure.in rp-pppoe-3.10/src/configure.in ---- rp-pppoe-3.10.orig/src/configure.in 2008-06-30 16:00:42.000000000 +0200 -+++ rp-pppoe-3.10/src/configure.in 2008-06-30 22:29:53.000000000 +0200 -@@ -45,7 +45,7 @@ - AC_MSG_RESULT($ac_cv_struct_sockaddr_ll) - - if test "$ac_cv_struct_sockaddr_ll" = yes ; then --AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL) -+AC_DEFINE(HAVE_STRUCT_SOCKADDR_LL, 1, [Define if you have struct sockaddr_ll]) - fi - - dnl Check for N_HDLC line discipline -@@ -56,7 +56,7 @@ - ac_cv_n_hdlc=no) - AC_MSG_RESULT($ac_cv_n_hdlc) - if test "$ac_cv_n_hdlc" = yes ; then --AC_DEFINE(HAVE_N_HDLC) -+AC_DEFINE(HAVE_N_HDLC, 1, [Define if you have the N_HDLC line discipline in linux/termios.h]) - fi - - AC_ARG_ENABLE(plugin, [ --enable-plugin=pppd_src_path build pppd plugin], ac_cv_pluginpath=$enableval, ac_cv_pluginpath=no) -@@ -104,7 +104,7 @@ - if test "$ac_cv_header_linux_if_pppox_h" = yes ; then - if test "$ac_cv_pluginpath" != no ; then - LINUX_KERNELMODE_PLUGIN=rp-pppoe.so -- AC_DEFINE(HAVE_LINUX_KERNEL_PPPOE) -+ AC_DEFINE(HAVE_LINUX_KERNEL_PPPOE, 1, [Define if you have kernel-mode PPPoE in Linux file]) - PPPD_INCDIR=$ac_cv_pluginpath - fi - fi -@@ -114,7 +114,7 @@ - fi - - if test "$ac_cv_debugging" = "yes" ; then -- AC_DEFINE(DEBUGGING_ENABLED) -+ AC_DEFINE(DEBUGGING_ENABLED, 1, [Define to include debugging code]) - fi - - AC_SUBST(LINUX_KERNELMODE_PLUGIN) -@@ -154,15 +154,15 @@ - AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) - AC_CACHE_VAL(ac_cv_linux_kernel_pppoe,[ - if test "`uname -s`" = "Linux" ; then --if test $cross_compiling = "no"; then -+dnl if test $cross_compiling = "no"; then - - dnl Do a bunch of modprobes. Can't hurt; might help. --modprobe ppp_generic > /dev/null 2>&1 --modprobe ppp_async > /dev/null 2>&1 --modprobe n_hdlc > /dev/null 2>&1 --modprobe ppp_synctty > /dev/null 2>&1 --modprobe pppoe > /dev/null 2>&1 --fi -+dnl modprobe ppp_generic > /dev/null 2>&1 -+dnl modprobe ppp_async > /dev/null 2>&1 -+dnl modprobe n_hdlc > /dev/null 2>&1 -+dnl modprobe ppp_synctty > /dev/null 2>&1 -+dnl modprobe pppoe > /dev/null 2>&1 -+dnl fi - AC_TRY_RUN([#include <sys/socket.h> - #include <net/ethernet.h> - #include <linux/if.h> -@@ -204,7 +204,7 @@ - dnl Figure out pppd version. 2.3.7 to 2.3.9 -- issue warning. Less than - dnl 2.3.7 -- stop - --PPPD_VERSION=`$PPPD --version 2>&1 | awk ' /version/ {print $NF}'` -+PPPD_VERSION=2.4.4 - - case "$PPPD_VERSION" in - 1.*|2.0.*|2.1.*|2.2.*|2.3.0|2.3.1|2.3.2|2.3.3|2.3.4|2.3.5|2.3.6) -@@ -258,7 +258,7 @@ - - if test "$rpppoe_cv_pack_bitfields" = "rev" ; then - AC_MSG_RESULT(reversed) -- AC_DEFINE(PACK_BITFIELDS_REVERSED) -+ AC_DEFINE(PACK_BITFIELDS_REVERSED, 1, [Define if bitfields are packed in reverse order]) - else - AC_MSG_RESULT(normal) - fi -diff -Nru rp-pppoe-3.10.orig/src/plugin.c rp-pppoe-3.10/src/plugin.c ---- rp-pppoe-3.10.orig/src/plugin.c 2008-06-30 16:00:43.000000000 +0200 -+++ rp-pppoe-3.10/src/plugin.c 2008-06-30 22:27:18.000000000 +0200 -@@ -27,7 +27,6 @@ - static char const RCSID[] = - "$Id: rp-pppoe-3.10-autotools.patch,v 1.2 2008/09/10 20:56:43 mrness Exp $"; - --#define _GNU_SOURCE 1 - #include "pppoe.h" - - #include "pppd/pppd.h" -diff -Nru rp-pppoe-3.10.orig/src/relay.c rp-pppoe-3.10/src/relay.c ---- rp-pppoe-3.10.orig/src/relay.c 2008-06-30 16:00:43.000000000 +0200 -+++ rp-pppoe-3.10/src/relay.c 2008-06-30 22:27:18.000000000 +0200 -@@ -17,8 +17,6 @@ - static char const RCSID[] = - "$Id: rp-pppoe-3.10-autotools.patch,v 1.2 2008/09/10 20:56:43 mrness Exp $"; - --#define _GNU_SOURCE 1 /* For SA_RESTART */ -- - #include "relay.h" - - #include <signal.h> diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-gentoo-netscripts.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-gentoo-netscripts.patch deleted file mode 100644 index f45557a0..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-gentoo-netscripts.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -Nru rp-pppoe-3.10.orig/configs/pppoe.conf rp-pppoe-3.10/configs/pppoe.conf ---- rp-pppoe-3.10.orig/configs/pppoe.conf 2008-06-30 16:00:42.000000000 +0200 -+++ rp-pppoe-3.10/configs/pppoe.conf 2008-06-30 22:22:32.000000000 +0200 -@@ -21,6 +21,9 @@ - # When you configure a variable, DO NOT leave spaces around the "=" sign. - - # Ethernet card connected to DSL modem -+# -+# NB: Gentoo overrides ETH when pppoe-start is called from the -+# networking scripts. This setting has no effect in that case. - ETH=eth1 - - # PPPoE user name. You may have to supply "@provider.com" Sympatico -@@ -86,8 +89,10 @@ - # $PIDFILE contains PID of pppoe-connect script - # $PIDFILE.pppoe contains PID of pppoe process - # $PIDFILE.pppd contains PID of pppd process --CF_BASE=`basename $CONFIG` --PIDFILE="/var/run/$CF_BASE-pppoe.pid" -+# -+# NB: Gentoo overrides PIDFILE when pppoe-start is run from the -+# networking scripts. This setting has no effect in that case. -+PIDFILE="/var/run/rp-pppoe.pid" - - # Do you want to use synchronous PPP? "yes" or "no". "yes" is much - # easier on CPU usage, but may not work for you. It is safer to use -diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppoe-connect.in ---- rp-pppoe-3.10.orig/scripts/pppoe-connect.in 2008-06-30 16:00:42.000000000 +0200 -+++ rp-pppoe-3.10/scripts/pppoe-connect.in 2008-06-30 22:22:32.000000000 +0200 -@@ -62,12 +62,17 @@ - ;; - esac - --if test ! -f "$CONFIG" -o ! -r "$CONFIG" ; then -+# In Gentoo, CONFIG is a named pipe when pppoe is started by the -+# network scripts. Testing -r is allowed; testing -f is not. -+if test ! -r "$CONFIG" ; then - echo "$0: Cannot read configuration file '$CONFIG'" >& 2 - exit 1 - fi --export CONFIG --. $CONFIG -+ -+# Read the named pipe (/dev/fd/foo) into a variable so we can use it -+# again later (since reading once from the pipe will exhaust it) -+CONFREAD=$(<$CONFIG) -+eval "$CONFREAD" - - PPPOE_PIDFILE="$PIDFILE.pppoe" - PPPD_PIDFILE="$PIDFILE.pppd" -diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-start.in rp-pppoe-3.10/scripts/pppoe-start.in ---- rp-pppoe-3.10.orig/scripts/pppoe-start.in 2008-06-30 16:00:42.000000000 +0200 -+++ rp-pppoe-3.10/scripts/pppoe-start.in 2008-06-30 22:22:32.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # @configure_input@ - #*********************************************************************** - # -@@ -113,12 +113,17 @@ - ;; - esac - --if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then -+# In Gentoo, CONFIG is a named pipe when pppoe is started by the -+# network scripts. Testing -r is allowed; testing -f is not. -+if [ ! -r "$CONFIG" ] ; then - $ECHO "$ME: Cannot read configuration file '$CONFIG'" >& 2 - exit 1 - fi --export CONFIG --. $CONFIG -+ -+# Read the named pipe (/dev/fd/foo) into a variable so we can use it -+# again later (since reading once from the pipe will exhaust it) -+CONFREAD=$(<$CONFIG) -+eval "$CONFREAD" - - # Check for command-line overriding of ETH and USER - case "$#" in -@@ -145,11 +150,11 @@ - - # Start the connection in the background unless we're debugging - if [ "$DEBUG" != "" ] ; then -- $CONNECT "$@" -+ $CONNECT <(echo "$CONFREAD") - exit 0 - fi - --$CONNECT "$@" > /dev/null 2>&1 & -+$CONNECT <(echo "$CONFREAD") >/dev/null 2>&1 & - CONNECT_PID=$! - - if [ "$CONNECT_TIMEOUT" = "" -o "$CONNECT_TIMEOUT" = 0 ] ; then -@@ -164,7 +169,7 @@ - # Monitor connection - TIME=0 - while [ true ] ; do -- @sbindir@/pppoe-status $CONFIG > /dev/null 2>&1 -+ @sbindir@/pppoe-status <(echo "$CONFREAD") >/dev/null 2>&1 - - # Looks like the interface came up - if [ $? = 0 ] ; then -diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-status rp-pppoe-3.10/scripts/pppoe-status ---- rp-pppoe-3.10.orig/scripts/pppoe-status 2008-06-30 16:00:42.000000000 +0200 -+++ rp-pppoe-3.10/scripts/pppoe-status 2008-06-30 22:22:32.000000000 +0200 -@@ -28,12 +28,17 @@ - ;; - esac - --if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then -+# In Gentoo, CONFIG is a named pipe when pppoe is started by the -+# network scripts. Testing -r is allowed; testing -f is not. -+if [ ! -r "$CONFIG" ] ; then - echo "$0: Cannot read configuration file '$CONFIG'" >& 2 - exit 1 - fi - --. $CONFIG -+# Read the named pipe (/dev/fd/foo) into a variable so we can use it -+# again later (since reading once from the pipe will exhaust it) -+CONFREAD=$(<$CONFIG) -+eval "$CONFREAD" - - PPPOE_PIDFILE="$PIDFILE.pppoe" - PPPD_PIDFILE="$PIDFILE.pppd" -diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-stop.in rp-pppoe-3.10/scripts/pppoe-stop.in ---- rp-pppoe-3.10.orig/scripts/pppoe-stop.in 2008-06-30 16:00:42.000000000 +0200 -+++ rp-pppoe-3.10/scripts/pppoe-stop.in 2008-06-30 22:22:32.000000000 +0200 -@@ -31,12 +31,17 @@ - CONFIG=/etc/ppp/pppoe.conf - fi - --if [ ! -f "$CONFIG" -o ! -r "$CONFIG" ] ; then -+# In Gentoo, CONFIG is a named pipe when pppoe is started by the -+# network scripts. Testing -r is allowed; testing -f is not. -+if [ ! -r "$CONFIG" ] ; then - echo "$ME: Cannot read configuration file '$CONFIG'" >& 2 - exit 1 - fi --export CONFIG --. $CONFIG -+ -+# Read the named pipe (/dev/fd/foo) into a variable so we can use it -+# again later (since reading once from the pipe will exhaust it) -+CONFREAD=$(<$CONFIG) -+eval "$CONFREAD" - - PPPOE_PIDFILE="$PIDFILE.pppoe" - PPPD_PIDFILE="$PIDFILE.pppd" diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-linux-headers.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-linux-headers.patch deleted file mode 100644 index 47e504bf..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-linux-headers.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -Nru rp-pppoe-3.10.orig/src/pppoe.h rp-pppoe-3.10/src/pppoe.h ---- rp-pppoe-3.10.orig/src/pppoe.h 2008-06-30 16:00:43.000000000 +0200 -+++ rp-pppoe-3.10/src/pppoe.h 2008-06-30 23:25:54.000000000 +0200 -@@ -19,6 +19,13 @@ - - extern int IsSetID; - -+/* Ugly header files on some Linux boxes... */ -+#if defined(HAVE_LINUX_IF_H) -+#include <linux/if.h> -+#elif defined(HAVE_NET_IF_H) -+#include <net/if.h> -+#endif -+ - #if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H) - #define _POSIX_SOURCE 1 /* For sigaction defines */ - #endif -@@ -51,13 +58,6 @@ - #include <sys/socket.h> - #endif - --/* Ugly header files on some Linux boxes... */ --#if defined(HAVE_LINUX_IF_H) --#include <linux/if.h> --#elif defined(HAVE_NET_IF_H) --#include <net/if.h> --#endif -- - #ifdef HAVE_NET_IF_TYPES_H - #include <net/if_types.h> - #endif diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch deleted file mode 100644 index 0d447748..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-plugin-options.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -ur rp-pppoe-3.10.orig/configs/pppoe.conf rp-pppoe-3.10/configs/pppoe.conf ---- rp-pppoe-3.10.orig/configs/pppoe.conf 2008-08-23 03:40:56.000000000 +0000 -+++ rp-pppoe-3.10/configs/pppoe.conf 2008-08-23 03:42:20.000000000 +0000 -@@ -120,7 +120,7 @@ - FIREWALL=NONE - - # Linux kernel-mode plugin for pppd. If you want to try the kernel-mode --# plugin, use LINUX_PLUGIN=/etc/ppp/plugins/rp-pppoe.so -+# plugin, use LINUX_PLUGIN=rp-pppoe.so - LINUX_PLUGIN= - - # Any extra arguments to pass to pppoe. Normally, use a blank string -diff -ur rp-pppoe-3.10.orig/scripts/pppoe-connect.in rp-pppoe-3.10/scripts/pppoe-connect.in ---- rp-pppoe-3.10.orig/scripts/pppoe-connect.in 2008-08-23 03:40:56.000000000 +0000 -+++ rp-pppoe-3.10/scripts/pppoe-connect.in 2008-08-23 03:45:43.000000000 +0000 -@@ -202,10 +202,13 @@ - - # If we're using kernel-mode PPPoE on Linux... - if test "$LINUX_PLUGIN" != "" ; then -- PLUGIN_OPTS="plugin $LINUX_PLUGIN nic-$ETH" -+ PLUGIN_OPTS="plugin $LINUX_PLUGIN" - if test -n "$SERVICENAME" ; then - PLUGIN_OPTS="$PLUGIN_OPTS rp_pppoe_service $SERVICENAME" - fi -+ -+ # Interface name MUST BE LAST!! -+ PLUGIN_OPTS="$PLUGIN_OPTS $ETH" - modprobe pppoe > /dev/null 2>&1 - fi - -@@ -297,7 +300,7 @@ - $SETSID $OVERRIDE_PPPD_COMMAND & - echo "$!" > $PPPD_PIDFILE - elif test "$LINUX_PLUGIN" != "" ; then -- $SETSID $PPPD $PPP_STD_OPTIONS $DEMAND & -+ $SETSID $PPPD $DEMAND $PPP_STD_OPTIONS & - echo "$!" > $PPPD_PIDFILE - else - $SETSID $PPPD pty "$PPPOE_CMD" \ diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-posix-source-sigaction.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-posix-source-sigaction.patch deleted file mode 100644 index bd19170a..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-posix-source-sigaction.patch +++ /dev/null @@ -1,18 +0,0 @@ -glibc does not define SA_RESTART when _POSIX_SOURCE is defined, so we -have to just assume the default signal.h include defines SA_RESTART - -http://sourceware.org/bugzilla/show_bug.cgi?id=12252 - ---- rp-pppoe-3.10/src/pppoe.h -+++ rp-pppoe-3.10/src/pppoe.h -@@ -19,10 +19,6 @@ - - extern int IsSetID; - --#if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H) --#define _POSIX_SOURCE 1 /* For sigaction defines */ --#endif -- - #include <stdio.h> /* For FILE */ - #include <sys/types.h> /* For pid_t */ - diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch deleted file mode 100644 index 303ecfa9..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-session-offset.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru rp-pppoe-3.10.orig/src/pppoe-server.c rp-pppoe-3.10/src/pppoe-server.c ---- rp-pppoe-3.10.orig/src/pppoe-server.c 2008-06-30 16:00:43.000000000 +0200 -+++ rp-pppoe-3.10/src/pppoe-server.c 2008-06-30 22:35:11.000000000 +0200 -@@ -1751,7 +1751,7 @@ - } - if (PassUnitOptionToPPPD) { - argv[c++] = "unit"; -- sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1 - SessOffset)); -+ sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1)); - argv[c++] = buffer; - } - argv[c++] = NULL; -@@ -1834,7 +1834,7 @@ - argv[c++] = "default-asyncmap"; - if (PassUnitOptionToPPPD) { - argv[c++] = "unit"; -- sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1 - SessOffset)); -+ sprintf(buffer, "%u", (unsigned int) (ntohs(session->sess) - 1)); - argv[c++] = buffer; - } - argv[c++] = NULL; diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-username-charset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-username-charset.patch deleted file mode 100644 index 8ef99a4b..00000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-username-charset.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nru rp-pppoe-3.10.orig/scripts/pppoe-setup.in rp-pppoe-3.10/scripts/pppoe-setup.in ---- rp-pppoe-3.10.orig/scripts/pppoe-setup.in 2008-06-30 16:00:42.000000000 +0200 -+++ rp-pppoe-3.10/scripts/pppoe-setup.in 2008-06-30 22:23:40.000000000 +0200 -@@ -86,11 +86,13 @@ - $ECHO "USER NAME" - $ECHO "" - printf "%s" ">>> Enter your PPPoE user name (default $USER): " -- read U -+ read Uu - -- if [ "$U" = "" ] ; then -- U="$USER" -+ if [ "$Uu" = "" ] ; then -+ Uu="$USER" - fi -+ -+ U=`echo $Uu | sed -e "s/&/\\\\\&/g"` - - # Under Linux, "fix" the default interface if eth1 is not available - if test `uname -s` = "Linux" ; then -@@ -221,7 +223,7 @@ - $ECHO "** Summary of what you entered **" - $ECHO "" - $ECHO "Ethernet Interface: $E" -- $ECHO "User name: $U" -+ $ECHO "User name: $Uu" - if [ "$D" = "no" ] ; then - $ECHO "Activate-on-demand: No" - else -@@ -288,7 +290,12 @@ - fi - - # Some #$(*& ISP's use a slash in the user name... --sed -e "s&^USER=.*&USER='$U'&" \ -+for SEP in ':' ';' '/' '!' '|' '_' '-' '@' ; do -+ if [ "$U" = `echo $U | sed "sI${SEP}II"` ]; then -+ break; -+ fi -+done -+sed -e "s${SEP}^USER=.*${SEP}USER='$U'${SEP}"\ - -e "s&^ETH=.*Ð='$E'&" \ - -e "s&^PIDFILE=.*&PIDFILE=\"$VARRUN/\$CF_BASE-pppoe.pid\"&" \ - -e "s/^FIREWALL=.*/FIREWALL=$FIREWALL/" \ -@@ -337,10 +344,10 @@ - cp /dev/null /etc/ppp/chap-secrets-bak - fi - --egrep -v "^$U|^\"$U\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets --$ECHO "\"$U\" * \"$PWD1\"" >> /etc/ppp/pap-secrets --egrep -v "^$U|^\"$U\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets --$ECHO "\"$U\" * \"$PWD1\"" >> /etc/ppp/chap-secrets -+egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/pap-secrets-bak > /etc/ppp/pap-secrets -+$ECHO "\"$Uu\" * \"$PWD1\"" >> /etc/ppp/pap-secrets -+egrep -v "^$Uu|^\"$Uu\"" /etc/ppp/chap-secrets-bak > /etc/ppp/chap-secrets -+$ECHO "\"$Uu\" * \"$PWD1\"" >> /etc/ppp/chap-secrets - - $ECHO "" - $ECHO "" diff --git a/net-dialup/rp-pppoe/metadata.xml b/net-dialup/rp-pppoe/metadata.xml deleted file mode 100644 index 87d71e72..00000000 --- a/net-dialup/rp-pppoe/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>net-dialup</herd> -</pkgmetadata> diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild deleted file mode 100644 index fdcabfce..00000000 --- a/net-dialup/rp-pppoe/rp-pppoe-3.10-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils flag-o-matic autotools - -DESCRIPTION="A user-mode PPPoE client and server suite for Linux" -HOMEPAGE="http://www.roaringpenguin.com/pppoe/" -SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz - ftp://ftp.samba.org/pub/ppp/ppp-2.4.4.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86" -IUSE="X" - -RDEPEND="net-dialup/ppp - X? ( dev-lang/tk )" -# see bug #230491 -DEPEND="|| ( <sys-kernel/linux-headers-2.6.24 >=sys-kernel/linux-headers-2.6.25 ) - ${RDEPEND}" - -src_unpack() { - unpack ${A} || die "failed to unpack" - - # Patch to enable integration of pppoe-start and pppoe-stop with - # baselayout-1.11.x so that the pidfile can be found reliably per interface - epatch "${FILESDIR}/${P}-gentoo-netscripts.patch" - - epatch "${FILESDIR}/${P}-username-charset.patch" # bug 82410 - epatch "${FILESDIR}/${P}-plugin-options.patch" - epatch "${FILESDIR}/${P}-autotools.patch" - epatch "${FILESDIR}/${P}-session-offset.patch" # bug 204476 - has_version '<sys-kernel/linux-headers-2.6.35' && \ - epatch "${FILESDIR}/${P}-linux-headers.patch" #334197 - epatch "${FILESDIR}/${P}-posix-source-sigaction.patch" - epatch "${FILESDIR}/${P}-BJA-configure-bit-fields-order.diff" - - cd "${S}"/src - eautoreconf -} - -src_compile() { - cd "${S}/src" - econf --enable-plugin=../../ppp-2.4.4 || die "econf failed" - emake || die "emake failed" - - if use X; then - make -C "${S}/gui" || die "gui make failed" - fi -} - -src_install () { - cd "${S}/src" - emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install \ - || die "install failed" - - #Don't use compiled rp-pppoe plugin - see pkg_preinst below - rm "${D}/etc/ppp/plugins/rp-pppoe.so" - - if use X; then - emake -C "${S}/gui" DESTDIR="${D}" datadir="/usr/share/doc/${PF}/" install \ - || die "gui install failed" - dosym "/usr/share/doc/${PF}/tkpppoe" /usr/share/tkpppoe - fi -} - -pkg_preinst() { - # Use the rp-pppoe plugin that comes with net-dialup/pppd - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER="${PPPD_VER#*/*-}" #reduce it to ${PV}-${PR} - PPPD_VER="${PPPD_VER%%-*}" #reduce it to ${PV} - if [ -n "${PPPD_VER}" ] && [ -f "${ROOT}/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" ] ; then - dosym "/usr/lib/pppd/${PPPD_VER}/rp-pppoe.so" /etc/ppp/plugins/rp-pppoe.so - fi -} - -pkg_postinst() { - elog "Use pppoe-setup to configure your dialup connection." -} |