mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
rp-pppoe: update to 3.14
Switched to new upstream. Added PKG_BUILD_PARALLEL for faster compilation. Refreshed and fixed up patches. Fixed up license information. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
@@ -1,36 +0,0 @@
|
||||
--- a/src/configure
|
||||
+++ b/src/configure
|
||||
@@ -3691,7 +3691,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" = xyes; then :
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@@ -3705,10 +3705,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" = xyes; then :
|
||||
@@ -4644,7 +4645,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. */
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -71,7 +71,7 @@ pppoe-sniff: pppoe-sniff.o if.o common.o
|
||||
@@ -72,7 +72,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@
|
||||
|
||||
@@ -1,34 +1,41 @@
|
||||
--- a/src/configure
|
||||
+++ b/src/configure
|
||||
@@ -3676,7 +3676,7 @@ fi
|
||||
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"
|
||||
--- a/src/if.c
|
||||
+++ b/src/if.c
|
||||
@@ -30,10 +30,6 @@ static char const RCSID[] =
|
||||
@@ -33,9 +33,9 @@
|
||||
#include <linux/if_packet.h>
|
||||
#endif
|
||||
|
||||
-#ifdef HAVE_NET_ETHERNET_H
|
||||
-#include <net/ethernet.h>
|
||||
-#endif
|
||||
-
|
||||
+//#ifdef HAVE_NET_ETHERNET_H
|
||||
+//#include <net/ethernet.h>
|
||||
+//#endif
|
||||
|
||||
#ifdef HAVE_ASM_TYPES_H
|
||||
#include <asm/types.h>
|
||||
#endif
|
||||
--- a/src/plugin.c
|
||||
+++ b/src/plugin.c
|
||||
@@ -49,7 +49,6 @@ static char const RCSID[] =
|
||||
@@ -52,7 +52,7 @@
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
#include <signal.h>
|
||||
-#include <net/ethernet.h>
|
||||
+//#include <net/ethernet.h>
|
||||
#include <net/if_arp.h>
|
||||
#include <linux/ppp_defs.h>
|
||||
#include <linux/if_pppox.h>
|
||||
--- a/src/pppoe.h
|
||||
+++ b/src/pppoe.h
|
||||
@@ -129,9 +129,9 @@ typedef unsigned long UINT32_t;
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
-#ifndef HAVE_SYS_DLPI_H
|
||||
-#include <netinet/if_ether.h>
|
||||
-#endif
|
||||
+//#ifndef HAVE_SYS_DLPI_H
|
||||
+//#include <netinet/if_ether.h>
|
||||
+//#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
--- a/src/Makefile.in
|
||||
+++ b/src/Makefile.in
|
||||
@@ -139,7 +139,8 @@ plugin/plugin.o: plugin.c
|
||||
@CC@ -DPLUGIN=1 '-DRP_VERSION="$(VERSION)"' $(CFLAGS) -I$(PPPD_INCDIR) -c -o $@ -fPIC $<
|
||||
@@ -140,7 +140,8 @@ plugin/plugin.o: plugin.c
|
||||
@CC@ -DPLUGIN=1 '-DRP_VERSION="$(RP_VERSION)"' $(CFLAGS) -I$(PPPD_INCDIR) -c -o $@ -fPIC $<
|
||||
|
||||
plugin/libplugin.a: plugin/discovery.o plugin/if.o plugin/common.o plugin/debug.o
|
||||
- ar -rc $@ $^
|
||||
@@ -9,4 +9,4 @@
|
||||
+ @RANLIB@ $@
|
||||
|
||||
plugin/discovery.o: discovery.c
|
||||
@CC@ -DPLUGIN=1 $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o $@ -fPIC $<
|
||||
@CC@ -DPLUGIN=1 $(CFLAGS) '-DRP_VERSION="$(RP_VERSION)"' -I$(PPPD_INCDIR) -c -o $@ -fPIC $<
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- a/src/pppoe.h
|
||||
+++ b/src/pppoe.h
|
||||
@@ -132,6 +132,9 @@ typedef unsigned long UINT32_t;
|
||||
#endif
|
||||
|
||||
#include <netinet/in.h>
|
||||
+/* avoid redefinitions if <linux/in.h> and <linux/in6.h> get included. */
|
||||
+#define _LINUX_IN_H
|
||||
+#define _LINUX_IN6_H
|
||||
|
||||
#ifdef HAVE_NETINET_IF_ETHER_H
|
||||
#include <sys/types.h>
|
||||
Reference in New Issue
Block a user