* new upstream version. debian-2.1.2-1

    * debian/diff/0002-sv.c-...diff, debian/diff/0004-sv.c-...diff,
      debian/diff/0005-man-sv.8-...diff: remove; applied upstream.

8 files changed, 55 insertions, 175 deletions

diff --git a/debian/changelog b/debian/changelog
index 9f50aef..6974e70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+runit (2.1.2-1) unstable; urgency=medium
+
+  * new upstream version.
+    * debian/diff/0002-sv.c-...diff, debian/diff/0004-sv.c-...diff,
+      debian/diff/0005-man-sv.8-...diff: remove; applied upstream.
+
+ -- Gerrit Pape <pape@smarden.org>  Mon, 11 Aug 2014 18:19:38 +0000
+
 runit (2.1.1-8) unstable; urgency=low
 
   * debian/diff/0005-man-sv.8-sv-exit-does-not-send-a-TERM-...diff:
diff --git a/debian/diff/0001-default-directory-for-services-on-Debian-is-etc-servi.diff b/debian/diff/0001-default-directory-for-services-on-Debian-is-etc-servi.diff
index 66455bf..afc1bc5 100644
--- a/debian/diff/0001-default-directory-for-services-on-Debian-is-etc-servi.diff
+++ b/debian/diff/0001-default-directory-for-services-on-Debian-is-etc-servi.diff
@@ -1,20 +1,20 @@
-From 531f1add3e4dcc249060b14818be6553d45b06a3 Mon Sep 17 00:00:00 2001
+From d99515f6c8427e5f1c8f252532df8858bdef1007 Mon Sep 17 00:00:00 2001
 From: Gerrit Pape <pape@smarden.org>
 Date: Wed, 7 May 2008 23:51:16 +0000
 Subject: [PATCH] default directory for services on Debian is /etc/service/,
  not /service/
 
 ---
- runit-2.1.1/man/runsv.8      | 4 ++--
- runit-2.1.1/man/runsvchdir.8 | 4 ++--
- runit-2.1.1/man/sv.8         | 4 ++--
- runit-2.1.1/src/sv.c         | 2 +-
+ runit-2.1.2/man/runsv.8      | 4 ++--
+ runit-2.1.2/man/runsvchdir.8 | 4 ++--
+ runit-2.1.2/man/sv.8         | 4 ++--
+ runit-2.1.2/src/sv.c         | 2 +-
  4 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/runit-2.1.1/man/runsv.8 b/runit-2.1.1/man/runsv.8
+diff --git a/runit-2.1.2/man/runsv.8 b/runit-2.1.2/man/runsv.8
 index 7c5abfc..75bc73a 100644
---- a/runit-2.1.1/man/runsv.8
-+++ b/runit-2.1.1/man/runsv.8
+--- a/runit-2.1.2/man/runsv.8
++++ b/runit-2.1.2/man/runsv.8
 @@ -157,9 +157,9 @@ This command is ignored if it is given to
  .IR service /log/supervise/control.
  .P
@@ -27,10 +27,10 @@ index 7c5abfc..75bc73a 100644
  .P
  .BR printf (1)
  usually blocks if no
-diff --git a/runit-2.1.1/man/runsvchdir.8 b/runit-2.1.1/man/runsvchdir.8
+diff --git a/runit-2.1.2/man/runsvchdir.8 b/runit-2.1.2/man/runsvchdir.8
 index f7f94dc..a5fc180 100644
---- a/runit-2.1.1/man/runsvchdir.8
-+++ b/runit-2.1.1/man/runsvchdir.8
+--- a/runit-2.1.2/man/runsvchdir.8
++++ b/runit-2.1.2/man/runsvchdir.8
 @@ -27,13 +27,13 @@ with a symlink pointing to
  .IR dir .
  .P
@@ -47,10 +47,10 @@ index f7f94dc..a5fc180 100644
  .SH EXIT CODES
  .B runsvchdir
  prints an error message and exits 111 on error.
