Niels,

Thanks for fixing #951819.  I think you've actually also fixed (or at least
implemented a workaround for) #951820 but used the wrong bug ID in the
CHANGELOG so it's not been automatically closed etc.  I don't know if you
can change the CHANGELOG after the fact, but it would be good to at least
get the issue marked as fixed?

https://salsa.debian.org/debian/debhelper/-/commit/19ca1aea15ec5502cab4d9243a327f6f4ee2cc1d
is
the workaround I'm talking about.

Andy

On Tue, Mar 24, 2020 at 6:21 PM Debian Bug Tracking System <
ow...@bugs.debian.org> wrote:

> This is an automatic notification regarding your Bug report
> which was filed against the debhelper package:
>
> #951819: debhelper: dh_installsystemduser can't install parameterized
> services
>
> It has been closed by Debian FTP Masters <ftpmas...@ftp-master.debian.org>
> (reply to Niels Thykier <ni...@thykier.net>).
>
> Their explanation is attached below along with your original report.
> If this explanation is unsatisfactory and you have not received a
> better one in a separate message then please contact Debian FTP Masters <
> ftpmas...@ftp-master.debian.org> (reply to Niels Thykier <
> ni...@thykier.net>) by
> replying to this email.
>
>
> --
> 951819: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951819
> Debian Bug Tracking System
> Contact ow...@bugs.debian.org with problems
>
>
>
> ---------- Forwarded message ----------
> From: Debian FTP Masters <ftpmas...@ftp-master.debian.org>
> To: 951819-cl...@bugs.debian.org
> Cc:
> Bcc:
> Date: Tue, 24 Mar 2020 18:19:09 +0000
> Subject: Bug#951819: fixed in debhelper 12.10
> Source: debhelper
> Source-Version: 12.10
> Done: Niels Thykier <ni...@thykier.net>
>
> We believe that the bug you reported is fixed in the latest version of
> debhelper, which is due to be installed in the Debian FTP archive.
>
> A summary of the changes between this version and the previous one is
> attached.
>
> Thank you for reporting the bug, which will now be closed.  If you
> have further comments please address them to 951...@bugs.debian.org,
> and the maintainer will reopen the bug report if appropriate.
>
> Debian distribution maintenance software
> pp.
> Niels Thykier <ni...@thykier.net> (supplier of updated debhelper package)
>
> (This message was generated automatically at their request; if you
> believe that there is a problem with it please contact the archive
> administrators by mailing ftpmas...@ftp-master.debian.org)
>
>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA512
>
> Format: 1.8
> Date: Tue, 24 Mar 2020 15:55:09 +0000
> Source: debhelper
> Architecture: source
> Version: 12.10
> Distribution: unstable
> Urgency: medium
> Maintainer: Debhelper Maintainers <debhel...@packages.debian.org>
> Changed-By: Niels Thykier <ni...@thykier.net>
> Closes: 939656 950723 951819 951917
> Changes:
>  debhelper (12.10) unstable; urgency=medium
>  .
>    [ Niels Thykier ]
>    * dh_installsystemd.1: Improve documentation about tmpfiles that
>      are now handled by dh_installtmpfiles in compat 13.
>    * dh_installtmpfiles: Prefer debian/package.tmpfiles over
>      debian/package.tmpfile, but accept the old path with a warning.
>      Thanks to Michael Biebl for suggesting the change.
>    * dh_strip: Automatically strip Link-Time Optimization (LTO)
>      symbols from static archives.  The format is not stable between
>      compiler versions.  Thanks to Matthias Klose for the
>      suggestion and for providing the exact options.
>      (Closes: #939656)
>    * dh: Tweak the command-skipping optimization to skip commands
>      in a few more cases when the command is known not to react to
>      command line options.
>    * dh,dh_installsytemd*: Work around broken NOOP promise caused by
>      dh_installsystemd* using nonstandard "package@" prefix for
>      pkgfiles.  Thanks to Badreddin Aboubakr and Andy Caldwell for
>      reporting it.  (Closes: #950723, #951819)
>  .
>    [ Nicholas Guriev ]
>    * cmake: Verbose autogen rules.
>    * cmake: Skip install all dependency with compatibility level 13 and
>      above.
>  .
>    [ Andy Caldwell ]
>    * dh_installsystemduser: Fix bug that prevented dh_installsystemduser
>      from installing parameterized services.  (Closes: #951819)
>  .
>    [ Translations ]
>    * Update German translation (Chris Leick)  (Closes: #951917)
> Checksums-Sha1:
>  adef1db05ca8f20d5b93d1fec71524a7d5b0c885 1839 debhelper_12.10.dsc
>  8171da063f17d95a74b23c87bb2bd1a98c4652b3 525416 debhelper_12.10.tar.xz
>  75e0d34be7ca464dfdd9ba52182aa122a9763679 4606
> debhelper_12.10_source.buildinfo
> Checksums-Sha256:
>  934871f9a113f24616d10dcfb3d3a39d916cb7a80e478b93656164f5d27995ab 1839
> debhelper_12.10.dsc
>  74ef66f33d0a1ac8d854f9476b3ae8d08a65fadb6c7fa7e6155e62c52439676a 525416
> debhelper_12.10.tar.xz
>  451b679c0d242580e656aceb7834dcffa8d5ad7101f43b67bc8308e332db8e25 4606
> debhelper_12.10_source.buildinfo
> Files:
>  3acd0bd939678b2c65986c4adc9eba70 1839 devel optional debhelper_12.10.dsc
>  2e8b9ef9ed4a36b9b38cb3f453e900b7 525416 devel optional
> debhelper_12.10.tar.xz
>  3e1de02e9214f38444b2cde00cceb2d3 4606 devel optional
> debhelper_12.10_source.buildinfo
>
> -----BEGIN PGP SIGNATURE-----
>
> iQJGBAEBCgAwFiEE8f9dDX4ALfD+VfsMplt42+Z8eqwFAl56SwASHG5pZWxzQHRo
> eWtpZXIubmV0AAoJEKZbeNvmfHqsrIwQAI2R1kd/ALP1tZCD/IoGACtDbjrakFtV
> CPlNuUIA8jL4yan4P7u991LdkONvMKtnddH+U0siZtxydE3sGBvedkf97fL1kRUA
> rruXcBCr45mSeeNwOd8sYJ8eDwqOK7q1vFKTHIV4pZ1jz00GRY5+xzQo3LFcmNUh
> VdFVaO68PvRPCyBQ0e+6kOTLpLgMUsRkB5MBL7yDlb2Fprz77fN7THRycVicgWoN
> iJwgimoVoChuQfoDQXHWRH9il3bxEwwg4VMOGMEh3IAUsTyGflT9x7YAn8G/hjVP
> KbZE7tmXByKdI+EGPYxuFnQsfXHN6lV3MRTnnRa6qEK2MEIYkubFE48+B/72LiGe
> DCsWewXwfzK2/hvBAg5ealgES5jRW8p1ucmiK8PP2J20VfoSN3dGNFRwQ1nVz4RP
> jtWvSaCp0Ar4er8GpDmUpwp1ALZuus5f9sm/ISG5I5skqnjt8mV1wVZ594t+ScpR
> UjWavoVIGEnMxfP17G2jIQA/ZqS2y1FX5ORHwxzkFvIyecRy8w7He3YJ8KiQrLzd
> Yjx8yTa57ZnxFJKudJkCzc0ERqMo1yebYwa9b/cze8Lf6NsUmrc6dO1KilcRm5NH
> NkACih+LuOxJoOTGajpXhw3V5easW6clNXutY90zxGzjd+5SXdh2+WnAP+GSTHVK
> H0sqFzgPOso3
> =AWYK
> -----END PGP SIGNATURE-----
>
>
> ---------- Forwarded message ----------
> From: Andy Caldwell <andy.m.caldw...@googlemail.com>
> To: Debian Bug Tracking System <sub...@bugs.debian.org>
> Cc:
> Bcc:
> Date: Sat, 22 Feb 2020 03:32:48 +0000
> Subject: debhelper: dh_installsystemduser can't install parameterized
> services
> Package: debhelper
> Version: 12.1.1ubuntu1~ubuntu18.04.1
> Severity: important
> Tags: upstream
>
> Dear Maintainer,
>
> Attempting to use `dh_installsystemduser` to create a package with a
> parameterized service/timer/etc. (e.g. package@.user.service) installs
> the service definition file into a temporary directory for a package
> called "package@", rather than "package".  This leads to the service not
> being included in the final debian package.
>
> Although I discovered this on the Ubuntu repackaging of the debhelper
> package, the issue is still present in the trunk codebase:
>
>
> https://salsa.debian.org/debian/debhelper/blob/master/dh_installsystemduser#L115-125
>
> The fix is to copy what `dh_installsystemd` does, and to pass the
> temporary directory through to `install_user_unit` so that all the
> package files end up in the right place.
>
> ```perl
> sub install_user_unit {
>   my ($package, $name, $suffix, $path) = @_;
>
>   my $unit = pkgfile($package, "user.$suffix");
>   return if $unit eq '';
>
>   install_dir($path);
>   install_file($unit, "$path/$name.$suffix");
> }
> ```
>
> And (at the call site):
>
> ```perl
>   for my $type (qw(service target socket path timer)) {
>     install_user_unit($package, $name, $type,
> "$tmpdir/usr/lib/systemd/user");
>     install_user_unit("${package}@", "${name}@", $type,
> "$tmpdir/usr/lib/systemd/user");
>   }
> ```
>
> Thanks,
>
> Andy
>
> -- System Information:
> Debian Release: buster/sid
>   APT prefers bionic-updates
>   APT policy: (500, 'bionic-updates'), (500, 'bionic-security'), (500,
> 'bionic'), (100, 'bionic-backports')
> Architecture: amd64 (x86_64)
> Foreign Architectures: i386
>
> Kernel: Linux 5.5.5-050505-generic (SMP w/4 CPU cores)
> Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8),
> LANGUAGE=en_GB:en (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
> LSM: AppArmor: enabled
>
> Versions of packages debhelper depends on:
> ii  autotools-dev            20180224.1
> ii  dh-autoreconf            17
> ii  dh-strip-nondeterminism  0.040-1.1~build1
> ii  dpkg                     1.19.0.5ubuntu2.3
> ii  dpkg-dev                 1.19.0.5ubuntu2.3
> ii  dwz                      0.12-2
> ii  file                     1:5.32-2ubuntu0.3
> ii  libdpkg-perl             1.19.0.5ubuntu2.3
> ii  man-db                   2.8.3-2ubuntu0.1
> ii  perl                     5.26.1-6ubuntu0.3
> ii  po-debconf               1.0.20
>
> debhelper recommends no packages.
>
> Versions of packages debhelper suggests:
> ii  dh-make  2.201701
>
> -- no debconf information
>

Reply via email to