From: Mike Frysinger Date: Fri, 13 Apr 2007 09:26:07 +0000 (+0000) Subject: No point in duplicating patches. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=807fb06a38ab342e32fd7987d0558188a06da125;p=gentoo.git No point in duplicating patches. Package-Manager: portage-2.1.2.3 --- diff --git a/sys-apps/watchdog/ChangeLog b/sys-apps/watchdog/ChangeLog index 6c4f971cf748..fc6ece8566a0 100644 --- a/sys-apps/watchdog/ChangeLog +++ b/sys-apps/watchdog/ChangeLog @@ -1,6 +1,11 @@ # 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.16 2007/04/11 19:41:39 phreak Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/ChangeLog,v 1.17 2007/04/13 09:26:07 vapier Exp $ + + 13 Apr 2007; Mike Frysinger + -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: + No point in duplicating patches. 11 Apr 2007; Christian Heim watchdog-5.2.6_p2.ebuild: Fixing ebuild.badheader. diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest index 417943d921bd..e66451f97b66 100644 --- a/sys-apps/watchdog/Manifest +++ b/sys-apps/watchdog/Manifest @@ -29,18 +29,6 @@ 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 @@ -74,14 +62,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 -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 4940 RMD160 a187d2d6bf74d6921e109fb3a1e68e55f7af5a9c SHA1 dfb4699996ed3fbd6c0c4ac23d4bfea8257a9bba SHA256 57de12b9b66a30c2b392442d80dba37d212bbbfa48cfb1b2ccac2666a1b9e383 -MD5 9054131223eb20b8ab889c325b990c6d ChangeLog 4940 -RMD160 a187d2d6bf74d6921e109fb3a1e68e55f7af5a9c ChangeLog 4940 -SHA256 57de12b9b66a30c2b392442d80dba37d212bbbfa48cfb1b2ccac2666a1b9e383 ChangeLog 4940 +EBUILD watchdog-5.3.1_p2.ebuild 1117 RMD160 320e0157b2848a23d41b0ef7ba60489105764607 SHA1 29bb3a0bed043b98f7714acc5715420a51a33565 SHA256 27900a4f9ea4b6cf8127bac9da44bdb43040d4ea4694e57872360061adb15500 +MD5 f058eb60354dafafd17d76ae7887554a watchdog-5.3.1_p2.ebuild 1117 +RMD160 320e0157b2848a23d41b0ef7ba60489105764607 watchdog-5.3.1_p2.ebuild 1117 +SHA256 27900a4f9ea4b6cf8127bac9da44bdb43040d4ea4694e57872360061adb15500 watchdog-5.3.1_p2.ebuild 1117 +MISC ChangeLog 5167 RMD160 b0318e5113ba84f1e507dfad0a31f6dd045396f3 SHA1 fe8d1a58a98b787d39eb2fd22d15d07ed0b85a83 SHA256 f7c2795fcc71c5f9506810245c18b4e952f80f7cbcaf0b2762e289886a09f2ec +MD5 f0ec4ea4eee013c732e526486fbbea32 ChangeLog 5167 +RMD160 b0318e5113ba84f1e507dfad0a31f6dd045396f3 ChangeLog 5167 +SHA256 f7c2795fcc71c5f9506810245c18b4e952f80f7cbcaf0b2762e289886a09f2ec ChangeLog 5167 MISC metadata.xml 254 RMD160 0a3283b74c87debe7d62eb58a0e798d5963e45fd SHA1 d5e1943e3d79385fce768a5b8e600dcb90cda850 SHA256 734bc7f51c6f1f54df40687a130ebbbacae4748c56aae30cdf2a5b8b80784d02 MD5 b8c2e62a45bdaad40478aac741f34aa0 metadata.xml 254 RMD160 0a3283b74c87debe7d62eb58a0e798d5963e45fd metadata.xml 254 @@ -104,7 +92,7 @@ SHA256 dd8b73c6c63e06eb1ad8017713b6fd7f5a34f39acdb456886c9bdbf9801be1c6 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGHTn4yuNVb5qfaOYRAjc+AJ9usIJpTICwFNlQSoLnlO0FZPejfQCgjO8x -RfUt3YNhSLgYHBYPp4IVj+o= -=xjOb +iD8DBQFGH0zh8bi6rjpTunYRAkN8AJ9U03WMKvUJpVOZlI+7jXX5qnPt6wCg49YA +jDDVB4JQq4D4CadtCfF4fEI= +=70cS -----END PGP SIGNATURE----- diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch b/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch deleted file mode 100644 index 0ad75afadf2e..000000000000 --- a/sys-apps/watchdog/files/watchdog-5.3.1-headers.patch +++ /dev/null @@ -1,114 +0,0 @@ -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 - #include - #include -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 - #include - #include -+#include - #include - #include - #include -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 - #include -+#include -+#include -+#include -+#include - #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 - #include - #include -@@ -14,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include -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 - #include - #include -+#include - #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 -+#include - #include - #include - #include -@@ -23,7 +25,6 @@ - #include - #include - #include --#define __USE_GNU - #include - - #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 - #include - #include -@@ -22,7 +23,7 @@ - #include - #include - #include --#define __USE_GNU -+#include - #include - #include - diff --git a/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch b/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch deleted file mode 100644 index cec4fb1f3502..000000000000 --- a/sys-apps/watchdog/files/watchdog-5.3.1-sundries.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 deleted file mode 100644 index fac3f0bde54a..000000000000 --- a/sys-apps/watchdog/files/watchdog-5.3.1-uclibc.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 index 11cd041fcf3c..e7d260a41934 100644 --- a/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild +++ b/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild @@ -1,6 +1,6 @@ # 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 $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/watchdog/watchdog-5.3.1_p2.ebuild,v 1.2 2007/04/13 09:26:07 vapier Exp $ inherit eutils @@ -24,14 +24,14 @@ 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 "${FILESDIR}"/${PN}-5.2.6-sundries.patch + epatch "${FILESDIR}"/${PN}-5.2.6-headers.patch + epatch "${FILESDIR}"/${PN}-5.2.6-uclibc.patch epatch "${WORKDIR}"/${MY_P}-${PATCH_LEVEL}.diff } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "make install failed" newconfd "${FILESDIR}"/${PN}-conf.d ${PN} newinitd "${FILESDIR}"/${PN}-init.d ${PN} @@ -40,3 +40,4 @@ src_install() { docinto examples dodoc examples/* } +