-diff --git a/runit-2.1.1/man/sv.8 b/runit-2.1.1/man/sv.8
-index 9bc005a..b5ece60 100644
---- a/runit-2.1.1/man/sv.8
-+++ b/runit-2.1.1/man/sv.8
+diff --git a/runit-2.1.2/man/sv.8 b/runit-2.1.2/man/sv.8
+index 7ed9852..fa56443 100644
+--- a/runit-2.1.2/man/sv.8
++++ b/runit-2.1.2/man/sv.8
 @@ -30,7 +30,7 @@ If
  .I service
  doesn't start with a dot or slash and doesn't end with a slash, it is
@@ -60,7 +60,7 @@ index 9bc005a..b5ece60 100644
  otherwise relative to the current directory.
  .P
  .I command
-@@ -217,7 +217,7 @@ This option implies
+@@ -232,7 +232,7 @@ This option implies
  .TP
  .B SVDIR
  The environment variable $SVDIR overrides the default services directory
@@ -69,10 +69,10 @@ index 9bc005a..b5ece60 100644
  .TP
  .B SVWAIT
  The environment variable $SVWAIT overrides the default 7 seconds to wait
-diff --git a/runit-2.1.1/src/sv.c b/runit-2.1.1/src/sv.c
-index e27ccb2..7c07101 100644
---- a/runit-2.1.1/src/sv.c
-+++ b/runit-2.1.1/src/sv.c
+diff --git a/runit-2.1.2/src/sv.c b/runit-2.1.2/src/sv.c
+index 0125795..887e9d1 100644
+--- a/runit-2.1.2/src/sv.c
++++ b/runit-2.1.2/src/sv.c
 @@ -32,7 +32,7 @@
  char *progname;
  char *action;
diff --git a/debian/diff/0003-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff b/debian/diff/0002-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff
index 0891c2a..1e7d092 100644
--- a/debian/diff/0003-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff
+++ b/debian/diff/0002-support-etc-runit-nosync-file-to-make-sync-on-shutdow.diff
@@ -1,4 +1,4 @@
-From f5d02961e163deba8aa42ebce59921995770a138 Mon Sep 17 00:00:00 2001
+From aed8774b9aa813cbb3e8b732f6f7ae132f86c82b Mon Sep 17 00:00:00 2001
 From: Andras Korn <korn-debbugs@elan.rulez.org>
 Date: Thu, 6 Dec 2012 16:57:06 +0100
 Subject: [PATCH] support /etc/runit/nosync file to make sync on
@@ -6,16 +6,16 @@ Subject: [PATCH] support /etc/runit/nosync file to make sync on
 
 https://bugs.debian.org/695281
 ---
- runit-2.1.1/doc/runit.8.html |  2 ++
- runit-2.1.1/man/runit.8      |  5 +++++
- runit-2.1.1/src/runit.c      | 15 ++++++++++-----
- runit-2.1.1/src/runit.h      |  1 +
+ runit-2.1.2/doc/runit.8.html |  2 ++
+ runit-2.1.2/man/runit.8      |  5 +++++
+ runit-2.1.2/src/runit.c      | 15 ++++++++++-----
+ runit-2.1.2/src/runit.h      |  1 +
  4 files changed, 18 insertions(+), 5 deletions(-)
 
-diff --git a/runit-2.1.1/doc/runit.8.html b/runit-2.1.1/doc/runit.8.html
+diff --git a/runit-2.1.2/doc/runit.8.html b/runit-2.1.2/doc/runit.8.html
 index 6c46b39..3cc8287 100644
---- a/runit-2.1.1/doc/runit.8.html
-+++ b/runit-2.1.1/doc/runit.8.html
+--- a/runit-2.1.2/doc/runit.8.html
++++ b/runit-2.1.2/doc/runit.8.html
 @@ -34,6 +34,8 @@ stage 2 if it is running, and runs <i>/etc/runit/3</i>. The systems tasks to shu
  and possibly halt or reboot the system are done here. If stage 3 returns,
  <b>runit</b> checks if the file <i>/etc/runit/reboot</i> exists and has the execute by
