Version bump.

Package-Manager: portage-2.1-r1

9 files changed, 152 insertions, 10 deletions

diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 1b76f5385520..cd086745f88b 100644
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/watchdog
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.11 2006/06/10 09:24:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.12 2006/06/25 10:50:21 brix Exp $
+
+*watchdog-5.2.6_p1 (25 Jun 2006)
+
+  25 Jun 2006; Henrik Brix Andersen <brix@gentoo.org>
+  +files/watchdog-5.2.6_p1-conf.d, +files/watchdog-5.2.6_p1-init.d,
+  +files/watchdog-5.2.6_p1-sundries.patch,
+  +files/watchdog-5.2.6_p1-uclibc.patch, +watchdog-5.2.6_p1.ebuild:
+  Version bump.
 
   10 Jun 2006; Michael Hanselmann <hansmi@gentoo.org>
   watchdog-5.2.5_p1.ebuild:
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index d89fce750989..e61536497855 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -30,10 +30,28 @@ AUX watchdog-5.2.5_p1-uclibc.patch 312 RMD160 27a24b71fd10666a1755c871c28a9dc100
 MD5 e3a3640b31e70f2956ed8ed4bb39f04a files/watchdog-5.2.5_p1-uclibc.patch 312
 RMD160 27a24b71fd10666a1755c871c28a9dc100db0128 files/watchdog-5.2.5_p1-uclibc.patch 312
 SHA256 dcf03faed25fd193b74b5b95e605ce0220409ff59d8ffc6a6d8ee5f5531f2f31 files/watchdog-5.2.5_p1-uclibc.patch 312
+AUX watchdog-5.2.6_p1-conf.d 279 RMD160 3fde79604e5b10dee2be03c7e29c8617c8e538ed SHA1 f47ffdf62153a2c5591301adc13f6aa990b7a4a5 SHA256 5f49ca36b91f2f578116e4ff1f716a68a177131deb80b91dc67f2cff3f85274c
+MD5 fbd3c33d95f4e12a5c171bbbd3f5d85d files/watchdog-5.2.6_p1-conf.d 279
+RMD160 3fde79604e5b10dee2be03c7e29c8617c8e538ed files/watchdog-5.2.6_p1-conf.d 279
+SHA256 5f49ca36b91f2f578116e4ff1f716a68a177131deb80b91dc67f2cff3f85274c files/watchdog-5.2.6_p1-conf.d 279
+AUX watchdog-5.2.6_p1-init.d 547 RMD160 1927ae90554a671c8e3470255f78d8b62f99d5af SHA1 974eb07dd76f2d831a10a2fd6b4dcf19dd0ed8c5 SHA256 6b85b4c4cc2e8c4fcbb76b803ac736e067d573a3ce904be8447546cef86fc6b4
+MD5 3489cdc686ef6c079d664057026d5ecf files/watchdog-5.2.6_p1-init.d 547
+RMD160 1927ae90554a671c8e3470255f78d8b62f99d5af files/watchdog-5.2.6_p1-init.d 547
+SHA256 6b85b4c4cc2e8c4fcbb76b803ac736e067d573a3ce904be8447546cef86fc6b4 files/watchdog-5.2.6_p1-init.d 547
+AUX watchdog-5.2.6_p1-sundries.patch 752 RMD160 1506a9ffd0476aca6b8fe4f848fd72483857951f SHA1 a71f6db59e4f931d4ac18489fe35b99c9fa4f9b0 SHA256 c95e6fb0329c92ea5e20daa632028d50e94dd3804701597f64a8df688db9c467
+MD5 ba2c02768a2e772c14e6332dd6b2e65e files/watchdog-5.2.6_p1-sundries.patch 752
+RMD160 1506a9ffd0476aca6b8fe4f848fd72483857951f files/watchdog-5.2.6_p1-sundries.patch 752
+SHA256 c95e6fb0329c92ea5e20daa632028d50e94dd3804701597f64a8df688db9c467 files/watchdog-5.2.6_p1-sundries.patch 752
+AUX watchdog-5.2.6_p1-uclibc.patch 312 RMD160 27a24b71fd10666a1755c871c28a9dc100db0128 SHA1 d23e15cc83b16c38b404920916be28c3691be82a SHA256 dcf03faed25fd193b74b5b95e605ce0220409ff59d8ffc6a6d8ee5f5531f2f31
+MD5 e3a3640b31e70f2956ed8ed4bb39f04a files/watchdog-5.2.6_p1-uclibc.patch 312
+RMD160 27a24b71fd10666a1755c871c28a9dc100db0128 files/watchdog-5.2.6_p1-uclibc.patch 312
+SHA256 dcf03faed25fd193b74b5b95e605ce0220409ff59d8ffc6a6d8ee5f5531f2f31 files/watchdog-5.2.6_p1-uclibc.patch 312
 DIST watchdog_5.2.4-5.diff.gz 14854
 DIST watchdog_5.2.4.orig.tar.gz 127791
