public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/
@ 2016-07-19 12:04 Lars Wendler
  0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-07-19 12:04 UTC (permalink / raw
  To: gentoo-commits

commit:     f08afe78c1339c5c4b048912969dc6b95bf55fe4
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 19 12:04:11 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 12:04:11 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f08afe78

net-dialup/rp-pppoe: Removed old.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-dialup/rp-pppoe/Manifest                       |   2 -
 .../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 --------
 net-dialup/rp-pppoe/rp-pppoe-3.11-r2.ebuild        |  92 -------------
 net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild         |  81 -----------
 9 files changed, 553 deletions(-)

diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index bc19c7b..5af76cd 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,5 +1,3 @@
-DIST ppp-2.4.3.tar.gz 688092 SHA256 1e0fddb5f53613dd14ab10b25435e88092fed1eff09b4ac4448d5be01f3b0b11 SHA512 221f0925ec8bb73df740cd563a34f387ce8bf2417d2797e7f360563d8de6524e1cdf058c185eaefc9cb3703828d32c6f1b74595916683e08168ce792c5f8333e WHIRLPOOL c6a7538f107adca4f7fcdfccec5aef4ebba248958c05b94badcf0f1a2ebde667cf55f9adf3bd8eae8c0e6a37ed54c1f836117412d1135363bdfa279197981c6e
 DIST ppp-2.4.7.tar.gz 688117 SHA256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2 WHIRLPOOL 48f3251e6b955ecfdaf9260b9ea5220d9e355fff836e2f5217ee0b15bf2c93e43f8207005f58bf1f97fb8ff0c76c56df8ecd8536f63c4d84d5940458ba0ba5c3
 DIST rp-pppoe-3.11.tar.gz 223234 SHA256 86a1a4d92fcea74fa6dd45516c5975933fa978b36fafe71f76ea70b4b4747720 SHA512 cb9579ad94f6b6cfd709e8061aacac0a007f1f58ffd50bd0603f5a2b612c0cf4831febdbfeee290b97932fd30f8ae7f707d532a291124c4aeae2333131d53905 WHIRLPOOL 5e0580b469973726696adc8754f4490877b748e04395873b63a7f6b87b682e0fe4d75f53b1cab674932fe7dcf4d7c99458979926f74589e6d4e15b07505720f6
 DIST rp-pppoe-3.12.tar.gz 224125 SHA256 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1 WHIRLPOOL 3285578003c1f03037517e468829e72cc4bbaeeb78f40bbcaf27a077ab3437fa4139bb7b141311658dbff55597da42d66c31155a180ed9acfefdc73dab1fffaf
-DIST rp-pppoe-3.8.tar.gz 212931 SHA256 d916e9cfe1e62395f63a5361936fa855f6d0f0a37dc7227b394cdb725f553479 SHA512 fd929978790645639800164ad1855862f2b2ec4597a2c4c76ea7691aafd7f6ab5797fc64034eefb574dcf6dd51c51eda91c461f70bf4f557d46fee656143effc WHIRLPOOL 048789a83cfcd50d95779c2eb5f31553500288138e70c6daa511e91edcf4010e17d9d106e8f1338741b1be7b5a9bf058a6bfafea0ff27665d2e53667d5bf3427

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 1c90260..0000000
--- 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 054d419..0000000
--- 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 <sys/socket.h>
- #include <net/ethernet.h>
- #include <linux/if.h>
-@@ -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 <signal.h>

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 c39e201..0000000
--- 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 dec2276..0000000
--- 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 8f53a1a..0000000
--- 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 b504e84..0000000
--- 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=.*&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/rp-pppoe-3.11-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11-r2.ebuild
deleted file mode 100644
index 8e8b122..0000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.11-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils flag-o-matic autotools
-
-PPP_P="ppp-2.4.7"
-
-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_P}.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_prepare() {
-	# 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}/${PN}-3.10-gentoo-netscripts.patch"
-
-	epatch "${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410
-	epatch "${FILESDIR}/${PN}-3.10-plugin-options.patch"
-	epatch "${FILESDIR}/${PN}-3.10-autotools.patch"
-	epatch "${FILESDIR}/${PN}-3.10-session-offset.patch" # bug 204476
-	has_version '<sys-kernel/linux-headers-2.6.35' && \
-		epatch "${FILESDIR}/${PN}-3.10-linux-headers.patch" #334197
-	epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch"
-	epatch "${FILESDIR}/${PN}-3.11-gentoo.patch"
-
-	cd "${S}"/src || die
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /dev/ppp
-
-	cd "${S}/src" || die
-	econf --enable-plugin=../../${PPP_P}
-}
-
-src_compile() {
-	cd "${S}/src" || die
-	emake
-
-	if use X; then
-		make -C "${S}/gui" || die "gui make failed"
-	fi
-}
-
-src_install () {
-	cd "${S}/src" || die
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-
-	#Don't use compiled rp-pppoe plugin - see pkg_preinst below
-	local pppoe_plugin="${D}/etc/ppp/plugins/rp-pppoe.so"
-	if [ -f "${pppoe_plugin}" ] ; then
-		rm "${pppoe_plugin}" || die
-	fi
-
-	if use X; then
-		emake -C "${S}/gui" \
-			DESTDIR="${D}" \
-			datadir=/usr/share/doc/${PF}/ \
-			install
-		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."
-}

diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild
deleted file mode 100644
index 75b928e..0000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.8-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2013 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/penguin/pppoe/${P}.tar.gz
-	ftp://ftp.samba.org/pub/ppp/ppp-2.4.3.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}-configure.patch"
-	epatch "${FILESDIR}/${P}-autoheader.patch"
-	epatch "${FILESDIR}/${P}-session-offset.patch" # bug 204476
-
-	cd "${S}"/src
-	eautoreconf
-}
-
-src_compile() {
-	addpredict /dev/ppp
-
-	cd "${S}/src"
-	econf --enable-plugin=../../ppp-2.4.3 || 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"
-	make RPM_INSTALL_ROOT="${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"
-
-	prepalldocs
-
-	if use X; then
-		make -C "${S}/gui" install RPM_INSTALL_ROOT="${D}" \
-		datadir=/usr/share/doc/${PF}/ || 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."
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/
@ 2016-11-11 20:13 Mike Frysinger
  0 siblings, 0 replies; 6+ messages in thread
From: Mike Frysinger @ 2016-11-11 20:13 UTC (permalink / raw
  To: gentoo-commits

commit:     a8f9980e70713039baa28f2ba7dd9c67b6cffda9
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 19:27:33 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 20:12:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f9980e

net-dialup/rp-pppoe: fix build w/linux-headers-4.8+

 .../files/rp-pppoe-3.12-linux-headers.patch        | 28 ++++++++++++++++++++++
 net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild           |  1 +
 2 files changed, 29 insertions(+)

diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch
new file mode 100644
index 00000000..961eba3
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-linux-headers.patch
@@ -0,0 +1,28 @@
+the linux headers have started adding shims to not define types or structs
+when C lib headers are active, but in order to work, the C lib headers have
+to be included before the linux headers.
+
+move the netinet/in.h include up above the linux/ includes.
+
+Mike Frysinger <vapier@gentoo.org>
+
+--- a/src/pppoe.h
++++ b/src/pppoe.h
+@@ -47,6 +47,8 @@
+ #include <sys/socket.h>
+ #endif
+ 
++#include <netinet/in.h>
++
+ /* Ugly header files on some Linux boxes... */
+ #if defined(HAVE_LINUX_IF_H)
+ #include <linux/if.h>
+@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t;
+ #include <linux/if_ether.h>
+ #endif
+ 
+-#include <netinet/in.h>
+-
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <sys/types.h>
+ 

diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
index addecd9..4739e1f 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
@@ -48,6 +48,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch"
 	epatch "${FILESDIR}/${PN}-3.11-gentoo.patch"
 	epatch "${FILESDIR}/${PN}-3.11-kmode.patch" #364941
+	epatch "${FILESDIR}/${PN}-3.12-linux-headers.patch"
 
 	epatch_user
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/
@ 2016-12-11 21:15 Lars Wendler
  0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2016-12-11 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     0c44a81c4dcf50d4c01d24a497ac27698d482cde
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 21:15:21 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 21:15:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c44a81c

net-dialup/rp-pppoe: Revbump to fix path to ifconfig (bug #602344).

Removed old.

Package-Manager: portage-2.3.3

 .../rp-pppoe/files/rp-pppoe-3.11-kmode.patch       |  4 +-
 .../files/rp-pppoe-3.12-ifconfig-path.patch        | 65 ++++++++++++++++++++++
 ...p-pppoe-3.12.ebuild => rp-pppoe-3.12-r1.ebuild} | 39 +++++++------
 3 files changed, 90 insertions(+), 18 deletions(-)

diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch
index 039abd4..78a6a3b 100644
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.11-kmode.patch
@@ -1,5 +1,5 @@
---- src/configure.in.old	2015-01-07 13:08:18.929959937 +0100
-+++ src/configure.in	2015-01-07 13:08:38.253406302 +0100
+--- a/src/configure.in
++++ b/src/configure.in
 @@ -26,6 +26,7 @@
  #include<net/ethernet.h>
  #include<linux/if.h>

diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.12-ifconfig-path.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-ifconfig-path.patch
new file mode 100644
index 00000000..2a56d40
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.12-ifconfig-path.patch
@@ -0,0 +1,65 @@
+diff --git a/gui/tkpppoe.in b/gui/tkpppoe.in
+index 148c8c8..1d952d4 100755
+--- a/gui/tkpppoe.in
++++ b/gui/tkpppoe.in
+@@ -1573,7 +1573,7 @@ proc SetButtonStates {} {
+ #***********************************************************************
+ proc GetEthernetInterfaces {} {
+     set ifs {}
+-    set fp [open "|/sbin/ifconfig" "r"]
++    set fp [open "|/bin/ifconfig" "r"]
+     while {[gets $fp line] >= 0} {
+ 	if {[regexp {^eth[0-9]+} $line eth]} {
+ 	    lappend ifs $eth
+diff --git a/scripts/pppoe-connect.in b/scripts/pppoe-connect.in
+index 2124422..e7eab32 100755
+--- a/scripts/pppoe-connect.in
++++ b/scripts/pppoe-connect.in
+@@ -28,7 +28,7 @@ exec_prefix=@exec_prefix@
+ localstatedir=/var
+
+ # Paths to programs
+-IFCONFIG=/sbin/ifconfig
++IFCONFIG=/bin/ifconfig
+ PPPD=@PPPD@
+ SETSID=@SETSID@
+ PPPOE=@sbindir@/pppoe
+diff --git a/scripts/pppoe-setup.in b/scripts/pppoe-setup.in
+index b378479..4122084 100755
+--- a/scripts/pppoe-setup.in
++++ b/scripts/pppoe-setup.in
+@@ -17,7 +17,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+
+ # Paths to programs
+-IFCONFIG=/sbin/ifconfig
++IFCONFIG=/bin/ifconfig
+ PPPD=@PPPD@
+ PPPOE=@sbindir@/pppoe
+ ECHO=@ECHO@
+diff --git a/scripts/pppoe-start.in b/scripts/pppoe-start.in
+index 7e15804..b9dd7f0 100755
+--- a/scripts/pppoe-start.in
++++ b/scripts/pppoe-start.in
+@@ -29,7 +29,7 @@ exec_prefix=@exec_prefix@
+ # Paths to programs
+ CONNECT=@sbindir@/pppoe-connect
+ ECHO=@ECHO@
+-IFCONFIG=/sbin/ifconfig
++IFCONFIG=/bin/ifconfig
+
+ # Set to "C" locale so we can parse messages from commands
+ LANG=C
+diff --git a/scripts/pppoe-status b/scripts/pppoe-status
+index 9fe89cd..96d6ebd 100755
+--- a/scripts/pppoe-status
++++ b/scripts/pppoe-status
+@@ -73,7 +73,7 @@ for i in /etc/ppp/ppp*.pid /var/run/ppp*.pid ; do
+ 		exit 1
+ 	    fi
+ 	    echo "pppoe-status: Link is up and running on interface $IF"
+-	    /sbin/ifconfig $IF
++	    /bin/ifconfig $IF
+ 	    exit 0
+ 	fi
+     fi

diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
similarity index 75%
rename from net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
rename to net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
index 4739e1f..a3e172f 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.12.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.12-r1.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit eutils flag-o-matic autotools readme.gentoo
+inherit eutils flag-o-matic autotools readme.gentoo-r1
 
 PPP_P="ppp-2.4.7"
 
@@ -35,22 +35,29 @@ pkg_setup() {
 	PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV}
 }
 
-src_prepare() {
+PATCHES=(
 	# 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}/${PN}-3.10-gentoo-netscripts.patch"
-
-	epatch "${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410
-	epatch "${FILESDIR}/${PN}-3.10-plugin-options.patch"
-	epatch "${FILESDIR}/${PN}-3.10-autotools.patch"
-	has_version '<sys-kernel/linux-headers-2.6.35' && \
-		epatch "${FILESDIR}/${PN}-3.10-linux-headers.patch" #334197
-	epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch"
-	epatch "${FILESDIR}/${PN}-3.11-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-3.11-kmode.patch" #364941
-	epatch "${FILESDIR}/${PN}-3.12-linux-headers.patch"
-
-	epatch_user
+	"${FILESDIR}/${PN}-3.10-gentoo-netscripts.patch"
+
+	"${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410
+	"${FILESDIR}/${PN}-3.10-plugin-options.patch"
+	"${FILESDIR}/${PN}-3.10-autotools.patch"
+	"${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch"
+	"${FILESDIR}/${PN}-3.11-gentoo.patch"
+	"${FILESDIR}/${PN}-3.11-kmode.patch" #364941
+	"${FILESDIR}/${PN}-3.12-linux-headers.patch"
+	"${FILESDIR}/${PN}-3.12-ifconfig-path.patch" #602344
+)
+
+src_prepare() {
+	if has_version '<sys-kernel/linux-headers-2.6.35' ; then
+		PATCHES+=(
+			"${FILESDIR}/${PN}-3.10-linux-headers.patch" #334197
+		)
+	fi
+
+	default
 
 	cd "${S}"/src || die
 	eautoreconf


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/
@ 2018-11-28 12:16 Lars Wendler
  0 siblings, 0 replies; 6+ messages in thread
From: Lars Wendler @ 2018-11-28 12:16 UTC (permalink / raw
  To: gentoo-commits

commit:     04d0c19570bd6043f9e6d1d560f6875899acb33b
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 28 12:15:40 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Nov 28 12:15:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d0c195

net-dialup/rp-pppoe: Removed old.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 net-dialup/rp-pppoe/Manifest                       |  1 -
 .../files/rp-pppoe-3.10-session-offset.patch       | 21 -----
 net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild        | 97 ----------------------
 3 files changed, 119 deletions(-)

diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 1644caa4947..fac075dbc80 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,4 +1,3 @@
 DIST ppp-2.4.7.tar.gz 688117 BLAKE2B e1c94ce31d98674536929d19e956e4013eb2b02c20c34e6184c0b99b50262ad1cd7fb6f4a1ed302872527a0c164af340e15ad1e2eaf191392c3f6ae2de21f5dd SHA512 e34ce24020af6a73e7a26c83c4f73a9c83fa455b7b363794dba27bf01f70368be06bff779777843949bd77f4bc9385d6ad455ea48bf8fff4e0d73cc8fef16ae2
-DIST rp-pppoe-3.11.tar.gz 223234 BLAKE2B 48a733f2b454284934a123383c32484e5715f131dd45e78a1dd8844dc7e9da74a62f2d4e144b8d57e30652be6eefef480d88a7b61fade7312a47ea750ddcbcda SHA512 cb9579ad94f6b6cfd709e8061aacac0a007f1f58ffd50bd0603f5a2b612c0cf4831febdbfeee290b97932fd30f8ae7f707d532a291124c4aeae2333131d53905
 DIST rp-pppoe-3.12.tar.gz 224125 BLAKE2B 27fe75e794624acaeb81806d67a6f4e5601a6b6a466100898ae3cccc8acb5f72ad9275fecd28735df1b01162ff0e60b74ad0373a24a60c7a5731b0744b86e019 SHA512 1b9e4c806fcbad1bc21f7b74a780ae98682b10a69d91fb08df6dbd1fff86f6271995ebded43f926f8249a17cdddb541edccbbb3ee28e1a2dc89173ad61cd3de1
 DIST rp-pppoe-3.13.tar.gz 224204 BLAKE2B 8ac3cd59c809f7f2e10fea580dfbda20fc99ae443851513cdc6d0ba8e8df848d7bd6f10d2b0ac6592bc4b48ee1945c299d3cbd73eb9dd6ddc23d0c1c39cd1b77 SHA512 e29ddc39252a0e71d509096e275f6f195f86a5871052dd558e8fb174d13086b1c601e6652f45619279a1eb2fbda96ba0ec85dea9edb27459af56ded4a52b5f36

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 303ecfa9e4b..00000000000
--- 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/rp-pppoe-3.11-r3.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
deleted file mode 100644
index 256fe45f563..00000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.11-r3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic autotools readme.gentoo
-
-PPP_P="ppp-2.4.7"
-
-DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-HOMEPAGE="https://www.roaringpenguin.com/products/pppoe"
-SRC_URI="http://www.roaringpenguin.com/files/download/${P}.tar.gz
-	https://www.samba.org/ftp/pub/ppp/${PPP_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="tk"
-
-RDEPEND="
-	net-dialup/ppp:=
-	tk? ( dev-lang/tk )
-"
-DEPEND=">=sys-kernel/linux-headers-2.6.25
-	${RDEPEND}"
-
-DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
-
-pkg_setup() {
-	# This is needed in multiple phases
-	PPPD_VER=$(best_version net-dialup/ppp)
-	PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
-	PPPD_VER=${PPPD_VER%%-*} #reduce it to ${PV}
-}
-
-src_prepare() {
-	# 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}/${PN}-3.10-gentoo-netscripts.patch"
-
-	epatch "${FILESDIR}/${PN}-3.10-username-charset.patch" # bug 82410
-	epatch "${FILESDIR}/${PN}-3.10-plugin-options.patch"
-	epatch "${FILESDIR}/${PN}-3.10-autotools.patch"
-	epatch "${FILESDIR}/${PN}-3.10-session-offset.patch" # bug 204476
-	has_version '<sys-kernel/linux-headers-2.6.35' && \
-		epatch "${FILESDIR}/${PN}-3.10-linux-headers.patch" #334197
-	epatch "${FILESDIR}/${PN}-3.10-posix-source-sigaction.patch"
-	epatch "${FILESDIR}/${PN}-3.11-gentoo.patch"
-	epatch "${FILESDIR}/${PN}-3.11-kmode.patch" #364941
-
-	cd "${S}"/src || die
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /dev/ppp
-
-	cd "${S}/src" || die
-	econf --enable-plugin=../../ppp-${PPPD_VER}
-}
-
-src_compile() {
-	cd "${S}/src" || die
-	emake
-
-	if use tk; then
-		emake -C "${S}/gui" || die "gui make failed"
-	fi
-}
-
-src_install () {
-	cd "${S}/src" || die
-	emake DESTDIR="${D}" docdir=/usr/share/doc/${PF} install
-
-	#Don't use compiled rp-pppoe plugin - see pkg_preinst below
-	local pppoe_plugin="${D}/etc/ppp/plugins/rp-pppoe.so"
-	if [ -f "${pppoe_plugin}" ] ; then
-		rm "${pppoe_plugin}" || die
-	fi
-
-	if use tk; then
-		emake -C "${S}/gui" \
-			DESTDIR="${D}" \
-			datadir=/usr/share/doc/${PF}/ \
-			install
-		dosym /usr/share/doc/${PF}/tkpppoe /usr/share/tkpppoe
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	# Use the rp-pppoe plugin that comes with net-dialup/pppd
-	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
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/
@ 2023-05-13  3:31 Sam James
  0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2023-05-13  3:31 UTC (permalink / raw
  To: gentoo-commits

commit:     364787c2116f366f1303a7af1751035ec90c5266
Author:     Jaco Kroon <jaco <AT> uls <DOT> co <DOT> za>
AuthorDate: Thu May 11 12:01:50 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 13 03:30:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=364787c2

net-dialup/rp-pppoe: 4.0 ar fixes

Closes: https://bugs.gentoo.org/906117
Signed-off-by: Jaco Kroon <jaco <AT> uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/30985
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/rp-pppoe-4.0-ar_environment.patch        | 81 ++++++++++++++++++++++
 net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild            |  4 +-
 net-dialup/rp-pppoe/rp-pppoe-9999.ebuild           |  2 -
 3 files changed, 84 insertions(+), 3 deletions(-)

diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-4.0-ar_environment.patch b/net-dialup/rp-pppoe/files/rp-pppoe-4.0-ar_environment.patch
new file mode 100644
index 000000000000..651dc9078cda
--- /dev/null
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-4.0-ar_environment.patch
@@ -0,0 +1,81 @@
+From 7686d18a896118d4b99b15313edac34e6f5a2370 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Thu, 11 May 2023 13:44:06 +0200
+Subject: [PATCH 1/2] libevent: avoid failure in case ar isn't ar but something
+ else.
+
+---
+ src/libevent/Makefile.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/libevent/Makefile.in b/src/libevent/Makefile.in
+index 5f4f43f..02ebe21 100644
+--- a/libevent/Makefile.in
++++ b/libevent/Makefile.in
+@@ -14,13 +14,12 @@ OBJS=event.o event_tcp.o hash.o event_sig.o
+ SRCS=$(OBJS:.o=.c)
+ HDRS=event.h event_tcp.h eventpriv.h hash.h
+ CFLAGS=@CFLAGS@ -I.. $(DEFINES)
+-AR=ar
+ 
+ all: libevent.a
+ 
+ libevent.a: $(OBJS)
+ 	rm -f libevent.a
+-	$(AR) -cq libevent.a $(OBJS)
++	@AR@ -cq libevent.a $(OBJS)
+ 	@RANLIB@ libevent.a
+ 
+ event.o: event.c $(HDRS)
+
+From 162bf8bf6b9c6776e3b6ac000a1e88afe49d9d31 Mon Sep 17 00:00:00 2001
+From: Jaco Kroon <jaco@uls.co.za>
+Date: Thu, 11 May 2023 13:49:48 +0200
+Subject: [PATCH 2/2] ./configure - marginally improve ar detection.
+
+---
+ src/configure    | 6 +++++-
+ src/configure.ac | 6 +++++-
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/configure b/src/configure
+index 7eb80d0..9a31790 100755
+--- a/configure
++++ b/configure
+@@ -3088,7 +3088,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+   if test "x$ac_ct_AR" = x; then
+-    AR="/bin/false"
++    AR=""
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+@@ -3103,6 +3103,10 @@ else
+ fi
+ 
+ 
++if test "no$AR" = no ; then
++	as_fn_error $? "ar is a required program" "$LINENO" 5
++fi
++
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+diff --git a/src/configure.ac b/src/configure.ac
+index cb7a094..a09241a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,7 +13,11 @@ AC_PREFIX_DEFAULT(/usr)
+ dnl Checks for programs.
+ AC_PROG_CC
+ AC_PROG_RANLIB
+-AC_CHECK_TOOL([AR],[ar],[/bin/false])
++AC_CHECK_TOOL([AR],[ar])
++
++if test "no$AR" = no ; then
++	AC_ERROR(ar is a required program)
++fi
+ 
+ dnl Checks for libraries.
+ 

diff --git a/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild b/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild
index eeb1e261948c..f156559e1489 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-4.0.ebuild
@@ -28,7 +28,9 @@ DEPEND=">=sys-kernel/linux-headers-2.6.25
 	elibc_musl? ( net-libs/ppp-defs )
 	${RDEPEND}"
 
-DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
+PATCHES=(
+	"${FILESDIR}/rp-pppoe-4.0-ar_environment.patch"
+)
 
 pkg_setup() {
 	# This is needed in multiple phases

diff --git a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
index eeb1e261948c..16b62dea4da5 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-9999.ebuild
@@ -28,8 +28,6 @@ DEPEND=">=sys-kernel/linux-headers-2.6.25
 	elibc_musl? ( net-libs/ppp-defs )
 	${RDEPEND}"
 
-DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
-
 pkg_setup() {
 	# This is needed in multiple phases
 	PPPD_VER="$(best_version net-dialup/ppp)"


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/
@ 2024-10-19  1:23 Mike Gilbert
  0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2024-10-19  1:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e3012081ca0c8cb575a1630767f693bd124a0874
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 20:54:53 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Oct 19 01:23:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3012081

net-dialup/rp-pppoe: drop 3.15-r2

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-dialup/rp-pppoe/Manifest                       |  2 -
 .../files/rp-pppoe-3.15-no_max_interfaces.patch    | 91 ---------------------
 net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild        | 94 ----------------------
 3 files changed, 187 deletions(-)

diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 5b877da0c975..4f51e9b0b243 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -1,3 +1 @@
-DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5eec2257350a41206bf05882aa7e2aa0e2cb0944a962d77e23451f604376168298d5ef99c70b134989c35261bae6046b882 SHA512 0ae0f91e8b9cfcd7d1a1af6cb55f7972e9bc029cd4b10469d5be696ae750d6aabb5f59426e9bf6f700d5a56decd3ddf85a097bb98ae1d06f0b167967b5b8b8ea
-DIST rp-pppoe-3.15.tar.gz 224966 BLAKE2B 85eda606677b71e35ed3b9389db0d01ac1f16c7b40cc31b3adf31946b18454b77867a5e8822386e9fb08455399733242c4c074c2fee6f1c4d62fe23b44e82707 SHA512 a156c084e57361ab6a464c3205ffb85cf86d02f71f17f92c9567f1ab0ed300f10030832fd232084699dc842ac4891efc8c54c8165587bfc7b4c92724318a60d9
 DIST rp-pppoe-4.0.tar.gz 139539 BLAKE2B ba9f11e547dafdacf6fc4d525488a4ac0279b06d545e0c116e568c92a45eb8ab558ca9112f1debecacde5401cb5974eacdf972b1b4cd813711589b8181e918de SHA512 faebe543988b1ffacd4d9bf55a3ec21f3a541f9232ba6c7b6fa0e8103d6c2b7b1c358e7f7bc8f99bebb24b2f7bdcc2f46ba1ef4c23e6dd34062f8f28114e7aea

diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch
deleted file mode 100644
index ecf70f09ddc6..000000000000
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.15-no_max_interfaces.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-pppoe-server: MAX_INTERFACES 64 is a problem for ULS.
-
-We currently require 77 interfaces, this code just lifts the limit entirely and
-will keep adding interfaces for as much RAM as you have to store an array as
-required.
-
-Signed-off-by: Jaco Kroon <jaco@uls.co.za>
-
-diff -rau rp-pppoe-3.15/src.o/pppoe-server.c rp-pppoe-3.15/src/pppoe-server.c
---- rp-pppoe-3.15.o/src/pppoe-server.c	2021-05-07 15:18:00.000000000 +0200
-+++ rp-pppoe-3.15/src/pppoe-server.c	2021-12-07 21:53:46.755693003 +0200
-@@ -115,8 +115,9 @@
- ClientSession *BusySessions = NULL;
- 
- /* Interfaces we're listening on */
--Interface interfaces[MAX_INTERFACES];
-+Interface *interfaces = NULL;
- int NumInterfaces = 0;
-+int MaxInterfaces = 0;
- 
- /* The number of session slots */
- size_t NumSessionSlots;
-@@ -1235,11 +1236,16 @@
- 	exit(1);
-     }
- 
--    memset(interfaces, 0, sizeof(interfaces));
--
-     /* Initialize syslog */
-     openlog("pppoe-server", LOG_PID, LOG_DAEMON);
- 
-+    MaxInterfaces = INIT_INTERFACES;
-+    interfaces = malloc(sizeof(*interfaces) * INIT_INTERFACES);
-+    if (!interfaces) {
-+	fprintf(stderr, "Out of memory allocating initial interfaces.\n");
-+	exit(1);
-+    }
-+
-     /* Default number of session slots */
-     NumSessionSlots = DEFAULT_MAX_SESSIONS;
-     MaxSessionsPerMac = 0; /* No limit */
-@@ -1406,10 +1412,14 @@
- 	    break;
- 
- 	case 'I':
--	    if (NumInterfaces >= MAX_INTERFACES) {
--		fprintf(stderr, "Too many -I options (max %d)\n",
--			MAX_INTERFACES);
--		exit(EXIT_FAILURE);
-+	    if (NumInterfaces >= MaxInterfaces) {
-+		MaxInterfaces *= 2;
-+		interfaces = realloc(interfaces, sizeof(*interfaces) * MaxInterfaces);
-+		if (!interfaces) {
-+		    fprintf(stderr, "Memory allocation failure trying to increase MaxInterfaces to %d\n",
-+			    MaxInterfaces);
-+		    exit(EXIT_FAILURE);
-+		}
- 	    }
- 	    found = 0;
- 	    for (i=0; i<NumInterfaces; i++) {
-@@ -1419,6 +1429,7 @@
- 		}
- 	    }
- 	    if (!found) {
-+		memset(&interfaces[NumInterfaces], 0, sizeof(*interfaces));
- 		strncpy(interfaces[NumInterfaces].name, optarg, IFNAMSIZ);
- 		NumInterfaces++;
- 	    }
-diff -rau rp-pppoe-3.15/src.o/pppoe-server.h rp-pppoe-3.15/src/pppoe-server.h
---- rp-pppoe-3.15/src.o/pppoe-server.h	2021-05-07 15:18:00.000000000 +0200
-+++ rp-pppoe-3.15/src/pppoe-server.h	2021-12-07 21:44:09.945578094 +0200
-@@ -97,8 +97,8 @@
- /* Hack for daemonizing */
- #define CLOSEFD 64
- 
--/* Max. number of interfaces to listen on */
--#define MAX_INTERFACES 64
-+/* Initial Max. number of interfaces to listen on */
-+#define INIT_INTERFACES 8
- 
- /* Max. 64 sessions by default */
- #define DEFAULT_MAX_SESSIONS 64
-@@ -107,7 +107,7 @@
- extern ClientSession *Sessions;
- 
- /* Interfaces we're listening on */
--extern Interface interfaces[MAX_INTERFACES];
-+extern Interface *interfaces;
- extern int NumInterfaces;
- 
- /* The number of session slots */

diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
deleted file mode 100644
index b893af0a1d57..000000000000
--- a/net-dialup/rp-pppoe/rp-pppoe-3.15-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools readme.gentoo-r1 toolchain-funcs
-
-PATCHSET="${PN}-3.14-patches-01"
-PATCHES=(
-	"${FILESDIR}/rp-pppoe-3.15-no_max_interfaces.patch"
-)
-
-DESCRIPTION="A user-mode PPPoE client and server suite for Linux"
-HOMEPAGE="https://dianne.skoll.ca/projects/rp-pppoe/ https://salsa.debian.org/dskoll/rp-pppoe"
-SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
-	https://dev.gentoo.org/~polynomial-c/dist/${PATCHSET}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="tk"
-
-RDEPEND="
-	<net-dialup/ppp-2.5:=
-	sys-apps/iproute2
-	tk? ( dev-lang/tk:= )
-"
-DEPEND=">=sys-kernel/linux-headers-2.6.25
-	elibc_musl? ( net-libs/ppp-defs )
-	${RDEPEND}"
-
-DOC_CONTENTS="Use pppoe-setup to configure your dialup connection"
-
-pkg_setup() {
-	# This is needed in multiple phases
-	PPPD_VER="$(best_version net-dialup/ppp)"
-	PPPD_VER="${PPPD_VER#*/*-}" #reduce it to ${PV}-${PR}
-	PPPD_VER="${PPPD_VER%%-*}" #reduce it to ${PV}
-
-	PPPD_PLUGIN_DIR="/usr/$(get_libdir)/pppd/${PPPD_VER}"
-}
-
-src_prepare() {
-	if ! use elibc_musl ; then
-		rm "${WORKDIR}/patches/${PN}-3.14-musl.patch" || die
-	fi
-
-	rm "${WORKDIR}/patches/${PN}-3.14-ifconfig-path.patch" || die
-
-	eapply "${WORKDIR}/patches"
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	cd "${S}"/src || die
-	eautoreconf
-}
-
-src_configure() {
-	addpredict /dev/ppp
-
-	cd src || die
-
-	econf --enable-plugin=/usr/include/pppd
-}
-
-src_compile() {
-	cd src || die
-	emake AR="$(tc-getAR)" PLUGIN_PATH=rp-pppoe.so PLUGIN_DIR="${PPPD_PLUGIN_DIR}"
-
-	if use tk ; then
-		emake -C "${S}/gui"
-	fi
-}
-
-src_install() {
-	cd src || die
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" PLUGIN_DIR="${PPPD_PLUGIN_DIR}" install
-
-	# We don't need this README file here.
-	rm "${ED}${PPPD_PLUGIN_DIR}/README" || die "Error removing ${PPPD_PLUGIN_DIR}/README from installation"
-
-	if use tk ; then
-		emake -C "${S}/gui" \
-			DESTDIR="${D}" \
-			datadir=/usr/share/doc/${PF}/ \
-			install
-		dosym doc/${PF}/tkpppoe /usr/share/tkpppoe
-	fi
-
-	newinitd "${FILESDIR}"/pppoe-server.initd pppoe-server
-	newconfd "${FILESDIR}"/pppoe-server.confd pppoe-server
-
-	readme.gentoo_create_doc
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-10-19  1:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-28 12:16 [gentoo-commits] repo/gentoo:master commit in: net-dialup/rp-pppoe/, net-dialup/rp-pppoe/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2024-10-19  1:23 Mike Gilbert
2023-05-13  3:31 Sam James
2016-12-11 21:15 Lars Wendler
2016-11-11 20:13 Mike Frysinger
2016-07-19 12:04 Lars Wendler

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox