Merge branch 'master' of https://projects.parabolagnulinux.org/abslibre

10 files changed, 144 insertions, 59 deletions

diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 3c6f1ba33..745c3fce3 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103710 2014-01-10 12:51:56Z tpowa $
+# $Id: PKGBUILD 104385 2014-01-19 20:27:05Z tpowa $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: M0Rf30
 # Contributor: Samsagax <samsagax@gmail.com>
@@ -8,7 +8,7 @@ _pkgname=bbswitch
 pkgname=bbswitch-libre
 pkgver=0.8
 _extramodules=extramodules-3.12-LIBRE # Don't forget to update bbswitch.install
-pkgrel=4
+pkgrel=5
 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url=("http://github.com/Bumblebee-Project/bbswitch")
diff --git a/libre/linux-libre-tools/01-fix-perf-python.patch b/libre/linux-libre-tools/01-fix-perf-python.patch
new file mode 100644
index 000000000..d46bd773c
--- /dev/null
+++ b/libre/linux-libre-tools/01-fix-perf-python.patch
@@ -0,0 +1,12 @@
+--- a/tools/perf/config/feature-checks/Makefile  2014-01-21 01:58:25.444339009 +0100
++++ b/tools/perf/config/feature-checks/Makefile  2014-01-21 01:46:58.081780576 +0100
+@@ -103,9 +103,6 @@
+ test-libperl:
+        $(BUILD) $(FLAGS_PERL_EMBED)
+ 
+-override PYTHON := python
+-override PYTHON_CONFIG := python-config
+-
+ escape-for-shell-sq =  $(subst ','\'',$(1))
+ shell-sq = '$(escape-for-shell-sq)'
+ 
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 78c0f4ea2..060d84bf2 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,19 +1,24 @@
-# $Id: PKGBUILD 102149 2013-12-05 21:51:01Z seblu $
+# $Id: PKGBUILD 104447 2014-01-21 01:10:56Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
 pkgbase=linux-libre-tools
-pkgname=('linux-libre-tools-meta'
-         'libtraceevent-libre'
-         'perf-libre'
-         'cpupower-libre'
-         'x86_energy_perf_policy-libre'
-         'usbip-libre')
-_basekernel=3.12
-_sublevel=3
-_pkgver=$_basekernel.$_sublevel
+pkgname=(
+  'acpidump-libre'
+  'cgroup_event_listener-libre'
+  'cpupower-libre'
+  'libtraceevent-libre'
+  'linux-libre-tools-meta'
+  'perf-libre'
+  'tmon-libre'
+  'usbip-libre'
+  'x86_energy_perf_policy-libre'
+)
+_basekernel=3.13
+#_sublevel=3
+#_pkgver=$_basekernel.$_sublevel
 pkgver=$_basekernel
-pkgrel=2
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -22,24 +27,28 @@ options=('!strip')
 # kernel source deps
 makedepends=('asciidoc' 'xmlto')
 # perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind')
+makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl')
 # cpupower-libre deps
 makedepends+=('pciutils')
 # usbip-libre deps
 makedepends+=('glib2' 'sysfsutils')
+# tmon-libre deps
+makedepends+=('ncurses')
 groups=("$pkgbase")
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz"
-        "http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
+        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
         'cpupower.default'
         'cpupower.systemd'
         'cpupower.service'