-DIST watchdog_5.2.5-1.diff.gz 8240
-DIST watchdog_5.2.5.orig.tar.gz 128599
+DIST watchdog_5.2.5-1.diff.gz 8240 RMD160 89da831a61ee68c84615749f5dfe1a36b512faef SHA1 e4120a163f03ab014ac75cf990f7b0d658253cb3 SHA256 2861c5239ac75534dcd61ee5b4de04271bc583f77c79b7591ecd87efc0599da6
+DIST watchdog_5.2.5.orig.tar.gz 128599 RMD160 168284e7e75f93422ddbc91227362613f2ed1fb4 SHA1 76e8ea7d82770ac0d03f8c6fa2ad8ecc618bceb5 SHA256 848835daa60ef1874e753571d9becf8806ac116f5fd1564da10f62224f8cf84f
+DIST watchdog_5.2.6-1.diff.gz 752 RMD160 17379b4e9f94741d642b0ee5258163d710d1f702 SHA1 91fd716630b82f8af50a542241a56ab8322480bb SHA256 d31953eedc83dcb39982bd6579ba001af587192627cccdc35674c56873eb7a51
+DIST watchdog_5.2.6.orig.tar.gz 138446 RMD160 accd68437bb986583f02ec9fe7af0c996a7dcaaf SHA1 c8b1c1199152f6cae4b3a4dea7e2132b9418d22e SHA256 84f08d17eebb052e165ce69cf4bbf86ff3da8ec2c3f078391a6d999f90b66baf
 EBUILD watchdog-5.2.4_p5.ebuild 1469 RMD160 cbc91d846d60a12cec1029a966d7126105d1779a SHA1 b8dcaeb47dbc571865441d1260ce0d035799e20b SHA256 5fcfba59645e36fb117a8059ed4e164578aacd57b9ba8dd5f3cef49cf0f965c7
 MD5 2d89608080fd1e9229cc30b2f409a2d7 watchdog-5.2.4_p5.ebuild 1469
 RMD160 cbc91d846d60a12cec1029a966d7126105d1779a watchdog-5.2.4_p5.ebuild 1469
@@ -42,10 +60,14 @@ EBUILD watchdog-5.2.5_p1.ebuild 1041 RMD160 d4b75e6abdb60b7dde7e1b92b76ed4f85a41
 MD5 93e438de2e297239a881c653eaa5becc watchdog-5.2.5_p1.ebuild 1041
 RMD160 d4b75e6abdb60b7dde7e1b92b76ed4f85a416cba watchdog-5.2.5_p1.ebuild 1041
 SHA256 0e8cc5b39fdbe89db2cc0ba2dc61673d2438d6d01b1bbbea152ac95d3ffa9029 watchdog-5.2.5_p1.ebuild 1041
-MISC ChangeLog 3402 RMD160 9e226dc39194472289141939c726ab1283b871f1 SHA1 57c2688d58ff8622c13aca6771efcc38a3cb0d5d SHA256 356f0ddaaac702b963e6eeab9e3a21cc8c0ecee3431239f2600ffa172d7c98f9
-MD5 9a91e4d93b4da90399c8b77c8a215859 ChangeLog 3402
-RMD160 9e226dc39194472289141939c726ab1283b871f1 ChangeLog 3402
-SHA256 356f0ddaaac702b963e6eeab9e3a21cc8c0ecee3431239f2600ffa172d7c98f9 ChangeLog 3402
+EBUILD watchdog-5.2.6_p1.ebuild 1041 RMD160 07839eac8e02222e0c92088a8aa224463c1afa14 SHA1 ea909a7734de6c57da8c51e067f38a58bd440c4b SHA256 ed6327a18a1f40fe4bebf450413531249c364269524236cf7ec07b32f851ef00
+MD5 d6f2ce5d7ec5f0ea226862cd2faee2b3 watchdog-5.2.6_p1.ebuild 1041
+RMD160 07839eac8e02222e0c92088a8aa224463c1afa14 watchdog-5.2.6_p1.ebuild 1041
+SHA256 ed6327a18a1f40fe4bebf450413531249c364269524236cf7ec07b32f851ef00 watchdog-5.2.6_p1.ebuild 1041
+MISC ChangeLog 3684 RMD160 d69a3dc4540b105a191d4acd5d7b84eb0336a639 SHA1 ae27ef37a532239f05e428507a07ed34af376bc9 SHA256 f0f56598cf8860be2b21d9461a60258b817866c107d97e468a485a1d5b6a4e6f
+MD5 123310a2d9221ed8177e70718163f47c ChangeLog 3684
+RMD160 d69a3dc4540b105a191d4acd5d7b84eb0336a639 ChangeLog 3684
+SHA256 f0f56598cf8860be2b21d9461a60258b817866c107d97e468a485a1d5b6a4e6f ChangeLog 3684
 MISC metadata.xml 219 RMD160 16d74fdb25e2623dc09d2485439af2f31ae16474 SHA1 417c58fc0d3f5a4f963540bb8818d563d044d1fb SHA256 e8496e2cfc92dd16ff14d0d990417d956f4b50901e4957214b4cefd945859e07
 MD5 c58db060ae5f8ffd1d141930b0c7c02c metadata.xml 219
 RMD160 16d74fdb25e2623dc09d2485439af2f31ae16474 metadata.xml 219
