Control: retitle -1 unblock: dnssec-trigger/0.13-5 Actually there's tow more variables that needs to go in Makefile.in and couple more fixups in un-hardcoding paths (@rundir@, @sbindir@).
Cheers, -- Ondřej Surý <[email protected]> Knot DNS (https://www.knot-dns.cz/) – a high-performance DNS server Knot Resolver (https://www.knot-resolver.cz/) – secure, privacy-aware, fast DNS(SEC) resolver On Wed, Feb 1, 2017, at 13:03, Ondřej Surý wrote: > Package: release.debian.org > Severity: normal > User: [email protected] > 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) > Email had 1 attachment: > + dnssec-trigger_0.13-3..0.13-4.diff > 7k (text/plain)
diff --git a/debian/changelog b/debian/changelog index 99cdf8f..7561d61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +dnssec-trigger (0.13-5) unstable; urgency=medium + + * Actually the Makefile.in was also missing @rundir@ and @sysconfdir@ + (Closes: #852297) + + -- OndÅej Surý <[email protected]> Wed, 01 Feb 2017 15:11:29 +0100 + +dnssec-trigger (0.13-4) unstable; urgency=high + + * Fix the missing systemdsystemunitdir variable assignment in + Makefile.in (Closes: #852297) + + -- OndÅej Surý <[email protected]> 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..263a308 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 ++++++++-------- - dnssec-triggerd-keygen.service | 8 -------- - dnssec-triggerd-keygen.service.in | 8 ++++++++ - 6 files changed, 52 insertions(+), 36 deletions(-) + Makefile.in | 44 ++++++++++++++++++++++++--------------- + configure.ac | 14 +++++++++++-- + dnssec-trigger-script.in | 16 +++++++------- + dnssec-triggerd-keygen.service | 8 ------- + dnssec-triggerd-keygen.service.in | 8 +++++++ + 6 files changed, 56 insertions(+), 36 deletions(-) delete mode 100644 dnssec-triggerd-keygen.service create mode 100644 dnssec-triggerd-keygen.service.in @@ -27,10 +27,20 @@ index 998bdc4..f751dd8 100644 # implementation diff --git a/Makefile.in b/Makefile.in -index 6f2579c..bd3097c 100644 +index 6f2579c..3a8050b 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -61,9 +61,11 @@ do_subst = sed -e 's,[@]SHELL[@],$(SHELL),g' \ +@@ -55,15 +55,21 @@ pidfile=@pidfile@ + login_command=@login_command@ + login_location=@login_location@ + unbound_control_path=@unbound_control_path@ ++rundir=@rundir@ ++sysconfdir=@sysconfdir@ ++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 +52,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 +185,7 @@ $(BUILD)%.o: $(srcdir)/%.c @-if test ! -d $(dir $@); then $(INSTALL) -d $(patsubst %/,%,$(dir $@)); fi $Q$(COMPILE) -o $@ -c $< @@ -51,7 +61,7 @@ index 6f2579c..bd3097c 100644 test: @echo done -@@ -206,6 +208,10 @@ dnssec-triggerd.service: $(srcdir)/dnssec-triggerd.service.in Makefile +@@ -206,6 +212,10 @@ dnssec-triggerd.service: $(srcdir)/dnssec-triggerd.service.in Makefile rm -f $@ $(do_subst) < $(srcdir)/dnssec-triggerd.service.in > $@ @@ -62,7 +72,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 +349,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 +81,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 +389,11 @@ windows-hook-uninstall: networkmanager-hook-install: $(INSTALL) -m 755 -d $(DESTDIR)$(networkmanager_dispatcher_dir) @@ -85,7 +95,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 +402,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 +104,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 +472,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 +125,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 +490,11 @@ gtk-gui-uninstall: rm -f $(DESTDIR)$(uidir)/status-icon.png rm -f $(DESTDIR)$(uidir)/status-icon-alert.png ifeq "$(APP_INDICATOR)" "yes" @@ -165,7 +175,7 @@ index 51ffcb7..85b0b3b 100644 pidfile="$withval" fi diff --git a/dnssec-trigger-script.in b/dnssec-trigger-script.in -index 5f70580..07e568a 100644 +index 5f70580..154f124 100644 --- a/dnssec-trigger-script.in +++ b/dnssec-trigger-script.in @@ -64,7 +64,7 @@ def pidof(process_name): @@ -214,11 +224,11 @@ index 5f70580..07e568a 100644 # provide upgrade path for previous versions - old_zones = glob.glob("/var/run/dnssec-trigger/????????-????-????-????-????????????") -+ old_zones = glob.glob("/run/dnssec-trigger/????????-????-????-????-????????????") ++ old_zones = glob.glob("@rundir@/dnssec-trigger/????????-????-????-????-????????????") if old_zones: log.info("Reading zones from the legacy zone store") - with open("/var/run/dnssec-trigger/zones", "a") as target: -+ with open("/run/dnssec-trigger/zones", "a") as target: ++ with open("@rundir@/dnssec-trigger/zones", "a") as target: for filename in old_zones: with open(filename) as source: log.debug("Reading zones from {}".format(filename)) @@ -238,7 +248,7 @@ index e3b8b10..0000000 -RemainAfterExit=yes diff --git a/dnssec-triggerd-keygen.service.in b/dnssec-triggerd-keygen.service.in new file mode 100644 -index 0000000..c1b6e45 +index 0000000..a05163d --- /dev/null +++ b/dnssec-triggerd-keygen.service.in @@ -0,0 +1,8 @@ @@ -248,5 +258,5 @@ index 0000000..c1b6e45 + +[Service] +Type=oneshot -+ExecStart=/usr/sbin/dnssec-trigger-control-setup -d @sysconfdir@ ++ExecStart=@sbindir@/dnssec-trigger-control-setup -d @sysconfdir@ +RemainAfterExit=yes
