16 files changed, 129 insertions, 56 deletions
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index 8cc22ace5..3cf76f09a 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115062 2014-07-05 06:49:19Z fyan $
+# $Id: PKGBUILD 115146 2014-07-05 17:57:54Z jlichtblau $
 # Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor (Arch): leif_thande <leif.thande@gmail.com>
 # Contributor (Arch): tranquility <trankas@gmail.com>
@@ -9,7 +9,7 @@
 _pkgname=atool
 pkgname=atool-libre
 pkgver=0.39.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A script for managing file archives of various types, without nonfree unace and unrar support"
 arch=('any')
 url="http://www.nongnu.org/atool/"
@@ -42,13 +42,13 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
+  cd "${srcdir}"/${_pkgname}-${pkgver}
 
   ./configure --prefix=/usr
 }
 
 package() {
-  cd ${srcdir}/${_pkgname}-${pkgver}
+  cd "${srcdir}"/${_pkgname}-${pkgver}
 
-  make prefix=${pkgdir}/usr install
+  make prefix="${pkgdir}"/usr install
 }
diff --git a/libre/atool-libre/atool.changelog b/libre/atool-libre/atool.changelog
index ce0b12c2b..c61925fb0 100644
--- a/libre/atool-libre/atool.changelog
+++ b/libre/atool-libre/atool.changelog
@@ -1,3 +1,6 @@
+2014-07-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* atool 0.39.0-3 mtree rebuild
+
 2012-04-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 	* atool 0.39.0-1
 
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD
index 0a5e6d5f8..77793b795 100644
--- a/libre/bitlbee-libre/PKGBUILD
+++ b/libre/bitlbee-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 202378 2013-12-21 14:01:44Z andyrtr $
+# $Id: PKGBUILD 216588 2014-07-07 01:27:38Z dreisner $
 
 # Contributor (Arch): FUBAR <mrfubar@gmail.com>
 # Contributor (Arch): simo <simo@archlinux.org>
@@ -10,28 +10,24 @@
 
 _pkgname=bitlbee
 pkgname=bitlbee-libre
-pkgver=3.2.1
-pkgrel=2.2
+pkgver=3.2.2
+pkgrel=1
 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC, without nonfree Skype support'
 url='http://www.bitlbee.org/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('gnutls' 'glib2')
-makedepends=('asciidoc' 'libotr3')
-optdepends=('libotr3: for OTR encryption support'
-            'xinetd: to run bitlbee through xinetd')
+makedepends=('asciidoc' 'libotr')
+optdepends=('libotr: for OTR encryption support')
 provides=($_pkgname=$pkgver)
 conflicts=($_pkgname)
 replaces=($_pkgname)
-source=("http://get.bitlbee.org/src/${_pkgname}-${pkgver}.tar.gz"
-        'xinetd'
+source=("http://get.bitlbee.org/src/$_pkgname-$pkgver.tar.gz"
         'bitlbee.tmpfiles')
-sha1sums=('954471ab87206826c072f31b3def40a1be5a78f5'
-          '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17'
+sha1sums=('7e3cfe2b6bf4e8e603c74e7587307a6f5d267e9c'
           '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c')
 backup=('etc/bitlbee/bitlbee.conf'
-        'etc/bitlbee/motd.txt'
-        'etc/xinetd.d/bitlbee')
+        'etc/bitlbee/motd.txt')
 install=bitlbee.install
 
 build() {
@@ -49,17 +45,12 @@ build() {
     --otr=plugin \
     --skype=0
 
-  # hacky: build against libotr3
-  sed -i 's,^OTRFLAGS=.*,OTRFLAGS=-lotr3,' Makefile.settings
-  sed -i 's,#include.*libotr,&3,' otr.h
-
   make
 }
 
 package() {
-  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev}
+  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install{,-etc,-dev,-systemd}
 
   install -o65 -g65 -dm770 "$pkgdir/var/lib/bitlbee"
-  install -Dm644 "$srcdir/xinetd" "$pkgdir/etc/xinetd.d/bitlbee"
   install -Dm644 "$srcdir/bitlbee.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/bitlbee.conf"
 }
diff --git a/libre/bitlbee-libre/xinetd b/libre/bitlbee-libre/xinetd
deleted file mode 100644
index d671a8cfc..000000000
--- a/libre/bitlbee-libre/xinetd
+++ /dev/null
@@ -1,12 +0,0 @@
-service bitlbee
-{
-        type = UNLISTED
-        socket_type = stream
-        protocol = tcp
-        wait = no
-        user = bitlbee
-	group = bitlbee
-        server = /usr/sbin/bitlbee
-        port = 6667
-        disable = yes
-}
diff --git a/libre/distcc-nozeroconf/PKGBUILD b/libre/distcc-nozeroconf/PKGBUILD
index d58c7a801..ed30cc230 100644
--- a/libre/distcc-nozeroconf/PKGBUILD
+++ b/libre/distcc-nozeroconf/PKGBUILD
@@ -6,10 +6,10 @@
 
 _pkgname=distcc
 pkgname=distcc-nozeroconf
-pkgver=3.1
+pkgver=3.2rc1
 provides=("$_pkgname=$pkgver")
 conflicts=("$_pkgname")
-pkgrel=12
+pkgrel=1
 pkgdesc="A distributed C, C++, Obj C compiler (without zeroconf support)"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/distcc/"
@@ -23,7 +23,7 @@ backup=('etc/conf.d/distccd'
 source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2
 	distccd.conf.d
 	distccd.service)
-md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
+md5sums=('18cd4f33f5cfc3e75675cafc568fb9cf'
          '239aae53250e3e35288cba566bc0bbf1'
          '09f0688da9c1840e518d2593bd5c3830')
 
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 7c5383411..74e507fce 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 215050 2014-06-11 23:14:55Z dreisner $
+# $Id: PKGBUILD 216487 2014-07-04 13:14:12Z dreisner $
 # Maintainer (Arch): Tom Gundersen <teg@jklm.no>
 # Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=filesystem
-pkgver=2014.06
-pkgrel=2
+pkgver=2014.07
+pkgrel=1
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,7 +21,7 @@ source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
         'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
         'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first' 'parabola.7.txt'
         'locale.sh')
