r3364 - in trunk: BOOK/introduction/welcome BOOK/postlfs/security patches

dj at linuxfromscratch.org dj at linuxfromscratch.org
Sun Jan 30 12:55:09 PST 2005


Author: dj
Date: 2005-01-30 13:55:08 -0700 (Sun, 30 Jan 2005)
New Revision: 3364

Added:
   trunk/patches/Linux-PAM-0.78-linkage-2.patch
Removed:
   trunk/patches/Linux-PAM-0.78-linkage-1.patch
Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/linux_pam.xml
Log:
Fixed Linux_PAM configure error without cracklib.

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-01-30 17:59:50 UTC (rev 3363)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-01-30 20:55:08 UTC (rev 3364)
@@ -22,6 +22,10 @@
 
 <itemizedlist>
 
+<listitem><para>January 30th, 2005 [dj]: Fixed craclib_dict_path check
+in Linux_PAM configure.  Added change to 
+Linux-PAM-linkage-2.patch.</para></listitem>
+
 <listitem><para>January 30th, 2005 [randy]: Separated root installation 
 commands from build commands in packages already indexed.</para></listitem>
 

Modified: trunk/BOOK/postlfs/security/linux_pam.xml
===================================================================
--- trunk/BOOK/postlfs/security/linux_pam.xml	2005-01-30 17:59:50 UTC (rev 3363)
+++ trunk/BOOK/postlfs/security/linux_pam.xml	2005-01-30 20:55:08 UTC (rev 3364)
@@ -45,7 +45,7 @@
 <sect3><title>Additional download</title>
 <itemizedlist spacing='compact'>
 <listitem><para>Required Patch: <ulink 
-url="&patch-root;/Linux-PAM-&Linux_PAM-version;-linkage-1.patch"/></para>
+url="&patch-root;/Linux-PAM-&Linux_PAM-version;-linkage-2.patch"/></para>
 </listitem></itemizedlist>
 </sect3>
 

Deleted: trunk/patches/Linux-PAM-0.78-linkage-1.patch
===================================================================
--- trunk/patches/Linux-PAM-0.78-linkage-1.patch	2005-01-30 17:59:50 UTC (rev 3363)
+++ trunk/patches/Linux-PAM-0.78-linkage-1.patch	2005-01-30 20:55:08 UTC (rev 3364)
@@ -1,56 +0,0 @@
-Submitted By: DJ Lucas (dj_AT_lucasit_DOT_com)
-Date: 2004-05-03
-Initial Package Version: 0.77
-Origin: Mandrake CVS (Jim Gifford) + cracklib source
-Description: Fixes linking on PAM and updates cracklib check
-
-$LastChangedBy$
-$Date$
-
-diff -Naur Linux-PAM-0.77-orig/configure.in Linux-PAM-0.77/configure.in
---- Linux-PAM-0.77-orig/configure.in	2002-07-09 01:17:13.000000000 -0500
-+++ Linux-PAM-0.77/configure.in	2004-04-30 17:06:17.000000000 -0500
-@@ -257,7 +257,7 @@
- 
- dnl Look for cracklib dictionary
- AC_MSG_CHECKING(path to cracklib dictionary)
--DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
-+DICT_DIR_CANDIDATES="/lib /usr/lib /usr/share/dict /usr/share/lib \
-   /usr/local/lib /usr/local/share/lib"
- DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
- CRACKLIB_DICTPATH=""
-diff -Naur Linux-PAM-0.77-orig/libpam_misc/Makefile Linux-PAM-0.77/libpam_misc/Makefile
---- Linux-PAM-0.77-orig/libpam_misc/Makefile	2002-06-26 23:04:54.000000000 -0500
-+++ Linux-PAM-0.77/libpam_misc/Makefile	2004-04-30 17:02:54.000000000 -0500
-@@ -38,6 +38,8 @@
- SLIBOBJECTS = $(addprefix static/,$(LIBOBJECTS))
- endif
- 
-+LINKLIBS += -L../libpam -lpam
-+
- # ---------------------------------------------
- ## rules
- 
-diff -Naur Linux-PAM-0.77-orig/modules/pam_cracklib/pam_cracklib.c Linux-PAM-0.77/modules/pam_cracklib/pam_cracklib.c
---- Linux-PAM-0.77-orig/modules/pam_cracklib/pam_cracklib.c	2001-11-27 00:09:48.000000000 -0600
-+++ Linux-PAM-0.77/modules/pam_cracklib/pam_cracklib.c	2004-04-30 17:04:05.000000000 -0500
-@@ -49,8 +49,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <ctype.h>
--
--extern char *FascistCheck(char *pw, const char *dictpath);
-+#include <crack.h>
- 
- #ifndef CRACKLIB_DICTPATH
- #define CRACKLIB_DICTPATH "/usr/share/dict/cracklib_dict"
-diff -Naur Linux-PAM-0.77-orig/modules/pam_lastlog/Makefile Linux-PAM-0.77/modules/pam_lastlog/Makefile
---- Linux-PAM-0.77-orig/modules/pam_lastlog/Makefile	2001-02-10 16:33:10.000000000 -0600
-+++ Linux-PAM-0.77/modules/pam_lastlog/Makefile	2004-04-30 17:02:54.000000000 -0500
-@@ -15,5 +15,6 @@
- endif
- 
- TITLE=pam_lastlog
-+MODULE_SIMPLE_EXTRALIBS=-lutil
- 
- include ../Simple.Rules

