From: Christian Heim <phreak@gentoo.org>
Date: Wed, 11 Apr 2007 19:40:10 +0000 (+0000)
Subject: Version bump, thanks to Martin von Gagern <Martin.vGagern at gmx.net> in #171786.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3284c74b9cb733cc4cae8ea9fdeb5bd5022b5ba6;p=gentoo.git

Version bump, thanks to Martin von Gagern <Martin.vGagern at gmx.net> in #171786.
Package-Manager: portage-2.1.2.3
---

diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog
index 46589da643db..58551c7744b9 100644
--- a/sys-apps/watchdog/ChangeLog
+++ b/sys-apps/watchdog/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/watchdog
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.15 2007/04/11 19:40:10 phreak Exp $
+
+*watchdog-5.3.1_p2 (11 Apr 2007)
+
+  11 Apr 2007; Christian Heim <phreak@gentoo.org>
+  +files/watchdog-5.3.1-headers.patch, +files/watchdog-5.3.1-sundries.patch,
+  +files/watchdog-5.3.1-uclibc.patch, +watchdog-5.3.1_p2.ebuild:
+  Version bump, thanks to Martin von Gagern <Martin.vGagern at gmx.net> in
+  #171786.
 
 *watchdog-5.2.6_p6 (17 Jan 2007)
 
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index 5eb2b9b66432..92b26bc18858 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -29,6 +29,18 @@ AUX watchdog-5.2.6-uclibc.patch 312 RMD160 27a24b71fd10666a1755c871c28a9dc100db0
 MD5 e3a3640b31e70f2956ed8ed4bb39f04a files/watchdog-5.2.6-uclibc.patch 312
 RMD160 27a24b71fd10666a1755c871c28a9dc100db0128 files/watchdog-5.2.6-uclibc.patch 312
 SHA256 dcf03faed25fd193b74b5b95e605ce0220409ff59d8ffc6a6d8ee5f5531f2f31 files/watchdog-5.2.6-uclibc.patch 312
+AUX watchdog-5.3.1-headers.patch 2871 RMD160 3ce17317715a0c2eecb5513a2bded6efc8a40ca6 SHA1 b8313606132628be8735eeef29908fa82ee97017 SHA256 ca0c4822631013bbc3c968a7c9b7d51d4567fe2e7d59c3f40e59c9ffa7b7a192
+MD5 05fd7d7594989d1a1687427cc86a29a5 files/watchdog-5.3.1-headers.patch 2871
+RMD160 3ce17317715a0c2eecb5513a2bded6efc8a40ca6 files/watchdog-5.3.1-headers.patch 2871
+SHA256 ca0c4822631013bbc3c968a7c9b7d51d4567fe2e7d59c3f40e59c9ffa7b7a192 files/watchdog-5.3.1-headers.patch 2871
+AUX watchdog-5.3.1-sundries.patch 860 RMD160 6a575acd1bca2f08b9c03cc31064bf14c262cb81 SHA1 7b68ff0869a6c4220a25311ec18845e70718a782 SHA256 ac200fb7faa669073dc4cd0c2e60c83d857c0cdbe5d612e8fd4ce7a8ddfd2c5e
+MD5 038dd090f3d95169b47be33df7e753ab files/watchdog-5.3.1-sundries.patch 860
+RMD160 6a575acd1bca2f08b9c03cc31064bf14c262cb81 files/watchdog-5.3.1-sundries.patch 860
+SHA256 ac200fb7faa669073dc4cd0c2e60c83d857c0cdbe5d612e8fd4ce7a8ddfd2c5e files/watchdog-5.3.1-sundries.patch 860
+AUX watchdog-5.3.1-uclibc.patch 422 RMD160 8a929f8293c621a8b5bf7530359b4e88ff80268d SHA1 80e66e8ff471026badd582df12a05dcd1f710374 SHA256 93aac26ed5b40c4bbcdc04a17e3b9444f86d64b77b6da6421c16cc142292c761
+MD5 1c9cbf86832922b807df24d4b42ec9a2 files/watchdog-5.3.1-uclibc.patch 422
+RMD160 8a929f8293c621a8b5bf7530359b4e88ff80268d files/watchdog-5.3.1-uclibc.patch 422
+SHA256 93aac26ed5b40c4bbcdc04a17e3b9444f86d64b77b6da6421c16cc142292c761 files/watchdog-5.3.1-uclibc.patch 422
 AUX watchdog-conf.d 272 RMD160 81bfaea980008182e595b07e4c04bef3bd866254 SHA1 5b607ca1fc96798a3f5d351d0136cac4b792b0fd SHA256 344c6926063c99a4277bd9b79231b94346354a50b35de9693333289b6ba6c4f8
 MD5 058c7f12df0728b53510d29cd85326bb files/watchdog-conf.d 272
 RMD160 81bfaea980008182e595b07e4c04bef3bd866254 files/watchdog-conf.d 272
@@ -44,6 +56,8 @@ DIST watchdog_5.2.5.orig.tar.gz 128599 RMD160 168284e7e75f93422ddbc91227362613f2
 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
