From e61ac093574839e037463acf191300e51d2f35bb Mon Sep 17 00:00:00 2001 From: Anant Narayanan Date: Sun, 4 Mar 2007 18:18:16 +0000 Subject: [PATCH] Add patch to remove troublesome header, bump to r1 to close bug #169256 Package-Manager: portage-2.1.2.1 --- app-misc/srm/ChangeLog | 9 ++++++- app-misc/srm/Manifest | 26 +++++++++++-------- .../{digest-srm-1.2.8 => digest-srm-1.2.8-r1} | 0 .../srm/files/srm-1.2.8-remove-mount.patch | 13 ++++++++++ .../{srm-1.2.8.ebuild => srm-1.2.8-r1.ebuild} | 12 +++++++-- 5 files changed, 46 insertions(+), 14 deletions(-) rename app-misc/srm/files/{digest-srm-1.2.8 => digest-srm-1.2.8-r1} (100%) create mode 100644 app-misc/srm/files/srm-1.2.8-remove-mount.patch rename app-misc/srm/{srm-1.2.8.ebuild => srm-1.2.8-r1.ebuild} (73%) diff --git a/app-misc/srm/ChangeLog b/app-misc/srm/ChangeLog index bc1b961d4a16..9b0823a3baad 100644 --- a/app-misc/srm/ChangeLog +++ b/app-misc/srm/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-misc/srm # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/ChangeLog,v 1.9 2007/02/21 22:43:57 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/ChangeLog,v 1.10 2007/03/04 18:18:16 anant Exp $ + +*srm-1.2.8-r1 (04 Mar 2007) + + 04 Mar 2007; +files/srm-1.2.8-remove-mount.patch, + -srm-1.2.8.ebuild, +srm-1.2.8-r1.ebuild: + Add patch to remove troublesome header that prevented compilation, bump to r1; + this closes bug #169256 21 Feb 2007; Piotr Jaroszyński ChangeLog: Transition to Manifest2. diff --git a/app-misc/srm/Manifest b/app-misc/srm/Manifest index 065e5ba8f1ed..b6114f0d8264 100644 --- a/app-misc/srm/Manifest +++ b/app-misc/srm/Manifest @@ -1,17 +1,21 @@ +AUX srm-1.2.8-remove-mount.patch 298 RMD160 a94da1b7abff7cdc26bb53d3b37bcf0768febf36 SHA1 1851503a2919521bcf2998c387bc594f85f16acf SHA256 73272bca010b1282dea4dad4adeb1c466bbcce556dc43baa67d0111990ba778b +MD5 ef52598e488576f19699b3f5c77ab464 files/srm-1.2.8-remove-mount.patch 298 +RMD160 a94da1b7abff7cdc26bb53d3b37bcf0768febf36 files/srm-1.2.8-remove-mount.patch 298 +SHA256 73272bca010b1282dea4dad4adeb1c466bbcce556dc43baa67d0111990ba778b files/srm-1.2.8-remove-mount.patch 298 DIST srm-1.2.7.tar.gz 85838 RMD160 d35ee17b8b423fd3efe8979421b3e1fe307e76db SHA1 d6667ef4d4843e10ec7a310979b2132b85d224e3 SHA256 e2b3db3e872e9a2115d42d989a458053d45946e6cf2b68b85a1ade6cf9d3ffa6 DIST srm-1.2.8.tar.gz 88067 RMD160 d1ce5fe2ec13e45c5620e6a71c1f2dfcb49ab1bc SHA1 8b7aafc95b3ef67e2c737030567222bf50082188 SHA256 3be77158b62873659de9d458f87993537c93bbd32a86d5543290a0cf4ab24f61 EBUILD srm-1.2.7.ebuild 818 RMD160 537825e9aae68b581c1666e476161f25c524e87a SHA1 6128bcf3862260fcb88f7bb44c1743ec0f929ae7 SHA256 e6ce237049f080a3453cb51e71e2d45bdc55fa8d26971c36d82d5703f4ac009f MD5 746ccf2ddd060f86e54a54ac336351ba srm-1.2.7.ebuild 818 RMD160 537825e9aae68b581c1666e476161f25c524e87a srm-1.2.7.ebuild 818 SHA256 e6ce237049f080a3453cb51e71e2d45bdc55fa8d26971c36d82d5703f4ac009f srm-1.2.7.ebuild 818 -EBUILD srm-1.2.8.ebuild 856 RMD160 acab555e7723f204a36d035b3c1703c66e7b69f2 SHA1 9e6ba67494d45c4c2c3688033de19f2b92a19780 SHA256 117227cd591c3fac22a21c47f180bf1fa016eda5ed81a39dbcd5772547ea2179 -MD5 47eb610b1a9772df260bcb56383ca62f srm-1.2.8.ebuild 856 -RMD160 acab555e7723f204a36d035b3c1703c66e7b69f2 srm-1.2.8.ebuild 856 -SHA256 117227cd591c3fac22a21c47f180bf1fa016eda5ed81a39dbcd5772547ea2179 srm-1.2.8.ebuild 856 -MISC ChangeLog 1122 RMD160 c65005939a6e8ee43c35ed45ac7eaeca443f2780 SHA1 fec4ea7e47045e580aaed16b7b2d2bac47395c53 SHA256 90d2c37be4232f6c650fcc3e6c0c205cf446aea016f9919b184a8a3ae3f8dcf5 -MD5 cd6402bbf1f60e6087bf0b66ca76b533 ChangeLog 1122 -RMD160 c65005939a6e8ee43c35ed45ac7eaeca443f2780 ChangeLog 1122 -SHA256 90d2c37be4232f6c650fcc3e6c0c205cf446aea016f9919b184a8a3ae3f8dcf5 ChangeLog 1122 +EBUILD srm-1.2.8-r1.ebuild 958 RMD160 06560a2ebcdb1d925f2fe298d037e11ed702da05 SHA1 047f4740b50713370ba4d0eae1acad0e277cebe2 SHA256 48a9bc9e71f6634309baba6cd0a82c0d287b87d141733ba4b0110a987a33787b +MD5 af2fe3b0fc4e9f7ed5c59d8d58e6efa3 srm-1.2.8-r1.ebuild 958 +RMD160 06560a2ebcdb1d925f2fe298d037e11ed702da05 srm-1.2.8-r1.ebuild 958 +SHA256 48a9bc9e71f6634309baba6cd0a82c0d287b87d141733ba4b0110a987a33787b srm-1.2.8-r1.ebuild 958 +MISC ChangeLog 1374 RMD160 8c49aeec231528d5b51c8fbab5395497623d4103 SHA1 faf652aed1c3102acf2092c7f6edfe7d23aa118d SHA256 eca050ec2fde558698e299cf52c29f252a4abb69d80d8e3fb240e34a264587cb +MD5 e717b95d238db492aa2a796ce63c2a55 ChangeLog 1374 +RMD160 8c49aeec231528d5b51c8fbab5395497623d4103 ChangeLog 1374 +SHA256 eca050ec2fde558698e299cf52c29f252a4abb69d80d8e3fb240e34a264587cb ChangeLog 1374 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314 @@ -19,6 +23,6 @@ SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 metadata MD5 3350c3410bc7adc1d2611258df39e750 files/digest-srm-1.2.7 226 RMD160 521fa9874ecdee7a2d708536f87d95981030c3e9 files/digest-srm-1.2.7 226 SHA256 09fcee2d57a95c553077a40f03d07a6939886bbd01df544340b5fa3f3b356cc5 files/digest-srm-1.2.7 226 -MD5 877589152b78cec9fec66ce2d5e07676 files/digest-srm-1.2.8 226 -RMD160 37dc29e153e2a38004c24ac3d46e8629a6786ba9 files/digest-srm-1.2.8 226 -SHA256 3423b3e24e976cac29ad393ab1d09f9722d2e3c247941fd8b89e6d58e8d72868 files/digest-srm-1.2.8 226 +MD5 877589152b78cec9fec66ce2d5e07676 files/digest-srm-1.2.8-r1 226 +RMD160 37dc29e153e2a38004c24ac3d46e8629a6786ba9 files/digest-srm-1.2.8-r1 226 +SHA256 3423b3e24e976cac29ad393ab1d09f9722d2e3c247941fd8b89e6d58e8d72868 files/digest-srm-1.2.8-r1 226 diff --git a/app-misc/srm/files/digest-srm-1.2.8 b/app-misc/srm/files/digest-srm-1.2.8-r1 similarity index 100% rename from app-misc/srm/files/digest-srm-1.2.8 rename to app-misc/srm/files/digest-srm-1.2.8-r1 diff --git a/app-misc/srm/files/srm-1.2.8-remove-mount.patch b/app-misc/srm/files/srm-1.2.8-remove-mount.patch new file mode 100644 index 000000000000..0f3297a43a3f --- /dev/null +++ b/app-misc/srm/files/srm-1.2.8-remove-mount.patch @@ -0,0 +1,13 @@ +--- src/sunlink.c 2007-03-05 03:01:00.000000000 +0530 ++++ src/sunlink.c 2007-03-05 03:01:16.000000000 +0530 +@@ -20,9 +20,8 @@ + #include + #endif + +-#if HAVE_SYS_PARAM_H && HAVE_SYS_MOUNT_H ++#if HAVE_SYS_PARAM_H + #include +-#include + #endif + + #include "srm.h" diff --git a/app-misc/srm/srm-1.2.8.ebuild b/app-misc/srm/srm-1.2.8-r1.ebuild similarity index 73% rename from app-misc/srm/srm-1.2.8.ebuild rename to app-misc/srm/srm-1.2.8-r1.ebuild index 5466ce12d791..c18853bb4962 100644 --- a/app-misc/srm/srm-1.2.8.ebuild +++ b/app-misc/srm/srm-1.2.8-r1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.8.ebuild,v 1.6 2005/01/01 15:24:55 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/srm/srm-1.2.8-r1.ebuild,v 1.1 2007/03/04 18:18:16 anant Exp $ + +inherit eutils DESCRIPTION="A command-line compatible rm which destroys file contents before unlinking." HOMEPAGE="http://sourceforge.net/projects/srm/" @@ -17,6 +19,12 @@ DEPEND="virtual/libc RDEPEND="virtual/libc !app-misc/secure-delete" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-remove-mount.patch +} + src_install() { make DESTDIR="${D}" install || die "make install failed" dodoc README Changes -- 2.26.2