ppp: avoid host contamination
* Import patch from OE-Classic commit f7c547ede1bfc94c24f6315a23ff48a4c5b9ffaf. * Fixes linking with libpcap (ppp filter). (From OE-Core rev: ba1539f165470d6ee9b7b95b5067792e384e6aea) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fce38e581f
commit
dd42988518
|
@ -1,6 +1,9 @@
|
||||||
The patch comes from OpenEmbedded.
|
The patch comes from OpenEmbedded.
|
||||||
Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
|
Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
|
||||||
|
|
||||||
|
Updated from OE-Classic to include the pcap hunk.
|
||||||
|
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [configuration]
|
Upstream-Status: Inappropriate [configuration]
|
||||||
|
|
||||||
diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
|
diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
|
||||||
|
@ -19,3 +22,16 @@ diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
|
||||||
|
|
||||||
ifdef NEEDDES
|
ifdef NEEDDES
|
||||||
ifndef USE_CRYPT
|
ifndef USE_CRYPT
|
||||||
|
@@ -169,10 +169,10 @@
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef FILTER
|
||||||
|
-ifneq ($(wildcard /usr/include/pcap-bpf.h),)
|
||||||
|
+#ifneq ($(wildcard /usr/include/pcap-bpf.h),)
|
||||||
|
LIBS += -lpcap
|
||||||
|
CFLAGS += -DPPP_FILTER
|
||||||
|
-endif
|
||||||
|
+#endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifdef HAVE_INET6
|
||||||
|
|
|
@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
|
||||||
file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
|
file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
|
||||||
file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
|
file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
|
||||||
file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
|
file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
|
||||||
PR = "r4"
|
PR = "r5"
|
||||||
|
|
||||||
SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
|
SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
|
||||||
file://makefile.patch \
|
file://makefile.patch \
|
||||||
|
|
Loading…
Reference in New Issue