Fri Feb 3 23:15:07 UTC 2012

11 files changed, 174 insertions, 29 deletions

diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index 5c7dd4848..569a63161 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -3,8 +3,8 @@
 # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com>
 
 pkgname=dos2unix
-pkgver=5.3.1
-pkgrel=3
+pkgver=5.3.2
+pkgrel=1
 pkgdesc='Text file format converter'
 arch=('i686' 'x86_64')
 url='http://waterlan.home.xs4all.nl/dos2unix.html'
@@ -13,7 +13,7 @@ depends=('glibc')
 makedepends=('perl')
 conflicts=('hd2u')
 source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('438c48ebd6891b80b58de14c022ca69e')
+md5sums=('aa2768f3e1223f0e8f30e6449d398872')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/drbd/01-remove-old-sanity-check.diff b/community/drbd/01-remove-old-sanity-check.diff
new file mode 100644
index 000000000..04edb7571
--- /dev/null
+++ b/community/drbd/01-remove-old-sanity-check.diff
@@ -0,0 +1,24 @@
+From: Lars Ellenberg <lars.ellenberg@linbit.com>
+Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100)
+Subject: build: remove old sanity check to allow build against linux 3.1
+X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf
+
+build: remove old sanity check to allow build against linux 3.1
+---
+
+diff --git a/drbd/Makefile b/drbd/Makefile
+index 0985340..7a09603 100644
+--- a/drbd/Makefile
++++ b/drbd/Makefile
+@@ -90,11 +90,6 @@ else
+     endif
+   endif
+ 
+-  KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3)
+-  ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),)
+-    $(error "won't compile with this kernel version")
+-  endif
+-
+   .PHONY: drbd.o default all greeting clean kbuild install dep tags
+ 
+   drbd.o: greeting kbuild
diff --git a/community/drbd/PKGBUILD b/community/drbd/PKGBUILD
new file mode 100644
index 000000000..68d7dea8a
--- /dev/null
+++ b/community/drbd/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 63408 2012-02-02 10:00:55Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+
+pkgname=drbd
+pkgver=8.3.11
+pkgrel=1
+arch=('i686' 'x86_64')
+pkgdesc='Userland tools for drbd block devices'
+url='http://www.drbd.org'
+license=('GPL2')
+source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz"
+        "$pkgname.rc"
+        '01-remove-old-sanity-check.diff')
+backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf')
+md5sums=('e47a35a80143b72e9708844efbe2e608'
+         '19236c6fe7a8c9191d67a4df15892b78'
+         '24144d23b31f9ce66929fe989247c779')
+
+build() {
+  cd $pkgname-$pkgver
+  # patch bad sanity check in makefile
+  patch -p1 -i ../01-remove-old-sanity-check.diff
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var \
+    --sysconfdir=/etc \
+    --with-distro=generic \
+    --with-utils \
+    --with-bashcompletion \
+    --with-udev \
+    --without-km \
+    --without-rgmanager \
+    --without-pacemaker \
+    --without-heartbeat \
+    --without-xen \
+    --with-initdir=/etc/rc.d
+    #--with-legacy_utils \
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # move udev files to the right place
+  install -d -m 755 "$pkgdir/lib"
+  mv "$pkgdir/etc/udev" "$pkgdir/lib"
+
+  # remove /var/lock
+  rmdir "$pkgdir/var/lock"
+
+  # replace 
+  install -D -m 755 "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
+}
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc
new file mode 100644
index 000000000..7aca1f394
--- /dev/null
+++ b/community/drbd/drbd.rc
@@ -0,0 +1,58 @@
+#!/bin/bash
+# Written by Sébastien Luttringer
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+DRBDADM='/sbin/drbdadm'
+PROC_DRBD='/proc/drbd'
+
+check_config() {
+  # check if module is loaded
+  if [[ ! -e $PROC_DRBD ]]; then
+    echo "Missing $PROC_DRBD. Try to load drbd module!"
+    stat_fail
+    exit 1
+  fi
+  # check if config is correct
+  if ! $DRBDADM dump &>/dev/null; then
+      echo 'Invalid configuration'
+      stat_fail
+      exit 1
+  fi
+}
+
+case "$1" in
+  start)
+    stat_busy 'Starting DRBD resources'
+    # check module and config
+    check_config
+    # load config
+    $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; }
+    # User interruptible version of wait-connect all
+    $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; }
+    # Become primary if configured
+    $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; }
+    add_daemon drbd
+    stat_done
+    ;;
+  stop)
+    stat_busy 'Stopping DRBD resources'
+    # check module and config
+    check_config
+    # disconnect and detach all resources
+    $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; }
+    rm_daemon drbd
+    stat_done
+    ;;
+  restart)
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+
+exit 0
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD
index c2e105479..af16ee713 100644
--- a/community/luakit/PKGBUILD
+++ b/community/luakit/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=luakit
 pkgver=2011.07.22
