rpms/libnetfilter_conntrack
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build with a new glibc

Browse Source
This commit is contained in:
Paul P Komkoff Jr 2008-02-19 11:27:10 +00:00
parent 6e4ef3a781
commit ae52bdb15e
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libnetfilter_conntrack-in6addr.patch Normal file
View File

@ -0,0 +1,43 @@
diff --git a/l3extensions/libnetfilter_conntrack_ipv6.c b/l3extensions/libnetfilter_conntrack_ipv6.c
index b0c7a3f..5f173f3 100644
--- a/l3extensions/libnetfilter_conntrack_ipv6.c
+++ b/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/src/conntrack/snprintf_default.c b/src/conntrack/snprintf_default.c
index 996fe1a..382b2d9 100644
--- a/src/conntrack/snprintf_default.c
+++ b/src/conntrack/snprintf_default.c
@@ -92,8 +92,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 56b2016..7bd1b43 100644
--- a/src/conntrack/snprintf_xml.c
+++ b/src/conntrack/snprintf_xml.c
@@ -98,7 +98,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;

7
libnetfilter_conntrack.spec
View File

@ -1,11 +1,12 @@
Name: libnetfilter_conntrack
Version: 0.0.82
Release: 1%{?dist}
Release: 2%{?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
Patch0: libnetfilter_conntrack-in6addr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libnfnetlink-devel, pkgconfig
@ -25,6 +26,7 @@ interface (API) to the in-kernel connection tracking state table.
%prep
%setup -q
%patch -p1
%build
%configure --disable-static --disable-rpath
@ -61,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libnetfilter_conntrack/*.h
%changelog
* Tue Feb 19 2008 Paul P. Komkoff Jr <i@stingr.net> - 0.0.82-2
- fix build with a new glibc
* Sun Jan 20 2008 Paul P. Komkoff Jr <i@stingr.net> - 0.0.82-1
- new upstream version