summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-07-15 04:55:12 +0000
committerMike Frysinger <vapier@gentoo.org>2006-07-15 04:55:12 +0000
commite7a7b2ef067dccd029e3123cad6b0f46d7a33193 (patch)
tree6c3a8ad4198fcf3aea49025aa4f7cc82be675d48 /sys-apps
parentarm/sh stable to shut flameeyes up (diff)
downloadgentoo-2-e7a7b2ef067dccd029e3123cad6b0f46d7a33193.tar.gz
gentoo-2-e7a7b2ef067dccd029e3123cad6b0f46d7a33193.tar.bz2
gentoo-2-e7a7b2ef067dccd029e3123cad6b0f46d7a33193.zip
Fix by Ulrich Mueller for building with USE=skey #139966.
(Portage version: 2.1.1_pre2-r4)
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/shadow/ChangeLog6
-rw-r--r--sys-apps/shadow/files/shadow-4.0.17-no-local-getpass.patch23
-rw-r--r--sys-apps/shadow/shadow-4.0.17.ebuild4
3 files changed, 31 insertions, 2 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog
index b770a7275101..6346f35e5fc4 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.155 2006/07/11 03:36:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.156 2006/07/15 04:55:12 vapier Exp $
+
+ 15 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+ +files/shadow-4.0.17-no-local-getpass.patch, shadow-4.0.17.ebuild:
+ Fix by Ulrich Mueller for building with USE=skey #139966.
*shadow-4.0.17 (11 Jul 2006)
diff --git a/sys-apps/shadow/files/shadow-4.0.17-no-local-getpass.patch b/sys-apps/shadow/files/shadow-4.0.17-no-local-getpass.patch
new file mode 100644
index 000000000000..3292e9a46096
--- /dev/null
+++ b/sys-apps/shadow/files/shadow-4.0.17-no-local-getpass.patch
@@ -0,0 +1,23 @@
+libshadow_getpass() was punted in 4.0.17
+
+http://bugs.gentoo.org/139966
+
+Patch by Ulrich Mueller
+
+Index: configure.in
+===================================================================
+RCS file: /cvsroot/shadow/configure.in,v
+retrieving revision 1.145
+diff -u -p -r1.145 configure.in
+--- configure.in 25 Jun 2006 12:30:47 -0000 1.145
++++ configure.in 15 Jul 2006 04:51:29 -0000
+@@ -329,9 +329,6 @@ if test "$with_skey" = "yes"; then
+ ],[
+ skeychallenge((void*)0, (void*)0, (void*)0, 0);
+ ],[AC_DEFINE(SKEY_BSD_STYLE, 1, [Define to support newer BSD S/Key API])])
+- dnl libshadow_getpass() handles password prompt with enabled echo
+- AC_DEFINE(getpass, libshadow_getpass,
+- [Define to libshadow_getpass to use our own version of getpass().])
+ fi
+
+ AM_GNU_GETTEXT_VERSION(0.12.1)
diff --git a/sys-apps/shadow/shadow-4.0.17.ebuild b/sys-apps/shadow/shadow-4.0.17.ebuild
index 41aa0b89a80c..1fdeb265d233 100644
--- a/sys-apps/shadow/shadow-4.0.17.ebuild
+++ b/sys-apps/shadow/shadow-4.0.17.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.17.ebuild,v 1.1 2006/07/11 03:36:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.0.17.ebuild,v 1.2 2006/07/15 04:55:12 vapier Exp $
inherit eutils libtool toolchain-funcs flag-o-matic autotools pam
@@ -58,6 +58,8 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-4.0.16-fix-useradd-usergroups.patch #128715
+ epatch "${FILESDIR}"/${PN}-4.0.17-no-local-getpass.patch
+
# Needed by the UCLIBC patches
eautoconf || die