diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2010-09-28 15:35:45 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2010-09-28 15:35:45 +0000 |
| commit | 8546c1eee518430b99449d95b884663595a1e996 (patch) | |
| tree | 4b24f90775fc3eb40ca1a29a4caba47ad4d03eda /sys-libs | |
| parent | version bump (diff) | |
| download | gentoo-2-8546c1eee518430b99449d95b884663595a1e996.tar.gz gentoo-2-8546c1eee518430b99449d95b884663595a1e996.tar.bz2 gentoo-2-8546c1eee518430b99449d95b884663595a1e996.zip | |
Fix nls handling in python module too.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/cracklib/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/cracklib/cracklib-2.8.16.ebuild | 4 | ||||
| -rw-r--r-- | sys-libs/cracklib/files/cracklib-2.8.16-no-nls.patch | 36 |
3 files changed, 43 insertions, 3 deletions
diff --git a/sys-libs/cracklib/ChangeLog b/sys-libs/cracklib/ChangeLog index a084fa975080..8bfe9600ade3 100644 --- a/sys-libs/cracklib/ChangeLog +++ b/sys-libs/cracklib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/cracklib # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.155 2010/08/02 03:11:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/ChangeLog,v 1.156 2010/09/28 15:35:45 vapier Exp $ + + 28 Sep 2010; Mike Frysinger <vapier@gentoo.org> cracklib-2.8.16.ebuild, + +files/cracklib-2.8.16-no-nls.patch: + Fix nls handling in python module too. 02 Aug 2010; Jeroen Roovers <jer@gentoo.org> cracklib-2.8.16.ebuild: Stable for PPC (bug #329149). diff --git a/sys-libs/cracklib/cracklib-2.8.16.ebuild b/sys-libs/cracklib/cracklib-2.8.16.ebuild index f1f03ab03cb5..d78404905abd 100644 --- a/sys-libs/cracklib/cracklib-2.8.16.ebuild +++ b/sys-libs/cracklib/cracklib-2.8.16.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/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.12 2010/08/02 03:11:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/cracklib/cracklib-2.8.16.ebuild,v 1.13 2010/09/28 15:35:45 vapier Exp $ EAPI="3" PYTHON_DEPEND="python? 2" @@ -44,7 +44,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-2.8.15-no-nls.patch + epatch "${FILESDIR}"/${PN}-2.8.16-no-nls.patch epatch "${FILESDIR}"/${P}-python.patch elibtoolize #269003 use python && do_python diff --git a/sys-libs/cracklib/files/cracklib-2.8.16-no-nls.patch b/sys-libs/cracklib/files/cracklib-2.8.16-no-nls.patch new file mode 100644 index 000000000000..28903496186f --- /dev/null +++ b/sys-libs/cracklib/files/cracklib-2.8.16-no-nls.patch @@ -0,0 +1,36 @@ +fix building on uclibc when nls is disabled + +--- util/check.c ++++ util/check.c +@@ -21,7 +21,9 @@ + int i; + + setlocale(LC_ALL, ""); ++#ifdef ENABLE_NLS + textdomain(PACKAGE); ++#endif + + while (fgets(buf, sizeof(buf), stdin) != NULL) { + while (((i = strlen(buf)) > 0) && (i > 0)) { +--- python/_cracklibmodule.c ++++ python/_cracklibmodule.c +@@ -32,7 +32,9 @@ + #endif + #include <crack.h> + #include <locale.h> ++#ifdef HAVE_LIBINTL_H + #include <libintl.h> ++#endif + + #ifdef HAVE_PTHREAD_H + static pthread_mutex_t cracklib_mutex = PTHREAD_MUTEX_INITIALIZER; +@@ -133,7 +135,9 @@ + } + + setlocale(LC_ALL, ""); ++#ifdef ENABLE_NLS + textdomain("cracklib"); ++#endif + + LOCK(); + result = FascistCheck(candidate, dict ? dict : defaultdict); |