diff --git a/libnetfilter_queue-1.0.1.tar.bz2 b/libnetfilter_queue-1.0.1.tar.bz2 deleted file mode 100644 index ad923f5..0000000 --- a/libnetfilter_queue-1.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cfda0aa4f05b93850df1d29b16b5601e7ceccf000e8ddc1abb7477761c4426aa -size 262048 diff --git a/libnetfilter_queue-1.0.1.tar.bz2.sig b/libnetfilter_queue-1.0.1.tar.bz2.sig deleted file mode 100644 index 4a9cc00..0000000 Binary files a/libnetfilter_queue-1.0.1.tar.bz2.sig and /dev/null differ diff --git a/libnetfilter_queue-1.0.2.tar.bz2 b/libnetfilter_queue-1.0.2.tar.bz2 new file mode 100644 index 0000000..807444b --- /dev/null +++ b/libnetfilter_queue-1.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32 +size 354201 diff --git a/libnetfilter_queue-1.0.2.tar.bz2.sig b/libnetfilter_queue-1.0.2.tar.bz2.sig new file mode 100644 index 0000000..042a163 Binary files /dev/null and b/libnetfilter_queue-1.0.2.tar.bz2.sig differ diff --git a/libnetfilter_queue.changes b/libnetfilter_queue.changes index f04d2dd..7f70cee 100644 --- a/libnetfilter_queue.changes +++ b/libnetfilter_queue.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 8 12:25:39 UTC 2012 - jengelh@inai.de + +- Update to new upstream release 1.0.2 +* This release provides new interfaces to interact with libmnl. + ------------------------------------------------------------------- Mon Jan 2 21:19:24 UTC 2012 - jengelh@medozas.de diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec index 993878d..1cbe254 100644 --- a/libnetfilter_queue.spec +++ b/libnetfilter_queue.spec @@ -16,23 +16,32 @@ # - Name: libnetfilter_queue -%define libsoname %{name}1 -Version: 1.0.1 -Release: 1 +%define lname %{name}1 +Version: 1.0.2 +Release: 0 +Summary: Userspace library for packets that have been queued by the kernel packet filter License: GPL-2.0 Group: Productivity/Networking/Security Url: http://netfilter.org/projects/libnetfilter_queue/ #Git-Clone: git://git.netfilter.org/libnetfiler_queue -Source: ftp://ftp.netfilter.org/pub/libnetfilter_queue/%name-%version.tar.bz2 -Source2: ftp://ftp.netfilter.org/pub/libnetfilter_queue/%name-%version.tar.bz2.sig +#DL-URL: http://netfilter.org/projects/libnetfilter_queue/files/ +Source: http://netfilter.org/projects/libnetfilter_queue/files/%name-%version.tar.bz2 +Source2: http://netfilter.org/projects/libnetfilter_queue/files/%name-%version.tar.bz2.sig Source3: baselibs.conf +Patch1: rhel6-iptos.diff + BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf automake >= 1.6 libtool -BuildRequires: pkgconfig >= 0.23 pkgconfig(libnfnetlink) >= 0.0.41 -Summary: Userspace library for packets that have been queued by the kernel packet filter +#BuildRequires: libtool +BuildRequires: pkgconfig >= 0.21 +%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} +BuildRequires: pkgconfig(libmnl) >= 1.0.3 +BuildRequires: pkgconfig(libnfnetlink) >= 0.0.41 +%else +BuildRequires: libmnl-devel >= 1.0.3 +BuildRequires: libnfnetlink-devel >= 0.0.41 +%endif %description libnetfilter_queue is a userspace library providing an API to packets @@ -41,11 +50,11 @@ system that deprecates the old ip_queue / libipq mechanism. libnetfilter_queue has been previously known as libnfnetlink_queue. -%package -n %libsoname -Group: System/Libraries +%package -n %lname Summary: Userspace library for packets that have been queued by the kernel packet filter +Group: System/Libraries -%description -n %libsoname +%description -n %lname libnetfilter_queue is a userspace library providing an API to packets that have been queued by the kernel packet filter. It is is part of a system that deprecates the old ip_queue / libipq mechanism. @@ -53,9 +62,10 @@ system that deprecates the old ip_queue / libipq mechanism. libnetfilter_queue has been previously known as libnfnetlink_queue. %package devel -Group: Development/Libraries/C and C++ -Requires: %libsoname = %version, libnfnetlink-devel +Requires: %lname = %version +Requires: libnfnetlink-devel Summary: Userspace library for packets that have been queued by the kernel packet filter +Group: Development/Libraries/C and C++ %description devel libnetfilter_queue is a userspace library providing an API to packets @@ -66,29 +76,27 @@ libnetfilter_queue has been previously known as libnfnetlink_queue. %prep %setup -q +%patch -P 1 -p1 %build -if [ ! -e configure ]; then - ./autogen.sh; -fi; %configure --disable-static --includedir=%_includedir/%name-%version -make %{?_smp_mflags} +make %{?_smp_mflags} KERNELDIR="ignore"; %install -%makeinstall +make install DESTDIR="%buildroot" KERNELDIR="ignore"; rm -f "%buildroot/%_libdir"/*.la; -%post -n %libsoname -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig -%postun -n %libsoname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig -%files -n %libsoname +%files -n %lname %defattr(-,root,root) %_libdir/libnetfilter_queue.so.1* %files devel %defattr(-,root,root) -%_includedir/libnetfilter_queue* +%_includedir/%name-%version %_libdir/libnetfilter_queue.so %_libdir/pkgconfig/libnetfilter_queue.pc diff --git a/rhel6-iptos.diff b/rhel6-iptos.diff new file mode 100644 index 0000000..0998f56 --- /dev/null +++ b/rhel6-iptos.diff @@ -0,0 +1,34 @@ +From: Jan Engelhardt +Date: 2012-10-09 02:46:29.418099680 +0200 +Upstream: never + +glibc before version 2.13 has a bug in netinet/ip.h: + +#define IPTOS_CLASS(class) ((tos) & IPTOS_CLASS_MASK) + +Namely, it does not use "class", but "tos". And þe olde RHEL 6 +even ships that... bleh. + +--- + src/extra/ipv4.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: libnetfilter_queue-1.0.2/src/extra/ipv4.c +=================================================================== +--- libnetfilter_queue-1.0.2.orig/src/extra/ipv4.c ++++ libnetfilter_queue-1.0.2/src/extra/ipv4.c +@@ -133,12 +133,13 @@ int nfq_ip_snprintf(char *buf, size_t si + int ret; + struct in_addr src = { iph->saddr }; + struct in_addr dst = { iph->daddr }; ++ unsigned int tos = iph->tos; + + ret = snprintf(buf, size, "SRC=%s DST=%s LEN=%u TOS=0x%X " + "PREC=0x%X TTL=%u ID=%u PROTO=%u ", + inet_ntoa(src), inet_ntoa(dst), + ntohs(iph->tot_len), IPTOS_TOS(iph->tos), +- IPTOS_PREC(iph->tos), iph->ttl, ntohs(iph->id), ++ IPTOS_PREC(tos), iph->ttl, ntohs(iph->id), + iph->protocol); + + return ret;