[pkgsrc/trunk]: pkgsrc/security/PAM pkgsrc added --without-libcrack to CONFIG...

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/02377728de6d
branches:  trunk
changeset: 519803:02377728de6d
user:      ben <ben%pkgsrc.org@localhost>
date:      Tue Oct 10 03:20:48 2006 +0000

description:
pkgsrc added --without-libcrack to CONFIGURE_ARGS if libcrack is missing
from PKG_OPTIONS, and also comments out the libcrack module in the PLIST.
However this means nothing to the PAM configure script, which will find a
system libcrack and install the libcrack module.  When the pkgsrc bulk
build deinstalls PAM, it detects the leftover libcrack module and marks
PAM and its dependents failed.

Fix this by adding a --disable-crack option to the configure script.

diffstat:

 security/PAM/Makefile         |   6 ++--
 security/PAM/distinfo         |   6 ++--
 security/PAM/patches/patch-ab |  29 +++++++++++++++++++---
 security/PAM/patches/patch-ac |  54 ++++++++++++++++++++++++++++++++++++------
 4 files changed, 76 insertions(+), 19 deletions(-)

diffs (191 lines):

diff -r 439222bac82b -r 02377728de6d security/PAM/Makefile
--- a/security/PAM/Makefile     Tue Oct 10 02:43:15 2006 +0000
+++ b/security/PAM/Makefile     Tue Oct 10 03:20:48 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2006/02/05 23:10:41 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2006/10/10 03:20:48 ben Exp $
 #
 
 DISTNAME=      Linux-PAM-0.77
@@ -49,10 +49,10 @@
 ###
 .if !empty(PKG_OPTIONS:Mlibcrack)
 .  include "../../security/libcrack/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-libcrack
+CONFIGURE_ARGS+=       --enable-crack
 PLIST_SUBST+=          USE_LIBCRACK=
 .else
-CONFIGURE_ARGS+=       --without-libcrack
+CONFIGURE_ARGS+=       --disable-crack
 PLIST_SUBST+=          USE_LIBCRACK="@comment "
 .endif
 
diff -r 439222bac82b -r 02377728de6d security/PAM/distinfo
--- a/security/PAM/distinfo     Tue Oct 10 02:43:15 2006 +0000
+++ b/security/PAM/distinfo     Tue Oct 10 03:20:48 2006 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2006/06/06 00:57:59 minskim Exp $
+$NetBSD: distinfo,v 1.15 2006/10/10 03:20:48 ben Exp $
 
 SHA1 (Linux-PAM-0.77.tar.gz) = 58dff29aec3c0b6a9e9b53af6fb643056ce0f304
 RMD160 (Linux-PAM-0.77.tar.gz) = 15391ed7bed7b506bb391608b735332d0391580c
 Size (Linux-PAM-0.77.tar.gz) = 442569 bytes
 SHA1 (patch-aa) = 99f4889c24ff71a9e40e0e913d6071b78a326877
-SHA1 (patch-ab) = 02fbb08bc8f74860eada3bdb23333ec5c191f124
-SHA1 (patch-ac) = dfd528bc187fcfeaedaee0418549ac6a65c644f4
+SHA1 (patch-ab) = 19e8f38c500d46778af56f797682d14d1e586bf9
+SHA1 (patch-ac) = a7c153cdec1e3d7f09bb4a6a0f1d572d184231eb
 SHA1 (patch-ad) = 336101bd1779715eac39f4ef5e923745defd438f
 SHA1 (patch-ae) = 58c67c5ba430d2c5788717c6c7373dbf84d7b424
 SHA1 (patch-af) = 10917af14f4bfd27c7872144ca215efdfe68d132
diff -r 439222bac82b -r 02377728de6d security/PAM/patches/patch-ab
--- a/security/PAM/patches/patch-ab     Tue Oct 10 02:43:15 2006 +0000
+++ b/security/PAM/patches/patch-ab     Tue Oct 10 03:20:48 2006 +0000
@@ -1,9 +1,28 @@
-$NetBSD: patch-ab,v 1.4 2004/11/16 07:46:57 jlam Exp $
+$NetBSD: patch-ab,v 1.5 2006/10/10 03:20:48 ben Exp $
 
---- configure.in.orig  Tue Jul  9 02:17:13 2002
+--- configure.in.orig  2002-07-09 02:17:13.000000000 -0400
 +++ configure.in
