From e0706ee59b0742d0b4bf5081d68522dd882afb80b1879f1af3c25affd272508d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 13 Nov 2017 15:33:35 +0000 Subject: [PATCH] libnetfilter_queue-1.0.3 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_queue?expand=0&rev=41 --- libnetfilter_queue-1.0.2.tar.bz2 | 3 -- libnetfilter_queue-1.0.2.tar.bz2.sig | Bin 543 -> 0 bytes libnetfilter_queue-1.0.3.tar.bz2 | 3 ++ libnetfilter_queue-1.0.3.tar.bz2.sig | Bin 0 -> 543 bytes libnetfilter_queue.changes | 8 ++++ libnetfilter_queue.keyring | 63 ++++++++++++++++++++++++--- libnetfilter_queue.spec | 14 +++--- rhel6-iptos.diff | 34 --------------- 8 files changed, 74 insertions(+), 51 deletions(-) delete mode 100644 libnetfilter_queue-1.0.2.tar.bz2 delete mode 100644 libnetfilter_queue-1.0.2.tar.bz2.sig create mode 100644 libnetfilter_queue-1.0.3.tar.bz2 create mode 100644 libnetfilter_queue-1.0.3.tar.bz2.sig delete mode 100644 rhel6-iptos.diff diff --git a/libnetfilter_queue-1.0.2.tar.bz2 b/libnetfilter_queue-1.0.2.tar.bz2 deleted file mode 100644 index 807444b..0000000 --- a/libnetfilter_queue-1.0.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 042a1639f737aa4be42ddd01557825cbf91b9e90950fd81cdb82483b65dca4f5..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-iVtY-iU2@s?aABnqPSj^6~5C49!LxIh@P%9uz5w^Bp z+tUPvTYTSxEn1JYxIGI=I(kVNWzSe#q$!`6g(Kmq-pnh!Qf$MyQ!3T4>8cw;1l2eu z4qKXS8@=JZ(tW;a%AHhm^^{isBjBlV88w{>3ehdJ_LJ4r%yQa=(2 zsdEWFEhe4tn?KAn^=}3u<#62LFCcn?ptr+Ed5P>^*%C)gDcU!I5eW&)SJxK3>8WMx z;S2BPazoa^-Hs#a%PwowaT%`*x`>i?CpYt>sNBnYM~p@TrZtr>L5(Sa^WmAE3Th-u zShY6a5)(|Hk=(ho=J_vMdc0=fuBCuqWJzvU_1qa7H-TzPI{9a9iC>I4E}?>ep*(&U z=^YRKMh%Qq5r*JO{{1@ARfZM4ObU&x0aAWzA?}(OWxB8Ziey)#rQ+e{2`?Lj4B(Ac z7>C;Z@C^{p4Rd)%6hA!`By;rzBrSKR$5W3EUGzanQF1=eF|aB?RseX(mvmdsr6b1v zULnn74w2=-Z}d7M_mJd7nra6T8(>?GgE6OlU662=E86~if#;@+U_*KIOPNOwLcw4+KBu*^q-V)sQEG3LgFPW{ z()mU|Zi;{Mv|$JNF;(&1^*Hf9)a+0=vuP3vBB0fMg!z*=7XjjXoHlE@|3^ zNzNl(>4JV&N=$zzKvTre=Ea!Fub-SkUZ&1iK<67A5Oe1fm-EfQlfkjzSU5*&Bl15S zBlgCHzk`KaBWQ{>vSN~_5PF#qnwH|X-{JaOwIBp57EOP_Y#ctID&0+!exTVD6Atk_ z5hB<5vAfCQvC*Y@e<@(Axt}`K1yE)1U8uIgv(1NMPs0-gxBDpv0VYpB>7ViSDxa;r z-i^_Q%&RkjR)qQdRS%)BIAT#vTJo~`yVYyp}(RMG($Y;Ft8FSTDNBLh3R$@1E~N2 literal 0 HcmV?d00001 diff --git a/libnetfilter_queue.changes b/libnetfilter_queue.changes index 80b84b6..c6b30b4 100644 --- a/libnetfilter_queue.changes +++ b/libnetfilter_queue.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 13 15:28:18 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 1.0.3 + * No changelog was provided, in fact, no release announcement + has been made. +- Drop rhel6-iptos.diff, we do not particularly care for RHEL6. + ------------------------------------------------------------------- Mon Dec 8 23:51:21 UTC 2014 - jengelh@inai.de diff --git a/libnetfilter_queue.keyring b/libnetfilter_queue.keyring index 3022f4a..1cce01f 100644 --- a/libnetfilter_queue.keyring +++ b/libnetfilter_queue.keyring @@ -1,9 +1,14 @@ -pub 4096R/BB5F58CC 2010-10-21 [expires: 2015-10-20] -uid Netfilter Core Team -sub 4096R/04B92F5C 2010-10-21 [expires: 2015-10-20] +pub 4096R/0xA4111F89BB5F58CC 2010-10-21 [expires: 2015-10-20] + Key fingerprint = 57FF 5E9C 9AA6 7A86 0B55 7AF7 A411 1F89 BB5F 58CC +uid [ expired] Netfilter Core Team +sub 4096R/0x0FD3A13A04B92F5C 2010-10-21 [expires: 2015-10-20] + +pub 4096R/0xAB4655A126D292E4 2015-10-19 [expires: 2020-10-17] + Key fingerprint = C09D B206 3F1D 7034 BA61 52AD AB46 55A1 26D2 92E4 +uid [ unknown] Netfilter Core Team +sub 4096R/0xE3B0B6BAE3AAA39E 2015-10-19 [expires: 2020-10-17] -----BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v2.0.19 (GNU/Linux) mQINBEzAS5EBEADVlGm+KwODJcVmP33HTCbn/eP8obZbgu+3Z1CYRklF8V43vC6D 8Jfk7fjD4/gWbAKZxriOESXVAN7mp0Fho4+Ga+pxWeLIET9tVM5xbNFK1p9R3XCK @@ -51,6 +56,52 @@ H0uV8ILfFVe6gnKzanugmaSQjWzby/ARPhs6OYAXoIUv5MUVDgvTzVmTckWjVa1R kMm3eGmDSqoMxsPmarb80nkoFQMOPhJWlyaUCt6HHRYuSkIcxY4H4Ni3Oq1s1R9/ EqUuIfxNv7Kp0mcsE2KvANc3JfB9wXwLWqDYRCifLkCD6pbpt9L/+xQ49VzcFxNO 9DqTyk4N7cz7OZrAi+ouVrdFuiwnZyn5YSQoof6Pos58b3bkFn14m9gofwTqGzPh -R4Vot9rRu5zrWdoCM4cRThpJyrjqBMs= -=mRxL +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 +=zI6p -----END PGP PUBLIC KEY BLOCK----- diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec index e481e5f..d6996a4 100644 --- a/libnetfilter_queue.spec +++ b/libnetfilter_queue.spec @@ -1,7 +1,7 @@ # # spec file for package libnetfilter_queue # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,20 +18,19 @@ Name: libnetfilter_queue %define lname %{name}1 -Version: 1.0.2 +Version: 1.0.3 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 +#Git-Clone: git://git.netfilter.org/libnetfilter_queue #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 +Source: http://ftp.netfilter.org/pub/libnetfilter_queue/%name-%version.tar.bz2 +Source2: http://ftp.netfilter.org/pub/libnetfilter_queue/%name-%version.tar.bz2.sig Source3: baselibs.conf Source4: %name.keyring -Patch1: rhel6-iptos.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build #BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 @@ -71,11 +70,10 @@ libnetfilter_queue has been previously known as libnfnetlink_queue. %prep %setup -q -%patch -P 1 -p1 %build %configure --disable-static --includedir="%_includedir/%name" -make %{?_smp_mflags} KERNELDIR="ignore"; +make %{?_smp_mflags} KERNELDIR="ignore" %install %make_install KERNELDIR="ignore" diff --git a/rhel6-iptos.diff b/rhel6-iptos.diff deleted file mode 100644 index 0998f56..0000000 --- a/rhel6-iptos.diff +++ /dev/null @@ -1,34 +0,0 @@ -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;