Thu Aug 30 00:04:42 UTC 2012

12 files changed, 170 insertions, 35 deletions

diff --git a/community/avifile/PKGBUILD b/community/avifile/PKGBUILD
index e38f7fb94..d9d575720 100644
--- a/community/avifile/PKGBUILD
+++ b/community/avifile/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 58655 2011-11-17 10:01:32Z spupykin $
+# $Id: PKGBUILD 75654 2012-08-28 09:59:19Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=avifile
 pkgver=0.7.45
-pkgrel=8
+pkgrel=9
 pkgdesc="A library that allows you to read and write compressed AVI files"
 arch=('i686' 'x86_64')
-depends=('qt' 'sdl' 'freetype2' 'libpng' 'libjpeg'
+depends=('qt3' 'sdl' 'freetype2' 'libpng' 'libjpeg'
          'libvorbis' 'xvidcore' 'libxxf86dga' 'libxi' 'libxv')
-makedepends=('lame' 'qt3' 'v4l-utils' 'chrpath')
+makedepends=('lame' 'v4l-utils' 'chrpath')
 url="http://avifile.sourceforge.net"
 license=('GPL')
 options=('!libtool')
@@ -18,7 +18,7 @@ source=("http://downloads.sourceforge.net/sourceforge/avifile/$pkgname-0.7-$pkgv
 	'gcc.patch'
 	'videodev.patch')
 md5sums=('7da94802f120d1b69e04a13170dcd21d'
-         '588c3ce7bdebc1244f46ba56d8ef8a42'
+         '79a488db80c82f0abb8a83f52e3b3aa0'
          '6cca050885afe85c2d98982f75f5e3b0')
 
 build() {
diff --git a/community/avifile/gcc.patch b/community/avifile/gcc.patch
index e93de24a8..078b4ae81 100644
--- a/community/avifile/gcc.patch
+++ b/community/avifile/gcc.patch
@@ -131,3 +131,15 @@ diff -wbBur avifile-0.7-0.7.45/samples/qtvidcap/v4lxif.cpp avifile-0.7-0.7.45.my
  		if (!base)
  		    avml(AVML_WARN,
  			 "v4l1: can not allocate frame buffer base: %p\n", base);
+diff -wbBur avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp avifile-0.7-0.7.45.my/lib/aviread/AsfNetworkInputStream.cpp
+--- avifile-0.7-0.7.45.org/lib/aviread/AsfNetworkInputStream.cpp	2004-10-25 14:15:38.000000000 +0400
++++ avifile-0.7-0.7.45/lib/aviread/AsfNetworkInputStream.cpp	2012-08-28 13:26:33.000000000 +0400
+@@ -937,7 +937,7 @@
+ 	}
+ 
+ 	asf_packet* p;
+-	unsigned short& size = chhdr.size;
++	uint16_t size = chhdr.size;
+ 	//printf("STREAMPACKET 0x%x  sz:%d  %lld   seq:%d part:%d  sc:%d\n", chhdr.kind, size, rsize, chhdr.seq, chhdr.partflag, chhdr.size_confirm);
+ 	switch (chhdr.kind)
+ 	{
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
index 20b88b329..d7e4c7c59 100644
--- a/community/drbd/PKGBUILD
+++ b/community/drbd/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 73826 2012-07-16 02:13:49Z seblu $
+# $Id: PKGBUILD 75667 2012-08-28 14:04:52Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgname=drbd
-pkgver=8.3.11
-pkgrel=4
+pkgver=8.3.13
+pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc='Userland tools for drbd block devices'
+pkgdesc='Userland tools for Distributed Replicated Block Device'
 url='http://www.drbd.org'
 license=('GPL2')
+depends=('perl' 'bash')
 source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
         "$pkgname.rc"
-        "$pkgname.service"
-        '01-remove-old-sanity-check.diff')
+        "$pkgname.service")
 backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
-md5sums=('e47a35a80143b72e9708844efbe2e608'
+md5sums=('760a25459ef6b7262a2a3572c1561c5b'
          '8902a2f7aca6245c27e9566a1509312c'
-         'afbb345094db49b0a474c0b4e51c0acd'
-         '24144d23b31f9ce66929fe989247c779')
+         'afbb345094db49b0a474c0b4e51c0acd')
 
 build() {
   cd $pkgname-$pkgver
-  # patch bad sanity check in makefile
-  patch -p1 -i "$srcdir/01-remove-old-sanity-check.diff"
   ./configure \
     --prefix=/usr \
     --localstatedir=/var \
diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD
index 5d772fd4a..5ed813a1d 100644
--- a/community/gsmartcontrol/PKGBUILD
+++ b/community/gsmartcontrol/PKGBUILD
@@ -2,18 +2,18 @@
 
 pkgname=gsmartcontrol
 pkgver=0.8.7
-pkgrel=1
+pkgrel=2
 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool."
 arch=('i686' 'x86_64')
 url="http://gsmartcontrol.berlios.de/home/index.php/en/Home"
 license=('GPL3')
 depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2' 'xorg-xmessage')
-optdepends=('gnomesu: for gsmartcontrol-root' 
-            'gksu: for gsmartcontrol-root')
+optdepends=('polkit: to run gparted directly from menu')
 install=${pkgname}.install
-source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30')
-
+source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2 org.archlinux.pkexec.gsmartcontrol.policy gsmartcontrol.desktop)
+md5sums=('6d104c2ffc1e693cd1a8052a6d7e3b30'
+         'e7b9380849cdcaa4356a42559ea7954f'
+         '19b20293a639e51fa2abb929a3faae01')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -30,4 +30,12 @@ package() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 
 	make DESTDIR=${pkgdir} install
