Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package dnssec-trigger
The 0.13-4 fixes the RC bug - dnssec-trigger was installing the
systemd unit files into root due botched patch on my side:
The upstream doesn't use automake, so Makefile.in was missing:
systemdsystemunitdir=@systemdsystemunitdir@
line - this has now been fixed.
The diff between 0.13-3..0.13-4 is attached.
unblock dnssec-trigger/0.13-4
-- System Information:
Debian Release: 9.0
APT prefers testing
APT policy: (900, 'testing'), (800, 'unstable'), (500, 'unstable-debug'),
(500, 'testing-debug'), (1, 'experimental-debug'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_DK.utf8, LC_CTYPE=en_DK.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff --git a/debian/changelog b/debian/changelog
index 99cdf8f..cca3049 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dnssec-trigger (0.13-4) unstable; urgency=high
+
+ * Fix the missing systemdsystemunitdir variable assignment in
+ Makefile.in (Closes: #852297)
+
+ -- Ondřej Surý <ond...@debian.org> Tue, 31 Jan 2017 11:53:14 +0100
+
dnssec-trigger (0.13-3) unstable; urgency=medium
* Update patches to be in sync with PR on upstream
diff --git a/debian/patches/0006-Unhardcode-most-of-the-paths.patch
b/debian/patches/0006-Unhardcode-most-of-the-paths.patch
index e68bafb..36b7eb2 100644
--- a/debian/patches/0006-Unhardcode-most-of-the-paths.patch
+++ b/debian/patches/0006-Unhardcode-most-of-the-paths.patch
@@ -4,12 +4,12 @@ Subject: Unhardcode most of the paths
---
01-dnssec-trigger.in | 2 +-
- Makefile.in | 40 ++++++++++++++++++++++-----------------
- configure.ac | 14 ++++++++++++--
- dnssec-trigger-script.in | 16 ++++++++--------
+ Makefile.in | 41 +++++++++++++++++++++++----------------
+ configure.ac | 14 +++++++++++--
+ dnssec-trigger-script.in | 16 +++++++--------
dnssec-triggerd-keygen.service | 8 --------
dnssec-triggerd-keygen.service.in | 8 ++++++++
- 6 files changed, 52 insertions(+), 36 deletions(-)
+ 6 files changed, 53 insertions(+), 36 deletions(-)
delete mode 100644 dnssec-triggerd-keygen.service
create mode 100644 dnssec-triggerd-keygen.service.in
@@ -27,10 +27,17 @@ index 998bdc4..f751dd8 100644
# implementation
diff --git a/Makefile.in b/Makefile.in
-index 6f2579c..bd3097c 100644
+index 6f2579c..eba6620 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -61,9 +61,11 @@ do_subst = sed -e 's,[@]SHELL[@],$(SHELL),g' \
+@@ -55,15 +55,18 @@ pidfile=@pidfile@
+ login_command=@login_command@
+ login_location=@login_location@
+ unbound_control_path=@unbound_control_path@
++systemdsystemunitdir=@systemdsystemunitdir@
+ DATE=$(shell date +%F -r $(srcdir)/Changelog)
+
+ do_subst = sed -e 's,[@]SHELL[@],$(SHELL),g' \
-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
-e 's,[@]VERSION[@],$(VERSION),g' \
-e 's,[@]PYTHON[@],$(PYTHON),g' \
@@ -42,7 +49,7 @@ index 6f2579c..bd3097c 100644
-e 's,[@]pidfile[@],$(pidfile),g' \
-e 's,[@]unbound_control_path[@],$(unbound_control_path),g' \
-e 's,[@]login_command[@],$(login_command),g' \
-@@ -179,7 +181,7 @@ $(BUILD)%.o: $(srcdir)/%.c
+@@ -179,7 +182,7 @@ $(BUILD)%.o: $(srcdir)/%.c
@-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir
$@)); fi
$Q$(COMPILE) -o $@ -c $<
@@ -51,7 +58,7 @@ index 6f2579c..bd3097c 100644
test:
@echo done
-@@ -206,6 +208,10 @@ dnssec-triggerd.service:
$(srcdir)/dnssec-triggerd.service.in Makefile
+@@ -206,6 +209,10 @@ dnssec-triggerd.service:
$(srcdir)/dnssec-triggerd.service.in Makefile
rm -f $@
$(do_subst) < $(srcdir)/dnssec-triggerd.service.in > $@
@@ -62,7 +69,7 @@ index 6f2579c..bd3097c 100644
dnssec-trigger-panel.desktop: $(srcdir)/panel/dnssec-trigger-panel.desktop.in
Makefile
rm -f $@
$(do_subst) < $(srcdir)/panel/dnssec-trigger-panel.desktop.in > $@
-@@ -339,7 +345,7 @@ clean:
+@@ -339,7 +346,7 @@ clean:
rm -f *.o *.d *.lo *~ tags
rm -f dnssec-trigger-panel$(EXEEXT) dnssec-triggerd$(EXEEXT)
rm -f dnssec-trigger-control-setup dnssec-trigger-control$(EXEEXT)
@@ -71,7 +78,7 @@ index 6f2579c..bd3097c 100644
rm -f dnssec-trigger-panel.desktop dnssec-trigger.8
dnssec-trigger-keygen$(EXEEXT)
rm -rf autom4te.cache build osx/RiggerStatusItem/build
-@@ -379,11 +385,11 @@ windows-hook-uninstall:
+@@ -379,11 +386,11 @@ windows-hook-uninstall:
networkmanager-hook-install:
$(INSTALL) -m 755 -d $(DESTDIR)$(networkmanager_dispatcher_dir)
@@ -85,7 +92,7 @@ index 6f2579c..bd3097c 100644
$(INSTALL) -c -m 644 dnssec-triggerd.service
$(DESTDIR)$(systemdsystemunitdir)/dnssec-triggerd.service
$(INSTALL) -c -m 644 dnssec-triggerd-keygen.service
$(DESTDIR)$(systemdsystemunitdir)/dnssec-triggerd-keygen.service
-@@ -392,7 +398,7 @@ networkmanager-hook-uninstall:
+@@ -392,7 +399,7 @@ networkmanager-hook-uninstall:
$(DESTDIR)$(sbindir)/dnssec-triggerd$(EXEEXT) -u
rm -f $(DESTDIR)$(networkmanager_dispatcher_dir)/01-dnssec-trigger
rm -f $(DESTDIR)$(libexecdir)/dnssec-trigger-script
@@ -94,7 +101,7 @@ index 6f2579c..bd3097c 100644
rm -f $(DESTDIR)$(systemdsystemunitdir)/dnssec-triggerd.service
rm -f $(DESTDIR)$(systemdsystemunitdir)/dnssec-triggerd-keygen.service
-@@ -462,13 +468,13 @@ gtk-gui-install:
+@@ -462,13 +469,13 @@ gtk-gui-install:
$(INSTALL) -c -m 644 $(srcdir)/panel/status-icon-alert.png
$(DESTDIR)$(uidir)/status-icon-alert.png
$(INSTALL) -c -m 755 dnssec-trigger-panel$(EXEEXT)
$(DESTDIR)$(bindir)/dnssec-trigger-panel$(EXEEXT)
ifeq "$(APP_INDICATOR)" "yes"
@@ -115,7 +122,7 @@ index 6f2579c..bd3097c 100644
endif
if test -n "$(xdg_autostart_dir)"; then \
$(INSTALL) -m 755 -d $(DESTDIR)$(xdg_autostart_dir) ; \
-@@ -480,11 +486,11 @@ gtk-gui-uninstall:
+@@ -480,11 +487,11 @@ gtk-gui-uninstall:
rm -f $(DESTDIR)$(uidir)/status-icon.png
rm -f $(DESTDIR)$(uidir)/status-icon-alert.png
ifeq "$(APP_INDICATOR)" "yes"
