Added patch to actually disable nls support, to allow building on non-GLIBC systems.

Package-Manager: portage-2.1_pre1

4 files changed, 108 insertions, 6 deletions

diff --git a/sys-apps/pam-login/ChangeLog b/sys-apps/pam-login/ChangeLog
index d26c4ef1fe99..be44c2fc12dc 100644
--- a/sys-apps/pam-login/ChangeLog
+++ b/sys-apps/pam-login/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/pam-login
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.59 2005/10/09 22:42:36 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/ChangeLog,v 1.60 2005/12/18 20:45:17 flameeyes Exp $
+
+  18 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pam-login-3.17-nonls.patch, pam-login-3.17.ebuild:
+  Added patch to actually disable nls support, to allow building on non-GLIBC
+  systems.
 
   09 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
   pam-login-4.0.12.ebuild:
diff --git a/sys-apps/pam-login/Manifest b/sys-apps/pam-login/Manifest
index aa554b6f9cc8..614438353d20 100644
--- a/sys-apps/pam-login/Manifest
+++ b/sys-apps/pam-login/Manifest
@@ -1,4 +1,7 @@
-MD5 15d112a169586b4b1c3db5e7b3f9e5ed ChangeLog 8940
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 93953d6eadc8f6987fd49bf8ca897161 ChangeLog 9143
 MD5 bd631a67641c2ecb9f2da34226ca80a8 files/digest-pam-login-3.14 67
 MD5 e7f9dde204926c73a570b344556e4b1e files/digest-pam-login-3.17 67
 MD5 9375147f78a25196b654616c969af9a5 files/digest-pam-login-4.0.11.1-r2 69
@@ -10,6 +13,7 @@ MD5 e01e197ed3b6d2ec6ae83d23b33088b8 files/login.pamd-4.0 1019
 MD5 0021ec2d8f5fc517f0e74f7233fc16c9 files/pam-login-3.11-gcc33.patch 527
 MD5 7761083b62bdcb822f1b9533aab2e06c files/pam-login-3.11-lastlog-fix.patch 362
 MD5 128c7d12948df01d7348a7edede0c2fb files/pam-login-3.14-query_user_context.diff 635
+MD5 128f3033812aee3deb9f272647d0f033 files/pam-login-3.17-nonls.patch 1897
 MD5 2fdbabc344539e9dfd4955c061596a27 files/pam-login-3.17-query_user_context.patch 423
 MD5 95f7b8980169e81352229bd548909ea7 files/pam-login-4.0.10-fix-configure.patch 579
 MD5 44f064b586ea49c8e2dc1fca8b9e4599 files/pam-login-4.0.11.1-SUPATH.patch 1614
@@ -21,6 +25,13 @@ MD5 636f233fa173a998195016c3808173d4 files/pam-login-4.0.5-skey.patch 395
 MD5 97fac4bd3167fadfc2abaeaa819ccbde files/pam_login-Werror-off-ppc64.patch 511
 MD5 393d06cf4b76671f8e6ce72ac71bdad8 metadata.xml 218
 MD5 f6a4f4c2e8300f1db0e4daf8fc8999b6 pam-login-3.14.ebuild 2801
