From patchwork Mon Apr 2 21:31:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 150260 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id D7EDDB6F9A for ; Tue, 3 Apr 2012 07:34:33 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8285B10008B; Mon, 2 Apr 2012 21:34:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l3FjxmSiV6yK; Mon, 2 Apr 2012 21:34:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 75A4410178F; Mon, 2 Apr 2012 21:34:06 +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 67B3F8F78E for ; Mon, 2 Apr 2012 21:33:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 46BA181C32 for ; Mon, 2 Apr 2012 21:33:58 +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 woA0VjH+lPRQ for ; Mon, 2 Apr 2012 21:33:57 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.224]) by whitealder.osuosl.org (Postfix) with ESMTP id 3638E8CABE for ; Mon, 2 Apr 2012 21:33:57 +0000 (UTC) Received: by busybox.osuosl.org (Postfix, from userid 4021) id 1AACA969DF; Mon, 2 Apr 2012 21:33:57 +0000 (UTC) From: Peter Korsgaard To: buildroot@busybox.net Date: Mon, 2 Apr 2012 23:31:53 +0200 X-Git-Refname: refs/heads/master X-Git-Oldrev: 52201e2d1151f3a6fb61f73c7bf54814cf26b672 X-Git-Newrev: adae2f673d027c14ca294c7f1143f86741da9945 X-Patchwork-Hint: ignore Message-Id: <20120402213357.1AACA969DF@busybox.osuosl.org> Subject: [Buildroot] [git commit] iptables: bump to version 1.4.13 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 commit: http://git.buildroot.net/buildroot/commit/?id=adae2f673d027c14ca294c7f1143f86741da9945 branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- package/iptables/iptables-3.2-headers-fix.patch | 34 ----------------------- package/iptables/iptables.mk | 2 +- 2 files changed, 1 insertions(+), 35 deletions(-) diff --git a/package/iptables/iptables-3.2-headers-fix.patch b/package/iptables/iptables-3.2-headers-fix.patch deleted file mode 100644 index 5ef6539..0000000 --- a/package/iptables/iptables-3.2-headers-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dbe77cc974cee656eae37e75039dd1a410a4535b Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Sun, 28 Aug 2011 14:19:43 +0200 -Subject: [PATCH] include: refresh include files from kernel 3.1-rc3 - -[Peter: trimmed to bare essentials for buildroot] -Signed-off-by: Jan Engelhardt ---- -diff --git a/include/linux/types.h b/include/linux/types.h -index 8b483c8..630cd3b 100644 ---- a/include/linux/types.h -+++ b/include/linux/types.h -@@ -34,5 +34,18 @@ typedef __u64 __bitwise __be64; - typedef __u16 __bitwise __sum16; - typedef __u32 __bitwise __wsum; - -+/* -+ * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid -+ * common 32/64-bit compat problems. -+ * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other -+ * architectures) and to 8-byte boundaries on 64-bit architetures. The new -+ * aligned_64 type enforces 8-byte alignment so that structs containing -+ * aligned_64 values have the same alignment on 32-bit and 64-bit architectures. -+ * No conversions are necessary between 32-bit user-space and a 64-bit kernel. -+ */ -+#define __aligned_u64 __u64 __attribute__((aligned(8))) -+#define __aligned_be64 __be64 __attribute__((aligned(8))) -+#define __aligned_le64 __le64 __attribute__((aligned(8))) -+ - #endif /* __ASSEMBLY__ */ - #endif /* _LINUX_TYPES_H */ --- -1.7.8.3 - diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 95134e3..87578d5 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -4,7 +4,7 @@ # ############################################################# -IPTABLES_VERSION = 1.4.12.2 +IPTABLES_VERSION = 1.4.13 IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables IPTABLES_INSTALL_STAGING = YES