diff options
| author |   Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2010-06-01 18:34:25 +0000 |
|---|---|---|
| committer | Stanislav Ochotnicky <sochotnicky@gentoo.org> | 2010-06-01 18:34:25 +0000 |
| commit | 4ad74ea16843bc86eaebb7c07c344111581afc66 (patch) | |
| tree | bdaadbc1199ecbc39fd1ea96be5e5f6be6b6f7e0 /app-arch | |
| parent | Version bump. (diff) | |
| download | gentoo-2-4ad74ea16843bc86eaebb7c07c344111581afc66.tar.gz gentoo-2-4ad74ea16843bc86eaebb7c07c344111581afc66.tar.bz2 gentoo-2-4ad74ea16843bc86eaebb7c07c344111581afc66.zip | |
Fix for bug #227939
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'app-arch')
| -rw-r--r-- | app-arch/rpm/ChangeLog | 6 | ||||
| -rw-r--r-- | app-arch/rpm/files/rpm-4.4.7-have-locale-h.patch | 11 | ||||
| -rw-r--r-- | app-arch/rpm/rpm-4.4.7-r5.ebuild | 3 |
3 files changed, 18 insertions, 2 deletions
diff --git a/app-arch/rpm/ChangeLog b/app-arch/rpm/ChangeLog index b90f3ef43fa6..3570938cc9c1 100644 --- a/app-arch/rpm/ChangeLog +++ b/app-arch/rpm/ChangeLog @@ -1,6 +1,10 @@ # 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.112 2010/05/12 18:49:00 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/ChangeLog,v 1.113 2010/06/01 18:34:25 sochotnicky Exp $ + + 01 Jun 2010; Stanislav Ochotnicky <sochotnicky@gentoo.org> + rpm-4.4.7-r5.ebuild, +files/rpm-4.4.7-have-locale-h.patch: + Fix for bug #227939 *rpm-4.4.7-r5 (12 May 2010) diff --git a/app-arch/rpm/files/rpm-4.4.7-have-locale-h.patch b/app-arch/rpm/files/rpm-4.4.7-have-locale-h.patch new file mode 100644 index 000000000000..7f2c51e5754a --- /dev/null +++ b/app-arch/rpm/files/rpm-4.4.7-have-locale-h.patch @@ -0,0 +1,11 @@ +diff -ur rpm-4.4.7.orig/configure.ac rpm-4.4.7/configure.ac +--- rpm-4.4.7.orig/configure.ac 2010-04-06 22:43:07.000000000 +0300 ++++ rpm-4.4.7/configure.ac 2010-04-07 20:53:40.000000000 +0300 +@@ -1120,6 +1120,7 @@ + LIBS="$LIBS -lefence" + fi + ++AC_CHECK_HEADER([locale.h], [AC_DEFINE(HAVE_LOCALE_H, 1, [locale.h isn't properly included without this])]) + AC_CHECK_FUNCS(setlocale) + + dnl XXX Solaris <= 2.6 only permits 8 chars in password. diff --git a/app-arch/rpm/rpm-4.4.7-r5.ebuild b/app-arch/rpm/rpm-4.4.7-r5.ebuild index edaee0c5c614..3d5437e12270 100644 --- a/app-arch/rpm/rpm-4.4.7-r5.ebuild +++ b/app-arch/rpm/rpm-4.4.7-r5.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.4.7-r5.ebuild,v 1.2 2010/05/12 19:59:42 sochotnicky Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.4.7-r5.ebuild,v 1.3 2010/06/01 18:34:25 sochotnicky Exp $ inherit eutils autotools distutils perl-module flag-o-matic @@ -39,6 +39,7 @@ src_unpack() { epatch "${FILESDIR}"/rpm-4.4.6-buffer-overflow.patch epatch "${FILESDIR}"/${P}-qa-implicit-function-to-pointer.patch epatch "${FILESDIR}"/${P}-qa-fix-undefined.patch + epatch "${FILESDIR}"/${P}-have-locale-h.patch # bug 214799 epatch "${FILESDIR}"/${PN}-4.4.6-neon-0.28.patch |