-pkgrel=2
-pkgdesc='luakit is a highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit."Stable" release'
+pkgrel=4
+pkgdesc='Highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit. "Stable" release.'
 arch=('i686' 'x86_64')
 url='http://www.luakit.org/projects/luakit'
 license=('GPL3')
-depends=('libwebkit' 'luafilesystem' 'libunique')
+depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils')
 makedepends=('git' 'help2man')
-options=(!makeflags)  
+options=(!makeflags)
 conflicts=('luakit-git' 'luakit-develop-git')
 install='luakit.install'
 source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1")
@@ -19,6 +19,9 @@ md5sums=('4937deb6bc81416e2deb037f4a5763e4')
 build() {
   cd mason-larobina-luakit-*
 
+  # Add missing library to PKGS in config.mk
+  sed -i 's|PKGS := .*|& javascriptcoregtk-1.0|' config.mk
+
   make PREFIX=/usr DESTDIR=${pkgdir} all
 }
 
diff --git a/community/luakit/luakit.install b/community/luakit/luakit.install
index c80d7609f..2c37d0597 100644
--- a/community/luakit/luakit.install
+++ b/community/luakit/luakit.install
@@ -4,7 +4,11 @@ post_install() {
   echo 'Or edit in place for global changes.'
   echo 'You NEED to replace local configs after each update'
 }
- 
+
 post_upgrade() {
-  post_install ${1}
+  update-desktop-database -q
+}
+
+post_remove() {
+  post_upgrade
 }
diff --git a/community/mashup/PKGBUILD b/community/mashup/PKGBUILD
index cfd72dee2..6228acf07 100644
--- a/community/mashup/PKGBUILD
+++ b/community/mashup/PKGBUILD
@@ -2,16 +2,16 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=mashup
-pkgver=3.3
+pkgver=3.5
 pkgrel=1
 pkgdesc="Adjusting images on a sheet of paper for printing"
 url="http://kornelix.squarespace.com/$pkgname"
 arch=('i686' 'x86_64')
 license=('GPL3')
-depends=('gtk2')
+depends=('gtk3')
 replaces=('printoxx')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('0d8286747d5cd1a65907c7d70c7a99e5')
+md5sums=('9ce1e5b734a149e84e4dae366dc2c1c1')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 217b6651d..ec3def46c 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.6.9
+pkgver=0.6.10
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ checkdepends=('curl') # curl used for check()
 optdepends=('openssl: TLS support')
 options=('!emptydirs')
 source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz")
-md5sums=('c2d2aee123a141ba8431855f1d9c8200')
+md5sums=('8a74fd5d48c2c7c64abc60b2b8f3fbc7')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/pigz/PKGBUILD b/community/pigz/PKGBUILD
index b379fe2ea..cc1e07c26 100755
--- a/community/pigz/PKGBUILD
+++ b/community/pigz/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=pigz
-pkgver=2.1.7
+pkgver=2.2.3
 pkgrel=1
 pkgdesc="Parallel implementation of the gzip file compressor"
 arch=('i686' 'x86_64')