-@@ -199,7 +199,7 @@ AC_CHECK_LIB(crack, FascistCheck, HAVE_L
+@@ -157,6 +157,10 @@ AC_ARG_ENABLE(lckpwdf,
+       WITH_LCKPWDF=no, WITH_LCKPWDF=yes)
+ AC_SUBST(WITH_LCKPWDF)
+ 
++AC_ARG_ENABLE(crack,
++[  --disable-crack do not use crack],
++      WITH_CRACK=no, WITH_CRACK=yes)
++
+ AC_CHECK_HEADERS(paths.h)
+ AC_ARG_WITH(mailspool,
+ [  --with-mailspool         path to mail spool directory
+@@ -195,11 +199,15 @@ dnl
+ dnl At least on Solaris, the existing libcrack must be dynamic.
+ dnl Ought to introduce a check for this.
+ dnl
++if test "$WITH_CRACK" = "yes"; then
+ AC_CHECK_LIB(crack, FascistCheck, HAVE_LIBCRACK=yes ; AC_DEFINE(HAVE_LIBCRACK),
        HAVE_LIBCRACK=no)
++else
++HAVE_LIBCRACK=no
++fi
  AC_SUBST(HAVE_LIBCRACK)
  
 -AC_CHECK_LIB(crypt, fcrypt, HAVE_LIBCRYPT=yes ; AC_DEFINE(HAVE_LIBCRYPT),
@@ -11,7 +30,7 @@
        HAVE_LIBCRYPT=no)
  AC_SUBST(HAVE_LIBCRYPT)
  AC_CHECK_LIB(util, logwtmp, HAVE_LIBUTIL=yes ; AC_DEFINE(HAVE_LIBUTIL),
-@@ -240,6 +240,13 @@ AC_CHECK_HEADERS(fcntl.h limits.h malloc
+@@ -240,6 +248,13 @@ AC_CHECK_HEADERS(fcntl.h limits.h malloc
  dnl Linux wants features.h in some of the source files.
  AC_CHECK_HEADERS(features.h)
  
@@ -25,7 +44,7 @@
  dnl For module/pam_cracklib
  AC_CHECK_HEADERS(crypt.h)
  
-@@ -257,7 +264,7 @@ dnl being found.
+@@ -257,7 +272,7 @@ dnl being found.
  
  dnl Look for cracklib dictionary
  AC_MSG_CHECKING(path to cracklib dictionary)
diff -r 439222bac82b -r 02377728de6d security/PAM/patches/patch-ac
--- a/security/PAM/patches/patch-ac     Tue Oct 10 02:43:15 2006 +0000
+++ b/security/PAM/patches/patch-ac     Tue Oct 10 03:20:48 2006 +0000
@@ -1,8 +1,46 @@
-$NetBSD: patch-ac,v 1.4 2004/11/16 07:46:57 jlam Exp $
+$NetBSD: patch-ac,v 1.5 2006/10/10 03:20:48 ben Exp $
 
---- configure.orig     Tue Jul  9 02:17:13 2002
+--- configure.orig     2002-07-09 02:17:13.000000000 -0400
 +++ configure
-@@ -1507,9 +1507,9 @@ fi
+@@ -47,6 +47,8 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --disable-lckpwdf do not use the lckpwdf function"
+ ac_help="$ac_help
++  --disable-crack do not use crack"
++ac_help="$ac_help
+   --with-mailspool         path to mail spool directory
+                            [default _PATH_MAILDIR if defined in paths.h, otherwise /var/spool/mail]"
+ 
+@@ -1168,6 +1170,14 @@ else
+   WITH_LCKPWDF=yes
+ fi
+ 
++# Check whether --enable-crack or --disable-crack was given.
++if test "${enable_crack+set}" = set; then
++  enableval="$enable_crack"
++  WITH_CRACK=no
++else
++  WITH_CRACK=yes
++fi
++
+ 
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+@@ -1461,6 +1471,7 @@ fi
+  
+ 
+ 
++if test "$WITH_CRACK" = "yes"; then
+ echo $ac_n "checking for FascistCheck in -lcrack""... $ac_c" 1>&6
+ echo "configure:1466: checking for FascistCheck in -lcrack" >&5
+ ac_lib_var=`echo crack'_'FascistCheck | sed 'y%./+-%__p_%'`
+@@ -1504,12 +1515,15 @@ else
+   echo "$ac_t""no" 1>&6
+ HAVE_LIBCRACK=no
+ fi
++else
++HAVE_LIBCRACK=no
++fi
  
  
  
@@ -15,7 +53,7 @@
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1521,10 +1521,10 @@ cat > conftest.$ac_ext <<EOF
+@@ -1521,10 +1535,10 @@ cat > conftest.$ac_ext <<EOF
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
      builtin and then its argument prototype would still apply.  */
@@ -28,7 +66,7 @@
  ; return 0; }
  EOF
  if { (eval echo configure:1531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-@@ -2312,7 +2312,7 @@ fi
+@@ -2312,7 +2326,7 @@ fi
  done
  
  
@@ -37,7 +75,7 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -2353,7 +2353,7 @@ fi
+@@ -2353,7 +2367,7 @@ fi
  done
  
  
@@ -46,7 +84,7 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-@@ -2393,6 +2393,143 @@ else
+@@ -2393,6 +2407,143 @@ else
  fi
  done
  
@@ -190,7 +228,7 @@
  HAVE_NDBM_H=$ac_cv_header_ndbm_h
  
  
-@@ -2439,8 +2576,8 @@ done
+@@ -2439,8 +2590,8 @@ done
  
  
  echo $ac_n "checking path to cracklib dictionary""... $ac_c" 1>&6