Commit e9ae739c authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

rp-pppoe: bump to version 3.10, convert to gentargets, undeprecate.



Most of the work from Darcy Watkins <dwatkins@tranzeo.com>

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 7c949cb2
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -41,9 +41,9 @@
	mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp,
	ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openssl,
	openvpn, oprofile, pango, patch, pcre, php, pkg-config,
	portmap, pppd, prboom, radvd, rdesktop, readline, ruby, qt,
	quagga, samba, sawman, sdl_mixer, sdl_sound, setserial,
	shared-mime-info, speex, sqlite, squashfs,
	portmap, pppd, pptp-linux, prboom, radvd, rdesktop, readline,
	rp-pppoe, ruby, qt, quagga, samba, sawman, sdl_mixer, sdl_sound,
	setserial, shared-mime-info, speex, sqlite, squashfs,
	startup-notification, strace, sylpheed, taglib, tcpdump,
	thttpd, tiff, tn5250, torsmo, udev, udpcast, usbmount,
	usbutils, vsftpd, vtun, which, wpa_supplicant, xapp_twm,
+6 −2
Original line number Diff line number Diff line
config BR2_PACKAGE_RP_PPPOE
	bool "pppoe"
	depends on BR2_DEPRECATED
	bool "rp-pppoe"
	depends on BR2_PACKAGE_PPPD
	help
	  An implementation of the Point-to-point protocol over Ethernet.
	  Has userspace client and server deamons.  You likely only need
	  this package if you are implementing the pppoe server that will
	  service other pppoe client devices.  Otherwise the normal client
	  functionality already exists in the pppd package (and kernel).

	  http://www.roaringpenguin.com/pppoe.html
+34 −0
Original line number Diff line number Diff line
diff -rdup rp-pppoe-3.8.oorig/src/configure.in rp-pppoe-3.8/src/configure.in
--- rp-pppoe-3.8.oorig/src/configure.in	2006-04-02 16:29:42.000000000 +0200
+++ rp-pppoe-3.8/src/configure.in	2007-08-24 11:51:04.000000000 +0200
@@ -221,6 +221,7 @@ esac
--- rp-pppoe-3.10.orig/src/configure.in	2006-04-02 16:29:42.000000000 +0200
+++ rp-pppoe-3.10/src/configure.in	2007-08-24 11:51:04.000000000 +0200
@@ -231,6 +231,7 @@ esac
 
 dnl Figure out packing order of structures
 AC_MSG_CHECKING([packing order of bit fields])
@@ -9,7 +8,7 @@ diff -rdup rp-pppoe-3.8.oorig/src/configure.in rp-pppoe-3.8/src/configure.in
 AC_TRY_RUN([
 union foo {
     struct bar {
@@ -244,8 +245,8 @@ main(void)
@@ -254,8 +255,8 @@ main(void)
 	return 2;
     }
 }], rpppoe_cv_pack_bitfields=normal, rpppoe_cv_pack_bitfields=rev,
@@ -20,3 +19,16 @@ diff -rdup rp-pppoe-3.8.oorig/src/configure.in rp-pppoe-3.8/src/configure.in
 if test "$rpppoe_cv_pack_bitfields" = "rev" ; then
 	AC_MSG_RESULT(reversed)
 	AC_DEFINE(PACK_BITFIELDS_REVERSED)
--- rp-pppoe-3.10.orig/src/configure	2010-08-20 10:46:39.000000000 -0700
+++ rp-pppoe-3.10/src/configure	2010-08-20 11:02:16.000000000 -0700
@@ -6272,7 +6272,9 @@ esac
 { echo "$as_me:$LINENO: checking packing order of bit fields" >&5
 echo $ECHO_N "checking packing order of bit fields... $ECHO_C" >&6; }
 if test "$cross_compiling" = yes; then
-  $ECHO "no defaults for cross-compiling"; exit 0
+if test "x$rpppoe_cv_pack_bitfields" = "x" ; then
+  $ECHO "no defaults for cross-compiling"
+fi
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
+23 −0
Original line number Diff line number Diff line
--- rp-pppoe-3.10/src/configure.theorig  2008-02-05 13:57:15.000000000 -0800
+++ rp-pppoe-3.10/src/configure  2008-02-05 13:24:36.000000000 -0800
@@ -6151,7 +6151,7 @@ modprobe ppp_synctty > /dev/null 2>&1
 modprobe pppoe > /dev/null 2>&1
 fi
 if test "$cross_compiling" = yes; then
-  ac_cv_linux_kernel_pppoe=no; $ECHO "cross-compiling, default: "
+  ac_cv_linux_kernel_pppoe=yes; $ECHO "cross-compiling, default: "
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
--- rp-pppoe-3.10/src/pppoe-server.c.theorig     2006-04-02 07:29:42.000000000 -0700
+++ rp-pppoe-3.10/src/pppoe-server.c     2008-02-05 13:52:15.000000000 -0800
@@ -20,6 +20,9 @@ static char const RCSID[] =
 
 #include "config.h"
 
+/* Patched hack to make this cross compile */
+#define HAVE_LINUX_KERNEL_PPPOE 1
+
 #if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H)
 #define _POSIX_SOURCE 1 /* For sigaction defines */
 #endif
+0 −8699

File deleted.

Preview size limit exceeded, changes collapsed.

Loading