summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-05-22 22:31:58 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 07:51:38 (GMT)
commitdd429885189761c264f8d626524c6a02bf148801 (patch)
tree793232335f0e2ced23ec645602503042cae97c15 /meta
parentfce38e581faf92871df41c6d829753a183e76acc (diff)
downloadpoky-dd429885189761c264f8d626524c6a02bf148801.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch16
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.5.bb2
2 files changed, 17 insertions, 1 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 8cc354a..d59717e 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 @@
1The patch comes from OpenEmbedded. 1The patch comes from OpenEmbedded.
2Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> 2Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
3 3
4Updated from OE-Classic to include the pcap hunk.
5Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
6
4Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
5 8
6diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux 9diff -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
19 22
20 ifdef NEEDDES 23 ifdef NEEDDES
21 ifndef USE_CRYPT 24 ifndef USE_CRYPT
25@@ -169,10 +169,10 @@
26 endif
27
28 ifdef FILTER
29-ifneq ($(wildcard /usr/include/pcap-bpf.h),)
30+#ifneq ($(wildcard /usr/include/pcap-bpf.h),)
31 LIBS += -lpcap
32 CFLAGS += -DPPP_FILTER
33-endif
34+#endif
35 endif
36
37 ifdef HAVE_INET6
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
index ed815d3..587871a 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://pppd/ccp.c;beginline=1;endline=29;md5=e2c43fe6e81ff77
10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ 10 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \
11 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ 11 file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \
12 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2" 12 file://chat/chat.c;beginline=1;endline=15;md5=0d374b8545ee5c62d7aff1acbd38add2"
13PR = "r4" 13PR = "r5"
14 14
15SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \ 15SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
16 file://makefile.patch \ 16 file://makefile.patch \