Merge branch 'master' of ssh://projects.parabola.nu/~git/abslibre

13 files changed, 27 insertions, 61 deletions

diff --git a/java/java-rxtx/0003-lockdir-location.patch b/java/java-rxtx/0003-lockdir-location.patch
index 78a757f81..0278add4e 100644
--- a/java/java-rxtx/0003-lockdir-location.patch
+++ b/java/java-rxtx/0003-lockdir-location.patch
@@ -12,7 +12,7 @@ http://lists.freedesktop.org/archives/systemd-devel/2011-March/001823.html
  #if defined(__linux__)
  #	define DEVICEDIR "/dev/"
 -#	define LOCKDIR "/var/lock"
-+#	define LOCKDIR "/var/lock/lockdev"
++#	define LOCKDIR "/run/lock/lockdev"
  #	define LOCKFILEPREFIX "LCK.."
  #	define FHS
  #endif /* __linux__ */
diff --git a/java/java-rxtx/GroupMembership.txt b/java/java-rxtx/GroupMembership.txt
index dd5c47076..fef1ef349 100644
--- a/java/java-rxtx/GroupMembership.txt
+++ b/java/java-rxtx/GroupMembership.txt
@@ -1,7 +1,7 @@
 In order to use a program that makes use of rxtx, you must be a member
 of the groups:
  * uucp: for access to hardware devices in /dev
- * lock: for access to hardware lockfiles in /var/lock/lockdev
+ * lock: for access to hardware lockfiles in /run/lock/lockdev
 
 Most documentation indicates that you must be in one or the other,
 depending on your distro; you must actually be in both.
diff --git a/java/java-rxtx/PKGBUILD b/java/java-rxtx/PKGBUILD
index 87c253900..1d247a802 100644
--- a/java/java-rxtx/PKGBUILD
+++ b/java/java-rxtx/PKGBUILD
@@ -19,7 +19,7 @@ case "$_pkgver" in
     *arduino*)
 	url="https://github.com/arduino/RXTX"
 	source=("libre://RXTX-$pkgver.tar.gz")
-	md5sums=('a71156587dc8d28d1ff4ece376bc0140')
+	md5sums=('f083d5a17878ccf4a25347f23d43c17b')
 	mksource=("git://github.com/arduino/RXTX.git#${_gitver}")
 	mkmd5sums=('SKIP')
 	_dirname=RXTX
@@ -42,8 +42,8 @@ source+=(
 md5sums+=('a36caaca717018341d69605f962d1c2a'
           '39c88043032de742c6b51d90a26eee2c'
           'a910e0c75a9c687d2b2f782e3d9982e3'
-          '19b19c2514bce563be2a812888e1d9b4'
-          '9dc461eab358e3b78c4b688977997116')
+          '33ece2602aed350a449e922b5465ea22'
+          '1c888e587298bcaf2b562f95bc62a9ad')
 
 _MAKEFLAGS=('JHOME=/usr/share/java' 'RXTX_PATH=/usr/lib')
 
diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD
index 318ef9643..623ad33b4 100644
--- a/libre/dpkg/PKGBUILD
+++ b/libre/dpkg/PKGBUILD
@@ -15,7 +15,7 @@ license=('GPL2')
 pkgver=1.17.6
 url="http://packages.debian.org/source/sid/dpkg"
 
-pkgrel=1
+pkgrel=2
 options=('staticlibs')
 
 if ! type in_array &>/dev/null; then
@@ -109,7 +109,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--sysconfdir=/etc \
-		--sbindir=/sbin \
+		--sbindir=/usr/bin \
 		--localstatedir=/var \
 		--with-zlib \
 		--with-liblzma \
