[arch-commits] CVS update of extra/kde/kdebase (PKGBUILD)

[Tobias Powalowski]

    Date: Saturday, September 29, 2007 @ 12:25:00
  Author: tpowa
    Path: /home/cvs-extra/extra/kde/kdebase

Modified: PKGBUILD (1.85 -> 1.86)

'upgpgk: added security fixes'


----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)


Index: extra/kde/kdebase/PKGBUILD
diff -u extra/kde/kdebase/PKGBUILD:1.85 extra/kde/kdebase/PKGBUILD:1.86
--- extra/kde/kdebase/PKGBUILD:1.85	Sat Aug 18 10:31:16 2007
+++ extra/kde/kdebase/PKGBUILD	Sat Sep 29 12:24:59 2007
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD,v 1.85 2007/08/18 14:31:16 tpowa Exp $
+# $Id: PKGBUILD,v 1.86 2007/09/29 16:24:59 tpowa Exp $
 # Contributor: Roman Kreisel <roman.kreisel at epost.de>
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kdebase
 pkgver=3.5.7
 kdever=3.5.7 # if minor 0, then without .0
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Base Programs."
 arch=(i686 x86_64)
 url="http://www.kde.org"
@@ -15,7 +15,7 @@
 depends=('kdelibs>=3.5.7' 'libldap' 'eject>=2.1.5' 'lm_sensors' 'mtools' 'libusb' 'libraw1394' 'cyrus-sasl' \
 	 'libxcomposite' 'libxdamage' 'hal>=0.5.8.1-2' 'pmount>=0.9.13-2' 'libxxf86misc' 'libxkbfile' 'libxss' \
 	 'libfontenc' 'dbus-qt3' 'xorg-xauth' 'db>=4.5')
-backup=('opt/kde/share/config/kdm/Xservers' \
+backup=('opt/kde/share/config/kdm/Xservers' 'opt/kde/share/config/kdm/kdmrc' \
         'opt/kde/share/config/kdm/Xaccess' 'opt/kde/share/config/kdm/Xresources' )
 
 # for easier build, just uncomment the mirror you want to use
@@ -24,7 +24,8 @@
 # mirror="ibiblio.org/pub/mirrors/kde/"     # ibiblio mirror
 
 source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2
-	ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-konqueror.diff
+	ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-konqueror-2.diff
+	ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-kdm.diff
 	tango.diff kdm-grub.patch)
 
 
@@ -41,7 +42,8 @@
   export PATH=$PATH:/usr/X11R6/bin
   cd $startdir/src/$pkgname-$pkgver
   # fix security issue
-  patch -Np0 -i ../post-3.5.7-kdebase-konqueror.diff || return 1
+  patch -Np0 -i ../post-3.5.7-kdebase-konqueror-2.diff || return 1
+  patch -Np0 -i ../post-3.5.7-kdebase-kdm.diff || return 1
   patch -Np1 -i ../kdm-grub.patch || return 1
   patch -Np0 -i ../tango.diff || return 1
   sed -i -e 's/applications-merged/kde-applications-merged/g' applnk/Makefile.{am,in}
@@ -79,5 +81,6 @@
 }
 md5sums=('b421e01b3ee712549ee967f58ed24de0'
          'e15d6b5580c5a20ab935f8e553d113e0'
+         'ee6c57046902c5b5a32a4699558baafc'
          '43232dcb916b1d25e0ad7ef3575763a4'
          'f8645dc5d0044476a01c9c6a95c4853f')