From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com ([192.55.52.88]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SXcZ0-0007ke-Fc for openembedded-core@lists.openembedded.org; Thu, 24 May 2012 20:15:06 +0200 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 24 May 2012 11:04:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="156855487" Received: from unknown (HELO [10.255.12.24]) ([10.255.12.24]) by fmsmga001.fm.intel.com with ESMTP; 24 May 2012 11:04:54 -0700 Message-ID: <4FBE7845.3010708@linux.intel.com> Date: Thu, 24 May 2012 11:04:53 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <1337725918-16650-1-git-send-email-obi@opendreambox.org> In-Reply-To: <1337725918-16650-1-git-send-email-obi@opendreambox.org> Subject: Re: [PATCH] ppp: avoid host contamination X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 May 2012 18:15:06 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 05/22/2012 03:31 PM, Andreas Oberritter wrote: > * Import patch from OE-Classic commit f7c547ede1bfc94c24f6315a23ff48a4c5b9ffaf. > * Fixes linking with libpcap (ppp filter). > > Signed-off-by: Andreas Oberritter > --- > .../makefile-remove-hard-usr-reference.patch | 16 ++++++++++++++++ > meta/recipes-connectivity/ppp/ppp_2.4.5.bb | 2 +- > 2 files changed, 17 insertions(+), 1 deletion(-) > > 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 @@ > The patch comes from OpenEmbedded. > Rebased for ppp-2.4.5. Dongxiao Xu > > +Updated from OE-Classic to include the pcap hunk. > +Signed-off-by: Andreas Oberritter > + > 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 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 > 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 \ Merged into OE-Core Thanks Sau!