cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

rp-pppoe: Add back from oldpackages with build fixes and enhanced packaging

Browse Source 
Add back from oldpackages with fixes for build errors and UCIfication
(for LuCI app submitted in a related PR (against LuCI repo)).

NOTE: Untested packages have been marked with @BROKEN.  This can
be undone of others report success with the sniffer

Signed-off-by: Daniel Dickinson <lede@daniel.thecshore.com>
This commit is contained in:
Daniel Dickinson
2016-05-21 20:35:10 -04:00
parent b6f8e32089
commit 847706ba5a
13 changed files with 455 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/rp-pppoe/patches/100-configure.patch
+36
View File
@@ -0,0 +1,36 @@
--- a/src/configure
+++ b/src/configure
@@ -3661,7 +3661,7 @@ done
for ac_header in linux/if.h
do :
- ac_fn_c_check_header_compile "$LINENO" "linux/if.h" "ac_cv_header_linux_if_h" "#include<sys/socket.h>
+ ac_fn_c_check_header_compile "$LINENO" "linux/if.h" "ac_cv_header_linux_if_h" "#include <sys/socket.h>
"
if test "x$ac_cv_header_linux_if_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
@@ -3675,10 +3675,11 @@ done
for ac_header in linux/if_pppox.h
do :
ac_fn_c_check_header_compile "$LINENO" "linux/if_pppox.h" "ac_cv_header_linux_if_pppox_h" "
-#include<sys/socket.h>
-#include<net/ethernet.h>
-#include<linux/if.h>
-#include<linux/in.h>
+#include <sys/socket.h>
+#include <net/ethernet.h>
+#include <linux/if.h>
+#include <linux/in.h>
+#include <linux/in6.h>
"
if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then :
@@ -4611,7 +4612,7 @@ esac
$as_echo_n "checking packing order of bit fields... " >&6; }
if test "${rpppoe_cv_pack_bitfields+set}" != set ; then
if test "$cross_compiling" = yes; then :
- $ECHO "no defaults for cross-compiling"; exit 0
+ rpppoe_cv_pack_bitfields="$ac_cv_pack_bitfields"
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
net/rp-pppoe/patches/110-Makefile.patch
+11
View File
@@ -0,0 +1,11 @@
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -71,7 +71,7 @@ pppoe-sniff: pppoe-sniff.o if.o common.o
@CC@ -o $@ $^ $(LDFLAGS)
pppoe-server: pppoe-server.o if.o debug.o common.o md5.o libevent/libevent.a @PPPOE_SERVER_DEPS@
- @CC@ -o $@ @RDYNAMIC@ $^ $(LDFLAGS) $(PPPOE_SERVER_LIBS) -Llibevent -levent
+ @CC@ -o $@ @RDYNAMIC@ $^ $(LDFLAGS) $(PPPOE_SERVER_LIBS)
pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o
@CC@ -o $@ $^ $(LDFLAGS)
net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch
+40
View File
@@ -0,0 +1,40 @@
Index: rp-pppoe-3.11/src/configure
===================================================================
--- rp-pppoe-3.11.orig/src/configure 2016-05-21 23:42:58.142423086 -0400
+++ rp-pppoe-3.11/src/configure 2016-05-21 23:42:58.178423086 -0400
@@ -3646,7 +3646,7 @@
done
-for ac_header in fcntl.h sys/dlpi.h sys/ioctl.h sys/time.h syslog.h unistd.h net/if_arp.h netinet/if_ether.h getopt.h sys/uio.h sys/param.h fcntl.h net/bpf.h netpacket/packet.h net/ethernet.h asm/types.h linux/if_packet.h linux/if_ether.h sys/socket.h sys/cdefs.h net/if.h net/if_dl.h net/if_ether.h net/if_types.h netinet/if_ether.h net/if_types.h net/if_dl.h
+for ac_header in fcntl.h sys/dlpi.h sys/ioctl.h sys/time.h syslog.h unistd.h net/if_arp.h getopt.h sys/uio.h sys/param.h fcntl.h net/bpf.h netpacket/packet.h asm/types.h linux/if_packet.h linux/if_ether.h sys/socket.h sys/cdefs.h net/if.h net/if_dl.h net/if_types.h net/if_types.h net/if_dl.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
Index: rp-pppoe-3.11/src/if.c
===================================================================
--- rp-pppoe-3.11.orig/src/if.c 2012-08-17 14:31:25.000000000 -0400
+++ rp-pppoe-3.11/src/if.c 2016-05-21 23:45:13.546423086 -0400
@@ -30,10 +30,6 @@
#include <linux/if_packet.h>
#endif
-#ifdef HAVE_NET_ETHERNET_H
-#include <net/ethernet.h>
-#endif
-
#ifdef HAVE_ASM_TYPES_H
#include <asm/types.h>
#endif
Index: rp-pppoe-3.11/src/plugin.c
===================================================================
--- rp-pppoe-3.11.orig/src/plugin.c 2012-08-17 14:31:25.000000000 -0400
+++ rp-pppoe-3.11/src/plugin.c 2016-05-21 23:43:55.314423086 -0400
@@ -49,7 +49,6 @@
#include <unistd.h>
#include <fcntl.h>
#include <signal.h>
-#include <net/ethernet.h>
#include <net/if_arp.h>
#include <linux/ppp_defs.h>
#include <linux/if_pppox.h>