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

13 files changed, 94 insertions, 65 deletions

diff --git a/libre/acpi_call/PKGBUILD b/libre/acpi_call/PKGBUILD
index 3edc09afa..38979af2d 100644
--- a/libre/acpi_call/PKGBUILD
+++ b/libre/acpi_call/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 116819 2014-08-04 07:10:28Z tpowa $
 # Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
 # Contributor (Arch): mortzu <me@mortzu.de>
 # Contributor (Arch): fnord0 <fnord0@riseup.net>
@@ -10,7 +9,7 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=3.16
-  _archrel=12
+  _archrel=13
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index d220586f8..9cecc3650 100644
--- a/libre/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -8,10 +8,10 @@ pkgdesc="A Java-based build tool"
 license=('Apache' 'custom:BSD3')
 url="http://ant.apache.org/"
 
-replaces=("$pkgname-libre")
-conflicts=("$pkgname-libre")
+replaces=("$pkgname-libre" "$pkgname-doc")
+conflicts=("$pkgname-libre" "$pkgname-doc")
 
-pkgrel=2.parabola1
+pkgrel=3.parabola1
 arch=('any')
 depends=('java-environment')
 makedepends=('jh')
diff --git a/libre/bbswitch/PKGBUILD b/libre/bbswitch/PKGBUILD
index f08ed8390..1172e3c6d 100644
--- a/libre/bbswitch/PKGBUILD
+++ b/libre/bbswitch/PKGBUILD
@@ -9,7 +9,7 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=3.16
-  _archrel=16
+  _archrel=17
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
diff --git a/libre/bfgminer/PKGBUILD b/libre/bfgminer/PKGBUILD
index 2591e8b84..dfbdb303e 100644
--- a/libre/bfgminer/PKGBUILD
+++ b/libre/bfgminer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 117772 2014-08-22 15:36:25Z fyan $
+# $Id: PKGBUILD 120159 2014-10-05 13:21:49Z fyan $
 # Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com>
 
 pkgname=bfgminer
-pkgver=4.7.0
-pkgrel=1.parabola3
+pkgver=4.9.0
+pkgrel=1.parabola1
 pkgdesc="Bitcoin miner featuring overclocking, monitoring, fan speed control and remote management. For FPGA/GPU/CPU Bitcoin mining, with opencl-mesa recommendation"
 arch=('i686' 'x86_64' 'mips64el')
 depends=('curl' 'jansson' 'libevent' 'libmicrohttpd' 'libusb' 'lm_sensors')
@@ -16,14 +16,13 @@ url='http://bfgminer.org/'
 license=('GPL3')
 source=(http://luke.dashjr.org/programs/bitcoin/files/$pkgname/$pkgver/$pkgname-$pkgver.txz
         remove-dangerous-rpath.patch)
-sha256sums=('044636103f2c399d8c0290e6642ef896cff43de3c025d99a1465e670337aeb0a'
-            'd26d07ca23ae25798c4db37cfda1a6a76f22d06e73efab1ddf62b3e1a7eef04c')
+sha256sums=('e406e6584443f5ab49ea936eaab80adb338d0966e0a4862b80434fdaa8e0daa7'
+            '27d89695ff963dd8f66654b9d454aa725c7db769def708513188fe0a496fda4d')
 
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver
 