-}
+
+        # Install pexec fixed desktop file
+        install -Dm755 $srcdir/gsmartcontrol.desktop $pkgdir/usr/share/applications/gsmartcontrol.desktop
+
+        # Install pexec file
+        install -Dm766 $srcdir/org.archlinux.pkexec.gsmartcontrol.policy \
+        $pkgdir/usr/share/polkit-1/actions/org.archlinux.pkexec.gsmartcontrol.policy 
+
+      }
diff --git a/community/gsmartcontrol/gsmartcontrol.desktop b/community/gsmartcontrol/gsmartcontrol.desktop
new file mode 100644
index 000000000..e65a26ef6
--- /dev/null
+++ b/community/gsmartcontrol/gsmartcontrol.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=GSmartControl
+GenericName=Hard Disk Health Inspection
+Comment=Monitor and control SMART data on hard disks
+Icon=gsmartcontrol
+Exec=pkexec /usr/bin/gsmartcontrol
+Type=Application
+Categories=GTK;GNOME;System;Filesystem;
diff --git a/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
new file mode 100644
index 000000000..fb985df87
--- /dev/null
+++ b/community/gsmartcontrol/org.archlinux.pkexec.gsmartcontrol.policy
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
+<policyconfig>
+
+  <action id="org.archlinux.pkexec.gsmartcontrol">
+    <message>Authentication is required to run the gsmartcontrol</message>
+    <icon_name>gsmartcontrol</icon_name>
+    <defaults>
+      <allow_any>auth_admin</allow_any>
+      <allow_inactive>auth_admin</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/bin/gsmartcontrol</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+  </action>
+
+</policyconfig>
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index ca5b69c3f..3aecd81da 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 72126 2012-06-08 23:13:24Z dreisner $
+# $Id: PKGBUILD 75656 2012-08-28 10:03:15Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Juergen Hoetzel <juergen@hoetzel.info>
 # Contributor: basilburn (basilburn), Paul Bredbury (brebs) 
 
 pkgname=privoxy
 pkgver=3.0.19
-pkgrel=4
+pkgrel=5
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64')
 url='http://www.privoxy.org'
@@ -20,11 +20,13 @@ install='privoxy.install'
 source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
         'privoxy'
         'privoxy.logrotate.d'
-        'privoxy.conf.d')
+        'privoxy.conf.d'
+        'privoxy.service')
 md5sums=('57acc79059565cc42eda67982842785d'
          '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
          'fc3046377137003726a151ee27b142a2'
-         '27830ef79418e277b90c1c1fa933f876')
+         '27830ef79418e277b90c1c1fa933f876'
+         '7285327a5dbef5511242651f88dbc218')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
@@ -64,4 +66,7 @@ package() {
 
   # avoid conflict with filesystem>=2012.06
   rmdir "$pkgdir/var/run"
+
+  # systemd unit file
+  install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
 }
diff --git a/community/privoxy/privoxy.service b/community/privoxy/privoxy.service
new file mode 100644
index 000000000..db0f43012
--- /dev/null
+++ b/community/privoxy/privoxy.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Privoxy Web Proxy With Advanced Filtering Capabilities
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/privoxy.pid
+ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/tor/PKGBUILD b/community/tor/PKGBUILD
index b167bf38d..f90d03b1a 100644
--- a/community/tor/PKGBUILD
+++ b/community/tor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 72796 2012-06-22 12:52:15Z dreisner $
+# $Id: PKGBUILD 75652 2012-08-28 09:58:29Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: simo <simo@archlinux.org>
 
 pkgname=tor
-pkgver=0.2.2.37
+pkgver=0.2.2.38
 pkgrel=1
 pkgdesc='Anonymizing overlay network.'
 arch=('i686' 'x86_64')
@@ -21,8 +21,8 @@ source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc}
         'tor'
         'tor.conf.d'
         'tor.service')
