cups/patches/cups-1.1.16-system-auth.patch

   1 diff -up /dev/null cups-1.4.2/conf/cups.password-auth
   2 --- /dev/null   2009-11-10 09:17:06.284031490 +0000
   3 +++ cups-1.4.2/conf/cups.password-auth  2009-11-10 11:15:42.750666738 +0000
   4 @@ -0,0 +1,4 @@
   5 +#%PAM-1.0
   6 +# Use password-auth common PAM configuration for the daemon
   7 +auth        include     password-auth
   8 +account     include     password-auth
   9 diff -up cups-1.4.2/conf/cups.system-auth cups-1.4.2/conf/cups
  10 diff -up /dev/null cups-1.4.2/conf/cups.system-auth
  11 --- /dev/null   2009-11-10 09:17:06.284031490 +0000
  12 +++ cups-1.4.2/conf/cups.system-auth    2009-11-10 11:15:42.750666738 +0000
  13 @@ -0,0 +1,3 @@
  14 +#%PAM-1.0
  15 +auth   include         system-auth
  16 +account        include         system-auth
  17 diff -up cups-1.4.2/conf/Makefile.system-auth cups-1.4.2/conf/Makefile
  18 --- cups-1.4.2/conf/Makefile.system-auth        2009-09-22 22:53:31.000000000 +0100
  19 +++ cups-1.4.2/conf/Makefile    2009-11-10 11:18:44.188791989 +0000
  20 @@ -90,10 +90,16 @@ install-data:
  21         done
  22         -if test x$(PAMDIR) != x; then \
  23                 $(INSTALL_DIR) -m 755 $(BUILDROOT)$(PAMDIR); \
  24 -               if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
  25 -                       $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
  26 +               if test -f /etc/pam.d/password-auth; then \
  27 +                       $(INSTALL_DATA) cups.password-auth $(BUILDROOT)$(PAMDIR)/cups; \
  28 +               elif test -f /etc/pam.d/system-auth; then \
  29 +                       $(INSTALL_DATA) cups.system-auth $(BUILDROOT)$(PAMDIR)/cups; \
  30                 else \
  31 -                       $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
  32 +                       if test -r $(BUILDROOT)$(PAMDIR)/cups ; then \
  33 +                               $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups.N ; \
  34 +                       else \
  35 +                               $(INSTALL_DATA) $(PAMFILE) $(BUILDROOT)$(PAMDIR)/cups ; \
  36 +                       fi ; \
  37                 fi ; \
  38         fi
  39