Wed Sep 12 00:03:32 UTC 2012

9 files changed, 88 insertions, 41 deletions

diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD
index e46dd187c..05aeda485 100644
--- a/community/aria2/PKGBUILD
+++ b/community/aria2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74226 2012-07-23 03:08:17Z allan $
+# $Id: PKGBUILD 76063 2012-09-10 12:19:21Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=aria2
-pkgver=1.15.1
-pkgrel=2
+pkgver=1.15.2
+pkgrel=1
 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink'
 arch=('i686' 'x86_64')
 url='http://aria2.sourceforge.net/'
@@ -15,10 +15,10 @@ license=('GPL')
 depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates')
 checkdepends=('cppunit')
 source=("http://downloads.sourceforge.net/aria2/aria2-${pkgver}.tar.bz2")
-md5sums=('a749a1f7cfe03a7518630d2310267c42')
+md5sums=('211f1e5c1fd28b788e687cb2d851812a')
 
 build() {
-  cd aria2-${pkgver}
+  cd $pkgname-$pkgver
 
   ./configure \
     --prefix=/usr \
@@ -28,13 +28,12 @@ build() {
 }
 
 check() {
-  cd aria2-${pkgver}
-
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd aria2-${pkgver}
+  cd $pkgname-$pkgver
 
   make DESTDIR=${pkgdir} install
 
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 17e3322bb..556bc8a97 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 73296 2012-07-05 20:48:55Z stephane $
+# $Id: PKGBUILD 76074 2012-09-10 20:04:41Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
-pkgver=1.55
+pkgver=1.56
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 depends=('pcre' 'qt')
 makedepends=('docbook-xsl')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('0e6f797ced959afddf7b847856a50636aa87ee3c')
+sha1sums=('63999e1a492f73408fcad87b4bef3c2775feb7e5')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index cab8f4779..07e4a50a0 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74381 2012-07-26 05:04:12Z bpiotrowski $
+# $Id: PKGBUILD 76065 2012-09-10 12:24:09Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Renato Garcia <fgar.renatoATgmailDOTcom>
 # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com>
 
 pkgname=dos2unix
-pkgver=6.0.1
+pkgver=6.0.2
 pkgrel=1
 pkgdesc='Text file format converter'
 arch=('i686' 'x86_64')
@@ -14,15 +14,15 @@ depends=('glibc')
 makedepends=('perl')
 conflicts=('hd2u')
 source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1070432514a0f2ee8abe6ebe502a4bf7')
+md5sums=('11ee6ae80c8acd6d750399cbf4ab6bd9')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $srcdir/$pkgname-$pkgver
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -D -m644 COPYING.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m644 COPYING.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
diff --git a/community/freeorion/PKGBUILD b/community/freeorion/PKGBUILD
index ffb155e59..f79d9cd07 100644
--- a/community/freeorion/PKGBUILD
+++ b/community/freeorion/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73989 2012-07-18 01:06:32Z ibiru $
+# $Id: PKGBUILD 76059 2012-09-10 08:39:54Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: guini <sidtrun@googlemail.com>
 # Contributor: Forrest Loomis <cybercyst _ at _ gmail dot com>
@@ -6,12 +6,11 @@
 # Contributor: fana-m <geminin@gmx.net>
 
 pkgname=freeorion
-pkgver=0.4
-_fixedrevision=4635
-pkgrel=6
-pkgdesc="Turn-based galactic conquest game inspired by Master of Orion"
+pkgver=0.4.1
+pkgrel=1
+pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
 arch=('x86_64' 'i686')
-url="http://www.freeorion.org/"
+url='http://www.freeorion.org/'
 license=('GPL')
 if [ "$CARCH" == "x86_64" ]
 then
@@ -20,26 +19,31 @@ else
   depends=('nvidia-cg-toolkit')
 fi
 depends=('bullet' 'freealut' 'libvorbis' 'python2' 'gigi' 'desktop-file-utils')
-makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-11' 'graphviz' 'libogg'
-             'desktop-file-utils' 'setconf' 'clang' 'cmake' 'gendesk' 'subversion')
+makedepends=('boost>=1.49.0' 'ogre' 'sdl' 'gigi>=0.8.0-12' 'graphviz' 'clang'
+             'desktop-file-utils' 'setconf' 'cmake' 'gendesk' 'subversion'
+             'libogg')
 options=('!strip' '!emptydirs')
 install=$pkgname.install
 source=("$pkgname.sh"
-        "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png")
+        "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png"
+        "cmake_python.patch")
 sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf'
