Hi,

pam currently depends on cracklib which brings in an 8.5mb dictionary.
It's quite easy to remove this dependency. Any objections to me
requesting a pam OLPC-3 branch and applying the attached changes on the
F-9 package?

This has been in joyride for the last few releases and nobody has
reported any breakage.

--- F-9/pam.spec	2008-05-21 04:37:37.000000000 -0400
+++ OLPC-3/pam.spec	2008-07-21 11:41:27.000000000 -0400
@@ -1,3 +1,4 @@
+%define minimal_build 1
 %define db_version 4.6.21
 %define db_conflicting_version 4.7.0
 %define pam_redhat_version 0.99.9-1
@@ -5,7 +6,7 @@
 Summary: A security tool which provides authentication for applications
 Name: pam
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 # The library is BSD licensed with option to relicense as GPLv2+ - this option is redundant
 # as the BSD license allows that anyway. pam_timestamp and pam_console modules are GPLv2+,
 # pam_rhosts_auth module is BSD with advertising
@@ -48,13 +49,15 @@
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: cracklib, cracklib-dicts >= 2.8
 Requires(post): coreutils, /sbin/ldconfig
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake, libtool
 BuildRequires: bison, flex, sed
-BuildRequires: cracklib-devel, cracklib-dicts >= 2.8
 BuildRequires: perl, pkgconfig, gettext
+%if %{minimal_build} == 0
+Requires: cracklib, cracklib-dicts >= 2.8
+BuildRequires: cracklib-devel, cracklib-dicts >= 2.8
+%endif
 %if %{WITH_AUDIT}
 BuildRequires: audit-libs-devel >= 1.0.8
 Requires: audit-libs >= 1.0.8
@@ -160,6 +163,9 @@
 %if ! %{WITH_AUDIT}
 	--disable-audit \
 %endif
+%if %{minimal_build} == 1
+	--disable-cracklib \
+%endif
 	--with-db-uniquename=_pam
 make
 # we do not use _smp_mflags because the build of sources in yacc/flex fails
@@ -230,6 +236,9 @@
 %if ! %{WITH_SELINUX}
         [ ${dir} = "modules/pam_selinux" ] && continue
 %endif	
+%if %{minimal_build} == 1
+        [ ${dir} = "modules/pam_cracklib" ] && continue
+%endif
 	if ! ls -1 $RPM_BUILD_ROOT%{_moduledir}/`basename ${dir}`*.so ; then
 		echo ERROR `basename ${dir}` did not build a module.
 		exit 1
@@ -296,7 +305,9 @@
 %{_moduledir}/pam_access.so
 %{_moduledir}/pam_chroot.so
 %{_moduledir}/pam_console.so
+%if %{minimal_build} == 0
 %{_moduledir}/pam_cracklib.so
+%endif
 %{_moduledir}/pam_debug.so
 %{_moduledir}/pam_deny.so
 %{_moduledir}/pam_echo.so
@@ -384,6 +395,9 @@
 %doc doc/adg/*.txt doc/adg/html
 
 %changelog
+* Mon Jul 21 2008 Daniel Drake <[EMAIL PROTECTED]> 1.0.1-5
+- remove cracklib support
+
 * Wed May 21 2008 Tomas Mraz <[EMAIL PROTECTED]> 1.0.1-4
 - pam_namespace: allow safe creation of directories owned by user (#437116)
 - pam_unix: fix multiple error prompts on password change (#443872)
--- F-9/system-auth.pamd	2006-09-04 10:31:09.000000000 -0400
+++ OLPC-3/system-auth.pamd	2008-07-21 11:40:30.000000000 -0400
@@ -7,8 +7,7 @@
 
 account     required      pam_unix.so
 
-password    required      pam_cracklib.so try_first_pass retry=3
-password    sufficient    pam_unix.so try_first_pass use_authtok nullok md5 shadow
+password    sufficient    pam_unix.so try_first_pass nullok md5 shadow
 password    required      pam_deny.so
 
 session     optional      pam_keyinit.so revoke
_______________________________________________
Devel mailing list
Devel@lists.laptop.org
http://lists.laptop.org/listinfo/devel

Reply via email to