@@ -53,6 +75,9 @@ SHA256 e8496e2cfc92dd16ff14d0d990417d956f4b50901e4957214b4cefd945859e07 metadata
 MD5 287794d799d9743d47a4cdcaea6eadb1 files/digest-watchdog-5.2.4_p5 139
 RMD160 42488e8a6b5fe8f491bf626260fce6cb2588d7b0 files/digest-watchdog-5.2.4_p5 139
 SHA256 77881be659e2dd9f6773845f5677478b8bb753ca2914c716aa33436e7ebeb515 files/digest-watchdog-5.2.4_p5 139
-MD5 6ad7ba12ce51412cb95df32eb14e572f files/digest-watchdog-5.2.5_p1 138
-RMD160 86c78bca973fb9bb870c6a34c44b194afd67637c files/digest-watchdog-5.2.5_p1 138
-SHA256 35cc5c5451ad15c3aa73d64cbe1b4bde8f266b818f79f39fc807f377e8c89c3a files/digest-watchdog-5.2.5_p1 138
+MD5 b637f88e44718cdf8d15d75f5bec68fa files/digest-watchdog-5.2.5_p1 506
+RMD160 1e659507bf16a97a5c568dad1125851eb4d006ef files/digest-watchdog-5.2.5_p1 506
+SHA256 2d32189ea1809dd3909b6ff8bef0abd0b9d7814ffa056c7f3c66a0e5bcf766b9 files/digest-watchdog-5.2.5_p1 506
+MD5 e6cf0b00ef47b20a50725bdbf9ef9294 files/digest-watchdog-5.2.6_p1 503
+RMD160 95c94e2af9efc0c112d07cc58a93dbba17d35d84 files/digest-watchdog-5.2.6_p1 503
+SHA256 c95cb76f4d68e15be67dc8170e6015ece36456bd1b974353151e2df14f320c84 files/digest-watchdog-5.2.6_p1 503
diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1 b/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1
index 2d046a5a59a7..98b78e6f4d49 100644
--- a/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1
+++ b/sys-apps/watchdog/files/digest-watchdog-5.2.5_p1
@@ -1,2 +1,6 @@
 MD5 cb4581c3af21559ecf054aa066045f3a watchdog_5.2.5-1.diff.gz 8240
+RMD160 89da831a61ee68c84615749f5dfe1a36b512faef watchdog_5.2.5-1.diff.gz 8240
+SHA256 2861c5239ac75534dcd61ee5b4de04271bc583f77c79b7591ecd87efc0599da6 watchdog_5.2.5-1.diff.gz 8240
 MD5 ec498ce0abf0a789b8ad748eb1109ed7 watchdog_5.2.5.orig.tar.gz 128599
