From fb01eb19abb0fea2ad1be7d39477e89aa5192deb Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Sun, 2 May 2010 15:39:48 +0000 Subject: [PATCH] =?utf8?q?Version=20bump,=20as=20requested=20by=20Johan=20?= =?utf8?q?Bergstr=C3=B6m=20in=20bug=20#299729.=20Patched=20out=20a=20strnl?= =?utf8?q?en=20vs=20strlen=20typo.=20Dropped=20suspect=20DEPEND=20from=20o?= =?utf8?q?lder=20ebuild.=20Package-Manager:=20portage-2.2=5Frc67/cvs/Linux?= =?utf8?q?=20x86=5F64?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- sys-apps/cciss_vol_status/ChangeLog | 11 +++++++-- sys-apps/cciss_vol_status/Manifest | 15 +++++++----- .../cciss_vol_status-1.02.ebuild | 6 ++--- .../cciss_vol_status-1.06.ebuild | 23 +++++++++++++++++++ .../files/1.06-strlen-typo.patch | 12 ++++++++++ 5 files changed, 56 insertions(+), 11 deletions(-) create mode 100644 sys-apps/cciss_vol_status/cciss_vol_status-1.06.ebuild create mode 100644 sys-apps/cciss_vol_status/files/1.06-strlen-typo.patch diff --git a/sys-apps/cciss_vol_status/ChangeLog b/sys-apps/cciss_vol_status/ChangeLog index 729975600bb9..b7afc490468c 100644 --- a/sys-apps/cciss_vol_status/ChangeLog +++ b/sys-apps/cciss_vol_status/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-apps/cciss_vol_status -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/cciss_vol_status/ChangeLog,v 1.6 2009/07/22 15:46:34 fauli Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/cciss_vol_status/ChangeLog,v 1.7 2010/05/02 15:39:47 chainsaw Exp $ + +*cciss_vol_status-1.06 (02 May 2010) + + 02 May 2010; +files/1.06-strlen-typo.patch, + +cciss_vol_status-1.06.ebuild: + Version bump, as requested by Johan Bergström in bug #299729. Patched out + a strnlen vs strlen typo. 22 Jul 2009; Christian Faulhammer cciss_vol_status-1.03.ebuild: diff --git a/sys-apps/cciss_vol_status/Manifest b/sys-apps/cciss_vol_status/Manifest index ee64120e7c79..cabfb6bd96e6 100644 --- a/sys-apps/cciss_vol_status/Manifest +++ b/sys-apps/cciss_vol_status/Manifest @@ -1,16 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 1.06-strlen-typo.patch 505 RMD160 0c6bd5897c481ac25dea3e18ae052e30ba8c8979 SHA1 e4d8c93f952969649f542dc11a92193727785fa3 SHA256 4a73d097338f44d4d9a3aa4f3900da7f4196cbf67bb5d4ff33ce91a38dd78f9f DIST cciss_vol_status-1.02.tar.gz 78200 RMD160 852e78d5ff755c4d0150f8b7b245bd7b221b3545 SHA1 bcba44e3f97a0a721f5fbd308958e7540798db0e SHA256 79decfa5c51d052d0ddba3f7c733bcfaf4b46f4ac1e19d68cf0e461d8c980413 DIST cciss_vol_status-1.03.tar.gz 86581 RMD160 8a021bca637d7ff7e7038d04322fa60fc7aacd00 SHA1 9d69590f02f59100043ebd212727c263a0e7451b SHA256 b3cdcadba4dc8637c70aac9d594e32acbbe2bc323915cce5b2722e631c05c8c0 -EBUILD cciss_vol_status-1.02.ebuild 625 RMD160 53631610441932b1a1e04579c1a95760d7b070a3 SHA1 563eeae634a236bb605d2e6c77808fbce955480c SHA256 e70c3455c9c440d17b9aa44c57d217f4a76916aeacb51a906c4ba5cee5dbafae +DIST cciss_vol_status-1.06.tar.gz 95075 RMD160 8e0ddb26980368fa77bded6b0cf6f159f6a5bac7 SHA1 4da8ec2a73ddf1293f75dcb490bd1d1aca9e21a2 SHA256 ba9a120d08e51a62412631c2d5286c6ba8b4491c9ff8c8240c3b84c459074450 +EBUILD cciss_vol_status-1.02.ebuild 600 RMD160 727cc92f79aee5698817331428d10cb8f60daa39 SHA1 f82cfb43c1e2b8ef6fed1f8c66fc53a46aa23bdb SHA256 d2d729d9c4f3a1e62dca71127b8b6a0b01f7f5f624c46b1d867634dceecb0bf6 EBUILD cciss_vol_status-1.03.ebuild 608 RMD160 871075d5ae6b06bc5f5a2454bdf3abf9845a6cb8 SHA1 59dff62d10dc14a4276a4b0abdf71ed757b4a718 SHA256 b28ba94c22806c8d5d2310f1cc6dc513efa04e5a80649f6b90e194dbbcac8ad8 -MISC ChangeLog 1707 RMD160 f7f58452fb21dcfab9ce4a7650c08d093a46fb20 SHA1 a48b61ab12060738ceb3e50b5a7624d17a46b2c3 SHA256 88556338c63511cee5b061422bbe8172073de61c681d88f48ba00701c5e91e9c +EBUILD cciss_vol_status-1.06.ebuild 685 RMD160 d7daa8bf2dfc90009475948c35a46d28ab5faaca SHA1 f631dfff9108ed53c0b7bf459143853525794f2b SHA256 92c8794d536c93109f35cbc6c8b506b99217e6fa58614d0d0de535dfebd11642 +MISC ChangeLog 1955 RMD160 9f366988eac6213eda038afa4d13f9d0428e8e85 SHA1 23647a621ec8ed914f1e1ae0aea41fb4c574733f SHA256 c42743c544278951456790d357aa6f361c6bd1baa3f007c358ac56f8df103456 MISC metadata.xml 254 RMD160 823c99a514af57fe285c45f08538b7cc18e6342a SHA1 de5f6d0faac7d5f11daa399f9e875c30cac2ce64 SHA256 2817a53a07dd68fef8ec5467cb1a8441e87d77bd7eaf8ce9971de1adfbab7bdc -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) +Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkpnNGAACgkQNQqtfCuFneOB5gCgmQ3HPku8w/qo+PSNgDQFCqjR -/CQAn3ySiZKHIrkfKhkWH+61N4YM3oWz -=TSsP +iEYEARECAAYFAkvdnRQACgkQp5vW4rUFj5qqHgCgnV7Ww9JqgE+jIKw+Xdt+eMK4 +kXsAoKJUQMNUrlk9yURKYDiwCtCW3rVC +=vwml -----END PGP SIGNATURE----- diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.02.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.02.ebuild index 214b81309c7c..7f36614bbc7b 100644 --- a/sys-apps/cciss_vol_status/cciss_vol_status-1.02.ebuild +++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.02.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/cciss_vol_status/cciss_vol_status-1.02.ebuild,v 1.4 2008/02/15 13:35:06 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/cciss_vol_status/cciss_vol_status-1.02.ebuild,v 1.5 2010/05/02 15:39:47 chainsaw Exp $ IUSE="" DESCRIPTION="Shows status of logical drives attached to HP SmartArray controllers." @@ -9,7 +9,7 @@ LICENSE="GPL-2" SRC_URI="mirror://sourceforge/cciss/${P}.tar.gz" KEYWORDS="amd64 x86" SLOT="0" -DEPEND=">=sys-devel/autoconf-2.59" +DEPEND="" src_install() { emake DESTDIR="${D}" install || die "Install failed." diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.06.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.06.ebuild new file mode 100644 index 000000000000..8492f11994d5 --- /dev/null +++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.06.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/cciss_vol_status/cciss_vol_status-1.06.ebuild,v 1.1 2010/05/02 15:39:47 chainsaw Exp $ + +EAPI=3 +inherit base + +IUSE="" +DESCRIPTION="Shows status of logical drives attached to HP SmartArray controllers." +HOMEPAGE="http://cciss.sourceforge.net/#cciss_utils" +LICENSE="GPL-2" +SRC_URI="mirror://sourceforge/cciss/${P}.tar.gz" +KEYWORDS="~amd64 ~x86" +SLOT="0" +RDEPEND="" +DEPEND="" + +PATCHES=( "${FILESDIR}/${PV}-strlen-typo.patch" ) + +src_install() { + emake DESTDIR="${D}" install || die "Install failed." + dodoc AUTHORS ChangeLog NEWS README +} diff --git a/sys-apps/cciss_vol_status/files/1.06-strlen-typo.patch b/sys-apps/cciss_vol_status/files/1.06-strlen-typo.patch new file mode 100644 index 000000000000..a65f29dac087 --- /dev/null +++ b/sys-apps/cciss_vol_status/files/1.06-strlen-typo.patch @@ -0,0 +1,12 @@ +diff -uNr cciss_vol_status-1.06.ORIG//cciss_vol_status.c cciss_vol_status-1.06/cciss_vol_status.c +--- cciss_vol_status-1.06.ORIG//cciss_vol_status.c 2010-05-02 16:33:47.634833662 +0100 ++++ cciss_vol_status-1.06/cciss_vol_status.c 2010-05-02 16:34:03.351822015 +0100 +@@ -1004,7 +1004,7 @@ + if (status < 0) + return 0; + for (i = 0; prod[i] != NULL; i++) { +- if (strncmp(std_inq+8, prod[i], strnlen(prod[i])) == 0) ++ if (strncmp(std_inq+8, prod[i], strlen(prod[i])) == 0) + return 1; + } + return 0; -- 2.26.2