Version bump and header cleanup.

Package-Manager: portage-2.1.2

diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 137ae81b4307efe553f3f58c93684df32ed5b96e..46589da643dbea9e851f3457055d019b44b0f903 100644 (file)
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2006/07/13 17:16:49 phreak Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.14 2007/01/17 01:48:15 vapier Exp $
+
+*watchdog-5.2.6_p6 (17 Jan 2007)
+
+  17 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/watchdog-5.2.6-headers.patch, +watchdog-5.2.6_p6.ebuild:
+  Version bump and header cleanup.
 
 *watchdog-5.2.6_p2 (13 Jul 2006)
 

diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 24740c06315e88a16e3da44b23bfe2d02dd9deae..5eb2b9b66432162606c3e0c5cf5c37bb04e465ca 100644 (file)
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -17,6 +17,10 @@ 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-headers.patch 2172 RMD160 d38317292d9cd06e4fa5103ff361220fe9c5a38e SHA1 0fb27a16744940a407b8caef8b902eef2e571587 SHA256 75994c1344c50b30408268197cd6f90079eae58feef816c1289c710e9e1437b8
+MD5 fea02a8f9fa1d64eaf96c28c5d1e75dd files/watchdog-5.2.6-headers.patch 2172
+RMD160 d38317292d9cd06e4fa5103ff361220fe9c5a38e files/watchdog-5.2.6-headers.patch 2172
+SHA256 75994c1344c50b30408268197cd6f90079eae58feef816c1289c710e9e1437b8 files/watchdog-5.2.6-headers.patch 2172
 AUX watchdog-5.2.6-sundries.patch 752 RMD160 1506a9ffd0476aca6b8fe4f848fd72483857951f SHA1 a71f6db59e4f931d4ac18489fe35b99c9fa4f9b0 SHA256 c95e6fb0329c92ea5e20daa632028d50e94dd3804701597f64a8df688db9c467
 MD5 ba2c02768a2e772c14e6332dd6b2e65e files/watchdog-5.2.6-sundries.patch 752
 RMD160 1506a9ffd0476aca6b8fe4f848fd72483857951f files/watchdog-5.2.6-sundries.patch 752
@@ -38,6 +42,7 @@ DIST watchdog_5.2.4.orig.tar.gz 127791 RMD160 cc941fd1c75152b5d954d605d44d387d28
 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-2.diff.gz 1791 RMD160 99c4162cda72ec7b4d3714bdeb9afcf0a1d3ed36 SHA1 5cedef216aa18c2c565af1ead5cdff79b2456737 SHA256 65d6b4a109972be2e569b9553acaafc7b6c1f6b095a0b56122ada5fa60f35152
+DIST watchdog_5.2.6-6.diff.gz 4446 RMD160 c86f9fd4d8ac00dffa7977ca6fb6e8206fdce906 SHA1 838fd8bd7ca21c2cbf13508fa784014777f3b3f7 SHA256 f9dc5d99c8191b1a7df8021f77097cd58a6296245534de94a1b7c19e5a08e60c
 DIST watchdog_5.2.6.orig.tar.gz 138446 RMD160 accd68437bb986583f02ec9fe7af0c996a7dcaaf SHA1 c8b1c1199152f6cae4b3a4dea7e2132b9418d22e SHA256 84f08d17eebb052e165ce69cf4bbf86ff3da8ec2c3f078391a6d999f90b66baf
 EBUILD watchdog-5.2.4_p5.ebuild 1476 RMD160 ff0344c4b1a738d49a5636aeafb9de43a25ac086 SHA1 c681533f9b960b8a61801bd539d527271d56d27b SHA256 a0e806b3b733f7f53089cb17937067a06ab9618329fef1b893b41ea0e71da194
 MD5 98cbb9c8ba89252a07b60655e6d904c0 watchdog-5.2.4_p5.ebuild 1476
