From 97a3eb8a109973014aed3bfb7c6f967739c98e21 Mon Sep 17 00:00:00 2001 From: Paul P Komkoff Jr Date: May 31 2008 18:40:55 +0000 Subject: libnetfilter_conntrack-0.0.89-0.1.svn7356 --- diff --git a/.cvsignore b/.cvsignore index 877ee04..ed5bbb7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ libnetfilter_conntrack-0.0.82.tar.bz2 +libnetfilter_conntrack-0.0.89-svn7356.patch.bz2 diff --git a/libnetfilter_conntrack-in6addr.patch b/libnetfilter_conntrack-in6addr.patch new file mode 100644 index 0000000..6134e09 --- /dev/null +++ b/libnetfilter_conntrack-in6addr.patch @@ -0,0 +1,43 @@ +diff --git a/src/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c +index e129218..675be7a 100644 +--- a/src/conntrack/snprintf_default.c ++++ b/src/conntrack/snprintf_default.c +@@ -93,8 +93,8 @@ int __snprintf_address_ipv6(char *buf, + struct in6_addr dst; + char tmp[INET6_ADDRSTRLEN]; + +- memcpy(&src.in6_u, &tuple->src.v6, sizeof(struct in6_addr)); +- memcpy(&dst.in6_u, &tuple->dst.v6, sizeof(struct in6_addr)); ++ memcpy(&src, &tuple->src.v6, sizeof(struct in6_addr)); ++ memcpy(&dst, &tuple->dst.v6, sizeof(struct in6_addr)); + + if (!inet_ntop(AF_INET6, &src, tmp, sizeof(tmp))) + return -1; +diff --git a/src/conntrack/snprintf_xml.c b/src/conntrack/snprintf_xml.c +index 9f7f388..0bd4443 100644 +--- a/src/conntrack/snprintf_xml.c ++++ b/src/conntrack/snprintf_xml.c +@@ -100,7 +100,7 @@ static int __snprintf_ipv6_xml(char *buf, + static char tmp[INET6_ADDRSTRLEN]; + const void *p = (type == __ADDR_SRC) ? &tuple->src.v6 : &tuple->dst.v6; + +- memcpy(&addr.in6_u, p, sizeof(struct in6_addr)); ++ memcpy(&addr, p, sizeof(struct in6_addr)); + + if (!inet_ntop(AF_INET6, &addr, tmp, sizeof(tmp))) + return -1; +diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c +index b0c7a3f..5f173f3 100644 +--- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c ++++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c +@@ -48,8 +48,8 @@ static int print_proto(char *buf, struct nfct_tuple *tuple) + char tmp[INET6_ADDRSTRLEN]; + int size; + +- memcpy(&src.in6_u, tuple->src.v6, sizeof(struct in6_addr)); +- memcpy(&dst.in6_u, tuple->dst.v6, sizeof(struct in6_addr)); ++ memcpy(&src, tuple->src.v6, sizeof(struct in6_addr)); ++ memcpy(&dst, tuple->dst.v6, sizeof(struct in6_addr)); + + if (!inet_ntop(AF_INET6, &src, tmp, sizeof(tmp))) + return 0; diff --git a/libnetfilter_conntrack-sysheader.patch b/libnetfilter_conntrack-sysheader.patch new file mode 100644 index 0000000..e068020 --- /dev/null +++ b/libnetfilter_conntrack-sysheader.patch @@ -0,0 +1,278 @@ +diff --git a/include/libnetfilter_conntrack/Makefile.am b/include/libnetfilter_conntrack/Makefile.am +index 9e4a2d1..760fbf6 100644 +--- a/include/libnetfilter_conntrack/Makefile.am ++++ b/include/libnetfilter_conntrack/Makefile.am +@@ -1,5 +1,5 @@ + +-pkginclude_HEADERS = libnetfilter_conntrack.h linux_nfnetlink_conntrack.h libnetfilter_conntrack_tcp.h libnetfilter_conntrack_udp.h libnetfilter_conntrack_icmp.h libnetfilter_conntrack_sctp.h libnetfilter_conntrack_ipv4.h libnetfilter_conntrack_ipv6.h ++pkginclude_HEADERS = libnetfilter_conntrack.h libnetfilter_conntrack_tcp.h libnetfilter_conntrack_udp.h libnetfilter_conntrack_icmp.h libnetfilter_conntrack_sctp.h libnetfilter_conntrack_ipv4.h libnetfilter_conntrack_ipv6.h + + noinst_HEADERS = libnetfilter_conntrack_extensions.h \ + libnetfilter_conntrack_l3extensions.h +diff --git a/include/libnetfilter_conntrack/libnetfilter_conntrack.h b/include/libnetfilter_conntrack/libnetfilter_conntrack.h +index 27c3cf0..b51782d 100644 +--- a/include/libnetfilter_conntrack/libnetfilter_conntrack.h ++++ b/include/libnetfilter_conntrack/libnetfilter_conntrack.h +@@ -9,9 +9,8 @@ + #define _LIBNETFILTER_CONNTRACK_H_ + + #include +-#include + #include +-#include ++#include + + #ifdef __cplusplus + extern "C" { +diff --git a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h b/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h +deleted file mode 100644 +index 7f0fe96..0000000 +--- a/include/libnetfilter_conntrack/linux_nfnetlink_conntrack.h ++++ /dev/null +@@ -1,161 +0,0 @@ +-#ifndef _IPCONNTRACK_NETLINK_H +-#define _IPCONNTRACK_NETLINK_H +-#include +- +-#ifdef __cplusplus +-extern "C" { +-#endif +- +-enum cntl_msg_types { +- IPCTNL_MSG_CT_NEW, +- IPCTNL_MSG_CT_GET, +- IPCTNL_MSG_CT_DELETE, +- IPCTNL_MSG_CT_GET_CTRZERO, +- +- IPCTNL_MSG_MAX +-}; +- +-enum ctnl_exp_msg_types { +- IPCTNL_MSG_EXP_NEW, +- IPCTNL_MSG_EXP_GET, +- IPCTNL_MSG_EXP_DELETE, +- +- IPCTNL_MSG_EXP_MAX +-}; +- +- +-enum ctattr_type { +- CTA_UNSPEC, +- CTA_TUPLE_ORIG, +- CTA_TUPLE_REPLY, +- CTA_STATUS, +- CTA_PROTOINFO, +- CTA_HELP, +- CTA_NAT_SRC, +-#define CTA_NAT CTA_NAT_SRC /* backwards compatibility */ +- CTA_TIMEOUT, +- CTA_MARK, +- CTA_COUNTERS_ORIG, +- CTA_COUNTERS_REPLY, +- CTA_USE, +- CTA_ID, +- CTA_NAT_DST, +- CTA_TUPLE_MASTER, +- CTA_NAT_SEQ_ADJ_ORIG, +- CTA_NAT_SEQ_ADJ_REPLY, +- CTA_SECMARK, +- __CTA_MAX +-}; +-#define CTA_MAX (__CTA_MAX - 1) +- +-enum ctattr_tuple { +- CTA_TUPLE_UNSPEC, +- CTA_TUPLE_IP, +- CTA_TUPLE_PROTO, +- __CTA_TUPLE_MAX +-}; +-#define CTA_TUPLE_MAX (__CTA_TUPLE_MAX - 1) +- +-enum ctattr_ip { +- CTA_IP_UNSPEC, +- CTA_IP_V4_SRC, +- CTA_IP_V4_DST, +- CTA_IP_V6_SRC, +- CTA_IP_V6_DST, +- __CTA_IP_MAX +-}; +-#define CTA_IP_MAX (__CTA_IP_MAX - 1) +- +-enum ctattr_l4proto { +- CTA_PROTO_UNSPEC, +- CTA_PROTO_NUM, +- CTA_PROTO_SRC_PORT, +- CTA_PROTO_DST_PORT, +- CTA_PROTO_ICMP_ID, +- CTA_PROTO_ICMP_TYPE, +- CTA_PROTO_ICMP_CODE, +- CTA_PROTO_ICMPV6_ID, +- CTA_PROTO_ICMPV6_TYPE, +- CTA_PROTO_ICMPV6_CODE, +- __CTA_PROTO_MAX +-}; +-#define CTA_PROTO_MAX (__CTA_PROTO_MAX - 1) +- +-enum ctattr_protoinfo { +- CTA_PROTOINFO_UNSPEC, +- CTA_PROTOINFO_TCP, +- __CTA_PROTOINFO_MAX +-}; +-#define CTA_PROTOINFO_MAX (__CTA_PROTOINFO_MAX - 1) +- +-enum ctattr_protoinfo_tcp { +- CTA_PROTOINFO_TCP_UNSPEC, +- CTA_PROTOINFO_TCP_STATE, +- CTA_PROTOINFO_TCP_WSCALE_ORIGINAL, +- CTA_PROTOINFO_TCP_WSCALE_REPLY, +- CTA_PROTOINFO_TCP_FLAGS_ORIGINAL, +- CTA_PROTOINFO_TCP_FLAGS_REPLY, +- __CTA_PROTOINFO_TCP_MAX +-}; +-#define CTA_PROTOINFO_TCP_MAX (__CTA_PROTOINFO_TCP_MAX - 1) +- +-enum ctattr_counters { +- CTA_COUNTERS_UNSPEC, +- CTA_COUNTERS_PACKETS, /* old 64bit counters */ +- CTA_COUNTERS_BYTES, /* old 64bit counters */ +- CTA_COUNTERS32_PACKETS, +- CTA_COUNTERS32_BYTES, +- __CTA_COUNTERS_MAX +-}; +-#define CTA_COUNTERS_MAX (__CTA_COUNTERS_MAX - 1) +- +-enum ctattr_nat { +- CTA_NAT_UNSPEC, +- CTA_NAT_MINIP, +- CTA_NAT_MAXIP, +- CTA_NAT_PROTO, +- __CTA_NAT_MAX +-}; +-#define CTA_NAT_MAX (__CTA_NAT_MAX - 1) +- +-enum ctattr_protonat { +- CTA_PROTONAT_UNSPEC, +- CTA_PROTONAT_PORT_MIN, +- CTA_PROTONAT_PORT_MAX, +- __CTA_PROTONAT_MAX +-}; +-#define CTA_PROTONAT_MAX (__CTA_PROTONAT_MAX - 1) +- +-enum ctattr_natseq { +- CTA_NAT_SEQ_CORRECTION_POS, +- CTA_NAT_SEQ_OFFSET_BEFORE, +- CTA_NAT_SEQ_OFFSET_AFTER, +- __CTA_NAT_SEQ_MAX +-}; +-#define CTA_NAT_SEQ_MAX (__CTA_NAT_SEQ_MAX - 1) +- +-enum ctattr_expect { +- CTA_EXPECT_UNSPEC, +- CTA_EXPECT_MASTER, +- CTA_EXPECT_TUPLE, +- CTA_EXPECT_MASK, +- CTA_EXPECT_TIMEOUT, +- CTA_EXPECT_ID, +- CTA_EXPECT_HELP_NAME, +- CTA_EXPECT_QUEUENR, +- __CTA_EXPECT_MAX +-}; +-#define CTA_EXPECT_MAX (__CTA_EXPECT_MAX - 1) +- +-enum ctattr_help { +- CTA_HELP_UNSPEC, +- CTA_HELP_NAME, +- __CTA_HELP_MAX +-}; +-#define CTA_HELP_MAX (__CTA_HELP_MAX - 1) +- +-#ifdef __cplusplus +-} +-#endif +- +-#endif /* _IPCONNTRACK_NETLINK_H */ +diff --git a/src/deprecated.c b/src/deprecated.c +index 6555062..d8331d5 100644 +--- a/src/deprecated.c ++++ b/src/deprecated.c +@@ -43,6 +43,8 @@ static char *l3proto2str[AF_MAX] = { + static struct nfct_proto *findproto(char *name); + static struct nfct_l3proto *findl3proto(char *name); + ++#define CTA_EXPECT_QUEUENR (CTA_EXPECT_HELP_NAME + 1) ++ + /* handler used for nfnl_listen */ + static int callback_handler(struct sockaddr_nl *nladdr, + struct nlmsghdr *n, void *arg) +diff --git a/src/deprecated/extensions/libnetfilter_conntrack_icmp.c b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c +index 72a7eb0..7127b4b 100644 +--- a/src/deprecated/extensions/libnetfilter_conntrack_icmp.c ++++ b/src/deprecated/extensions/libnetfilter_conntrack_icmp.c +@@ -12,7 +12,6 @@ + #include + #include + #include /* For htons */ +-#include + #include + #include + #include +diff --git a/src/deprecated/extensions/libnetfilter_conntrack_sctp.c b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c +index 3785c2e..f963161 100644 +--- a/src/deprecated/extensions/libnetfilter_conntrack_sctp.c ++++ b/src/deprecated/extensions/libnetfilter_conntrack_sctp.c +@@ -12,7 +12,6 @@ + #include + #include + #include /* For htons */ +-#include + #include + #include + #include +diff --git a/src/deprecated/extensions/libnetfilter_conntrack_tcp.c b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c +index 9efdbb7..9f74517 100644 +--- a/src/deprecated/extensions/libnetfilter_conntrack_tcp.c ++++ b/src/deprecated/extensions/libnetfilter_conntrack_tcp.c +@@ -12,7 +12,6 @@ + #include + #include + #include /* For htons */ +-#include + #include + #include + #include +diff --git a/src/deprecated/extensions/libnetfilter_conntrack_udp.c b/src/deprecated/extensions/libnetfilter_conntrack_udp.c +index c1d20c3..e63463c 100644 +--- a/src/deprecated/extensions/libnetfilter_conntrack_udp.c ++++ b/src/deprecated/extensions/libnetfilter_conntrack_udp.c +@@ -12,7 +12,6 @@ + #include + #include + #include /* For htons */ +-#include + #include + #include + #include +diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c +index 727ea01..e70102d 100644 +--- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c ++++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv4.c +@@ -9,7 +9,6 @@ + #include + #include + #include /* For htons */ +-#include + #include + #include + #include +diff --git a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c +index 5f173f3..b751c7a 100644 +--- a/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c ++++ b/src/deprecated/l3extensions/libnetfilter_conntrack_ipv6.c +@@ -12,7 +12,6 @@ + #include + #include /* For htons */ + #include +-#include + #include + #include + #include diff --git a/libnetfilter_conntrack.spec b/libnetfilter_conntrack.spec index 59bde49..7dbed7b 100644 --- a/libnetfilter_conntrack.spec +++ b/libnetfilter_conntrack.spec @@ -1,14 +1,21 @@ +%define rev 7356 +%define basever 0.0.82 + Name: libnetfilter_conntrack -Version: 0.0.82 -Release: 1%{?dist} +Version: 0.0.89 +Release: 0.1.svn%{rev}%{?dist} Summary: Netfilter conntrack userspace library Group: System Environment/Libraries License: GPL URL: http://netfilter.org -Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 +Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{basever}.tar.bz2 +Patch0: libnetfilter_conntrack-%{version}-svn%{rev}.patch.bz2 +Patch1: libnetfilter_conntrack-in6addr.patch +Patch2: libnetfilter_conntrack-sysheader.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libnfnetlink-devel, pkgconfig +BuildRequires: libnfnetlink-devel, pkgconfig, kernel-headers +BuildRequires: autoconf, automake, libtool %description libnetfilter_conntrack is a userspace library providing a programming @@ -18,21 +25,23 @@ interface (API) to the in-kernel connection tracking state table. Summary: Netfilter conntrack userspace library Group: Development/Libraries Requires: %{name} = %{version}-%{release}, libnfnetlink-devel +Requires: kernel-headers %description devel libnetfilter_conntrack is a userspace library providing a programming interface (API) to the in-kernel connection tracking state table. %prep -%setup -q +%setup -q -n %{name}-%{basever} +%patch -p1 +%patch1 -p1 +%patch2 -p1 + +autoreconf -i --force %build %configure --disable-static --disable-rpath -# kill the rpaths -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - make %{?_smp_mflags} %install @@ -50,8 +59,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING %{_libdir}/*.so.* -%dir %{_libdir}/libnetfilter_conntrack -%{_libdir}/libnetfilter_conntrack/*.so %files devel %defattr(-,root,root,-) @@ -61,6 +68,16 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/libnetfilter_conntrack/*.h %changelog +* Sat Feb 23 2008 Paul P. Komkoff Jr - 0.0.89-0.1.svn7356 +- new version from upstream svn, with new api +- use system headers instead of bundled + +* Tue Feb 19 2008 Fedora Release Engineering - 0.0.82-3 +- Autorebuild for GCC 4.3 + +* Tue Feb 19 2008 Paul P. Komkoff Jr - 0.0.82-2 +- fix build with a new glibc + * Sun Jan 20 2008 Paul P. Komkoff Jr - 0.0.82-1 - new upstream version diff --git a/sources b/sources index d73c709..35b79d3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b3f6bc03a362baef942680572300c3bf libnetfilter_conntrack-0.0.82.tar.bz2 +82a13ea845c42b59b63a251dc400c8b4 libnetfilter_conntrack-0.0.89-svn7356.patch.bz2