import libnetfilter_queue-1.0.4-3.el8

.gitignore

@@ -1 +1 @@
-SOURCES/libnetfilter_queue-1.0.2.tar.bz2
+SOURCES/libnetfilter_queue-1.0.4.tar.bz2

.libnetfilter_queue.metadata

@@ -1 +1 @@
-8cc0b8ed33162281bc9fa8bcfa8c9dcb08848ff9 SOURCES/libnetfilter_queue-1.0.2.tar.bz2
+1f1b4d4238371ca89739b08cff8a8388b7d438ad SOURCES/libnetfilter_queue-1.0.4.tar.bz2

SOURCES/0001-configure-add-with-without-doxygen-switch.patch

@@ -0,0 +1,77 @@
+From b9986739f0ec0ffc2bf37951fc8308fbfb433d0c Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Sat, 6 Jun 2020 16:14:44 +0200
+Subject: [PATCH] configure: add --with/without-doxygen switch
+
+Allows to turn off doxygen even if its installed, via
+--without-doxygen.
+
+Default is to probe for doxygen presence (--with-doxygen).
+
+Signed-off-by: Florian Westphal <fw@strlen.de>
+(cherry picked from commit 3622e6061d5cc34db70cef7b8516217e27ffa57c)
+
+Conflicts:
+- Change configure script itself instead of configure.ac as original patch
+  does.
+---
+
+--- a/configure
++++ b/configure
+@@ -770,6 +770,7 @@
+ with_gnu_ld
+ with_sysroot
+ enable_libtool_lock
++with_doxygen
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -1441,6 +1442,7 @@
+   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+   --with-sysroot[=DIR]    Search for dependent libraries within DIR (or the
+                           compiler's sysroot if not specified).
++  --with-doxygen          create doxygen documentation
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -13278,7 +13280,17 @@
+ 
+ 
+ 
+-for ac_prog in doxygen
++# Check whether --with-doxygen was given.
++if test "${with_doxygen+set}" = set; then :
++  withval=$with_doxygen; with_doxygen="$withval"
++else
++  with_doxygen=yes
++fi
++
++
++if test "x$with_doxygen" != xno; then :
++
++	for ac_prog in doxygen
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -13320,9 +13332,7 @@
+   test -n "$DOXYGEN" && break
+ done
+ 
+-if test -z "$DOXYGEN";
+-	then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Doxygen not found - continuing without Doxygen support" >&5
+-$as_echo "$as_me: WARNING: Doxygen not found - continuing without Doxygen support" >&2;}
++
+ fi
+ 
+  if test -n "$DOXYGEN"; then
+@@ -13333,6 +13343,10 @@
+   HAVE_DOXYGEN_FALSE=
+ fi
+ 
++if test -z "$DOXYGEN"; then
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Doxygen not found - continuing without Doxygen support" >&5
++$as_echo "$as_me: WARNING: Doxygen not found - continuing without Doxygen support" >&2;}
++fi
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+ # tests run on this system so they can be shared between configure

SOURCES/fixmanpages.sh

