From dbcf0c5db23592c947efda19ced710a1c8b462ce Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@geeks.cl>
Date: Tue, 20 Jan 2004 22:59:55 +0000
Subject: [PATCH] Alejandro Mery: updated and cleaned runit (0.13.0) and added
 more init scripts

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2249 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/mnemoc/runit/config-djb.in            |  4 ++--
 package/mnemoc/runit/packages/apache-run.txt  |  3 +++
 .../runit/packages/cron-runit-cron_run.txt    |  2 +-
 .../runit/packages/dhcp-dhcpd_log_run.txt     |  5 ++++
 .../mnemoc/runit/packages/dhcp-dhcpd_run.txt  |  4 ++++
 package/mnemoc/runit/packages/openssh-run.txt |  2 +-
 .../runit/packages/samba-nmbd_log_run.txt     |  5 ++++
 .../mnemoc/runit/packages/samba-nmbd_run.txt  |  4 ++++
 .../runit/packages/samba-smbd_log_run.txt     |  5 ++++
 .../mnemoc/runit/packages/samba-smbd_run.txt  |  4 ++++
 .../packages/sysklogd-runit-klogd_run.txt     |  2 +-
 .../packages/sysklogd-runit-syslogd_run.txt   |  2 +-
 package/mnemoc/runit/parse-config             | 23 +++++++++----------
 package/mnemoc/runit/rockify.patch            | 13 ++++++++---
 package/mnemoc/runit/runit.conf               |  9 +++++++-
 package/mnemoc/runit/runit.desc               |  4 ++--
 16 files changed, 67 insertions(+), 24 deletions(-)
 create mode 100644 package/mnemoc/runit/packages/apache-run.txt
 create mode 100644 package/mnemoc/runit/packages/dhcp-dhcpd_log_run.txt
 create mode 100644 package/mnemoc/runit/packages/dhcp-dhcpd_run.txt
 create mode 100644 package/mnemoc/runit/packages/samba-nmbd_log_run.txt
 create mode 100644 package/mnemoc/runit/packages/samba-nmbd_run.txt
 create mode 100644 package/mnemoc/runit/packages/samba-smbd_log_run.txt
 create mode 100644 package/mnemoc/runit/packages/samba-smbd_run.txt

diff --git a/package/mnemoc/runit/config-djb.in b/package/mnemoc/runit/config-djb.in
index d2a745e38..80a5d25b7 100644
--- a/package/mnemoc/runit/config-djb.in
+++ b/package/mnemoc/runit/config-djb.in
@@ -20,8 +20,8 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-if pkgcheck runit X || pkgcheck daemontools X; then
-menu_begin MENU_DJB 'Package Options - D.J. Bernsteinīs software and -like'
+if pkgcheck "runit|daemontools" X; then
+menu_begin MENU_DJB 'Package Options - D.J. Bernstein`s software and -like'
 	bool 'Use /package, /command and /service directories' ROCKCFG_PKG_DJB_LAYOUT 1
 menu_end
 fi
diff --git a/package/mnemoc/runit/packages/apache-run.txt b/package/mnemoc/runit/packages/apache-run.txt
new file mode 100644
index 000000000..1b29614ea
--- /dev/null
+++ b/package/mnemoc/runit/packages/apache-run.txt
@@ -0,0 +1,3 @@
+#!/bin/sh
+echo 2>&1
+exec D_sbindir/httpd -DNO_DETACH
diff --git a/package/mnemoc/runit/packages/cron-runit-cron_run.txt b/package/mnemoc/runit/packages/cron-runit-cron_run.txt
index 57a77b901..45f6c2eca 100644
--- a/package/mnemoc/runit/packages/cron-runit-cron_run.txt
+++ b/package/mnemoc/runit/packages/cron-runit-cron_run.txt
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec /usr/sbin/cron -f
+exec D_sbindir/cron -f
diff --git a/package/mnemoc/runit/packages/dhcp-dhcpd_log_run.txt b/package/mnemoc/runit/packages/dhcp-dhcpd_log_run.txt
new file mode 100644
index 000000000..de54117a9
--- /dev/null
+++ b/package/mnemoc/runit/packages/dhcp-dhcpd_log_run.txt
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+
+mkdir -p main
+exec svlogd -t main
diff --git a/package/mnemoc/runit/packages/dhcp-dhcpd_run.txt b/package/mnemoc/runit/packages/dhcp-dhcpd_run.txt
new file mode 100644
index 000000000..b10f84313
--- /dev/null
+++ b/package/mnemoc/runit/packages/dhcp-dhcpd_run.txt
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+
+exec D_sbindir/dhcpd -f -cf D_sysconfdir/dhcpd.conf
diff --git a/package/mnemoc/runit/packages/openssh-run.txt b/package/mnemoc/runit/packages/openssh-run.txt
index 23395cdee..62fda47d9 100644
--- a/package/mnemoc/runit/packages/openssh-run.txt
+++ b/package/mnemoc/runit/packages/openssh-run.txt
@@ -1,4 +1,4 @@
 #!/bin/sh
 exec 2>&1
 
