Bug#993014: cifs-utils non-parallel FTBFS
Hi. Could we have this fixed in stable for the next point release (11.5), please? (The window for uploads closes this weekend). Please tell me if you need help (for example, doing an upload and/or submitting a bug to release.debian.org asking for the upload to be accepted). Thanks.
Bug#993014: cifs-utils non-parallel FTBFS
El 27/8/22 a las 17:24, Michael Tokarev escribió: 27.08.2022 03:35, Santiago Vila пишет: Hi. Now that this is finally fixed in sid, here is a proposed diff for bullseye, including changelog. Heh. The changelog includes entry by me.. it is not fair for your contribution, I think.. :) I prefer not to appear in the changelog for such tiny contribution, but do as you prefer. I am happy enough to see this fixed in the next point release of Debian 11. BTW, should we drop the .1 from -3.1+deb11u2 release number? This is an upload for stable, so it has to be >= version in stable to be accepted. Version in stable is 2:6.11-3.1+deb11u1 because it was made by security team. Once we start using the "+deb11u1" thing in stable, the usual thing is to increment the u1 part, so we go from u1 to u2. Thanks.
Bug#993014: cifs-utils non-parallel FTBFS
27.08.2022 03:35, Santiago Vila пишет: Hi. Now that this is finally fixed in sid, here is a proposed diff for bullseye, including changelog. Heh. The changelog includes entry by me.. it is not fair for your contribution, I think.. :) BTW, should we drop the .1 from -3.1+deb11u2 release number? Thanks, /mjt
Bug#993014: cifs-utils non-parallel FTBFS
Hi. Now that this is finally fixed in sid, here is a proposed diff for bullseye, including changelog. It's the same fix which is now in sid. I've tested and it works for me. Thanks. diff -Nru cifs-utils-6.11/debian/changelog cifs-utils-6.11/debian/changelog --- cifs-utils-6.11/debian/changelog2022-05-10 22:12:42.0 +0200 +++ cifs-utils-6.11/debian/changelog2022-08-27 02:20:00.0 +0200 @@ -1,3 +1,9 @@ +cifs-utils (2:6.11-3.1+deb11u2) bullseye; urgency=medium + + * Fix non-parallel build. Closes: #993014. + + -- Michael Tokarev Sat, 27 Aug 2022 02:20:00 +0200 + cifs-utils (2:6.11-3.1+deb11u1) bullseye-security; urgency=high * Non-maintainer upload by the Security Team. diff -Nru cifs-utils-6.11/debian/patches/root_sbindir-hook.patch cifs-utils-6.11/debian/patches/root_sbindir-hook.patch --- cifs-utils-6.11/debian/patches/root_sbindir-hook.patch 1970-01-01 01:00:00.0 +0100 +++ cifs-utils-6.11/debian/patches/root_sbindir-hook.patch 2022-08-27 02:20:00.0 +0200 @@ -0,0 +1,11 @@ +--- a/Makefile.am b/Makefile.am +@@ -118,7 +118,7 @@ + + SUBDIRS = contrib + +-install-exec-hook: ++install-exec-hook: install-root_sbinPROGRAMS + (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) + + install-data-hook: diff -Nru cifs-utils-6.11/debian/patches/series cifs-utils-6.11/debian/patches/series --- cifs-utils-6.11/debian/patches/series 2022-05-10 22:12:42.0 +0200 +++ cifs-utils-6.11/debian/patches/series 2022-08-27 02:20:00.0 +0200 @@ -5,3 +5,4 @@ 0011-fix-regression-for-CVE-2021-20208.patch CVE-2022-27239-mount.cifs-fix-length-check-for-ip-op.patch mount.cifs-fix-verbose-messages-on-option-parsing.patch +root_sbindir-hook.patch
Bug#993014: cifs-utils non-parallel FTBFS
reopen 993014 found 993014 2:7.0-1 thanks This is still happening in both bullseye and sid. I'm attaching the full build log for sid on a system with only one CPU. This may be reproduced easily on any system by booting with this option: GRUB_CMDLINE_LINUX="nr_cpus=1" in /etc/default/grub (and running update-grub, of course). I can't tell for sure if that's equivalent to DEB_BUILD_OPTIONS=parallel=1 (sometimes it's not), but I can tell that on systems with only one CPU (or the GRUB trick) this package seems to fail 100% of the time. L. van Belle wrote: > current bullseye version builds as far I know, No, not really. I noted such detail here: Message-ID: <0e84f68c-e911-b2ca-21ef-9ad44a12a...@unex.es> Michael Tokarev wrote: > do we need to fix this for bullseye? Yes, please. This is a FTBFS bug in a supported architecture (amd64), and packages in stable must build in stable. In case it helps, I would be willing to make the upload for bullseye, as a sponsored upload. Thanks.sbuild (Debian sbuild) 0.81.2 (31 January 2021) on skywalker1 +==+ | cifs-utils 2:7.0-1 (amd64) Fri, 26 Aug 2022 11:22:12 + | +==+ Package: cifs-utils Version: 2:7.0-1 Source Version: 2:7.0-1 Distribution: sid Machine Architecture: amd64 Host Architecture: amd64 Build Architecture: amd64 Build Type: any I: NOTICE: Log filtering will replace 'var/run/schroot/mount/sid-ef57b26d-da23-4219-a46e-047c79c00f34' with '<>' I: NOTICE: Log filtering will replace 'build/cifs-utils-gH22g8/resolver-SdoRRS' with '<>' +--+ | Update chroot| +--+ Hit:1 http://deb.debian.org/debian sid InRelease Reading package lists... Reading package lists... Building dependency tree... Reading state information... Calculating upgrade... 0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded. +--+ | Fetch source files | +--+ Check APT - Checking available source versions... Download source files with APT -- Reading package lists... NOTICE: 'cifs-utils' packaging is maintained in the 'Git' version control system at: https://salsa.debian.org/samba-team/cifs-utils.git Please use: git clone https://salsa.debian.org/samba-team/cifs-utils.git to retrieve the latest (possibly unreleased) updates to the package. Need to get 431 kB of source archives. Get:1 http://deb.debian.org/debian sid/main cifs-utils 2:7.0-1 (dsc) [2177 B] Get:2 http://deb.debian.org/debian sid/main cifs-utils 2:7.0-1 (tar) [419 kB] Get:3 http://deb.debian.org/debian sid/main cifs-utils 2:7.0-1 (asc) [819 B] Get:4 http://deb.debian.org/debian sid/main cifs-utils 2:7.0-1 (diff) [9588 B] Fetched 431 kB in 0s (38.5 MB/s) Download complete and in download only mode I: NOTICE: Log filtering will replace 'build/cifs-utils-gH22g8/cifs-utils-7.0' with '<>' I: NOTICE: Log filtering will replace 'build/cifs-utils-gH22g8' with '<>' +--+ | Install package build dependencies | +--+ Setup apt archive - Merged Build-Depends: libkeyutils-dev, libcap-ng-dev, libkrb5-dev, libpam0g-dev, libtalloc-dev (>= 1.2.0~git20080616), libwbclient-dev (>= 2:3.6.5-3), python3-docutils, debhelper-compat (= 13), bash-completion, build-essential, fakeroot Filtered Build-Depends: libkeyutils-dev, libcap-ng-dev, libkrb5-dev, libpam0g-dev, libtalloc-dev (>= 1.2.0~git20080616), libwbclient-dev (>= 2:3.6.5-3), python3-docutils, debhelper-compat (= 13), bash-completion, build-essential, fakeroot dpkg-deb: building package 'sbuild-build-depends-main-dummy' in '/<>/apt_archive/sbuild-build-depends-main-dummy.deb'. Ign:1 copy:/<>/apt_archive ./ InRelease Get:2 copy:/<>/apt_archive ./ Release [957 B] Ign:3 copy:/<>/apt_archive ./ Release.gpg Get:4 copy:/<>/apt_archive ./ Sources [458 B] Get:5 copy:/<>/apt_archive ./ Packages [540 B] Fetched 1955 B in 0s (143 kB/s) Reading package lists... Reading package lists... Install main build dependencies (apt-based resolver) Installing build dependencies Reading package lists... Building dependency tree... Reading state information... The following additional packages will be installed: bash-completion comerr-dev docutils-common krb5-multidev libbsd0 libcap-ng-dev
Bug#993014: cifs-utils non-parallel FTBFS
Control: tag -1 + pending 22.08.2022 17:11, L. van Belle wrote: I can confirm the patch works. I've tested on a Debian Bullseye build with cifs-utils 7.0 from https://ftp.samba.org/pub/linux-cifs/cifs-utils/ I refreshed patch 001. Added the patch shown buy Helmut. And I builded against Debian Bullseye with parallel=7 and parallel=1 Here's the upstream commit which fixes the problem: commit aeaa786aceb0ea781ded2c151fb68f6b34880ad4 Author: lizhe Date: Tue May 26 11:54:11 2020 +0800 cifs-utils: fix probabilistic compiling error When we compile cifs-utils, we may probabilistic encounter install error like: cd ***/sbin && ln -sf mount.cifs mount.smb3 ***/sbin: No such file or directory The reason of this problem is that if we compile cifs-utils using multithreading, target 'install-sbinPROGRAMS' may be built after target 'install-exec-hook' of the main Makefile. Target 'install-sbinPROGRAMS' will copy the executable file 'mount.cifs' to the $(ROOTSBINDIR), which target 'install-exec-hook' will do the 'ln' command on. This patch add the dependency of target 'install-exec-hook' to ensure the correct order of the compiling. Signed-off-by: lizhe diff --git a/Makefile.am b/Makefile.am index a95782d..8a17e73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,7 +117,7 @@ endif SUBDIRS = contrib -install-exec-hook: +install-exec-hook: install-sbinPROGRAMS (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) install-data-hook: I think both are wrong but both do the job. Now, the question is: do we need to fix this for bullseye? It smells like there's no need to, no? Thanks, /mjt
Bug#993014: cifs-utils non-parallel FTBFS
I can confirm the patch works. I've tested on a Debian Bullseye build with cifs-utils 7.0 from https://ftp.samba.org/pub/linux-cifs/cifs-utils/ I refreshed patch 001. Added the patch shown buy Helmut. And I builded against Debian Bullseye with parallel=7 and parallel=1 Only I can't upload the sources to salsa.. Sorry. @Michael Tokarev can you add this one? I can put the build and logs online if you want. Greetz, Louis
Bug#993014: cifs-utils non-parallel FTBFS
tags 993014 + patch thanks El 26/8/21 a las 12:31, Helmut Grohne escribió: | make install-exec-hook | make[5]: Entering directory '/<>' | (cd /<>/debian/cifs-utils/sbin && ln -sf mount.cifs mount.smb3) | /bin/bash: line 1: cd: /<>/debian/cifs-utils/sbin: No such file or directory Hi. I can reproduce this as well. For the version in bullseye, I believe the attached patch should be enough to fix the problem. For testing/unstable, I'm confused because the QA page for this package: https://packages.qa.debian.org/c/cifs-utils.html says: Updating cifs-utils fixes old bugs: #993014 but I don't see this is fixed in unstable. Is the QA tracker working properly? Thanks.--- a/Makefile.am +++ b/Makefile.am @@ -119,6 +119,7 @@ SUBDIRS = contrib install-exec-hook: + mkdir -p $(DESTDIR)$(ROOTSBINDIR) (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3) install-data-hook:
Bug#993014: cifs-utils non-parallel FTBFS
Source: cifs-utils Version: 2:6.11-3.1 Severity: serious Tags: ftbfs cifs-utils fails to build from source when including parallel=1 in DEB_BUILD_OPTIONS. A failing build ends with: | dh_auto_install | make -j1 install DESTDIR=/<>/debian/cifs-utils AM_UPDATE_INFO_DIR=no | make[2]: Entering directory '/<>' | Making install in contrib | make[3]: Entering directory '/<>/contrib' | Making install in request-key.d | make[4]: Entering directory '/<>/contrib/request-key.d' | make[5]: Entering directory '/<>/contrib/request-key.d' | make[5]: Nothing to be done for 'install-exec-am'. | make[5]: Nothing to be done for 'install-data-am'. | make[5]: Leaving directory '/<>/contrib/request-key.d' | make[4]: Leaving directory '/<>/contrib/request-key.d' | make[4]: Entering directory '/<>/contrib' | make[5]: Entering directory '/<>/contrib' | make[5]: Nothing to be done for 'install-exec-am'. | make[5]: Nothing to be done for 'install-data-am'. | make[5]: Leaving directory '/<>/contrib' | make[4]: Leaving directory '/<>/contrib' | make[3]: Leaving directory '/<>/contrib' | make[3]: Entering directory '/<>' | make[4]: Entering directory '/<>' | /bin/mkdir -p '/<>/debian/cifs-utils/usr/bin' | /usr/bin/install -c cifscreds getcifsacl setcifsacl smbinfo '/<>/debian/cifs-utils/usr/bin' | /bin/mkdir -p '/<>/debian/cifs-utils/usr/bin' | /usr/bin/install -c smb2-quota '/<>/debian/cifs-utils/usr/bin' | /bin/mkdir -p '/<>/debian/cifs-utils/usr/sbin' | /usr/bin/install -c cifs.upcall cifs.idmap '/<>/debian/cifs-utils/usr/sbin' | make install-exec-hook | make[5]: Entering directory '/<>' | (cd /<>/debian/cifs-utils/sbin && ln -sf mount.cifs mount.smb3) | /bin/bash: line 1: cd: /<>/debian/cifs-utils/sbin: No such file or directory | make[5]: *** [Makefile:1506: install-exec-hook] Error 1 | make[5]: Leaving directory '/<>' | make[4]: *** [Makefile:1385: install-exec-am] Error 2 | make[4]: Leaving directory '/<>' | make[3]: *** [Makefile:1307: install-am] Error 2 | make[3]: Leaving directory '/<>' | make[2]: *** [Makefile:998: install-recursive] Error 1 | make[2]: Leaving directory '/<>' | dh_auto_install: error: make -j1 install DESTDIR=/<>/debian/cifs-utils AM_UPDATE_INFO_DIR=no returned exit code 2 | make[1]: *** [debian/rules:13: override_dh_auto_install-arch] Error 25 | make[1]: Leaving directory '/<>' | make: *** [debian/rules:6: binary] Error 2 | dpkg-buildpackage: error: fakeroot debian/rules binary subprocess returned exit status 2 I suppose that some ordering relation in the makefile is missing and a parallel build creates the relevant directory quickly enough. In a parallel=1 build, the race is lost reliably. Helmut