diff --git a/libre/lirc/PKGBUILD b/libre/lirc/PKGBUILD
index 4a0f5f8f6..275d6b312 100644
--- a/libre/lirc/PKGBUILD
+++ b/libre/lirc/PKGBUILD
@@ -72,7 +72,7 @@ source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar
         ${pkgbase}.tmpfiles)
 md5sums=('1f1fac162ed309dd50f307e96a292957'
          '9ec33169b3407f74264062d7679dd269'
-         'cd00acf480e82a0bf050032732d0d733'
+         '2d68e8b7423b4f4e2fcb37f2a7ca3caf'
          '3deb02604b37811d41816e9b4385fcc3'
          '32df3b9bc859565d6acf5f0e5b747083'
          'febf25c154a7d36f01159e84f26c2d9a')
diff --git a/libre/lirc/lirc-0.9.1a-fix-segfaults.patch b/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
index a1f657551..0912294cc 100644
--- a/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
+++ b/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
@@ -17,8 +17,9 @@ index d8ddedd..11293e2 100644
  driver          = default
  device          = /dev/lirc0
 -output          = /var/run/lirc/lircd
-+lircdfile       = /var/run/lirc/lircd
- pidfile         = /var/run/lirc/lircd.pid
++lircdfile       = /run/lirc/lircd
+-pidfile         = /var/run/lirc/lircd.pid
++pidfile         = /run/lirc/lircd.pid
  plugindir       = /usr/lib/lirc/plugins
  allow-simulate  = No
 -- 
diff --git a/libre/mcomix/PKGBUILD b/libre/mcomix/PKGBUILD
index 3727242e8..b6dd55def 100644
--- a/libre/mcomix/PKGBUILD
+++ b/libre/mcomix/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=mcomix
 pkgver=1.00
-pkgrel=6.parabola1
+pkgrel=6.parabola2
 pkgdesc="A user-friendly, customizable image viewer specifically designed to handle comic books, without nonfree unrar support"
 arch=('any')
 url="http://sourceforge.net/projects/mcomix/"
