Fix pathces issues reported by James Cloos <cloos@jhcloos.com>

Package-Manager: portage-2.1.10.15/cvs/Linux x86_64

diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog
index e959a49374dc415b5ce2836de22e0efd5ee749d1..18129acb6d8591a55ae45af4bc377a30a90d8b2f 100644 (file)
--- a/app-misc/hivex/ChangeLog
+++ b/app-misc/hivex/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/hivex
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.1 2011/09/06 17:17:33 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/ChangeLog,v 1.2 2011/09/13 18:43:15 maksbotan Exp $
+
+  13 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org>
+  -files/autoconf_fix-1.3.0.patch, hivex-1.3.1.ebuild,
+  +files/autoconf_fix-1.3.1.patch, -files/incorrect_format.patch:
+  Remove useless incorrect_format.patch, rename autoconf_fix path to apropriate
+  ${PV}. Thanks to James Cloos <cloos@jhcloos.com> for reporting issue, thanks
+  to Andreis Vinogradovs <spamslepnoga@inbox.ru> for providing way to fix.
 
 *hivex-1.3.1 (06 Sep 2011)
 

diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 9540dfab27264d9f28f8194736bdb98195303660..70935651d1208e42f207676519707d5c6fb68e4e 100644 (file)
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,6 +1,5 @@
-AUX autoconf_fix-1.3.0.patch 3561 RMD160 05d90b32f940649dc0bb0d959f70604e1cc84bdc SHA1 bb221c20105751f031ff1d2a2555de2ef88db730 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26
-AUX incorrect_format.patch 836 RMD160 ffba9ed5e67d0d99bbfd62d0fbc335d4bb59d8eb SHA1 7469d7e81a95ff829aaa4b2df724314efeba68c5 SHA256 13b9d2fe2f3e466aa244b10f9cf2e9b5919bc65f0f162ff5f55b87468c853768
+AUX autoconf_fix-1.3.1.patch 3561 RMD160 05d90b32f940649dc0bb0d959f70604e1cc84bdc SHA1 bb221c20105751f031ff1d2a2555de2ef88db730 SHA256 318b92cbecf6858a57188b7c4d1c2d18ba0daea84335825286bb4860c32ffe26
 DIST hivex-1.3.1.tar.gz 1078397 RMD160 5f42e555fae7c694421714b7e7e9909888b5b2f3 SHA1 71b54636b516f7c08767c826c2c630358f9e52de SHA256 dc18d94c88f088b9423ed429fe2fd95bab51fc66f86b6081a7c73e4093913328
-EBUILD hivex-1.3.1.ebuild 1671 RMD160 40b13714f2ee1c576f639e3cc2530680535f1949 SHA1 986ff0c9ee2939cdf732046675c6ffd630cbfb79 SHA256 6fb6b0f0cb8ffc78c684d6678b927ead1922db72e3531039f5d05058b6365778
-MISC ChangeLog 462 RMD160 2b96fc5ccaa36acc6872d471bf2a5e7d8ebd78fd SHA1 65e67bb79d59628d0801085fee796ca51a990e2e SHA256 b124857f2a5b6992fdd19884bbba3c2178312d1454191113250a4dc494347504
+EBUILD hivex-1.3.1.ebuild 1634 RMD160 17606b7cb8970680906c1d1c0d5f391400a7bd0e SHA1 973a83ec0ed727e3403c250205111c653008878d SHA256 088911ed1cc062ddf4f61158feff5817479b05635248502e1f29deac1e6b29fb
+MISC ChangeLog 870 RMD160 ddebe7e3a6e205d4e10b507811797201814242ec SHA1 a3e5ae33421895d6dd5f2bf5112c74960a078073 SHA256 43285de747b7478869deb65c6adf45c9400f3875bdb6efcbffc7b435df46180f
 MISC metadata.xml 320 RMD160 49623f4c60591eb15bff9e2b223973ce11e35e2c SHA1 1471a4deabf0a9d538751495c89a010a16b6479d SHA256 63b84e297acd5cbd83e9df619867e1d7b8db48537daaf37649387fe5cda56521

diff --git a/app-misc/hivex/files/autoconf_fix-1.3.0.patch b/app-misc/hivex/files/autoconf_fix-1.3.1.patch
similarity index 100%
rename from app-misc/hivex/files/autoconf_fix-1.3.0.patch
rename to app-misc/hivex/files/autoconf_fix-1.3.1.patch

diff --git a/app-misc/hivex/files/incorrect_format.patch b/app-misc/hivex/files/incorrect_format.patch
deleted file mode 100644 (file)
index 7fa5ce5..0000000
--- a/app-misc/hivex/files/incorrect_format.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Richard W.M. Jones <rjones@redhat.com>
-Date: Mon, 15 Aug 2011 09:52:00 +0000 (+0100)
-Subject: Fix incorrect printf format specifier in error string.
-X-Git-Url: http://git.annexia.org/?p=hivex.git;a=commitdiff_plain;h=5a4fd441d23f96ca618e55d4e54471d2e0fa94af
-
-Fix incorrect printf format specifier in error string.
----
-
-diff --git a/lib/hivex.c b/lib/hivex.c
-index dceea73..a3f5171 100644
---- a/lib/hivex.c
-+++ b/lib/hivex.c
-@@ -621,7 +621,8 @@ timestamp_check (hive_h *h, hive_node_h node, int64_t timestamp)
-   if (timestamp < 0) {
-     if (h->msglvl >= 2)
-       fprintf (stderr, "hivex: timestamp_check: "
--               "negative time reported at %z: %" PRIi64 "\n", node, timestamp);
-+               "negative time reported at %zu: %" PRIi64 "\n",
-+               node, timestamp);
-     errno = EINVAL;
-     return -1;
-   }

diff --git a/app-misc/hivex/hivex-1.3.1.ebuild b/app-misc/hivex/hivex-1.3.1.ebuild
index 9750d58008c47976553c5d36ad0a079a68c54ed7..5247672ce82076beb6634a897f259397a09fbddb 100644 (file)
--- a/app-misc/hivex/hivex-1.3.1.ebuild
+++ b/app-misc/hivex/hivex-1.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.1.ebuild,v 1.1 2011/09/06 17:17:33 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/hivex/hivex-1.3.1.ebuild,v 1.2 2011/09/13 18:43:15 maksbotan Exp $
 
 EAPI=3
 
@@ -37,7 +37,7 @@ DEPEND="${RDEPEND}
                                dev-perl/Test-Pod-Coverage ) )
        ruby? ( dev-ruby/rake )
        "
-PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch "${FILESDIR}"/incorrect_format.patch)
+PATCHES=("${FILESDIR}"/autoconf_fix-${PV}.patch)
 DOCS=(README)
 
 pkg_config() {