diff options
| author |   Andreas Oberritter <obi@opendreambox.org> | 2012-05-23 00:24:36 +0200 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2012-05-23 00:24:36 +0200 |
| commit | 06618326cf5a3044ec5ffe8d225c8e67b1757c79 (patch) | |
| tree | b5c26f4158de7efaaa6bd8112d37a4adb6a7025e | |
| parent | 8d8fabbf017ad6f3755ecbf4920dc1d7620baff0 (diff) | |
| download | openembedded-core-contrib-06618326cf5a3044ec5ffe8d225c8e67b1757c79.tar.gz | |
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>
| -rw-r--r-- | meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch | 16 | ||||
| -rw-r--r-- | meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 2 |
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 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 diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.5.bb b/meta/recipes-connectivity/ppp/ppp_2.4.5.bb index ed815d36e2..587871aae0 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 file://pppd/plugins/passprompt.c;beginline=1;endline=10;md5=3bcbcdbf0e369c9a3e0b8c8275b065d8 \ file://pppd/tdb.c;beginline=1;endline=27;md5=4ca3a9991b011038d085d6675ae7c4e6 \ 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 \ file://makefile.patch \ |