[PATCH libnetfilter_queue 0/1] URGENT: libnetfilter_queue-1.0.4 fails to build

[PATCH libnetfilter_queue 0/1] URGENT: libnetfilter_queue-1.0.4 fails to build

[Duncan Roe]

'make' says: No rule to build ../fixmanpages.sh: stop
Maybe you can push out a re-release before anyone else notices?
Do what you must,

Cheers ... Duncan.

Duncan Roe (1):
  build: dist: Add fixmanpages.sh to distribution tree

 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

v2: Move fixmanpages.sh into the doxygen directory
    Compare Slackware built package to v1: no significant diffs.
    (diffs are: "Generated on" lines in html files differ
                binary gzipped man pages differ, but zdiff compares equal)

-- 
2.14.5

[PATCH libnetfilter_queue v2 1/1] build: dist: Add fixmanpages.sh to distribution tree

[Duncan Roe]

Also move fixmanpages.sh into the doxygen directory

Tested by running Slackware package builder on libnetfilter_queue-1.0.4.tar.bz2
created by 'make dist' after applying the patch. Works now, failed before.

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
 Makefile.am                              | 1 +
 doxygen/Makefile.am                      | 4 ++--
 fixmanpages.sh => doxygen/fixmanpages.sh | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename fixmanpages.sh => doxygen/fixmanpages.sh (99%)

diff --git a/Makefile.am b/Makefile.am
index a5b347b..7d3bf23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,4 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnetfilter_queue.pc
 
 EXTRA_DIST += Make_global.am
+EXTRA_DIST += doxygen/fixmanpages.sh
diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index ef468e0..a4db804 100644
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -8,8 +8,8 @@ doc_srcs = $(top_srcdir)/src/libnetfilter_queue.c  \
            $(top_srcdir)/src/extra/udp.c           \
            $(top_srcdir)/src/extra/pktbuff.c
 
-doxyfile.stamp: $(doc_srcs) $(top_srcdir)/fixmanpages.sh
-	rm -rf html man && cd .. && doxygen doxygen.cfg && ./fixmanpages.sh
+doxyfile.stamp: $(doc_srcs) fixmanpages.sh
+	rm -rf html man && (cd .. && doxygen doxygen.cfg) && ./fixmanpages.sh
 	touch doxyfile.stamp
 
 CLEANFILES = doxyfile.stamp
diff --git a/fixmanpages.sh b/doxygen/fixmanpages.sh
similarity index 99%
rename from fixmanpages.sh
rename to doxygen/fixmanpages.sh
index dd8b3a4..38e97ba 100755
--- a/fixmanpages.sh
+++ b/doxygen/fixmanpages.sh
@@ -3,7 +3,7 @@
 function main
 {
   set -e
-  cd doxygen/man/man3
+  cd man/man3
   rm -f _*
   setgroup LibrarySetup nfq_open
     add2group nfq_close nfq_bind_pf nfq_unbind_pf
-- 
2.14.5

Re: [PATCH libnetfilter_queue v2 1/1] build: dist: Add fixmanpages.sh to distribution tree

[Pablo Neira Ayuso]

On Sun, Jun 07, 2020 at 12:25:08AM +1000, Duncan Roe wrote:
> Also move fixmanpages.sh into the doxygen directory
> 
> Tested by running Slackware package builder on libnetfilter_queue-1.0.4.tar.bz2
> created by 'make dist' after applying the patch. Works now, failed before.

Applied, thanks.

Re: [PATCH libnetfilter_queue v2 1/1] build: dist: Add fixmanpages.sh to distribution tree

[Pablo Neira Ayuso]

On Sun, Jun 07, 2020 at 08:29:51PM +0200, Pablo Neira Ayuso wrote:
> On Sun, Jun 07, 2020 at 12:25:08AM +1000, Duncan Roe wrote:
> > Also move fixmanpages.sh into the doxygen directory
> > 
> > Tested by running Slackware package builder on libnetfilter_queue-1.0.4.tar.bz2
> > created by 'make dist' after applying the patch. Works now, failed before.
> 
> Applied, thanks.

Side note: I had to move EXTRA_DIST to doxygen/Makefile.am so make
distcheck works.

Re: [PATCH libnetfilter_queue v2 1/1] build: dist: Add fixmanpages.sh to distribution tree

[Pablo Neira Ayuso]

On Sun, Jun 07, 2020 at 08:39:43PM +0200, Pablo Neira Ayuso wrote:
> On Sun, Jun 07, 2020 at 08:29:51PM +0200, Pablo Neira Ayuso wrote:
> > On Sun, Jun 07, 2020 at 12:25:08AM +1000, Duncan Roe wrote:
> > > Also move fixmanpages.sh into the doxygen directory
> > > 
> > > Tested by running Slackware package builder on libnetfilter_queue-1.0.4.tar.bz2
> > > created by 'make dist' after applying the patch. Works now, failed before.
> > 
> > Applied, thanks.
> 
> Side note: I had to move EXTRA_DIST to doxygen/Makefile.am so make
> distcheck works.

Sorry, I quickly looked to fix it but it still does not work with make
distcheck here for some reason.

[PATCH libnetfilter_queue 0/2] Force 'make distcheck' to pass

[Duncan Roe]

Hi Pablo,

Patch 1 below is the same as I sent previously.

Patch 2 forces 'make distcheck' to pass. The generated tar.bz2 is good.
The patch is not pretty, but the best I could do.

Cheers ... Duncan.

Duncan Roe (2):
  build: dist: Add fixmanpages.sh to distribution tree
  build: dist: Force 'make distcheck' to pass

 Makefile.am                              |  1 +
 doxygen/Makefile.am                      | 18 +++++++++++++++---
 fixmanpages.sh => doxygen/fixmanpages.sh |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)
 rename fixmanpages.sh => doxygen/fixmanpages.sh (99%)