-            'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f')
+            'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f'
+            '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a')
+_svnrepo='https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/'
+_pyversion=2.7
 
 build() {
   cd "$srcdir"
   gendesk -n
 
+  msg2 'Looking up revision from version number...'
+  _fixedrevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1`
   msg2 "Checking out svn revision $_fixedrevision..."
   if [[ -d "$pkgname/.svn" ]]; then
     (cd "$pkgname" && svn up -r "$_fixedrevision")
   else
-    svn co \
-      https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/ \
-      --config-dir ./ -r "$_fixedrevision" "$pkgname"
+    svn co "$_svnrepo" --config-dir ./ -r "$_fixedrevision" "$pkgname"
   fi
 
   msg2 "Setting up build directory..."
@@ -47,15 +51,22 @@ build() {
   cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
   cd "$srcdir/$pkgname-build"
 
+  msg2 "CMake/Python fix..."
+  patch -N -p1 -i "$srcdir/cmake_python.patch"
+
   msg2 "Generating makefiles..."
-  cmake -G "Unix Makefiles"
+  cmake \
+    -DPYTHON_INCLUDE_DIR:PATH="/usr/include/python$_pyversion" \
+    -DPYTHON_LIBRARY:FILEPATH="/usr/lib/libpython$_pyversion.so" \
+    -G "Unix Makefiles"
   
   msg2 "GLU fix..."
-  setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING "'-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
+  setconf CMakeCache.txt CMAKE_CXX_FLAGS:STRING \
+    "'-march=x86-64 -mtune=generic -O2 -fno-var-tracking -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2 -lGL -lGLU '"
 
   msg2 "Boost fix..."
   sed -i 's:TIME_UTC:TIME_UTC_:' util/MultiplayerCommon.cpp
-
+  
   msg2 "Compiling..."
   make -j1
 
diff --git a/community/freeorion/cmake_python.patch b/community/freeorion/cmake_python.patch
new file mode 100644
index 000000000..b875fa844
--- /dev/null
+++ b/community/freeorion/cmake_python.patch
@@ -0,0 +1,23 @@
+--- a/client/AI/CMakeLists.txt	2012-09-10 00:11:18.659341865 +0200
++++ b/client/AI/CMakeLists.txt	2012-09-10 00:12:37.659345189 +0200
+@@ -33,6 +33,20 @@
+ find_package(PythonLibs)
+ if (PYTHONLIBS_FOUND)
+     include_directories(${PYTHON_INCLUDE_PATH})
++    SET(_VERSION_REGEX
++      "^#define[ \t]+PY([A-Z_]*_VERSION)[ \t]+[\"]*([0-9A-Za-z\\.]+)[\"]*[ \t]*$")
++    FILE(STRINGS "${PYTHON_INCLUDE_DIR}/patchlevel.h" _VERSION_STRINGS
++       LIMIT_COUNT 10 REGEX ${_VERSION_REGEX})
++    FOREACH(_VERSION_STRING ${_VERSION_STRINGS})
++        STRING(REGEX REPLACE ${_VERSION_REGEX} "PYTHON\\1"
++           _VERSION_VARIABLE "${_VERSION_STRING}")
++        STRING(REGEX REPLACE ${_VERSION_REGEX} "\\2"
++           _VERSION_NUMBER "${_VERSION_STRING}")
++        SET(${_VERSION_VARIABLE} ${_VERSION_NUMBER})
++    ENDFOREACH(_VERSION_STRING ${_VERSION_STRINGS})
++    IF(PYTHON_MAJOR_VERSION EQUAL 3)
++        MESSAGE(FATAL_ERROR "Python 3 is not supported!")
++    ENDIF()
+ else ()
+     message(FATAL_ERROR " library not found.")
+ endif ()
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD
index 3aecd81da..bdfa37e72 100644
--- a/community/privoxy/PKGBUILD
+++ b/community/privoxy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 75656 2012-08-28 10:03:15Z lfleischer $
+# $Id: PKGBUILD 76058 2012-09-10 08:26:06Z 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=5
+pkgrel=6
 pkgdesc='A web proxy with advanced filtering capabilities.'
 arch=('i686' 'x86_64')
 url='http://www.privoxy.org'
@@ -26,7 +26,7 @@ md5sums=('57acc79059565cc42eda67982842785d'
          '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
          'fc3046377137003726a151ee27b142a2'
          '27830ef79418e277b90c1c1fa933f876'
-         '7285327a5dbef5511242651f88dbc218')
+         '4c154a126ec17b02c623e3d451e062d9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}-stable"
diff --git a/community/privoxy/privoxy.service b/community/privoxy/privoxy.service
index db0f43012..59a8884f9 100644
--- a/community/privoxy/privoxy.service
+++ b/community/privoxy/privoxy.service
@@ -6,6 +6,7 @@ After=network.target
 Type=forking
 PIDFile=/run/privoxy.pid
 ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
+SuccessExitStatus=15
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/tinc/PKGBUILD b/community/tinc/PKGBUILD
index 88b8354f1..1fa1f008a 100644
--- a/community/tinc/PKGBUILD
+++ b/community/tinc/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 73258 2012-07-04 13:07:27Z tredaelli $
+# $Id: PKGBUILD 76061 2012-09-10 11:46:16Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: helios
 # Contributor: Lothar Gesslein
+# Contributor: Dominik George <nik@naturalnet.de>
 
 pkgname=tinc
 pkgver=1.0.19
-pkgrel=1
+pkgrel=2
 pkgdesc="VPN (Virtual Private Network) daemon"
 arch=('i686' 'x86_64')
 url="http://www.tinc-vpn.org/"
@@ -14,11 +15,12 @@ depends=('lzo2' 'openssl')
 backup=(etc/conf.d/tincd.conf)
 install=tinc.install
 source=(http://www.tinc-vpn.org/packages/tinc-$pkgver.tar.gz{,.sig}
-        tincd.rc tincd.conf)
+        tincd.rc tincd.conf tincd@.service)
 md5sums=('5d97ee0f1ccf8fea5b492f6b54d5ac32'
          'af4a88d89a17c216e38b93630389181a'
          '64bb53748d9051255f243003f0d511f5'
-         '7c0276d4812cc5d3cc18142562a3aa82')
+         '7c0276d4812cc5d3cc18142562a3aa82'
+         '035b0e549b08da55d19a8df5b8306e4d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -38,4 +40,5 @@ package() {
 
   install -Dm755 "$srcdir/tincd.rc" "$pkgdir/etc/rc.d/tincd"
   install -Dm644 "$srcdir/tincd.conf" "$pkgdir/etc/conf.d/tincd.conf"
+  install -Dm644 "$srcdir/tincd@.service" "$pkgdir/usr/lib/systemd/system/tincd@.service"
 }
diff --git a/community/tinc/tincd@.service b/community/tinc/tincd@.service
new file mode 100644
index 000000000..ef8f2da9f
--- /dev/null
+++ b/community/tinc/tincd@.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tinc daemon for net %i
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/tincd -n %i
+
+[Install]
+WantedBy=multi-user.target