diff -Nru php7.1-7.1.33/debian/changelog php7.1-7.1.33/debian/changelog --- php7.1-7.1.33/debian/changelog 2020-10-17 07:25:35.000000000 +0000 +++ php7.1-7.1.33/debian/changelog 2020-10-18 21:17:46.000000000 +0000 @@ -1,8 +1,15 @@ -php7.1 (7.1.33-20+ubuntu20.04.1+deb.sury.org+1) focal; urgency=medium +php7.1 (7.1.33-21+ubuntu20.04.1+deb.sury.org+1) focal; urgency=medium * No-change backport to focal - -- Ondřej Surý Sat, 17 Oct 2020 09:25:35 +0200 + -- Ondřej Surý Sun, 18 Oct 2020 23:17:46 +0200 + +php7.1 (7.1.33-21) unstable; urgency=medium + + * In phpize, copy the foreign files from their respective packages + (libtool, pkg-config, shtool) + + -- Ondřej Surý Sun, 18 Oct 2020 23:07:34 +0200 php7.1 (7.1.33-20) unstable; urgency=medium diff -Nru php7.1-7.1.33/debian/patches/0096-In-phpize-also-copy-config.guess-config.sub-ltmain.s.patch php7.1-7.1.33/debian/patches/0096-In-phpize-also-copy-config.guess-config.sub-ltmain.s.patch --- php7.1-7.1.33/debian/patches/0096-In-phpize-also-copy-config.guess-config.sub-ltmain.s.patch 1970-01-01 00:00:00.000000000 +0000 +++ php7.1-7.1.33/debian/patches/0096-In-phpize-also-copy-config.guess-config.sub-ltmain.s.patch 2020-10-18 21:07:34.000000000 +0000 @@ -0,0 +1,32 @@ +From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= +Date: Sun, 18 Oct 2020 20:38:15 +0200 +Subject: In phpize, also copy config.guess, config.sub, + ltmain.sh and shtool from their respective packages + +--- + scripts/phpize.in | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/scripts/phpize.in b/scripts/phpize.in +index c1ea973..a753dd1 100644 +--- a/scripts/phpize.in ++++ b/scripts/phpize.in +@@ -9,10 +9,16 @@ includedir="$prefix/include/php/@DEBIAN_PHP_API@" + builddir="`pwd`" + SED="@SED@" + ++libtool_version=$(dpkg-query -f'${Version}' -W libtool) + aclocaldir="$prefix/share/aclocal" +-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool ax_check_compile_flag.m4" ++if dpkg --compare-versions "$libtool_version" ge 2.4.6-0.1~; then \ ++ auxdir="/usr/share/libtool/build-aux" ++else \ ++ auxdir="/usr/share/libtool/config" ++fi ++FILES_BUILD="mkdep.awk scan_makefile_in.awk /usr/bin/shtool ax_check_compile_flag.m4" + LIBTOOL_FILES="pkg.m4 libtool.m4 ltoptions.m4 ltsugar.m4 ltversion.m4 lt~obsolete.m4" +-FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php" ++FILES="acinclude.m4 Makefile.global $auxdir/config.sub $auxdir/config.guess $auxdir/ltmain.sh run-tests*.php" + CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \ + mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ + aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \ diff -Nru php7.1-7.1.33/debian/patches/series php7.1-7.1.33/debian/patches/series --- php7.1-7.1.33/debian/patches/series 2020-10-17 07:20:39.000000000 +0000 +++ php7.1-7.1.33/debian/patches/series 2020-10-18 21:07:34.000000000 +0000 @@ -93,3 +93,4 @@ 0093-Do-not-decode-cookie-names-anymore.patch 0094-NEWS.patch 0095-Add-pkg-config-m4-files-to-phpize-script.patch +0096-In-phpize-also-copy-config.guess-config.sub-ltmain.s.patch diff -Nru php7.1-7.1.33/debian/rules php7.1-7.1.33/debian/rules --- php7.1-7.1.33/debian/rules 2020-10-17 07:20:39.000000000 +0000 +++ php7.1-7.1.33/debian/rules 2020-10-18 21:07:34.000000000 +0000 @@ -458,6 +458,14 @@ debian/tmp/usr/share/php/PEAR/ \ debian/tmp/usr/share/php/data/ \ debian/tmp/etc/pear.conf + # shipping duplicate files from other packages is hell for security audits + rm -f \ + debian/tmp$(PHPIZE_BUILDDIR)/config.guess \ + debian/tmp$(PHPIZE_BUILDDIR)/config.sub \ + debian/tmp$(PHPIZE_BUILDDIR)/libtool.m4 \ + debian/tmp$(PHPIZE_BUILDDIR)/pkg.m4 \ + debian/tmp$(PHPIZE_BUILDDIR)/ltmain.sh \ + debian/tmp$(PHPIZE_BUILDDIR)/shtool touch remove-files-stamp override_dh_installdirs: prepare-files-stamp @@ -513,20 +521,6 @@ override_dh_systemd_start: dh_systemd_start --restart-after-upgrade -override_dh_link: -# shipping duplicate files from other packages is hell for security audits - echo "/usr/share/misc/config.guess $(PHPIZE_BUILDDIR)/config.guess" >> $(PHP_DEV).links - echo "/usr/share/misc/config.sub $(PHPIZE_BUILDDIR)/config.sub" >> $(PHP_DEV).links - echo "/usr/share/aclocal/libtool.m4 $(PHPIZE_BUILDDIR)/libtool.m4" >> $(PHP_DEV).links - echo "/usr/share/aclocal/pkg.m4 $(PHPIZE_BUILDDIR)/pkg.m4" >> $(PHP_DEV).links - if dpkg --compare-versions $(LIBTOOL_VERSION) ge 2.4.6-0.1~; then \ - echo "/usr/share/libtool/build-aux/ltmain.sh $(PHPIZE_BUILDDIR)/ltmain.sh" >> $(PHP_DEV).links; \ - else \ - echo "/usr/share/libtool/config/ltmain.sh $(PHPIZE_BUILDDIR)/ltmain.sh" >> $(PHP_DEV).links; \ - fi - echo "/usr/bin/shtool $(PHPIZE_BUILDDIR)/shtool" >> $(PHP_DEV).links - dh_link - override_dh_apache2: for sapi in apache2 cgi fpm; do \ $(SAPI_PACKAGE) \