r1149 - in trunk: hlfs shadow

archaic at linuxfromscratch.org archaic at linuxfromscratch.org
Fri Sep 30 19:28:52 PDT 2005


Author: archaic
Date: 2005-09-30 20:28:49 -0600 (Fri, 30 Sep 2005)
New Revision: 1149

Added:
   trunk/hlfs/shadow-4.0.12-uClibc-1.patch
   trunk/shadow/shadow-4.0.12-uClibc-1.patch
Log:
Added patch for shadow to build with uClibc (hlfs).

Added: trunk/hlfs/shadow-4.0.12-uClibc-1.patch
===================================================================
--- trunk/hlfs/shadow-4.0.12-uClibc-1.patch	2005-09-30 16:12:39 UTC (rev 1148)
+++ trunk/hlfs/shadow-4.0.12-uClibc-1.patch	2005-10-01 02:28:49 UTC (rev 1149)
@@ -0,0 +1,124 @@
+Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
+Date: 2005-09-30
+Initial Package Version: 4.0.12
+Upstream Status: Unknown
+Origin: Gentoo: shadow-4.0.10-nonis.patch and
+	shadow-4.0.11.1-uclibc-missing-l64a.patch
+Description: This is a combination of two patched needed to compile Shadow
+on uClibc.
+
+diff -Naur shadow-4.0.12.orig/libmisc/salt.c shadow-4.0.12/libmisc/salt.c
+--- shadow-4.0.12.orig/libmisc/salt.c	2005-06-14 20:27:35.000000000 +0000
++++ shadow-4.0.12/libmisc/salt.c	2005-09-30 23:26:11.000000000 +0000
+@@ -14,6 +14,57 @@
+ #include "prototypes.h"
+ #include "defines.h"
+ #include "getdef.h"
++
++#ifndef HAVE_A64L
++
++/*
++ * i64c - convert an integer to a radix 64 character
++ */
++
++int
++i64c(int i)
++{
++	if (i <= 0)
++		return ('.');
++
++	if (i == 1)
++		return ('/');
++
++	if (i >= 2 && i < 12)
++		return ('0' - 2 + i);
++
++	if (i >= 12 && i < 38)
++		return ('A' - 12 + i);
++
++	if (i >= 38 && i < 63)
++		return ('a' - 38 + i);
++
++	return ('z');
++}
++
++/*
++ * l64a - convert a long to a string of radix 64 characters
++ */
++
++char *
++l64a(long l)
++{
++	static	char	buf[8];
++	int	i = 0;
++
++	if (l < 0L)
++		return ((char *) 0);
++
++	do {
++		buf[i++] = i64c ((int) (l % 64));
++		buf[i] = '\0';
++	} while (l /= 64L, l > 0 && i < 6);
++
++	return (buf);
++}
++
++#endif /* !HAVE_A64L */
++
+ /*
+  * Generate 8 base64 ASCII characters of random salt.  If MD5_CRYPT_ENAB
+  * in /etc/login.defs is "yes", the salt string will be prefixed by "$1$"
+diff -Naur shadow-4.0.12.orig/src/login_nopam.c shadow-4.0.12/src/login_nopam.c
+--- shadow-4.0.12.orig/src/login_nopam.c	2005-07-02 17:53:06.000000000 +0000
++++ shadow-4.0.12/src/login_nopam.c	2005-09-30 23:26:03.000000000 +0000
+@@ -50,7 +50,9 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>		/* for inet_ntoa() */
+ extern struct group *getgrnam ();
++#ifdef USE_NIS
+ extern int innetgr ();
++#endif
+ 
+ #if !defined(MAXHOSTNAMELEN) || (MAXHOSTNAMELEN < 64)
+ #undef MAXHOSTNAMELEN
+@@ -185,6 +187,7 @@
+ 	return (name);
+ }
+ 
++#ifdef USE_NIS
+ /* netgroup_match - match group against machine or user */
+ 
+ static int
+@@ -201,6 +204,7 @@
+ 
+ 	return innetgr (group, machine, user, mydomain);
+ }
++#endif
+ 
+ /* user_match - match a username against one token */
+ 
+@@ -224,8 +228,10 @@
+ 		*at = 0;
+ 		return (user_match (tok, string)
+ 			&& from_match (at + 1, myhostname ()));
++#ifdef USE_NIS
+ 	} else if (tok[0] == '@') {	/* netgroup */
+ 		return (netgroup_match (tok + 1, (char *) 0, string));
++#endif
+ 	} else if (string_match (tok, string)) {	/* ALL or exact match */
+ 		return (YES);
+ 	} else if ((group = getgrnam (tok))) {	/* try group membership */
+@@ -282,9 +288,13 @@
+ 	 * if it matches the head of the string.
+ 	 */
+ 
++#ifdef USE_NIS
+ 	if (tok[0] == '@') {	/* netgroup */
+ 		return (netgroup_match (tok + 1, string, (char *) 0));
+ 	} else if (string_match (tok, string)) {	/* ALL or exact match */
++#else
++	if (string_match (tok, string)) {	/* ALL or exact match */
++#endif
+ 		return (YES);
+ 	} else if (tok[0] == '.') {	/* domain: match last fields */
+ 		if ((str_len = strlen (string)) > (tok_len = strlen (tok))

Added: trunk/shadow/shadow-4.0.12-uClibc-1.patch
===================================================================
--- trunk/shadow/shadow-4.0.12-uClibc-1.patch	2005-09-30 16:12:39 UTC (rev 1148)
+++ trunk/shadow/shadow-4.0.12-uClibc-1.patch	2005-10-01 02:28:49 UTC (rev 1149)
@@ -0,0 +1 @@
+link ../hlfs/shadow-4.0.12-uClibc-1.patch
\ No newline at end of file


Property changes on: trunk/shadow/shadow-4.0.12-uClibc-1.patch
___________________________________________________________________
Name: svn:special
   + *




More information about the patches mailing list