summaryrefslogtreecommitdiff
path: root/meta/recipes-connectivity/ppp/ppp-2.4.5
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-05-23 00:31:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 08:34:50 +0100
commitba1539f165470d6ee9b7b95b5067792e384e6aea (patch)
treec2218baf3797c4ac10a488d54f8843279531026a /meta/recipes-connectivity/ppp/ppp-2.4.5
parente065c11b6066f8c1d37496b58dd853a684cd9136 (diff)
downloadopenembedded-core-ba1539f165470d6ee9b7b95b5067792e384e6aea.tar.gz
openembedded-core-ba1539f165470d6ee9b7b95b5067792e384e6aea.tar.bz2
openembedded-core-ba1539f165470d6ee9b7b95b5067792e384e6aea.zip
ppp: avoid host contamination
* Import patch from OE-Classic commit f7c547ede1bfc94c24f6315a23ff48a4c5b9ffaf. * Fixes linking with libpcap (ppp filter). Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp-2.4.5')
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
index 8cc354af97..d59717ebd3 100644
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
@@ -1,6 +1,9 @@
The patch comes from OpenEmbedded.
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]
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
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