-exec /usr/sbin/sshd -De
+exec D_sbindir/sshd -De
diff --git a/package/mnemoc/runit/packages/samba-nmbd_log_run.txt b/package/mnemoc/runit/packages/samba-nmbd_log_run.txt
new file mode 100644
index 000000000..de54117a9
--- /dev/null
+++ b/package/mnemoc/runit/packages/samba-nmbd_log_run.txt
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+
+mkdir -p main
+exec svlogd -t main
diff --git a/package/mnemoc/runit/packages/samba-nmbd_run.txt b/package/mnemoc/runit/packages/samba-nmbd_run.txt
new file mode 100644
index 000000000..de7fb3585
--- /dev/null
+++ b/package/mnemoc/runit/packages/samba-nmbd_run.txt
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+
+exec D_sbindir/nmbd -D -F -S
diff --git a/package/mnemoc/runit/packages/samba-smbd_log_run.txt b/package/mnemoc/runit/packages/samba-smbd_log_run.txt
new file mode 100644
index 000000000..de54117a9
--- /dev/null
+++ b/package/mnemoc/runit/packages/samba-smbd_log_run.txt
@@ -0,0 +1,5 @@
+#!/bin/sh
+exec 2>&1
+
+mkdir -p main
+exec svlogd -t main
diff --git a/package/mnemoc/runit/packages/samba-smbd_run.txt b/package/mnemoc/runit/packages/samba-smbd_run.txt
new file mode 100644
index 000000000..a666e4783
--- /dev/null
+++ b/package/mnemoc/runit/packages/samba-smbd_run.txt
@@ -0,0 +1,4 @@
+#!/bin/sh
+exec 2>&1
+
+exec D_sbindir/smbd -D -F -S
diff --git a/package/mnemoc/runit/packages/sysklogd-runit-klogd_run.txt b/package/mnemoc/runit/packages/sysklogd-runit-klogd_run.txt
index a9df0f2ae..bb0241ec7 100644
--- a/package/mnemoc/runit/packages/sysklogd-runit-klogd_run.txt
+++ b/package/mnemoc/runit/packages/sysklogd-runit-klogd_run.txt
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec chpst -Unobody /usr/sbin/klogd -n 
+exec chpst -Unobody D_sbindir/klogd -n 
diff --git a/package/mnemoc/runit/packages/sysklogd-runit-syslogd_run.txt b/package/mnemoc/runit/packages/sysklogd-runit-syslogd_run.txt
index cad5af2c0..4e563ebcd 100644
--- a/package/mnemoc/runit/packages/sysklogd-runit-syslogd_run.txt
+++ b/package/mnemoc/runit/packages/sysklogd-runit-syslogd_run.txt
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec chpst -Unobody /usr/sbin/syslogd -n 
+exec chpst -Unobody D_sbindir/syslogd -n 
diff --git a/package/mnemoc/runit/parse-config b/package/mnemoc/runit/parse-config
index 68d4a8281..5216d0bfa 100644
--- a/package/mnemoc/runit/parse-config
+++ b/package/mnemoc/runit/parse-config
@@ -36,9 +36,9 @@ if [ "$ROCKCFG_PKG_DJB_LAYOUT" == "1" ]; then
 		chmod 1755 $xroot/package'
 	fi
 elif [ "$ROCKCFG_PKG_DJB_LAYOUT" == "0" ]; then
-	mkdir -p $xroot/etc/service	
+	mkdir -p $xroot/var/service	
 	if [ "$pkg" == "runit" ]; then
-		hook_add premake 1 'add_flist $xroot/etc/service'
+		hook_add premake 1 'add_flist $xroot/var/service'
 	fi
 fi
 
