Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community-staging/xemacs/PKGBUILD
	community/gkrellm/PKGBUILD
	community/ldns/PKGBUILD
	community/tomoyo-tools/PKGBUILD
	community/unbound/PKGBUILD
	staging/kdelibs/PKGBUILD
	staging/opencv/PKGBUILD
	testing/systemd/PKGBUILD

16 files changed, 171 insertions, 81 deletions

diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index ce4c8437c..e0eb5ddec 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61453 2011-12-31 18:08:55Z spupykin $
+# $Id: PKGBUILD 62769 2012-01-26 14:42:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=ejabberd
 pkgver=2.1.10
-pkgrel=1
+pkgrel=2
 pkgdesc="An erlang jabber server"
 arch=(i686 x86_64 'mips64el')
 url="http://www.ejabberd.im/"
diff --git a/community/ejabberd/ejabberd.install b/community/ejabberd/ejabberd.install
index 579be7ed3..eceb73592 100644
--- a/community/ejabberd/ejabberd.install
+++ b/community/ejabberd/ejabberd.install
@@ -1,6 +1,6 @@
 post_install() {
-    groupadd jabber
-    useradd -G jabber -d /var/lib/ejabberd ejabberd
+    groupadd -r jabber
+    useradd -r -G jabber -d /var/lib/ejabberd ejabberd
     chown -R ejabberd.jabber /var/log/ejabberd
     chown -R ejabberd.jabber /var/spool/ejabberd
     chown -R ejabberd.jabber /var/lib/ejabberd
diff --git a/community/gkrellm/PKGBUILD b/community/gkrellm/PKGBUILD
index 1b7db8aaf..918eb548b 100644
--- a/community/gkrellm/PKGBUILD
+++ b/community/gkrellm/PKGBUILD
@@ -1,25 +1,37 @@
-# $Id: PKGBUILD 31931 2010-11-07 23:10:53Z lcarlier $
+# $Id: PKGBUILD 62784 2012-01-26 17:53:09Z arodseth $
+# Maintainer: dorphell <dorphell@archlinux.org>
 # Contributor: Matt Smith (Majik) <darkknight@helpdesk.zaz.net>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Maintainer: dorphell <dorphell@archlinux.org>
-
+# Contributor: Jozef Riha <jose1711@gmail.com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 pkgname=gkrellm
 pkgver=2.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="System monitor package for GTK2"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://members.dslextreme.com/users/billw/gkrellm/gkrellm.html"
 license=('GPL3')
-depends=('gtk2' 'openssl' 'libsm' 'lm_sensors')
+depends=('gtk2' 'libsm' 'lm_sensors')
 makedepends=('gettext')
 backup=('etc/gkrellmd.conf')
-source=(http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('e43a9416a6975e3be63d591bdeb33b04')
+source=("http://members.dslextreme.com/users/billw/$pkgname/$pkgname-$pkgver.tar.bz2"
+        "gkrellmd")
+sha256sums=('702b5b0e9c040eb3af8e157453f38dd6f53e1dcd8b1272d20266cda3d4372c8b'
+            'c6d532dd7a706891aed92d750bceda74d4618e86ad82feadc0503214de904360')
 
 build() {
-  cd ${srcdir}/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   make LOCALEDIR=/usr/share/locale
-  make DESTDIR=${pkgdir} PREFIX=/usr install
-  install -D -m644 "${srcdir}/${pkgname}-${pkgver}/server/gkrellmd.conf" "${pkgdir}/etc/gkrellmd.conf"
 }
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" PREFIX=/usr install
+  install -Dm644 "server/gkrellmd.conf" "$pkgdir/etc/gkrellmd.conf"
+  install -Dm755 "../gkrellmd" "$pkgdir/etc/rc.d/gkrellmd"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gkrellm/gkrellmd b/community/gkrellm/gkrellmd
new file mode 100644
index 000000000..1f255e755
--- /dev/null
+++ b/community/gkrellm/gkrellmd
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# source application-specific settings
+GKRELLMD_ARGS='-d'
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=$(pidof -o %PPID /usr/bin/gkrellmd)
+case "$1" in
+  start)
+    stat_busy "Starting GKrellM Daemon"
+    [ -z "$PID" ] && /usr/bin/gkrellmd ${GKRELLMD_ARGS}
+    PID=$(pidof -o %PPID /usr/bin/gkrellmd)
+    if [ -z "$PID" ]; then
+      stat_fail
+    else
+      add_daemon gkrellmd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping GKrellM Daemon"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon gkrellmd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community/ldns/Makefile.patch b/community/ldns/Makefile.patch
new file mode 100644
index 000000000..d98291ac9
--- /dev/null
+++ b/community/ldns/Makefile.patch
@@ -0,0 +1,20 @@
+--- old/Makefile.in	2012-01-12 00:11:36.000000000 +1100
++++ new/Makefile.in	2012-01-27 11:36:16.110154453 +1100
+@@ -130,7 +130,7 @@
+ 		exit -1 ; \
+ 	fi
+ drill/drill: $(DRILL_LOBJS) $(LIB)
+-	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) -lldns -o drill/drill
++	$(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
+ 
+ install-drill: drill/drill
+ 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
+@@ -157,7 +157,7 @@
+ 		exit -1 ; \
+ 	fi
+ $(EXAMPLE_PROGS): $(EXAMPLE_LOBJS) $(LIB)
+-	$(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
++	$(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
+ 
+ $(TESTNS): $(TESTNS_LOBJS) $(LIB)
+ 	$(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS)
diff --git a/community/ldns/PKGBUILD b/community/ldns/PKGBUILD
index 49febb4d2..46d7e1f5f 100644
--- a/community/ldns/PKGBUILD
+++ b/community/ldns/PKGBUILD
@@ -1,39 +1,38 @@
-# $Id: PKGBUILD 56190 2011-10-03 10:19:02Z bisson $
-
+# $Id: PKGBUILD 62792 2012-01-27 01:01:36Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: jiribb <jiribb@gmail.com> and <mathieui> <mathieui@mathieui.net>
 # Contributor: mathieui <mathieui@mathieui.net>
+# Contributor: jiribb <jiribb@gmail.com>
 
 pkgname=ldns
-pkgver=1.6.11
+pkgver=1.6.12
 pkgrel=1
-pkgdesc='Fast DNS library with DNSSEC support, including tools such as Drill'
-arch=('i686' 'x86_64' 'mips64el')
+pkgdesc='Fast DNS library supporting recent RFCs, including Drill and other tools'
 url='http://www.nlnetlabs.nl/projects/ldns/'
 license=('custom:BSD')
+arch=('i686' 'x86_64' 'mips64el')
+options=('!libtool')
 depends=('openssl')
 makedepends=('libpcap')
 optdepends=('libpcap: ldns-dpa tool')
-options=('!libtool')
-source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2c4537eee39a1af63e8dde4f35498ce78c968c1f')
+source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        'Makefile.patch')
+sha1sums=('1d61df0f666908551d5a62768f77d63e727810aa'
+          '01bce260e9639d9cd26109a689dddf2498e5026a')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	_conf='--prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-static=no --disable-rpath'
-	_tmp="$(mktemp -d)"
+	patch -p1 -i ../Makefile.patch
 
-	./configure ${_conf}
-	make
-	make DESTDIR="${_tmp}" install
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-static=no \
+		--disable-rpath \
+		--with-drill \
+		--with-examples \
 
-	cd drill
-	./configure ${_conf} --with-ldns="${_tmp}"
-	make
-
-	cd ../examples
-	./configure ${_conf} --with-ldns="${_tmp}"
 	make
 }
 
@@ -41,11 +40,6 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	make DESTDIR="${pkgdir}" install
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
-	cd drill
-	make DESTDIR="${pkgdir}" install
 
-	cd ../examples
-	make DESTDIR="${pkgdir}" install
+	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/community/mythplugins/PKGBUILD b/community/mythplugins/PKGBUILD
index 2097c4310..8dbcc7b9a 100644
--- a/community/mythplugins/PKGBUILD
+++ b/community/mythplugins/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48174 2011-05-29 12:47:11Z jconder $
+# $Id: PKGBUILD 62800 2012-01-27 02:41:18Z jconder $
 # Maintainer: Jonathan Conder <jonno.conder@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
@@ -14,21 +14,21 @@ pkgname=('mythplugins-mytharchive'
          'mythplugins-mythweather'
          'mythplugins-mythweb'
          'mythplugins-mythzoneminder')
-pkgver=0.24.1
-pkgrel=4
+pkgver=0.24.2
+pkgrel=2
 epoch=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mythtv.org"
 license=('GPL')
 makedepends=('cdparanoia' 'cdrkit' 'dvdauthor' 'dvd+rw-tools' 'ffmpeg' 'flac'
              'libcdaudio' 'libexif' 'libvisual' 'libvorbis' 'mplayer' 'mythtv'
-	     'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
-	     'perl-libwww' 'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple'
-	     'perl-xml-xpath' 'python2-oauth' 'python-imaging' 'python-pycurl'
-	     'sdl' 'taglib' 'zlib')
+             'perl-datetime-format-iso8601' 'perl-date-manip' 'perl-image-size'
+             'perl-json' 'perl-libwww' 'perl-soap-lite' 'perl-xml-sax'
+             'perl-xml-simple' 'perl-xml-xpath' 'python2-oauth' 'python-imaging'
+             'python-pycurl' 'sdl' 'taglib' 'zlib')
 source=("ftp://ftp.osuosl.org/pub/mythtv/$pkgbase-$pkgver.tar.bz2"
         'mtd.rc')
