Automatic import for version 1.1.4-9

pam.spec

@@ -1,20 +1,28 @@
-%define libname %mklibname %{name} 0
+%define major	0
+%define libname %mklibname %{name} %{major}
+%define libnamec %mklibname %{name}c %{major}
+%define libname_misc %mklibname %{name}_misc %{major}
 %define develname %mklibname %{name} -d
 
 %define with_prelude 0
 %{?_without_prelude: %{expand: %%global with_prelude 0}}
 %{?_with_prelude: %{expand: %%global with_prelude 1}}
 
+%define bootstrap 0
+%{?_without_bootstrap: %global bootstrap 0}
+%{?_with_bootstrap: %global bootstrap 1}
+
 %define pam_redhat_version 0.99.10-1
 
 Summary:	A security tool which provides authentication for applications
 Name:		pam
 Version:	1.1.4
-Release:	4
+Release:	9
 # 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+,
 License:	BSD and GPLv2+
 Group:		System/Libraries
+Url:		http://www.kernel.org/pub/linux/libs/pam/index.html
 Source0:	ftp://ftp.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2
 Source1:	ftp://ftp.kernel.org/pub/linux/libs/pam/library/Linux-PAM-%{version}.tar.bz2.sign
 Source2:	pam-redhat-%{pam_redhat_version}.tar.bz2
@@ -26,6 +34,9 @@ Source7:	config-util.pamd
 Source8:	dlopen.sh
 Source9:	system-auth.5
 Source10:	config-util.5
+#add missing documentation
+Source501: 	pam_tty_audit.8
+Source502:	README
 
 # RedHat patches
 Patch1:		pam-1.0.90-redhat-modules.patch
@@ -56,19 +67,14 @@ Patch701:	pam-1.1.0-console-nopermsd.patch
 # (proyvind): add missing constant that went with rpc removal from glibc 2.14
 Patch702:	Linux-PAM-1.1.4-add-now-missing-nis-constant.patch
 
-#add missing documentation
+BuildRequires:	bison
-Source501: 	pam_tty_audit.8
+BuildRequires:	cracklib-devel
-Source502:	README
+BuildRequires:	flex
-Requires:	cracklib-dicts
+%if !%{bootstrap}
-Requires:	setup >= 2.7.12-2
+# this pulls in the mega texlive load
-Requires:	pam_tcb >= 1.0.2-16
-Conflicts:	initscripts < 3.94
-Requires(pre):	rpm-helper
-Requires(post):	coreutils
-Requires(post):	tcb >= 1.0.2-16
-BuildRequires:	bison cracklib-devel flex
 BuildRequires:	linuxdoc-tools
-BuildRequires:	db_nss-devel >= 4.6
+%endif
+BuildRequires:	db_nss-devel
 BuildRequires:	openssl-devel
 BuildRequires:	libaudit-devel
 BuildRequires:	glibc-crypt_blowfish-devel
@@ -77,9 +83,13 @@ BuildRequires:	prelude-devel >= 0.9.0
 %else
 BuildConflicts:	prelude-devel
 %endif
-Obsoletes:	pamconfig
+Requires:	cracklib-dicts
-Provides:	pamconfig
+Requires:	setup >= 2.7.12-2
-Url:		http://www.kernel.org/pub/linux/libs/pam/index.html
+Requires:	pam_tcb >= 1.0.2-16
+Requires(pre):	rpm-helper
+Requires(post):	coreutils
+Requires(post):	tcb >= 1.0.2-16
+Conflicts:	%{_lib}pam0 < 1.1.4-5
 
 %description
 PAM (Pluggable Authentication Modules) is a system security tool that
@@ -92,31 +102,39 @@ Group:		System/Libraries
 Requires:	%{name} = %{EVRD}
 
 %description	doc
-PAM (Pluggable Authentication Modules) is a system security tool that
-allows system administrators to set authentication policy without
-having to recompile programs that handle authentication.
-
 This is the documentation package of %{name}.
 
 %package -n	%{libname}
-Summary:	Libraries for %{name}
+Summary:	Library for %{name}
 Group:		System/Libraries
-Conflicts:	%{name} < 0.99.8.1-10mdv
+Conflicts:	pam < 1.1.4-5
-Conflicts:	pam_tcb < 1.0.2-16
 
 %description -n	%{libname}
-PAM (Pluggable Authentication Modules) is a system security tool that
+This package contains the library libpam for %{name}.
-allows system administrators to set authentication policy without
-having to recompile programs that handle authentication.
 
-This package contains the libraries for %{name}.
+%package -n	%{libnamec}
+Summary:	Library for %{name}
+Group:		System/Libraries
+Conflicts:	%{_lib}pam0 < 1.1.4-5
+
+%description -n	%{libnamec}
+This package contains the library libpamc for %{name}.
+
+%package -n	%{libname_misc}
+Summary:	Library for %{name}
+Group:		System/Libraries
+Conflicts:	%{_lib}pam0 < 1.1.4-5
+
+%description -n	%{libname_misc}
+This package contains the library libpam_misc for %{name}.
 
 %package -n	%{develname}
 Summary:	Development headers and libraries for %{name}
 Group:		Development/Other
 Requires:	%{libname} = %{EVRD}
+Requires:	%{libnamec} = %{EVRD}
+Requires:	%{libname_misc} = %{EVRD}
 Provides:	%{name}-devel = %{EVRD}
