[arch-commits] Commit in cups/repos (extra-i686 extra-i686/PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, January 17, 2009 @ 16:36:38
  Author: andyrtr
Revision: 24520

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

........
  r24518 | andyrtr | 2009-01-17 21:33:17 +0000 (Sa, 17 Jan 2009) | 2 lines
  
  upgpkg: cups 1.3.9-4
      fix a SEC issue, #12781
........

Modified:
  cups/repos/extra-i686/	(properties)
  cups/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)


Property changes on: cups/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /cups/trunk:1-21402
   + /cups/trunk:1-24519
Deleted: svn:mergeinfo
   - 

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-01-17 21:33:48 UTC (rev 24519)
+++ extra-i686/PKGBUILD	2009-01-17 21:36:38 UTC (rev 24520)
@@ -3,20 +3,22 @@
 
 pkgname=cups
 pkgver=1.3.9
-pkgrel=3
+pkgrel=4
 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' 'gnutls>=2.4.1')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'xdg-utils' 'avahi' 'heimdal>=1.2.1-3' 'gnutls>=2.6.3')
 makedepends=('xinetd')
 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
         etc/xinetd.d/cups-lpd)
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
+	http://www.cups.org/strfiles/2974/str2974.patch
         cups cups.logrotate cups.pam cupsd.conf cups-1.3.7-peercred.patch)
 md5sums=('cf63f451c356e6cabb08972d4d11c365'
+         'a601f6fd4f4c2dac889b970a68a53b4b'
          '5c85b7d8d2ddd02c2c64955cebbf55ea'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17'
@@ -27,6 +29,7 @@
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -p1 < ../cups-1.3.7-peercred.patch || return 1
+  patch -Np0 -i ${srcdir}/str2974.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 \