@@ -47,18 +52,22 @@ EBUILD watchdog-5.2.5_p1.ebuild 1051 RMD160 80ee6a8bbe7a1fa6538b6637879953ac06e2
 MD5 29fa0dd669d9d229ac9e759d147aa13a watchdog-5.2.5_p1.ebuild 1051
 RMD160 80ee6a8bbe7a1fa6538b6637879953ac06e256de watchdog-5.2.5_p1.ebuild 1051
 SHA256 97b87763c2ee9c401e7452c63302b017ee4307a1aecf9bf1590707ce7a422174 watchdog-5.2.5_p1.ebuild 1051
-EBUILD watchdog-5.2.6_p2.ebuild 1071 RMD160 99979d0ffa7f7b5cea8ed66509af37f61328b2a2 SHA1 48abbdea03611e285d02e0aaf766e53c8f91f545 SHA256 2dd2b4957252c486e75d67e9a472dd998a9d39940809038ba84fe0ee7ab6ebde
-MD5 1ab4a48f3d7eec97e9ebf5ec6ccc8e6a watchdog-5.2.6_p2.ebuild 1071
-RMD160 99979d0ffa7f7b5cea8ed66509af37f61328b2a2 watchdog-5.2.6_p2.ebuild 1071
-SHA256 2dd2b4957252c486e75d67e9a472dd998a9d39940809038ba84fe0ee7ab6ebde watchdog-5.2.6_p2.ebuild 1071
-MISC ChangeLog 4337 RMD160 46718c884f4bdd404990cfac8d38b86fbb75c04f SHA1 75622b466bae404b7d5a2227e25e8666488ff702 SHA256 6067116720ea93bd1a598eaca3448b8042173ab4bd8ca8f0aafc2c8a9d0ddc42
-MD5 7638556049a4a652b5a6f52692b0d37b ChangeLog 4337
-RMD160 46718c884f4bdd404990cfac8d38b86fbb75c04f ChangeLog 4337
-SHA256 6067116720ea93bd1a598eaca3448b8042173ab4bd8ca8f0aafc2c8a9d0ddc42 ChangeLog 4337
-MISC metadata.xml 254 RMD160 83c348dffd8d7302409dae40ef329b7e11274475 SHA1 66140dae09a868155ef4005c1cf0f314dae4ea40 SHA256 eca2b7e2934fa2e5861b976084b50c56fbb3725c76a14a494887d1f834417b97
-MD5 92cae4132356c24801af97de2266dfa9 metadata.xml 254
-RMD160 83c348dffd8d7302409dae40ef329b7e11274475 metadata.xml 254
-SHA256 eca2b7e2934fa2e5861b976084b50c56fbb3725c76a14a494887d1f834417b97 metadata.xml 254
+EBUILD watchdog-5.2.6_p2.ebuild 1083 RMD160 2c1206da54e8d688642dd6110da2bc656a73823b SHA1 d4f424997c717ca0ab5992b0c699fba917ac3fec SHA256 a411a3c7ba9ec257eafdda003f5781dce1a08b98d41b13a6816ffadc4e5187b6
+MD5 5b09313f39e7736f6d8638b46d6db53d watchdog-5.2.6_p2.ebuild 1083
+RMD160 2c1206da54e8d688642dd6110da2bc656a73823b watchdog-5.2.6_p2.ebuild 1083
+SHA256 a411a3c7ba9ec257eafdda003f5781dce1a08b98d41b13a6816ffadc4e5187b6 watchdog-5.2.6_p2.ebuild 1083
+EBUILD watchdog-5.2.6_p6.ebuild 1135 RMD160 48d25533af737b610afdeb043fdfcbba222a747c SHA1 29d18fec582bc76186af845b6aeb5089dbcb75f2 SHA256 03fb87b49a25d07127db8ed1559e1ae5af291f6e73d4adc1556288f22d069d12
+MD5 f8041b5e642cf8176cabc9ef377bd807 watchdog-5.2.6_p6.ebuild 1135
+RMD160 48d25533af737b610afdeb043fdfcbba222a747c watchdog-5.2.6_p6.ebuild 1135
+SHA256 03fb87b49a25d07127db8ed1559e1ae5af291f6e73d4adc1556288f22d069d12 watchdog-5.2.6_p6.ebuild 1135
+MISC ChangeLog 4523 RMD160 69a9c614971a45055b14082ba078c2810a0756ee SHA1 6b3c2c936113f2c1c84cb40772528e06b3125fff SHA256 265bffae713b90598755a4093a0299a6ebdc7c430748ae69ab07fce670d65aa4
+MD5 c634d7a0e7a921adee96bb9b3f392b5e ChangeLog 4523
+RMD160 69a9c614971a45055b14082ba078c2810a0756ee ChangeLog 4523
+SHA256 265bffae713b90598755a4093a0299a6ebdc7c430748ae69ab07fce670d65aa4 ChangeLog 4523
+MISC metadata.xml 254 RMD160 0a3283b74c87debe7d62eb58a0e798d5963e45fd SHA1 d5e1943e3d79385fce768a5b8e600dcb90cda850 SHA256 734bc7f51c6f1f54df40687a130ebbbacae4748c56aae30cdf2a5b8b80784d02
+MD5 b8c2e62a45bdaad40478aac741f34aa0 metadata.xml 254
+RMD160 0a3283b74c87debe7d62eb58a0e798d5963e45fd metadata.xml 254
+SHA256 734bc7f51c6f1f54df40687a130ebbbacae4748c56aae30cdf2a5b8b80784d02 metadata.xml 254
 MD5 32b6cbaae06ac8a27e72838da96db7bd files/digest-watchdog-5.2.4_p5 509
 RMD160 12966375508506b5ba0e9aa80ca6d4db40a08e7a files/digest-watchdog-5.2.4_p5 509
 SHA256 b10b78ade0aa6a41f3d8327abd1c4953692f51b120306cf7ec6fc214aaf24337 files/digest-watchdog-5.2.4_p5 509
