diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/diff/chpst-chroot.diff | 502 | ||||
| -rwxr-xr-x | debian/rules | 34 | ||||
| -rw-r--r-- | doc/install.html | 12 | ||||
| -rw-r--r-- | doc/replaceinit.html | 4 | ||||
| -rw-r--r-- | doc/upgrade.html | 2 | ||||
| -rwxr-xr-x | package/upgrade | 4 | ||||
| -rw-r--r-- | package/versions | 1 |
9 files changed, 28 insertions, 541 deletions
diff --git a/Makefile b/Makefile index 0929961..8ec5080 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ DESTDIR= -PACKAGE=runit-1.0.2 +PACKAGE=runit-1.0.3 DIRS=doc man etc package src MANPAGES=runit.8 runit-init.8 runsvdir.8 runsv.8 svwaitdown.8 svwaitup.8 \ utmpset.8 runsvchdir.8 runsvstat.8 runsvctrl.8 svlogd.8 chpst.8 diff --git a/debian/changelog b/debian/changelog index 0fae1ce..10524ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +runit (1.0.3-1) unstable; urgency=low + + * new upstream release. + * debian/diff/chpst-chroot.diff: remove; included upstream. + * debian/rules: don't apply diff; shorten architecture-check. + + -- Gerrit Pape <pape@smarden.org> Sat, 26 Jun 2004 14:35:37 +0000 + runit (1.0.2-3) unstable; urgency=low * debian/diff/chpst-chroot.diff: chdir before chroot; update diff --git a/debian/diff/chpst-chroot.diff b/debian/diff/chpst-chroot.diff deleted file mode 100644 index 9273665..0000000 --- a/debian/diff/chpst-chroot.diff +++ /dev/null @@ -1,502 +0,0 @@ -Index: src/chpst.c -=================================================================== -RCS file: /var/lib/cvs/runit/src/chpst.c,v -retrieving revision 1.2 -retrieving revision 1.4 -diff -u -r1.2 -r1.4 ---- src/chpst.c 2 Mar 2004 20:19:46 -0000 1.2 -+++ src/chpst.c 30 Apr 2004 18:51:04 -0000 1.4 -@@ -20,7 +20,7 @@ - #include "openreadclose.h" - #include "direntry.h" - --#define USAGE_MAIN " [-vP012] [-u user[:group]] [-U user[:group]] [-e dir] [-l|-L lock] [-m n] [-o n] [-p n] [-f n] [-c n] prog" -+#define USAGE_MAIN " [-vP012] [-u user[:group]] [-U user[:group]] [-e dir] [-/ root] [-l|-L lock] [-m n] [-o n] [-p n] [-f n] [-c n] prog" - #define FATAL "chpst: fatal: " - #define WARNING "chpst: warning: " - -@@ -57,6 +57,7 @@ - long limitr =-2; - long limitt =-2; - const char *lock =0; -+const char *root =0; - unsigned int lockdelay; - - void suidgid(char *user, unsigned int dogrp) { -@@ -270,7 +271,8 @@ - if (str_equal(progname, "setlock")) setlock(argc, argv); - if (str_equal(progname, "softlimit")) softlimit(argc, argv); - -- while ((opt =getopt(argc, argv, "u:U:e:m:o:p:f:c:r:t:l:L:vP012V")) != opteof) -+ while ((opt =getopt(argc, argv, "u:U:e:m:o:p:f:c:r:t:/:l:L:vP012V")) -+ != opteof) - switch(opt) { - case 'u': set_user =(char*)optarg; break; - case 'U': env_user =(char*)optarg; break; -@@ -285,6 +287,7 @@ - case 'c': if (optarg[scan_ulong(optarg, &limitc)]) usage(); break; - case 'r': if (optarg[scan_ulong(optarg, &limitr)]) usage(); break; - case 't': if (optarg[scan_ulong(optarg, &limitt)]) usage(); break; -+ case '/': root =optarg; break; - case 'l': if (lock) usage(); lock =optarg; lockdelay =1; break; - case 'L': if (lock) usage(); lock =optarg; lockdelay =0; break; - case 'v': verbose =1; break; -@@ -292,7 +295,7 @@ - case '0': nostdin =1; break; - case '1': nostdout =1; break; - case '2': nostderr =1; break; -- case 'V': strerr_warn1("$Id$", 0); -+ case 'V': strerr_warn1("$Id$", 0); - case '?': usage(); - } - argv +=optind; -@@ -300,6 +303,10 @@ - - if (pgrp) setsid(); - if (env_dir) edir(env_dir); -+ if (root) { -+ if (chdir(root) == -1) fatal2("unable to change directory", root); -+ if (chroot(".") == -1) fatal("unable to change root directory"); -+ } - if (env_user) euidgid(env_user, 1); - if (set_user) suidgid(set_user, 1); - slimit(); -Index: src/chpst.dist -=================================================================== -RCS file: /var/lib/cvs/runit/src/chpst.dist,v -retrieving revision 1.1 -retrieving revision 1.2 -diff -u -r1.1 -r1.2 ---- src/chpst.dist 8 Mar 2004 12:36:49 -0000 1.1 -+++ src/chpst.dist 27 Apr 2004 17:48:29 -0000 1.2 -@@ -1,8 +1,8 @@ --usage: chpst [-vP012] [-u user[:group]] [-U user[:group]] [-e dir] [-l|-L lock] [-m n] [-o n] [-p n] [-f n] [-c n] prog -+usage: chpst [-vP012] [-u user[:group]] [-U user[:group]] [-e dir] [-/ root] [-l|-L lock] [-m n] [-o n] [-p n] [-f n] [-c n] prog - - 100 --$Id$ --usage: chpst [-vP012] [-u user[:group]] [-U user[:group]] [-e dir] [-l|-L lock] [-m n] [-o n] [-p n] [-f n] [-c n] prog -+$Id$ -+usage: chpst [-vP012] [-u user[:group]] [-U user[:group]] [-e dir] [-/ root] [-l|-L lock] [-m n] [-o n] [-p n] [-f n] [-c n] prog - - 100 - test=1 -Index: man/chpst.8 -=================================================================== -RCS file: /var/lib/cvs/runit/man/chpst.8,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- man/chpst.8 8 Mar 2004 12:36:49 -0000 1.4 -+++ man/chpst.8 27 Apr 2004 17:32:26 -0000 1.5 -@@ -10,6 +10,8 @@ - .IR user ] - [-e - .IR dir ] -+[\-/ -+.IR root ] - [-l|-L - .IR lock ] - [-m -@@ -96,6 +98,13 @@ - .I k - if it exists, without adding a new variable. - .TP -+.B \-/ \fIroot -+chroot. -+Change the root directory to -+.I root -+before starting -+.IR prog . -+.TP - .B \-l \fIlock - lock. - Open the file -@@ -153,15 +162,15 @@ - in a new process group. - .TP - .B \-0 --Close standard input before running -+Close standard input before starting - .IR prog . - .TP - .B \-1 --Close standard output before running -+Close standard output before starting - .IR prog . - .TP - .B \-2 --Close standard error before running -+Close standard error before starting - .IR prog . - .SH EXIT CODES - .B chpst -Index: doc/chpst.8.html -=================================================================== -RCS file: /var/lib/cvs/runit/doc/chpst.8.html,v -retrieving revision 1.4 -retrieving revision 1.5 -diff -u -r1.4 -r1.5 ---- doc/chpst.8.html 8 Mar 2004 12:36:49 -0000 1.4 -+++ doc/chpst.8.html 27 Apr 2004 17:32:26 -0000 1.5 -@@ -12,21 +12,21 @@ - chpst - runs a program with a changed process state - <h2><a name='sect1'>Synopsis</a></h2> - <b>chpst</b> [-vP012] --[-u <i>user</i>] [-U <i>user</i>] [-e <i>dir</i>] [-l|-L <i>lock</i>] [-m <i>bytes</i>] [-o <i>n</i>] [-p <i>n</i>] [-f <i>bytes</i>] [-c --<i>bytes</i>] <i>prog</i> -+[-u <i>user</i>] [-U <i>user</i>] [-e <i>dir</i>] [-/ <i>root</i>] [-l|-L <i>lock</i>] [-m <i>bytes</i>] [-o <i>n</i>] [-p <i>n</i>] [-f <i>bytes</i>] -+[-c <i>bytes</i>] <i>prog</i> - <h2><a name='sect2'>Description</a></h2> - <i>prog</i> consists of one or more arguments. <p> --<b>chpst</b> changes --the process state according to the given options, and runs <i>prog</i>. -+<b>chpst</b> -+changes the process state according to the given options, and runs <i>prog</i>. -+ - <h2><a name='sect3'>Options</a></h2> - - <dl> - --<dt><b>-u --<i>user[:group]</b> </i></dt> --<dd>setuidgid. Set uid and gid to the <i>user</i>’s uid and gid. If <i>user</i> --is followed by a colon and a <i>group</i>, set the gid to <i>group</i>’s gid instead of --<i>user</i>’s gid. All supplementary groups are removed. </dd> -+<dt><b>-u <i>user[:group]</b> </i></dt> -+<dd>setuidgid. Set uid and gid to the <i>user</i>’s uid and gid. -+If <i>user</i> is followed by a colon and a <i>group</i>, set the gid to <i>group</i>’s gid instead -+of <i>user</i>’s gid. All supplementary groups are removed. </dd> - - <dt><b>-U <i>user[:group]</b> </i></dt> - <dd>envuidgid. -@@ -43,69 +43,73 @@ - to newlines. If the file <i>k</i> is empty (0 bytes long), <b>chpst</b> removes the environment - variable <i>k</i> if it exists, without adding a new variable. </dd> - -+<dt><b>-/ <i>root</b> </i></dt> -+<dd>chroot. Change -+the root directory to <i>root</i> before starting <i>prog</i>. </dd> -+ - <dt><b>-l <i>lock</b> </i></dt> --<dd>lock. Open --the file <i>lock</i> for writing, and obtain an exclusive lock on it. <i>lock</i> will --be created if it does not exist. If <i>lock</i> is locked by another process, wait --until a new lock can be obtained. </dd> -+<dd>lock. Open the file -+<i>lock</i> for writing, and obtain an exclusive lock on it. <i>lock</i> will be created -+if it does not exist. If <i>lock</i> is locked by another process, wait until a -+new lock can be obtained. </dd> - - <dt><b>-L <i>lock</b> </i></dt> --<dd>The same as -l, but fail immediately --if <i>lock</i> is locked by another process. </dd> -+<dd>The same as -l, but fail immediately if -+<i>lock</i> is locked by another process. </dd> - - <dt><b>-m <i>bytes</b> </i></dt> --<dd>limit memory. Limit the data --segment, stack segment, locked physical pages, and total of all segment --per process to <i>bytes</i> bytes each. </dd> -+<dd>limit memory. Limit the data segment, -+stack segment, locked physical pages, and total of all segment per process -+to <i>bytes</i> bytes each. </dd> - - <dt><b>-o <i>n</b> </i></dt> --<dd>limit open files. Limit the number of --open file descriptors per process to <i>n</i>. </dd> -+<dd>limit open files. Limit the number of open file -+descriptors per process to <i>n</i>. </dd> - - <dt><b>-p <i>n</b> </i></dt> --<dd>limit processes. Limit the number --of processes per uid to <i>n</i>. </dd> -+<dd>limit processes. Limit the number of processes -+per uid to <i>n</i>. </dd> - - <dt><b>-f <i>bytes</b> </i></dt> --<dd>limit output size. Limit the output file --size to <i>bytes</i> bytes. </dd> -+<dd>limit output size. Limit the output file size to <i>bytes</i> -+bytes. </dd> - - <dt><b>-c <i>bytes</b> </i></dt> --<dd>limit core size. Limit the core file size to --<i>bytes</i> bytes. </dd> -+<dd>limit core size. Limit the core file size to <i>bytes</i> bytes. </dd> - --<dt><b>-v</b> </dt> --<dd>verbose. Print verbose messages to standard error. This includes --warnings about limits unsupported by the system. </dd> -+<dt><b>-v</b> -+</dt> -+<dd>verbose. Print verbose messages to standard error. This includes warnings -+about limits unsupported by the system. </dd> - - <dt><b>-P</b> </dt> --<dd>pgrphack. Run <i>prog</i> in --a new process group. </dd> -+<dd>pgrphack. Run <i>prog</i> in a new process -+group. </dd> - - <dt><b>-0</b> </dt> --<dd>Close standard input before running <i>prog</i>. </dd> -+<dd>Close standard input before starting <i>prog</i>. </dd> - - <dt><b>-1</b> </dt> --<dd>Close --standard output before running <i>prog</i>. </dd> -+<dd>Close standard output -+before starting <i>prog</i>. </dd> - - <dt><b>-2</b> </dt> --<dd>Close standard error before running --<i>prog</i>. </dd> -+<dd>Close standard error before starting <i>prog</i>. </dd> - </dl> - - <h2><a name='sect4'>Exit Codes</a></h2> --<b>chpst</b> exits 100 when called with wrong options. It prints --an error message and exits 111 if it has trouble changing the process state. --Otherwise its exit code is the same as that of <i>prog</i>. -+<b>chpst</b> -+exits 100 when called with wrong options. It prints an error message and -+exits 111 if it has trouble changing the process state. Otherwise its exit -+code is the same as that of <i>prog</i>. - <h2><a name='sect5'>Emulation</a></h2> --If <b>chpst</b> is --called as <i><b>envdir</b>(8)</i>, <i><b>envuidgid</b>(8)</i>, <i><b>pgrphack</b>(8)</i>, <i><b>setlock</b>(8)</i>, <i><b>setuidgid</b>(8)</i>, --or <i><b>softlimit</b>(8)</i>, it emulates the functionality of these programs from the --daemontools package respectively. -+If <b>chpst</b> is called as <i><b>envdir</b>(8)</i>, -+<i><b>envuidgid</b>(8)</i>, <i><b>pgrphack</b>(8)</i>, <i><b>setlock</b>(8)</i>, <i><b>setuidgid</b>(8)</i>, or <i><b>softlimit</b>(8)</i>, it -+emulates the functionality of these programs from the daemontools package -+respectively. - <h2><a name='sect6'>See Also</a></h2> --<i>runsv(8)</i>, <i>runsvctrl(8)</i>, <i>runsvstat(8)</i>, --<i>runsvdir(8)</i>, <i>setsid(2)</i> <p> -+<i>runsv(8)</i>, <i>runsvctrl(8)</i>, <i>runsvstat(8)</i>, <i>runsvdir(8)</i>, -+<i>setsid(2)</i> <p> - <i>http://smarden.org/runit/</i><br> - <i>http://cr.yp.to/daemontools.html</i><br> - -Index: doc/runscripts.html -=================================================================== -RCS file: /var/lib/cvs/runit/doc/runscripts.html,v -retrieving revision 1.20 -retrieving revision 1.21 -diff -u -r1.20 -r1.21 ---- doc/runscripts.html 29 Feb 2004 16:12:15 -0000 1.20 -+++ doc/runscripts.html 30 Apr 2004 18:42:29 -0000 1.21 -@@ -22,7 +22,7 @@ - Alessandro Bono, Robin S. Socha, Claus Alboege, Paul Jarc, clemens fischer, - Jesse Cablek, Lukas Beeler, Thomas Baden, Ralf Hildebrandt, Antonio Dias, - Erich Schubert, Lang Martin, Tomasz Nidecki, Marek Bartnikowski, --Thomas Schwinge. -+Thomas Schwinge, Gael Canal, Woon Wai Keen, Richard A Downing. - <hr> - <a href="#atftpd">atftpd</a><br> - <a href="#apache">apache</a><br> -@@ -30,19 +30,25 @@ - <a href="#bind9">bind9</a><br> - <a href="#boa">boa</a><br> - <a href="#cfengine">cfengine</a><br> -+<a href="#chrony">chrony</a><br> - <a href="#clamav">clamav</a><br> --<a href="#courier-imap">courier-imap</a></br> -+<a href="#courier-imap">courier-imap</a><br> - <a href="#cups">cups</a><br> - <a href="#dhclient">dhclient</a><br> - <a href="#dhcpcd">dhcpcd</a><br> - <a href="#dhcpd">dhcpd</a><br> -+<a href="#exim">exim</a><br> - <a href="#expireproctitle">expireproctitle</a><br> - <a href="#fam">fam</a><br> -+<a href="#fcron">fcron</a><br> - <a href="#gdm">gdm</a><br> - <a href="#getty">getty</a><br> -+<a href="#gpm">gpm</a><br> -+<a href="#hotwayd">hotwayd</a><br> - <a href="#identd">identd</a><br> - <a href="#inn">inn</a><br> - <a href="#jabberd">jabberd</a><br> -+<a href="#keepalived">keepalived</a><br> - <a href="#klogd">klogd</a><br> - <a href="#leafnode">leafnode</a><br> - <a href="#loglinuxkernel">logging Linux kernel messages</a><br> -@@ -54,6 +60,7 @@ - <a href="#polipo">polipo</a><br> - <a href="#pop3-ssl">pop3-ssl</a><br> - <a href="#pop3vscan">pop3vscan</a><br> -+<a href="#portmap">portmap</a><br> - <a href="#postgresql">postgresql</a><br> - <a href="#ppp">ppp</a><br> - <a href="#proftpd">proftpd</a><br> -@@ -68,6 +75,7 @@ - <a href="#sshdtcpserver">sshd under tcpserver</a><br> - <a href="#statd">statd</a>, <a href="#mountd">mountd</a><br> - <a href="#stunnel">stunnel</a><br> -+<a href="#swat">swat</a><br> - <a href="#taiclockd">taiclockd</a><br> - <a href="#tmda-ofmipd">tmda-ofmipd</a><br> - <a href="#tomcat">tomcat</a><br> -@@ -148,6 +156,17 @@ - -L -v -q exec sleep 3600 - </pre> - <hr> -+<h3><a name="chrony">A <tt>chrony</tt> run script</a></h3> -+(<i>LFS</i>) -+<pre> -+ #!/bin/sh -+ exec 2>&1 -+ exec /usr/sbin/chronyd -d -r -s -+</pre> -+This service needs a -+<a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a> -+to be set up. -+<hr> - <h3><a name="clamav">A <tt>clamd</tt> run script</a></h3> - (<i>RedHat 7</i>) - <pre> -@@ -177,7 +196,7 @@ - this page</a>. - <hr> - <h3><a name="cups">A <tt>cups</tt> run script</a></h3> --(<i>Debian woody</i>, a.bono) -+(<i>Debian woody</i>) - <pre> - #!/bin/sh - exec 2>&1 -@@ -230,6 +249,13 @@ - <a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a> - to be set up. - <hr> -+<h3><a name="exim">An <tt>exim</tt> run script</a></h3> -+(<i>Linux</i>, <i>FreeBSD</i>) -+<pre> -+ #!/bin/sh -+ exec /usr/local/sbin/exim -bdf -q30m -+</pre> -+<hr> - <h3><a name="expireproctitle"> - <tt>expireproctitle</tt> run script examples</a></h3> - (<i>Linux</i>) -@@ -250,8 +276,19 @@ - <a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a> - to be set up. - <hr> -+<h3><a name="fcron">A <tt>fcron</tt> run script</a></h3> -+(<i>LFS</i>) -+<pre> -+ #!/bin/sh -+ exec 2>&1 -+ exec /usr/sbin/fcron -f -y -+</pre> -+This service needs a -+<a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a> -+to be set up. -+<hr> - <h3><a name="gdm">A <tt>gdm</tt> run script</a></h3> --<i>(Debian woody)</i> -+(<i>Debian woody</i>) - <pre> - #!/bin/sh - exec gdm -nodaemon -@@ -273,6 +310,23 @@ - exec /sbin/agetty 38400 tty1 linux - </pre> - <hr> -+<h3><a name="gpm">A <tt>gpm</tt> run script</a></h3> -+(<i>LFS</i>) -+<pre> -+ #!/bin/sh -+ exec 2>&1 -+ . /etc/sysconfig/mouse -+ exec gpm -D -m $MDEVICE -t $PROTOCOL -+</pre> -+<hr> -+<h3><a name="hotwayd">A <tt>hotwayd</tt> run script</a></h3> -+(<i>LFS</i>) -+<pre> -+ #!/bin/sh -+ exec 2>,&1 -+ exec tcpsvd -l0 -u nobody 127.0.0.1 110 /usr/sbin/hotwayd -+</pre> -+<hr> - <h3><a name="identd">An <tt>oidentd</tt> run script</a></h3> - (<i>Linux</i>, oidentd version 2.0.6) - <pre> -@@ -329,6 +383,14 @@ - <a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a> - to be set up. - <hr> -+<h3><a name="keepalived">A <tt>keepalived</tt> run script</a></h3> -+(<i>Linux</i>) -+<pre> -+ #!/bin/sh -+ exec 2>&1 -+ exec keepalived -n -+</pre> -+<hr> - <h3><a name="klogd">A <tt>klogd</tt> run script</a></h3> - (<i>Debian woody</i>) - <pre> -@@ -383,6 +445,12 @@ - --socket=/tmp/mysql.sock \ - --pid-file=/pack/mysql/data/mysql.pid 2>&1 - </pre> -+(<i>LFS</i>) -+<pre> -+ #!/bin/sh -+ exec 2>&1 -+ exec /usr/sbin/mysqld -u mysql -+</pre> - (<i>Debian</i>, ``It's an ugly hack, but it works'') - <pre> - #!/bin/sh -@@ -442,6 +510,14 @@ - <a href="http://cr.yp.to/daemontools/faq/create.html#runlog">log service</a> - to be set up. - <hr> -+<h3><a name="portmap">A <tt>portmap</tt> run script</a></h3> -+(<i>LFS</i>) -+<pre> -+ #!/bin/sh -+ exec 2>&1 -+ exec /sbin/portmap -d -+</pre> -+<hr> - <h3><a name="postgresql">A <tt>postgresql</tt> run script</a></h3> - (<i>SunOS</i>) - <pre> -@@ -479,7 +555,7 @@ - to be set up. - <hr> - <h3><a name="pure-ftpd">A <tt>pure-ftpd</tt> run script</a></h3> --(<i>Debian woody</i>, a.bono) -+(<i>Debian woody</i>) - <pre> - #!/bin/sh - exec 2>&1 -@@ -636,6 +712,13 @@ - exec /usr/local/sbin/stunnel -f -d 1234 -r 25 -v3 -a /etc/ssl/mailcerts 2>&1 - </pre> - <hr> -+<h3><a name="swat">A <tt>swat</tt> run script</a></h3> -+<pre> -+ #!/bin/sh -+ exec 2>&1 -+ exec tcpsvd -l0 127.0.0.1 901 /usr/sbin/swat -+</pre> -+<hr> - <h3><a name="taiclockd">A <tt>taiclockd</tt> run script</a></h3> - <pre> - #!/bin/sh -@@ -699,6 +782,6 @@ - <address><a href="mailto:pape-runscripts@smarden.org"> - Gerrit Pape <pape@smarden.org> - </a></address> --<small>$Id$</small> -+<small>$Id$</small> - </body> - </html> diff --git a/debian/rules b/debian/rules index 8e04586..ecb80e9 100755 --- a/debian/rules +++ b/debian/rules @@ -1,34 +1,15 @@ #!/usr/bin/make -f -DEB_HOST_ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH) - CFLAGS =-O2 -Wall -LDFLAGS =-s -Os -pipe +LDFLAGS =-Os -pipe CC =diet -v -Os gcc STRIP =strip -ifneq ($(DEB_HOST_ARCH),alpha) -ifneq ($(DEB_HOST_ARCH),amd64) -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),s390) -ifneq ($(DEB_HOST_ARCH),sparc) +DIET_ARCHS =alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc +ARCH ?=$(shell dpkg-architecture -qDEB_HOST_ARCH) +ifneq (,$(findstring $(ARCH),$(DIET_ARCHS))) CC =gcc -endif -endif -endif -endif -endif -endif -endif -endif -endif -endif + CFLAGS =-Wall endif ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) @@ -42,9 +23,8 @@ DIR =`pwd`/debian/runit unpack: deb-checkdir unpack-stamp unpack-stamp: - tar xzf runit-1.0.2.tar.gz - ln -s runit-1.0.2 admin/runit - (cd admin/runit && patch -p0) <debian/diff/chpst-chroot.diff + 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 touch unpack-stamp diff --git a/doc/install.html b/doc/install.html index 1f8ee2d..21bda26 100644 --- a/doc/install.html +++ b/doc/install.html @@ -17,14 +17,14 @@ If you don't have a <tt>/package</tt> directory, create it now: # chmod 1755 /package </pre> Download -<a href="runit-1.0.2.tar.gz">runit-1.0.2.tar.gz</a> into <tt>/package</tt> +<a href="runit-1.0.3.tar.gz">runit-1.0.3.tar.gz</a> into <tt>/package</tt> and unpack the archive <pre> # cd /package - # gunzip runit-1.0.2.tar - # tar -xpf runit-1.0.2.tar - # rm runit-1.0.2.tar - # cd admin/runit-1.0.2 + # gunzip runit-1.0.3.tar + # tar -xpf runit-1.0.3.tar + # rm runit-1.0.3.tar + # cd admin/runit-1.0.3 </pre> On MacOSX, do <pre> @@ -43,7 +43,7 @@ hierarchy, do: </pre> To report success: <pre> - # mail pape-runit-1.0.2@smarden.org <compile/sysdeps + # mail pape-runit-1.0.3@smarden.org <compile/sysdeps </pre> If you use <i>runit</i> regularly, please <a href="http://smarden.org/pape/#contribution">contribute</a> to the project. diff --git a/doc/replaceinit.html b/doc/replaceinit.html index 630e8ab..08166c1 100644 --- a/doc/replaceinit.html +++ b/doc/replaceinit.html @@ -117,7 +117,7 @@ default Unix process no 1 <i>runit</i>. </pre> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.0.2@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.0.3@smarden.org </pre> <hr> @@ -206,7 +206,7 @@ This will cause <i>runit</i> to enter stage 3 which runs <p> To report success: <pre> - # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-1.0.2@smarden.org + # ( uname -a ; cat /etc/runit/[123] ) | mail pape-runit-1.0.3@smarden.org </pre> <h3>Step 5: Service migration</h3> The goal is to migrate all services from <i>/etc/rc.*</i> scheme to the diff --git a/doc/upgrade.html b/doc/upgrade.html index 38c5b80..90c7d3a 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -9,7 +9,7 @@ <hr> <h1>runit - upgrading from previous versions</h1> <hr> -<h3>0.13.0 or 0.13.1 to 1.0.1 or 1.0.2</h3> +<h3>0.13.0 or 0.13.1 to 1.0.x</h3> No further action from you is required. <h3>0.12.0 or 0.12.1 to 0.13.0 or 0.13.1</h3> runit's service logging daemon <a href="svlogd.8.html">svlogd</a> now can diff --git a/package/upgrade b/package/upgrade index 5989436..bc9ba2e 100755 --- a/package/upgrade +++ b/package/upgrade @@ -7,9 +7,9 @@ test -d src || ( echo 'Wrong working directory.'; exit 1 ) || exit 1 here=`env - PATH=$PATH pwd` parent=`dirname $here` -echo 'Creating symlink runit -> runit-1.0.2...' +echo 'Creating symlink runit -> runit-1.0.3...' rm -f runit -ln -s runit-1.0.2 runit +ln -s runit-1.0.3 runit mv -f runit .. echo 'Making command links in /command...' diff --git a/package/versions b/package/versions index 0449448..85afd76 100644 --- a/package/versions +++ b/package/versions @@ -26,3 +26,4 @@ 1.0.0 1.0.1 1.0.2 +1.0.3 |