commit 45c7ff1866b9f5de8b8cc7b0d3c8263851402ebc
parent 0b398f09c2c5c49259717495300928fa318368f0
Author: Gerrit Pape <pape@smarden.org>
Date: Tue, 10 Jun 2003 07:43:21 +0000
debianized, final.
Diffstat:
4 files changed, 40 insertions(+), 61 deletions(-)
diff --git a/debian/changelog b/debian/changelog
@@ -1,14 +1,14 @@
-runit (0.9.4-0) unstable; urgency=low
+runit (0.9.4-0) unstable; urgency=medium
* new upstream version.
* debian/diff/defaultsize.diff: remove; applied upstream.
* debian/getty.run, debian/getty.finish: remove; obsolete.
* debian/rules: remove temporary patch; install upstream example
- getty service directory; build and install setuidgid.
- * debian/control: Replaces: daemontools (drop-in replacement
- setuidgid plus manpage).
+ getty service directory; build and install setuidgid (drop-in
+ replacement for daemontools' setuidgid).
+ * debian/control: Standards-Version: 3.5.10.
- -- Gerrit Pape <pape@smarden.org> Wed, 4 Jun 2003 14:26:58 +0200
+ -- Gerrit Pape <pape@smarden.org> Fri, 6 Jun 2003 10:28:09 +0200
runit (0.9.3-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
@@ -2,13 +2,13 @@ Source: runit
Section: admin
Priority: optional
Maintainer: Gerrit Pape <pape@smarden.org>
-Build-Depends: dietlibc-dev (>> 0.22-0), debhelper (>> 3.0.0)
-Standards-Version: 3.5.9
+Build-Depends: dietlibc-dev (>> 0.22-0) [alpha arm hppa i386 ia64 mips mipsel powerpc sparc], debhelper (>> 3.0.0)
+Standards-Version: 3.5.10
Package: runit
Architecture: any
+Depends: ${shlibs:Depends}
Suggests: runit-run
-Replaces: dameontools
Description: a UNIX init scheme with service supervision
runit is a daemontools alike replacement for SysV-init and other init
schemes. runit currently runs on Debian GNU/Linux, OpenBSD, FreeBSD,
@@ -18,7 +18,8 @@ Description: a UNIX init scheme with service supervision
services (via the runsvdir program). Stage 3 handles the tasks necessary
to shutdown and halt or reboot.
.
- The runit programs are compiled and linked statically with the diet libc.
+ The runit programs are compiled and linked statically with the diet libc
+ on architectures the diet libc is available for.
.
See http://smarden.org/runit/ for more information.
.
diff --git a/debian/rules b/debian/rules
@@ -5,6 +5,32 @@
export DH_COMPAT=3
+DEB_HOST_ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+CFLAGS =-O2 -Wall
+LDFLAGS =-s -Os -pipe
+CC =diet -v -Os gcc
+
+ifneq ($(DEB_HOST_ARCH),alpha)
+ifneq ($(DEB_HOST_ARCH),arm)
+ifneq ($(DEB_HOST_ARCH),hppa)
+ifneq ($(DEB_HOST_ARCH),i386)
+ifneq ($(DEB_HOST_ARCH),ia64)
+ifneq ($(DEB_HOST_ARCH),mips)
+ifneq ($(DEB_HOST_ARCH),mipsel)
+ifneq ($(DEB_HOST_ARCH),powerpc)
+ifneq ($(DEB_HOST_ARCH),sparc)
+ CC =gcc
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+endif
+
configure: configure-stamp
configure-stamp:
dh_testdir
@@ -22,8 +48,8 @@ build-arch-stamp:
set -e; \
cd admin/runit-0.9.4/src; \
ln -s runit-0.9.4 runit; mv runit ../..; \
- echo 'diet -v -Os gcc -O2 -Wall' >conf-cc; \
- echo 'diet -v -Os gcc -s -Os -pipe' >conf-ld; \
+ echo "$(CC) $(CFLAGS)" >conf-cc; \
+ echo "$(CC) $(LDFLAGS)" >conf-ld; \
$(MAKE); \
$(MAKE) setuidgid; \
)
@@ -120,7 +146,7 @@ binary-arch: build install
# dh_installdebconf -a
# dh_installdocs -an
# dh_installexamples -a
- dh_installman -a admin/runit/man/*.8 debian/*.8
+ dh_installman -a admin/runit/man/*.8
dh_installchangelogs -a admin/runit-0.9.4/package/CHANGES
dh_strip -a
# dh_link -a
@@ -128,7 +154,7 @@ binary-arch: build install
dh_fixperms -a -X/sbin
# dh_makeshlibs -a
dh_installdeb -a
-# dh_shlibdeps -a
+ dh_shlibdeps -a
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
diff --git a/debian/setuidgid.8 b/debian/setuidgid.8
@@ -1,48 +0,0 @@
-.TH setuidgid 8
-.SH NAME
-setuidgid \- runs another program under a specified account's uid and gid.
-.SH SYNOPSIS
-.B setuidgid
-.I account
-.I child
-.SH DESCRIPTION
-.I account
-is a single argument.
-.I child
-consists of one or more arguments.
-
-.B setuidgid
-sets its uid and gid to
-.IR account 's
-uid and gid, removing all supplementary groups. It then runs
-.IR child .
-
-.B setuidgid
-cannot be run by anyone other than root.
-.SH EXIT CODES
-.B setuidgid
-exits 111 if it cannot find a UNIX account named
-.IB account ,
-if it cannot setgid, if it cannot setuid, or if it cannot run
-.IR child .
-Otherwise its exit code is the same as that of
-.IR child .
-.SH SEE ALSO
-supervise(8),
-svc(8),
-svok(8),
-svstat(8),
-svscanboot(8),
-svscan(8),
-readproctitle(8),
-fghack(8),
-pgrphack(8),
-multilog(8),
-tai64n(8),
-tai64nlocal(8),
-envuidgid(8),
-envdir(8),
-softlimit(8),
-setlock(8)
-
-http://cr.yp.to/daemontools.html