-md5sums=('76aeefeff70b550b2d35c2d9d751df18'
+md5sums=('471836d48657afc488d560aee624931e'
          '476c12ba074794ad7f4ae092bdf949d6')
 
 build() {
@@ -112,9 +112,9 @@ package_mythplugins-mythvideo() {
 
 package_mythplugins-mythweather() {
   pkgdesc="Weather checking plugin for MythTV"
-  depends=('mythtv' 'perl-date-manip' 'perl-libwww'
-           'perl-soap-lite' 'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath'
-	   'perl-image-size' 'perl-datetime-format-iso8601')
+  depends=('mythtv' 'perl-date-manip' 'perl-json' 'perl-libwww' 'perl-soap-lite'
+           'perl-xml-sax' 'perl-xml-simple' 'perl-xml-xpath' 'perl-image-size'
+           'perl-datetime-format-iso8601')
 
   cd "$srcdir/$pkgbase-$pkgver/mythweather"
   make INSTALL_ROOT="$pkgdir" install
diff --git a/community/open-vm-tools/PKGBUILD b/community/open-vm-tools/PKGBUILD
index 5be5138ce..87a7a8f21 100644
--- a/community/open-vm-tools/PKGBUILD
+++ b/community/open-vm-tools/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 61569 2012-01-03 12:06:41Z spupykin $
+# $Id: PKGBUILD 62772 2012-01-26 14:44:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Krzysztof Raczkowski <raczkow@gmail.com>
 
 pkgname=open-vm-tools
 pkgver=2011.12.20
 _pkgsubver=562307
-pkgrel=1
+pkgrel=2
 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://open-vm-tools.sourceforge.net/"
@@ -29,7 +29,7 @@ md5sums=('529c15cb6cfa2972a96664c504dee560'
          '199508b0d3fe6fa9b726d09170bf51f1'
          '8c333a979578bdc0c3134c1dd6bb7353'
          '79b0a14d86191fee70a4639da8bd7785'
-         '136ff53d0d3a303d09266a407fd2d215'
+         '67cb83a9e5a4dd016c1a1da2863ca36d'
          'b55d15e2c4be396aad709aeca91033d3'
          '73cc1a2665b0dd62427733d62ead8b9a'
          '75a25d83417e683957321f97a00f8465')
diff --git a/community/open-vm-tools/open-vm-tools.rc.d b/community/open-vm-tools/open-vm-tools.rc.d
index 555fa1535..0c9221489 100644
--- a/community/open-vm-tools/open-vm-tools.rc.d
+++ b/community/open-vm-tools/open-vm-tools.rc.d
@@ -13,7 +13,7 @@ case "$1" in
 
     if [ "$VM_DRAG_AND_DROP" == "yes" ]; then
 	VMBLOCK=`grep -w vmblock /proc/modules`
-	[ -z "$VMBLOCK" ] && modprobe -f vmblock
+	[ -z "$VMBLOCK" ] && modprobe vmblock
 	if [ $? -gt 0 ]; then
     	    stat_fail
 	    exit 1
@@ -36,7 +36,7 @@ case "$1" in
     for m in vmhgfs vmsync; do
 	VMMOD=`grep -w $m /proc/modules`
 	[ -z "$VMMOD" ] && \
-		{ modprobe -f $m
+		{ modprobe $m
 		if [ $? -gt 0 ]; then
 		    stat_fail
 		    exit 1
diff --git a/community/perl-datetime/PKGBUILD b/community/perl-datetime/PKGBUILD
index 19a115798..d12d492e8 100644
--- a/community/perl-datetime/PKGBUILD
+++ b/community/perl-datetime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 55077 2011-09-02 08:37:50Z andrea $
+# $Id: PKGBUILD 62774 2012-01-26 14:45:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-datetime
-pkgver=0.70
-pkgrel=3
+pkgver=0.72
+pkgrel=1
 pkgdesc="A complete, easy to use date and time object"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/DateTime"
@@ -15,7 +15,7 @@ LC_NUMERIC=C
 provides=("perl-datetime=`printf %.4f $pkgver`")
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/D/DR/DROLSKY/DateTime-$pkgver.tar.gz)
-md5sums=('228a3ca93b49e308fc7a3b7a47341ab3')
+md5sums=('f50b328919fe8bf2d2b16ca0df35c3f3')
 
 build() {
   cd  $srcdir/DateTime-$pkgver
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index a9bd200a1..1e4e50780 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 62318 2012-01-19 08:04:12Z spupykin $
+# $Id: PKGBUILD 62767 2012-01-26 14:20:03Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
@@ -8,7 +8,7 @@ _timestamp=20111025
 _file=53357
 pkgver=${_basever}.${_timestamp}
 pkgrel=1
-pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernels 2.6.36 - 3.0'
+pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://tomoyo.sourceforge.jp'
 #url='http://sourceforge.jp/projects/tomoyo/releases/?package_id=9818'
diff --git a/community/ulogd/PKGBUILD b/community/ulogd/PKGBUILD
index c4ea91a7c..b002d8e49 100644
--- a/community/ulogd/PKGBUILD
+++ b/community/ulogd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 55184 2011-09-05 09:03:02Z spupykin $
+# $Id: PKGBUILD 62776 2012-01-26 14:46:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sebastien Luttringer <seblu+arch@seblu.net>
 # Contributor: Dale Blount <dale@archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=ulogd
 pkgver=1.24
-pkgrel=7
+pkgrel=8
 pkgdesc='Userspace Packet Logging for netfilter'
 arch=('i686' 'x86_64')
 url='http://www.netfilter.org/projects/ulogd/index.html'
@@ -19,14 +19,17 @@ optdepends=('postgresql-libs'
 backup=('etc/ulogd.conf')
 source=("ftp://ftp.netfilter.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
 	'rc'
-	'logrotate')
+	'logrotate'
+	'mac-addr.patch')
 md5sums=('05b4ed2926b9a22aaeaf642917bbf8ff'
          'c42230c1cabf5dd9b80bf9a0fd87ca7e'
-         'fe40b3073b7474a77e0b8b0bfd19ab63')
+         'fe40b3073b7474a77e0b8b0bfd19ab63'
+         'ca41a10a9f230614cd15e2bb037e057d')
 
 build() {
   cd $pkgname-$pkgver
   export MAKEFLAGS="-j1"
+  patch -p0 extensions/ulogd_BASE.c <$srcdir/mac-addr.patch
   ./configure --prefix=/usr --sysconfdir=/etc --with-mysql --with-pgsql --with-sqlite3
   make || true
   (cd mysql && ld -shared -L/usr/lib -L/usr/lib -L/usr/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -o ulogd_MYSQL.so ulogd_MYSQL_sh.o -lc)
diff --git a/community/ulogd/mac-addr.patch b/community/ulogd/mac-addr.patch
new file mode 100644
index 000000000..87a76a22b
--- /dev/null
+++ b/community/ulogd/mac-addr.patch
@@ -0,0 +1,22 @@
+--- ulogd_BASE.c-save	2007-08-06 11:23:53.000000000 +0200
++++ ulogd_BASE.c	2007-08-06 11:28:47.000000000 +0200
+@@ -63,7 +63,7 @@ static ulog_iret_t *_interp_raw(ulog_int
+ {
+ 	unsigned char *p;
+ 	int i;
+-	char *buf, *oldbuf = NULL;
++	char *buf = NULL;
+ 	ulog_iret_t *ret = ip->result;
+ 
+ 	if (pkt->mac_len) {
+@@ -75,9 +75,8 @@ static ulog_iret_t *_interp_raw(ulog_int
+ 		*buf = '\0';
+ 
+ 		p = pkt->mac;
+-		oldbuf = buf;
+ 		for (i = 0; i < pkt->mac_len; i++, p++)
+-			sprintf(buf, "%s%02x%c", oldbuf, *p, i==pkt->mac_len-1 ? ' ':':');
++			sprintf(buf + (i*3), "%02x%c", *p, i==pkt->mac_len-1 ? ' ':':');
+ 		ret[0].value.ptr = buf;
+ 		ret[0].flags |= ULOGD_RETF_VALID;
+ 	}
diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD
index 9e866e24e..ac58b852a 100644
--- a/community/unbound/PKGBUILD
+++ b/community/unbound/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 60976 2011-12-19 22:59:53Z bisson $
-
+# $Id: PKGBUILD 62794 2012-01-27 01:24:10Z 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.14
+pkgver=1.4.15
 pkgrel=1
 pkgdesc='Validating, recursive, and caching DNS resolver'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://unbound.net/'
 license=('custom:BSD')
+arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool')
 depends=('openssl' 'ldns')
 makedepends=('expat')
@@ -19,7 +18,7 @@ backup=('etc/unbound/unbound.conf')
 source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz"
         'unbound.conf'
         'rc.d')
-sha1sums=('1435029abe63d0106213acb9f173b885183cf1d7'
+sha1sums=('bbda46664ea8391ca7986300ce98a79787c0e322'
           '5d473ec2943fd85367cdb653fcd58e186f07383f'
           'dc96e772f467b32555df21d16fdb15e98194c228')
 
diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD
index 88ffd0291..79316346d 100644
--- a/core/nilfs-utils/PKGBUILD
+++ b/core/nilfs-utils/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 145721 2011-12-28 18:28:07Z ibiru $
+# $Id: PKGBUILD 147682 2012-01-26 19:27:33Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> 
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
 pkgname=nilfs-utils
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.nilfs.org/"
@@ -12,7 +13,7 @@ backup=('etc/nilfs_cleanerd.conf')
 depends=('util-linux')
 options=(!libtool)
 source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('738f7bee062051c14dcff444bb17ada7')
+md5sums=('caa7d8b7121311bd978120e2f0c45d81')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index 9592c0e52..07f91ab67 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 141291 2011-10-28 08:03:24Z tpowa $
+# $Id: PKGBUILD 147668 2012-01-26 08:10:51Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('smbclient' 'samba')
-pkgver=3.6.1
+pkgver=3.6.2
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.1
+_realver=3.6.2
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 url="http://www.samba.org"
@@ -38,7 +38,6 @@ build() {
               --with-quotas \
               --with-ads \
               --with-acl-support \
-              --with-cifsmount \
               --with-libsmbclient \
               --with-syslog \
               --enable-external-libtalloc \
@@ -137,7 +136,7 @@ depends=('db' 'popt' 'libcups' 'acl' 'libldap' "smbclient>=$pkgver" 'libcap' 'kr
   # copy ldap example
   install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema
 }
-md5sums=('5291717be0734e07dc07b6110e162e87'
+md5sums=('bd2bb63b1c90161b88262f813bd1ce8b'
          'a3da19515a234c703876cf850c44e996'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'