summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-arch/rpm/ChangeLog8
-rw-r--r--app-arch/rpm/Manifest14
-rw-r--r--app-arch/rpm/rpm-4.8.1-r1.ebuild (renamed from app-arch/rpm/rpm-4.8.1.ebuild)6
3 files changed, 24 insertions, 4 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog
index 92b5dd3ad0f3..d7a940963a86 100644
--- a/app-arch/rpm/ChangeLog
+++ b/app-arch/rpm/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for app-arch/rpm
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.119 2010/12/14 02:04:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.120 2010/12/27 18:55:45 sochotnicky Exp $
+
+*rpm-4.8.1-r1 (27 Dec 2010)
+
+ 27 Dec 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org>
+ -rpm-4.8.1.ebuild, +rpm-4.8.1-r1.ebuild:
+ Fix #349840 (incorrect symlinks to /bin/rpm)
14 Dec 2010; Matt Turner <mattst88@gentoo.org> rpm-4.4.7-r4.ebuild,
rpm-4.4.7-r5.ebuild, rpm-4.4.7-r6.ebuild, rpm-4.8.1.ebuild,
diff --git a/app-arch/rpm/Manifest b/app-arch/rpm/Manifest
index 152aeb187e5a..8978d69b234c 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX rpm-4.4.6-autotools.patch 660 RMD160 63155d3737ffdf9927b1763ddf068c5964e168c9 SHA1 70dd2346df0e5d95ec4a06587485381b48d52b81 SHA256 dd4828899e760358b702d0c2ca75e781619f7b65140cf2cc5600ea687a085569
AUX rpm-4.4.6-buffer-overflow.patch 1952 RMD160 468c71731ec6893de165b4e1047f85f5b240f2f7 SHA1 dc41417f4064eb9476de9ef51e616042e55e5f73 SHA256 6ae715632dabd6cc6c24a92312ac22c1bd57235ff2f027f68943df68dcfc957b
AUX rpm-4.4.6-fix-cflags-stripping.patch 594 RMD160 a13c8d5d98ef6820bf41e6b4cbfe6f9d06545e8a SHA1 1f88f28a7a4df450768447087189c48bfc3fdefa SHA256 d1138a2b80797da7244ff1917178c104b56926f38708b0149be57f06e99233da
@@ -19,7 +22,14 @@ EBUILD rpm-4.4.6-r7.ebuild 3161 RMD160 3d7c39878d2efe7e907b15fb5ebb166fbaa95c1a
EBUILD rpm-4.4.7-r4.ebuild 3076 RMD160 ba4d697d2ce29499cbe254d292f7c222d5a19de1 SHA1 f354f0cac8d28b45b6a617f8c0a2e15a40fda74f SHA256 3256f1f6a3c7d9d6a523f9fe3acdd5709e5ca5a5ce5ed331fd182aa7aafa0d88
EBUILD rpm-4.4.7-r5.ebuild 3121 RMD160 b26b23f42e3a7cdcf638654f6841599e77cc4eb7 SHA1 c2b049c26787d880c1f42ef9e281882ad28ce428 SHA256 d5518e3ba7bc3c22021b0ea46eeb2c06ea67f144ee3020c7723423e078e5dd9b
EBUILD rpm-4.4.7-r6.ebuild 3206 RMD160 698da66f8b0642e58841009388dc4f6e7028ba78 SHA1 5c19e81212b69a38e7ae3fc867d45240e0f58b65 SHA256 55885980d8b2edd4fed54f5b487b3196fa20bcdf63f5a6ba9ccb7c72777ce11b
-EBUILD rpm-4.8.1.ebuild 2260 RMD160 31952a5b8aeb289632fa25168c96f6c9e5601128 SHA1 f884e956486be484925e28d5a5fd7943e799020d SHA256 e211194baccd66c01d97be7dc6bc951a13b850001886bbca8239d371bfc08e94
+EBUILD rpm-4.8.1-r1.ebuild 2397 RMD160 33d091b4afe1fc55ce8fd60c256dc5e5f07accad SHA1 c02e8f42506bfdcce1b699549a822e58456e1156 SHA256 c9832016a8ca6eaf2d1404dd24c6b24b75614b23276cac1f5e6159a16295333f
EBUILD rpm-5.1.6.ebuild 2966 RMD160 93a46162bdfc29e7b4441c94cb7d7fb379795c86 SHA1 a7888cea50c5e65c9cfdaeaf7486f702707d04a2 SHA256 7f07f2c6b0f936a47e5ee7d8b23d0282714419f6a06b63ac261385839d112767
-MISC ChangeLog 18702 RMD160 ee28cbc3121e78feb5f94c88e95800c4f204a7af SHA1 ef9428784167044e7eae71f586f8c21f186e1cd1 SHA256 fc19b0fe8462418836e9916de8b32f8ec2c5b28b4e66afc85fb39c5bf826dfaa
+MISC ChangeLog 18886 RMD160 3add46a84992abf4c1f28910c9b282e11759ae47 SHA1 f4886fcddc5e1fe6086306b85762b4ebcf3a82db SHA256 cb9ab1a8069a12de49a6f81126fedb610401b9df02893707c105a6ffecb0539f
MISC metadata.xml 433 RMD160 a9e016d167fe73783ef50feedc00a09a2a84ac0c SHA1 8bdca4e6a26bc1d49efd244a93d8dab7c8c9ea94 SHA256 9cfbc2d47795431299888f776524d37950ff3bbd083940d5560a2f5eb958ef4f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0Y4UEACgkQB9Uc/HGhZ3xckACgiaUAUzhMf0NRsajJmyKyNL/R
+SGUAnioUm1VUUum65AxQt4ZmlNhfA87b
+=2pbE
+-----END PGP SIGNATURE-----
diff --git a/app-arch/rpm/rpm-4.8.1.ebuild b/app-arch/rpm/rpm-4.8.1-r1.ebuild
index 0fe7c2691064..b061a7288b2b 100644
--- a/app-arch/rpm/rpm-4.8.1.ebuild
+++ b/app-arch/rpm/rpm-4.8.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.1.ebuild,v 1.3 2010/12/14 02:04:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.8.1-r1.ebuild,v 1.1 2010/12/27 18:55:45 sochotnicky Exp $
EAPI=2
@@ -70,6 +70,10 @@ src_install() {
mv "${D}"/bin/rpm "${D}"/usr/bin
rmdir "${D}"/bin
+ # fix symlinks to /bin/rpm (#349840)
+ for binary in rpmdb rpmquery rpmsign rpmverify;do
+ ln -sf rpm "${D}"/usr/bin/$binary
+ done
use nls || rm -rf "${D}"/usr/share/man/??