@@ -47,18 +47,17 @@ fi
 #
 if pkgcheck runit X; then
 	runitconfdir=$base/package/mnemoc/runit
-	for x in `ls $runitconfdir/packages/$pkg-*.txt 2> /dev/null`; do
-		y=${x##*/}; y=${y#$pkg-}; y=${y%.txt}; y=${y//_/\/}
-		echo_status "Seting to install ${x##*/}"
+	for x in $( cd $runitconfdir/packages; ls -1 $pkg-*.txt 2> /dev/null ); do
+		y=${x#$pkg-}; y=${y%.txt}; y=${y//_/\/}
 		if [ "${y#runit-}" != "$y" ]; then
-			y=${y#runit-}
-			hook_add postmake 8 "mkdir -p $root/etc/runit/${y%/*}; \
-				cp -fv $x $root/etc/runit/$y; \
-				chmod 744 $root/etc/runit/$y;"
+			y=\$root/etc/runit/${y#runit-}
 		else
-			hook_add postmake 8 "mkdir -p $sysconfdir/${y%/*}; \
-				cp -fv $x $sysconfdir/$y; \
-				chmod 744 $sysconfdir/$y;"
+			y=\$sysconfdir/$y
 		fi
+		echo_status "runit: Setting to install $x as $y"
+		hook_add postmake 8 "mkdir -p ${y%/*}; \
+			rock_substitute $runitconfdir/packages/$x > $y; \
+			chmod 744 $y;"
 	done
+	unset runitconfdir
 fi
diff --git a/package/mnemoc/runit/rockify.patch b/package/mnemoc/runit/rockify.patch
index 613bd8a88..f28456e45 100644
--- a/package/mnemoc/runit/rockify.patch
+++ b/package/mnemoc/runit/rockify.patch
@@ -24,18 +24,25 @@ we need to export vars to be read inside init.d/system
 currently we simulate sysv's stage 2
   Alejandro
 
---- ./doc/debian/1.orig	2003-10-29 18:28:27.000000000 +0000
-+++ ./doc/debian/1	2003-11-11 02:43:07.000000000 +0000
-@@ -1,10 +1,9 @@
+--- ./etc/debian/1.orig	2003-11-18 12:47:03.000000000 -0300
++++ ./etc/debian/1	2003-12-07 10:28:44.000000000 -0300
+@@ -1,10 +1,16 @@
  #!/bin/sh
  # system one time tasks
  
 -PATH=/command:/sbin:/bin:/usr/sbin:/usr/bin
++{
 +export PATH=/command:/sbin:/bin:/usr/sbin:/usr/bin
  
 -/etc/init.d/rcS
 -/etc/init.d/rmnologin
 +/etc/rc.d/init.d/system start
++#/etc/rc.d/init.d/network start
++
++# write ET mark for btee
++echo -ne '\004'
++
++} 2>&1 | /sbin/btee a /var/log/init.msg
  
  touch /etc/runit/stopit
  chmod 0 /etc/runit/stopit
diff --git a/package/mnemoc/runit/runit.conf b/package/mnemoc/runit/runit.conf
index 4034d6f23..46d8d6925 100644
--- a/package/mnemoc/runit/runit.conf
+++ b/package/mnemoc/runit/runit.conf
@@ -89,7 +89,14 @@ EOT
 		cp -vf ${pkg_djb_commanddir}/runit* $sbindir/
 	fi
 
-
+	# Emulate daemontools if not present
+	if ! pckgcheck daemontools X; then
+		echo "Emulate functionality of daemontools with chpst."
+		for x in softlimit envdir envuidgid pgrphack setlock setuidgid; 
+		do
+			ln -sfv chpst $pkg_djb_commanddir/$x
+		done
+	fi
 	}
 
 pkg_runit_doc() {
diff --git a/package/mnemoc/runit/runit.desc b/package/mnemoc/runit/runit.desc
index 39fbb552b..f522637c6 100644
--- a/package/mnemoc/runit/runit.desc
+++ b/package/mnemoc/runit/runit.desc
@@ -40,10 +40,10 @@
 
 [L] OpenSource
 [S] Stable
-[V] 0.12.1
+[V] 0.13.0
 [P] O -1---5---9 700.000
 
 [CV-URL] http://smarden.org/runit/install.html
 
-[D] 2427812240 runit-0.12.1.tar.gz http://smarden.org/runit/
+[D] 3242474056 runit-0.13.0.tar.gz http://smarden.org/runit/