@@ -25,10 +25,10 @@ index 6c46b39..3cc8287 100644
  
  <h2><a name='sect6'>Ctrl-alt-del</a></h2>
  If <b>runit</b> receives the ctrl-alt-del keyboard request and the file
-diff --git a/runit-2.1.1/man/runit.8 b/runit-2.1.1/man/runit.8
+diff --git a/runit-2.1.2/man/runit.8 b/runit-2.1.2/man/runit.8
 index a53cf6e..faf789b 100644
---- a/runit-2.1.1/man/runit.8
-+++ b/runit-2.1.1/man/runit.8
+--- a/runit-2.1.2/man/runit.8
++++ b/runit-2.1.2/man/runit.8
 @@ -48,6 +48,11 @@ checks if the file
  .I /etc/runit/reboot
  exists and has the execute by owner permission set.
@@ -41,10 +41,10 @@ index a53cf6e..faf789b 100644
  .SH CTRL-ALT-DEL
  If
  .B runit
-diff --git a/runit-2.1.1/src/runit.c b/runit-2.1.1/src/runit.c
+diff --git a/runit-2.1.2/src/runit.c b/runit-2.1.2/src/runit.c
 index 48620b3..2bb4794 100644
---- a/runit-2.1.1/src/runit.c
-+++ b/runit-2.1.1/src/runit.c
+--- a/runit-2.1.2/src/runit.c
++++ b/runit-2.1.2/src/runit.c
 @@ -41,6 +41,11 @@ void sig_int_handler (void) {
  }
  void sig_child_handler (void) { write(selfpipe[1], "", 1); }
@@ -91,10 +91,10 @@ index 48620b3..2bb4794 100644
      reboot_system(RB_AUTOBOOT);
  #endif
  #endif
-diff --git a/runit-2.1.1/src/runit.h b/runit-2.1.1/src/runit.h
+diff --git a/runit-2.1.2/src/runit.h b/runit-2.1.2/src/runit.h
 index ba98386..bccaf2d 100644
---- a/runit-2.1.1/src/runit.h
-+++ b/runit-2.1.1/src/runit.h
+--- a/runit-2.1.2/src/runit.h
++++ b/runit-2.1.2/src/runit.h
 @@ -1,4 +1,5 @@
  #define RUNIT "/sbin/runit"
  #define STOPIT "/etc/runit/stopit"
