Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

10 files changed, 49 insertions, 61 deletions

diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 011b94f3a..e39dfc88a 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=32
+pkgrel=33
 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/libcl-libre/PKGBUILD b/libre/libcl-libre/PKGBUILD
index a564c2ffb..425525492 100644
--- a/libre/libcl-libre/PKGBUILD
+++ b/libre/libcl-libre/PKGBUILD
@@ -1,8 +1,9 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
+pkgbase=mesa
 pkgname=libcl-libre
-true && pkgver=9.0.git20120905
-true && pkgrel=1
+pkgver=9.0
+pkgrel=2
 arch=(
   i686
   x86_64
@@ -26,7 +27,7 @@ license=(
   Khronos
   LGPL
 )
-url=http://mesa3d.sourceforge.net
+url="http://${pkgbase}3d.sourceforge.net"
 depends=(
   gcc-libs
   libdrm
@@ -43,56 +44,32 @@ provides=(
 replaces=(
   ${pkgname%-libre}
 )
-pkgdesc='A libre version of OpenCL library and ICD loader, (Mesa OpenCL)'
-#source=(
-#  ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2
-#)
-#sha512sums=(
-#  b7e8879e92252d0588d9eeeed904fd502ce1f48551b9a97f52aeb1318c79a80fab27504521107d61fbb5d986b2d778d89023a892baf9f1c5a5d2ee3746fefa57
-#)
-
-_gitroot=git://anongit.freedesktop.org/git/mesa/mesa
-_gitname=mesa
+pkgdesc='Mesa OpenCL library and ICD loader'
+source=(
+  ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/${pkgbase^}Lib-$pkgver.tar.bz2
+)
+sha512sums=(
+  878dc8e3f87aa4ad8d96599a87c733c15b725251c797cdfa6d03fee3c2959fd81a07ac7363e7a8946cf597303398aa581356b46827e7ffa27b33971d39bd29a2
+)
 
 build() {
-  msg 'Connecting to git.freedesktop.org GIT server....'
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-  else
-    git clone $_gitroot --depth 1
-  fi
-  msg 'GIT checkout done or server timeout'
-  msg 'Starting make...'
-
-  cd $srcdir
-
-  # Cleanup and prepare the build dir
-  [ -d build ] && rm -rf build
-  cp -r $_gitname build
-  cd build
-
-  #cd $srcdir/Mesa-$pkgver
+  cd $srcdir/${pkgbase^}-$pkgver
 
   autoreconf -vfi
-  ./autogen.sh --prefix=/usr \
+  ./configure --prefix=/usr \
     --enable-opencl \
     --enable-gallium-llvm \
     --enable-r600-llvm-compiler \
     --with-clang-libdir=/usr/lib \
-    --with-dri-drivers=nouveau,radeon,swrast \
-    --with-gallium-drivers=r300,r600,nouveau,swrast
-  make
+    --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \
+    --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast
+  make V=0
 }
 
 package() {
-  make -C $srcdir/build/src/gallium/targets/opencl DESTDIR=$pkgdir install
-
-  cd $srcdir/build
-  #install -m755 -d $pkgdir/usr/lib/opencl
+  cd $srcdir/${pkgbase^}-$pkgver
+  make -C src/gallium/targets/opencl DESTDIR=$pkgdir install
   install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre}
-  #bin/minstall src/gallium/targets/opencl/libOpenCL.la $pkgdir/usr/lib
-  #bin/minstall lib/libOpenCL.so*                       $pkgdir/usr/lib
-  #bin/minstall src/gallium/targets/pipe-loader/*.so    $pkgdir/usr/lib/${pkgname%-libre}
-  bin/minstall docs/COPYING                            $pkgdir/usr/share/licenses/${pkgname%-libre}
-  bin/minstall docs/license.html                       $pkgdir/usr/share/licenses/${pkgname%-libre}
+  bin/minstall docs/COPYING      $pkgdir/usr/share/licenses/${pkgname%-libre}
+  bin/minstall docs/license.html $pkgdir/usr/share/licenses/${pkgname%-libre}
 }
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 582234b13..a3b46121f 100755
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165910 2012-09-03 19:19:26Z eric $
+# $Id: PKGBUILD 170013 2012-10-31 00:54:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.9
+pkgver=1.8.10
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
@@ -18,9 +18,9 @@ depends=('gconf' 'libwebkit' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-t
 makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('35452b46d987ba37d5a81ea3e4c0f7199c9c0403'
+sha1sums=('1e71c56f4eb8ea7941fce53ced433491d0dd7c4d'
           '0d68c567c3d37932a49709c58c37c3f138fd19cb')
 
 build() {
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index 90bc2061a..24a7919e1 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: André Silva <emulatorman@lavabit.com>
 
-_kernver=3.0.48
+_kernver=3.0.49
 _kernrel=1
 pkgname=('linux-libre-lts-kmod-alx')
 _pkgver=2012-10-03
 pkgver=20121003
-pkgrel=3
+pkgrel=4
 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel'
 arch=('i686' 'x86_64')
 url='http://linuxwireless.org/'
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index fbff59b80..01502f813 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=tp_smapi-libre-lts
 _pkgname=tp_smapi
 _extramodules=/usr/lib/modules/extramodules-3.0-LIBRE-LTS
 pkgver=0.41
-pkgrel=9.2
+pkgrel=9.3
 pkgdesc="linux-libre-lts modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index 9db910c9e..27e9ce6ea 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,7 +11,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=10
+pkgrel=11
 pkgdesc="Modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index ba6448702..febefacfa 100755
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
 _extramodules=extramodules-3.6-LIBRE
-pkgrel=13
+pkgrel=14
 pkgdesc="Kernel libre module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index e080feb02..d836a3a37 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.4
-pkgrel=1
+pkgrel=1.1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index e5e54537b..a008bcc6c 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=20
+pkgrel=21
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(
   i686
@@ -187,9 +187,12 @@ package() {
   for i in events images temp; do
     mv    $pkgdir/srv/http/$pkgname/$i $pkgdir/var/cache/$pkgname/$i
     ln -s /var/cache/$pkgname/$i       $pkgdir/srv/http/$pkgname/$i
+    chown -h http.http                 $pkgdir/srv/http/$pkgname/$i
   done
 
   ln -s /srv/http/cgi-bin                  $pkgdir/srv/http/$pkgname
+  chown -h http.http                       $pkgdir/srv/http/{cgi-bin,$pkgname,$pkgname/cgi-bin}
+
   ln -s /usr/share/cambozola/cambozola.jar $pkgdir/srv/http/$pkgname
 
   install -D -m 644 $srcdir/httpd-$pkgname.conf $pkgdir/etc/httpd/conf/extra
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index 899e2a5d1..ecacf6437 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -69,6 +69,9 @@ post_install() {
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
     /^open_basedir/ s/$/:\/srv\/http\/zoneminder/;
+    /^open_basedir/ s/:\/var\/cache\/zoneminder//;
+    /^open_basedir/ s/:\/var\/cache\/zoneminder\///;
+    /^open_basedir/ s/$/:\/var\/cache\/zoneminder/;
     ' /etc/php/php.ini || read
   sed -i -e '
     /^LoadModule php5_module modules\/libphp5.so/d;
@@ -79,6 +82,7 @@ post_install() {
     /^Include \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/d;
     /^Include conf\/extra\/httpd-default.conf/ s/$/\n\n# PHP 5\n\Include \/etc\/httpd\/conf\/extra\/php5_module.conf\n\n# ZoneMinder\nInclude \/etc\/httpd\/conf\/extra\/httpd-zoneminder.conf/;
     ' /etc/httpd/conf/httpd.conf || read
+  gpasswd -a http video
   cat << EOF
 Note for mysql:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
@@ -105,11 +109,11 @@ Note for php:
 ==> "extension=openssl.so"
 ==> "extension=ftp.so"
 ==> "extension=zip.so"
-==> check and add to open_basedir "/etc" and
-==> "/srv/http/zoneminder" like so
-==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder"
+==> check and add to open_basedir "/etc", 
+==> "/srv/http/zoneminder" and "/var/cache/zoneminder" like so
+==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/srv/http/zoneminder:/var/cache/zoneminder"
 ==> and set your timezone in php.ini:
-==> "date.timezone = <your_country>/<your_city>"
+==> "date.timezone = <your_zone>/<your_city>"
 
 Note for apache:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
@@ -132,6 +136,7 @@ post_remove() {
   sed -i -e '
     /^open_basedir/ s/:\/srv\/http\/zoneminder//;
     /^open_basedir/ s/:\/srv\/http\/zoneminder\///;
+    /^open_basedir/ s/:\/var\/cache\/zoneminder\///
     ' /etc/php/php.ini || read
   sed -i -e '
     /^# ZoneMinder/d;
@@ -165,9 +170,12 @@ Note:
 ==> "extension=mysqli.so"
 ==> "extension=session.so"
 ==> "extension=sockets.so"
-==> "date.timezone = <my_country>/<my_city>"
+==> "date.timezone = <my_zone>/<my_city>"
 
-==> Edit /etc/php/php.ini and remove "/etc" and "/srv/http/zoneminder"
+==> Drop http user on video group if it isn't needed with others servers:
+==> gpasswd -d http video
+
+==> Edit /etc/php/php.ini and remove "/etc", "/srv/http/zoneminder" and "/var/cache/zoneminder"
 ==> in the "open_basedir".
 
 ==> Remove log files and "zonemider" directory in "/var/log/zoneminder".