-  patch -p0 < "${srcdir}"/remove-dangerous-rpath.patch
-  NOSUBMODULES=1 ./autogen.sh
+  patch -p1 -i "${srcdir}"/remove-dangerous-rpath.patch
 }
 
 build() {
diff --git a/libre/bfgminer/remove-dangerous-rpath.patch b/libre/bfgminer/remove-dangerous-rpath.patch
index abd815141..6152d23c3 100644
--- a/libre/bfgminer/remove-dangerous-rpath.patch
+++ b/libre/bfgminer/remove-dangerous-rpath.patch
@@ -1,11 +1,21 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -514,7 +514,7 @@
- 	])
- else
- 	libblkmaker_CFLAGS='-Ilibblkmaker'
--	libblkmaker_LDFLAGS='-Llibblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS"
-+	libblkmaker_LDFLAGS='-Llibblkmaker/.libs'
- 	libblkmaker_LIBS='-lblkmaker_jansson-0.1 -lblkmaker-0.1'
- 	AC_CONFIG_SUBDIRS([libblkmaker])
- fi
+diff -Naur bfgminer-4.8.0-orig/configure bfgminer-4.8.0/configure
+--- bfgminer-4.8.0-orig/configure	2014-10-04 20:54:28.717071865 -0400
++++ bfgminer-4.8.0/configure	2014-10-04 20:55:50.140274445 -0400
+@@ -12201,7 +12201,7 @@
+ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+ 	libbase58_CFLAGS='-I'"${ac_abs_top_srcdir}"'/libbase58'
+-	libbase58_LIBS='-L'"${ac_abs_top_srcdir}"'/libbase58/.libs -Wl,-rpath,\$$ORIGIN/libbase58/.libs'"$origin_LDFLAGS"'  -lbase58'
++	libbase58_LIBS='-L'"${ac_abs_top_srcdir}"'/libbase58/.libs -Wl,-rpath,/usr/lib'"$origin_LDFLAGS"'  -lbase58'
+ 	libbase58_SUBDIRS=libbase58
+ 	libbase58_EXTRADEPS=libbase58_directory
+ 	BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES
+@@ -12470,7 +12470,7 @@
+ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
+ 	libblkmaker_CFLAGS='-I'"${ac_abs_top_srcdir}"'/libblkmaker'
+-	libblkmaker_LIBS='-L'"${ac_abs_top_srcdir}"'/libblkmaker/.libs -Wl,-rpath,\$$ORIGIN/libblkmaker/.libs'"$origin_LDFLAGS"'  -lblkmaker_jansson-0.1 -lblkmaker-0.1'
++	libblkmaker_LIBS='-L'"${ac_abs_top_srcdir}"'/libblkmaker/.libs -Wl,-rpath,/usr/lib'"$origin_LDFLAGS"'  -lblkmaker_jansson-0.1 -lblkmaker-0.1'
+ 	libblkmaker_SUBDIRS=libblkmaker
+ 	libblkmaker_EXTRADEPS=libblkmaker_directory
+ 	BUNDLED_LIB_RULES="$BUNDLED_LIB_RULES
diff --git a/libre/linux-libre-tools/04-fix-usip-h-path.patch b/libre/linux-libre-tools/04-fix-usip-h-path.patch
new file mode 100644
index 000000000..2d9abce0a
--- /dev/null
+++ b/libre/linux-libre-tools/04-fix-usip-h-path.patch
@@ -0,0 +1,13 @@
+# Copyright 2014 Sébastien Luttringer
+
+--- a/tools/usb/usbip/libsrc/usbip_common.h      2014-10-06 02:13:09.295856364 +0200
++++ b/tools/usb/usbip/libsrc/usbip_common.h      2014-10-06 02:13:03.607873728 +0200
+@@ -15,7 +15,7 @@
+ #include <syslog.h>
+ #include <unistd.h>
+ #include <linux/usb/ch9.h>
+-#include <linux/usbip.h>
++#include "../../../include/uapi/linux/usbip.h"
+ 
+ #ifndef USBIDS_FILE
+ #define USBIDS_FILE "/usr/share/hwdata/usb.ids"
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index a0dc15e0b..c110c6b47 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -17,13 +17,13 @@ _pkgname=(
 )
 pkgname=("${pkgbase}-meta" "${_pkgname[@]/#/${pkgbase}-}")
 
-_pkgbasever=3.16-gnu
-_pkgver=3.16-gnu
+_pkgbasever=3.17-gnu
+_pkgver=3.17-gnu
 
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
-pkgrel=1.5
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -32,7 +32,7 @@ options=('!strip')
 makedepends=('asciidoc' 'xmlto')
 # split packages need all package dependencies set manually in makedepends
 declare -A _depends
-_depends[perf]='perl python2 libnewt elfutils libunwind numactl'
+_depends[perf]='perl python2 libnewt elfutils libunwind numactl audit'
 _depends[cpupower]='pciutils'
 _depends[usbip]='glib2 sysfsutils libsystemd'
 makedepends+=(systemd) # libsystemd for runtime, systemd for make. IDK, it's what Arch does
@@ -48,15 +48,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         'usbipd.service'
         '01-fix-perf-python.patch'
         '02-parabola-paths.patch'
