rp-pppoe 3.8: Updates

* Recommend ppp-oe, which is the PPPoE plugin module for PPP to
  enable the kernel mode PPPoE which is a lot faster, has lower
  latency and uses less CPU.
* Remove the module path from the configuration file since it's wrong
  and it's not needed.
* Don't check for the location of echo on the host, just use
  /bin/echo - it's only needed for the script that rp-pppoe installs.

2 files changed, 22 insertions, 10 deletions

diff --git a/packages/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch b/packages/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch
index 4ea5908737..0543145c63 100644
--- a/packages/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch
+++ b/packages/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch
@@ -1,26 +1,29 @@
---- rp-pppoe-3.8/src/configure.in	2007/04/30 07:21:25	1.1
-+++ rp-pppoe-3.8/src/configure.in	2007/04/30 07:22:06
-@@ -5,6 +5,12 @@
+Index: src/configure.in
+===================================================================
+--- rp-pppoe-3.8.org/src/configure.in	2006-04-03 00:29:42.000000000 +1000
++++ rp-pppoe-3.8/src/configure.in	2007-06-07 20:00:48.000000000 +1000
+@@ -5,6 +5,13 @@
  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)
-@@ -131,15 +137,10 @@
+@@ -131,15 +138,8 @@
  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)
- 
+-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)
 -
@@ -30,7 +33,7 @@
  
  dnl Check for Linux-specific kernel support for PPPoE
  AC_MSG_CHECKING(for Linux 2.4.X kernel-mode PPPoE support)
-@@ -183,44 +184,8 @@
+@@ -183,44 +183,8 @@
  	CFLAGS="$CFLAGS -Wall -Wstrict-prototypes -ansi"
  fi
  
@@ -76,7 +79,7 @@
  AC_TRY_RUN([
  union foo {
      struct bar {
-@@ -245,6 +210,7 @@
+@@ -245,6 +209,7 @@
      }
  }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev,
  $ECHO "no defaults for cross-compiling"; exit 0)
diff --git a/packages/rp-pppoe/rp-pppoe_3.8.bb b/packages/rp-pppoe/rp-pppoe_3.8.bb
index c4d5ff88d2..ae3e52bfce 100644
--- a/packages/rp-pppoe/rp-pppoe_3.8.bb
+++ b/packages/rp-pppoe/rp-pppoe_3.8.bb
@@ -3,7 +3,8 @@ HOMEPAGE = "http://www.roaringpenguin.com/en/penguin/openSourceProducts/rpPppoe"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 RDEPENDS = "ppp"
-PR = "r0"
+RRECOMMENDS = "ppp-oe"
+PR = "r1"
 
 SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
            file://configure_in_cross.patch;patch=1;pnum=2 \
@@ -15,8 +16,11 @@ inherit autotools
 
 do_install() {
         # Set timeout to 0. Fixes lots of reconnect issues
+        # No need for full path to the PPPoE plugin, and it's in a different 
         # Can't patch this in because it's outside of what we have {S} set to.
-        sed -i -e 's,\(CONNECT_TIMEOUT=\)30,\10,g' ${S}/../configs/pppoe.conf
+        sed -i -e 's,\(CONNECT_TIMEOUT=\)30,\10,g' \
+               -e 's,\(LINUX_PLUGIN=\)/etc/ppp/plugins/rp-pppoe.so,\1rp-pppoe.so,g' \
+               ${S}/../configs/pppoe.conf
         # Install
         oe_runmake -C ${S} RPM_INSTALL_ROOT=${D} docdir=${docdir} install
 }
@@ -27,3 +31,8 @@ pkg_postinst() {
     fi
     chmod 4755 ${sbindir}/pppoe
 }
+
+CONFFILES_${PN} = "${sysconfdir}/ppp/pppoe-server-options \
+                   ${sysconfdir}/ppp/pppoe.conf \
+                   ${sysconfdir}/ppp/firewall-standalone \
+                   ${sysconfdir}/ppp/firewall-masq"