From patchwork Mon Jun 25 07:07:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 166975 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id CF2EE1008D6 for ; Mon, 25 Jun 2012 17:08:08 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id BC69731C8A; Mon, 25 Jun 2012 07:08:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id a6GgN-XY4Ije; Mon, 25 Jun 2012 07:08:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 554DF31C1D; Mon, 25 Jun 2012 07:08:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B0B798F753 for ; Mon, 25 Jun 2012 07:07:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7F8A18AA9D for ; Mon, 25 Jun 2012 07:07:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZwfsKaDiCBHt for ; Mon, 25 Jun 2012 07:07:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from tango.tkos.co.il (tango.tkos.co.il [62.219.50.35]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7C3EE8AB52 for ; Mon, 25 Jun 2012 07:07:51 +0000 (UTC) Received: from sapphire.alvarion.com (guitar.tcltek.co.il [192.115.133.116]) (authenticated bits=0) by tango.tkos.co.il (8.14.4/8.12.11) with ESMTP id q5P77jVM001625; Mon, 25 Jun 2012 10:07:48 +0300 From: Baruch Siach To: buildroot@busybox.net Date: Mon, 25 Jun 2012 10:07:35 +0300 Message-Id: <4cb520504e0c57eb586091cd4c9de83f6c005fe7.1340607805.git.baruch@tkos.co.il> X-Mailer: git-send-email 1.7.10 X-Scanned-By: MIMEDefang 2.62 on 62.219.50.35 Subject: [Buildroot] [PATCHv2] libpcap: bump to version 1.3.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Baruch Siach --- v2: remove patch applied upstream. .../libpcap-dont-fail-on-missing-netfilter.patch | 30 -------------------- package/libpcap/libpcap.mk | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch diff --git a/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch b/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch deleted file mode 100644 index b0efbc7..0000000 --- a/package/libpcap/libpcap-dont-fail-on-missing-netfilter.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d55b6f4f1b2bfab96ad57e0239b0b2b57785df77 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Wed, 29 Feb 2012 01:19:18 -0800 -Subject: [PATCH] Don't fail if netfilter isn't enabled in the kernel. - -Check for EPROTONOSUPPORT as well as EAFNOSUPPORT. - -Reviewed-By: Guy Harris ---- - pcap-netfilter-linux.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c -index 225e49f..f9c6bef 100644 ---- a/pcap-netfilter-linux.c -+++ b/pcap-netfilter-linux.c -@@ -452,8 +452,8 @@ netfilter_platform_finddevs(pcap_if_t **alldevsp, char *err_str) - - sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER); - if (sock < 0) { -- /* if netlink is not supported this this is not fatal */ -- if (errno == EAFNOSUPPORT) -+ /* if netlink is not supported this is not fatal */ -+ if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) - return 0; - snprintf(err_str, PCAP_ERRBUF_SIZE, "Can't open netlink socket %d:%s", - errno, pcap_strerror(errno)); --- -1.7.10 - diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 0b88a42..51e1106 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -4,7 +4,7 @@ # ############################################################# -LIBPCAP_VERSION = 1.2.1 +LIBPCAP_VERSION = 1.3.0 LIBPCAP_SITE = http://www.tcpdump.org/release LIBPCAP_INSTALL_STAGING = YES # doesn't have an install-strip