commit 54f993927f86623f1601842bf6bd12ed46858c9b
parent 2cf8e61c0b139cc476a705d712de0be8fd6fd213
Author: Gerrit Pape <pape@smarden.org>
Date: Sun, 1 Aug 2004 18:53:08 +0000
* debian/control: Build-Depends: dietlibc-dev (>> 0.27-0).
* debian/rules: minor cleanup.
* debian/implicit: update to revision 1.10.
* debian/runit.README.Debian: minor.
* debian/runit.postinst, debian/runit.postrm, debian/runit.preinst:
simplify; cleanup.
-1.
Diffstat:
7 files changed, 85 insertions(+), 108 deletions(-)
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,15 @@
+runit (1.0.4-1) unstable; urgency=low
+
+ * new upstream release.
+ * debian/control: Build-Depends: dietlibc-dev (>> 0.27-0).
+ * debian/rules: minor cleanup.
+ * debian/implicit: update to revision 1.10.
+ * debian/runit.README.Debian: minor.
+ * debian/runit.postinst, debian/runit.postrm, debian/runit.preinst:
+ simplify; cleanup.
+
+ -- Gerrit Pape <pape@smarden.org> Sun, 1 Aug 2004 18:38:36 +0000
+
runit (1.0.3-1) unstable; urgency=low
* new upstream release.
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: runit
Section: admin
Priority: optional
Maintainer: Gerrit Pape <pape@smarden.org>
-Build-Depends: dietlibc-dev (>> 0.26-0) [alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc]
+Build-Depends: dietlibc-dev (>> 0.27-0) [alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc]
Standards-Version: 3.6.1.0
Package: runit
diff --git a/debian/rules b/debian/rules
@@ -19,14 +19,14 @@ ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
STRIP =: nostrip
endif
-DIR =`pwd`/debian/runit
+DIR =$(shell pwd)/debian/runit
unpack: deb-checkdir unpack-stamp
unpack-stamp:
- tar xzf runit-1.0.3.tar.gz
- ln -s runit-1.0.3 admin/runit
- echo "$(CC) $(CFLAGS)" >admin/runit/src/conf-cc
- echo "$(CC) $(LDFLAGS)" >admin/runit/src/conf-ld
+ tar xzf runit-1.0.4.tar.gz
+ ln -s runit-1.0.4 admin/runit
+ echo '$(CC) $(CFLAGS)' >admin/runit/src/conf-cc
+ echo '$(CC) $(LDFLAGS)' >admin/runit/src/conf-ld
touch unpack-stamp
build: deb-checkdir build-stamp
@@ -38,53 +38,53 @@ build-stamp: unpack-stamp
clean: deb-checkdir deb-checkuid
rm -rf admin
rm -f unpack-stamp build-stamp
- rm -rf "$(DIR)"
+ rm -rf '$(DIR)'
rm -f debian/files debian/substvars changelog
install: deb-checkdir deb-checkuid build-stamp
- rm -rf "$(DIR)"
- install -d -m0755 "$(DIR)"/var/service
- install -d -m0755 "$(DIR)"/sbin
- install -d -m0755 "$(DIR)"/usr/bin
- install -d -m0755 "$(DIR)"/usr/sbin
+ rm -rf '$(DIR)'
+ install -d -m0755 '$(DIR)'/var/service
+ install -d -m0755 '$(DIR)'/sbin
+ install -d -m0755 '$(DIR)'/usr/bin
+ install -d -m0755 '$(DIR)'/usr/sbin
for i in runit runit-init; do \
- install -m0755 admin/runit/src/$$i "$(DIR)"/sbin/ || exit 1; \
+ install -m0755 admin/runit/src/$$i '$(DIR)'/sbin/ || exit 1; \
done
for i in runsvdir runsv svlogd svwaitdown svwaitup runsvstat \
runsvctrl chpst; do \
- install -m0755 admin/runit/src/$$i "$(DIR)"/usr/bin/ || exit 1; \
+ install -m0755 admin/runit/src/$$i '$(DIR)'/usr/bin/ || exit 1; \
done
for i in runsvchdir utmpset; do \
- install -m0755 admin/runit/src/$$i "$(DIR)"/usr/sbin/ || exit 1; \
+ install -m0755 admin/runit/src/$$i '$(DIR)'/usr/sbin/ || exit 1; \
done
- install -m0755 admin/runit/src/utmpset "$(DIR)"/usr/sbin/
- $(STRIP) -R .comment -R .note "$(DIR)"/sbin/* "$(DIR)"/usr/sbin/* \
- "$(DIR)"/usr/bin/*
+ install -m0755 admin/runit/src/utmpset '$(DIR)'/usr/sbin/
+ $(STRIP) -R .comment -R .note '$(DIR)'/sbin/* '$(DIR)'/usr/sbin/* \
+ '$(DIR)'/usr/bin/*
# runsvdir-start to be used from /etc/inittab
- install -m0755 debian/2 "$(DIR)"/usr/sbin/runsvdir-start
+ install -m0755 debian/2 '$(DIR)'/usr/sbin/runsvdir-start
# getty-5 service
- install -d -m0755 "$(DIR)"/etc/runit/getty-5
+ install -d -m0755 '$(DIR)'/etc/runit/getty-5
install -m0755 admin/runit/etc/debian/getty-tty5/run \
- "$(DIR)"/etc/runit/getty-5/run
+ '$(DIR)'/etc/runit/getty-5/run
install -m0755 admin/runit/etc/debian/getty-tty5/finish \
- "$(DIR)"/etc/runit/getty-5/finish
+ '$(DIR)'/etc/runit/getty-5/finish
# lintian overrides
- install -m0755 -d "$(DIR)"/usr/share/lintian/overrides
+ install -m0755 -d '$(DIR)'/usr/share/lintian/overrides
install -m0644 debian/runit.lintian \
- "$(DIR)"/usr/share/lintian/overrides/runit
+ '$(DIR)'/usr/share/lintian/overrides/runit
# 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
+ 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
- ln -s /var/run/getty-5 "$(DIR)"/etc/runit/getty-5/supervise
+ install -d -m0755 '$(DIR)'/var/run/getty-5
+ ln -s /var/run/getty-5 '$(DIR)'/etc/runit/getty-5/supervise
# additional docs
- install -d -m0755 "$(DIR)"/usr/share/doc/runit/debian
+ install -d -m0755 '$(DIR)'/usr/share/doc/runit/debian
for i in 1 2 3 ctrlaltdel; do \
install -m0644 admin/runit/etc/debian/$$i \
- "$(DIR)"/usr/share/doc/runit/debian/; \
+ '$(DIR)'/usr/share/doc/runit/debian/; \
done
# changelog
rm -f changelog && ln -s admin/runit/package/CHANGES changelog
@@ -92,10 +92,10 @@ install: deb-checkdir deb-checkuid build-stamp
binary-indep:
binary-arch: install runit.deb
- test "$(CC)" != 'gcc' || \
- dpkg-shlibdeps "$(DIR)"/usr/sbin/* "$(DIR)"/usr/bin/*
- dpkg-gencontrol -isp -prunit -P"$(DIR)"
- dpkg -b "$(DIR)" ..
+ test '$(CC)' != 'gcc' || \
+ dpkg-shlibdeps '$(DIR)'/usr/sbin/* '$(DIR)'/usr/bin/*
+ dpkg-gencontrol -isp -prunit -P'$(DIR)'
+ dpkg -b '$(DIR)' ..
binary: binary-indep binary-arch
diff --git a/debian/runit.README.Debian b/debian/runit.README.Debian
@@ -7,9 +7,9 @@ service supervision on systems running sysvinit as init scheme.
The package does not replace the /sbin/init program, and so does not
enable runit to run as process no 1. To do so, you need to follow the
-documentation[0] or install the package runit-run.
+documentation[0] or install the runit-run package.
-runit's default directory for services is /var/service.
+runit's default directory for services is /var/service/.
[0] http://smarden.org/runit/replaceinit.html
diff --git a/debian/runit.postinst b/debian/runit.postinst
@@ -1,12 +1,12 @@
-#! /bin/sh
+#!/bin/sh
set -e
-case "$1" in
- configure)
- if test -z "$2"; then
- # not upgrading
- if grep '^SV:' /etc/inittab >/dev/null; then
- cat <<EOT >&2
+test "$1" = 'configure' || exit 0
+
+if test -z "$2"; then
+ # not upgrading
+ if grep '^SV:' /etc/inittab >/dev/null; then
+ cat <<EOT >&2
There already is an SV entry in /etc/inittab. In order to have this package
add an entry with the name SV to have runit's service supervision started
@@ -15,27 +15,17 @@ by sysvinit, you need to remove or rename the current SV entry first.
Installation failed.
EOT
- exit 1
- fi
- fi
- if ! grep '^SV:' /etc/inittab >/dev/null; then
- echo 'Adding SV inittab entry...'
- cp /etc/inittab /etc/inittab'{new}'
- cat >>/etc/inittab'{new}' <<EOT
-#-- runit begin
-SV:123456:respawn:/usr/sbin/runsvdir-start
-#-- runit end
-EOT
- mv -f /etc/inittab'{new}' /etc/inittab
- kill -HUP 1
- fi
- ;;
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
- *)
- echo "postinst called with unknown argument \`$1'" >&2
exit 1
- ;;
-esac
-
-exit 0
+ fi
+fi
+if ! grep '^SV:' /etc/inittab >/dev/null; then
+ echo 'Adding SV inittab entry...'
+ cp /etc/inittab /etc/inittab'{new}'
+ cat >>/etc/inittab'{new}' <<-\EOT
+ #-- runit begin
+ SV:123456:respawn:/usr/sbin/runsvdir-start
+ #-- runit end
+ EOT
+ mv -f /etc/inittab'{new}' /etc/inittab
+ kill -HUP 1
+fi
diff --git a/debian/runit.postrm b/debian/runit.postrm
@@ -1,26 +1,14 @@
-#! /bin/sh
+#!/bin/sh
set -e
-case "$1" in
- remove)
- if grep -q "#-- runit begin" /etc/inittab; then
- echo 'Removing SV inittab entry...'
- rm -f /etc/inittab'{new}'
- sed -e '/#-- runit begin/,/#-- runit end/d' \
- /etc/inittab > /etc/inittab'{new}'
- mv -f /etc/inittab'{new}' /etc/inittab
- kill -HUP 1
- fi
- ;;
- purge)
- rm -rf /var/run/getty-5
- ;;
- upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
- ;;
- *)
- echo "postrm called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
+test "$1" = 'remove' || test "$1" = 'purge' || exit 0
-exit 0
+if grep '#-- runit begin' /etc/inittab >/dev/null; then
+ echo 'Removing SV inittab entry...'
+ rm -f /etc/inittab'{new}'
+ sed -e '/#-- runit begin/,/#-- runit end/d' \
+ </etc/inittab >/etc/inittab'{new}'
+ mv -f /etc/inittab'{new}' /etc/inittab
+ kill -HUP 1
+fi
+test "$1" != 'purge' || rm -rf /var/run/getty-5
diff --git a/debian/runit.preinst b/debian/runit.preinst
@@ -1,19 +1,6 @@
-#! /bin/sh
+#!/bin/sh
set -e
-case "$1" in
- install)
- ;;
- upgrade)
- test ! -x /sbin/runit || test -e /sbin/runit.old || \
- ln /sbin/runit /sbin/runit.old
- ;;
- abort-upgrade)
- ;;
- *)
- echo "preinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-exit 0
+test "$1" = 'upgrade' || exit 0
+test ! -x /sbin/runit || test -e /sbin/runit.old || \
+ ln /sbin/runit /sbin/runit.old
