Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

Conflicts:
	libwpd/PKGBUILD

bbswitch/PKGBUILD

@@ -3,7 +3,7 @@
 #
 # maintainer abveritas@chakra-project.org
 
-_extramodules=extramodules-3.4-CHAKRA
+_extramodules=extramodules-3.5-CHAKRA
 _kver="$(cat /lib/modules/${_extramodules}/version)"
  
 pkgname=bbswitch
@@ -15,7 +15,7 @@ url=("http://github.com/Bumblebee-Project/bbswitch")
 license=('GPL')
 provides=('bbswitch')
 install=bbswitch.install
-depends=('linux>=3.4' 'linux<3.5')
+depends=('linux>=3.5' 'linux<3.6')
 makedepends=('linux' 'linux-headers')
 source=("https://github.com/downloads/Bumblebee-Project/bbswitch/${pkgname}-${pkgver}.tar.gz")
 md5sums=('0db72765c6accb49426a40c4cb1556d3')
@@ -30,7 +30,7 @@ package() {
     msg2 "Building module for $_kver..."
 
     # KDIR is necessary even when cleaning
-    make KDIR=/usr/src/linux-${_kver} clean
+    #make KDIR=/usr/src/linux-${_kver} clean
     make KDIR=/usr/src/linux-${_kver}
     mkdir -p $pkgdir//lib/modules/${_extramodules}
     install -D -m644 bbswitch.ko $pkgdir/lib/modules/${_extramodules}

bbswitch/bbswitch.install

@@ -1,15 +1,15 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.4-CHAKRA'
+    EXTRAMODULES='extramodules-3.5-CHAKRA'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.4-CHAKRA'
+    EXTRAMODULES='extramodules-3.5-CHAKRA'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.4-CHAKRA'
+    EXTRAMODULES='extramodules-3.5-CHAKRA'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }

catalyst-legacy/3.5-do_mmap.patch

@@ -0,0 +1,49 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
+@@ -2106,6 +2106,12 @@
+     }
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
++# define NO_DO_MMAP
++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
++# define do_munmap(a,b,c) vm_munmap(b, c)
++#endif
++
+ unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
+                                         KCL_IO_FILE_Handle file,
+                                         unsigned long addr,
+@@ -2117,10 +2123,13 @@
+ 
+     flags = MAP_SHARED;
+     prot  = PROT_READ|PROT_WRITE;
+-
++#ifdef NO_DO_MMAP
++    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
++#else
+     down_write(&current->mm->mmap_sem);
+     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
+     up_write(&current->mm->mmap_sem);
++#endif
+     if (IS_ERR(vaddr))
+        return 0;
+     else
+@@ -2131,7 +2140,9 @@
+ {
+     int retcode = 0;
+ 
++#ifndef NO_DO_MMAP
+     down_write(&current->mm->mmap_sem);
++#endif
+ #ifdef FGL_LINUX_RHEL_MUNMAP_API
+     retcode = do_munmap(current->mm,
+                         addr,
+@@ -2142,7 +2153,9 @@
+                         addr,
+                         len);
+ #endif                        
++#ifndef NO_DO_MMAP
+     up_write(&current->mm->mmap_sem);
++#endif
+     return retcode;
+ }

catalyst-legacy/PKGBUILD

@@ -1,13 +1,13 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-_kernver="3.4.6-1-CHAKRA"
+_kernver="3.5.4-1-CHAKRA"
 
-pkgname=(catalyst-legacy chd-catalyst-legacy)
+pkgname=('catalyst-legacy' 'chd-catalyst-legacy')
 pkgver=12.6
-pkgrel=5
+pkgrel=6
 arch=('i686' 'x86_64')
 url="http://www.ati.amd.com"
 license=('custom')
