[arch-commits] Commit in cups/repos (4 files)

Fri May 1 16:44:54 UTC 2009

Date: Friday, May 1, 2009 @ 12:44:54
  Author: andyrtr
Revision: 37428

Merged revisions 37426 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/cups/trunk

........
  r37426 | andyrtr | 2009-05-01 18:42:02 +0200 (Fr, 01 Mai 2009) | 2 lines
  
  upgpkg: cups 1.3.10-3
      ship upstream default config, only backup files we really ship in the pkg to /etc, compress printer ppd files, remove unneeded patches
........

Modified:
  cups/repos/extra-i686/	(properties)
  cups/repos/extra-i686/PKGBUILD
Deleted:
  cups/repos/extra-i686/cupsd.conf
  cups/repos/extra-i686/fr-template.patch

-------------------+
 PKGBUILD          |   30 ++++++++---------
 cupsd.conf        |   89 ----------------------------------------------------
 fr-template.patch |   19 -----------
 3 files changed, 15 insertions(+), 123 deletions(-)


Property changes on: cups/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /cups/trunk:1-36564
   + /cups/trunk:1-37427

Modified: extra-i686/PKGBUILD
===================================================================

--- extra-i686/PKGBUILD	2009-05-01 16:42:40 UTC (rev 37427)
+++ extra-i686/PKGBUILD	2009-05-01 16:44:54 UTC (rev 37428)
@@ -3,31 +3,32 @@
 
 pkgname=cups
 pkgver=1.3.10
-pkgrel=2
+pkgrel=3
 pkgdesc="The CUPS Printing System"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
 depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'avahi' 'heimdal>=1.2.1-3' 'gnutls>=2.6.5' 'poppler>=0.10.6')
-makedepends=('xinetd')
+makedepends=('xinetd' 'gzip')
 install=cups.install
-backup=(etc/cups/{printers.conf,client.conf,cupsd.conf,mime.types,mime.convs}
-        etc/cups/classes.conf etc/logrotate.d/cups etc/pam.d/cups
+backup=(etc/cups/cupsd.conf
+        etc/cups/mime.convs
+        etc/cups/mime.types
+        etc/cups/snmp.conf
+        etc/dbus-1/system.d/cups.conf
+        etc/logrotate.d/cups
+        etc/pam.d/cups
         etc/xinetd.d/cups-lpd)
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
-        cups cups.logrotate cups.pam cupsd.conf cups-1.3.7-peercred.patch)
-options=('!emptydirs' '!makeflags')
+        cups cups.logrotate cups.pam)
+options=('!emptydirs') #'!makeflags') seems smp safe now; find pkg/ | sort | wc -l gives 1815
 md5sums=('84fffe96b8537c81a463faccead80026'
          '5c85b7d8d2ddd02c2c64955cebbf55ea'
          'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17'
-         '3a55ba2b942182ab0bd2584c2138cb2d'
-         '99e54c2fc138360bb7622bea4f0977bc')
+         '96f82c38f3f540b53f3e5144900acf17')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -p1 < ../cups-1.3.7-peercred.patch || return 1
-  # fix french search template
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --with-logdir=/var/log/cups -with-docdir=/usr/share/cups/doc \
      --with-cups-user=daemon --with-cups-group=lp --enable-ssl=yes \
@@ -62,10 +63,9 @@
   chmod 755 ${startdir}/pkg/var/spool
   chmod 755 ${startdir}/pkg/etc
 
-  # add own cupsd.conf with saner defaults as normal file
-  rm ${startdir}/pkg/etc/cups/cupsd.conf
-  install -D -m 644 ${startdir}/src/cupsd.conf ${startdir}/pkg/etc/cups/cupsd.conf
-
   # fix .desktop file
   sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' $startdir/pkg/usr/share/applications/cups.desktop
+  
+  # compress some driver files, adopted from Fedora
+  find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
 }

