rpms/cups/devel cups-1.1.16-system-auth.patch, 1.4, 1.5 cups.spec, 1.519, 1.520

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/cups/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2498

Modified Files:
	cups-1.1.16-system-auth.patch cups.spec 
Log Message:
* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1:1.4.1-3
- Use password-auth common PAM configuration instead of system-auth
  when available.


cups-1.1.16-system-auth.patch:
 Makefile           |   12 +++++++++---
 cups.password-auth |    4 ++++
 cups.system-auth   |    3 +++
 3 files changed, 16 insertions(+), 3 deletions(-)

Index: cups-1.1.16-system-auth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups-1.1.16-system-auth.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- cups-1.1.16-system-auth.patch	17 Mar 2006 12:10:57 -0000	1.4
+++ cups-1.1.16-system-auth.patch	16 Sep 2009 10:25:32 -0000	1.5
@@ -1,12 +1,14 @@
 --- cups-1.2svn-r5238/conf/Makefile.system-auth	2006-03-07 09:34:20.000000000 +0000
 +++ cups-1.2svn-r5238/conf/Makefile	2006-03-07 09:45:41.000000000 +0000
-@@ -79,10 +79,14 @@
+@@ -79,10 +79,16 @@
  	done
  	-if test x$(PAMDIR) != x; then \
  		$(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
 -		if test -r $(BUILDROOT)$(PAMDIR)/cups/$(PAMFILE) ; then \
 -			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
-+		if test -f /etc/pam.d/system-auth; then \
++		if test -f /etc/pam.d/password-auth; then \
++			$(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups ; \
++		elif test -f /etc/pam.d/system-auth; then \
 +			$(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups ; \
  		else \
 -			$(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
@@ -24,3 +26,10 @@
 +#%PAM-1.0
 +auth	include		system-auth
 +account	include		system-auth
+--- /dev/null	2006-03-07 09:12:30.964372750 +0000
++++ cups-1.2svn-r5238/conf/cups.password-auth	2006-03-07 09:43:12.000000000 +0000
+@@ -0,0 +1,4 @@
++#%PAM-1.0
++# Use password-auth common PAM configuration for the daemon
++auth        include     password-auth
++account     include     password-auth


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/devel/cups.spec,v
retrieving revision 1.519
retrieving revision 1.520
diff -u -p -r1.519 -r1.520
--- cups.spec	15 Sep 2009 10:11:01 -0000	1.519
+++ cups.spec	16 Sep 2009 10:25:32 -0000	1.520
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/1.4.0/cups-%{version}-source.tar.bz2
@@ -505,6 +505,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> 1:1.4.1-3
+- Use password-auth common PAM configuration instead of system-auth
+  when available.
+
 * Tue Sep 15 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.1-2
 - Fixed 'service cups status' to check for correct subsys name
   (bug #521641).