+DIST watchdog_5.3.1-2.diff.gz 1232 RMD160 f8c39573e6b796751130f20a4daead7e061bdbea SHA1 8dcaff7f461e285389c764f65031d6b1f627f53f SHA256 7c0f3969cbd81c00e32a5955fc51b03f8d14cd1f266167a064315e521f8ad3bb
+DIST watchdog_5.3.1.orig.tar.gz 167983 RMD160 dd18d00e5a1ff450c2cfba8eaa57f0476b649280 SHA1 e77c1b9614a2bf830170047d0f5880a4275035d4 SHA256 0831b0dcd6823a8b20139c7ce37301d16d4188197c05249b8de65c1b37f075cc
 EBUILD watchdog-5.2.4_p5.ebuild 1476 RMD160 ff0344c4b1a738d49a5636aeafb9de43a25ac086 SHA1 c681533f9b960b8a61801bd539d527271d56d27b SHA256 a0e806b3b733f7f53089cb17937067a06ab9618329fef1b893b41ea0e71da194
 MD5 98cbb9c8ba89252a07b60655e6d904c0 watchdog-5.2.4_p5.ebuild 1476
 RMD160 ff0344c4b1a738d49a5636aeafb9de43a25ac086 watchdog-5.2.4_p5.ebuild 1476
@@ -60,10 +74,14 @@ EBUILD watchdog-5.2.6_p6.ebuild 1135 RMD160 48d25533af737b610afdeb043fdfcbba222a
 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
+EBUILD watchdog-5.3.1_p2.ebuild 1130 RMD160 b1415f90397cad0103858ace1e6b0176e0ca8286 SHA1 e72175d3bfadab147b36351d72701183317b1705 SHA256 58da41f22ed0ca17b037fe24af3ba6c4dadc979e4e15d02b7eff9371aff5e600
+MD5 2a4121597f7219c210c8ec93918dd16a watchdog-5.3.1_p2.ebuild 1130
+RMD160 b1415f90397cad0103858ace1e6b0176e0ca8286 watchdog-5.3.1_p2.ebuild 1130
+SHA256 58da41f22ed0ca17b037fe24af3ba6c4dadc979e4e15d02b7eff9371aff5e600 watchdog-5.3.1_p2.ebuild 1130
+MISC ChangeLog 4836 RMD160 9d2d3838645318e677ab8331237a7726e2d86e98 SHA1 e244e7aaec0cd8de38ed6c0706f82143955cc0f7 SHA256 20e35cb6300dcdd89cea890bc5ecfb7bc3e41f3464954cdabcfc3478f9e93957
+MD5 4634ba798aa538900b52036ed999e8a8 ChangeLog 4836
+RMD160 9d2d3838645318e677ab8331237a7726e2d86e98 ChangeLog 4836
+SHA256 20e35cb6300dcdd89cea890bc5ecfb7bc3e41f3464954cdabcfc3478f9e93957 ChangeLog 4836
 MISC metadata.xml 254 RMD160 0a3283b74c87debe7d62eb58a0e798d5963e45fd SHA1 d5e1943e3d79385fce768a5b8e600dcb90cda850 SHA256 734bc7f51c6f1f54df40687a130ebbbacae4748c56aae30cdf2a5b8b80784d02
 MD5 b8c2e62a45bdaad40478aac741f34aa0 metadata.xml 254
 RMD160 0a3283b74c87debe7d62eb58a0e798d5963e45fd metadata.xml 254
@@ -80,10 +98,13 @@ SHA256 7c65e3ea3903db58cb835d58f82d565da0633c3baf885972e70d7b9265d99345 files/di
 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