-md5sums=('89adbc553847ba96b3437234dc224f9d'
+md5sums=('d46cb1adf8175888cc827a3dad8857d2'
          '6be47d893fd49b2e4a8c0e811b350861'
          '9e4533df61f0c82d6b2e2371f7376282'
          '4c4540eeb748bf1f71d631b8c1dcf0b3'
@@ -36,14 +36,42 @@ md5sums=('89adbc553847ba96b3437234dc224f9d'
          '0e145e18fea8fd190b30d45764f5707c'
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '22518e922891f9359f971f4f5b4e793c'
-         'f45389e116ab0b9e9968287617d27c7d'
+         '09bce9236c3729d31aaa528bcf5d198e'
          '0b6f835598c7640184e476057b3c7722'
          'a8a962370cd0128465d514e6a1f74130'
          'd5732ffdb3488e1383d4ea199343e767'
          '4fab2b798deff348e04f05152111aae0')
 
+lint() {
+	# ensure that passwd is sync'd to shadow and group is sync'd to gshadow.
+	local r=0
+
+	local passwd shadow group gshadow
+
+	for f in passwd shadow group gshadow; do
+		mapfile -t "$f" < <(cut -d: -f1 "$f" | sort)
+	done
+
+	# we can cheat and do simple string comparison only because we can make some
+	# assumptions about the data in these files
+	if [[ ${passwd[*]} != "${shadow[*]}" ]]; then
+		error 'passwd is not in sync with shadow!'
+		r=1
+	fi
+
+	if [[ ${group[*]} != "${gshadow[*]}" ]]; then
+		error 'group is not in sync with gshadow!'
+		r=1
+	fi
+
+	return $r
+}
+
 build() {
 	cd ${srcdir}
+
+	lint
+
 	a2x -d manpage -f manpage parabola.7.txt
 }
 
@@ -65,7 +93,7 @@ package() {
 
 	# setup /etc
 	install -d etc/{ld.so.conf.d,skel,profile.d}
-	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
+	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
 		install -m644 ${srcdir}/${f} etc/
 	done
 	ln -s /proc/self/mounts etc/mtab
@@ -76,6 +104,7 @@ package() {
 	ln -sv parabola-release etc/arch-release
 	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
 	install -m755 ${srcdir}/locale.sh etc/profile.d/locale.sh
+	install -Dm644 "$srcdir"/os-release "$pkgdir"/usr/lib/os-release
 
 	# setup /var
 	for d in cache/man local opt log/old lib/misc empty; do
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index 2ce661725..065a79d6c 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -33,6 +33,7 @@ post_upgrade() {
 	_adduser uuidd    -u 68 -d / -g uuidd -s /usr/bin/nologin
 	_addgroup dbus    -g 81
 	_adduser dbus     -u 81 -d / -g dbus -s /usr/bin/nologin
+	_addgroup input   -g 97
 	_addgroup systemd-journal -g 190
 	_addgroup systemd-journal-gateway -g 191
 	_adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 0d26d616a..ebfb87169 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -29,6 +29,7 @@ optical:x:93:
 floppy:x:94:
 storage:x:95:
 scanner:x:96:
+input:x:97:
 power:x:98:
 nobody:x:99:
 users:x:100:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index fb475bfd2..1fcb075bc 100644
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -29,7 +29,13 @@ optical:::
 floppy:x::
 storage:x::
 scanner:x::
+input:x::
 power:x::
 nobody:::
 users:::
-systemd-journal:x::
+systemd-journal:::
+systemd-journal-gateway:::
+systemd-timesync:::
+systemd-network:::
+systemd-bus-proxy:::
+systemd-resolve:::
diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD
index ad6565c2a..e593f97d2 100644
--- a/libre/mesa-libcl/PKGBUILD
+++ b/libre/mesa-libcl/PKGBUILD
@@ -5,8 +5,8 @@ pkgbase=mesa
 _pkgname=libcl
 pkgname=$pkgbase-$_pkgname
 _pkgflag=libre
-pkgver=10.2.2
-pkgrel=2
+pkgver=10.2.3
+pkgrel=1
 pkgdesc='Mesa 3-D OpenCL library'
 url=http://${pkgbase}3d.sourceforge.net
 license=(
@@ -59,7 +59,7 @@ source=(
   ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2
 )
 sha512sums=(
-  c01e336bd7ef629c4867041c3e78eda1d2a3abe1f73cd7cc43f6bcff810f52df4362bb461b27456c49083e31cf47ccba5f0ffc67f1706858572759ee173f870d
+  418c452abb2911e0c3105b23ea4baff98dae8bb612eb88011970f34cad319063a7dd2bd18a95729ce116a06f675dfa1c620226be8582d6f06ca34def3bafcf6a
 )
 
 build() {
diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD
index 5596513a9..df8a55c76 100644
--- a/libre/xbmc-libre-lts/PKGBUILD
+++ b/libre/xbmc-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us>
 # Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com>
 # Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com>
@@ -12,7 +12,7 @@ _pkgname=xbmc
 pkgname=xbmc-libre-lts
 pkgver=12.3
 _codename=Frodo
-pkgrel=4
+pkgrel=5
 pkgdesc="A software media player and entertainment hub for digital media (Frodo version), without nonfree addons and unrar support"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -47,15 +47,17 @@ source=(
   'xbmc.service'
   "libass.patch::https://bugs.archlinux.org/index.php?getfile=11285"
   '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch'
+  'libnfs-header-changes.patch'
 )
 mkmd5sums=(
   '7ae385ebf8e5cfcb917393235e6efbdb'
 )
 md5sums=(
   '10ed8b9cb84b2825d746c26bd5236899'
-  '12c9b4dfb8dd0d5b20cc230c28388160'
+  'a3e68ff230fac14cd58f2b5eff1661ba'
   '7fd6399d2ffbdf06b724f0cc2efa0784'
   '8998bc505ae4c66604c90b1c005be8c2'
+  '27f1e75d99977d5bdd3eee58921514cb'
 )
 
 mksource() {
@@ -70,6 +72,7 @@ prepare() {
 
   patch -p0 <$srcdir/libass.patch
   patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch"
+  patch -p1 -i "$srcdir/libnfs-header-changes.patch"
 
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
diff --git a/libre/xbmc-libre-lts/libnfs-header-changes.patch b/libre/xbmc-libre-lts/libnfs-header-changes.patch
new file mode 100644
index 000000000..ef3d45e2c
--- /dev/null
+++ b/libre/xbmc-libre-lts/libnfs-header-changes.patch
@@ -0,0 +1,24 @@
+diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
+index 85084a5..8efa7bf 100644
+--- a/xbmc/filesystem/NFSDirectory.cpp
++++ b/xbmc/filesystem/NFSDirectory.cpp
+@@ -37,6 +37,7 @@
+ using namespace XFILE;
+ using namespace std;
+ #include <limits.h>
++#include <nfsc/libnfs-zdr.h>
+ #include <nfsc/libnfs-raw-mount.h>
+ #include <nfsc/libnfs-raw-nfs.h>
+ 
+diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp
+index 479f3fe..2aeea32 100644
+--- a/xbmc/filesystem/NFSFile.cpp
++++ b/xbmc/filesystem/NFSFile.cpp
+@@ -32,6 +32,7 @@
+ #include "network/DNSNameCache.h"
+ #include "threads/SystemClock.h"
+ 
++#include <nfsc/libnfs-zdr.h>
+ #include <nfsc/libnfs-raw-mount.h>
+ 
+ #ifdef TARGET_WINDOWS
diff --git a/libre/xbmc-libre-lts/xbmc.service b/libre/xbmc-libre-lts/xbmc.service
index 81a37ac7e..90119f07d 100644
--- a/libre/xbmc-libre-lts/xbmc.service
+++ b/libre/xbmc-libre-lts/xbmc.service
@@ -1,6 +1,6 @@
 [Unit]
 Description = Starts instance of XBMC using xinit
-After = systemd-user-sessions.service
+After = systemd-user-sessions.service network.target
 Conflicts=getty@tty7.service
 
 [Service]
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index bd8e32c35..f97c7bae7 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 112817 2014-06-08 08:35:29Z idevolder $
+# $Id: PKGBUILD 115116 2014-07-05 17:16:22Z idevolder $
 # Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor (Arch): Brad Fanella <bradfanella@archlinux.us>
 # Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -14,7 +14,7 @@ _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=13.1
 _codename=Gotham
-pkgrel=2
+pkgrel=3
 pkgdesc="A software media player and entertainment hub for digital media (Gotham version), without nonfree addons and unrar support"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -54,15 +54,17 @@ source=(
   'xbmc.service'
   'enable-external-ffmpeg.patch'
   '0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch'
+  'libnfs-header-changes.patch'
 )
 mksha256sums=(
   '344b604eae2ddb47c032dd7964d01f27e6fcd7a8873c84c0841d5da75961a678'
 )
 sha256sums=(
   '0e06a586e2b3041fd812b9d440ffe224f78779ac4cf6a21421a47c74a0f65d1f'
-  '17ea860b675568f516df0289e5663029a2ce1829b0dfa3c71636ef1ae7cd2207'
+  '1a94a7952ef99cd3dd6f4b921630563f72a3b907265e91e0a37b07339081558c'
   '0239e33e87292c7340ed2092f2b5f1e82f5e283b1f763fb125b3aee78f50c355'
   '5f5fe2932050265ad71c82b5d23efe5eaf7b2b3a152bdc6da66675cfb655fabe'
+  '9b49e98540cfcf3431d38cf9cd981ed8450ccbfcb70eed7f862f82f39d66763b'
 )
 
 mksource() {
@@ -76,6 +78,7 @@ prepare() {
   cd "$srcdir/xbmc-$pkgver-$_codename"
   patch -p1 -i "$srcdir/enable-external-ffmpeg.patch"
   patch -p1 -i "$srcdir/0001-make-sure-applications-xbmc.desktop-does-nt-have-exe.patch"
+  patch -p1 -i "$srcdir/libnfs-header-changes.patch"
 
   find -type f -name *.py -exec sed 's|^#!.*python$|#!/usr/bin/python2|' -i "{}" +
   sed 's|^#!.*python$|#!/usr/bin/python2|' -i tools/depends/native/rpl-native/rpl
diff --git a/libre/xbmc-libre/libnfs-header-changes.patch b/libre/xbmc-libre/libnfs-header-changes.patch
new file mode 100644
index 000000000..ef3d45e2c
--- /dev/null
+++ b/libre/xbmc-libre/libnfs-header-changes.patch
@@ -0,0 +1,24 @@
+diff --git a/xbmc/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp
+index 85084a5..8efa7bf 100644
+--- a/xbmc/filesystem/NFSDirectory.cpp
++++ b/xbmc/filesystem/NFSDirectory.cpp
+@@ -37,6 +37,7 @@
+ using namespace XFILE;
+ using namespace std;
+ #include <limits.h>
++#include <nfsc/libnfs-zdr.h>
+ #include <nfsc/libnfs-raw-mount.h>
+ #include <nfsc/libnfs-raw-nfs.h>
+ 
+diff --git a/xbmc/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp
+index 479f3fe..2aeea32 100644
+--- a/xbmc/filesystem/NFSFile.cpp
++++ b/xbmc/filesystem/NFSFile.cpp
+@@ -32,6 +32,7 @@
+ #include "network/DNSNameCache.h"
+ #include "threads/SystemClock.h"
+ 
++#include <nfsc/libnfs-zdr.h>
+ #include <nfsc/libnfs-raw-mount.h>
+ 
+ #ifdef TARGET_WINDOWS
diff --git a/libre/xbmc-libre/xbmc.service b/libre/xbmc-libre/xbmc.service
index 81a37ac7e..90119f07d 100644
--- a/libre/xbmc-libre/xbmc.service
+++ b/libre/xbmc-libre/xbmc.service
@@ -1,6 +1,6 @@
 [Unit]
 Description = Starts instance of XBMC using xinit
-After = systemd-user-sessions.service
+After = systemd-user-sessions.service network.target
 Conflicts=getty@tty7.service
 
 [Service]