From 829fe87b14eb21bbbea42521aff0020cd59e4bdc Mon Sep 17 00:00:00 2001 From: Dai Caiyun Date: Wed, 6 Jan 2016 21:00:33 -0800 Subject: rp-pppoe: 3.11 -> 3.12 Upgrade rp-pppoe from 3.11 to 3.12. Signed-off-by: Dai Caiyun Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- .../rp-pppoe-3.11/configure.in-Error-fix.patch | 59 -------- .../rp-pppoe/rp-pppoe-3.11/configure.patch | 11 -- .../rp-pppoe-3.11/configure_in_cross.patch | 156 --------------------- .../discard-use-of-dnl-in-Makefile.am.patch | 27 ---- .../rp-pppoe-3.11/dont-swallow-errors.patch | 28 ---- .../rp-pppoe/rp-pppoe-3.11/pppoe-server.default | 22 --- .../rp-pppoe/rp-pppoe-3.11/pppoe-server.init | 59 -------- .../rp-pppoe/rp-pppoe-3.11/pppoe-server.service | 11 -- .../rp-pppoe-3.11/pppoe-src-restrictions.patch | 20 --- .../rp-pppoe/rp-pppoe-3.11/top-autoconf.patch | 27 ---- .../rp-pppoe/rp-pppoe-3.11/update-config.patch | 32 ----- .../rp-pppoe-3.12/configure.in-Error-fix.patch | 59 ++++++++ .../rp-pppoe/rp-pppoe-3.12/configure.patch | 11 ++ .../rp-pppoe-3.12/configure_in_cross.patch | 156 +++++++++++++++++++++ .../discard-use-of-dnl-in-Makefile.am.patch | 27 ++++ .../rp-pppoe-3.12/dont-swallow-errors.patch | 28 ++++ .../rp-pppoe/rp-pppoe-3.12/pppoe-server.default | 22 +++ .../rp-pppoe/rp-pppoe-3.12/pppoe-server.init | 59 ++++++++ .../rp-pppoe/rp-pppoe-3.12/pppoe-server.service | 11 ++ .../rp-pppoe-3.12/pppoe-src-restrictions.patch | 20 +++ .../rp-pppoe/rp-pppoe-3.12/top-autoconf.patch | 27 ++++ .../rp-pppoe/rp-pppoe-3.12/update-config.patch | 32 +++++ .../recipes-protocols/rp-pppoe/rp-pppoe_3.11.bb | 70 --------- .../recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb | 70 +++++++++ 24 files changed, 522 insertions(+), 522 deletions(-) delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.in-Error-fix.patch delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.patch delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure_in_cross.patch delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/discard-use-of-dnl-in-Makefile.am.patch delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/dont-swallow-errors.patch delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.default delete mode 100755 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.init delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.service delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-src-restrictions.patch delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/top-autoconf.patch delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/update-config.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default create mode 100755 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch delete mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.11.bb create mode 100644 meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb (limited to 'meta-networking') diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.in-Error-fix.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.in-Error-fix.patch deleted file mode 100644 index 2661fd3dbc..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.in-Error-fix.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 71956de46feef962dc0645af4c81ae074ca3b818 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Wed, 19 Aug 2015 13:52:57 +0900 -Subject: [PATCH] configure.in: Error fix. - -the error is: conftest.c:9:28: fatal error: ac_nonexistent.h: -No such file or directory #include - -Upstream-Status: pending - -Signed-off-by: Li Xin ---- - src/configure.in | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -diff --git a/src/configure.in b/src/configure.in -index 0b23df5..31c7fbc 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -193,36 +193,6 @@ if test "$GCC" = yes; then - CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" - fi - --dnl Figure out packing order of structures --AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[ --if test "${rpppoe_cv_pack_bitfields+set}" != set ; then --AC_TRY_RUN([ --union foo { -- struct bar { -- unsigned int ver:4; -- unsigned int type:4; -- } bb; -- unsigned char baz; --}; -- --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 1) --fi --]) -- - if test "$rpppoe_cv_pack_bitfields" = "rev" ; then - AC_MSG_RESULT(reversed) - AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.patch deleted file mode 100644 index 1380ba4891..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: rp-pppoe-3.8/configure.in -=================================================================== ---- rp-pppoe-3.8.orig/configure.in 2014-07-16 19:31:33.549991388 +0000 -+++ rp-pppoe-3.8/configure.in 2014-07-17 22:01:18.116590827 +0000 -@@ -1,4 +1,4 @@ --AC_INIT(src/pppoe.c) --AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) -+AC_INIT([rp-pppoe], [3.8]) -+AM_INIT_AUTOMAKE([foreign]) - AC_CONFIG_SUBDIRS(src) - AC_OUTPUT(Makefile) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure_in_cross.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure_in_cross.patch deleted file mode 100644 index 88cf7e6777..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/configure_in_cross.patch +++ /dev/null @@ -1,156 +0,0 @@ -From cab02076afb808a43c6ff3d7b1c64e71f5a1b397 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Wed, 19 Aug 2015 12:17:03 +0900 -Subject: [PATCH] configure in cross - -Update the configure script to cross-compiling with OE. This hard-codes -a few target paths, reworks a few tests to be more friendly for cross -and drops other tests. - -Upstream-Status: Inappropriate [build system specific changes] - ---- - src/configure.in | 66 ++++++++++++++------------------------------------------ - 1 file changed, 16 insertions(+), 50 deletions(-) - -diff --git a/src/configure.in b/src/configure.in -index e194295..82d64d6 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -5,6 +5,13 @@ AC_INIT(pppoe.c) - dnl pppd directory for kernel-mode PPPoE - PPPD_DIR=ppp-2.4.1.pppoe2 - -+dnl hard code some paths -+PPPD=/usr/sbin/pppd -+ID=/usr/bin/id -+ECHO=/bin/echo -+AC_ARG_VAR(PPPD) -+AC_ARG_VAR(ID) -+ - AC_CONFIG_HEADER(config.h) - - AC_PREFIX_DEFAULT(/usr) -@@ -45,7 +52,7 @@ ac_cv_struct_sockaddr_ll=no) - 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], [], [Have struct SOCKADDR_LL]) - fi - - dnl Check for N_HDLC line discipline -@@ -56,7 +63,7 @@ AC_TRY_COMPILE([#include ], - 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], [], [Have N_HDLC]) - fi - - AC_ARG_ENABLE(plugin, [ --enable-plugin=pppd_src_path build pppd plugin], ac_cv_pluginpath=$enableval, ac_cv_pluginpath=no) -@@ -104,7 +111,7 @@ PPPD_INCDIR="" - 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], [], [Have kernel PPPoE]) - PPPD_INCDIR=$ac_cv_pluginpath - fi - fi -@@ -114,7 +121,7 @@ if test "$PPPD_INCDIR" = "" ; then - fi - - if test "$ac_cv_debugging" = "yes" ; then -- AC_DEFINE(DEBUGGING_ENABLED) -+ AC_DEFINE([DEBUGGING_ENABLED], [], [Debugging enabled]) - fi - - AC_SUBST(LINUX_KERNELMODE_PLUGIN) -@@ -140,15 +147,8 @@ AC_CHECK_SIZEOF(unsigned short) - AC_CHECK_SIZEOF(unsigned int) - AC_CHECK_SIZEOF(unsigned long) - --dnl Check for location of pppd --AC_PATH_PROG(PPPD, pppd, NOTFOUND, $PATH:/sbin:/usr/sbin:/usr/local/sbin) --AC_PATH_PROG(ECHO, echo, echo) -- --dnl Check for setsid (probably Linux-specific) --AC_PATH_PROG(SETSID, setsid, "", $PATH:/sbin:/usr/sbin:/usr/local/sbin) -- - dnl Check for an "id" which accepts "-u" option -- hack for Solaris. --AC_PATH_PROG(ID, id, "", /usr/xpg4/bin:$PATH) -+dnl AC_PATH_PROG(ID, id, "", /usr/xpg4/bin:$PATH) - - dnl Check for Linux-specific kernel support for PPPoE - AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) -@@ -193,44 +193,8 @@ if test "$GCC" = yes; then - CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" - fi - --dnl If we couldn't find pppd, die --if test "$PPPD" = "NOTFOUND"; then -- AC_MSG_WARN([*** Oops! I couldn't find pppd, the PPP daemon anywhere.]) -- AC_MSG_WARN([*** You must install pppd, version 2.3.10 or later.]) -- AC_MSG_WARN([*** I will keep going, but it may not work.]) -- PPPD=pppd --fi -- --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}'` -- --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) -- AC_MSG_WARN([*** Oops! Your version of pppd is $PPPD_VERSION, which is too old.]) -- AC_MSG_WARN([*** You need at least 2.3.7 (2.3.10 or newer recommended.]) -- AC_MSG_WARN([*** I will keep going, but it may not work.]) -- ;; -- --2.3.7|2.3.8|2.3.9) -- AC_MSG_WARN([*** Warning. Your version of pppd is $PPPD_VERSION. You will]) -- AC_MSG_WARN([*** not be able to use connect-on-demand. Upgrade to pppd]) -- AC_MSG_WARN([*** 2.3.10 or newer if you need connect-on-demand.]) -- ;; -- --2*|3*|4*|5*|6*|7*|8*|9*) -- ;; -- --*) -- AC_MSG_WARN([*** Oops. I cannot figure out what version of pppd you have.]) -- AC_MSG_WARN([*** All I got back was '$PPPD_VERSION']) -- AC_MSG_WARN([*** I will keep going, but it may not work.]) -- ;; --esac -- - dnl Figure out packing order of structures --AC_MSG_CHECKING([packing order of bit fields]) -+AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[ - if test "${rpppoe_cv_pack_bitfields+set}" != set ; then - AC_TRY_RUN([ - union foo { -@@ -257,10 +221,11 @@ main(void) - }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, - $ECHO "no defaults for cross-compiling"; exit 0) - fi -+]) - - if test "$rpppoe_cv_pack_bitfields" = "rev" ; then - AC_MSG_RESULT(reversed) -- AC_DEFINE(PACK_BITFIELDS_REVERSED) -+ AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) - else - AC_MSG_RESULT(normal) - fi -@@ -324,6 +289,7 @@ AC_SUBST(PPPOE_SERVER_DEPS) - AC_SUBST(RDYNAMIC) - AC_SUBST(LIBEVENT) - AC_SUBST(ECHO) -+AC_SUBST(HAVE_STRUCT_SOCKADDR_LL) - AC_SUBST(LDFLAGS) - - datadir_evaluated=`eval echo $datadir` --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/discard-use-of-dnl-in-Makefile.am.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/discard-use-of-dnl-in-Makefile.am.patch deleted file mode 100644 index 8b7886485a..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/discard-use-of-dnl-in-Makefile.am.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 611c9fe719c5aa264a2ad2eb920cf4522ae2ddec Mon Sep 17 00:00:00 2001 -From: Ting Liu -Date: Tue, 12 Jun 2012 14:26:16 -0400 -Subject: [PATCH] discard use of dnl in Makefile.am - -Since Makefile.am is not processed by m4, but by automake, 'dnl' does -not introduce a comment. - -Signed-off-by: Ting Liu ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index eff6977..3091c33 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,5 +1,5 @@ - PACKAGE = rp-pppoe - VERSION = 3.8 - --dnl AM_CFLAGS = -Wall -DDEBUG -+##dnl AM_CFLAGS = -Wall -DDEBUG - SUBDIRS = src --- -1.7.6.5 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/dont-swallow-errors.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/dont-swallow-errors.patch deleted file mode 100644 index f61337f153..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/dont-swallow-errors.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bbdadb803b19f002e76e7bb5ce3faf770dd7c413 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Wed, 19 Aug 2015 12:33:41 +0900 -Subject: [PATCH] don't swallow errors - -Further fixup to the configure scripts to not swallow errors - -Upstream-Status: Pending ---- - src/configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/configure.in b/src/configure.in -index 82d64d6..0b23df5 100644 ---- a/src/configure.in -+++ b/src/configure.in -@@ -219,7 +219,7 @@ main(void) - return 2; - } - }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, --$ECHO "no defaults for cross-compiling"; exit 0) -+$ECHO "no defaults for cross-compiling"; exit 1) - fi - ]) - --- -1.8.4.2 - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.default b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.default deleted file mode 100644 index 996d57f3cf..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.default +++ /dev/null @@ -1,22 +0,0 @@ -# PPPoE Server options - -# Maximum segment size, not used for in kernel PPPoE -#MSS=1412 - -# Device(s) - Space seperated list of devices to listen on -#DEVICES="eth1" - -# Local IP -#LOCAL_IP=10.0.0.1 - -# Starting remote IP -#REMOTE_IP=10.67.15.1 - -# Service name -#SERVICE_NAME="acme" - -# Maximum number of sessions, default is 16 -#MAX_SESSIONS=64 - -# Access concentrator name, default is the hostname -#ACCESS_CONCENTRATOR_NAME="pppoe-rtr-1" diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.init b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.init deleted file mode 100755 index 21afe0be39..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.init +++ /dev/null @@ -1,59 +0,0 @@ -#! /bin/sh - -test -f /usr/sbin/pppoe-server || exit 0 -test -f /etc/default/pppoe-server && . /etc/default/pppoe-server - -case $1 in - start) - OPTIONS="" - if [ -n "$MSS" ]; then - OPTIONS="$OPTIONS -m $MSS" - fi - if [ -n "$DEVICES" ]; then - for i in $DEVICES; do - OPTIONS="$OPTIONS -I $i" - done - fi - if [ -n "$LOCAL_IP" ]; then - OPTIONS="$OPTIONS -L $LOCAL_IP" - fi - if [ -n "$REMOTE_IP" ]; then - OPTIONS="$OPTIONS -R $REMOTE_IP" - fi - if [ -n "$SERVICE_NAME" ]; then - OPTIONS="$OPTIONS -S $SERVICE_NAME" - fi - if [ -n "$MAX_SESSIONS" ]; then - OPTIONS="$OPTIONS -N $MAX_SESSIONS" - fi - if [ -n "$ACCESS_CONCENTRATOR_NAME" ]; then - OPTIONS="$OPTIONS -C $ACCESS_CONCENTRATOR_NAME" - fi - echo -n "Starting PPPoE server: pppoe-server" - start-stop-daemon --start --quiet --exec /usr/sbin/pppoe-server -- $OPTIONS - echo "." - ;; - stop) - echo -n "Stopping PPPoE server: pppoe-server" - start-stop-daemon --stop --quiet --exec /usr/sbin/pppoe-server -- $OPTIONS - echo "." - ;; - status) - pid=$(pidof pppoe-server) - if [ -n "$pid" ] ; then - echo "Running with pid $pid" - else - echo "Not running" - fi - ;; - restart|force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/pppoe-server {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.service b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.service deleted file mode 100644 index 41e0b9e851..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-server.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=PPPOE Service -After=network.target - -[Service] -Type=forking -EnvironmentFile=-@SYSCONFDIR@/default/pppoe-server -ExecStart=@SBINDIR@/pppoe-server - -[Install] -WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-src-restrictions.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-src-restrictions.patch deleted file mode 100644 index bcf4d1164d..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/pppoe-src-restrictions.patch +++ /dev/null @@ -1,20 +0,0 @@ -Relax restrictions on the PPPoE src address, as per debian bug -293811: - - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293811 - -Upstream-Status: Inappropriate [Backport from Debian] - ---- rp-pppoe-3.8.orig/src/discovery.c -+++ rp-pppoe-3.8/src/discovery.c -@@ -376,8 +376,8 @@ - if (!packetIsForMe(conn, &packet)) continue; - - if (packet.code == CODE_PADO) { -- if (NOT_UNICAST(packet.ethHdr.h_source)) { -- printErr("Ignoring PADO packet from non-unicast MAC address"); -+ if (BROADCAST(packet.ethHdr.h_source)) { -+ printErr("Ignoring broadcast PADO packet"); - continue; - } - parsePacket(&packet, parsePADOTags, &pc); diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/top-autoconf.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/top-autoconf.patch deleted file mode 100644 index 4fe73d0171..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/top-autoconf.patch +++ /dev/null @@ -1,27 +0,0 @@ -The autoconf stuff is all in a subdirectory, which is rather annoying -as OE expects patches to be applied and autoconf stuff to be done in -S. This adds enough autoconf at the top level to allow it to be -called there - all it does is run a sub autoconf stuff in the src -directory. - -Upstream-Status: Inappropriate [build system specific change] - -Index: rp-pppoe-3.8/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rp-pppoe-3.8/Makefile.am 2007-06-08 15:58:16.000000000 +1000 -@@ -0,0 +1,5 @@ -+PACKAGE = rp-pppoe -+VERSION = 3.8 -+ -+dnl AM_CFLAGS = -Wall -DDEBUG -+SUBDIRS = src -Index: rp-pppoe-3.8/configure.in -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rp-pppoe-3.8/configure.in 2007-06-08 15:58:16.000000000 +1000 -@@ -0,0 +1,4 @@ -+AC_INIT(src/pppoe.c) -+AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) -+AC_CONFIG_SUBDIRS(src) -+AC_OUTPUT(Makefile) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/update-config.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/update-config.patch deleted file mode 100644 index 42a3bc62c8..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.11/update-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -Set the timeout to 0 since we don't want pppoe to try reconnecting, -we want whatever is calling it to reconnect. Lots of odd things -happen when you have pppoe retrying itself. - -The path for the plugin is wrong, it's now part of ppp and is in a -ppp's plugin lib directory. If no path is specified then that's where -ppp looks, so that's what we do here. - -Upstream-Status: Inappropriate [configuration] - -Index: rp-pppoe-3.8/configs/pppoe.conf -=================================================================== ---- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-03 00:29:41.000000000 +1000 -+++ rp-pppoe-3.8/configs/pppoe.conf 2007-06-08 16:02:47.000000000 +1000 -@@ -66,7 +66,7 @@ - # to connect forever after pppoe-start is called. Otherwise, it will - # give out after CONNECT_TIMEOUT seconds and will not attempt to - # connect again, making it impossible to reach. --CONNECT_TIMEOUT=30 -+CONNECT_TIMEOUT=0 - - # How often in seconds pppoe-start polls to check if link is up - CONNECT_POLL=2 -@@ -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 --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch new file mode 100644 index 0000000000..2661fd3dbc --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.in-Error-fix.patch @@ -0,0 +1,59 @@ +From 71956de46feef962dc0645af4c81ae074ca3b818 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Wed, 19 Aug 2015 13:52:57 +0900 +Subject: [PATCH] configure.in: Error fix. + +the error is: conftest.c:9:28: fatal error: ac_nonexistent.h: +No such file or directory #include + +Upstream-Status: pending + +Signed-off-by: Li Xin +--- + src/configure.in | 30 ------------------------------ + 1 file changed, 30 deletions(-) + +diff --git a/src/configure.in b/src/configure.in +index 0b23df5..31c7fbc 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -193,36 +193,6 @@ if test "$GCC" = yes; then + CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" + fi + +-dnl Figure out packing order of structures +-AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[ +-if test "${rpppoe_cv_pack_bitfields+set}" != set ; then +-AC_TRY_RUN([ +-union foo { +- struct bar { +- unsigned int ver:4; +- unsigned int type:4; +- } bb; +- unsigned char baz; +-}; +- +-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 1) +-fi +-]) +- + if test "$rpppoe_cv_pack_bitfields" = "rev" ; then + AC_MSG_RESULT(reversed) + AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) +-- +1.8.4.2 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch new file mode 100644 index 0000000000..1380ba4891 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure.patch @@ -0,0 +1,11 @@ +Index: rp-pppoe-3.8/configure.in +=================================================================== +--- rp-pppoe-3.8.orig/configure.in 2014-07-16 19:31:33.549991388 +0000 ++++ rp-pppoe-3.8/configure.in 2014-07-17 22:01:18.116590827 +0000 +@@ -1,4 +1,4 @@ +-AC_INIT(src/pppoe.c) +-AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) ++AC_INIT([rp-pppoe], [3.8]) ++AM_INIT_AUTOMAKE([foreign]) + AC_CONFIG_SUBDIRS(src) + AC_OUTPUT(Makefile) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch new file mode 100644 index 0000000000..88cf7e6777 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/configure_in_cross.patch @@ -0,0 +1,156 @@ +From cab02076afb808a43c6ff3d7b1c64e71f5a1b397 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Wed, 19 Aug 2015 12:17:03 +0900 +Subject: [PATCH] configure in cross + +Update the configure script to cross-compiling with OE. This hard-codes +a few target paths, reworks a few tests to be more friendly for cross +and drops other tests. + +Upstream-Status: Inappropriate [build system specific changes] + +--- + src/configure.in | 66 ++++++++++++++------------------------------------------ + 1 file changed, 16 insertions(+), 50 deletions(-) + +diff --git a/src/configure.in b/src/configure.in +index e194295..82d64d6 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -5,6 +5,13 @@ AC_INIT(pppoe.c) + dnl pppd directory for kernel-mode PPPoE + PPPD_DIR=ppp-2.4.1.pppoe2 + ++dnl hard code some paths ++PPPD=/usr/sbin/pppd ++ID=/usr/bin/id ++ECHO=/bin/echo ++AC_ARG_VAR(PPPD) ++AC_ARG_VAR(ID) ++ + AC_CONFIG_HEADER(config.h) + + AC_PREFIX_DEFAULT(/usr) +@@ -45,7 +52,7 @@ ac_cv_struct_sockaddr_ll=no) + 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], [], [Have struct SOCKADDR_LL]) + fi + + dnl Check for N_HDLC line discipline +@@ -56,7 +63,7 @@ AC_TRY_COMPILE([#include ], + 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], [], [Have N_HDLC]) + fi + + AC_ARG_ENABLE(plugin, [ --enable-plugin=pppd_src_path build pppd plugin], ac_cv_pluginpath=$enableval, ac_cv_pluginpath=no) +@@ -104,7 +111,7 @@ PPPD_INCDIR="" + 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], [], [Have kernel PPPoE]) + PPPD_INCDIR=$ac_cv_pluginpath + fi + fi +@@ -114,7 +121,7 @@ if test "$PPPD_INCDIR" = "" ; then + fi + + if test "$ac_cv_debugging" = "yes" ; then +- AC_DEFINE(DEBUGGING_ENABLED) ++ AC_DEFINE([DEBUGGING_ENABLED], [], [Debugging enabled]) + fi + + AC_SUBST(LINUX_KERNELMODE_PLUGIN) +@@ -140,15 +147,8 @@ AC_CHECK_SIZEOF(unsigned short) + AC_CHECK_SIZEOF(unsigned int) + AC_CHECK_SIZEOF(unsigned long) + +-dnl Check for location of pppd +-AC_PATH_PROG(PPPD, pppd, NOTFOUND, $PATH:/sbin:/usr/sbin:/usr/local/sbin) +-AC_PATH_PROG(ECHO, echo, echo) +- +-dnl Check for setsid (probably Linux-specific) +-AC_PATH_PROG(SETSID, setsid, "", $PATH:/sbin:/usr/sbin:/usr/local/sbin) +- + dnl Check for an "id" which accepts "-u" option -- hack for Solaris. +-AC_PATH_PROG(ID, id, "", /usr/xpg4/bin:$PATH) ++dnl AC_PATH_PROG(ID, id, "", /usr/xpg4/bin:$PATH) + + dnl Check for Linux-specific kernel support for PPPoE + AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support) +@@ -193,44 +193,8 @@ if test "$GCC" = yes; then + CFLAGS="$CFLAGS -fno-strict-aliasing -Wall -Wstrict-prototypes" + fi + +-dnl If we couldn't find pppd, die +-if test "$PPPD" = "NOTFOUND"; then +- AC_MSG_WARN([*** Oops! I couldn't find pppd, the PPP daemon anywhere.]) +- AC_MSG_WARN([*** You must install pppd, version 2.3.10 or later.]) +- AC_MSG_WARN([*** I will keep going, but it may not work.]) +- PPPD=pppd +-fi +- +-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}'` +- +-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) +- AC_MSG_WARN([*** Oops! Your version of pppd is $PPPD_VERSION, which is too old.]) +- AC_MSG_WARN([*** You need at least 2.3.7 (2.3.10 or newer recommended.]) +- AC_MSG_WARN([*** I will keep going, but it may not work.]) +- ;; +- +-2.3.7|2.3.8|2.3.9) +- AC_MSG_WARN([*** Warning. Your version of pppd is $PPPD_VERSION. You will]) +- AC_MSG_WARN([*** not be able to use connect-on-demand. Upgrade to pppd]) +- AC_MSG_WARN([*** 2.3.10 or newer if you need connect-on-demand.]) +- ;; +- +-2*|3*|4*|5*|6*|7*|8*|9*) +- ;; +- +-*) +- AC_MSG_WARN([*** Oops. I cannot figure out what version of pppd you have.]) +- AC_MSG_WARN([*** All I got back was '$PPPD_VERSION']) +- AC_MSG_WARN([*** I will keep going, but it may not work.]) +- ;; +-esac +- + dnl Figure out packing order of structures +-AC_MSG_CHECKING([packing order of bit fields]) ++AC_CACHE_CHECK([packing order of bit fields],rpppoe_cv_pack_bitfields,[ + if test "${rpppoe_cv_pack_bitfields+set}" != set ; then + AC_TRY_RUN([ + union foo { +@@ -257,10 +221,11 @@ main(void) + }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, + $ECHO "no defaults for cross-compiling"; exit 0) + fi ++]) + + if test "$rpppoe_cv_pack_bitfields" = "rev" ; then + AC_MSG_RESULT(reversed) +- AC_DEFINE(PACK_BITFIELDS_REVERSED) ++ AC_DEFINE([PACK_BITFIELDS_REVERSED], [], [Reversed bitfields]) + else + AC_MSG_RESULT(normal) + fi +@@ -324,6 +289,7 @@ AC_SUBST(PPPOE_SERVER_DEPS) + AC_SUBST(RDYNAMIC) + AC_SUBST(LIBEVENT) + AC_SUBST(ECHO) ++AC_SUBST(HAVE_STRUCT_SOCKADDR_LL) + AC_SUBST(LDFLAGS) + + datadir_evaluated=`eval echo $datadir` +-- +1.8.4.2 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch new file mode 100644 index 0000000000..8b7886485a --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/discard-use-of-dnl-in-Makefile.am.patch @@ -0,0 +1,27 @@ +From 611c9fe719c5aa264a2ad2eb920cf4522ae2ddec Mon Sep 17 00:00:00 2001 +From: Ting Liu +Date: Tue, 12 Jun 2012 14:26:16 -0400 +Subject: [PATCH] discard use of dnl in Makefile.am + +Since Makefile.am is not processed by m4, but by automake, 'dnl' does +not introduce a comment. + +Signed-off-by: Ting Liu +--- + Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index eff6977..3091c33 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,5 +1,5 @@ + PACKAGE = rp-pppoe + VERSION = 3.8 + +-dnl AM_CFLAGS = -Wall -DDEBUG ++##dnl AM_CFLAGS = -Wall -DDEBUG + SUBDIRS = src +-- +1.7.6.5 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch new file mode 100644 index 0000000000..f61337f153 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/dont-swallow-errors.patch @@ -0,0 +1,28 @@ +From bbdadb803b19f002e76e7bb5ce3faf770dd7c413 Mon Sep 17 00:00:00 2001 +From: Lei Maohui +Date: Wed, 19 Aug 2015 12:33:41 +0900 +Subject: [PATCH] don't swallow errors + +Further fixup to the configure scripts to not swallow errors + +Upstream-Status: Pending +--- + src/configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/configure.in b/src/configure.in +index 82d64d6..0b23df5 100644 +--- a/src/configure.in ++++ b/src/configure.in +@@ -219,7 +219,7 @@ main(void) + return 2; + } + }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev, +-$ECHO "no defaults for cross-compiling"; exit 0) ++$ECHO "no defaults for cross-compiling"; exit 1) + fi + ]) + +-- +1.8.4.2 + diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default new file mode 100644 index 0000000000..996d57f3cf --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.default @@ -0,0 +1,22 @@ +# PPPoE Server options + +# Maximum segment size, not used for in kernel PPPoE +#MSS=1412 + +# Device(s) - Space seperated list of devices to listen on +#DEVICES="eth1" + +# Local IP +#LOCAL_IP=10.0.0.1 + +# Starting remote IP +#REMOTE_IP=10.67.15.1 + +# Service name +#SERVICE_NAME="acme" + +# Maximum number of sessions, default is 16 +#MAX_SESSIONS=64 + +# Access concentrator name, default is the hostname +#ACCESS_CONCENTRATOR_NAME="pppoe-rtr-1" diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init new file mode 100755 index 0000000000..21afe0be39 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.init @@ -0,0 +1,59 @@ +#! /bin/sh + +test -f /usr/sbin/pppoe-server || exit 0 +test -f /etc/default/pppoe-server && . /etc/default/pppoe-server + +case $1 in + start) + OPTIONS="" + if [ -n "$MSS" ]; then + OPTIONS="$OPTIONS -m $MSS" + fi + if [ -n "$DEVICES" ]; then + for i in $DEVICES; do + OPTIONS="$OPTIONS -I $i" + done + fi + if [ -n "$LOCAL_IP" ]; then + OPTIONS="$OPTIONS -L $LOCAL_IP" + fi + if [ -n "$REMOTE_IP" ]; then + OPTIONS="$OPTIONS -R $REMOTE_IP" + fi + if [ -n "$SERVICE_NAME" ]; then + OPTIONS="$OPTIONS -S $SERVICE_NAME" + fi + if [ -n "$MAX_SESSIONS" ]; then + OPTIONS="$OPTIONS -N $MAX_SESSIONS" + fi + if [ -n "$ACCESS_CONCENTRATOR_NAME" ]; then + OPTIONS="$OPTIONS -C $ACCESS_CONCENTRATOR_NAME" + fi + echo -n "Starting PPPoE server: pppoe-server" + start-stop-daemon --start --quiet --exec /usr/sbin/pppoe-server -- $OPTIONS + echo "." + ;; + stop) + echo -n "Stopping PPPoE server: pppoe-server" + start-stop-daemon --stop --quiet --exec /usr/sbin/pppoe-server -- $OPTIONS + echo "." + ;; + status) + pid=$(pidof pppoe-server) + if [ -n "$pid" ] ; then + echo "Running with pid $pid" + else + echo "Not running" + fi + ;; + restart|force-reload) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/pppoe-server {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service new file mode 100644 index 0000000000..41e0b9e851 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-server.service @@ -0,0 +1,11 @@ +[Unit] +Description=PPPOE Service +After=network.target + +[Service] +Type=forking +EnvironmentFile=-@SYSCONFDIR@/default/pppoe-server +ExecStart=@SBINDIR@/pppoe-server + +[Install] +WantedBy=multi-user.target diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch new file mode 100644 index 0000000000..bcf4d1164d --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/pppoe-src-restrictions.patch @@ -0,0 +1,20 @@ +Relax restrictions on the PPPoE src address, as per debian bug +293811: + + http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293811 + +Upstream-Status: Inappropriate [Backport from Debian] + +--- rp-pppoe-3.8.orig/src/discovery.c ++++ rp-pppoe-3.8/src/discovery.c +@@ -376,8 +376,8 @@ + if (!packetIsForMe(conn, &packet)) continue; + + if (packet.code == CODE_PADO) { +- if (NOT_UNICAST(packet.ethHdr.h_source)) { +- printErr("Ignoring PADO packet from non-unicast MAC address"); ++ if (BROADCAST(packet.ethHdr.h_source)) { ++ printErr("Ignoring broadcast PADO packet"); + continue; + } + parsePacket(&packet, parsePADOTags, &pc); diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch new file mode 100644 index 0000000000..4fe73d0171 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/top-autoconf.patch @@ -0,0 +1,27 @@ +The autoconf stuff is all in a subdirectory, which is rather annoying +as OE expects patches to be applied and autoconf stuff to be done in +S. This adds enough autoconf at the top level to allow it to be +called there - all it does is run a sub autoconf stuff in the src +directory. + +Upstream-Status: Inappropriate [build system specific change] + +Index: rp-pppoe-3.8/Makefile.am +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ rp-pppoe-3.8/Makefile.am 2007-06-08 15:58:16.000000000 +1000 +@@ -0,0 +1,5 @@ ++PACKAGE = rp-pppoe ++VERSION = 3.8 ++ ++dnl AM_CFLAGS = -Wall -DDEBUG ++SUBDIRS = src +Index: rp-pppoe-3.8/configure.in +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ rp-pppoe-3.8/configure.in 2007-06-08 15:58:16.000000000 +1000 +@@ -0,0 +1,4 @@ ++AC_INIT(src/pppoe.c) ++AM_INIT_AUTOMAKE([rp-pppoe], [3.8]) ++AC_CONFIG_SUBDIRS(src) ++AC_OUTPUT(Makefile) diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch new file mode 100644 index 0000000000..42a3bc62c8 --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch @@ -0,0 +1,32 @@ +Set the timeout to 0 since we don't want pppoe to try reconnecting, +we want whatever is calling it to reconnect. Lots of odd things +happen when you have pppoe retrying itself. + +The path for the plugin is wrong, it's now part of ppp and is in a +ppp's plugin lib directory. If no path is specified then that's where +ppp looks, so that's what we do here. + +Upstream-Status: Inappropriate [configuration] + +Index: rp-pppoe-3.8/configs/pppoe.conf +=================================================================== +--- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-03 00:29:41.000000000 +1000 ++++ rp-pppoe-3.8/configs/pppoe.conf 2007-06-08 16:02:47.000000000 +1000 +@@ -66,7 +66,7 @@ + # to connect forever after pppoe-start is called. Otherwise, it will + # give out after CONNECT_TIMEOUT seconds and will not attempt to + # connect again, making it impossible to reach. +-CONNECT_TIMEOUT=30 ++CONNECT_TIMEOUT=0 + + # How often in seconds pppoe-start polls to check if link is up + CONNECT_POLL=2 +@@ -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 --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.11.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.11.bb deleted file mode 100644 index 4415c4b935..0000000000 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.11.bb +++ /dev/null @@ -1,70 +0,0 @@ -SUMMARY = "A user-mode PPPoE client and server suite for Linux" -HOMEPAGE = "http://www.roaringpenguin.com/products/pppoe" -SECTION = "net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" - -PR = "r10" - -SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \ - file://top-autoconf.patch \ - file://configure_in_cross.patch \ - file://pppoe-src-restrictions.patch \ - file://update-config.patch \ - file://dont-swallow-errors.patch \ - file://discard-use-of-dnl-in-Makefile.am.patch \ - file://configure.patch \ - file://pppoe-server.default \ - file://pppoe-server.init \ - file://configure.in-Error-fix.patch \ - file://pppoe-server.service" - -SRC_URI[md5sum] = "13b5900c56bd602df6cc526e5e520722" -SRC_URI[sha256sum] = "86a1a4d92fcea74fa6dd45516c5975933fa978b36fafe71f76ea70b4b4747720" - -inherit autotools-brokensep update-rc.d systemd - -do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system - sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service - sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service -} - -do_install() { - # Install init script and default settings - install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d - install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server - install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server - # Install - oe_runmake -C ${S} DESTDIR=${D} docdir=${docdir} install - chmod 4755 ${D}${sbindir}/pppoe -} - -SYSTEMD_PACKAGES = "${PN}-server" -SYSTEMD_SERVICE_${PN}-server = "pppoe-server.service" -SYSTEMD_AUTO_ENABLE = "disable" -# Insert server package before main package -PACKAGES = "${PN}-dbg ${PN}-server ${PN}-relay ${PN}-sniff ${PN} ${PN}-doc" - -FILES_${PN}-server = "${sysconfdir}/default/pppoe-server \ - ${sysconfdir}/init.d/pppoe-server \ - ${sbindir}/pppoe-server \ - ${sysconfdir}/ppp/pppoe-server-options" -FILES_${PN}-relay = "${sbindir}/pppoe-relay" -FILES_${PN}-sniff = "${sbindir}/pppoe-sniff" - -CONFFILES_${PN} = "${sysconfdir}/ppp/pppoe.conf \ - ${sysconfdir}/ppp/firewall-standalone \ - ${sysconfdir}/ppp/firewall-masq" -CONFFILES_${PN}-server = "${sysconfdir}/ppp/pppoe-server-options \ - ${sysconfdir}/default/pppoe-server" - -INITSCRIPT_PACKAGES = "${PN}-server" -INITSCRIPT_NAME_${PN}-server = "pppoe-server" -INITSCRIPT_PARAMS_${PN}-server = "defaults 92 8" - -RDEPENDS_${PN} = "ppp" -RDEPENDS_${PN}-server = "${PN}" -RRECOMMENDS_${PN} = "ppp-oe" - diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb new file mode 100644 index 0000000000..d5f4a2025d --- /dev/null +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.12.bb @@ -0,0 +1,70 @@ +SUMMARY = "A user-mode PPPoE client and server suite for Linux" +HOMEPAGE = "http://www.roaringpenguin.com/products/pppoe" +SECTION = "net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" + +PR = "r10" + +SRC_URI = "http://www.roaringpenguin.com/files/download/${BP}.tar.gz \ + file://top-autoconf.patch \ + file://configure_in_cross.patch \ + file://pppoe-src-restrictions.patch \ + file://update-config.patch \ + file://dont-swallow-errors.patch \ + file://discard-use-of-dnl-in-Makefile.am.patch \ + file://configure.patch \ + file://pppoe-server.default \ + file://pppoe-server.init \ + file://configure.in-Error-fix.patch \ + file://pppoe-server.service" + +SRC_URI[md5sum] = "216eb52b69062b92a64ee37fd71f4b66" +SRC_URI[sha256sum] = "00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2" + +inherit autotools-brokensep update-rc.d systemd + +do_install_append() { + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/pppoe-server.service ${D}${systemd_unitdir}/system + sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service + sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/pppoe-server.service +} + +do_install() { + # Install init script and default settings + install -m 0755 -d ${D}${sysconfdir}/default ${D}${sysconfdir}/init.d + install -m 0644 ${WORKDIR}/pppoe-server.default ${D}${sysconfdir}/default/pppoe-server + install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server + # Install + oe_runmake -C ${S} DESTDIR=${D} docdir=${docdir} install + chmod 4755 ${D}${sbindir}/pppoe +} + +SYSTEMD_PACKAGES = "${PN}-server" +SYSTEMD_SERVICE_${PN}-server = "pppoe-server.service" +SYSTEMD_AUTO_ENABLE = "disable" +# Insert server package before main package +PACKAGES = "${PN}-dbg ${PN}-server ${PN}-relay ${PN}-sniff ${PN} ${PN}-doc" + +FILES_${PN}-server = "${sysconfdir}/default/pppoe-server \ + ${sysconfdir}/init.d/pppoe-server \ + ${sbindir}/pppoe-server \ + ${sysconfdir}/ppp/pppoe-server-options" +FILES_${PN}-relay = "${sbindir}/pppoe-relay" +FILES_${PN}-sniff = "${sbindir}/pppoe-sniff" + +CONFFILES_${PN} = "${sysconfdir}/ppp/pppoe.conf \ + ${sysconfdir}/ppp/firewall-standalone \ + ${sysconfdir}/ppp/firewall-masq" +CONFFILES_${PN}-server = "${sysconfdir}/ppp/pppoe-server-options \ + ${sysconfdir}/default/pppoe-server" + +INITSCRIPT_PACKAGES = "${PN}-server" +INITSCRIPT_NAME_${PN}-server = "pppoe-server" +INITSCRIPT_PARAMS_${PN}-server = "defaults 92 8" + +RDEPENDS_${PN} = "ppp" +RDEPENDS_${PN}-server = "${PN}" +RRECOMMENDS_${PN} = "ppp-oe" + -- cgit 1.2.3-korg