@@ -0,0 +1,65 @@
+#!/bin/bash -p
+#set -x
+function main
+{
+  set -e
+  cd doxygen/man/man3
+  rm -f _*
+  setgroup LibrarySetup nfq_open
+    add2group nfq_close nfq_bind_pf nfq_unbind_pf
+  setgroup Parsing nfq_get_msg_packet_hdr
+    add2group nfq_get_nfmark nfq_get_timestamp nfq_get_indev nfq_get_physindev
+    add2group nfq_get_outdev nfq_get_physoutdev nfq_get_indev_name
+    add2group nfq_get_physindev_name nfq_get_outdev_name
+    add2group nfq_get_physoutdev_name nfq_get_packet_hw
+    add2group nfq_get_skbinfo
+    add2group nfq_get_uid nfq_get_gid
+    add2group nfq_get_secctx nfq_get_payload
+  setgroup Queue nfq_fd
+    add2group nfq_create_queue nfq_destroy_queue nfq_handle_packet nfq_set_mode
+    add2group nfq_set_queue_flags nfq_set_queue_maxlen nfq_set_verdict
+    add2group nfq_set_verdict2 nfq_set_verdict_batch
+    add2group nfq_set_verdict_batch2 nfq_set_verdict_mark
+  setgroup ipv4 nfq_ip_get_hdr
+    add2group nfq_ip_set_transport_header nfq_ip_mangle nfq_ip_snprintf
+    setgroup ip_internals nfq_ip_set_checksum
+  setgroup ipv6 nfq_ip6_get_hdr
+    add2group nfq_ip6_set_transport_header nfq_ip6_mangle nfq_ip6_snprintf
+  setgroup nfq_cfg nfq_nlmsg_cfg_put_cmd
+    add2group nfq_nlmsg_cfg_put_params nfq_nlmsg_cfg_put_qmaxlen
+  setgroup nfq_verd nfq_nlmsg_verdict_put
+    add2group nfq_nlmsg_verdict_put_mark nfq_nlmsg_verdict_put_pkt
+  setgroup nlmsg nfq_nlmsg_parse
+    add2group nfq_nlmsg_put
+  setgroup pktbuff pktb_alloc
+    add2group pktb_data pktb_len pktb_mangle pktb_mangled
+    add2group pktb_free
+    setgroup otherfns pktb_tailroom
+      add2group pktb_mac_header pktb_network_header pktb_transport_header
+      setgroup uselessfns pktb_push
+        add2group pktb_pull pktb_put pktb_trim
+  setgroup tcp nfq_tcp_get_hdr
+    add2group nfq_tcp_get_payload nfq_tcp_get_payload_len
+    add2group nfq_tcp_snprintf nfq_tcp_mangle_ipv4 nfq_tcp_mangle_ipv6
+    setgroup tcp_internals nfq_tcp_compute_checksum_ipv4
+      add2group nfq_tcp_compute_checksum_ipv6
+  setgroup udp nfq_udp_get_hdr
+    add2group nfq_udp_get_payload nfq_udp_get_payload_len
+    add2group nfq_udp_mangle_ipv4 nfq_udp_mangle_ipv6 nfq_udp_snprintf
+    setgroup udp_internals nfq_udp_compute_checksum_ipv4
+      add2group nfq_udp_compute_checksum_ipv6
+  setgroup Printing nfq_snprintf_xml
+}
+function setgroup
+{
+  mv $1.3 $2.3
+  BASE=$2
+}
+function add2group
+{
+  for i in $@
+  do
+    ln -sf $BASE.3 $i.3
+  done
+}
+main

SPECS/libnetfilter_queue.spec

@@ -1,16 +1,19 @@
 %define libnfnetlink 1.0.1
 
 Name:           libnetfilter_queue
-Version:        1.0.2
+Version:        1.0.4
-Release:        11%{?dist}
+Release:        3%{?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
+Source1:        fixmanpages.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:         0001-configure-add-with-without-doxygen-switch.patch
+
 BuildRequires:  libnfnetlink-devel >= %{libnfnetlink}, pkgconfig, kernel-headers
 BuildRequires:  autoconf, automake, libtool, libmnl-devel >= 1.0.3
 
@@ -35,17 +38,17 @@ deprecates the old ip_queue / libipq mechanism.
 libnetfilter_queue has been previously known as libnfnetlink_queue.
 
 %prep
-%setup -q
+%autosetup -p1
+install -m0755 %{SOURCE1} .
 
 %build
-%configure --disable-static
+%configure --disable-static --without-doxygen
 make %{?_smp_mflags}
 
 %install
 rm -rf $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
@@ -66,6 +69,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Mon Jun 08 2020 Phil Sutter <psutter@redhat.com> - 1.0.4-3
+- Add missing fixmanpages.sh script
+- Allow for and explicitly disable doxygen docs
+
+* Fri Jun 05 2020 Phil Sutter <psutter@redhat.com> - 1.0.4-2
+- No need to drop internal.h, it is no longer installed.
+
+* Fri Jun 05 2020 Phil Sutter <psutter@redhat.com> - 1.0.4-1
+- Rebase onto version 1.0.4
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild