Merge branch 'master' of ssh://gparabola/srv/git/abslibre-mips64el

25 files changed, 441 insertions, 156 deletions

diff --git a/community/c++-gtk-utils/PKGBUILD b/community/c++-gtk-utils/PKGBUILD
index 87c12b438..9477323b4 100644
--- a/community/c++-gtk-utils/PKGBUILD
+++ b/community/c++-gtk-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 73736 2012-07-15 04:46:33Z giovanni $
+# $Id: PKGBUILD 74790 2012-08-05 09:41:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=c++-gtk-utils
-pkgver=2.0.10
+pkgver=2.0.11
 pkgrel=1
 pkgdesc="Classes and functions for programming in GTK+"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL2.1')
 depends=('gtk3')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/project/cxx-gtk-utils/cxx-gtk-utils/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6a2ba8c42356fa82e60d75410ebe6c54')
+md5sums=('30e0299d677fb857bb0291e467408279')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/linux-tools/PKGBUILD b/community/linux-tools/PKGBUILD
index 56dfeb802..a0541720d 100644
--- a/community/linux-tools/PKGBUILD
+++ b/community/linux-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 74127 2012-07-22 02:44:47Z seblu $
+# $Id: PKGBUILD 74810 2012-08-06 02:37:26Z seblu $
 # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=linux-tools
 pkgname=('perf' 'cpupower' 'x86_energy_perf_policy')
 pkgver=3.5
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -16,11 +16,13 @@ source=("http://ftp.kernel.org/pub/linux/kernel/v3.x/linux-$pkgver.tar.xz"
 #        "http://ftp.kernel.org/pub/linux/kernel/v3.x/patch-$pkgver.4.xz"
         'cpupower.rc'
         'cpupower.conf'
+        'cpupower.systemd'
         'cpupower.service')
 md5sums=('24153eaaa81dedc9481ada8cd9c3b83d'
-         '73dbc931e86b3b73d6e2338dcbee81a4'
+         '1d9214637968b91706b6e616a100d44b'
          '857ccdd0598511e3bf4b63522754dc48'
-         '20870541e88109d2f153be3c58a277f1')
+         'c0d17b5295fe964623c772a2dd981771'
+         '2450e8ff41b30eb58d43b5fffbfde1f4')
 
 build() {
   # apply stable patching set
@@ -83,17 +85,18 @@ package_cpupower() {
     install install-man
   popd
   # install rc.d script
-  install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
-  install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
-  install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  install -Dm 644 $pkgname.conf "$pkgdir/etc/conf.d/$pkgname"
+  install -Dm 644 $pkgname.service "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm 755 $pkgname.systemd "$pkgdir/usr/lib/systemd/scripts/$pkgname"
 }
 
 package_x86_energy_perf_policy() {
   pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
 
   cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
-  install -D -m 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
-  install -D -m 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+  install -Dm 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
+  install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/linux-tools/cpupower.rc b/community/linux-tools/cpupower.rc
index 27a491e95..2c4441c4e 100644
--- a/community/linux-tools/cpupower.rc
+++ b/community/linux-tools/cpupower.rc
@@ -2,40 +2,16 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-
-[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower
+. /etc/conf.d/${0##*/}
 
 case "$1" in
   start|restart)
-    stat_busy "Setting cpupower rules"
-    declare -i fail=0
-
-    # frequency-set options
-    declare -a params=()
-    params+=(${governor:+-g $governor})
-    params+=(${min_freq:+-d $min_freq})
-    params+=(${max_freq:+-u $max_freq})
-    params+=(${freq:+-f $freq})
-    if ((${#params[@]} > 0)); then
-      cpupower frequency-set "${params[@]}" >/dev/null || fail=1
-    fi
-
-    # set options
-    declare -a params=()
-    params+=(${mc_scheduler:+-m $mc_scheduler})
-    params+=(${smp_scheduler:+-s $smp_scheduler})
-    params+=(${perf_bias:+-b $perf_bias})
-    if ((${#params[@]} > 0)); then
-      cpupower set "${params[@]}" >/dev/null || fail=1
-    fi
-
-    # print failure if any
-    (($fail > 0)) && stat_fail && exit 1 || stat_done
+    status 'Setting cpupower rules' /usr/lib/systemd/scripts/cpupower || exit 1
   ;;
   *)
-  echo "usage: ${0##*/} {start|restart}"
+    echo "usage: ${0##*/} {start|restart}" >&2
+    exit 1
+  ;;
 esac
 
-true
-
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/linux-tools/cpupower.service b/community/linux-tools/cpupower.service
index f77cfdc97..aaeba2b08 100644
--- a/community/linux-tools/cpupower.service
+++ b/community/linux-tools/cpupower.service
@@ -3,7 +3,7 @@ Description=Apply cpupower configuration
 
 [Service]
 Type=oneshot
-ExecStart=/etc/rc.d/cpupower start
+ExecStart=/usr/lib/systemd/scripts/cpupower
 RemainAfterExit=yes
 
 [Install]
diff --git a/community/linux-tools/cpupower.systemd b/community/linux-tools/cpupower.systemd
new file mode 100644
index 000000000..f45b02bc8
--- /dev/null
+++ b/community/linux-tools/cpupower.systemd
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. /etc/conf.d/cpupower
+
+declare -i fail=0
+
+# parse frequency options
+declare -a params=()
+params+=(${governor:+-g $governor})
+params+=(${min_freq:+-d $min_freq})
+params+=(${max_freq:+-u $max_freq})
+params+=(${freq:+-f $freq})
+
+# apply frequency options
+if ((${#params[@]} > 0)); then
+  cpupower frequency-set "${params[@]}" >/dev/null || fail=1
+fi
+
+# parse cpu options
+declare -a params=()
+params+=(${mc_scheduler:+-m $mc_scheduler})
+params+=(${smp_scheduler:+-s $smp_scheduler})
+params+=(${perf_bias:+-b $perf_bias})
+
+# apply cpu options
+if ((${#params[@]} > 0)); then
+  cpupower set "${params[@]}" >/dev/null || fail=1
+fi
+
+exit $fail
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/mailman/PKGBUILD b/community/mailman/PKGBUILD
index 975b3cb96..74db47b4b 100644
--- a/community/mailman/PKGBUILD
+++ b/community/mailman/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 67164 2012-03-05 00:39:58Z pschmitz $
-# Maintainer: Paul Mattal <paul@archlinux.org>
+# $Id: PKGBUILD 74799 2012-08-05 16:06:17Z seblu $
+# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
+# Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=mailman
-pkgver=2.1.14
-pkgrel=4
-pkgdesc="Mailing list manager with built in web access"
-arch=('i686' 'x86_64')
+pkgver=2.1.15
+pkgrel=2
+pkgdesc='The GNU Mailing List Manager'
+arch=(i686 x86_64)
 license=('GPL')
-url="http://www.list.org/"
-depends=('python2' 'smtp-server')
+url='http://www.list.org/'
+depends=('glibc' 'python2' 'smtp-server')
 # we need to have the mailman user to build mailman
 makedepends=('mailman')
 # 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead.
@@ -16,35 +17,42 @@ backup=('usr/lib/mailman/Mailman/mm_cfg.py')
 install=$pkgname.install
 source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz"
         'mailman-2.1-build.patch'
-        'rc.mailman')
-md5sums=('9ea163871ceccbd33fee4c9e335fcf7b'
+        "$pkgname.profile.sh"
+        "$pkgname.profile.csh"
+        "$pkgname.rc"
+        "$pkgname.service")
+md5sums=('7d207489e8e9de0727cb334d46029833'
          'ed04d062379eb21e39ce1e70e6b1ade2'
-         '3d83d06d0ec3319bf3c7d9df5d18e89f')
+         'a9c71ec940c56173415fbd49087d10b0'
+         '85a8c30ffc444e677b286f54df530482'
+         '3a4014c15e9923451f5f282860896057'
+         'f3ea6ef02ab135274406ce52ea8bbb7b')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  # fix calls to /usr/bin/python
-  find . -name '*.py' -exec sed -i 's@^#!.*python$@#!/usr/bin/python2@' {} +
+  cd $pkgname-$pkgver
+  # some files in mailman doesn't use configure parameter
+  find . -type f -exec \
+    sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \;
   # fix directory permissions to satisfy check_perms
-  patch -p1 -i ${srcdir}/mailman-2.1-build.patch
+  patch -p1 -i "$srcdir/mailman-2.1-build.patch"
   # set some sane defaults before the configure script has a chance to screw them up
-  sed -e 's/@MAILHOST@/localhost/g' \
-      -e 's/@URLHOST@/localhost/g' \
-      -i Mailman/Defaults.py.in
-
-  ./configure --without-permcheck \
-              --prefix=/usr/lib/mailman \
-              --with-var-prefix=/var/lib/mailman \
-              --with-mail-gid=mailman \
-              --with-username=mailman --with-groupname=mailman \
-              --with-cgi-gid=http --with-python=/usr/bin/python2
+  ./configure \
+    --without-permcheck \
+    --prefix=/usr/lib/mailman \
+    --with-var-prefix=/var/lib/mailman \
+    --with-mail-gid=mailman \
+    --with-username=mailman \
+    --with-groupname=mailman \
+    --with-cgi-gid=http \
+    --with-python=/usr/bin/python2 \
+    --with-mailhost=localhost \
+    --with-urlhost=localhost
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
   # let's follow Fedora FHS way; Gentoo does it the other way round
 
@@ -56,16 +64,23 @@ package() {
   # experienced mailman admins will expect to find it there. But having it
   # "appear" in the config directory is good practice and heading in the
   # right direction for FHS compliance.
-  install -d -m755 ${pkgdir}/etc/${pkgname}
-  ln -sv /usr/lib/mailman/Mailman/mm_cfg.py ${pkgdir}/etc/${pkgname}/mm_cfg.py
-
+  install -d -m755 "$pkgdir/etc/$pkgname"
+  ln -sv /usr/lib/mailman/Mailman/mm_cfg.py "$pkgdir/etc/$pkgname/mm_cfg.py"
   # fix some permissions to satisfy check_perms
-  chown -R mailman:mailman $pkgdir/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
-  chown http:mailman ${pkgdir}/var/lib/mailman/archives/private
-  chmod 2770 ${pkgdir}/var/lib/mailman/archives/private
-  chmod 2755 ${pkgdir}/usr/lib/mailman/cgi-bin/* 
-  chmod 2755 ${pkgdir}/usr/lib/mailman/mail/mailman
-
-  # install the launch script
-  install -D -m755 $srcdir/rc.mailman $pkgdir/etc/rc.d/mailman
+  chown -R mailman:mailman "$pkgdir"/{usr/lib/mailman,var/lib/mailman,etc/mailman/*}
+  chown http:mailman "$pkgdir"/var/lib/mailman/archives/private
+  chmod 2770 "$pkgdir"/var/lib/mailman/archives/private
+  chmod 2755 "$pkgdir"/usr/lib/mailman/cgi-bin/*
+  chmod 2755 "$pkgdir"/usr/lib/mailman/mail/mailman
+  cd "$srcdir"
+  # install initscripts
+  install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname"
+  # install systemd service
+  install -Dm 644 $pkgname.service \
+    "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  # install profiles
+  install -Dm 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh"
+  install -Dm 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh"
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/mailman/mailman.install b/community/mailman/mailman.install
index ec85260a5..62a364e1a 100644
--- a/community/mailman/mailman.install
+++ b/community/mailman/mailman.install
@@ -1,31 +1,29 @@
+#!/bin/sh
+
 ## arg 1:  the new package version
 post_install() {
-  # Make sure the group and user "mailman" exists on this system and has the correct values
-  if grep -q "^mailman:" /etc/group &> /dev/null ; then
-    groupmod -g 80 -n mailman mailman &> /dev/null
-  else
-    groupadd -g 80 mailman &> /dev/null
+  if ! getent group mailman >/dev/null; then
+    groupadd -g 80 mailman >/dev/null
   fi
-  
-  if grep -q "^mailman:" /etc/passwd 2> /dev/null ; then
-    usermod -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman mailman &> /dev/null
-  else
-    useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman -u 80 -g mailman -M -r mailman &> /dev/null
-  fi 
 
+  if ! getent passwd mailman >/dev/null; then
+    useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman \
+      -u 80 -g mailman -M -r mailman >/dev/null
+  fi
   # check file permissions
-#  cd /usr/lib/mailman && bin/check_perms -f  > /dev/null 2>&1     # -f applies fixes we should solve in the PKGBUILD
   cd /usr/lib/mailman && bin/check_perms > /dev/null
 }
 
 ## arg 1:  the new package version
 ## arg 2:  the old package version
 post_upgrade() {
-  post_install $1
+  post_install "$1"
 }
 
 ## arg 1:  the old package version
 pre_remove() {
-  userdel mailman &>/dev/null
-  groupdel mailman &>/dev/null || /bin/true
+  userdel mailman >/dev/null || true
+  groupdel mailman >/dev/null || true
 }
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/mailman/mailman.profile.csh b/community/mailman/mailman.profile.csh
new file mode 100644
index 000000000..c0a39edee
--- /dev/null
+++ b/community/mailman/mailman.profile.csh
@@ -0,0 +1 @@
+[ -d /usr/lib/mailman/bin ] && setenv PATH ${PATH}:/usr/lib/mailman/bin
diff --git a/community/mailman/mailman.profile.sh b/community/mailman/mailman.profile.sh
new file mode 100644
index 000000000..51b69ebfb
--- /dev/null
+++ b/community/mailman/mailman.profile.sh
@@ -0,0 +1,3 @@
+[ -d /usr/lib/mailman/bin ] && PATH=$PATH:/usr/lib/mailman/bin
+
+export PATH
diff --git a/community/mailman/mailman.rc b/community/mailman/mailman.rc
new file mode 100644
index 000000000..79c1cd661
--- /dev/null
+++ b/community/mailman/mailman.rc
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+MAILMANCTL=/usr/lib/mailman/bin/mailmanctl
+
+case "$1" in
+  start)
+    status 'Starting GNU Mailing List Manager' $MAILMANCTL -q start &&
+      add_daemon ${0##*/} || exit 1
+  ;;
+  stop)
+    status 'Stoping GNU Mailing List Manager' $MAILMANCTL -q stop &&
+      rm_daemon ${0##*/} || exit 1
+  ;;
+  reload)
+    status 'Reloading GNU Mailing List Manager' $MAILMANCTL -q restart
+  ;;
+  restart)
+    $0 stop && $0 start
+  ;;
+  *)
+    echo "usage: ${0##*/} {start|stop|restart|reload}" >&2
+  ;;
+esac
+
+:
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/mailman/mailman.service b/community/mailman/mailman.service
new file mode 100644
index 000000000..633412dbc
--- /dev/null
+++ b/community/mailman/mailman.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=GNU Mailing List Manager
+After=network.target
+
+[Service]
+ExecStart=/usr/lib/mailman/bin/mailmanctl -s start
+ExecReload=/usr/lib/mailman/bin/mailmanctl restart
+ExecStop=/usr/lib/mailman/bin/mailmanctl stop
+StandardError=syslog
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/pcsclite/PKGBUILD b/community/pcsclite/PKGBUILD
index 92b2d78c2..3ffa59861 100644
--- a/community/pcsclite/PKGBUILD
+++ b/community/pcsclite/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 73085 2012-06-30 14:21:47Z giovanni $
+# $Id: PKGBUILD 74792 2012-08-05 10:29:48Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=pcsclite
-pkgver=1.8.4
+pkgver=1.8.5
 pkgrel=1
 pkgdesc="PC/SC Architecture smartcard middleware library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,9 +12,9 @@ license=('BSD')
 depends=('python2' 'systemd-tools')
 makedepends=('pkg-config')
 options=('!libtool' '!docs')
-source=("https://alioth.debian.org/frs/download.php/3734/pcsc-lite-${pkgver}.tar.bz2"
+source=("https://alioth.debian.org/frs/download.php/3741/pcsc-lite-${pkgver}.tar.bz2"
         'pcscd')
-md5sums=('3ef6b569128b15969adba25d80ced8d0'
+md5sums=('c9d176f2f868814e836ff894983c537c'
          'c97b6bce695222efb0f003d8e8369010')
 
 build() {
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index 7046f07e9..5c9612235 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164328 2012-07-30 14:40:47Z andyrtr $
+# $Id: PKGBUILD 164782 2012-08-05 08:32:04Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
 pkgver=1.6.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
@@ -15,7 +15,10 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-gcrypt.patch
         cups-no-gzip-man.patch
         cups-systemd-socket.patch
-        cups cups.logrotate cups.pam)
+        cups cups.logrotate cups.pam
+        cupsd-conf-remove-obsolete-browse-directives.patch
+        avahi-missing-in-conditionals.patch
+        recognize-remote-cups-queue-via-dnssd-uri.patch)
 #options=('!emptydirs')
 md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
          '9b8467a1e51d360096b70e2c3c081e6c'
@@ -24,7 +27,10 @@ md5sums=('87ade07e3d1efd03c9c3add949cf9c00'
          'a81573a429b98e16670d7fea47e528c4'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
-         '96f82c38f3f540b53f3e5144900acf17')
+         '96f82c38f3f540b53f3e5144900acf17'
+         '6bef262b5081051e88cd2ae94fed1867'
+         '9c91b1319f4b20dc323986cb4abbe806'
+         'dcef8dd5614461166cada8a706eebb49')
 
 build() {
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -40,6 +46,14 @@ build() {
   patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
   # don't zip man pages in make install, let makepkg do that / Fedora
   patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
+
+  # upstream bugtracker patches
+  # http://www.cups.org/str.php?L4157 - fix broken default server config
+  patch -Np1 -i ${srcdir}/cupsd-conf-remove-obsolete-browse-directives.patch
+  # http://www.cups.org/str.php?L4156 - In many DNS-SD/Bonjour conditionals Avahi is not considered
+  patch -Np1 -i ${srcdir}/avahi-missing-in-conditionals.patch
+  # http://www.cups.org/str.php?L4158 - DNS-SD-based print queues pointing to CUPS server are not considered remote printers with driver on server
+  patch -Np1 -i ${srcdir}/recognize-remote-cups-queue-via-dnssd-uri.patch
   
   # Rebuild configure script for not zipping man-pages.
   aclocal -I config-scripts
@@ -150,4 +164,7 @@ optdepends=('xdg-utils: xdg .desktop file support')
   rm -v ${pkgdir}/usr/share/cups/data/testprint
   # comment out all conversion rules which use any of the removed filters
   perl -p -i -e 's:^(.*\s+bannertops\s*)$:#\1:' /usr/share/cups/mime/mime.convs
+
+  # Provide native service for arch-daemons generator
+  ln -s cups.service "$pkgdir/usr/lib/systemd/system/cupsd.service"
 }
diff --git a/extra/cups/avahi-missing-in-conditionals.patch b/extra/cups/avahi-missing-in-conditionals.patch
new file mode 100644
index 000000000..b261f58ae
--- /dev/null
+++ b/extra/cups/avahi-missing-in-conditionals.patch
@@ -0,0 +1,118 @@
+diff -uraN cups/scheduler/client.c cups-new/scheduler/client.c
+--- cups/scheduler/client.c	2012-05-25 15:28:49.000000000 +0200
++++ cups-new/scheduler/client.c	2012-08-04 20:13:17.082220961 +0200
+@@ -4021,7 +4021,7 @@
+ 	    !strncmp(host, "[::1]:", 6));
+   }
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+  /*
+   * Check if the hostname is something.local (Bonjour); if so, allow it.
+   */
+@@ -4040,7 +4040,7 @@
+ 	      !_cups_strcasecmp(end, ".local.") ||
+ 	      !_cups_strncasecmp(end, ".local.:", 8)))
+     return (1);
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+  /*
+   * Check if the hostname is an IP address...
+@@ -4101,7 +4101,7 @@
+     }
+   }
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   for (a = (cupsd_alias_t *)cupsArrayFirst(DNSSDAlias);
+        a;
+        a = (cupsd_alias_t *)cupsArrayNext(DNSSDAlias))
+@@ -4126,7 +4126,7 @@
+         return (1);
+     }
+   }
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+  /*
+   * Check for interface hostname matches...
+diff -uraN cups/scheduler/conf.c cups-new/scheduler/conf.c
+--- cups/scheduler/conf.c	2012-05-25 15:28:49.000000000 +0200
++++ cups-new/scheduler/conf.c	2012-08-04 20:15:49.830978405 +0200
+@@ -89,9 +89,9 @@
+ {
+   { "AccessLog",		&AccessLog,		CUPSD_VARTYPE_STRING },
+   { "AutoPurgeJobs", 		&JobAutoPurge,		CUPSD_VARTYPE_BOOLEAN },
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   { "BrowseDNSSDSubTypes",	&DNSSDSubTypes,		CUPSD_VARTYPE_STRING },
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+   { "BrowseWebIF",		&BrowseWebIF,		CUPSD_VARTYPE_BOOLEAN },
+   { "Browsing",			&Browsing,		CUPSD_VARTYPE_BOOLEAN },
+   { "CacheDir",			&CacheDir,		CUPSD_VARTYPE_STRING },
+@@ -735,9 +735,9 @@
+   Browsing                 = CUPS_DEFAULT_BROWSING;
+   DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   cupsdSetString(&DNSSDSubTypes, "_cups,_print");
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+   cupsdSetString(&LPDConfigFile, CUPS_DEFAULT_LPD_CONFIG_FILE);
+   cupsdSetString(&SMBConfigFile, CUPS_DEFAULT_SMB_CONFIG_FILE);
+diff -uraN cups/scheduler/ipp.c cups-new/scheduler/ipp.c
+--- cups/scheduler/ipp.c	2012-05-25 15:28:49.000000000 +0200
++++ cups-new/scheduler/ipp.c	2012-08-04 20:13:17.086220978 +0200
+@@ -4813,7 +4813,7 @@
+     ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
+                ippTimeToDate(curtime));
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+   if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
+   {
+     if (printer->reg_name)
+@@ -4823,7 +4823,7 @@
+       ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
+                    "printer-dns-sd-name", 0);
+   }
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+   if (!ra || cupsArrayFind(ra, "printer-error-policy"))
+     ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
+diff -uraN cups/scheduler/main.c cups-new/scheduler/main.c
+--- cups/scheduler/main.c	2012-05-25 15:28:49.000000000 +0200
++++ cups-new/scheduler/main.c	2012-08-04 20:13:17.090221001 +0200
+@@ -781,9 +781,9 @@
+       * Got an error from select!
+       */
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+       cupsd_printer_t	*p;		/* Current printer */
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+ 
+       if (errno == EINTR)		/* Just interrupted by a signal */
+@@ -824,13 +824,13 @@
+ 			job->print_pipes[0], job->print_pipes[1],
+ 			job->back_pipes[0], job->back_pipes[1]);
+ 
+-#ifdef HAVE_DNSSD
++#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
+       for (p = (cupsd_printer_t *)cupsArrayFirst(Printers);
+ 	   p;
+ 	   p = (cupsd_printer_t *)cupsArrayNext(Printers))
+         cupsdLogMessage(CUPSD_LOG_EMERG, "printer[%s] reg_name=\"%s\"", p->name,
+ 	                p->reg_name ? p->reg_name : "(null)");
+-#endif /* HAVE_DNSSD */
++#endif /* HAVE_DNSSD || HAVE_AVAHI */
+ 
+       break;
+     }
diff --git a/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch b/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch
new file mode 100644
index 000000000..97636c7f2
--- /dev/null
+++ b/extra/cups/cupsd-conf-remove-obsolete-browse-directives.patch
@@ -0,0 +1,12 @@
+diff -uraN cups/conf/cupsd.conf.in cups-new/conf/cupsd.conf.in
+--- cups/conf/cupsd.conf.in	2012-05-25 15:28:25.000000000 +0200
++++ cups-new/conf/cupsd.conf.in	2012-08-04 20:56:26.699062177 +0200
+@@ -19,8 +19,6 @@
+ 
+ # Show shared printers on the local network.
+ Browsing On
+-BrowseOrder allow,deny
+-BrowseAllow all
+ BrowseLocalProtocols @CUPS_BROWSE_LOCAL_PROTOCOLS@
+ 
+ # Default authentication type, when authentication is required...
diff --git a/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch b/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
new file mode 100644
index 000000000..6349bd901
--- /dev/null
+++ b/extra/cups/recognize-remote-cups-queue-via-dnssd-uri.patch
@@ -0,0 +1,25 @@
+diff -uraN cups/scheduler/printers.c cups-new/scheduler/printers.c
+--- cups/scheduler/printers.c	2012-05-25 15:28:49.000000000 +0200
++++ cups-new/scheduler/printers.c	2012-08-04 20:58:40.475725544 +0200
+@@ -4829,13 +4829,14 @@
+ 		   "printer-make-and-model", NULL,
+ 		   "Local System V Printer");
+     }
+-    else if (!strncmp(p->device_uri, "ipp://", 6) &&
+-	     (strstr(p->device_uri, "/printers/") != NULL ||
+-	      strstr(p->device_uri, "/classes/") != NULL ||
+-	      ((strstr(p->device_uri, "._ipp.") != NULL ||
+-	        strstr(p->device_uri, "._ipps.") != NULL) &&
+-	       !strcmp(p->device_uri + strlen(p->device_uri) - 5,
+-		       "/cups"))))
++    else if ((!strncmp(p->device_uri, "ipp://", 6) &&
++	      (strstr(p->device_uri, "/printers/") != NULL ||
++	       strstr(p->device_uri, "/classes/") != NULL)) ||
++	     (!strncmp(p->device_uri, "dnssd://", 8) &&
++	      (strstr(p->device_uri, "._ipp.") != NULL ||
++	       strstr(p->device_uri, "._ipps.") != NULL) &&
++	      !strcmp(p->device_uri + strlen(p->device_uri) - 5,
++		      "/cups")))
+     {
+      /*
+       * Tell the client this is really a hard-wired remote printer.
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 6ab346548..ff60556ce 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163970 2012-07-23 03:03:19Z allan $
+# $Id: PKGBUILD 164788 2012-08-05 11:49:39Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.0.21
-pkgrel=2
+pkgver=3.0.22
+pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL3' 'LGPL')
@@ -14,8 +14,8 @@ depends=('gcc-libs>=4.7.1-5' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit
 makedepends=('strace')
 [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind')
 source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('7480dff7115e5af85215893c06b3ac5c'
-         'c84eb5e67f1498c60ea6fd6ba9045def')
+md5sums=('7b3db90934c2d410c573e37efce3d579'
+         '33aab6d202af8d6f8f51cfb9249b6d50')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/help2man/PKGBUILD b/extra/help2man/PKGBUILD
index 140fc4c99..4433144b4 100644
--- a/extra/help2man/PKGBUILD
+++ b/extra/help2man/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160650 2012-06-03 07:59:58Z giovanni $
+# $Id: PKGBUILD 164784 2012-08-05 10:17:22Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 
 pkgname=help2man
-pkgver=1.40.10
+pkgver=1.40.11
 pkgrel=1
 pkgdesc="Conversion tool to create man files"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-locale-gettext')
 install=help2man.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('7181a363af41e0f476dd81f36b105a8e')
+md5sums=('169c7db58f09cfc704c5d953139bb58d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/perl-crypt-ssleay/PKGBUILD b/extra/perl-crypt-ssleay/PKGBUILD
index 82f0c5abc..dda0cbaa7 100644
--- a/extra/perl-crypt-ssleay/PKGBUILD
+++ b/extra/perl-crypt-ssleay/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 160515 2012-06-02 10:27:13Z bluewind $
+# $Id: PKGBUILD 164786 2012-08-05 10:42:41Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-crypt-ssleay
-pkgver=0.58
-pkgrel=4
+pkgver=0.60
+pkgrel=1
 pkgdesc="OpenSSL glue that provides LWP https support"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/Crypt-SSLeay"
 license=('GPL' 'PerlArtistic')
-depends=('openssl')
+depends=('perl-lwp-protocol-https' 'perl-try-tiny')
 options=('!emptydirs')
 source=(http://www.cpan.org/CPAN/authors/id/N/NA/NANIS/Crypt-SSLeay-$pkgver.tar.gz) 
-md5sums=('fbf3d12e58462cee00ea63239c0b13c7')
+md5sums=('04986e80e4a9f81479a98b32eb14a1c5')
 
 build() {
   cd  "${srcdir}/Crypt-SSLeay-${pkgver}"
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 3803b520c..1e9216af6 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -9,7 +9,7 @@ _basekernel=3.5
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -21,11 +21,13 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         #"http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz"
         'cpupower.rc'
         'cpupower.conf'
+        'cpupower.systemd'
         'cpupower.service')
 md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         '73dbc931e86b3b73d6e2338dcbee81a4'
+         '1d9214637968b91706b6e616a100d44b'
          '18d5aa9e4c6bb23bb02bf65e155e0f0e'
-         '20870541e88109d2f153be3c58a277f1')
+         'c0d17b5295fe964623c772a2dd981771'
+         '2450e8ff41b30eb58d43b5fffbfde1f4')
 
 build() {
   # apply stable patching set
@@ -93,9 +95,10 @@ package_cpupower-libre() {
     install install-man
   popd
   # install rc.d script
-  install -D -m 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
-  install -D -m 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
-  install -D -m 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+  install -Dm 755 cpupower.rc "$pkgdir/etc/rc.d/cpupower"
+  install -Dm 644 cpupower.conf "$pkgdir/etc/conf.d/cpupower"
+  install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
+  install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
 }
 
 package_x86_energy_perf_policy-libre() {
@@ -105,8 +108,8 @@ package_x86_energy_perf_policy-libre() {
   provides=("x86_energy_perf_policy=$pkgver")
 
   cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
-  install -D -m 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
-  install -D -m 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
+  install -Dm 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
+  install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
 }
 
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
index 27a491e95..2c4441c4e 100644
--- a/libre/linux-libre-tools/cpupower.rc
+++ b/libre/linux-libre-tools/cpupower.rc
@@ -2,40 +2,16 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-
-[[ -f /etc/conf.d/cpupower ]] && . /etc/conf.d/cpupower
+. /etc/conf.d/${0##*/}
 
 case "$1" in
   start|restart)
-    stat_busy "Setting cpupower rules"
-    declare -i fail=0
-
-    # frequency-set options
-    declare -a params=()
-    params+=(${governor:+-g $governor})
-    params+=(${min_freq:+-d $min_freq})
-    params+=(${max_freq:+-u $max_freq})
-    params+=(${freq:+-f $freq})
-    if ((${#params[@]} > 0)); then
-      cpupower frequency-set "${params[@]}" >/dev/null || fail=1
-    fi
-
-    # set options
-    declare -a params=()
-    params+=(${mc_scheduler:+-m $mc_scheduler})
-    params+=(${smp_scheduler:+-s $smp_scheduler})
-    params+=(${perf_bias:+-b $perf_bias})
-    if ((${#params[@]} > 0)); then
-      cpupower set "${params[@]}" >/dev/null || fail=1
-    fi
-
-    # print failure if any
-    (($fail > 0)) && stat_fail && exit 1 || stat_done
+    status 'Setting cpupower rules' /usr/lib/systemd/scripts/cpupower || exit 1
   ;;
   *)
-  echo "usage: ${0##*/} {start|restart}"
+    echo "usage: ${0##*/} {start|restart}" >&2
+    exit 1
+  ;;
 esac
 
-true
-
 # vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/linux-libre-tools/cpupower.service b/libre/linux-libre-tools/cpupower.service
index f77cfdc97..aaeba2b08 100644
--- a/libre/linux-libre-tools/cpupower.service
+++ b/libre/linux-libre-tools/cpupower.service
@@ -3,7 +3,7 @@ Description=Apply cpupower configuration
 
 [Service]
 Type=oneshot
-ExecStart=/etc/rc.d/cpupower start
+ExecStart=/usr/lib/systemd/scripts/cpupower
 RemainAfterExit=yes
 
 [Install]
diff --git a/libre/linux-libre-tools/cpupower.systemd b/libre/linux-libre-tools/cpupower.systemd
new file mode 100644
index 000000000..f45b02bc8
--- /dev/null
+++ b/libre/linux-libre-tools/cpupower.systemd
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+. /etc/conf.d/cpupower
+
+declare -i fail=0
+
+# parse frequency options
+declare -a params=()
+params+=(${governor:+-g $governor})
+params+=(${min_freq:+-d $min_freq})
+params+=(${max_freq:+-u $max_freq})
+params+=(${freq:+-f $freq})
+
+# apply frequency options
+if ((${#params[@]} > 0)); then
+  cpupower frequency-set "${params[@]}" >/dev/null || fail=1
+fi
+
+# parse cpu options
+declare -a params=()
+params+=(${mc_scheduler:+-m $mc_scheduler})
+params+=(${smp_scheduler:+-s $smp_scheduler})
+params+=(${perf_bias:+-b $perf_bias})
+
+# apply cpu options
+if ((${#params[@]} > 0)); then
+  cpupower set "${params[@]}" >/dev/null || fail=1
+fi
+
+exit $fail
+
+# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index 50988f587..0786adabf 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -19,7 +19,7 @@ pre_install() {
   * Etc.
 
   Please report back to the Parabola Project on the usual channels:
-  * https://bugs.parabolagnulinux.org
+  * https://labs.parabola.nu
   * irc://freenode.net/#parabola
   * mailto:dev@list.parabolagnulinux.org
 EOM
diff --git a/pcr/mednafen-wip/PKGBUILD b/pcr/mednafen-wip/PKGBUILD
new file mode 100755
index 000000000..cc33eeb75
--- /dev/null
+++ b/pcr/mednafen-wip/PKGBUILD
@@ -0,0 +1,32 @@
+# Maintainer: Hans-Kristian Arntzen <maister@archlinux.us>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: kagan <juanynie@mi.madritel.es>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+
+pkgname=mednafen-wip
+pkgver=0.9.24
+pkgrel=1
+pkgdesc="A command-line multi-system gaming emulator, WIP version"
+url="http://mednafen.sourceforge.net/"
+license=(GPL)
+arch=('i686' 'x86_64')
+depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'libsndfile' 'zlib')
+makedepends=('pkgconfig' 'mesa')
+conflicts=('mednafen')
+provides=('mednafen')
+source=('http://forum.fobby.net/index.php?t=getfile&id=380&')
+sha1sums=('bc0d867a3fa255f01d04ee6f028acab18849f16d')
+
+build() 
+{
+   cd $srcdir/mednafen
+   ./configure --prefix=/usr
+   make
+}
+
+package()
+{
+   cd $srcdir/mednafen
+   make DESTDIR=$pkgdir install
+}