diff --git a/libre/mcomix/mcomix.install b/libre/mcomix/mcomix.install
index 82047a202..982ff97fa 100644
--- a/libre/mcomix/mcomix.install
+++ b/libre/mcomix/mcomix.install
@@ -1,8 +1,8 @@
 pkgname=mcomix
 
 post_install() {
-  if [ -f usr/sbin/gconfpkg ]; then
-      usr/sbin/gconfpkg --install ${pkgname} &> /dev/null
+  if [ -f usr/bin/gconfpkg ]; then
+      usr/bin/gconfpkg --install ${pkgname} &> /dev/null
   fi
   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
   update-desktop-database -q
@@ -19,8 +19,8 @@ post_upgrade() {
 }
 
 pre_remove() {
-  if [ -f usr/sbin/gconfpkg ]; then
-      usr/sbin/gconfpkg --uninstall ${pkgname} &> /dev/null
+  if [ -f usr/bin/gconfpkg ]; then
+      usr/bin/gconfpkg --uninstall ${pkgname} &> /dev/null
   fi
 }
 
diff --git a/libre/rp-pppoe/adsl b/libre/rp-pppoe/adsl
deleted file mode 100644
index 33bd91839..000000000
--- a/libre/rp-pppoe/adsl
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting ADSL Connection"
-    /usr/sbin/pppoe-start &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon adsl
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ADSL Connection"
-    /usr/sbin/pppoe-stop &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon adsl
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/~coadde/mariadb/PKGBUILD b/~coadde/mariadb/PKGBUILD
index 7b02c2533..5bfbf9a0f 100644
--- a/~coadde/mariadb/PKGBUILD
+++ b/~coadde/mariadb/PKGBUILD
@@ -20,8 +20,8 @@ source=("http://mirror.aarnet.edu.au/pub/${_pkgbase}/${pkgbase}-${pkgver}/kvm-ta
         "${falsename}d"
         'my.cnf')
 md5sums=('7074fa091b3c1489f45a5ddf12cd5e6f'
-         '2234207625baa29b2ff7d7b4f088abce'
-         '1c949c0dbea5206af0db14942d9927b6')
+         'b9ecca93aaeee9d8375fffb199d9057c'
+         '1351485633baf9894cfdf7c5bbffd7b5')
 
 build() {
   cd "${srcdir}"
@@ -37,7 +37,7 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONFDIR=/etc/${falsename} \
     -DMYSQL_DATADIR=/var/lib/${falsename} \
-    -DMYSQL_UNIX_ADDR=/var/run/${falsename}/${falsename}.sock \
+    -DMYSQL_UNIX_ADDR=/run/${falsename}/${falsename}.sock \
     -DDEFAULT_CHARSET=utf8 \
     -DDEFAULT_COLLATION=utf8_unicode_ci \
     -DENABLED_LOCAL_INFILE=ON \
diff --git a/~coadde/mariadb/mariadbd b/~coadde/mariadb/mariadbd
index 3ae612096..95986eb1a 100755
--- a/~coadde/mariadb/mariadbd
+++ b/~coadde/mariadb/mariadbd
@@ -11,7 +11,7 @@ getPID() {
 case "$1" in
   start)
     stat_busy "Starting MariaDB Server"
-    [ ! -d /var/run/mariadb ] && install -d -g mysql -o mysql /var/run/mariadb &>/dev/null
+    [ ! -d /run/mariadb ] && install -d -g mysql -o mysql /run/mariadb &>/dev/null
     if [ -z "$(getPID)" ]; then
        /usr/bin/mysqld_safe --user=mysql &>/dev/null &
       if [ $? -gt 0 ]; then
@@ -29,7 +29,7 @@ case "$1" in
           stat_fail
           exit 1
         else
-          echo $(getPID) > /var/run/mariadb/mariadb.pid
+          echo $(getPID) > /run/mariadb/mariadb.pid
           add_daemon mysqld
           stat_done
         fi
@@ -54,7 +54,7 @@ case "$1" in
         let timeo=${timeo}-1
       done
       if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mariadb/mariadb.pid &>/dev/null
+        rm -f /run/mariadb/mariadb.pid &>/dev/null
         rm_daemon mysqld
         stat_done
       else
diff --git a/~coadde/mariadb/my.cnf b/~coadde/mariadb/my.cnf
index 9a41b4fc3..387020858 100644
--- a/~coadde/mariadb/my.cnf
+++ b/~coadde/mariadb/my.cnf
@@ -18,14 +18,14 @@
 [client]
 #password	= your_password
 port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
+socket		= /run/mysqld/mysqld.sock
 
 # Here follows entries for some specific programs
 
 # The MySQL server
 [mysqld]
 port		= 3306
-socket		= /var/run/mysqld/mysqld.sock
+socket		= /run/mysqld/mysqld.sock
 datadir		= /var/lib/mysql
 skip-external-locking
 key_buffer_size = 16M
diff --git a/~coadde/mariadb/mysqld b/~coadde/mariadb/mysqld
index 1ac88a7cc..4bbddb5a4 100644
--- a/~coadde/mariadb/mysqld
+++ b/~coadde/mariadb/mysqld
@@ -11,7 +11,7 @@ getPID() {
 case "$1" in
   start)
     stat_busy "Starting MySQL Server"
-    [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null
+    [ ! -d /run/mysqld ] && install -d -g mysql -o mysql /run/mysqld &>/dev/null
     if [ -z "$(getPID)" ]; then
        /usr/bin/mysqld_safe --user=mysql &>/dev/null &
       if [ $? -gt 0 ]; then
@@ -29,7 +29,7 @@ case "$1" in
           stat_fail
           exit 1
         else
-          echo $(getPID) > /var/run/mysqld/mysqld.pid
+          echo $(getPID) > /run/mysqld/mysqld.pid
           add_daemon mysqld
           stat_done
         fi
@@ -54,7 +54,7 @@ case "$1" in
         let timeo=${timeo}-1
       done
       if [ -z "$(getPID)" ]; then
-        rm -f /var/run/mysqld/mysqld.pid &>/dev/null
+        rm -f /run/mysqld/mysqld.pid &>/dev/null
         rm_daemon mysqld
         stat_done
       else