rpm/libnetfilter_queue
SHA256
1
0
Fork 0
forked from pool/libnetfilter_queue
Code Pull Requests Activity

RHEL6 workarounds

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/libnetfilter_queue?expand=0&rev=27
This commit is contained in:
Jan Engelhardt 2012-10-09 01:02:44 +00:00 committed by Git OBS Bridge
parent ba73d408f3
commit dda62653dd
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libnetfilter_queue.spec
View File

@ -30,6 +30,7 @@ Url: http://netfilter.org/projects/libnetfilter_queue/
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: libtool
@ -75,6 +76,7 @@ libnetfilter_queue has been previously known as libnfnetlink_queue.
%prep
%setup -q
%patch -P 1 -p1
%build
%configure --disable-static --includedir=%_includedir/%name-%version

34
rhel6-iptos.diff Normal file
View File

@ -0,0 +1,34 @@
From: Jan Engelhardt <jengelh@inai.de>
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;