+RMD160 168284e7e75f93422ddbc91227362613f2ed1fb4 watchdog_5.2.5.orig.tar.gz 128599
+SHA256 848835daa60ef1874e753571d9becf8806ac116f5fd1564da10f62224f8cf84f watchdog_5.2.5.orig.tar.gz 128599
diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.6_p1 b/sys-apps/watchdog/files/digest-watchdog-5.2.6_p1
new file mode 100644
index 000000000000..54b797531157
--- /dev/null
+++ b/sys-apps/watchdog/files/digest-watchdog-5.2.6_p1
@@ -0,0 +1,6 @@
+MD5 725b822a3d460b3100ad9e7aaff4bda7 watchdog_5.2.6-1.diff.gz 752
+RMD160 17379b4e9f94741d642b0ee5258163d710d1f702 watchdog_5.2.6-1.diff.gz 752
+SHA256 d31953eedc83dcb39982bd6579ba001af587192627cccdc35674c56873eb7a51 watchdog_5.2.6-1.diff.gz 752
+MD5 43c33708ac07d458bdbd416812481bab watchdog_5.2.6.orig.tar.gz 138446
+RMD160 accd68437bb986583f02ec9fe7af0c996a7dcaaf watchdog_5.2.6.orig.tar.gz 138446
+SHA256 84f08d17eebb052e165ce69cf4bbf86ff3da8ec2c3f078391a6d999f90b66baf watchdog_5.2.6.orig.tar.gz 138446
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6_p1-conf.d b/sys-apps/watchdog/files/watchdog-5.2.6_p1-conf.d
new file mode 100644
index 000000000000..c873a4217d97
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6_p1-conf.d
@@ -0,0 +1,6 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-5.2.6_p1-conf.d,v 1.1 2006/06/25 10:50:21 brix Exp $
+
+# for more info, see watchdog(8)
+WATCHDOG_OPTS=""
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6_p1-init.d b/sys-apps/watchdog/files/watchdog-5.2.6_p1-init.d
new file mode 100644
index 000000000000..6a9fb1cafc7d
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6_p1-init.d
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/files/watchdog-5.2.6_p1-init.d,v 1.1 2006/06/25 10:50:21 brix Exp $
+
+depend() {
+	need localmount
+	use logger
+}
+
+start() {
+	ebegin "Starting watchdog"
+	start-stop-daemon --start --quiet --exec /usr/sbin/watchdog \
+		-- ${WATCHDOG_OPTS}
+	eend ${?}
+}
+
+stop() {
+	ebegin "Stopping watchdog"
+	start-stop-daemon --stop --retry 5 --quiet --exec /usr/sbin/watchdog
+	eend ${?}
+}
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6_p1-sundries.patch b/sys-apps/watchdog/files/watchdog-5.2.6_p1-sundries.patch
new file mode 100644
index 000000000000..2d3d0a1f2986
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6_p1-sundries.patch
@@ -0,0 +1,19 @@
+--- include/sundries.h.orig	2004-08-06 01:33:43.525091352 -0400
++++ include/sundries.h	2004-08-06 01:33:58.254852088 -0400
+@@ -46,16 +46,7 @@
+ char *xstrconcat3 (const char *, const char *, const char *);
+ char *xstrconcat4 (const char *, const char *, const char *, const char *);
+ 
+-/* Here is some serious cruft.  */
+-#ifdef __GNUC__
+-#if defined(__GNUC_MINOR__) && __GNUC__ == 2 && __GNUC_MINOR__ >= 5
+ void die (int errcode, const char *fmt, ...) __attribute__ ((noreturn));
+-#else /* GNUC < 2.5 */
+-void die (int errcode, const char *fmt, ...);
+-#endif /* GNUC < 2.5 */
+-#else /* !__GNUC__ */
+-void die (int errcode, const char *fmt, ...);
+-#endif /* !__GNUC__ */
+ 
+ #ifdef HAVE_NFS
+ int nfsmount (const char *spec, const char *node, int *flags,
diff --git a/sys-apps/watchdog/files/watchdog-5.2.6_p1-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.2.6_p1-uclibc.patch
new file mode 100644
index 000000000000..1986ed88774a
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6_p1-uclibc.patch
@@ -0,0 +1,11 @@
+--- src/fstab.c.orig	2004-08-23 15:32:22 +0000
++++ src/fstab.c	2004-08-23 15:32:36 +0000
+@@ -237,7 +237,7 @@
+ /* Ensure that the lock is released if we are interrupted.  */
+ static void
+ handler (int sig) {
+-     die (EX_USER, "%s", sys_siglist[sig]);
++     die (EX_USER, "%s", strsignal(sig));
+ }
+
+ static void
diff --git a/sys-apps/watchdog/watchdog-5.2.6_p1.ebuild b/sys-apps/watchdog/watchdog-5.2.6_p1.ebuild
new file mode 100644
index 000000000000..496f57b36079
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.2.6_p1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.2.6_p1.ebuild,v 1.1 2006/06/25 10:50:21 brix Exp $
+
+inherit eutils
+
+MY_P=${PN}_${PV/_p*/}
+S=${WORKDIR}/${P/_p*/}.orig
+PATCH_LEVEL=${PV##*_p}
+
+DESCRIPTION="A software watchdog"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/system/daemons/watchdog/"
+SRC_URI="mirror://debian/pool/main/w/watchdog/${MY_P}.orig.tar.gz
+		mirror://debian/pool/main/w/watchdog/${MY_P}-${PATCH_LEVEL}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~sh ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-sundries.patch
+	epatch "${FILESDIR}"/${P}-uclibc.patch
+	epatch "${WORKDIR}"/${MY_P}-${PATCH_LEVEL}.diff
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	newconfd "${FILESDIR}"/${P}-conf.d ${PN}
+	newinitd "${FILESDIR}"/${P}-init.d ${PN}
+
+	dodoc AUTHORS README TODO
+	docinto examples
+	dodoc examples/*
+}