From a9f3c9b7a66ffea6484d4133ff802d5e2da8f01c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Fri, 20 Nov 2009 14:04:42 +0000 Subject: testing/daemontools: new aport fixes #205 --- testing/daemontools/0.76-errno.patch | 11 +++++ testing/daemontools/0.76-warnings.patch | 74 +++++++++++++++++++++++++++++++++ testing/daemontools/APKBUILD | 48 +++++++++++++++++++++ testing/daemontools/svscan.initd | 33 +++++++++++++++ 4 files changed, 166 insertions(+) create mode 100644 testing/daemontools/0.76-errno.patch create mode 100644 testing/daemontools/0.76-warnings.patch create mode 100644 testing/daemontools/APKBUILD create mode 100644 testing/daemontools/svscan.initd (limited to 'testing') diff --git a/testing/daemontools/0.76-errno.patch b/testing/daemontools/0.76-errno.patch new file mode 100644 index 0000000000..3af157c462 --- /dev/null +++ b/testing/daemontools/0.76-errno.patch @@ -0,0 +1,11 @@ +--- src/error.h 2001-07-12 11:49:49.000000000 -0500 ++++ src/error.h 2003-02-26 02:14:06.000000000 -0600 +@@ -3,7 +3,7 @@ + #ifndef ERROR_H + #define ERROR_H + +-extern int errno; ++#include + + extern int error_intr; + extern int error_nomem; diff --git a/testing/daemontools/0.76-warnings.patch b/testing/daemontools/0.76-warnings.patch new file mode 100644 index 0000000000..f558bb18b1 --- /dev/null +++ b/testing/daemontools/0.76-warnings.patch @@ -0,0 +1,74 @@ +Fixup misc warnings + +Patch by RiverRat + +http://bugs.gentoo.org/124487 + +--- src/chkshsgr.c ++++ src/chkshsgr.c +@@ -1,10 +1,13 @@ + /* Public domain. */ + ++#include ++#include ++#include + #include + + int main() + { +- short x[4]; ++ gid_t x[4]; + + x[0] = x[1] = 0; + if (getgroups(1,x) == 0) if (setgroups(1,x) == -1) _exit(1); +--- src/matchtest.c ++++ src/matchtest.c +@@ -1,3 +1,4 @@ ++#include + #include "match.h" + #include "buffer.h" + #include "str.h" +--- src/multilog.c ++++ src/multilog.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include +--- src/prot.c ++++ src/prot.c +@@ -1,5 +1,8 @@ + /* Public domain. */ + ++#include ++#include ++#include + #include "hasshsgr.h" + #include "prot.h" + +--- src/seek_set.c ++++ src/seek_set.c +@@ -1,6 +1,7 @@ + /* Public domain. */ + + #include ++#include + #include "seek.h" + + #define SET 0 /* sigh */ +--- src/supervise.c ++++ src/supervise.c +@@ -1,3 +1,4 @@ ++#include + #include + #include + #include +--- src/pathexec_run.c ++++ src/pathexec_run.c +@@ -1,5 +1,6 @@ + /* Public domain. */ + ++#include + #include "error.h" + #include "stralloc.h" + #include "str.h" diff --git a/testing/daemontools/APKBUILD b/testing/daemontools/APKBUILD new file mode 100644 index 0000000000..f4920a24d6 --- /dev/null +++ b/testing/daemontools/APKBUILD @@ -0,0 +1,48 @@ +# Maintainer: Natanael Copa +pkgname=daemontools +pkgver=0.76 +pkgrel=0 +pkgdesc="Collection of tools for managing UNIX services" +url="http://cr.yp.to/daemontools.html" +license="public-domain" +depends= +# The makefile need GNU cat for 'cat -v' +makedepends="coreutils" + +source="http://cr.yp.to/daemontools/$pkgname-$pkgver.tar.gz + 0.76-errno.patch + 0.76-warnings.patch + svscan.initd + " + +_builddir="$srcdir"/admin/$pkgname-$pkgver/src + +prepare() { + cd "$_builddir" + for i in "$srcdir"/*.patch; do + msg "Applying $i" + patch -p1 -i $i || return 1 + done +} + +build() { + cd "$_builddir" + echo "${CC:-"gcc"} ${CFLAGS}" > conf-cc + echo "${CC:-"gcc"} ${LDFLAGS}" > conf-ld + touch > home + make || return 1 +} + +package() { + cd "$_builddir" + mkdir -p "$pkgdir"/usr/bin "$pkgdir"/service + for f in $(cat ../package/commands); do + cp $f "$pkgdir"/usr/bin/$f + done + install -Dm755 "$srcdir"/svscan.initd "$pkgdir"/etc/init.d/svscan +} + +md5sums="1871af2453d6e464034968a0fbcb2bfc daemontools-0.76.tar.gz +c75438b1c3b9d9f67691bd10cf3c8e52 0.76-errno.patch +ad68177f50bfffb6a1cbf8c668de6a55 0.76-warnings.patch +c6e4ace205400be062d3ba82315cbcd1 svscan.initd" diff --git a/testing/daemontools/svscan.initd b/testing/daemontools/svscan.initd new file mode 100644 index 0000000000..bf7af28fa4 --- /dev/null +++ b/testing/daemontools/svscan.initd @@ -0,0 +1,33 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/daemontools/files/svscan.init-0.76-r7,v 1.1 2008/12/07 06:59:37 robbat2 Exp $ + +depend() { + use net + before ntpd ntp-client spamd apache apache2 + after firewall +} + +start() { + ebegin "Starting service scan" + setsid start-stop-daemon --start --exec /usr/bin/svscan \ + --background --make-pidfile \ + --pidfile /var/run/svscan.pid -- /service + eend $? +} + +stop() { + ebegin "Stopping service scan" + start-stop-daemon --stop --exec /usr/bin/svscan \ + --pidfile /var/run/svscan.pid + eend $? + + ebegin "Stopping service scan services" + svc -dx /service/* 2>/dev/null + eend $? + + ebegin "Stopping service scan logging" + svc -dx /service/*/log 2>/dev/null + eend $? +} -- cgit v1.2.3