-        '03-fix-tmon-ltinfo.patch')
-sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
+        '03-fix-tmon-ltinfo.patch'
+        '04-fix-usip-h-path.patch')
+sha256sums=('3b2e9a862ada390a318f95d5a436d07dd32664434f4f383e27fd5cc0b4f41f0e'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
             '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
             'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a'
             'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570'
-            '7547815bb761d49d198b85f95011535713c2ed4a004f249a9cf6ba985af8c4ed')
+            '7547815bb761d49d198b85f95011535713c2ed4a004f249a9cf6ba985af8c4ed'
+            'e5543d8d6d3fbc7f8d9d25c428a882737d2e0169455f70cbc3f73076ff33dd5d')
 
 prepare() {
   cd $_srcname
@@ -69,6 +71,7 @@ prepare() {
   patch -N -p1 -i "$srcdir/01-fix-perf-python.patch"
   patch -N -p1 -i "$srcdir/02-parabola-paths.patch"
   patch -N -p1 -i "$srcdir/03-fix-tmon-ltinfo.patch"
+  patch -N -p1 -i "$srcdir/04-fix-usip-h-path.patch"
 }
 
 build() {
@@ -103,9 +106,7 @@ build() {
   popd
 
   msg2 'usbip'
-  pushd $_srcname/drivers/staging/usbip/userspace
-  # fix missing man page
-  sed -i 's/usbip_bind_driver.8//' Makefile.am
+  pushd $_srcname/tools/usb/usbip
   ./autogen.sh
   ./configure --prefix=/usr --sbindir=/usr/bin
   make
@@ -142,7 +143,7 @@ _package_libtraceevent() {
 
   cd $_srcname/tools/lib/traceevent
   install -dm 755 "$pkgdir/usr/lib"
-  install -m 644 libtraceevent.a libtraceevent.so "$pkgdir/usr/lib"
+  install -m 644 libtraceevent.so "$pkgdir/usr/lib"
 }
 
 _package_perf() {
@@ -199,7 +200,7 @@ _package_x86_energy_perf_policy() {
 _package_usbip() {
   pkgdesc='An USB device sharing system over IP network'
 
-  pushd $_srcname/drivers/staging/usbip/userspace
+  pushd $_srcname/tools/usb/usbip
   make install DESTDIR="$pkgdir"
   popd
   # module loading
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index add1b11e8..07a49b242 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgbase=linux-libre         # Build stock "" kernel
 _pkgbasever=3.16-gnu
-_pkgver=3.16.3-gnu
+_pkgver=3.16.4-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=('kernel26%' 'kernel26-libre%') # '%' gets replaced with _kernelname
@@ -36,7 +36,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # loongson-community patch: http://linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/
         '3.16-7981337ad0-loongson-community.patch')
 sha256sums=('9c2a524c901febe0f0138f702bfdeb52d6f79f22c1fdbabaa37580bc70f16218'
-            'b9af84b880ad0762b768ecc39a3f9b9e91288d37a609a1bf6a8873497dedad05'
+            '04424ffce8e1584cf684da2907760c7db52d93c4bb057f9ff9ced327e9e9faa3'
             '4c637ad28bbe6489062629bf00f30f6feea1af272ff7fdcb4171ec37d8cf6f35'
             'cf59016d9110d214d3889d03cfe54b97f5f1890a940dc5548272b1485e06d795'
             '422be6aca94945293b7b9f1466360b0eadae688237aebb4a829d7093d9b3d9a3'
@@ -316,6 +316,7 @@ _package-docs() {
 pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs")
 for _p in ${pkgname[@]}; do
   eval "package_${_p}() {
+    $(declare -f "_package${_p#${pkgbase}}")
     _package${_p#${pkgbase}}
   }"
 done
diff --git a/libre/lirc/PKGBUILD b/libre/lirc/PKGBUILD
index 0de70fe96..960668875 100644
--- a/libre/lirc/PKGBUILD
+++ b/libre/lirc/PKGBUILD
@@ -8,7 +8,7 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=3.16
-  _archrel=4
+  _archrel=5
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
diff --git a/libre/tp_smapi/PKGBUILD b/libre/tp_smapi/PKGBUILD
index 84e1a36fa..5d9b436c2 100644
--- a/libre/tp_smapi/PKGBUILD
+++ b/libre/tp_smapi/PKGBUILD
@@ -14,7 +14,7 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=3.16
-  _archrel=53
+  _archrel=54
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
diff --git a/libre/vhba-module/PKGBUILD b/libre/vhba-module/PKGBUILD
index 223c58431..4cffe3682 100644
--- a/libre/vhba-module/PKGBUILD
+++ b/libre/vhba-module/PKGBUILD
@@ -9,7 +9,7 @@ _kernelname=
 
 if [[ ${_kernelname} == "" ]]; then
   _basekernel=3.16
-  _archrel=7
+  _archrel=8
   _parabolarel=1
 elif [[ ${_kernelname} == -lts ]]; then
   _basekernel=3.14
diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index 12b0bec58..3d4bc7d79 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -3,10 +3,10 @@
 pkgname=your-freedom
 pkgdesc="This package conflicts with every nonfree package known to date to ensure your system is free."
 license=('GPL3')
-#url="https://projects.parabolagnulinux.org/blacklist.git"
-url="https://lukeshu.com/git/mirror/parabola/blacklist.git"
-pkgver=20140927
-_gitver=c738a50e1343b1a5d0e6cf3133dd8241532741b9
+url="https://projects.parabola.nu/blacklist.git"
+#url="https://lukeshu.com/git/mirror/parabola/blacklist.git"
+pkgver=20141006
+_gitver=fc8ccd07c43805de79f22b2ca67e842bba088217
 pkgrel=1
 
 arch=('any')
@@ -14,9 +14,9 @@ groups=('base')
 install=${pkgname}.install
 
 makedepends=(librelib)
-#source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/blacklist.txt?id=${_gitver})
-source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver})
-md5sums=('5c96ef0e87933200f86eecb62422f0ac')
+source=(blacklist-${_gitver}.txt::https://projects.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})
+#source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/blacklist.txt?id=${_gitver})
+md5sums=('509830202eabcfaa5b3e91658e63d38b')
 
 package() {
 	cd "$srcdir"
diff --git a/pcr/tomb/PKGBUILD b/pcr/tomb/PKGBUILD
index 23aba4e02..febfe6a4a 100644
--- a/pcr/tomb/PKGBUILD
+++ b/pcr/tomb/PKGBUILD
@@ -1,29 +1,32 @@
-## PKGBUILD [bash]
-# Maintainer (Arch): nignux <nignux@freaknet.org>
 # Maintainer: fauno <fauno@parabola.nu>
+# Maintainer (Arch): Rich Li <rich at dranek com>
+# Contributor (Arch): nignux <nignux@freaknet.org>
 # Contributor (Arch): BoySka
-# Contributor (Arch): Rich Li
 
 pkgname=(tomb tomb-kdf)
-pkgver=1.5.2
+pkgver=1.5.3
 pkgrel=1
-pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage"
+pkgdesc="Crypto Undertaker, a simple tool to manage encrypted storage"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.dyne.org/software/tomb/"
 license=('GPL3')
 install=${pkgname}.install
-source=(https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz
-        https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz.sha
-        https://files.dyne.org/.xsend.php?file=tomb/Tomb-${pkgver}.tar.gz.sha.asc
+source=(
+        https://releases.dyne.org/tomb/Tomb-${pkgver}.tar.gz
+        https://releases.dyne.org/tomb/Tomb-${pkgver}.tar.gz.sha
+        https://releases.dyne.org/tomb/Tomb-${pkgver}.tar.gz.asc
         )
+
 # The first hash comes from the .sha file
-sha256sums=('6ae28aaec7b533127534070b25ccba08eb1416dc07e7e74bf433f5c5d675f7e2'
-            'SKIP'
+sha256sums=('e56180434011acda6e58f25c24db3a6d6a10f9e796cfd9c88405ae7abb27e1fb'
+            'c2bdd00edb0df013a97d50dd109b4744dfc8cee1b5dd71283fc942cdabc7b1af'
             'SKIP')
 
+# The public key is found at http://jaromil.dyne.org/contact
+# gpg --recv-keys 0x73b35da54acb7d10
+
 build() {
   cd ${srcdir}/Tomb-${pkgver}/extras/kdf-keys
-
   make
 }
 
@@ -34,21 +37,24 @@ build() {
 #}
 
 package_tomb() {
-  pkgdesc="Crypto Undertaker, simple tool to manage encrypted storage, from the hashes of the dyne:bolic nesting mechanism."
-  depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'wipe')
+  depends=('bc' 'cryptsetup' 'gnupg' 'sudo' 'zsh' 'e2fsprogs')
   optdepends=(
   'steghide: steganography'
   'dcfldd: show nice progress during massive I/O'
+  'wipe: secure file deletion'
+  'qrencode: for paper backups of keys'
+  'swish-e: file content indexer'
   )
   arch=('any')
-  cd ${srcdir}/Tomb-${pkgver}
-  make DESTDIR=${pkgdir} PREFIX=/usr install
+
+  cd "${srcdir}/Tomb-${pkgver}"
+  make DESTDIR="${pkgdir}" PREFIX=/usr install
 }
 
 package_tomb-kdf() {
   pkgdesc="Crypto Undertaker extensions to improve password security"
   depends=('libgcrypt')
 
-  cd ${srcdir}/Tomb-${pkgver}/extras/kdf-keys
-  make DESTDIR=${pkgdir} PREFIX=/usr install
+  cd "${srcdir}/Tomb-${pkgver}/extras/kdf-keys"
+  make DESTDIR="${pkgdir}" PREFIX=/usr install
 }