@@ -68,10 +77,13 @@ SHA256 2d32189ea1809dd3909b6ff8bef0abd0b9d7814ffa056c7f3c66a0e5bcf766b9 files/di
 MD5 c286ccc7564fb453a6f960da0de30ec7 files/digest-watchdog-5.2.6_p2 506
 RMD160 a018640305a6543180374a52a8ef35bdcbdfd6ab files/digest-watchdog-5.2.6_p2 506
 SHA256 7c65e3ea3903db58cb835d58f82d565da0633c3baf885972e70d7b9265d99345 files/digest-watchdog-5.2.6_p2 506
+MD5 321ca184e31d3675f62dba55c33bc6d8 files/digest-watchdog-5.2.6_p6 506
+RMD160 6480a7f54c49b65239d2982303a69746cf9d38f6 files/digest-watchdog-5.2.6_p6 506
+SHA256 8072dc89b6544bcc40dffe41a7c62c3c60cb2b09adf42ba7b0695d97b697fbc3 files/digest-watchdog-5.2.6_p6 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFEtoFRflZ8QqxhrsMRAnxiAKCg4oHhKcYC/DuxyaFk43PmDz1VagCaA46j
-+TShIHyp3bWLG+K6QxuNtbw=
-=Uejk
+iD8DBQFFrYCE8bi6rjpTunYRAkqTAJ4nyHEVLFsdDfZVgaoDLpfabt0nmwCgxnZ8
+k8FuxbsDvf4t7h75ckbra4I=
+=S20O
 -----END PGP SIGNATURE-----