diff --git a/debian/diff/0002-sv.c-support-optional-LSB-init-script-actions-reload-.diff b/debian/diff/0002-sv.c-support-optional-LSB-init-script-actions-reload-.diff
deleted file mode 100644
index 08b7d6a..0000000
--- a/debian/diff/0002-sv.c-support-optional-LSB-init-script-actions-reload-.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-From 50376787e21a3c42fee51715f2cc28f1b51f4f41 Mon Sep 17 00:00:00 2001
-From: Gerrit Pape <pape@smarden.org>
-Date: Sun, 11 Oct 2009 19:55:52 +0000
-Subject: [PATCH] sv.c: support optional LSB init script actions reload and
- try-restart
-
-http://bugs.debian.org/545227
----
- runit-2.1.1/man/sv.8 | 14 ++++++++++++++
- runit-2.1.1/src/sv.c |  5 ++++-
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/runit-2.1.1/man/sv.8 b/runit-2.1.1/man/sv.8
-index b5ece60..3949c2c 100644
---- a/runit-2.1.1/man/sv.8
-+++ b/runit-2.1.1/man/sv.8
-@@ -111,6 +111,11 @@ Same as
- but wait up to 7 seconds for the service to become down.
- Then report the status or timeout.
- .TP
-+.B reload
-+Same as
-+.IR hup ,
-+and additionally report the status afterwards.
-+.TP
- .B restart
- Send the commands
- .IR term ,
-@@ -182,6 +187,15 @@ process to terminate.
- Then report the status, and on timeout send the service the
- .I kill
- command.
-+.TP
-+.B try-restart
-+if the service is running, send it the
-+.I term
-+and
-+.I cont
-+commands, and wait up to 7 seconds for the service to restart.
-+Then report the status or timeout.
-+
- .SS Additional Commands
- .TP
- .B check
-diff --git a/runit-2.1.1/src/sv.c b/runit-2.1.1/src/sv.c
-index 7c07101..43224b5 100644
---- a/runit-2.1.1/src/sv.c
-+++ b/runit-2.1.1/src/sv.c
-@@ -305,9 +305,11 @@ int main(int argc, char **argv) {
-     acts ="d"; kll =1; cbk =&check; break;
-   case 'T':
-     acts ="tc"; kll =1; cbk =&check; break;
-+  case 't':
-+    if (!str_diff(action, "try-restart")) { acts ="tc"; cbk =&check; break; }
-   case 'c':
-     if (!str_diff(action, "check")) { act =0; acts ="C"; cbk =&check; break; }
--  case 'u': case 'd': case 'o': case 't': case 'p': case 'h':
-+  case 'u': case 'd': case 'o': case 'p': case 'h':
-   case 'a': case 'i': case 'k': case 'q': case '1': case '2':
-     action[1] =0; acts =action; break;
-   case 's':
-@@ -318,6 +320,7 @@ int main(int argc, char **argv) {
-     act =&status; cbk =0; break;
-   case 'r':
-     if (!str_diff(action, "restart")) { acts ="tcu"; cbk =&check; break; }
-+    if (!str_diff(action, "reload")) { acts ="h"; cbk =&check; break; }
-     usage();
-   case 'f':
-     if (!str_diff(action, "force-reload"))
--- 
-2.0.1
-
diff --git a/debian/diff/0006-utmpset.c-mixes-int32_t-and-time_t.diff b/debian/diff/0003-utmpset.c-mixes-int32_t-and-time_t.diff
index ba638da..6b21bbb 100644
--- a/debian/diff/0006-utmpset.c-mixes-int32_t-and-time_t.diff
+++ b/debian/diff/0003-utmpset.c-mixes-int32_t-and-time_t.diff
@@ -1,4 +1,4 @@
-From 1e598e312d74c99873d77029ce6861921c4d6c6a Mon Sep 17 00:00:00 2001
+From 20a0afcd367666efc17c59cf121a0d991ff1bd09 Mon Sep 17 00:00:00 2001
 From: Gerrit Pape <pape@smarden.org>
 Date: Thu, 31 Jul 2014 12:25:49 +0000
 Subject: [PATCH] utmpset.c: mixes "int32_t *" and "time_t *"
@@ -6,13 +6,13 @@ Subject: [PATCH] utmpset.c: mixes "int32_t *" and "time_t *"
 Don't pass int32_t to time(), thx Lorenzo Beretta,
 https://bugs.debian.org/754849
 ---
- runit-2.1.1/src/utmpset.c | 8 ++++++--
+ runit-2.1.2/src/utmpset.c | 8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/runit-2.1.1/src/utmpset.c b/runit-2.1.1/src/utmpset.c
+diff --git a/runit-2.1.2/src/utmpset.c b/runit-2.1.2/src/utmpset.c
 index eea41a5..2e8a525 100644
---- a/runit-2.1.1/src/utmpset.c
-+++ b/runit-2.1.1/src/utmpset.c
+--- a/runit-2.1.2/src/utmpset.c
++++ b/runit-2.1.2/src/utmpset.c
 @@ -24,6 +24,7 @@ void usage(void) { strerr_die4x(1, "usage: ", progname, USAGE, "\n"); }
  int utmp_logout(const char *line) {
    int fd;
diff --git a/debian/diff/0007-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff b/debian/diff/0004-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff
index 7c2f253..c2cdfc8 100644
--- a/debian/diff/0007-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff
+++ b/debian/diff/0004-src-Makefile-don-t-use-static-to-link-runit-runit-ini.diff
@@ -1,17 +1,17 @@
-From 92e68bee2a9a9c8af07dfff2c808c87032414765 Mon Sep 17 00:00:00 2001
+From 77d0f60701a401ea0de0925d9422c78fb560b4f6 Mon Sep 17 00:00:00 2001
 From: Gerrit Pape <pape@smarden.org>
 Date: Thu, 31 Jul 2014 12:54:32 +0000
 Subject: [PATCH] src/Makefile: don't use -static to link runit, runit-init on
  Debian
 
 ---
- runit-2.1.1/src/Makefile | 4 ++--
+ runit-2.1.2/src/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/runit-2.1.1/src/Makefile b/runit-2.1.1/src/Makefile
+diff --git a/runit-2.1.2/src/Makefile b/runit-2.1.2/src/Makefile
 index d9624de..507a419 100644
---- a/runit-2.1.1/src/Makefile
-+++ b/runit-2.1.1/src/Makefile
+--- a/runit-2.1.2/src/Makefile
++++ b/runit-2.1.2/src/Makefile
 @@ -6,10 +6,10 @@ check: $(IT)
  	./check-local $(IT)
  
diff --git a/debian/diff/0004-sv.c-fix-typo-that-made-sv-status-get-confused.diff b/debian/diff/0004-sv.c-fix-typo-that-made-sv-status-get-confused.diff
deleted file mode 100644
index a88f0c5..0000000
--- a/debian/diff/0004-sv.c-fix-typo-that-made-sv-status-get-confused.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5394a1cbf8bc229c90da70deb8cb149da6398eca Mon Sep 17 00:00:00 2001
-From: Gerrit Pape <pape@smarden.org>
-Date: Mon, 28 Jul 2014 07:37:50 +0000
-Subject: [PATCH] sv.c: fix typo that made sv status get confused
-
-https://bugs.debian.org/715512
----
- runit-2.1.1/src/sv.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/runit-2.1.1/src/sv.c b/runit-2.1.1/src/sv.c
-index 43224b5..5f3aa71 100644
---- a/runit-2.1.1/src/sv.c
-+++ b/runit-2.1.1/src/sv.c
-@@ -153,7 +153,7 @@ int status(char *unused) {
-   int rc;
- 
-   rc =svstatus_get();
--  switch(r) { case -1: if (lsb) done(4); case 0: return(0); }
-+  switch(rc) { case -1: if (lsb) done(4); case 0: return(0); }
-   rc =svstatus_print(*service);
-   if (chdir("log") == -1) {
-     if (errno != error_noent) {
--- 
-2.0.1
-
diff --git a/debian/diff/0005-man-sv.8-sv-exit-does-not-send-a-TERM-signal-to-the-l.diff b/debian/diff/0005-man-sv.8-sv-exit-does-not-send-a-TERM-signal-to-the-l.diff
deleted file mode 100644
index 1e3fe91..0000000
--- a/debian/diff/0005-man-sv.8-sv-exit-does-not-send-a-TERM-signal-to-the-l.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From 99aeb38b3f0d1108ef46c8f3d684e2ed195a59e0 Mon Sep 17 00:00:00 2001
-From: Gerrit Pape <pape@smarden.org>
-Date: Thu, 31 Jul 2014 11:54:39 +0000
-Subject: [PATCH] man/sv.8: "sv exit" does not send a TERM signal to the log
- service
-
-thx Jonathan Nieder, https://bugs.debian.org/627574
----
- runit-2.1.1/man/sv.8 | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/runit-2.1.1/man/sv.8 b/runit-2.1.1/man/sv.8
-index 3949c2c..fa56443 100644
---- a/runit-2.1.1/man/sv.8
-+++ b/runit-2.1.1/man/sv.8
-@@ -75,8 +75,9 @@ Do not restart the service.
- If the service is down, and no log service exists,
- .BR runsv (8)
- exits.
--If the service is down and a log service exists, send the TERM signal to the
--log service.
-+If the service is down and a log service exists,
-+.BR runsv (8)
-+closes the standard input of the log service and waits for it to terminate.
- If the log service is down,
- .BR runsv (8)
- exits.
--- 
-2.0.1
-