[debhelper-devel] Bug#889006: dh-autoreconf is run before patching

[Sven Joachim]

[ CC'ing dpatch maintainer. ]

On 2018-02-01 08:56 +0200, Adrian Bunk wrote:

> Package: debhelper,dh-autoreconf
> Severity: serious
> Control: found -1 16
> Control: affects -1 src:dansguardian
>
> https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/dansguardian.html
>
> ...
>    dh_autoreconf
> configure.ac:14: installing './compile'
> src/Makefile.am:13: warning: source file 'contentscanners/clamav.cpp' is in a subdirectory,
> src/Makefile.am:13: but option 'subdir-objects' is disabled
> automake: warning: possible forward-incompatibility.
> automake: At least a source file is in a subdirectory, but the 'subdir-objects'
> automake: automake option hasn't been enabled.  For now, the corresponding output
> automake: object file(s) will be placed in the top-level directory.  However,
> automake: this behaviour will change in future Automake versions: they will
> automake: unconditionally cause object files to be placed in the same subdirectory
> automake: of the corresponding sources.
> automake: You are advised to start using 'subdir-objects' option throughout your
> automake: project, to avoid future incompatibilities.
> src/Makefile.am:31: warning: source file 'contentscanners/icapscan.cpp' is in a subdirectory,
> src/Makefile.am:31: but option 'subdir-objects' is disabled
> src/Makefile.am:39: warning: source file 'contentscanners/kavdscan.cpp' is in a subdirectory,
> src/Makefile.am:39: but option 'subdir-objects' is disabled
> src/Makefile.am:25: warning: source file 'contentscanners/clamdscan.cpp' is in a subdirectory,
> src/Makefile.am:25: but option 'subdir-objects' is disabled
> src/Makefile.am:43: warning: source file 'contentscanners/commandlinescan.cpp' is in a subdirectory,
> src/Makefile.am:43: but option 'subdir-objects' is disabled
> src/Makefile.am:48: warning: source file 'downloadmanagers/default.cpp' is in a subdirectory,
> src/Makefile.am:48: but option 'subdir-objects' is disabled
> src/Makefile.am:53: warning: source file 'downloadmanagers/fancy.cpp' is in a subdirectory,
> src/Makefile.am:53: but option 'subdir-objects' is disabled
> src/Makefile.am:57: warning: source file 'downloadmanagers/trickle.cpp' is in a subdirectory,
> src/Makefile.am:57: but option 'subdir-objects' is disabled
> src/Makefile.am:62: warning: source file 'authplugins/proxy.cpp' is in a subdirectory,
> src/Makefile.am:62: but option 'subdir-objects' is disabled
> src/Makefile.am:63: warning: source file 'authplugins/ident.cpp' is in a subdirectory,
> src/Makefile.am:63: but option 'subdir-objects' is disabled
> src/Makefile.am:64: warning: source file 'authplugins/ip.cpp' is in a subdirectory,
> src/Makefile.am:64: but option 'subdir-objects' is disabled
> src/Makefile.am:70: warning: source file 'authplugins/ntlm.cpp' is in a subdirectory,
> src/Makefile.am:70: but option 'subdir-objects' is disabled
> src/Makefile.am:65: warning: source file 'authplugins/digest.cpp' is in a subdirectory,
> src/Makefile.am:65: but option 'subdir-objects' is disabled
>    dh_dpatch_patch
> applying patch 03_add_unconfigures to ./ ... ok.
> applying patch 07_fix_config_paths to ./ ... ok.
> applying patch 11_FixOptionContainer.cpp_on_arm to ./ ... ok.
> applying patch 50_clamav095_support to ./ ... ok.
> applying patch 60_add_gcc4.4_support to ./ ... ok.
> applying patch 65-fix_clamdsocket to ./ ... ok.
> applying patch 70-gcc4.6 to ./ ... ok.
> applying patch 70_fix_clamav_detection to ./ ... ok.
> applying patch 80_fix_libcre3_max_sub_expression_allocation to ./ ... ok.
> ...
> checking for CLAMAV... no
> configure: error: Package requirements (libclamav >= 4) were not met:
>
> Requested 'libclamav >= 4' but version of libclamav is 0.99.3-beta2
>
>
> This is caused by:
>
>
> dh-autoreconf (16) unstable; urgency=medium
> ...
>   * Run dh_autoreconf after dh_update_autotools_config,
>     not before dh_auto_configure

The dansguardian package uses dpatch:

,----
| %:
| 	dh $@ --with dpatch,autotools_dev,autoreconf
`----

And /usr/share/perl5/Debian/Debhelper/Sequence/dpatch.pm has this line:

insert_before("dh_auto_configure", "dh_dpatch_patch");

I think this should be changed to

insert_before("dh_update_autotools_config", "dh_dpatch_patch");

as is the case in quilt.pm (since quilt 0.63-8.2).  Haven't tested it,
though.

Cheers,
       Sven