ibnetfilter_conntrack: update to latest stable version

4 files changed, 3 insertions, 262 deletions

diff --git a/package/libnetfilter_conntrack/Makefile b/package/libnetfilter_conntrack/Makefile
index 8c3a2e785..b8047bbaf 100644
--- a/package/libnetfilter_conntrack/Makefile
+++ b/package/libnetfilter_conntrack/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libnetfilter_conntrack
-PKG_VERSION:=		1.0.4
-PKG_RELEASE:=		2
-PKG_HASH:=		d9ec4a3caf49417f2b0a2d8d44249133e8c3ec78c757b7eb8c273f1cb6929c7d
+PKG_VERSION:=		1.0.5
+PKG_RELEASE:=		1
+PKG_HASH:=		fc9d7daf43605a73045de203bbfc0bca3e07f72d4ac61bcf656868f48692d73a
 PKG_DESCR:=		connection tracking state table library
 PKG_SECTION:=		libs/net
 PKG_DEPENDS:=		libnfnetlink libmnl
diff --git a/package/libnetfilter_conntrack/patches/patch-include_libnetfilter_conntrack_libnetfilter_conntrack_h b/package/libnetfilter_conntrack/patches/patch-include_libnetfilter_conntrack_libnetfilter_conntrack_h
deleted file mode 100644
index b8d557cb7..000000000
--- a/package/libnetfilter_conntrack/patches/patch-include_libnetfilter_conntrack_libnetfilter_conntrack_h
+++ /dev/null
@@ -1,228 +0,0 @@
---- libnetfilter_conntrack-1.0.4.orig/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2013-08-06 15:22:55.000000000 +0200
-+++ libnetfilter_conntrack-1.0.4/include/libnetfilter_conntrack/libnetfilter_conntrack.h	2014-04-10 14:29:23.000000000 +0200
-@@ -10,6 +10,7 @@
- #ifndef _LIBNETFILTER_CONNTRACK_H_
- #define _LIBNETFILTER_CONNTRACK_H_
- 
-+#include <stdint.h>
- #include <netinet/in.h>
- #include <libnfnetlink/linux_nfnetlink.h>
- #include <libnfnetlink/libnfnetlink.h>
-@@ -37,9 +38,9 @@ struct nfct_handle;
- /*
-  * [Open|close] a conntrack handler
-  */
--extern struct nfct_handle *nfct_open(u_int8_t, unsigned);
-+extern struct nfct_handle *nfct_open(uint8_t, unsigned);
- extern struct nfct_handle *nfct_open_nfnl(struct nfnl_handle *nfnlh,
--					  u_int8_t subsys_id,
-+					  uint8_t subsys_id,
- 					  unsigned int subscriptions);
- extern int nfct_close(struct nfct_handle *cth);
- 
-@@ -160,31 +161,31 @@ enum nf_conntrack_attr_grp {
- };
- 
- struct nfct_attr_grp_ipv4 {
--	u_int32_t src, dst;
-+	uint32_t src, dst;
- };
- 
- struct nfct_attr_grp_ipv6 {
--	u_int32_t src[4], dst[4];
-+	uint32_t src[4], dst[4];
- };
- 
- struct nfct_attr_grp_port {
--	u_int16_t sport, dport;
-+	uint16_t sport, dport;
- };
- 
- struct nfct_attr_grp_icmp {
--	u_int16_t id;
--	u_int8_t code, type;
-+	uint16_t id;
-+	uint8_t code, type;
- };
- 
- struct nfct_attr_grp_ctrs {
--	u_int64_t packets;
--	u_int64_t bytes;
-+	uint64_t packets;
-+	uint64_t bytes;
- };
- 
- union nfct_attr_grp_addr {
--	u_int32_t ip;
--	u_int32_t ip6[4];
--	u_int32_t addr[4];
-+	uint32_t ip;
-+	uint32_t ip6[4];
-+	uint32_t addr[4];
- };
- 
- /* message type */
-@@ -302,19 +303,19 @@ extern void nfct_set_attr(struct nf_conn
- 
- extern void nfct_set_attr_u8(struct nf_conntrack *ct,
- 			     const enum nf_conntrack_attr type,
--			     u_int8_t value);
-+			     uint8_t value);
- 
- extern void nfct_set_attr_u16(struct nf_conntrack *ct,
- 			      const enum nf_conntrack_attr type,
--			      u_int16_t value);
-+			      uint16_t value);
- 
- extern void nfct_set_attr_u32(struct nf_conntrack *ct,
- 			      const enum nf_conntrack_attr type,
--			      u_int32_t value);
-+			      uint32_t value);
- 
- extern void nfct_set_attr_u64(struct nf_conntrack *ct,
- 			      const enum nf_conntrack_attr type,
--			      u_int64_t value);
-+			      uint64_t value);
- 
- extern void nfct_set_attr_l(struct nf_conntrack *ct,
- 			    const enum nf_conntrack_attr type,
-@@ -325,16 +326,16 @@ extern void nfct_set_attr_l(struct nf_co
- extern const void *nfct_get_attr(const struct nf_conntrack *ct,
- 				 const enum nf_conntrack_attr type);
- 
--extern u_int8_t nfct_get_attr_u8(const struct nf_conntrack *ct,
-+extern uint8_t nfct_get_attr_u8(const struct nf_conntrack *ct,
- 				 const enum nf_conntrack_attr type);
- 
--extern u_int16_t nfct_get_attr_u16(const struct nf_conntrack *ct,
-+extern uint16_t nfct_get_attr_u16(const struct nf_conntrack *ct,
- 				   const enum nf_conntrack_attr type);
- 
--extern u_int32_t nfct_get_attr_u32(const struct nf_conntrack *ct,
-+extern uint32_t nfct_get_attr_u32(const struct nf_conntrack *ct,
- 				   const enum nf_conntrack_attr type);
- 
--extern u_int64_t nfct_get_attr_u64(const struct nf_conntrack *ct,
-+extern uint64_t nfct_get_attr_u64(const struct nf_conntrack *ct,
- 				   const enum nf_conntrack_attr type);
- 
- /* checker */
-@@ -477,20 +478,20 @@ extern struct nfct_filter *nfct_filter_c
- extern void nfct_filter_destroy(struct nfct_filter *filter);
- 
- struct nfct_filter_proto {
--	u_int16_t proto;
--	u_int16_t state;
-+	uint16_t proto;
-+	uint16_t state;
- };
- struct nfct_filter_ipv4 {
--	u_int32_t addr;
--	u_int32_t mask;
-+	uint32_t addr;
-+	uint32_t mask;
- };
- struct nfct_filter_ipv6 {
--	u_int32_t addr[4];
--	u_int32_t mask[4];
-+	uint32_t addr[4];
-+	uint32_t mask[4];
- };
- 
- enum nfct_filter_attr {
--	NFCT_FILTER_L4PROTO = 0,	/* u_int32_t */
-+	NFCT_FILTER_L4PROTO = 0,	/* uint32_t */
- 	NFCT_FILTER_L4PROTO_STATE,	/* struct nfct_filter_proto */
- 	NFCT_FILTER_SRC_IPV4,		/* struct nfct_filter_ipv4 */
- 	NFCT_FILTER_DST_IPV4,		/* struct nfct_filter_ipv4 */
-@@ -505,7 +506,7 @@ extern void nfct_filter_add_attr(struct
- 
- extern void nfct_filter_add_attr_u32(struct nfct_filter *filter,
- 				     const enum nfct_filter_attr attr,
--				     const u_int32_t value);
-+				     const uint32_t value);
- 
- enum nfct_filter_logic {
- 	NFCT_FILTER_LOGIC_POSITIVE,
-@@ -525,13 +526,13 @@ extern int nfct_filter_detach(int fd);
- struct nfct_filter_dump;
- 
- struct nfct_filter_dump_mark {
--	u_int32_t val;
--	u_int32_t mask;
-+	uint32_t val;
-+	uint32_t mask;
- };
- 
- enum nfct_filter_dump_attr {
- 	NFCT_FILTER_DUMP_MARK = 0,	/* struct nfct_filter_dump_mark */
--	NFCT_FILTER_DUMP_L3NUM,		/* u_int8_t */
-+	NFCT_FILTER_DUMP_L3NUM,		/* uint8_t */
- 	NFCT_FILTER_DUMP_MAX
- };
- 
-@@ -545,7 +546,7 @@ void nfct_filter_dump_set_attr(struct nf
- 
- void nfct_filter_dump_set_attr_u8(struct nfct_filter_dump *filter_dump,
- 				  const enum nfct_filter_dump_attr type,
--				  u_int8_t data);
-+				  uint8_t data);
- 
- /* low level API: netlink functions */
- 
-@@ -553,8 +554,8 @@ extern __attribute__((deprecated)) int
- nfct_build_conntrack(struct nfnl_subsys_handle *ssh,
- 				void *req,
- 				size_t size,
--				u_int16_t type,
--				u_int16_t flags,
-+				uint16_t type,
-+				uint16_t flags,
- 				const struct nf_conntrack *ct);
- 
- extern __attribute__((deprecated))
-@@ -640,27 +641,27 @@ extern void nfexp_set_attr(struct nf_exp
- 
- extern void nfexp_set_attr_u8(struct nf_expect *exp,
- 			      const enum nf_expect_attr type,
--			      u_int8_t value);
-+			      uint8_t value);
- 
- extern void nfexp_set_attr_u16(struct nf_expect *exp,
- 			       const enum nf_expect_attr type,
--			       u_int16_t value);
-+			       uint16_t value);
- 
- extern void nfexp_set_attr_u32(struct nf_expect *exp,
- 			       const enum nf_expect_attr type,
--			       u_int32_t value);
-+			       uint32_t value);
- 
- /* getter */
- extern const void *nfexp_get_attr(const struct nf_expect *exp,
- 				  const enum nf_expect_attr type);
- 
--extern u_int8_t nfexp_get_attr_u8(const struct nf_expect *exp,
-+extern uint8_t nfexp_get_attr_u8(const struct nf_expect *exp,
- 				  const enum nf_expect_attr type);
- 
--extern u_int16_t nfexp_get_attr_u16(const struct nf_expect *exp,
-+extern uint16_t nfexp_get_attr_u16(const struct nf_expect *exp,
- 				    const enum nf_expect_attr type);
- 
--extern u_int32_t nfexp_get_attr_u32(const struct nf_expect *exp,
-+extern uint32_t nfexp_get_attr_u32(const struct nf_expect *exp,
- 				    const enum nf_expect_attr type);
- 
- /* checker */
-@@ -700,8 +701,8 @@ extern __attribute__((deprecated))
- int nfexp_build_expect(struct nfnl_subsys_handle *ssh,
- 			      void *req,
- 			      size_t size,
--			      u_int16_t type,
--			      u_int16_t flags,
-+			      uint16_t type,
-+			      uint16_t flags,
- 			      const struct nf_expect *exp);
- 
- extern __attribute__((deprecated))
diff --git a/package/libnetfilter_conntrack/patches/patch-ltmain_sh b/package/libnetfilter_conntrack/patches/patch-ltmain_sh
deleted file mode 100644
index b29e65024..000000000
--- a/package/libnetfilter_conntrack/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- libnetfilter_conntrack-0.0.101.orig/ltmain.sh	2009-04-08 00:25:23.000000000 +0200
-+++ libnetfilter_conntrack-0.0.101/ltmain.sh	2011-01-14 20:35:18.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # @file GCC response files
-       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
--      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
-+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
-         func_quote_for_eval "$arg"
- 	arg="$func_quote_for_eval_result"
-         func_append compile_command " $arg"
diff --git a/package/libnetfilter_conntrack/patches/patch-src_main_c b/package/libnetfilter_conntrack/patches/patch-src_main_c
deleted file mode 100644
index 12ce50bc7..000000000
--- a/package/libnetfilter_conntrack/patches/patch-src_main_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- libnetfilter_conntrack-1.0.4.orig/src/main.c	2011-12-30 00:42:58.000000000 +0100
-+++ libnetfilter_conntrack-1.0.4/src/main.c	2014-04-10 14:29:50.000000000 +0200
-@@ -13,7 +13,7 @@
- #include "internal/internal.h"
- 
- struct nfct_handle *nfct_open_nfnl(struct nfnl_handle *nfnlh,
--				   u_int8_t subsys_id,
-+				   uint8_t subsys_id,
- 				   unsigned int subscriptions)
- {
- 	struct nfct_handle *cth;
-@@ -81,7 +81,7 @@ out_free:
-  *
-  * On error, NULL is returned and errno is explicitly set.
-  */
--struct nfct_handle *nfct_open(u_int8_t subsys_id, unsigned subscriptions)
-+struct nfct_handle *nfct_open(uint8_t subsys_id, unsigned subscriptions)
- {
- 	struct nfnl_handle *nfnlh = nfnl_open();
- 	struct nfct_handle *nfcth;