@@ -16,12 +16,14 @@ makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers')
 source=("http://www2.ati.com/drivers/legacy/amd-driver-installer-${pkgver}-legacy-x86.x86_64.zip"
         'ati_make.sh'
         'makefile_compat.patch'
-	'fglrx_supported')
+	'fglrx_supported'
+	'3.5-do_mmap.patch')
 
 md5sums=('36d5a91d60673b26705e9ac2df952daf'
          '660396540b0ceaff71d6155c986734de'
          '3e1b82bd69774ea808da69c983d6a43b'
-         '8bd182de340d6ed8b2dfcedfd3e5a389')
+         '8bd182de340d6ed8b2dfcedfd3e5a389'
+         '83b8d2063458cc9e8b6679567b280e36')
 
 build() {
 
@@ -51,6 +53,8 @@ build() {
     # makefile patch to choose arch_compat_alloc_user_space or older compat_alloc_user_space
     # works only in combination with ati_make.sh script
     patch -p1 -i ../makefile_compat.patch 
+    #linux-3.5.4 fix
+    patch -p1 -i ../3.5-do_mmap.patch
 
     cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
     cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" . 
@@ -67,7 +71,7 @@ build() {
 package_catalyst-legacy() {
     pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
     screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg"
-    depends=('linux>=3.4' 'linux<3.5' 'catalyst-legacy-utils')
+    depends=('linux>=3.5' 'linux<3.6' 'catalyst-legacy-utils')
     conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'catalyst')
     install=catalyst.install
 

catalyst-legacy/catalyst.install

@@ -1,5 +1,5 @@
 
-KERNEL_VERSION=3.4.6-1-CHAKRA
+KERNEL_VERSION=3.5.4-1-CHAKRA
 
 
 remove_hook(){
@@ -11,18 +11,18 @@ remove_hook(){
 }
 
 post_install() {
-    EXTRAMODULES=extramodules-3.4-CHAKRA
+    EXTRAMODULES=extramodules-3.5-CHAKRA
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
     remove_hook
-    EXTRAMODULES=extramodules-3.4-CHAKRA
+    EXTRAMODULES=extramodules-3.5-CHAKRA
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES=extramodules-3.4-CHAKRA
+    EXTRAMODULES=extramodules-3.5-CHAKRA
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo "----------------------------------------------------------------"
     echo "Don't forget to remove fglrx from MODULES array of /etc/rc.conf"

catalyst/3.5-do_mmap.patch

@@ -0,0 +1,49 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
+@@ -2106,6 +2106,12 @@
+     }
+ }
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
++# define NO_DO_MMAP
++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
++# define do_munmap(a,b,c) vm_munmap(b, c)
++#endif
++
+ unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
+                                         KCL_IO_FILE_Handle file,
+                                         unsigned long addr,
+@@ -2117,10 +2123,13 @@
+ 
+     flags = MAP_SHARED;
+     prot  = PROT_READ|PROT_WRITE;
+-
++#ifdef NO_DO_MMAP
++    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
++#else
+     down_write(&current->mm->mmap_sem);
+     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
+     up_write(&current->mm->mmap_sem);
++#endif
+     if (IS_ERR(vaddr))
+        return 0;
+     else
+@@ -2131,7 +2140,9 @@
+ {
+     int retcode = 0;
+ 
++#ifndef NO_DO_MMAP
+     down_write(&current->mm->mmap_sem);
++#endif
+ #ifdef FGL_LINUX_RHEL_MUNMAP_API
+     retcode = do_munmap(current->mm,
+                         addr,
+@@ -2142,7 +2153,9 @@
+                         addr,
+                         len);
+ #endif                        
++#ifndef NO_DO_MMAP
+     up_write(&current->mm->mmap_sem);
++#endif
+     return retcode;
+ }

catalyst/PKGBUILD

@@ -3,30 +3,32 @@
 #
 # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-_kernver="3.4.6-1-CHAKRA"
+_kernver="3.5.4-1-CHAKRA"
 
 pkgname=(catalyst chd-catalyst)
 pkgver=12.8
-pkgrel=2
+pkgrel=3
 _amdver=8.982
 arch=('i686' 'x86_64')
 url="http://www.ati.amd.com"
 license=('custom')
-makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.4' 'linux<=3.5')
+makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'linux-headers' 'linux>=3.5' 'linux<=3.6')
 
 source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip
         ati_make.sh
         makefile_compat.patch
 	fglrx_supported
 	switchlibglx
-	switchlibGL)
+	switchlibGL
+	3.5-do_mmap.patch)
 
 md5sums=('41c5478322b13be6909eeb46412a3aa0'
          '660396540b0ceaff71d6155c986734de'
          '3e1b82bd69774ea808da69c983d6a43b'
          '8bd182de340d6ed8b2dfcedfd3e5a389'
          '99032d919ede27884b5c3e87ab110a96'
-         '99032d919ede27884b5c3e87ab110a96')
+         '99032d919ede27884b5c3e87ab110a96'
+         '83b8d2063458cc9e8b6679567b280e36')
 
 build() {
 
@@ -56,6 +58,8 @@ build() {
     # makefile patch to choose arch_compat_alloc_user_space or older compat_alloc_user_space
     # works only in combination with ati_make.sh script
     patch -p1 -i ../makefile_compat.patch 
+    #linux-3.5.4 fix
+    patch -p1 -i ../3.5-do_mmap.patch
 
     cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
     cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" . 
@@ -72,7 +76,7 @@ build() {
 package_catalyst() {
     pkgdesc="AMD/ATI Catalyst drivers for linux. fglrx kernel module only"
     screenshot="http://linuxtation3.files.wordpress.com/2007/03/pantallazo.jpg"
-    depends=('linux>=3.4' 'linux<3.5' 'catalyst-utils')
+    depends=('linux>=3.5' 'linux<3.6' 'catalyst-utils')
     conflicts=('nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'catalyst-legacy')
     install=catalyst.install
 

catalyst/catalyst.install

@@ -1,5 +1,5 @@
 
-KERNEL_VERSION=3.4.6-1-CHAKRA
+KERNEL_VERSION=3.5.4-1-CHAKRA
 
 
 remove_hook(){
@@ -11,18 +11,18 @@ remove_hook(){
 }
 
 post_install() {
-    EXTRAMODULES=extramodules-3.4-CHAKRA
+    EXTRAMODULES=extramodules-3.5-CHAKRA
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
     remove_hook
-    EXTRAMODULES=extramodules-3.4-CHAKRA
+    EXTRAMODULES=extramodules-3.5-CHAKRA
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES=extramodules-3.4-CHAKRA
+    EXTRAMODULES=extramodules-3.5-CHAKRA
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 

create-resources/PKGBUILD

@@ -7,13 +7,13 @@
 pkgname=create-resources
 pkgver=0.1.3
 pkgrel=2
-makedeps=('scons')
 pkgdesc="Shared resources for use by creative applications"
 arch=("any")
+makedepends=('scons')
 license=('GPL')
 url="http://create.freedesktop.org/"
 
-source=("http://chakra-project.org/sources/create-resources/create-resources-$pkgver.tar.gz")
+source=("http://chakra-linux.org/sources/create-resources/create-resources-$pkgver.tar.gz")
 md5sums=('ba6b6292c30029a4bbac7876544bec69')
 
 build() {      

dkms-nvidia/PKGBUILD

@@ -7,7 +7,7 @@
 pkgname=dkms-nvidia
 _pkgname=nvidia
 pkgver=304.51
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA dynamic kernel module (DKMS) drivers for kernel26."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"

dkms/PKGBUILD

@@ -6,20 +6,20 @@
 
 pkgname=dkms
 pkgver=2.2.0.3
-pkgrel=3
+pkgrel=4
 pkgdesc='Dynamic Kernel Modules System'
 arch=('any')
 url='http://linux.dell.com/dkms/'
 license=('GPL2')
-depends=('linux-headers' 'kmod')
-backup=('etc/dkms/framework.conf' "etc/conf.d/$pkgname")
+depends=('linux-headers' 'kmod' 'sh')
+backup=('etc/dkms/framework.conf')
 source=("http://linux.dell.com/$pkgname/permalink/$pkgname-$pkgver.tar.gz"
-        "$pkgname.rc"
-        "$pkgname.conf"
+        "$pkgname.service"
+        "$pkgname.systemd"
         '01-broken-uninstall.patch')
 md5sums=('11a8aaade2ebec2803653837c7593030'
-         'cf3bcc0cec00caf67a6d393e94c65de5'
-         '8be6746da3df4dcb61cd2b1459974fce'
+         '02e9744e3fdc3d2f68e46966fb32e260'
+         '51c80e29c0ca600b4737c573d3311dbc'
          '4e3a580c09b5af8de7ffde0b61bdcfcf')
 
 build() {
@@ -43,8 +43,8 @@ package() {
   # move bash completion in right place
   install -d -m 755 "$pkgdir/usr/share/bash-completion"
   mv "$pkgdir/etc/bash_completion.d" "$pkgdir/usr/share/bash-completion/completions"
-  # add initscripts
-  install -D -m 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
-  install -D -m 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
+  # add systemd
+  install -D -m 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -D -m 755 $pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$pkgname"
 }
 

dkms/dkms.service

@@ -0,0 +1,11 @@
+[Unit]
+Description=Dynamic Kernel Modules System
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/lib/systemd/scripts/dkms start
+ExecStop=/usr/lib/systemd/scripts/dkms stop
+
+[Install]
+WantedBy=multi-user.target

dkms/dkms.systemd

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+. /etc/conf.d/dkms
+
+# list dkms modules for the current running kernel
+list_dkms_modules() {
+  shopt -s nullglob
+  declare -a DKMS_MOULES
+  # dkms status needs uname -r to list correctly intalled version for current kernel
+  local modules_path=($(dkms status -k "$(uname -r)"|sed -rn 's#(.*), (.*), (.*), (.*): installed#\1/\2/\3/\4#p'))
+  for p in "${modules_path[@]}"; do
+    for m in /var/lib/dkms/"$p"/module/*.ko{,gz}; do
+      m=${m##*/}
+      m=${m%.gz}
+      m=${m%.ko}
+      DKMS_MODULES+=("$m")
+    done
+  done
+}
+
+# load installed kernel modules for the current kernel version
+load_dkms_modules() {
+  local ret=0
+  list_dkms_modules
+  for m in "${DKMS_MODULES[@]}"; do
+    modprobe "$m"
+    ret+=$?
+  done
+  return $ret
+}
+
+# unload installed kernel modules for the current kernel version
+unload_dkms_modules() {
+  list_dkms_modules
+  # ask for removal
+  for m in "${DKMS_MODULES[@]}"; do
+    modprobe --remove --quiet "$m"
+  done
+  # check modules are unloaded
+  # sometimes modprobe -r fail but modules are removed
+  for m in "${DKMS_MODULES[@]}"; do
+    [[ -e /sys/modules/$m ]] && return 1
+  done
+  return 0
+}
+
+case "$1" in
+  start)
+    dkms autoinstall -k "$(uname -r)"
+    [[ $LOAD =~ [Yy][Ee][Ss] ]] && load_dkms_modules
+  ;;
+  stop)
+    [[ $UNLOAD =~ [Yy][Ee][Ss] ]] && unload_dkms_modules
+  ;;
+  *)
+    echo "usage: $0 {start|stop}" >&2
+  ;;
+esac
+
+:
+# vim:set ts=2 sw=2 ft=sh et:

gsfonts/PKGBUILD

@@ -17,8 +17,8 @@ makedepends=('rpmextract')
 provides=(${_realname})
 install=xfonts.install
 source=(http://kojipkgs.fedoraproject.org/packages/${_realname}/${_fedoraver}/${_fedorarel}/src/${_realname}-${_fedoraver}-${_fedorarel}.src.rpm)
-options=(force)
-md5sums=('54935e7d6692792e414510490e3a0fa4')
+options=()
+md5sums=('7bd842c30948a43eaabb107fb5773647')
 
 build() {
   cd $srcdir || return 1

libpqxx/PKGBUILD

@@ -5,7 +5,7 @@
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=libpqxx
-pkgver=3.1
+pkgver=4.0
 pkgrel=1
 pkgdesc="C++ client API for PostgreSQL"
 arch=('i686' 'x86_64')
@@ -14,12 +14,19 @@ url="http://pqxx.org/development/libpqxx/"
 depends=('postgresql-libs>=8.4.1')
 options=('!libtool')
 source=("http://pqxx.org/download/software/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('4993a516eb88d8a51125607db30ad2ef')
+sha256sums=('b160043289cfbf2a186d3b12f9976b6914e76d918d3d4469ff408bd199bbb8ed')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --enable-shared
-  make || return 1
+
+  ./configure --prefix=/usr \
+              --enable-shared
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
   make prefix="${pkgdir}/usr" install
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

libspnav/PKGBUILD

@@ -13,6 +13,7 @@ arch=('i686' 'x86_64')
 url="http://spacenav.sourceforge.net/"
 license=('GPL')
 makedepends=('gcc make')
+depends=('libx11')
 provides=('libspnav')
 options=()
 install=

libwpd/PKGBUILD

@@ -1,23 +1,27 @@
-# $Id: PKGBUILD 68060 2010-02-10 16:21:25Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas@chakra-project.org
 
 pkgname=libwpd
 pkgver=0.9.6
-pkgrel=2
+pkgrel=1
 pkgdesc="Library for importing WordPerfect (tm) documents"
 arch=('i686' 'x86_64')
 url="http://libwpd.sourceforge.net/"
 license=('LGPL')
-depends=('libgsf>=1.14.3-2')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a48717413de46ccca59df1b07ac70225')
+depends=('gcc-libs')
+makedepends=('libgsf>=1.14.20')
+options=('!libtool' '!emptydirs')
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz)
+md5sums=('63f476b892bf783072854b98d2fc4fa2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr \
-              --without-docs
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

madwifi/PKGBUILD

@@ -3,18 +3,18 @@
 #
 # maintainer abveritas@chakra-project.org
 
-_extramodules=extramodules-3.4-CHAKRA
+_extramodules=extramodules-3.5-CHAKRA
 _kver="$(cat /lib/modules/${_extramodules}/version)"
 
 pkgname=madwifi
 pkgver=0.9.4.4173
 _ver=0.9.4-r4173-20111008
-pkgrel=8
+pkgrel=9
 pkgdesc="Madwifi drivers for Atheros wireless chipsets"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://madwifi-project.org"
-depends=('madwifi-utils' 'linux>=3.4' 'linux<3.5')
+depends=('madwifi-utils' 'linux>=3.5' 'linux<3.6')
 makedepends=('linux-headers' 'sharutils')
 install=madwifi-ng.install
 # subversion source: svn checkout http:/madwifi-project.org/svn/madwifi/trunk madwifi

madwifi/madwifi-ng.install

@@ -5,7 +5,7 @@ post_install()
 
 post_upgrade()
 {
-  EXTRAMODULES='extramodules-3.4-CHAKRA'
+  EXTRAMODULES='extramodules-3.5-CHAKRA'
   depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 

nvidia-173xx/PKGBUILD

@@ -3,12 +3,12 @@
 #
 # maintainer abveritas@chakra-project.org
 
-_extramodules=extramodules-3.4-CHAKRA
+_extramodules=extramodules-3.5-CHAKRA
 _kver="$(cat /lib/modules/${_extramodules}/version)"
 
 pkgname=(nvidia-173xx chd-nvidia-173xx)
 pkgver=173.14.35
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
@@ -38,7 +38,7 @@ build() {
 
 package_nvidia-173xx() {
     pkgdesc="Legacy NVIDIA drivers for linux."
-    depends=('linux>=3.4' 'linux<3.5' 'nvidia-173xx-utils')
+    depends=('linux>=3.5' 'linux<3.6' 'nvidia-173xx-utils')
     conflicts=('nvidia-96xx' 'nvidia')
     install=nvidia.install
 

nvidia-173xx/nvidia.install

@@ -1,15 +1,15 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.4-CHAKRA'
+    EXTRAMODULES='extramodules-3.5-CHAKRA'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.4-CHAKRA'
+    EXTRAMODULES='extramodules-3.5-CHAKRA'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.4-CHAKRA'
+    EXTRAMODULES='extramodules-3.5-CHAKRA'
     depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }

nvidia-utils-bumblebee/PKGBUILD

@@ -12,7 +12,7 @@ pkgname=nvidia-utils-bumblebee
 #}
 
 pkgver=304.51
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities and libraries. Repacked and installed in different folder to be used simultaneously with libgl."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"

postgresql/PKGBUILD

@@ -6,72 +6,83 @@
 
 pkgbase=postgresql
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
-pkgver=9.1.2
+pkgver=9.2.1
 _majorver=${pkgver%.*}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
-makedepends=('libxml2' 'python2' 'perl' 'openssl>=1.0.0')
-source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-        postgresql postgresql.confd postgresql.pam postgresql.logrotate postgresql.service
-	postgresql-initdb)
-md5sums=('7dbff52221954c46595313eb7f92c3e0'
-         '4a6e9b63f2aa50195735f2b46aba040b'
-         'a54d09a20ab1672adf08f037df188d53'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'd28e443f9f65a5712c52018b84e27137'
-         '1ec1fbf1ce998324248c543e6cc2c5e6'
-         '1488a98a5d5d96a04416e4f5872223bf')
+makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0')
+source=("ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2"
+        'postgresql.rcd'
+	'postgresql.confd'
+	'postgresql.pam'
+	'postgresql.logrotate'
+	'postgresql.service'
+	'postgresql-initdb')
+sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461'
+            'b2931d7a719e765f14811b9109310b2418d3064bfcedef699573fc25854a2201'
+            '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
+            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+            '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
+            '7014ccc8f3bbac8be9473a43fca2ed4037ee04e56d8e07d6027b3b4ef0317c89'
+            'c22f82a3cf5b555935039853fab2d7e5ff6188cdb1fb528fa9171a87b94f42b0')
 
 build() {
   cd "${srcdir}/postgresql-${pkgver}"
 
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-  --datadir=/usr/share/postgresql \
-  --with-libxml --with-openssl --with-perl \
-  --with-python PYTHON=/usr/bin/python2 --with-pam \
-  --with-system-tzdata=/usr/share/zoneinfo --enable-nls \
-  --enable-thread-safety
+  ./configure --prefix=/usr \
+              --mandir=/usr/share/man \
+              --datadir=/usr/share/postgresql \
+              --with-krb5 \
+              --with-libxml \
+              --with-openssl \
+              --with-perl \
+              --with-python PYTHON=/usr/bin/python2 \
+              --with-tcl \
+              --with-pam \
+              --with-system-tzdata=/usr/share/zoneinfo \
+              --enable-nls \
+              --enable-thread-safety
 
   make world
 }
 
 package_postgresql-libs() {
   pkgdesc="Libraries for use with PostgreSQL"
-  depends=('openssl>=1.0.0' 'readline>=6.0')
+  depends=('krb5' 'openssl>=1.0.0' 'readline>=6.0')
   provides=('postgresql-client')
   conflicts=('postgresql-client')
 
   cd "${srcdir}/postgresql-${pkgver}"
 
   # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE"
+  install -Dm0644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-libs/LICENSE"
 
   # install libs
   for dir in src/interfaces src/bin/pg_config src/bin/psql; do
     make -C ${dir} DESTDIR="${pkgdir}" install
   done
 
-  install -D -m644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
-  install -D -m644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1"
+  install -D -m0644 doc/src/sgml/man1/pg_config.1 "${pkgdir}/usr/share/man/man1/pg_config.1"
+  install -D -m0644 doc/src/sgml/man1/psql.1 "${pkgdir}/usr/share/man/man1/psql.1"
 
   cd src/include
 
   mkdir -p "${pkgdir}"/usr/include/{libpq,postgresql/internal/libpq}
 
   # these headers are needed by the public headers of the interfaces
-  install -m644 pg_config.h "${pkgdir}/usr/include/"
-  install -m644 pg_config_os.h "${pkgdir}/usr/include/"
-  install -m644 postgres_ext.h "${pkgdir}/usr/include/"
-  install -m644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
-  install -m644 pg_config_manual.h "${pkgdir}/usr/include/"
+  install -m0644 pg_config.h "${pkgdir}/usr/include/"
+  install -m0644 pg_config_os.h "${pkgdir}/usr/include/"
+  install -m0644 postgres_ext.h "${pkgdir}/usr/include/"
+  install -m0644 libpq/libpq-fs.h "${pkgdir}/usr/include/libpq/"
+  install -m0644 pg_config_manual.h "${pkgdir}/usr/include/"
 
   # these headers are needed by the not-so-public headers of the interfaces
-  install -m644 c.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 port.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
-  install -m644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
+  install -m0644 c.h "${pkgdir}/usr/include/postgresql/internal/"
+  install -m0644 port.h "${pkgdir}/usr/include/postgresql/internal/"
+  install -m0644 postgres_fe.h "${pkgdir}/usr/include/postgresql/internal/"
+  install -m0644 libpq/pqcomm.h "${pkgdir}/usr/include/postgresql/internal/libpq/"
 }
 
 package_postgresql-docs() {
@@ -81,7 +92,7 @@ package_postgresql-docs() {
   cd "${srcdir}/postgresql-${pkgver}"
 
   # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE"
+  install -Dm0644 COPYRIGHT "${pkgdir}/usr/share/licenses/postgresql-docs/LICENSE"
 
   make -C doc/src/sgml DESTDIR="${pkgdir}" install-html
   chown -R root:root "${pkgdir}/usr/share/doc/postgresql/html/"
@@ -94,9 +105,10 @@ package_postgresql-docs() {
 package_postgresql() {
   pkgdesc="A sophisticated object-relational DBMS"
   backup=('etc/conf.d/postgresql' 'etc/pam.d/postgresql' 'etc/logrotate.d/postgresql')
-  depends=("postgresql-libs>=${pkgver}" 'libxml2' 'readline>=6.0' 'openssl>=1.0.0')
+  depends=("postgresql-libs>=${pkgver}" 'krb5' 'libxml2' 'readline>=6.0' 'openssl>=1.0.0')
   optdepends=('python2: for PL/Python support'
               'perl: for PL/Perl support'
+              'tcl: for PL/Tcl support'
               'postgresql-old-upgrade: upgrade from previous major version using pg_upgrade')
   install=postgresql.install
 
@@ -115,7 +127,7 @@ package_postgresql() {
   rm "${pkgdir}/usr/share/man/man1/psql.1"
 
   # install license
-  install -D -m644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+  install -D -m0644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
 
   # clean up unneeded installed items
   rm -rf "${pkgdir}/usr/include/postgresql/internal"
@@ -124,19 +136,18 @@ package_postgresql() {
   rmdir "${pkgdir}/usr/share/doc/postgresql/html"
 
   # install launch script
-  install -D -m755 "${srcdir}/postgresql" "${pkgdir}/etc/rc.d/postgresql"
+  install -Dm0755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql"
 
   # install conf file
-  install -D -m644 ${srcdir}/postgresql.confd \
-    "${pkgdir}/etc/conf.d/postgresql"
+  install -Dm0644 "${srcdir}/postgresql.confd" "${pkgdir}/etc/conf.d/postgresql"
 
-  install -D -m644 ${srcdir}/postgresql.pam \
-    "${pkgdir}/etc/pam.d/postgresql"
+  # install pam file
+  install -Dm0644 "${srcdir}/postgresql.pam" "${pkgdir}/etc/pam.d/postgresql"
 
-  install -D -m644 ${srcdir}/postgresql.logrotate \
-    "${pkgdir}/etc/logrotate.d/postgresql"
+  # install logrotate file
+  install -Dm0644 "${srcdir}/postgresql.logrotate" "${pkgdir}/etc/logrotate.d/postgresql"
 
   # install systemd unit
-  install -Dm644 ${srcdir}/postgresql.service "${pkgdir}/usr/lib/systemd/system/postgresql.service"
-  install -Dm644 "$srcdir/postgresql-initdb" "$pkgdir/usr/lib/systemd/scripts/postgresql-initdb"
+  install -Dm0644 "${srcdir}/postgresql.service" "${pkgdir}/usr/lib/systemd/system/postgresql.service"
+  install -Dm0644 "$srcdir/postgresql-initdb" "$pkgdir/usr/lib/systemd/scripts/postgresql-initdb"
 }