Merge branch 'master' of vparabola:abslibre

10 files changed, 79 insertions, 43 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 1ed9e7d46..9590f1a83 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $
+# $Id: PKGBUILD 214251 2014-06-04 14:43:58Z 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=2013.05
-pkgrel=2.2
+pkgver=2014.05
+pkgrel=2
 pkgdesc='Base filesystem (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
@@ -21,6 +21,26 @@ 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=('e26a6b21c1e154e87a5c45e8b8c366fd'
+         '6be47d893fd49b2e4a8c0e811b350861'
+         '9e4533df61f0c82d6b2e2371f7376282'
+         '4c4540eeb748bf1f71d631b8c1dcf0b3'
+         'f28150d4c0b22a017be51b9f7f9977ed'
+         '6e488ffecc8ba142c0cf7e2d7aeb832e'
+         '932af5f313265a774ec5995d9e720025'
+         '2ef2429c2c98d0883906aa6f5363be80'
+         '693c97f2c9a519bb97a17008e92c2b74'
+         '1745349eb24ed21b4cfaa6f423bddb76'
+         '7bc65f234dfb6abf24e7c3b03e86f4ff'
+         'd41d8cd98f00b204e9800998ecf8427e'
+         '0e145e18fea8fd190b30d45764f5707c'
+         '6f48288b6fcaf0065fcb7b0e525413e0'
+         '22518e922891f9359f971f4f5b4e793c'
+         'f45389e116ab0b9e9968287617d27c7d'
+         '0b6f835598c7640184e476057b3c7722'
+         'a8a962370cd0128465d514e6a1f74130'
+         'd5732ffdb3488e1383d4ea199343e767'
+         '4fab2b798deff348e04f05152111aae0')
 
 build() {
 	cd ${srcdir}
@@ -53,7 +73,7 @@ package() {
 		install -m600 ${srcdir}/${f} etc/
 	done
 	touch etc/parabola-release
-	ln -s parabola-release etc/arch-release
+	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
 
@@ -112,23 +132,3 @@ package() {
 	done
 	ln -s ../man usr/local/share/man
 }
-md5sums=('7b8e40f8f793e60f471511641bb1c9f2'
-         '6be47d893fd49b2e4a8c0e811b350861'
-         '9e4533df61f0c82d6b2e2371f7376282'
-         '4c4540eeb748bf1f71d631b8c1dcf0b3'
-         'f28150d4c0b22a017be51b9f7f9977ed'
-         '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '1cfd310dff0804a7d21958487c32a3b1'
-         '2ef2429c2c98d0883906aa6f5363be80'
-         '693c97f2c9a519bb97a17008e92c2b74'
-         '1745349eb24ed21b4cfaa6f423bddb76'
-         '7bc65f234dfb6abf24e7c3b03e86f4ff'
-         'd41d8cd98f00b204e9800998ecf8427e'
-         '0e145e18fea8fd190b30d45764f5707c'
-         '6f48288b6fcaf0065fcb7b0e525413e0'
-         '22518e922891f9359f971f4f5b4e793c'
-         'f45389e116ab0b9e9968287617d27c7d'
-         '0b6f835598c7640184e476057b3c7722'
-         'a8a962370cd0128465d514e6a1f74130'
-         'd5732ffdb3488e1383d4ea199343e767'
-         '3807d07215d9116331fe1cf8feeaa0f8')
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index c04374422..62e553ce4 100644
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -25,15 +25,19 @@ post_upgrade() {
 	_addgroup games   -g 50
 	_addgroup uucp    -g 14
 	_addgroup http    -g 33
-	_adduser  http    -u 33 -d /srv/http -g http -s /bin/false
+	_adduser  http    -u 33 -d /srv/http -g http -s /usr/bin/nologin
 	_addgroup scanner -g 96
 	_addgroup rfkill  -g 24
 	_addgroup lock    -g 54
 	_addgroup uuidd   -g 68
-	_adduser uuidd    -u 68 -d / -g uuidd -s /sbin/nologin
+	_adduser uuidd    -u 68 -d / -g uuidd -s /usr/bin/nologin
 	_addgroup dbus    -g 81
-	_adduser dbus     -u 81 -d / -g dbus -s /sbin/nologin
+	_adduser dbus     -u 81 -d / -g dbus -s /usr/bin/nologin
 	_addgroup systemd-journal -g 190
+	_addgroup systemd-journal-gateway -g 191
+	_adduser systemd-journal-gateway -u 191 -g 191 -d / -s /usr/bin/nologin
+	_addgroup systemd-timesync -g 192
+	_adduser systemd-timesync -u 192 -g 192 -d / -s /usr/bin/nologin
 
 	# sync gshadow to group (fixes FS#19869)
 	if ! grep -q '^lock:' etc/gshadow; then
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 6c91b292f..0d0918cbb 100644
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -33,3 +33,5 @@ power:x:98:
 nobody:x:99:
 users:x:100:
 systemd-journal:x:190:
+systemd-journal-gateway:x:191:
+systemd-timesync:x:192:
diff --git a/libre/filesystem/locale.sh b/libre/filesystem/locale.sh
index 5fd4174d5..3cfc89c1b 100644
--- a/libre/filesystem/locale.sh
+++ b/libre/filesystem/locale.sh
@@ -9,11 +9,10 @@ elif [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
   . "$HOME/.config/locale.conf"
 elif [ -r /etc/locale.conf ]; then
   . /etc/locale.conf
-elif [ -r /etc/rc.conf ]; then
-  LANG=$(. /etc/rc.conf 2>/dev/null; echo "$LOCALE")
 fi
 
-export LANG="${LANG:-C}"
+LANG=${LANG:-C}
+export LANG
 [ -n "$LC_CTYPE" ]          && export LC_CTYPE
 [ -n "$LC_NUMERIC" ]        && export LC_NUMERIC
 [ -n "$LC_TIME" ]           && export LC_TIME
diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd
index 671fc486e..b65b7cc8a 100644
--- a/libre/filesystem/passwd
+++ b/libre/filesystem/passwd
@@ -7,3 +7,5 @@ http:x:33:33:http:/srv/http:/bin/false
 uuidd:x:68:68:uuidd:/:/sbin/nologin
 dbus:x:81:81:dbus:/:/sbin/nologin
 nobody:x:99:99:nobody:/:/bin/false
+systemd-journal-gateway:x:191:191:systemd-journal-gateway:/:/bin/false
+systemd-timesync:x:192:192:systemd-timesync:/:/bin/false
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index 336cb4dd6..a4a345635 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 107420 2014-03-17 10:06:48Z alucryd $
+# $Id: PKGBUILD 112452 2014-06-02 10:30:28Z alucryd $
 # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
 # Contributor (Arch): TingPing <tingping@tingping.se>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=hexchat
 pkgname=hexchat-libre
-pkgver=2.9.6.1
-pkgrel=2
+pkgver=2.10.0
+pkgrel=1
 pkgdesc='A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://hexchat.github.io/'
 license=('GPL')
-depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
-makedepends=('perl' 'python')
+depends=('dbus-glib' 'desktop-file-utils' 'gtk2' 'libcanberra' 'libnotify' 'libproxy' 'pciutils')
+makedepends=('intltool' 'iso-codes' 'perl' 'python')
 optdepends=('enchant: Spell check'
             'perl: Perl plugin'
             'python: Python plugin')
@@ -21,7 +21,7 @@ replaces=($_pkgname)
 conflicts=($_pkgname)
 provides=($_pkgname=$pkgver)
 source=("http://dl.hexchat.org/${_pkgname}/${_pkgname}-${pkgver}.tar.xz")
-sha256sums=('6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470')
+sha256sums=('a0247f1e12379154d0719d9c6861dc22817b588562653bb9d3626863d8eca916')
 
 build() {
   cd ${_pkgname}-${pkgver}
@@ -33,7 +33,7 @@ build() {
   sed -i '\|NAME Open Link| s|Firefox|Iceweasel|' src/common/hexchat.c
   sed -i '\|NAME Open Link| s|firefox -private %s\\n\\n";|iceweasel -private %s\\n\\n"\\\n		"NAME Open Link in Private Icecat Window\\n"		"CMD !icecat -private %s\\n\\n";|' src/common/hexchat.c
 
-  ./configure --prefix='/usr' --enable-{python='python3.4',shm,spell='libsexy',textfe}
+  ./configure --prefix='/usr' --enable-{python='python3.4',textfe}
   make
 }
 
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 5371822a3..bdeebdb56 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109662 2014-04-17 21:37:35Z seblu $
+# $Id: PKGBUILD 112360 2014-06-01 08:43:39Z fyan $
 # Maintainer (Arch): Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
@@ -18,7 +18,7 @@ _basekernel=3.14
 #_sublevel=3
 #_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=2
+pkgrel=3
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
index f26e026c3..a21694e5d 100644
--- a/libre/vim-runtime/PKGBUILD
+++ b/libre/vim-runtime/PKGBUILD
@@ -12,7 +12,7 @@ _patchlevel=307
 __hgrev=54d96e3b2eec
 _versiondir="vim${_topver//./}"
 pkgver=${_topver}.${_patchlevel}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:vim')
 url="http://www.vim.org"
diff --git a/libre/winetricks-libre/PKGBUILD b/libre/winetricks-libre/PKGBUILD
new file mode 100644
index 000000000..9b74efa9c
--- /dev/null
+++ b/libre/winetricks-libre/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 107291 2014-03-16 16:05:59Z lfleischer $
+# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor (Arch): Laurent Carlier <lordheavym@gmail.com>
+# Contributor (Arch): DsTr <dstr@gmail.com>
+# Contributor (Arch): Allan McRae <allan@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Gaming4JC <gaming4jc2@yahoo.com>
+
+_pkgname=winetricks
+pkgname=winetricks-libre
+pkgver=1.0
+pkgrel=1
+pkgdesc='Script to install various redistributable runtime libraries in Wine (a libre fork of winetricks)'
+url='https://github.com/g4jc/winetricks-libre'
+license=('LGPL')
+arch=('any')
+replaces=($_pkgname)
+conflicts=($_pkgname)
+provides=($_pkgname)
+optdepends=('zenity: GUI for GNOME desktop'
+            'kdebase-kdialog: GUI for KDE desktop')
+source=("https://github.com/g4jc/${pkgname}/archive/${pkgver}.tar.gz")
+md5sums=('aec9a4c60f793b25bd9df79e3c336994')
+
+package() {
+  depends=('wine' 'cabextract' 'unzip' 'xorg-xmessage')
+
+  install -Dm755 "${srcdir}/${pkgname}-${pkgver}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  ln -sv ${pkgname} "${pkgdir}/usr/bin/${_pkgname}"
+}
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index 1214dc947..50bee2561 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $
+# $Id: PKGBUILD 213744 2014-05-28 22:09:31Z eric $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
 # Maintainer: André Silva <emulatorman@parabola.nu>
@@ -6,7 +6,7 @@
 _pkgname=xchat
 pkgname=xchat-libre
 pkgver=2.8.8
-pkgrel=13
+pkgrel=14
 pkgdesc="A GTK+ based IRC client, without nonfree browser reference"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xchat.org/"
@@ -18,7 +18,6 @@ depends=('gtk2' 'openssl' 'dbus-glib' 'libnotify' 'hicolor-icon-theme')
 makedepends=('tcl' 'perl' 'python2' 'librsvg')
 optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin'
             'python2: for python plugin')
-options=('!libtool')
 install=xchat.install
 source=(http://www.xchat.org/files/source/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz
         http://xchat.org/files/icons/xchat-svg.tar.bz2