debianized. debian_version_0_11_2-1

7 files changed, 28 insertions, 137 deletions

diff --git a/debian/1 b/debian/1
deleted file mode 100755
index a40fcfa..0000000
--- a/debian/1
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# system one time tasks
-rm -f /etc/runit/stopit
-rm -f /sbin/runit.old
-
-/etc/init.d/rcS
-
-/etc/init.d/rmnologin
diff --git a/debian/2 b/debian/2
index 8eac230..3ff94d9 100755
--- a/debian/2
+++ b/debian/2
@@ -2,7 +2,5 @@
 
 PATH=/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin
 
-runsvchdir default >/dev/null
-
 exec env - PATH=$PATH \
 runsvdir /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
diff --git a/debian/3 b/debian/3
deleted file mode 100755
index d86f3d8..0000000
--- a/debian/3
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-exec 2>&1
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-LAST=0
-test -r /etc/runit/reboot && LAST=6
-
-echo 'Waiting for services to stop...'
-svwaitdown -xk -t350 /var/service/*
-
-echo 'Waiting for getties to stop...'
-svwaitdown -xk -t14 /var/service/getty-*
-
-echo 'Shutdown...'
-/etc/init.d/rc $LAST
diff --git a/debian/changelog b/debian/changelog
index e5b384c..1a529cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,23 +1,22 @@
-runit (0.11.1-1) unstable; urgency=low
+runit (0.11.2-1) unstable; urgency=low
 
   * new upstream version.
-  * debian/diff/readlink.diff: new; create link target if ./supervise is
-    a dangling symbolic link.
-  * debian/rules: apply patches in debian/diff/; install stage 2 as
-    /usr/sbin/runsvdir-start for the use with /etc/inittab; enable dh_link.
+  * debian/rules: install stage 2 as /usr/sbin/runsvdir-start for the use
+    with /etc/inittab; enable dh_link.
   * debian/runit.dirs: add /var/service, /var/run/getty-5.
   * debian/README.Debian: adapt; package now automatically enables service
     supervision when used with sysvinit.
-  * debian/diff/doc-useinit.diff: new; document runsvdir-start usage.
   * debian/runit.links: new; create symlink for getty-5 service supervise
     directory to /var/run/.
   * debian/runit.postinst: new; add SV entry to /etc/inittab if not present
-    on install and upgrade; barf on fresh install if SV entry is present.
+    on install and upgrade; barf on fresh install if SV entry is present
+    (closes: #212311).
   * debian/runit.postrm: new; remove SV inittab entry on de-install; force
     remove /var/run/getty-5/ on purge.
   * debian/control: Standards-Version: 3.6.0
+  * debian/1, debian/3: remove; obsolete.
 
- -- Gerrit Pape <pape@smarden.org>  Mon, 22 Sep 2003 09:57:07 +0000
+ -- Gerrit Pape <pape@smarden.org>  Tue, 23 Sep 2003 08:56:19 +0000
 
 runit (0.11.0-1) unstable; urgency=low
 
diff --git a/debian/diff/doc-useinit.diff b/debian/diff/doc-useinit.diff
deleted file mode 100644
index 8e06938..0000000
--- a/debian/diff/doc-useinit.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: doc/useinit.html
-===================================================================
-RCS file: /var/lib/cvs/runit/doc/useinit.html,v
-retrieving revision 1.3
-diff -u -r1.3 useinit.html
---- doc/useinit.html	22 Jun 2003 18:25:31 -0000	1.3
-+++ doc/useinit.html	22 Sep 2003 09:50:34 -0000
-@@ -20,10 +20,9 @@
- <tt>StartupItems</tt>.
- <p>
- In any case, you first need to copy the <i>stage 2</i> script to
--<tt>/etc/runit/2</tt>:
-+<tt>/sbin/runsvdir-start</tt>:
- <pre>
--  # mkdir -p /etc/runit
--  # cp -p /package/admin/runit/etc/2 /etc/runit/
-+  # install -m0750 /package/admin/runit/etc/2 /sbin/runsvdir-start
- </pre>
- <hr>
- <a href="#sysv">How to use with sysvinit</a><br>
-@@ -35,7 +34,7 @@
- file, do:
- <pre>
-   # cat &gt;&gt;/etc/inittab &lt;&lt;EOT
--  SV:123456:respawn:/etc/runit/2
-+  SV:123456:respawn:/sbin/runsvdir-start
-   EOT
- </pre>
- and tell <i>init</i> to reread its configuration, e.g.:
-@@ -48,7 +47,7 @@
- script, do:
- <pre>
-   # cat &gt;&gt;/etc/rc.local &lt;&lt;EOT
--  csh -cf '/etc/runit/2 &amp;'
-+  csh -cf '/sbin/runsvdir-start &amp;'
-   EOT
- </pre>
- and reboot your system.
diff --git a/debian/diff/readlink.diff b/debian/diff/readlink.diff
deleted file mode 100644
index a96b000..0000000
--- a/debian/diff/readlink.diff
+++ /dev/null
@@ -1,44 +0,0 @@
-? ANN
-? changeversion
-? manpagehtml.diff
-? runit-0.9.6.tar.gz
-? debian/readlink.diff
-? src/test
-Index: src/runsv.c
-===================================================================
-RCS file: /var/lib/cvs/runit/src/runsv.c,v
-retrieving revision 1.11
-diff -u -r1.11 runsv.c
---- src/runsv.c	9 Mar 2003 14:05:49 -0000	1.11
-+++ src/runsv.c	4 Sep 2003 09:43:32 -0000
-@@ -318,6 +318,7 @@
- int main(int argc, char **argv) {
-   struct stat s;
-   int fd;
-+  char buf[256];
- 
-   progname =argv[0];
-   if (! argv[1] || argv[2]) usage();
-@@ -367,7 +368,21 @@
-     }
-   }
- 
--  mkdir("supervise", 0700);
-+  if (mkdir("supervise", 0700) == -1) {
-+    if ((fd =readlink("supervise", buf, 256)) != -1) {
-+      if (fd == 256) {
-+	errno =EOVERFLOW;
-+	fatal("unable to readlink ./supervise");
-+      }
-+      buf[fd] =0;
-+      mkdir(buf, 0700);
-+    }
-+    else {
-+      if ((errno != ENOENT) && (errno != EINVAL))
-+	fatal("unable to readlink ./supervise");
-+    }
-+  }
-+  
-   if ((svd[0].fdlock =open_append("supervise/lock")) == -1)
-     fatal("unable to open lock");
-   if (lock_exnb(svd[0].fdlock) == -1) fatal("unable to lock");
diff --git a/debian/rules b/debian/rules
index 8fe6470..5d7e489 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,16 +41,16 @@ build-arch: configure-stamp build-arch-stamp
 build-arch-stamp:
 	dh_testdir
 
-	tar xfzvp runit-0.11.1.tar.gz
-	for i in debian/diff/*.diff; do \
-	  cat $$i | ( cd admin/runit-0.11.1 && patch -p0 ); \
-	done
+	tar xfzvp runit-0.11.2.tar.gz
+#	for i in debian/diff/*.diff; do \
+#	  cat $$i | ( cd admin/runit-0.11.2 && patch -p0 ); \
+#	done
 	-gcc -v
 
 	( \
 	set -e; \
-	cd admin/runit-0.11.1/src; \
-	ln -s runit-0.11.1 runit; mv runit ../..; \
+	cd admin/runit-0.11.2/src; \
+	ln -s runit-0.11.2 runit; mv runit ../..; \
 	echo "$(CC) $(CFLAGS)" >conf-cc; \
 	echo "$(CC) $(LDFLAGS)" >conf-ld; \
 	$(MAKE); \
@@ -82,29 +82,29 @@ install: build
 	dh_installdirs
 
 	# runit
-	install -m0500 admin/runit-0.11.1/src/runit \
+	install -m0500 admin/runit-0.11.2/src/runit \
 	  $(CURDIR)/debian/runit/sbin/runit
-	install -m0500 admin/runit-0.11.1/src/runit-init \
+	install -m0500 admin/runit-0.11.2/src/runit-init \
 	  $(CURDIR)/debian/runit/sbin/runit-init
-	install -m0755 admin/runit-0.11.1/src/runsvdir \
+	install -m0755 admin/runit-0.11.2/src/runsvdir \
 	  $(CURDIR)/debian/runit/usr/bin/runsvdir
-	install -m0755 admin/runit-0.11.1/src/runsv \
+	install -m0755 admin/runit-0.11.2/src/runsv \
 	  $(CURDIR)/debian/runit/usr/bin/runsv
-	install -m0755 admin/runit-0.11.1/src/runsvchdir \
+	install -m0755 admin/runit-0.11.2/src/runsvchdir \
 	  $(CURDIR)/debian/runit/usr/sbin/runsvchdir
-	install -m0755 admin/runit-0.11.1/src/svlogd \
+	install -m0755 admin/runit-0.11.2/src/svlogd \
 	  $(CURDIR)/debian/runit/usr/bin/svlogd
-	install -m0755 admin/runit-0.11.1/src/svwaitdown \
+	install -m0755 admin/runit-0.11.2/src/svwaitdown \
 	  $(CURDIR)/debian/runit/usr/bin/svwaitdown
-	install -m0755 admin/runit-0.11.1/src/svwaitup \
+	install -m0755 admin/runit-0.11.2/src/svwaitup \
 	  $(CURDIR)/debian/runit/usr/bin/svwaitup
-	install -m0755 admin/runit-0.11.1/src/utmpset \
+	install -m0755 admin/runit-0.11.2/src/utmpset \
 	  $(CURDIR)/debian/runit/usr/sbin/utmpset
-	install -m0755 admin/runit-0.11.1/src/runsvstat \
+	install -m0755 admin/runit-0.11.2/src/runsvstat \
 	  $(CURDIR)/debian/runit/usr/bin/runsvstat
-	install -m0755 admin/runit-0.11.1/src/runsvctrl \
+	install -m0755 admin/runit-0.11.2/src/runsvctrl \
 	  $(CURDIR)/debian/runit/usr/bin/runsvctrl
-	install -m0755 admin/runit-0.11.1/src/chpst \
+	install -m0755 admin/runit-0.11.2/src/chpst \
 	  $(CURDIR)/debian/runit/usr/bin/chpst
 
 	# runsvdir-start to be used from /etc/inittab
@@ -114,9 +114,9 @@ install: build
 	# temporary?
 	( cd $(CURDIR)/debian/runit/usr/sbin/ && ln -s ../bin/chpst setuidgid )
 
-	install -m0755 admin/runit-0.11.1/etc/debian/getty-tty5/run \
+	install -m0755 admin/runit-0.11.2/etc/debian/getty-tty5/run \
 	  $(CURDIR)/debian/runit/etc/runit/getty-5/run
-	install -m0755 admin/runit-0.11.1/etc/debian/getty-tty5/finish \
+	install -m0755 admin/runit-0.11.2/etc/debian/getty-tty5/finish \
 	  $(CURDIR)/debian/runit/etc/runit/getty-5/finish
 
 	# lintian overrides
@@ -155,7 +155,7 @@ binary-arch: build install
 #	dh_installdocs -an
 #	dh_installexamples -a
 	dh_installman -a admin/runit/man/*.8
-	dh_installchangelogs -a admin/runit-0.11.1/package/CHANGES
+	dh_installchangelogs -a admin/runit-0.11.2/package/CHANGES
 	dh_strip -a
 	dh_link -a
 	dh_compress -a