create .diet/gcc on i386 to suppress

    gcc warnings in build logs; minor.
add runsvdir-start man page (thx Bastian Kleineidam).

3 files changed, 41 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index c66eae1..c53f63f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-runit (1.0.1-0.1) unstable; urgency=low
+runit (1.0.1-1) unstable; urgency=low
 
   * new upstream release.
+   * chpst -e dir doesn't barf on subdirectories of dir (closes: #234172).
+  * debian/runsvdir-start.8: new; tnx Bastian Kleineidam (closes: #234114).
+  * debian/rules: run make check; no longer provide /usr/sbin/setuidgid;
+    install runsvdir-start man page; create .diet/gcc on i386 to suppress
+    gcc warnings in build logs; minor.
 
- -- Gerrit Pape <pape@smarden.org>  Sun, 22 Feb 2004 08:26:24 +0000
+ -- Gerrit Pape <pape@smarden.org>  Mon,  8 Mar 2004 15:49:54 +0000
 
 runit (1.0.0-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 6d3daef..6809996 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,17 +40,18 @@ DIR =`pwd`/debian/runit
 
 build: deb-checkdir build-stamp
 build-stamp:
-	tar xfzp runit-1.0.1.tar.gz
 	-gcc -v
-	( cd admin/runit-1.0.1/src && \
-	ln -s runit-1.0.1 runit && mv runit ../.. && \
-	echo "$(CC) $(CFLAGS)" >conf-cc && \
-	echo "$(CC) $(LDFLAGS)" >conf-ld && \
-	$(MAKE) )
+	test "$(DEB_HOST_ARCH)" != 'i386' || \
+	  ( mkdir -p .diet && echo '-Os -fomit-frame-pointer -falign-functions=0 -falign-jumps=0 -falign-loops=0 -mpreferred-stack-boundary=2' >.diet/gcc )
+	tar xfzp runit-1.0.1.tar.gz
+	ln -s runit-1.0.1 admin/runit
+	echo "$(CC) $(CFLAGS)" >admin/runit/src/conf-cc
+	echo "$(CC) $(LDFLAGS)" >admin/runit/src/conf-ld
+	HOME="`pwd`" $(MAKE) -Cadmin/runit/src default check
 	touch build-stamp
 
 clean: deb-checkdir deb-checkuid
-	rm -rf admin
+	rm -rf admin .diet
 	rm -f build-stamp
 	rm -rf "$(DIR)"
 	rm -f debian/files debian/substvars changelog
@@ -76,8 +77,6 @@ install: deb-checkdir deb-checkuid build-stamp
 	  "$(DIR)"/usr/bin/*
 	# runsvdir-start to be used from /etc/inittab
 	install -m0755 debian/2 "$(DIR)"/usr/sbin/runsvdir-start
-	# temporary?
-	ln -s ../bin/chpst "$(DIR)"/usr/sbin/setuidgid
 	# getty-5 service
 	install -d -m0755 "$(DIR)"/etc/runit/getty-5
 	install -m0755 admin/runit/etc/debian/getty-tty5/run \
@@ -91,6 +90,7 @@ install: deb-checkdir deb-checkuid build-stamp
 	# man pages
 	install -d -m0755 "$(DIR)"/usr/share/man/man8
 	install -m0644 admin/runit/man/*.8 "$(DIR)"/usr/share/man/man8/
+	install -m0644 debian/runsvdir-start.8 "$(DIR)"/usr/share/man/man8/
 	gzip -9 "$(DIR)"/usr/share/man/man8/*.8
 	# links
 	install -d -m0755 "$(DIR)"/var/run/getty-5
diff --git a/debian/runsvdir-start.8 b/debian/runsvdir-start.8
new file mode 100644
index 0000000..6f41ce9
--- /dev/null
+++ b/debian/runsvdir-start.8
@@ -0,0 +1,25 @@
+.TH RUNSVDIR-START 8 "22 February 2004"
+.SH NAME
+runsvdir-start \- monitor and start runsv(8) processes in /var/service
+.SH SYNOPSIS
+\fBrunsvdir-start\fP
+.SH DESCRIPTION
+Intended to be run at boot time, the script monitors and starts processes
+in the \fB/var/service\fP directory.
+.SH EXAMPLE
+Include the following line into your \fB/etc/inittab\fP:
+
+  \fBSV:123456:respawn:/usr/sbin/runsvdir-start\fP
+.SH FILES
+ /var/service/
+ /etc/inittab
+.SH SEE ALSO
+runsvdir(8), runsv(8), inittab(5)
+
+http://smarden.org/runit/
+.SH AUTHOR
+This manpage was originally written by Bastian Kleineidam
+<calvin@debian.org> for the Debian distribution of runit
+(but may be used by others).
+
+The main author of runit is Gerrit Pape <pape@smarden.org>.