diff --git a/.gitignore b/.gitignore index 7159b58..b5732a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libnetfilter_queue-0.0.17.tar.bz2 libnetfilter_queue-1.0.0.tar.bz2 /libnetfilter_queue-1.0.1.tar.bz2 +/libnetfilter_queue-1.0.2.tar.bz2 diff --git a/libnetfilter_queue-sysheader.patch b/libnetfilter_queue-sysheader.patch deleted file mode 100644 index fc59b86..0000000 --- a/libnetfilter_queue-sysheader.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/include/libnetfilter_queue/Makefile.am b/include/libnetfilter_queue/Makefile.am -index 188a927..2f1652e 100644 ---- a/include/libnetfilter_queue/Makefile.am -+++ b/include/libnetfilter_queue/Makefile.am -@@ -1,3 +1,3 @@ - --pkginclude_HEADERS = libnetfilter_queue.h linux_nfnetlink_queue.h -+pkginclude_HEADERS = libnetfilter_queue.h - -diff --git a/include/libnetfilter_queue/libnetfilter_queue.h b/include/libnetfilter_queue/libnetfilter_queue.h -index 28bf2b1..2d98f12 100644 ---- a/include/libnetfilter_queue/libnetfilter_queue.h -+++ b/include/libnetfilter_queue/libnetfilter_queue.h -@@ -14,9 +14,12 @@ - #define __LIBCTNETLINK_H - - #include --// #include - --#include -+#ifndef aligned_be64 -+#define aligned_be64 __be64 __attribute__((aligned(8))) -+#endif -+ -+#include - - #ifdef __cplusplus - extern "C" { -diff --git a/include/libnetfilter_queue/linux_nfnetlink_queue.h b/include/libnetfilter_queue/linux_nfnetlink_queue.h -deleted file mode 100644 -index 6b4f86d..0000000 ---- a/include/libnetfilter_queue/linux_nfnetlink_queue.h -+++ /dev/null -@@ -1,94 +0,0 @@ --#ifndef _NFNETLINK_QUEUE_H --#define _NFNETLINK_QUEUE_H -- --#ifndef aligned_u64 --#define aligned_u64 unsigned long long __attribute__((aligned(8))) --#endif -- --#include -- --enum nfqnl_msg_types { -- NFQNL_MSG_PACKET, /* packet from kernel to userspace */ -- NFQNL_MSG_VERDICT, /* verdict from userspace to kernel */ -- NFQNL_MSG_CONFIG, /* connect to a particular queue */ -- NFQNL_MSG_VERDICT_BATCH, /* batch verdict from userspace to kernel */ -- -- NFQNL_MSG_MAX --}; -- --struct nfqnl_msg_packet_hdr { -- u_int32_t packet_id; /* unique ID of packet in queue */ -- u_int16_t hw_protocol; /* hw protocol (network order) */ -- u_int8_t hook; /* netfilter hook */ --} __attribute__ ((packed)); -- --struct nfqnl_msg_packet_hw { -- u_int16_t hw_addrlen; -- u_int16_t _pad; -- u_int8_t hw_addr[8]; --} __attribute__ ((packed)); -- --struct nfqnl_msg_packet_timestamp { -- aligned_u64 sec; -- aligned_u64 usec; --} __attribute__ ((packed)); -- --enum nfqnl_attr_type { -- NFQA_UNSPEC, -- NFQA_PACKET_HDR, -- NFQA_VERDICT_HDR, /* nfqnl_msg_verdict_hrd */ -- NFQA_MARK, /* u_int32_t nfmark */ -- NFQA_TIMESTAMP, /* nfqnl_msg_packet_timestamp */ -- NFQA_IFINDEX_INDEV, /* u_int32_t ifindex */ -- NFQA_IFINDEX_OUTDEV, /* u_int32_t ifindex */ -- NFQA_IFINDEX_PHYSINDEV, /* u_int32_t ifindex */ -- NFQA_IFINDEX_PHYSOUTDEV, /* u_int32_t ifindex */ -- NFQA_HWADDR, /* nfqnl_msg_packet_hw */ -- NFQA_PAYLOAD, /* opaque data payload */ -- -- __NFQA_MAX --}; --#define NFQA_MAX (__NFQA_MAX - 1) -- --struct nfqnl_msg_verdict_hdr { -- u_int32_t verdict; -- u_int32_t id; --} __attribute__ ((packed)); -- -- --enum nfqnl_msg_config_cmds { -- NFQNL_CFG_CMD_NONE, -- NFQNL_CFG_CMD_BIND, -- NFQNL_CFG_CMD_UNBIND, -- NFQNL_CFG_CMD_PF_BIND, -- NFQNL_CFG_CMD_PF_UNBIND, --}; -- --struct nfqnl_msg_config_cmd { -- u_int8_t command; /* nfqnl_msg_config_cmds */ -- u_int8_t _pad; -- u_int16_t pf; /* AF_xxx for PF_[UN]BIND */ --} __attribute__ ((packed)); -- --enum nfqnl_config_mode { -- NFQNL_COPY_NONE, -- NFQNL_COPY_META, -- NFQNL_COPY_PACKET, --}; -- --struct nfqnl_msg_config_params { -- u_int32_t copy_range; -- u_int8_t copy_mode; /* enum nfqnl_config_mode */ --} __attribute__ ((packed)); -- -- --enum nfqnl_attr_config { -- NFQA_CFG_UNSPEC, -- NFQA_CFG_CMD, /* nfqnl_msg_config_cmd */ -- NFQA_CFG_PARAMS, /* nfqnl_msg_config_params */ -- NFQA_CFG_QUEUE_MAXLEN, /* u_int32_t */ -- __NFQA_CFG_MAX --}; --#define NFQA_CFG_MAX (__NFQA_CFG_MAX-1) -- --#endif /* _NFNETLINK_QUEUE_H */ diff --git a/libnetfilter_queue.spec b/libnetfilter_queue.spec index bca0d33..9f3905f 100644 --- a/libnetfilter_queue.spec +++ b/libnetfilter_queue.spec @@ -1,19 +1,18 @@ -%define libnfnetlink 0.0.41 +%define libnfnetlink 1.0.1 Name: libnetfilter_queue -Version: 1.0.1 -Release: 2%{?dist} +Version: 1.0.2 +Release: 1%{?dist} Summary: Netfilter queue userspace library Group: System Environment/Libraries # Most files say GPLv2+, one says v2 only. License: GPLv2 URL: http://netfilter.org Source0: http://netfilter.org/projects/%{name}/files/%{name}-%{version}.tar.bz2 -Patch0: libnetfilter_queue-sysheader.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libnfnetlink-devel >= %{libnfnetlink}, pkgconfig, kernel-headers -BuildRequires: autoconf, automake, libtool +BuildRequires: autoconf, automake, libtool, libmnl-devel >= 1.0.3 %description libnetfilter_queue is a userspace library providing an API to packets that have @@ -37,20 +36,16 @@ libnetfilter_queue has been previously known as libnfnetlink_queue. %prep %setup -q -%patch0 -p1 - -mkdir -p m4 -autoreconf -i --force %build -%configure --disable-static --disable-rpath - +%configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make DESTDIR=%{buildroot} install find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +rm %{buildroot}/%{_includedir}/internal.h %clean rm -rf $RPM_BUILD_ROOT @@ -71,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/%{name}.pc %changelog +* Fri Nov 30 2012 Paul Komkoff - 1.0.2-1 +- upstream release + * Thu Jul 19 2012 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index e25821f..19ee049 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08b968cb2d36c24deb7f26a69f5d8602 libnetfilter_queue-1.0.1.tar.bz2 +df09befac35cb215865b39a36c96a3fa libnetfilter_queue-1.0.2.tar.bz2