Deleted: extra-i686/cupsd.conf
===================================================================
--- extra-i686/cupsd.conf	2009-05-01 16:42:40 UTC (rev 37427)
+++ extra-i686/cupsd.conf	2009-05-01 16:44:54 UTC (rev 37428)
@@ -1,89 +0,0 @@
-#
-# "$Id: cupsd.conf,v 1.1 2006/07/06 13:11:10 tpowa Exp $"
-#
-#   Sample configuration file for the Common UNIX Printing System (CUPS)
-#   scheduler.  See "man cupsd.conf" for a complete description of this
-#   file.
-#
-
-# Disable ssl by default, you have to generate own certs to use this feature eg. by this command:
-# openssl req -new -x509 -keyout /etc/cups/ssl/server.key -out /etc/cups/ssl/server.crt -days 365 -nodes
-# for other certs please refer to openssl manpage.
-# Setting Encryption to not required by default
-DefaultEncryption IfRequested
-
-
-# Log general information in error_log - change "info" to "debug" for
-# troubleshooting...
-LogLevel info
-
-# Administrator user group...
-SystemGroup sys root
-
-# Only listen for connections from the local machine.
-Listen localhost:631
-# Socket disabled by default it makes KDE fail on CUPS
-# Listen /var/run/cups/cups.sock
-# To allow remote connections add for example
-# Listen <yourserverip>:631
-
-# Show shared printers on the local network.
-Browsing On
-BrowseOrder allow,deny
-BrowseAllow @LOCAL
-
-# Default authentication type, when authentication is required...
-DefaultAuthType Basic
-
-# Restrict access to the server...
-# By default only localhost connections are possible
-<Location />
-  Order allow,deny
-  Allow localhost
-</Location>
-
-# Restrict access to the admin pages...
-<Location /admin>
-  # Encryption disabled by default
-  #Encryption Required
-  Order allow,deny
-  Allow localhost
-</Location>
-
-# Restrict access to configuration files...
-<Location /admin/conf>
-  AuthType Basic
-  Require user @SYSTEM
-  Order allow,deny
-  Allow localhost
-</Location>
-
-# Set the default printer/job policies...
-<Policy default>
-  # Job-related operations must be done by the owner or an adminstrator...
-  <Limit Send-Document Send-URI Hold-Job Release-Job Restart-Job Purge-Jobs Set-Job-Attributes Create-Job-Subscription Renew-Subscription Cancel-Subscription Get-Notifications Reprocess-Job Cancel-Current-Job Suspend-Current-Job Resume-Job CUPS-Move-Job>
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # All administration operations require an adminstrator to authenticate...
-  <Limit Pause-Printer Resume-Printer Set-Printer-Attributes Enable-Printer Disable-Printer Pause-Printer-After-Current-Job Hold-New-Jobs Release-Held-New-Jobs Deactivate-Printer Activate-Printer Restart-Printer Shutdown-Printer Startup-Printer Promote-Job Schedule-Job-After CUPS-Add-Printer CUPS-Delete-Printer CUPS-Add-Class CUPS-Delete-Class CUPS-Accept-Jobs CUPS-Reject-Jobs CUPS-Set-Default>
-    AuthType Basic
-    Require user @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  # Only the owner or an administrator can cancel or authenticate a job...
-  <Limit Cancel-Job CUPS-Authenticate-Job>
-    Require user @OWNER @SYSTEM
-    Order deny,allow
-  </Limit>
-
-  <Limit All>
-    Order deny,allow
-  </Limit>
-</Policy>
-
-#
-# End of "$Id: cupsd.conf,v 1.1 2006/07/06 13:11:10 tpowa Exp $".
-#

Deleted: extra-i686/fr-template.patch
===================================================================
--- extra-i686/fr-template.patch	2009-05-01 16:42:40 UTC (rev 37427)
+++ extra-i686/fr-template.patch	2009-05-01 16:44:54 UTC (rev 37428)
@@ -1,19 +0,0 @@
---- templates/fr/search.tmpl~	2007-02-05 21:25:50.000000000 +0100
-+++ templates/fr/search.tmpl	2007-03-04 10:50:26.000000000 +0100
-@@ -11,16 +11,4 @@
- SRC="/images/button-clear.gif" ALT="Nettoyer" CLASS="button"></A></P>
- 
- </FORM>
--<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
--{WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
--{ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
- 
--<P ALIGN="CENTER"><B>Rechercher dans 
--{SEARCH_DEST?{SEARCH_DEST}:{SECTION=classes?les classes:{SECTION=jobs?les tâches:les imprimantes}}} :</B>
--<INPUT TYPE="TEXT" NAME="QUERY" VALUE="{?QUERY}" SIZE="60"> <INPUT
--TYPE="IMAGE" SRC="/images/button-search.gif" ALT="Rechercher">
--<A
--HREF="/{SECTION}/{?SEARCH_DEST}{WHICH_JOBS??WHICH_JOBS={WHICH_JOBS}{ORDER?&ORDER={ORDER}:}:{ORDER??ORDER={ORDER}:}}"><IMG
--SRC="/images/button-clear.gif" ALT="Nettoyer" CLASS="button"></A></P>
--
--</FORM>