-md5sums=('5aafdca4fb6af6e12b503d32b03f14a7'
-         '8d3adf70109d16e860dbf414f9d70eac'
+md5sums=('91a9dd2c9d7fbd946bda5a13edbe5667'
+         '3486e60baeebe27d5702dbd38fa39c9d'
          '56c75d4e8a66f34167d31e38c43793dd'
          'f8e6868a389877346e7eebaacd1078bb'
          '5c7c6834064b3530c442def6079ac3aa'
diff --git a/community/tp_smapi/PKGBUILD b/community/tp_smapi/PKGBUILD
new file mode 100644
index 000000000..e80492955
--- /dev/null
+++ b/community/tp_smapi/PKGBUILD
@@ -0,0 +1,58 @@
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: xduugu
+# Contributor: nh2
+# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
+# Contributor: Nick B <Shirakawasuna ð gmail đ com>
+# Contributor: Christof Musik <christof ð senfdax đ de>
+# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
+# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
+
+pkgname=tp_smapi
+pkgver=0.41
+pkgrel=5
+pkgdesc="Modules for ThinkPad's SMAPI functionality"
+arch=('i686' 'x86_64')
+url='https://github.com/evgeni/tp_smapi'
+license=('GPL')
+depends=('linux>=3.5' 'linux<3.6')
+makedepends=('linux-headers>=3.5' 'linux-headers<3.6')
+install="${pkgname}.install"
+source=("https://github.com/downloads/evgeni/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('63c683415c764568f6bf17c7eabe4752')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  _kernver=${_kernver:-$(uname -r)}
+  _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true)
+  _kernver=$(< "${_extramodules}/version")
+
+  sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \
+	  -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile
+
+  make HDAPS=1
+}
+
+package() {
+  _kernver=${_kernver:-$(uname -r)}
+  _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true)
+  _kernver=$(< "${_extramodules}/version")
+
+  make -C "${_extramodules%/*}/${_kernver}/build" \
+    INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \
+    M="${srcdir}/${pkgname}-${pkgver}" modules_install
+
+  cd "${pkgdir}/${_extramodules%/*}"
+  mv "${_kernver}/extra" "${_extramodules##*/}"
+  rmdir "${_kernver}"
+
+  # compress kernel modules
+  find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
+
+  # load module on startup
+  echo tp_smapi > "${srcdir}/${pkgname}.conf"
+  install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
+
+  # update kernel version in install file
+  sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install"
+}
diff --git a/community/tp_smapi/tp_smapi.install b/community/tp_smapi/tp_smapi.install
new file mode 100644
index 000000000..5fe1bab90
--- /dev/null
+++ b/community/tp_smapi/tp_smapi.install
@@ -0,0 +1,13 @@
+extramodules=/usr/lib/modules/extramodules-3.5-ARCH
+
+post_install() {
+  depmod -v $(< "$extramodules/version") &>/dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/community/xmlrpc-c/PKGBUILD b/community/xmlrpc-c/PKGBUILD
index e7d31a8cc..fd30c2955 100644
--- a/community/xmlrpc-c/PKGBUILD
+++ b/community/xmlrpc-c/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75449 2012-08-24 16:17:09Z arodseth $
+# $Id: PKGBUILD 75673 2012-08-28 21:19:22Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
@@ -7,7 +7,7 @@
 pkgname=xmlrpc-c
 pkgver=1.31.04
 epoch=1
-pkgrel=1
+pkgrel=2
 pkgdesc='XML-RPC for C and C++'
 arch=('x86_64' 'i686')
 url='http://xmlrpc-c.sourceforge.net/'
@@ -16,7 +16,7 @@ depends=('curl' 'libxml2')
 makedepends=('libtool' 'setconf')
 options=('!makeflags' '!libtool' '!emptydirs')
 source=("$pkgname-advanced-$pkgver.tar.gz::http://xmlrpc-c.svn.sourceforge.net/viewvc/xmlrpc-c/advanced.tar.gz")
-sha256sums=('f37239df6a0900149cf878dc4f57733cb80de1b44ffadc4efb5e26b02273533c')
+sha256sums=('a85e6f9db7db21ed2811e455e61f7b62f5d08770cd68d83bdf10886b74e038f6')
 
 build() {
   cd "$srcdir/advanced"
@@ -27,16 +27,19 @@ build() {
     --enable-libxml2-backend \
     --disable-cgi-server \
     --disable-libwww-client \
-    --disable-wininet-client
+    --disable-wininet-client \
+    --enable-cplusplus
   mkdir include/curl
   touch include/curl/types.h
   make CFLAGS_PERSONAL="$CFLAGS"
+  make CFLAGS_PERSONAL="$CFLAGS" -C tools
 }
 
 package() {
   cd "$srcdir/advanced"
 
   make DESTDIR="$pkgdir" install
+  make DESTDIR="$pkgdir" -C tools install
   install -Dm644 doc/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
   # Remove references to build directory
   setconf "$pkgdir/usr/bin/xmlrpc-c-config" BLDDIR ""