summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-05-09 03:00:53 +0000
committerMike Frysinger <vapier@gentoo.org>2006-05-09 03:00:53 +0000
commitb183252bd46dfc466768dbfa81d885f3570d62de (patch)
tree6da660e0f753359b39184737ba420f04ad2f26d0 /sys-apps/shadow
parentignore nfs4 filesystems #132658 by kakou (diff)
downloadhistorical-b183252bd46dfc466768dbfa81d885f3570d62de.tar.gz
historical-b183252bd46dfc466768dbfa81d885f3570d62de.tar.bz2
historical-b183252bd46dfc466768dbfa81d885f3570d62de.zip
Last uClibc release still needs l64a() #132666 by solar.
Package-Manager: portage-2.1_pre10-r3
Diffstat (limited to 'sys-apps/shadow')
-rw-r--r--sys-apps/shadow/ChangeLog6
-rw-r--r--sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch37
-rw-r--r--sys-apps/shadow/shadow-4.0.15-r1.ebuild3
3 files changed, 44 insertions, 2 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index ea3ec7697ab7..012b7d64374e 100644
--- a/sys-apps/shadow/ChangeLog
+++ b/sys-apps/shadow/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-apps/shadow
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.139 2006/05/07 19:11:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.140 2006/05/09 03:00:53 vapier Exp $
+
+ 09 May 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/shadow-4.0.15-uclibc-missing-l64a.patch, shadow-4.0.15-r1.ebuild:
+ Last uClibc release still needs l64a() #132666 by solar.
*shadow-4.0.15-r1 (07 May 2006)
diff --git a/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch b/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch
new file mode 100644
index 000000000000..3adf1b8f90e8
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.15-uclibc-missing-l64a.patch
@@ -0,0 +1,37 @@
+uClibc svn has l64a() support in it, but not uClibc 0.9.28 release
+
+--- shadow-4.0.15/libmisc/salt.c
++++ shadow-4.0.15/libmisc/salt.c
+@@ -14,6 +14,32 @@
+ #include "prototypes.h"
+ #include "defines.h"
+ #include "getdef.h"
++
++#ifndef HAVE_A64L
++
++/*
++ * 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 --git a/sys-apps/shadow/shadow-4.0.15-r1.ebuild b/sys-apps/shadow/shadow-4.0.15-r1.ebuild
index 95330ebcb4f3..a11ec02b4079 100644
--- a/sys-apps/shadow/shadow-4.0.15-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.0.15-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.15-r1.ebuild,v 1.2 2006/05/08 03:52:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.15-r1.ebuild,v 1.3 2006/05/09 03:00:53 vapier Exp $
inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
@@ -54,6 +54,7 @@ src_unpack() {
# lock down setuid perms #47208
epatch "${FILESDIR}"/${PN}-4.0.11.1-perms.patch
+ epatch "${FILESDIR}"/${PN}-4.0.15-uclibc-missing-l64a.patch
epatch "${FILESDIR}"/${PN}-4.0.15-no-default-MAIL.patch
# Needed by the UCLIBC patches