From f08afe78c1339c5c4b048912969dc6b95bf55fe4 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 19 Jul 2016 14:04:11 +0200 Subject: net-dialup/rp-pppoe: Removed old. Package-Manager: portage-2.3.0 Signed-off-by: Lars Wendler --- .../rp-pppoe/files/rp-pppoe-3.8-autoheader.patch | 46 ------- .../rp-pppoe/files/rp-pppoe-3.8-configure.patch | 70 ---------- .../files/rp-pppoe-3.8-gentoo-netscripts.patch | 150 --------------------- .../files/rp-pppoe-3.8-plugin-options.patch | 33 ----- .../files/rp-pppoe-3.8-session-offset.patch | 21 --- .../files/rp-pppoe-3.8-username-charset.patch | 58 -------- 6 files changed, 378 deletions(-) delete mode 100644 net-dialup/rp-pppoe/files/rp-pppoe-3.8-autoheader.patch delete mode 100644 net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch delete mode 100644 net-dialup/rp-pppoe/files/rp-pppoe-3.8-gentoo-netscripts.patch delete mode 100644 net-dialup/rp-pppoe/files/rp-pppoe-3.8-plugin-options.patch delete mode 100644 net-dialup/rp-pppoe/files/rp-pppoe-3.8-session-offset.patch delete mode 100644 net-dialup/rp-pppoe/files/rp-pppoe-3.8-username-charset.patch (limited to 'net-dialup/rp-pppoe/files') diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-autoheader.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-autoheader.patch deleted file mode 100644 index 1c902600afcc..000000000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-autoheader.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -Nru rp-pppoe-3.8.orig/src/configure.in rp-pppoe-3.8/src/configure.in ---- rp-pppoe-3.8.orig/src/configure.in 2008-06-15 16:59:01.000000000 +0300 -+++ rp-pppoe-3.8/src/configure.in 2008-06-15 17:12:02.000000000 +0300 -@@ -44,7 +44,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 -@@ -55,7 +55,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) -@@ -100,13 +100,13 @@ - 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 - - 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) -@@ -248,7 +248,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 --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch deleted file mode 100644 index 054d419bb1ab..000000000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nru rp-pppoe-3.8.orig/gui/Makefile.in rp-pppoe-3.8/gui/Makefile.in ---- rp-pppoe-3.8.orig/gui/Makefile.in 2006-09-23 18:05:31.000000000 +0300 -+++ rp-pppoe-3.8/gui/Makefile.in 2006-09-23 18:16:02.623018000 +0300 -@@ -46,7 +46,7 @@ - -mkdir -p $(RPM_INSTALL_ROOT)$(sbindir) - -mkdir -p $(RPM_INSTALL_ROOT)$(bindir) - -mkdir -p $(RPM_INSTALL_ROOT)/etc/ppp/rp-pppoe-gui -- $(install) -m 4755 -s pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir) -+ $(install) -m 4755 pppoe-wrapper $(RPM_INSTALL_ROOT)$(sbindir) - $(install) -m 755 tkpppoe $(RPM_INSTALL_ROOT)$(bindir) - -mkdir -p $(RPM_INSTALL_ROOT)$(mandir)/man1 - $(install) -m 644 pppoe-wrapper.1 $(RPM_INSTALL_ROOT)$(mandir)/man1 -diff -Nru rp-pppoe-3.8.orig/src/configure.in rp-pppoe-3.8/src/configure.in ---- rp-pppoe-3.8.orig/src/configure.in 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/src/configure.in 2007-01-05 00:12:48.000000000 +0200 -@@ -145,15 +145,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 - #include - #include -@@ -180,7 +180,7 @@ - - dnl GCC warning level - if test "$GCC" = yes; then -- CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -ansi" -+ CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -D_GNU_SOURCE" - fi - - dnl If we couldn't find pppd, die -diff -Nru rp-pppoe-3.8.orig/src/plugin.c rp-pppoe-3.8/src/plugin.c ---- rp-pppoe-3.8.orig/src/plugin.c 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/src/plugin.c 2007-01-05 00:08:41.000000000 +0200 -@@ -27,7 +27,6 @@ - static char const RCSID[] = - "$Id$"; - --#define _GNU_SOURCE 1 - #include "pppoe.h" - - #include "pppd/pppd.h" -diff -Nru rp-pppoe-3.8.orig/src/relay.c rp-pppoe-3.8/src/relay.c ---- rp-pppoe-3.8.orig/src/relay.c 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/src/relay.c 2007-01-05 00:08:46.000000000 +0200 -@@ -17,8 +17,6 @@ - static char const RCSID[] = - "$Id$"; - --#define _GNU_SOURCE 1 /* For SA_RESTART */ -- - #include "relay.h" - - #include diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-gentoo-netscripts.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-gentoo-netscripts.patch deleted file mode 100644 index c39e2014bd65..000000000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-gentoo-netscripts.patch +++ /dev/null @@ -1,150 +0,0 @@ -diff -Nru rp-pppoe-3.8.orig/configs/pppoe.conf rp-pppoe-3.8/configs/pppoe.conf ---- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-02 17:29:41.000000000 +0300 -+++ rp-pppoe-3.8/configs/pppoe.conf 2006-04-21 10:04:20.369308000 +0300 -@@ -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.8.orig/scripts/pppoe-connect.in rp-pppoe-3.8/scripts/pppoe-connect.in ---- rp-pppoe-3.8.orig/scripts/pppoe-connect.in 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/scripts/pppoe-connect.in 2006-04-21 10:04:20.369308000 +0300 -@@ -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.8.orig/scripts/pppoe-start.in rp-pppoe-3.8/scripts/pppoe-start.in ---- rp-pppoe-3.8.orig/scripts/pppoe-start.in 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/scripts/pppoe-start.in 2006-04-21 10:04:20.369308000 +0300 -@@ -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.8.orig/scripts/pppoe-status rp-pppoe-3.8/scripts/pppoe-status ---- rp-pppoe-3.8.orig/scripts/pppoe-status 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/scripts/pppoe-status 2006-04-21 10:04:20.369308000 +0300 -@@ -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.8.orig/scripts/pppoe-stop.in rp-pppoe-3.8/scripts/pppoe-stop.in ---- rp-pppoe-3.8.orig/scripts/pppoe-stop.in 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/scripts/pppoe-stop.in 2006-04-21 10:04:20.369308000 +0300 -@@ -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.8-plugin-options.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-plugin-options.patch deleted file mode 100644 index dec2276aa0d1..000000000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-plugin-options.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nru rp-pppoe-3.8.orig/configs/pppoe.conf rp-pppoe-3.8/configs/pppoe.conf ---- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-02 17:29:41.000000000 +0300 -+++ rp-pppoe-3.8/configs/pppoe.conf 2006-04-21 10:06:46.170420000 +0300 -@@ -115,7 +115,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 -Nru rp-pppoe-3.8.orig/scripts/pppoe-connect.in rp-pppoe-3.8/scripts/pppoe-connect.in ---- rp-pppoe-3.8.orig/scripts/pppoe-connect.in 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/scripts/pppoe-connect.in 2006-04-21 10:06:58.951218750 +0300 -@@ -197,7 +197,7 @@ - - # 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 -@@ -295,7 +295,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.8-session-offset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-session-offset.patch deleted file mode 100644 index 8f53a1af4239..000000000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-session-offset.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nru rp-pppoe-3.8.orig/src/pppoe-server.c rp-pppoe-3.8/src/pppoe-server.c ---- rp-pppoe-3.8.orig/src/pppoe-server.c 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/src/pppoe-server.c 2008-01-06 14:43:39.000000000 +0200 -@@ -1693,7 +1693,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; -@@ -1776,7 +1776,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.8-username-charset.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-username-charset.patch deleted file mode 100644 index b504e849cf31..000000000000 --- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-username-charset.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Nru rp-pppoe-3.8.orig/scripts/pppoe-setup.in rp-pppoe-3.8/scripts/pppoe-setup.in ---- rp-pppoe-3.8.orig/scripts/pppoe-setup.in 2006-04-02 17:29:42.000000000 +0300 -+++ rp-pppoe-3.8/scripts/pppoe-setup.in 2006-04-21 10:09:08.411309500 +0300 -@@ -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 "" -- cgit v1.2.3-65-gdbad