-MD5 15f16bbb5e752541cd8346d7aa5d5904 pam-login-3.17.ebuild 2874
+MD5 198152aaf42aac32d336b82ce482efb7 pam-login-3.17.ebuild 2995
 MD5 b14a60034b1653ab8897c834b7b2d26d pam-login-4.0.11.1-r2.ebuild 3988
 MD5 df176d893e727f84defe9cab73658e23 pam-login-4.0.12.ebuild 3995
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDpcpzAiZjviIA2XgRAnwTAJ9lAGylIyZCpKvWAJwgDZgOGzksLACeM3CM
+5f+ncclMfT6srs5nr2U8xXI=
+=ujS7
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/pam-login/files/pam-login-3.17-nonls.patch b/sys-apps/pam-login/files/pam-login-3.17-nonls.patch
new file mode 100644
index 000000000000..74590309c1f4
--- /dev/null
+++ b/sys-apps/pam-login/files/pam-login-3.17-nonls.patch
@@ -0,0 +1,82 @@
+Index: pam_login-3.17/src/faillog.c
+===================================================================
+--- pam_login-3.17.orig/src/faillog.c
++++ pam_login-3.17/src/faillog.c
+@@ -41,7 +41,10 @@
+ #include <unistd.h>
+ #include <getopt.h>
+ #include <locale.h>
++
++#ifdef ENABLE_NLS
+ #include <libintl.h>
++#endif
+ 
+ #include "faillog.h"
+ 
+@@ -92,9 +95,11 @@ int main (int argc, char **argv)
+ 	int c, anyflag = 0;
+ 	struct passwd *pwent;
+ 
++#ifdef ENABLE_NLS
+ 	setlocale (LC_ALL, "");
+ 	bindtextdomain (PACKAGE, LOCALEDIR);
+ 	textdomain (PACKAGE);
++#endif
+ 
+ 	/* try to open for read/write, if that fails - read only */
+ 
+Index: pam_login-3.17/src/lastlog.c
+===================================================================
+--- pam_login-3.17.orig/src/lastlog.c
++++ pam_login-3.17/src/lastlog.c
+@@ -41,7 +41,10 @@
+ #include <stdlib.h>
+ #include <getopt.h>
+ #include <locale.h>
++
++#ifdef ENABLE_NLS
+ #include <libintl.h>
++#endif
+ 
+ #ifndef _
+ #define _(s) gettext(s)
+@@ -77,9 +80,11 @@ int main (int argc, char **argv)
+ {
+ 	int c;
+ 
++#ifdef ENABLE_NLS
+ 	setlocale (LC_ALL, "");
+ 	bindtextdomain (PACKAGE, LOCALEDIR);
+ 	textdomain (PACKAGE);
++#endif
+ 
+ 	if ((lastlogfile = fopen (_PATH_LASTLOG, "r")) == (FILE *) 0) {
+ 		perror (_PATH_LASTLOG);
+Index: pam_login-3.17/src/login.c
+===================================================================
+--- pam_login-3.17.orig/src/login.c
++++ pam_login-3.17/src/login.c
+@@ -63,7 +63,11 @@
+ #include <sys/sysmacros.h>
+ #include <netdb.h>
+ #include <locale.h>
++
++#ifdef ENABLE_NLS
+ #include <libintl.h>
++#endif
++
+ #include <sys/sysmacros.h>
+ #include <linux/major.h>
+ #include <security/pam_appl.h>
+@@ -534,9 +538,11 @@ main (int argc, char **argv)
+ 
+   init_sighandler ();
+ 
++#ifdef ENABLE_NLS
+   setlocale (LC_ALL, "");
+   bindtextdomain ("pam_login", LOCALEDIR);
+   textdomain ("pam_login");
++#endif
+ 
+   setpriority (PRIO_PROCESS, 0, 0);
+ #ifdef HAVE_QUOTA
diff --git a/sys-apps/pam-login/pam-login-3.17.ebuild b/sys-apps/pam-login/pam-login-3.17.ebuild
index b9c9231ea5c1..7d0ff7dff5d8 100644
--- a/sys-apps/pam-login/pam-login-3.17.ebuild
+++ b/sys-apps/pam-login/pam-login-3.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.17.ebuild,v 1.13 2005/09/12 03:02:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pam-login/pam-login-3.17.ebuild,v 1.14 2005/12/18 20:45:17 flameeyes Exp $
 
 inherit gnuconfig eutils pam
 
@@ -34,6 +34,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-3.11-gcc33.patch
 	epatch ${FILESDIR}/${PN}-3.11-lastlog-fix.patch
 
+	# Make sure NLS is actually disable, fix building on non-GLIBC systems
+	# see bug #115953, and Gentoo/Alt technotes.
+	epatch "${FILESDIR}/${P}-nonls.patch"
+
 	# Disable query_user_context selinux code (only affects selinux)
 	# if on the selinux livecd, since it can cause the login to timeout
 	# if the user isnt ready
@@ -48,10 +52,10 @@ src_unpack() {
 src_compile() {
 	local myconf=
 
-	use nls || myconf="${myconf} --disable-nls"
 	use selinux && myconf="${myconf} --enable-selinux"
 
-	econf ${myconf} || die
+	econf \
+		$(use_enable nls)
 	emake || die "emake failed"
 }