@@ -11,28 +11,28 @@ url="http://www.zlib.net/pigz/"
 license=('custom')
 depends=('zlib')
 source=(http://www.zlib.net/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('a09e1097fdc05ac0fff763bdb4d2d5e4')
+md5sums=('8330a6c6a3e5f1954687aaba4b973a6f')
 
 build() {
-  cd "${srcdir}/$pkgname"
-  sed -i s/"CFLAGS=".*/"CFLAGS=${CFLAGS}"/g Makefile 
+  cd "${srcdir}/$pkgname-$pkgver"
+  #sed -i s/"CFLAGS=".*/"CFLAGS=${CFLAGS}"/g Makefile 
   make
 }
 
 package() {
-  cd "${srcdir}/$pkgname"
+  cd "${srcdir}/$pkgname-$pkgver"
 
-  install -Dm755 "${srcdir}"/${pkgname}/${pkgname} \
+  install -Dm755 "${srcdir}"/${pkgname}-$pkgver/${pkgname} \
     "${pkgdir}"/usr/bin/${pkgname} 
 
   pushd "${pkgdir}"/usr/bin
     ln -s pigz unpigz 
   popd
 
-  install -Dm644 "${srcdir}"/${pkgname}/${pkgname}.1 \
+  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/${pkgname}.1 \
     "${pkgdir}"/usr/share/man/man1/${pkgname}.1
-  install -Dm644 "${srcdir}"/${pkgname}/${pkgname}.pdf \
+  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/${pkgname}.pdf \
     "${pkgdir}"/usr/share/doc/${pkgname}/${pkgname}.pdf
-  install -Dm644 "${srcdir}"/${pkgname}/README \
+  install -Dm644 "${srcdir}"/${pkgname}-$pkgver/README \
     "${pkgdir}"/usr/share/licenses/${pkgname}/README
 }
diff --git a/community/pokerth/PKGBUILD b/community/pokerth/PKGBUILD
index 7e1d7006d..ce2265250 100644
--- a/community/pokerth/PKGBUILD
+++ b/community/pokerth/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 62237 2012-01-18 17:30:42Z bpiotrowski $
+# $Id: PKGBUILD 63424 2012-02-02 19:11:13Z bpiotrowski $
 # Maintainer:  Mateusz Herych <heniekk@gmail.com>
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Vasco Costa <vasco.costa@meiodigital.com>
 
 pkgname=pokerth
 _realname=PokerTH
-pkgver=0.9.1
+pkgver=0.9.2
 pkgrel=1
 pkgdesc="Poker game written in C++/QT4"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ depends=('curl' 'boost-libs>=1.43.0' 'gsasl' 'gnutls'
          'qt' 'sdl_mixer' 'libircclient' 'tinyxml')
 makedepends=('boost')
 source=(http://downloads.sourceforge.net/sourceforge/pokerth/$_realname-$pkgver-src.tar.bz2)
-md5sums=('c22ec528ebb47c44b93149b63619004f')
+md5sums=('d1855713756be9072b275ee3754a4ff0')
 
 build() {
   cd "$srcdir/$_realname-$pkgver-src"
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 3696fde67..d7dfe1f74 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 62794 2012-01-27 01:24:10Z bisson $
+# $Id: PKGBUILD 63410 2012-02-02 10:13:55Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net>
 # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service>
 
 pkgname=unbound
-pkgver=1.4.15
+pkgver=1.4.16
 pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
 url='http://unbound.net/'
@@ -18,7 +18,7 @@ backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'unbound.conf'
         'rc.d')
-sha1sums=('bbda46664ea8391ca7986300ce98a79787c0e322'
+sha1sums=('68ed8737b1a6e3f9a67812f7e962fd6740494c1e'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'dc96e772f467b32555df21d16fdb15e98194c228')