[gentoo-commits] gentoo-x86 commit in sys-libs/cracklib/files: cracklib-2.8.16-no-nls.patch

[Mike Frysinger (vapier)]

vapier      10/09/28 15:35:45

  Added:                cracklib-2.8.16-no-nls.patch
  Log:
  Fix nls handling in python module too.
  
  (Portage version: 2.2_rc86/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-libs/cracklib/files/cracklib-2.8.16-no-nls.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/files/cracklib-2.8.16-no-nls.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/cracklib/files/cracklib-2.8.16-no-nls.patch?rev=1.1&content-type=text/plain

Index: cracklib-2.8.16-no-nls.patch
===================================================================
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);