-        'usbipd.service')
-sha256sums=('66c1fa816cb4a3b2f6078e1f6256133697ca4cc4186758c58c2b4d0153ed3237'
-            '561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
+        'usbipd.service'
+        '01-fix-perf-python.patch')
+sha256sums=('6e68eef826b17ae9d7df01ac13e46ef5d978670071d1b05aed775bdbff8fed96'
+            #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
             '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
             'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
             'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
-            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f')
+            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
+            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a')
 
 prepare() {
   # apply stable patching set
@@ -52,36 +61,37 @@ prepare() {
 }
 
 build() {
-  msg2 'Build libtraceevent-libre'
+  msg2 'libtraceevent-libre'
   pushd linux-$pkgver/tools/lib/traceevent
   make
   popd
 
-  msg2 'Build perf-libre'
+  msg2 'perf-libre'
   pushd linux-$pkgver/tools/perf
   make \
     WERROR=0 \
     DESTDIR="$pkgdir/usr" \
     perfexecdir='lib/perf' \
     PYTHON=python2 \
+    PYTHON_CONFIG=python2-config \
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     all man
   popd
 
-  msg2 'Build cpupower-libre'
+  msg2 'cpupower-libre'
   pushd linux-$pkgver/tools/power/cpupower
   # we cannot use --as-needed
-  LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
+  #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
   make VERSION=$pkgver-$pkgrel
   popd
 
-  msg2 'Build x86_energy_perf_policy-libre'
+  msg2 'x86_energy_perf_policy-libre'
   pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
   make
   popd
 
-  msg2 'Build usbip-libre'
+  msg2 'usbip-libre'
   pushd linux-$pkgver/drivers/staging/usbip/userspace
   # fix missing man page
   sed -i 's/usbip_bind_driver.8//' Makefile.am
@@ -89,12 +99,37 @@ build() {
   ./configure --prefix=/usr --sbindir=/usr/bin
   make
   popd
+
+  msg2 'tmon-libre'
+  pushd linux-$pkgver/tools/thermal/tmon
+  make
+  popd
+
+  msg2 'acpidump-libre'
+  pushd linux-$pkgver/tools/power/acpi
+  make
+  popd
+
+  msg2 'cgroup_event_listener-libre'
+  pushd linux-$pkgver/tools/cgroup
+  make
+  popd
 }
 
 package_linux-libre-tools-meta() {
   pkgdesc='Linux kernel tools meta package'
   groups=()
-  depends=('libtraceevent-libre' 'perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
+  depends=(
+    'acpidump-libre'
+    'cgroup_event_listener-libre'
+    'cpupower-libre'
+    'libtraceevent-libre'
+    'linux-libre-tools-meta'
+    'perf-libre'
+    'tmon-libre'
+    'usbip-libre'
+    'x86_energy_perf_policy-libre'
+  )
   replaces=('linux-tools-meta')
   conflicts=('linux-tools-meta')
   provides=("linux-tools-meta=$pkgver") 
@@ -114,7 +149,8 @@ package_libtraceevent-libre() {
 
 package_perf-libre() {
   pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils')
+  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils'
+           'numactl')
   replaces=('perf')  
   conflicts=('perf')
   provides=("perf=$pkgver")
@@ -125,6 +161,7 @@ package_perf-libre() {
     DESTDIR="$pkgdir/usr" \
     perfexecdir='lib/perf' \
     PYTHON=python2 \
+    PYTHON_CONFIG=python2-config \
     NO_GTK2=1 \
     PERF_VERSION=$pkgver-$pkgrel \
     install install-man
@@ -186,4 +223,38 @@ package_usbip-libre() {
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
+package_tmon-libre() {
+  pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem'
+  depends=('glibc' 'ncurses')
+  replaces=('tmon')
+  conflicts=('tmon')
+  provides=("tmon=$pkgver")
+
+  cd linux-$pkgver/tools/thermal/tmon
+  make install INSTALL_ROOT="$pkgdir"
+}
+
+package_acpidump-libre() {
+  pkgdesc='Dump system ACPI tables to an ASCII file'
+  depends=('glibc')
+  replaces=('acpidump')
+  conflicts=('acpidump' 'iasl')
+  provides=("acpidump=$pkgver")
+
+  cd linux-$pkgver/tools/power/acpi
+  install -Dm755 acpidump "$pkgdir/usr/bin/acpidump"
+  install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
+}
+
+package_cgroup_event_listener-libre() {
+  pkgdesc='Simple listener of cgroup events'
+  depends=('glibc')
+  replaces=('cgroup_event_listener')
+  conflicts=('cgroup_event_listener')
+  provides=("cgroup_event_listener=$pkgver")
+
+  cd linux-$pkgver/tools/cgroup
+  install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
+}
+
 # vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index ebf30af10..7d32cd7ad 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203524 2014-01-12 13:05:55Z tpowa $
+# $Id: PKGBUILD 204288 2014-01-16 11:41:25Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
@@ -10,10 +10,10 @@
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.12
-_sublevel=7
+_sublevel=8
 pkgver=${_basekernel}.${_sublevel}
-pkgrel=2
-_lxopkgver=${_basekernel}.7 # nearly always the same as pkgver
+pkgrel=1
+_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -38,7 +38,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'rpc_pipe-fix-cleanup-of-dummy-gssd-directory-when-notification-fails.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('254f59707b6676b59ce5ca5c3c698319'
-         'c42ff446236915fe1a6e2b6f9724d267'
+         '392f920129940c4f83c7d204468213f3'
          '568ce15a9df133072489cbac8c4fefb3'
          '772873c548059c57c8ec7898f35c0e2b'
          'e49ac236dfeef709f91a3d993ea7b62c'
@@ -53,7 +53,7 @@ md5sums=('254f59707b6676b59ce5ca5c3c698319'
          'cec0bb8981936eab2943b2009b7a6fff'
          '88d9cddf9e0050a76ec4674f264fb2a1'
          'cb9016630212ef07b168892fbcfd4e5d'
-         '7554da820df91c282656972976d9e0b5')
+         '0569e96c071703cc244f1ea7ee87d40a')
 if [ "$CARCH" != "mips64el" ]; then
     # don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 8d2f988bc..277f31c7c 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203411 2014-01-10 12:51:03Z tpowa $
+# $Id: PKGBUILD 204436 2014-01-19 20:29:01Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
 
@@ -6,7 +6,7 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-libre-utils')
 pkgver=0.9.0
-pkgrel=68
+pkgrel=69
 epoch=1
 _extramodules=extramodules-3.12-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index e4d5a6879..4b53e4463 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103716 2014-01-10 12:53:25Z tpowa $
+# $Id: PKGBUILD 104391 2014-01-19 20:28:42Z tpowa $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: xduugu
 # Contributor: nh2
@@ -12,7 +12,7 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=42
+pkgrel=43
 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url='https://github.com/evgeni/tp_smapi'
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 0b1ae56c2..ed87b2b70 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103718 2014-01-10 12:54:19Z tpowa $
+# $Id: PKGBUILD 104393 2014-01-19 20:29:02Z tpowa $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
@@ -8,7 +8,7 @@ _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20130607
 _extramodules=extramodules-3.12-LIBRE
-pkgrel=22
+pkgrel=23
 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cdemu.sourceforge.net/"
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index 17917185e..7055b9d4f 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 103998 2014-01-14 14:56:47Z spupykin $
+# $Id: PKGBUILD 104461 2014-01-21 08:35:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -11,7 +11,7 @@ _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.3
 _codename=Frodo
-pkgrel=6
+pkgrel=7
 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -27,7 +27,7 @@ makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'libvdpau' 'libc
 optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'lirc-libre: remote controller support'
 	    'udisks: automount external drives'
-	    'upower: used to trigger suspend functionality'
+	    'upower: used to trigger power management functionality'
 	    'libarchive: access compressed files without unpacking them'
 	    'xorg-xinit: autostart xbmc')
 install="${_pkgname}.install"
@@ -40,7 +40,7 @@ source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
 	"libass.patch::https://bugs.archlinux.org/index.php?getfile=11285")
 md5sums=('7ae385ebf8e5cfcb917393235e6efbdb'
          '8312d6d4ac5d7c3d9eed40ab08a17d3b'
-         'd4cbb6609c8e7b713c714241f529000e'
+         '02f7951824ee13103344f36009c0ef2a'
          '7fd6399d2ffbdf06b724f0cc2efa0784')
 
 prepare() {
@@ -121,7 +121,7 @@ package() {
   done
 
   install -Dm0644 $srcdir/xbmc.service $pkgdir/usr/lib/systemd/system/xbmc.service
-  install -Dm0644 $srcdir/polkit.rules $pkgdir/etc/polkit-1/rules.d/10-xbmc.rules
-  chmod 0700 $pkgdir/etc/polkit-1/rules.d/
+  install -Dm0644 $srcdir/polkit.rules $pkgdir/usr/share/polkit-1/rules.d/10-xbmc.rules
+  chmod 0700 $pkgdir/usr/share/polkit-1/rules.d/
 }
 # vim:set ts=2 sw=2 et:
diff --git a/libre/xbmc-libre/polkit.rules b/libre/xbmc-libre/polkit.rules
index 5bc7e69f5..4b6d0fda0 100644
--- a/libre/xbmc-libre/polkit.rules
+++ b/libre/xbmc-libre/polkit.rules
@@ -1,11 +1,12 @@
 polkit.addRule(function(action, subject) {
-  if (action.id.match("org.freedesktop.login1.") && subject.isInGroup("power")) {
-    return polkit.Result.YES;
-  }
-});
-
-polkit.addRule(function(action, subject) {
-  if (action.id.indexOf("org.freedesktop.udisks") == 0 && subject.isInGroup("storage")) {
-    return polkit.Result.YES;
-  }
+    if (subject.user == "xbmc") {
+        polkit.log("action=" + action);
+        polkit.log("subject=" + subject);
+        if (action.id.indexOf("org.freedesktop.login1.") == 0) {
+            return polkit.Result.YES;
+        }
+        if (action.id.indexOf("org.freedesktop.udisks.") == 0) {
+            return polkit.Result.YES;
+        }
+    }
 });
diff --git a/libre/xbmc-libre/xbmc.install b/libre/xbmc-libre/xbmc.install
index 04396af45..7fc45751a 100644
--- a/libre/xbmc-libre/xbmc.install
+++ b/libre/xbmc-libre/xbmc.install
@@ -1,10 +1,10 @@
 post_install() {
   [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
   [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
-  getent group xbmc > /dev/null || groupadd xbmc
-  getent passwd xbmc > /dev/null || useradd -m -d /var/lib/xbmc -g xbmc xbmc
+  getent group xbmc > /dev/null || groupadd -r xbmc
+  getent passwd xbmc > /dev/null || useradd -r -m -d /var/lib/xbmc -g xbmc xbmc
   usermod -a -G xbmc,audio,video,power,network,optical,storage,disk xbmc
-  chown -R 102:0 etc/polkit-1
+  chown -R xbmc:xbmc var/lib/xbmc
 }
 
 post_upgrade() {
@@ -12,6 +12,7 @@ post_upgrade() {
 }
 
 post_remove() {
-  post_install $1
-  echo "You may want to remove xbmc user and group"
+  [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
+  [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications
+  getent passwd xbmc > /dev/null || userdel xbmc
 }