diff options
| author |   Maxim Koltsov <maksbotan@gentoo.org> | 2011-09-13 18:43:15 +0000 |
|---|---|---|
| committer | Maxim Koltsov <maksbotan@gentoo.org> | 2011-09-13 18:43:15 +0000 |
| commit | 4a7a54cae2a7491e78311e769461f2153fef601a (patch) | |
| tree | 0576c5d1058754fd7e8a21760d8725a9778e1e87 | |
| parent | Drop maintainer due retirement, bug #225633 (diff) | |
| download | gentoo-2-4a7a54cae2a7491e78311e769461f2153fef601a.tar.gz gentoo-2-4a7a54cae2a7491e78311e769461f2153fef601a.tar.bz2 gentoo-2-4a7a54cae2a7491e78311e769461f2153fef601a.zip | |
Fix pathces issues reported by James Cloos <cloos@jhcloos.com>
(Portage version: 2.1.10.15/cvs/Linux x86_64)
| -rw-r--r-- | app-misc/hivex/ChangeLog | 9 | ||||
| -rw-r--r-- | app-misc/hivex/files/autoconf_fix-1.3.1.patch (renamed from app-misc/hivex/files/autoconf_fix-1.3.0.patch) | 0 | ||||
| -rw-r--r-- | app-misc/hivex/files/incorrect_format.patch | 22 | ||||
| -rw-r--r-- | app-misc/hivex/hivex-1.3.1.ebuild | 4 |
4 files changed, 10 insertions, 25 deletions
diff --git a/app-misc/hivex/ChangeLog b/app-misc/hivex/ChangeLog index e959a49374dc..18129acb6d85 100644 --- 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/files/autoconf_fix-1.3.0.patch b/app-misc/hivex/files/autoconf_fix-1.3.1.patch index 2a9495b51cea..2a9495b51cea 100644 --- a/app-misc/hivex/files/autoconf_fix-1.3.0.patch +++ b/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 index 7fa5ce56ac0a..000000000000 --- 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 9750d58008c4..5247672ce820 100644 --- 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() { |