From patchwork Wed Nov 4 16:56:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Weber X-Patchwork-Id: 540067 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5AC3514110D for ; Thu, 5 Nov 2015 03:59:18 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=ScmKOB+U; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 52ABD280351; Wed, 4 Nov 2015 17:57:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 674D9280351 for ; Wed, 4 Nov 2015 17:56:00 +0100 (CET) X-policyd-weight: using cached result; rate: -8.5 Received: from mail-wm0-f53.google.com (mail-wm0-f53.google.com [74.125.82.53]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 4 Nov 2015 17:55:59 +0100 (CET) Received: by wmll128 with SMTP id l128so119565962wml.0 for ; Wed, 04 Nov 2015 08:57:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tWiusHDI8Ez++5lG5GViXljhlBsf+mkBr75toYZ7Qv0=; b=ScmKOB+UuQARLJYtCL9vhAUc20h81PCb7KRgkfzUhGn072tLBRFrM7xIMt1V31DMnx aTIQHar/YMMBIneAx7BrhuJnrGOiFcrg2EpHSsu5IL3dOZL2Es1CN9GSpftEKN5XvppV 6sHmIG7PfJ64OFMaEU1ZMzgpkrSsjRZlQebbfU5X6bW29ODB1gdHFCPIQdxolHDGs73h BBdTobaLtocfXxtKEmNdVN5f9r+qHpfL9qnaFsZFv0EqM3gxvOooGV7W5ucyrrL50SsK iHtNut+fjLSVhFGS2/pqlHHp3FZxCaYYpxtVyRvcLZUk0LDSAweDiv+GQUH9/f8Kwb+Y kHPg== X-Received: by 10.28.138.195 with SMTP id m186mr4922288wmd.2.1446656268184; Wed, 04 Nov 2015 08:57:48 -0800 (PST) Received: from localhost.localdomain ([5.158.136.57]) by smtp.googlemail.com with ESMTPSA id gd10sm2453443wjb.47.2015.11.04.08.57.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Nov 2015 08:57:47 -0800 (PST) From: Ulrich Weber X-Google-Original-From: Ulrich Weber To: openwrt-devel@lists.openwrt.org Date: Wed, 4 Nov 2015 17:56:51 +0100 Message-Id: <1446656212-20082-2-git-send-email-uw@ocedo.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446656212-20082-1-git-send-email-uw@ocedo.com> References: <1446656212-20082-1-git-send-email-uw@ocedo.com> Cc: Ulrich Weber Subject: [OpenWrt-Devel] [PATCH 2/3] conntrack-tools: upgrade to 1.4.3 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Signed-off-by: Ulrich Weber --- package/network/utils/conntrack-tools/Makefile | 4 +-- .../patches/100-missing_include.patch | 40 ---------------------- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 package/network/utils/conntrack-tools/patches/100-missing_include.patch diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile index 476281f..390cae5 100644 --- a/package/network/utils/conntrack-tools/Makefile +++ b/package/network/utils/conntrack-tools/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=conntrack-tools -PKG_VERSION:=1.4.2 +PKG_VERSION:=1.4.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -16,7 +16,7 @@ PKG_SOURCE_URL:= \ http://www.netfilter.org/projects/conntrack-tools/files \ ftp://ftp.netfilter.org/pub/conntrack-tools \ http://mirrors.evolva.ro/netfilter.org/conntrack-tools -PKG_MD5SUM:=b1f9d006e7bf000a77395ff7cd3fac16 +PKG_MD5SUM:=966a5d8f846ddf5304bcd12685c0707f PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/conntrack-tools/patches/100-missing_include.patch b/package/network/utils/conntrack-tools/patches/100-missing_include.patch deleted file mode 100644 index 96941a8..0000000 --- a/package/network/utils/conntrack-tools/patches/100-missing_include.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/include/mcast.h -+++ b/include/mcast.h -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - - struct mcast_conf { - int ipproto; ---- a/include/tcp.h -+++ b/include/tcp.h -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - struct tcp_conf { - int ipproto; ---- a/include/udp.h -+++ b/include/udp.h -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - struct udp_conf { - int ipproto; ---- a/include/bitops.h -+++ b/include/bitops.h -@@ -2,6 +2,7 @@ - #define _BITOPS_H_ - - #include -+#include - - static inline void set_bit_u32(int nr, u_int32_t *addr) - {