Your message dated Mon, 11 Dec 2023 05:19:03 +0000
with message-id <e1rcyh5-00en8i...@fasolo.debian.org>
and subject line Bug#1052664: fixed in ntpsec 1.2.2+dfsg1-3
has caused the Debian Bug report #1052664,
regarding ntpsec FTBFS when systemd.pc changes systemdsystemunitdir
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
1052664: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1052664
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: ntpsec
Version: 1.2.2+dfsg1-2
Severity: normal
Tags: ftbfs patch
User: helm...@debian.org
Usertags: dep17m2

We want to change the value of systemdsystemunitdir in systemd.pc to
point below /usr. ntpsec's upstream build system consumes this variable,
but the packaging hard codes the current value. Consequently, ntpsec
FTBFS when it changes. Consider applying the attached patch to avoid
this failure.

Helmut
diff -Nru ntpsec-1.2.2+dfsg1/debian/changelog 
ntpsec-1.2.2+dfsg1/debian/changelog
--- ntpsec-1.2.2+dfsg1/debian/changelog 2023-07-30 21:04:02.000000000 +0200
+++ ntpsec-1.2.2+dfsg1/debian/changelog 2023-09-25 22:51:13.000000000 +0200
@@ -1,3 +1,10 @@
+ntpsec (1.2.2+dfsg1-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Mon, 25 Sep 2023 22:51:13 +0200
+
 ntpsec (1.2.2+dfsg1-2) unstable; urgency=high
 
   * copyright: Update libjsmn comment
diff -Nru ntpsec-1.2.2+dfsg1/debian/ntpsec-ntpviz.install 
ntpsec-1.2.2+dfsg1/debian/ntpsec-ntpviz.install
--- ntpsec-1.2.2+dfsg1/debian/ntpsec-ntpviz.install     2023-01-17 
00:31:00.000000000 +0100
+++ ntpsec-1.2.2+dfsg1/debian/ntpsec-ntpviz.install     2023-09-25 
22:50:52.000000000 +0200
@@ -1,9 +1,9 @@
-debian/tmp/lib/systemd/system/ntplogtemp.service
-debian/tmp/lib/systemd/system/ntplogtemp.timer
-debian/tmp/lib/systemd/system/ntpviz-daily.service
-debian/tmp/lib/systemd/system/ntpviz-daily.timer
-debian/tmp/lib/systemd/system/ntpviz-weekly.service
-debian/tmp/lib/systemd/system/ntpviz-weekly.timer
+debian/tmp/${env:systemdsystemunitdir}/ntplogtemp.service
+debian/tmp/${env:systemdsystemunitdir}/ntplogtemp.timer
+debian/tmp/${env:systemdsystemunitdir}/ntpviz-daily.service
+debian/tmp/${env:systemdsystemunitdir}/ntpviz-daily.timer
+debian/tmp/${env:systemdsystemunitdir}/ntpviz-weekly.service
+debian/tmp/${env:systemdsystemunitdir}/ntpviz-weekly.timer
 debian/tmp/usr/bin/ntpviz
 debian/tmp/usr/sbin/ntploggps
 debian/tmp/usr/sbin/ntplogtemp
diff -Nru ntpsec-1.2.2+dfsg1/debian/ntpsec.install 
ntpsec-1.2.2+dfsg1/debian/ntpsec.install
--- ntpsec-1.2.2+dfsg1/debian/ntpsec.install    2023-01-17 00:31:00.000000000 
+0100
+++ ntpsec-1.2.2+dfsg1/debian/ntpsec.install    2023-09-25 22:51:03.000000000 
+0200
@@ -1,7 +1,7 @@
 debian/ntp-systemd-wrapper usr/libexec/ntpsec
 debian/rotate-stats usr/libexec/ntpsec
-debian/tmp/lib/systemd/system/ntpsec-wait.service
-debian/tmp/lib/systemd/system/ntpsec.service
+debian/tmp/${env:systemdsystemunitdir}/ntpsec-wait.service
+debian/tmp/${env:systemdsystemunitdir}/ntpsec.service
 debian/tmp/usr/bin/ntpleapfetch usr/sbin
 debian/tmp/usr/bin/ntpmon
 debian/tmp/usr/bin/ntpq
diff -Nru ntpsec-1.2.2+dfsg1/debian/rules ntpsec-1.2.2+dfsg1/debian/rules
--- ntpsec-1.2.2+dfsg1/debian/rules     2023-01-17 00:31:00.000000000 +0100
+++ ntpsec-1.2.2+dfsg1/debian/rules     2023-09-25 22:50:13.000000000 +0200
@@ -6,6 +6,7 @@
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow,+pie
 export DEB_CFLAGS_MAINT_APPEND = -fno-strict-aliasing
+export systemdsystemunitdir = $(shell pkg-config 
--variable=systemdsystemunitdir systemd)
 
 %:
        dh $@ --with apache2,python3
@@ -78,11 +79,11 @@
 override_dh_install:
        python3 waf install --destdir=$(CURDIR)/debian/tmp
        mv \
-               debian/tmp/lib/systemd/system/ntpd.service \
-               debian/tmp/lib/systemd/system/ntpsec.service
+               debian/tmp/$(systemdsystemunitdir)/ntpd.service \
+               debian/tmp/$(systemdsystemunitdir)/ntpsec.service
        mv \
-               debian/tmp/lib/systemd/system/ntp-wait.service \
-               debian/tmp/lib/systemd/system/ntpsec-wait.service
+               debian/tmp/$(systemdsystemunitdir)/ntp-wait.service \
+               debian/tmp/$(systemdsystemunitdir)/ntpsec-wait.service
        rm -rf debian/tmp/usr/lib/python3/dist-packages/ntp/__pycache__
        # ntpfrob probes internal, mostly undocumented settings.  It is
        # extremely unlikely that anyone needs this.
@@ -129,19 +130,19 @@
                debian/ntpsec.certbot \
                debian/ntpsec/etc/letsencrypt/renewal-hooks/deploy/ntpsec
 
-       install -d debian/ntpsec/lib/systemd/system
+       install -d debian/ntpsec/$(systemdsystemunitdir)
        install -m 644 \
                debian/ntpsec.ntpsec-rotate-stats.service \
-               debian/ntpsec/lib/systemd/system/ntpsec-rotate-stats.service
+               
debian/ntpsec/$(systemdsystemunitdir)/ntpsec-rotate-stats.service
        install -m 644 \
                debian/ntpsec.ntpsec-rotate-stats.timer \
-               debian/ntpsec/lib/systemd/system/ntpsec-rotate-stats.timer
+               debian/ntpsec/$(systemdsystemunitdir)/ntpsec-rotate-stats.timer
 
-       install -d debian/ntpsec-ntpviz/lib/systemd/system
+       install -d debian/ntpsec-ntpviz/$(systemdsystemunitdir)
        install -m 644 \
                etc/ntploggps.service \
                etc/ntploggps.timer \
-               debian/ntpsec-ntpviz/lib/systemd/system/
+               debian/ntpsec-ntpviz/$(systemdsystemunitdir)
 
        install -d debian/ntpsec-ntpviz/etc/ntpviz/day
        install -m 644 www/day/footer \
@@ -175,9 +176,9 @@
        install -D -m 0755 debian/ntpsec-ntpdate.networkmanager \
                
debian/ntpsec-ntpdate/etc/NetworkManager/dispatcher.d/ntpsec-ntpdate
        install -D -m 0644 debian/ntpsec-systemd-netif.path \
-               debian/ntpsec/lib/systemd/system/ntpsec-systemd-netif.path
+               debian/ntpsec/$(systemdsystemunitdir)/ntpsec-systemd-netif.path
        install -D -m 0644 debian/ntpsec-systemd-netif.service \
-               debian/ntpsec/lib/systemd/system/ntpsec-systemd-netif.service
+               
debian/ntpsec/$(systemdsystemunitdir)/ntpsec-systemd-netif.service
 
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
        install -D -m 0644 debian/ntp.conf.ubuntu 
debian/ntpsec/etc/ntpsec/ntp.conf

--- End Message ---
--- Begin Message ---
Source: ntpsec
Source-Version: 1.2.2+dfsg1-3
Done: Richard Laager <rlaa...@debian.org>

We believe that the bug you reported is fixed in the latest version of
ntpsec, 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 1052...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Richard Laager <rlaa...@debian.org> (supplier of updated ntpsec 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: Sun, 10 Dec 2023 22:02:20 -0600
Source: ntpsec
Architecture: source
Version: 1.2.2+dfsg1-3
Distribution: unstable
Urgency: high
Maintainer: Richard Laager <rlaa...@debian.org>
Changed-By: Richard Laager <rlaa...@debian.org>
Closes: 1052664 1057416
Changes:
 ntpsec (1.2.2+dfsg1-3) unstable; urgency=high
 .
   [ Helmut Grohne ]
   * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: 1052664)
 .
   [ Richard Laager ]
   * Fix corrupted ntpq output.
     Thanks to Hal Murray and Bill Sommerfeld (Closes: 1057416)
Checksums-Sha1:
 1d70c20da96c3b4163bc570cc992b054aecc8656 2593 ntpsec_1.2.2+dfsg1-3.dsc
 bc8d5a18dcebc470360a640df530849f7d58461e 2317956 ntpsec_1.2.2+dfsg1.orig.tar.xz
 be16b9b4385964d786ca8345777340f657eabe0b 59040 
ntpsec_1.2.2+dfsg1-3.debian.tar.xz
 ea0c34b8f44576304d5f7404198f39435272e6ce 8979 
ntpsec_1.2.2+dfsg1-3_source.buildinfo
Checksums-Sha256:
 02ca87587e45600c214c85df1dc1a074440edf07c9e306bf155230c4186d30c0 2593 
ntpsec_1.2.2+dfsg1-3.dsc
 53e527e3d04d551d41af2d359c2715c2de5f5bfa2a695d4ec1a811b3e9137f63 2317956 
ntpsec_1.2.2+dfsg1.orig.tar.xz
 bc4897a0e6d911696ffa2ab3660f7631fe92c68660aa984ffd8a2637f318deab 59040 
ntpsec_1.2.2+dfsg1-3.debian.tar.xz
 9c74ac3aa14b5131bc164e8a1918edb5d117d2391b160303e774f58c80701e7d 8979 
ntpsec_1.2.2+dfsg1-3_source.buildinfo
Files:
 a1d25fe27673c97e2bd72239c60d4222 2593 net optional ntpsec_1.2.2+dfsg1-3.dsc
 2787c8145e6ba35c52967d020b38ade0 2317956 net optional 
ntpsec_1.2.2+dfsg1.orig.tar.xz
 99443c223b08f2697c51e695d1c28661 59040 net optional 
ntpsec_1.2.2+dfsg1-3.debian.tar.xz
 e05ffb6996b1a66c0e0189999f4241d9 8979 net optional 
ntpsec_1.2.2+dfsg1-3_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEE1Ot9lOeOTujs4H+U+HlhmcBFhs4FAmV2lhAACgkQ+HlhmcBF
hs64TxAAje3e0O55G8j+3e8XPoJt2ONSc5GhFZmGAfdITKzHOQdQf9LGSTvQr0u8
ttk5PoAaefxNYNQHtnaS8jxnWSmSTJM9riYH2SQyxkcCsBVlbUBBcXcIRM/8/6lJ
qJ2B3qjCRl40BEgG034B9s2UyxCi2RLohzuPUocWUTfV2v4wMz4fRs5UeEuuYvfS
xmRPFwmasf9aupZZhz47MiZ89W14CTKZPj9OnpSjxN/QAqNNzps6YuCTijPXDZBu
AbiZaUibuhKnReglUbdesIvC9e2gN5piZHu5XlNPeaqZwqNMJA4kHLtGpIVkDT9M
hobCdpMIwVzjgFBavW1H+7Oy6QIGOOe6+pZHXxAfP+aq+wId+B2edy8CNBvqCEaw
CqqVB0jm9sSrm+uObfb55N3DoaYXare+/gXbiN6I8bF3EHzY3G1yVrT0U9pJDgTo
FCfGoi2VKFTRAysAXnHC+ZzeL5gDe+vov1j73IyP6zBsiAqG5ZV3i1F1eNc4d/zI
/OSEP9RwaHV0p5519418D0QSmOoKUiXPZCHcBFqGMyYV34fj0K8wfz7t1m+xs1tF
H5FsCZx+WAS7SGWI8xuVO2xyD+P3TcXkb0xhA2aw/XWxrgCabdvY4Wp9po4kJmc3
n7bHlL87TFXvqXSa7aZDgPCuK1XYcxEJeMbNdDumWKtIdGkfXXw=
=c1L3
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to