diff --git a/sys-apps/watchdog/files/digest-watchdog-5.2.6_p6 b/sys-apps/watchdog/files/digest-watchdog-5.2.6_p6
new file mode 100644 (file)
index 0000000..c404dbe
--- /dev/null
+++ b/sys-apps/watchdog/files/digest-watchdog-5.2.6_p6
@@ -0,0 +1,6 @@
+MD5 6e9a66f3e4c312bc76253b7714d65312 watchdog_5.2.6-6.diff.gz 4446
+RMD160 c86f9fd4d8ac00dffa7977ca6fb6e8206fdce906 watchdog_5.2.6-6.diff.gz 4446
+SHA256 f9dc5d99c8191b1a7df8021f77097cd58a6296245534de94a1b7c19e5a08e60c watchdog_5.2.6-6.diff.gz 4446
+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-headers.patch b/sys-apps/watchdog/files/watchdog-5.2.6-headers.patch
new file mode 100644 (file)
index 0000000..aa03366
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.2.6-headers.patch
@@ -0,0 +1,102 @@
+pull in more headers for prototypes
+
+--- watchdog-5.2.6/src/fstab.c
++++ watchdog-5.2.6/src/fstab.c
+@@ -2,6 +2,7 @@
+ #include "config.h"
+ #endif
+ 
++#define _GNU_SOURCE /* for strsignal() */
+ #include <unistd.h>
+ #include <errno.h>
+ #include <stdio.h>
+--- watchdog-5.2.6/src/nfsmount.c
++++ watchdog-5.2.6/src/nfsmount.c
+@@ -41,6 +41,7 @@
+ #include <rpc/pmap_prot.h>
+ #include <rpc/pmap_clnt.h>
+ #include <sys/socket.h>
++#include <time.h>
+ #include <sys/time.h>
+ #include <sys/utsname.h>
+ #include <sys/stat.h>
+--- watchdog-5.2.6/src/pidfile.c
++++ watchdog-5.2.6/src/pidfile.c
+@@ -4,6 +4,10 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <stdlib.h>
++#include <signal.h>
+ #include "extern.h"
+ #include "watch_err.h"
+ 
+--- watchdog-5.2.6/src/shutdown.c
++++ watchdog-5.2.6/src/shutdown.c
+@@ -2,6 +2,8 @@
+ #include "config.h"
+ #endif
+ 
++#define _GNU_SOURCE /* for getsid() */
++
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -12,6 +14,7 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <time.h>
+ #include <utmp.h>
+ #include <sys/mman.h>
+ #include <sys/param.h>
+--- watchdog-5.2.6/src/test_binary.c
++++ watchdog-5.2.6/src/test_binary.c
+@@ -8,6 +8,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <sys/wait.h>
++#include <time.h>
+ #include "extern.h"
+ #include "watch_err.h"
+ 
+--- watchdog-5.2.6/src/wd_keepalive.c
++++ watchdog-5.2.6/src/wd_keepalive.c
+@@ -15,6 +15,7 @@
+  *
+ ***********************************************************/
+ 
++#define _GNU_SOURCE
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sched.h>
+@@ -23,7 +24,7 @@
+ #include <stdlib.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+-#define __USE_GNU
++#include <unistd.h>
+ #include <string.h>
+ #include <syslog.h>
+ 
+--- watchdog-5.2.6/src/watchdog.c
++++ watchdog-5.2.6/src/watchdog.c
+@@ -11,6 +11,8 @@
+ 
+ #include "extern.h"
+ 
++#include <sys/stat.h>
++#include <libgen.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <getopt.h>
+@@ -21,7 +23,6 @@
+ #include <arpa/inet.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+-#define __USE_GNU
+ #include <string.h>
+ 
+ #if !defined(__GLIBC__)               /* __GLIBC__ */

diff --git a/sys-apps/watchdog/watchdog-5.2.6_p6.ebuild b/sys-apps/watchdog/watchdog-5.2.6_p6.ebuild
new file mode 100644 (file)
index 0000000..970675e
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.2.6_p6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2007 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_p6.ebuild,v 1.1 2007/01/17 01:48:15 vapier 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 ~m68k ~mips ~ppc ~s390 ~sh ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+       unpack ${A}
+
+       cd "${S}"
+       epatch "${FILESDIR}"/${PN}-${PV/_p*/}-sundries.patch
+       epatch "${FILESDIR}"/${PN}-${PV/_p*/}-headers.patch
+       epatch "${FILESDIR}"/${PN}-${PV/_p*/}-uclibc.patch
+       epatch "${WORKDIR}"/${MY_P}-${PATCH_LEVEL}.diff
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "make install failed"
+
+       newconfd "${FILESDIR}"/${PN}-conf.d ${PN}
+       newinitd "${FILESDIR}"/${PN}-init.d ${PN}
+
+       dodoc AUTHORS README TODO
+       docinto examples
+       dodoc examples/*
+}