-Obsoletes:	%{mklibname %{name} 0 -d} <= 0.99.8.1
 
 %description -n	%{develname}
 PAM (Pluggable Authentication Modules) is a system security tool that
@@ -160,7 +178,6 @@ mv pam-redhat-%{pam_redhat_version}/* modules
 #    sed -i "s/ $d / /" modules/Makefile.am
 #done
 
-
 install -m644 %{SOURCE501} %{SOURCE502} modules/pam_tty_audit/
 
 mkdir -p doc/txts
@@ -215,8 +232,8 @@ rm -f %{buildroot}/%{_lib}/*.la
 # (blino) we don't want to test if SE Linux is built, it's disabled
 # Make sure every module subdirectory gave us a module.  Yes, this is hackish.
 for dir in modules/pam_* ; do
-if [ -d ${dir} ] && [ ${dir} != "modules/pam_selinux" && [ ${dir} != "modules/pam_sepermit"  ]; then
+if [ -d ${dir} ] && [[ "${dir}" != "modules/pam_selinux" ]] && [[ "${dir}" != "modules/pam_sepermit" ]]; then
-         [ ${dir} = "modules/pam_tally" ] && continue
+         [[ "${dir}" = "modules/pam_tally" ]] && continue
 	if ! ls -1 %{buildroot}/%{_lib}/security/`basename ${dir}`*.so ; then
 		echo ERROR `basename ${dir}` did not build a module.
 		exit 1
@@ -229,7 +246,7 @@ done
 /sbin/ldconfig -n %{buildroot}/%{_lib}
 for module in %{buildroot}/%{_lib}/security/pam*.so ; do
 	if ! env LD_LIBRARY_PATH=%{buildroot}/%{_lib} \
-		 %{SOURCE8} -ldl -lpam -L%{buildroot}/%{_lib} ${module} ; then
+		sh %{SOURCE8} -ldl -lpam -L%{buildroot}/%{_lib} ${module} ; then
 		echo ERROR module: ${module} cannot be loaded.
 		exit 1
 	fi
@@ -243,15 +260,14 @@ if [ -f /etc/login.defs ] && ! grep -q USE_TCB /etc/login.defs; then
        /usr/sbin/set_tcb --auto --migrate
 fi
 
-
 %files -f Linux-PAM.lang
 %doc NEWS README.0.99.8.1.update.urpmi
 %docdir %{_docdir}/%{name}
 %dir /etc/pam.d
 %config(noreplace) /etc/environment
-%config(noreplace) /etc/pam.d/other
+%config /etc/pam.d/other
-%attr(0644,root,shadow) %config(noreplace) /etc/pam.d/system-auth
+%attr(0644,root,shadow) %config /etc/pam.d/system-auth
-%config(noreplace) /etc/pam.d/config-util
+%config /etc/pam.d/config-util
 /sbin/mkhomedir_helper
 /sbin/pam_console_apply
 /sbin/pam_tally2
@@ -271,18 +287,22 @@ fi
 %config(noreplace) %{_sysconfdir}/security/opasswd
 %dir %{_sysconfdir}/security/console.apps
 %dir %{_sysconfdir}/security/console.perms.d
+%dir /%{_lib}/security
+/%{_lib}/security/*.so
+/%{_lib}/security/pam_filter
 %dir /var/run/console
 %ghost %verify(not md5 size mtime) /var/log/tallylog
 %{_mandir}/man5/*
 %{_mandir}/man8/*
 
 %files -n %{libname}
-/%{_lib}/libpam.so.*
+/%{_lib}/libpam.so.%{major}*
-/%{_lib}/libpamc.so.*
+
-/%{_lib}/libpam_misc.so.*
+%files -n %{libnamec}
-/%{_lib}/security/*.so
+/%{_lib}/libpamc.so.%{major}*
-/%{_lib}/security/pam_filter
+
-%dir /%{_lib}/security
+%files -n %{libname_misc}
+/%{_lib}/libpam_misc.so.%{major}*
 
 %files -n %{develname}
 %doc Copyright
@@ -297,6 +317,37 @@ fi
 
 
 %changelog
+* Wed May 23 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1.1.4-9
++ Revision: 800224
+- add a versioned conflicts to deal with pam modules having been moved out of
+  library package, ensuring that the library package doesn't get upgraded
+  independent of the pam package which now ships the modules which would lead
+  to modules possibly missing and anything using pam left broken
+
+* Sun Apr 29 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1.1.4-8
++ Revision: 794382
+- pam files *really* shouldn't be config(noreplace) but rather %%config, otherwise
+  upgrades where these files has changed between releases will very easily turn
+  fugly (TODO: post RFC about this as a policy and implement rpmlint check to
+  enforce it)
+
+* Fri Mar 09 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1.1.4-7
++ Revision: 783687
+- rebuild to get rid of false devel() dependency in main package
+
+* Wed Mar 07 2012 Per Øyvind Karlsen <peroyvind@mandriva.org> 1.1.4-6
++ Revision: 782601
+- fix module subdirectory test
+- fix assumption of dlopen.sh being executable (which will no longer be true as
+  all files packaged with src.rpms are now always given 644 for attributes)
+- rebuild with internal dependency generator
+
+  + Matthew Dawkins <mattydaw@mandriva.org>
+    - rebuild for db_nss
+    - moved security modules to main pkg
+    - split up libs into individual pkgs
+    - cleaned up spec
+
 * Tue Dec 13 2011 Oden Eriksson <oeriksson@mandriva.com> 1.1.4-4
 + Revision: 740745
 - delete the libtool *.la files