Gentoo Archives: gentoo-commits

From: "Diego Petteno (flameeyes)" <flameeyes@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-libs/pam/files: Linux-PAM-1.1.0-xcrypt.patch Linux-PAM-1.1.1-xcrypt.patch Linux-PAM-0.99.7.0-disable-regenerate-man.patch Linux-PAM-1.0.4-fix-tests.patch
Date: Mon, 26 Apr 2010 12:04:12
Message-Id: 20100426120409.B94542C043@corvid.gentoo.org
1 flameeyes 10/04/26 12:04:09
2
3 Added: Linux-PAM-1.1.0-xcrypt.patch
4 Linux-PAM-1.1.1-xcrypt.patch
5 Removed: Linux-PAM-0.99.7.0-disable-regenerate-man.patch
6 Linux-PAM-1.0.4-fix-tests.patch
7 Log:
8 Cleanup old ebuilds and files; add patches to disable libxcrypt automagic dependency (bug #317195).
9 (Portage version: 2.2_rc67/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.1 sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch?rev=1.1&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/files/Linux-PAM-1.1.0-xcrypt.patch?rev=1.1&content-type=text/plain
16
17 Index: Linux-PAM-1.1.0-xcrypt.patch
18 ===================================================================
19 Index: Linux-PAM-1.1.1/configure.in
20 ===================================================================
21 --- Linux-PAM-1.1.1.orig/configure.in
22 +++ Linux-PAM-1.1.1/configure.in
23 @@ -360,6 +360,10 @@ AC_SUBST(LIBAUDIT)
24 AC_CHECK_HEADERS(xcrypt.h crypt.h)
25 +AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
26 + [crypt_libs="xcrypt crypt"],
27 + [crypt_libs="crypt"])
28 +
29 BACKUP_LIBS=$LIBS
30 -AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
31 +AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
32 AC_CHECK_FUNCS(crypt_r crypt_gensalt_rn)
33 LIBS=$BACKUP_LIBS
34 AC_SUBST(LIBCRYPT)
35
36
37
38 1.1 sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch
39
40 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch?rev=1.1&view=markup
41 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-libs/pam/files/Linux-PAM-1.1.1-xcrypt.patch?rev=1.1&content-type=text/plain
42
43 Index: Linux-PAM-1.1.1-xcrypt.patch
44 ===================================================================
45 Index: Linux-PAM-1.1.1/configure.in
46 ===================================================================
47 --- Linux-PAM-1.1.1.orig/configure.in
48 +++ Linux-PAM-1.1.1/configure.in
49 @@ -361,10 +361,14 @@ AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS],
50 [test "x$HAVE_AUDIT_TTY_STATUS" = xyes])
51
52 AC_CHECK_HEADERS(xcrypt.h crypt.h)
53 +AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
54 + [crypt_libs="xcrypt crypt"],
55 + [crypt_libs="crypt"])
56 +
57 BACKUP_LIBS=$LIBS
58 -AC_SEARCH_LIBS([crypt],[xcrypt crypt], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
59 +AC_SEARCH_LIBS([crypt],[$crypt_libs], LIBCRYPT="-l$ac_lib", LIBCRYPT="")
60 AC_CHECK_FUNCS(crypt_r crypt_gensalt_r)
61 -Libs=$BACKUP_LIBS
62 +LIBS=$BACKUP_LIBS
63 AC_SUBST(LIBCRYPT)
64 if test "$LIBCRYPT" = "-lxcrypt" -a "$ac_cv_header_xcrypt_h" = "yes" ; then
65 AC_DEFINE([HAVE_LIBXCRYPT], 1, [Define to 1 if xcrypt support should be compiled in.])