Added: trunk/patches/Linux-PAM-0.78-linkage-2.patch
===================================================================
--- trunk/patches/Linux-PAM-0.78-linkage-2.patch	2005-01-30 17:59:50 UTC (rev 3363)
+++ trunk/patches/Linux-PAM-0.78-linkage-2.patch	2005-01-30 20:55:08 UTC (rev 3364)
@@ -0,0 +1,66 @@
+Submitted By: DJ Lucas (dj_AT_lucasit_DOT_com)
+Date: 2004-05-03
+Initial Package Version: 0.77
+Origin: Mandrake CVS (Jim Gifford) + cracklib source
+Description: Fixes linking on PAM and updates cracklib check
+
+$LastChangedBy$
+$Date$
+
+
+diff -Naur Linux-PAM-0.78-orig/configure.in Linux-PAM-0.78/configure.in
+--- Linux-PAM-0.78-orig/configure.in	2004-10-06 09:04:34.000000000 -0500
++++ Linux-PAM-0.78/configure.in	2005-01-30 13:53:16.856763760 -0600
+@@ -262,7 +262,7 @@
+ 
+ dnl Look for cracklib dictionary
+ AC_MSG_CHECKING(path to cracklib dictionary)
+-DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
++DICT_DIR_CANDIDATES="/lib /usr/lib /usr/share/dict /usr/share/lib \
+   /usr/local/lib /usr/local/share/lib"
+ DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
+ CRACKLIB_DICTPATH=""
+@@ -278,7 +278,7 @@
+       done
+ done
+ if test -z "$CRACKLIB_DICTPATH" ; then
+-      AC_MSG_ERROR(none found)
++      AC_MSG_RESULT(none found)
+ else
+       AC_MSG_RESULT($CRACKLIB_DICTPATH)
+ fi
+diff -Naur Linux-PAM-0.78-orig/libpam_misc/Makefile Linux-PAM-0.78/libpam_misc/Makefile
+--- Linux-PAM-0.78-orig/libpam_misc/Makefile	2004-09-28 08:49:19.000000000 -0500
++++ Linux-PAM-0.78/libpam_misc/Makefile	2005-01-30 13:52:46.445386992 -0600
+@@ -38,6 +38,8 @@
+ SLIBOBJECTS = $(addprefix static/,$(LIBOBJECTS))
+ endif
+ 
++LINKLIBS += -L../libpam -lpam
++
+ # ---------------------------------------------
+ ## rules
+ 
+diff -Naur Linux-PAM-0.78-orig/modules/pam_cracklib/pam_cracklib.c Linux-PAM-0.78/modules/pam_cracklib/pam_cracklib.c
+--- Linux-PAM-0.78-orig/modules/pam_cracklib/pam_cracklib.c	2004-09-15 07:06:17.000000000 -0500
++++ Linux-PAM-0.78/modules/pam_cracklib/pam_cracklib.c	2005-01-30 13:52:46.446386840 -0600
+@@ -49,8 +49,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+-
+-extern char *FascistCheck(char *pw, const char *dictpath);
++#include <crack.h>
+ 
+ #ifndef CRACKLIB_DICTPATH
+ #define CRACKLIB_DICTPATH "/usr/share/dict/cracklib_dict"
+diff -Naur Linux-PAM-0.78-orig/modules/pam_lastlog/Makefile Linux-PAM-0.78/modules/pam_lastlog/Makefile
+--- Linux-PAM-0.78-orig/modules/pam_lastlog/Makefile	2001-02-10 16:33:10.000000000 -0600
++++ Linux-PAM-0.78/modules/pam_lastlog/Makefile	2005-01-30 13:52:46.446386840 -0600
+@@ -15,5 +15,6 @@
+ endif
+ 
+ TITLE=pam_lastlog
++MODULE_SIMPLE_EXTRALIBS=-lutil
+ 
+ include ../Simple.Rules


Property changes on: trunk/patches/Linux-PAM-0.78-linkage-2.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list