+MD5 1e533007e62093c5d2f394b151a264b3 files/digest-watchdog-5.3.1_p2 506
+RMD160 92a250b2fb0ad468ef8a9a9a276404851af081e1 files/digest-watchdog-5.3.1_p2 506
+SHA256 dd8b73c6c63e06eb1ad8017713b6fd7f5a34f39acdb456886c9bdbf9801be1c6 files/digest-watchdog-5.3.1_p2 506
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFFrYCE8bi6rjpTunYRAkqTAJ4nyHEVLFsdDfZVgaoDLpfabt0nmwCgxnZ8
-k8FuxbsDvf4t7h75ckbra4I=
-=S20O
+iD8DBQFGHTmfyuNVb5qfaOYRAtfoAKC4c/C4BWt21Mh2PuH/zgHHspT5LwCgu6PK
+hqmeoKtm301d1gwvSuSvcEE=
+=nITw
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/watchdog/files/digest-watchdog-5.3.1_p2 b/sys-apps/watchdog/files/digest-watchdog-5.3.1_p2
new file mode 100644
index 000000000000..5808a5c3b6c5
--- /dev/null
+++ b/sys-apps/watchdog/files/digest-watchdog-5.3.1_p2
@@ -0,0 +1,6 @@
+MD5 3cc55c4dafcc6010cc1e2f2ce06467f9 watchdog_5.3.1-2.diff.gz 1232
+RMD160 f8c39573e6b796751130f20a4daead7e061bdbea watchdog_5.3.1-2.diff.gz 1232
+SHA256 7c0f3969cbd81c00e32a5955fc51b03f8d14cd1f266167a064315e521f8ad3bb watchdog_5.3.1-2.diff.gz 1232
+MD5 e14e9e54ef839f9f74b62c175298914d watchdog_5.3.1.orig.tar.gz 167983
+RMD160 dd18d00e5a1ff450c2cfba8eaa57f0476b649280 watchdog_5.3.1.orig.tar.gz 167983
+SHA256 0831b0dcd6823a8b20139c7ce37301d16d4188197c05249b8de65c1b37f075cc watchdog_5.3.1.orig.tar.gz 167983
diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch b/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch
new file mode 100644
index 000000000000..0ad75afadf2e
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch
@@ -0,0 +1,114 @@
+Index: watchdog-5.3.1/src/fstab.c
+===================================================================
+--- watchdog-5.3.1.orig/src/fstab.c
++++ watchdog-5.3.1/src/fstab.c
+@@ -4,6 +4,7 @@
+ #include "config.h"
+ #endif
+ 
++#define _GNU_SOURCE /* for strsignal() */
+ #include <unistd.h>
+ #include <errno.h>
+ #include <stdio.h>
+Index: watchdog-5.3.1/src/nfsmount.c
+===================================================================
+--- watchdog-5.3.1.orig/src/nfsmount.c
++++ watchdog-5.3.1/src/nfsmount.c
+@@ -43,6 +43,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>
+Index: watchdog-5.3.1/src/pidfile.c
+===================================================================
+--- watchdog-5.3.1.orig/src/pidfile.c
++++ watchdog-5.3.1/src/pidfile.c
+@@ -6,6 +6,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"
+ 
+Index: watchdog-5.3.1/src/shutdown.c
+===================================================================
+--- watchdog-5.3.1.orig/src/shutdown.c
++++ watchdog-5.3.1/src/shutdown.c
+@@ -4,6 +4,8 @@
+ #include "config.h"
+ #endif
+ 
++#define _GNU_SOURCE /* for getsid() */
++
+ #include <dirent.h>
+ #include <errno.h>
+ #include <fcntl.h>
+@@ -14,6 +16,7 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <time.h>
+ #include <utmp.h>
+ #include <sys/mman.h>
+ #include <sys/param.h>
+Index: watchdog-5.3.1/src/test_binary.c
+===================================================================
+--- watchdog-5.3.1.orig/src/test_binary.c
++++ watchdog-5.3.1/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"
+ 
+Index: watchdog-5.3.1/src/watchdog.c
+===================================================================
+--- watchdog-5.3.1.orig/src/watchdog.c
++++ watchdog-5.3.1/src/watchdog.c
+@@ -13,6 +13,8 @@
+ 
+ #include "extern.h"
+ 
++#include <sys/stat.h>
++#include <libgen.h>
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <getopt.h>
+@@ -23,7 +25,6 @@
+ #include <arpa/inet.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+-#define __USE_GNU
+ #include <string.h>
+ 
+ #if !defined(__GLIBC__)		/* __GLIBC__ */
+Index: watchdog-5.3.1/src/wd_keepalive.c
+===================================================================
+--- watchdog-5.3.1.orig/src/wd_keepalive.c
++++ watchdog-5.3.1/src/wd_keepalive.c
+@@ -14,6 +14,7 @@
+ #include "config.h"
+ #endif
+ 
++#define _GNU_SOURCE
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <sched.h>
+@@ -22,7 +23,7 @@
+ #include <stdlib.h>
+ #include <sys/mman.h>
+ #include <sys/wait.h>
+-#define __USE_GNU
++#include <unistd.h>
+ #include <string.h>
+ #include <syslog.h>
+ 
diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch b/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch
new file mode 100644
index 000000000000..cec4fb1f3502
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch
@@ -0,0 +1,21 @@
+Index: watchdog-5.3.1/include/sundries.h
+===================================================================
+--- watchdog-5.3.1.orig/include/sundries.h
++++ watchdog-5.3.1/include/sundries.h
+@@ -46,16 +46,7 @@ char *xstrconcat2 (const char *, const c
+ 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.3.1-uclibc.patch b/sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch
new file mode 100644
index 000000000000..fac3f0bde54a
--- /dev/null
+++ b/sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch
@@ -0,0 +1,13 @@
+Index: watchdog-5.3.1/src/fstab.c
+===================================================================
+--- watchdog-5.3.1.orig/src/fstab.c
++++ watchdog-5.3.1/src/fstab.c
+@@ -240,7 +240,7 @@ static int old_lockfile = 1;
+ /* 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.3.1_p2.ebuild b/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild
new file mode 100644
index 000000000000..11cd041fcf3c
--- /dev/null
+++ b/sys-apps/watchdog/watchdog-5.3.1_p2.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.3.1_p2.ebuild,v 1.1 2007/04/11 19:40:10 phreak Exp $
+
+inherit eutils
+
+MY_P=${PN}_${PV/_p*/}
+S="${WORKDIR}"/${P/_p*/}
+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/*
+}