-- 
2.14.5

[PATCH libnetfilter_queue 1/2] build: dist: Add fixmanpages.sh to distribution tree

[Duncan Roe]

Also move fixmanpages.sh into the doxygen directory

Tested by running Slackware package builder on libnetfilter_queue-1.0.4.tar.bz2
created by 'make dist' after applying the patch. Works now, failed before.

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
 Makefile.am                              | 1 +
 doxygen/Makefile.am                      | 4 ++--
 fixmanpages.sh => doxygen/fixmanpages.sh | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename fixmanpages.sh => doxygen/fixmanpages.sh (99%)

diff --git a/Makefile.am b/Makefile.am
index a5b347b..7d3bf23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,4 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnetfilter_queue.pc
 
 EXTRA_DIST += Make_global.am
+EXTRA_DIST += doxygen/fixmanpages.sh
diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index ef468e0..a4db804 100644
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -8,8 +8,8 @@ doc_srcs = $(top_srcdir)/src/libnetfilter_queue.c  \
            $(top_srcdir)/src/extra/udp.c           \
            $(top_srcdir)/src/extra/pktbuff.c
 
-doxyfile.stamp: $(doc_srcs) $(top_srcdir)/fixmanpages.sh
-	rm -rf html man && cd .. && doxygen doxygen.cfg && ./fixmanpages.sh
+doxyfile.stamp: $(doc_srcs) fixmanpages.sh
+	rm -rf html man && (cd .. && doxygen doxygen.cfg) && ./fixmanpages.sh
 	touch doxyfile.stamp
 
 CLEANFILES = doxyfile.stamp
diff --git a/fixmanpages.sh b/doxygen/fixmanpages.sh
similarity index 99%
rename from fixmanpages.sh
rename to doxygen/fixmanpages.sh
index dd8b3a4..38e97ba 100755
--- a/fixmanpages.sh
+++ b/doxygen/fixmanpages.sh
@@ -3,7 +3,7 @@
 function main
 {
   set -e
-  cd doxygen/man/man3
+  cd man/man3
   rm -f _*
   setgroup LibrarySetup nfq_open
     add2group nfq_close nfq_bind_pf nfq_unbind_pf
-- 
2.14.5

[PATCH libnetfilter_queue 2/2] build: dist: Force 'make distcheck' to pass

[Duncan Roe]

'make distcheck' was failing because fixmanpages.sh was not present in the
test build directory.
While this can be addressed, it has no chance of working because make has
already deleted the generated man pages.
To solve this problem, this patch makes the Makefile become "aware" that is
being run by 'make distcheck' and keep going if so.
The Makefile also has to take special action so 'make distcleancheck' passes.

This does mean that 'make distcheck' doesn't test fixmanpages.sh.

Signed-off-by: Duncan Roe <duncan_roe@optusnet.com.au>
---
 doxygen/Makefile.am | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/doxygen/Makefile.am b/doxygen/Makefile.am
index a4db804..9c06983 100644
--- a/doxygen/Makefile.am
+++ b/doxygen/Makefile.am
@@ -9,7 +9,12 @@ doc_srcs = $(top_srcdir)/src/libnetfilter_queue.c  \
            $(top_srcdir)/src/extra/pktbuff.c
 
 doxyfile.stamp: $(doc_srcs) fixmanpages.sh
-	rm -rf html man && (cd .. && doxygen doxygen.cfg) && ./fixmanpages.sh
+# Hack so 'make distcheck' passes:
+# just keep going if fixmanpages.sh is missing
+# as an extra check, ensure penultimate 2 components of cwd are "_build/sub"
+	rm -rf html man && (cd .. && doxygen doxygen.cfg) &&\
+	[ ! -x ./fixmanpages.sh -a "$$(pwd|rev|cut -d/ -f2-3|rev)" = _build/sub ] ||\
+	./fixmanpages.sh
 	touch doxyfile.stamp
 
 CLEANFILES = doxyfile.stamp
@@ -19,5 +24,12 @@ clean-local:
 	rm -rf $(top_srcdir)/doxygen/man $(top_srcdir)/doxygen/html
 install-data-local:
 	mkdir -p $(DESTDIR)$(mandir)/man3
-	cp --no-dereference --preserve=links,mode,timestamps man/man3/*.3 $(DESTDIR)$(mandir)/man3/
+# Need another hack so 'make distcleancheck' passes :(
+# No need to check directory tree again
+	if [ ! -x ./fixmanpages.sh ];\
+	then\
+		rm -rf html;\
+	else\
+		cp --no-dereference --preserve=links,mode,timestamps man/man3/*.3 $(DESTDIR)$(mandir)/man3/;\
+	fi
 endif
-- 
2.14.5

Re: [PATCH libnetfilter_queue 0/2] Force 'make distcheck' to pass

[Pablo Neira Ayuso]

On Mon, Jun 08, 2020 at 05:14:59PM +1000, Duncan Roe wrote:
> Hi Pablo,
> 
> Patch 1 below is the same as I sent previously.
> 
> Patch 2 forces 'make distcheck' to pass. The generated tar.bz2 is good.
> The patch is not pretty, but the best I could do.

Thanks. I also spent a bit of time and I failed to make this work
without the hacks.

I decided to:

* Disable doxygen by default, as it was in the <= 1.0.3 releases.
  Users can still enable this via --with-doxygen.

* Add this manpage fixup script to EXTRA_DIST.

Patch are already upstream.