[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#838481: marked as done (RFS: daemontools/0.76-7 [RC])

Your message dated Sun, 27 Nov 2016 01:06:39 +0100
with message-id <fcfc72bb-ac4a-4600-9297-53223d612c09@debian.org>
and subject line NMU of daemontools
has caused the Debian Bug report #838481,
regarding RFS: daemontools/0.76-7 [RC]
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 owner@bugs.debian.org
immediately.)


-- 
838481: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=838481
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: sponsorship-requests
Severity: important

Dear mentors,

I am looking for a sponsor for my package "daemontools":

* Package name    : daemontools
  Version         : 0.76-7
  Section         : admin

It builds those binary packages:

  daemontools - a collection of tools for managing UNIX services
  daemontools-run - daemontools service supervision


Download the package with dget using this command:

dget -x http://smarden.org/kaGh6ut/daemontools_0.76-7.dsc

Changes since the last upload:

  * debian/rules: do not FTBFS with dpkg-buildpackage -A (thx Santiago
    Vila; closes: #831921).


The process to get my new gpg key into the debian keyring is stuck for 
some reason, although signatures are available, hence the RFS.


$ debdiff daemontools_0.76-6.dsc daemontools_0.76-7.dsc
diff -u daemontools-0.76/debian/changelog
daemontools-0.76/debian/changelog
--- daemontools-0.76/debian/changelog
+++ daemontools-0.76/debian/changelog
@@ -1,3 +1,10 @@
+daemontools (1:0.76-7) unstable; urgency=low
+
+  * debian/rules: do not FTBFS with dpkg-buildpackage -A (thx Santiago
+    Vila; closes: #831921).
+
+ -- Gerrit Pape <pape@smarden.org>  Wed, 21 Sep 2016 08:57:18 +0000
+
 daemontools (1:0.76-6) unstable; urgency=medium

   * workaround #767933 by copying from sysvinit-2.88dsf:
diff -u daemontools-0.76/debian/rules daemontools-0.76/debian/rules
--- daemontools-0.76/debian/rules
+++ daemontools-0.76/debian/rules
@@ -14,6 +14,8 @@
        done
        touch patch-stamp

+build-arch: build
+build-indep: build
 build: deb-checkdir build-stamp
 build-stamp: patch-stamp
        cd daemontools-0.76 && package/compile
@@ -101,7 +103,7 @@

 binary: binary-indep binary-arch

-.PHONY: patch build clean install install-arch install-indep binary \
+.PHONY: patch build build-arch build-indep clean install install-arch install-indep binary \
          binary-arch binary-indep

 include debian/implicit
$ 


Regards, Gerrit.

Attachment: signature.asc
Description: Digital signature


--- End Message ---
--- Begin Message --- 
Hi,
the previous NMU did not seem to get to unstable, so I've uploaded it again. Please find attached the updated patch for the NMU.
If you'd like to have a new version with yourself as maintainer sponsored into Debian, feel free to contact me. 

Regards,
Tobias

diff -u daemontools-0.76/debian/changelog daemontools-0.76/debian/changelog
--- daemontools-0.76/debian/changelog
+++ daemontools-0.76/debian/changelog
@@ -1,3 +1,23 @@
+daemontools (1:0.76-6.1) unstable; urgency=medium
+
+  [ Jan Mojzis ]
+  * Non-maintainer upload.
+  * supervise.c: restart the monitored process when
+    fork(2) fails (Closes: #819036)
+  * d/rules: fix mtimes before building binary package to produce
+    reproducible output (Closes: #793003) (Closes: #776876)
+  * d/rules: do not FTBFS with dpkg-buildpackage -A (thx Santiago
+    Vila) (Closes: #831921)
+  * d/implicit: fixed md5sums permissions 0664 -> 0644
+  * d/control: bump to standards-version 3.9.8
+  * d/control: fixed the description
+
+  [ Dr. Tobias Quathamer ]
+  * New upload with all changes from Jan, his previous NMU
+    to DELAYED/5 did not end up in unstable.
+
+ -- Dr. Tobias Quathamer <toddy@debian.org>  Sun, 27 Nov 2016 00:26:56 +0100
+
 daemontools (1:0.76-6) unstable; urgency=medium
 
   * workaround #767933 by copying from sysvinit-2.88dsf:
@@ -242 +261,0 @@
-
diff -u daemontools-0.76/debian/control daemontools-0.76/debian/control
--- daemontools-0.76/debian/control
+++ daemontools-0.76/debian/control
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Gerrit Pape <pape@smarden.org>
-Standards-Version: 3.9.5.0
+Standards-Version: 3.9.8
 
 Package: daemontools
 Architecture: any
@@ -10,7 +10,7 @@
 Suggests: daemontools-run | runit
 Depends: ${shlibs:Depends}
 Replaces: daemontools-doc
-Description: a collection of tools for managing UNIX services
+Description: collection of tools for managing UNIX services
  supervise monitors a service. It starts the service and restarts the
  service if it dies. Setting up a new service is easy: all supervise
  needs is a directory with a run script that runs the service. 
diff -u daemontools-0.76/debian/implicit daemontools-0.76/debian/implicit
--- daemontools-0.76/debian/implicit
+++ daemontools-0.76/debian/implicit
@@ -35,7 +35,7 @@
 	    debian/$*/usr/share/doc/$*/changelog'
 	@test -s debian/$*/usr/share/doc/$*/changelog || \
 	  sh -cx 'rm -f debian/$*/usr/share/doc/$*/changelog'
-	@gzip -9 debian/$*/usr/share/doc/$*/changelog*
+	@gzip -9n debian/$*/usr/share/doc/$*/changelog*
 %.deb-docs-docs: %.deb-docs-base
 	@for i in `cat debian/$*.docs 2>/dev/null || :`; do \
 	  if test -d $$i; then \
@@ -54,7 +54,7 @@
 	@if test -r debian/$*.NEWS.Debian; then \
 	  sh -cx 'install -m0644 debian/$*.NEWS.Debian \
 	    debian/$*/usr/share/doc/$*/NEWS.Debian && \
-	      gzip -9 debian/$*/usr/share/doc/$*/NEWS.Debian'; \
+	      gzip -9n debian/$*/usr/share/doc/$*/NEWS.Debian'; \
 	fi
 %.deb-docs-examples: %.deb-docs-docs
 	@rm -rf debian/$*/usr/share/doc/$*/examples
@@ -88,6 +88,7 @@
 	@rm -f debian/$*/DEBIAN/md5sums
 	@cd debian/$* && find * -path 'DEBIAN' -prune -o \
 	  -type f -exec md5sum {} >>DEBIAN/md5sums \;
+	@chmod 644 debian/$*/DEBIAN/md5sums
 %.deb-DEBIAN: %.deb-checkdir %.deb-DEBIAN-base %.deb-DEBIAN-scripts \
 	  %.deb-DEBIAN-md5sums
 	: debian/$*/DEBIAN/ ok
diff -u daemontools-0.76/debian/rules daemontools-0.76/debian/rules
--- daemontools-0.76/debian/rules
+++ daemontools-0.76/debian/rules
@@ -7,6 +7,8 @@
 
 DIR =$(shell pwd)/debian/daemontools
 
+BUILD_DATE := $(shell dpkg-parsechangelog --show-field Date)
+
 patch: deb-checkdir patch-stamp
 patch-stamp:
 	for i in `ls -1 debian/diff/*.diff || :`; do \
@@ -14,6 +16,8 @@
 	done
 	touch patch-stamp
 
+build-arch: build
+build-indep: build
 build: deb-checkdir build-stamp
 build-stamp: patch-stamp
 	cd daemontools-0.76 && package/compile
@@ -47,7 +51,7 @@
 	install -d -m0755 '$(DIR)'/usr/share/man/man8
 	for i in debian/daemontools-man/*.8; do \
 	  install -m0644 $$i '$(DIR)'/usr/share/man/man8/ && \
-	  gzip -9 '$(DIR)'/usr/share/man/man8/$${i##*/} || exit 1; \
+	  gzip -9n '$(DIR)'/usr/share/man/man8/$${i##*/} || exit 1; \
 	done
 	#  changelog
 	test -r changelog || ln -s daemontools-0.76/src/CHANGES changelog
@@ -62,7 +66,7 @@
 	  '$(DIR)'-run/usr/sbin/update-service
 	install -d -m0755 '$(DIR)'-run/usr/share/man/man8
 	install -m0644 debian/update-service.8 '$(DIR)'-run/usr/share/man/man8/
-	gzip -9 '$(DIR)'-run/usr/share/man/man8/update-service.8
+	gzip -9n '$(DIR)'-run/usr/share/man/man8/update-service.8
 	#  systemd service
 	install -d -m0755 '$(DIR)'-run/lib/systemd/system
 	install -m0644 debian/systemd/daemontools.service \
@@ -94,14 +98,18 @@
 binary-arch: install-arch daemontools.deb
 	dpkg-shlibdeps '$(DIR)'/usr/bin/*
 	dpkg-gencontrol -isp -pdaemontools -P'$(DIR)'
+	find '$(DIR)' -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
 	dpkg -b '$(DIR)' ..
 binary-indep: install-indep daemontools-run.deb
 	dpkg-gencontrol -isp -pdaemontools-run -P'$(DIR)'-run
+	find '$(DIR)'-run -newermt '$(BUILD_DATE)' -print0 | \
+		xargs -0r touch --no-dereference --date='$(BUILD_DATE)'
 	dpkg -b '$(DIR)'-run ..
 
 binary: binary-indep binary-arch
 
-.PHONY: patch build clean install install-arch install-indep binary \
+.PHONY: patch build build-arch build-indep clean install install-arch install-indep binary \
 	  binary-arch binary-indep
 
 include debian/implicit
only in patch2:
unchanged:
--- daemontools-0.76.orig/debian/diff/0003-supervise.c_restart_process_when_fork_fails.diff
+++ daemontools-0.76/debian/diff/0003-supervise.c_restart_process_when_fork_fails.diff
@@ -0,0 +1,32 @@
+diff -Nur admin.orig/daemontools-0.76/src/supervise.c admin/daemontools-0.76/src/supervise.c
+--- admin.orig/daemontools-0.76/src/supervise.c	2010-02-19 11:08:15.000000000 +0100
++++ admin/daemontools-0.76/src/supervise.c	2010-02-19 12:53:16.000000000 +0100
+@@ -86,6 +86,8 @@
+ 
+ const char *run[2] = { "./run", 0 };
+ 
++int flagfailed = 0;
++
+ void trystart(void)
+ {
+   int f;
+@@ -94,6 +96,7 @@
+     case -1:
+       strerr_warn4(WARNING,"unable to fork for ",dir,", sleeping 60 seconds: ",&strerr_sys);
+       deepsleep(60);
++      flagfailed = 1;
+       trigger();
+       return;
+     case 0:
+@@ -153,6 +156,11 @@
+       }
+     }
+ 
++    if (flagfailed && flagwant && flagwantup){
++      flagfailed = 0;
++      trystart();
++    }
++
+     if (read(fdcontrol,&ch,1) == 1)
+       switch(ch) {
+ 	case 'd':

Attachment: signature.asc
Description: OpenPGP digital signature


--- End Message ---
Reply to: