Tue Sep 4 00:04:04 UTC 2012

14 files changed, 250 insertions, 17 deletions

diff --git a/testing/fetchmail/PKGBUILD b/testing/fetchmail/PKGBUILD
new file mode 100644
index 000000000..f4045b5c2
--- /dev/null
+++ b/testing/fetchmail/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: PKGBUILD 165877 2012-09-02 12:54:03Z pierre $
+
+pkgname=fetchmail
+pkgver=6.3.22
+pkgrel=1
+pkgdesc="A remote-mail retrieval utility"
+arch=('i686' 'x86_64')
+url="http://fetchmail.berlios.de/"
+license=('GPL')
+depends=('openssl')
+makedepends=('python2')
+optdepends=('tk: for using fetchmailconf'
+            'python2: for using fetchmailconf')
+backup=('etc/conf.d/fetchmail')
+options=('!makeflags')
+install='fetchmail.install'
+source=("http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz"
+        "http://downloads.sourceforge.net/$pkgname/${pkgname}-${pkgver}.tar.xz.asc"
+        'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
+sha1sums=('3bb755010dbe568d53840e22d8e87d8d5db25b19'
+          '27184b75ef09c5202bede9863ae8abc3d0cdb1d2'
+          'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
+          '30401729386d6f774c6c36ab8530842166de54a8'
+          '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
+          '11ff81fc8363a54099880da18634b0d1ecf9fa82')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
+  PYTHON=python2 ./configure --prefix=/usr --with-ssl=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
+  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
+  install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
+  install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf
+  install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service
+}
diff --git a/testing/fetchmail/fetchmail.conf b/testing/fetchmail/fetchmail.conf
new file mode 100644
index 000000000..dcac2a067
--- /dev/null
+++ b/testing/fetchmail/fetchmail.conf
@@ -0,0 +1,5 @@
+# Daemon polling interval
+INTERVAL=60
+
+# Config location
+CONFIG=/etc/fetchmailrc
diff --git a/testing/fetchmail/fetchmail.install b/testing/fetchmail/fetchmail.install
new file mode 100644
index 000000000..81b374c57
--- /dev/null
+++ b/testing/fetchmail/fetchmail.install
@@ -0,0 +1,26 @@
+post_install() {
+  # /etc/fetchmail must be owned by fetchmail for daemon to work.
+  echo "If you run fetchmail as a daemon and not a cron job"
+  echo "then 'chown fetchmail /etc/fetchmailrc'"
+  getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
+      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
+  if [[ ! -d run/fetchmail ]]; then
+    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+  fi
+}
+
+post_upgrade() {
+  getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
+      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
+
+  if [ "$(vercmp $2 6.3.19-3)" -lt 0 ] ; then
+    usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
+  fi
+  if [[ ! -d run/fetchmail ]]; then
+    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+  fi
+}
+
+pre_remove() {
+  usr/sbin/userdel fetchmail &>/dev/null
+}
diff --git a/testing/fetchmail/fetchmail.rc b/testing/fetchmail/fetchmail.rc
new file mode 100644
index 000000000..4d8b98d40
--- /dev/null
+++ b/testing/fetchmail/fetchmail.rc
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/fetchmail
+
+PID=`pidof -o %PPID /usr/bin/fetchmail`
+case "$1" in
+  start)
+    stat_busy "Starting fetchmail"
+    [ -z "$PID" ] &&
+      su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon fetchmail
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping fetchmail"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon fetchmail
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/testing/fetchmail/fetchmail.service b/testing/fetchmail/fetchmail.service
new file mode 100644
index 000000000..3e7da7545
--- /dev/null
+++ b/testing/fetchmail/fetchmail.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=A remote-mail retrieval utility
+After=network.target
+
+[Service]
+User=fetchmail
+EnvironmentFile=/etc/conf.d/fetchmail
+ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG}
+RestartSec=1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/testing/fetchmail/fetchmail.tmpfiles b/testing/fetchmail/fetchmail.tmpfiles
new file mode 100644
index 000000000..07945f876
--- /dev/null
+++ b/testing/fetchmail/fetchmail.tmpfiles
@@ -0,0 +1 @@
+d /run/fetchmail 700 fetchmail nobody
diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD
index 88f001a8a..583c24148 100644
--- a/testing/inetutils/PKGBUILD
+++ b/testing/inetutils/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165418 2012-08-18 22:30:35Z eric $
+# $Id: PKGBUILD 165845 2012-08-31 23:00:09Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=inetutils
 pkgver=1.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A collection of common network programs"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/inetutils/"
@@ -25,7 +25,7 @@ sha1sums=('86b7eb11cfdaefb1d4e9bfc10620beaf8f09bc90'
           '27d99b910eec0fc26bd79ccc2c1de26608330298'
           '81f10b3b688e3952f793b35bcef63b5bf257a92b'
           '81f4a8da823cf0bb14284fc71ee6108849691eda'
-          '1c5ff1b6166c7401ef0956ce6eab30450ff95eaf'
+          'fb607dafe177f074e14891dd887ef9e9ab67a875'
           'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
 
 build() {
diff --git a/testing/inetutils/ftpd.service b/testing/inetutils/ftpd.service
index 985eb9756..5708bdfd1 100644
--- a/testing/inetutils/ftpd.service
+++ b/testing/inetutils/ftpd.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=FTPD Daemon
+After=network.target
 
 [Service]
 ExecStart=/usr/sbin/ftpd -D
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
index cc4be1fea..9a7e814e3 100644
--- a/testing/libreoffice/PKGBUILD
+++ b/testing/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 165822 2012-08-31 03:31:02Z andyrtr $
+# $Id: PKGBUILD 165881 2012-09-02 17:17:47Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -26,7 +26,7 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built
 _LOver=3.6.1.2
 pkgver=3.6.1
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -39,7 +39,7 @@ makedepends=( # makedepends
              # the runtime dependencies
              "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
              'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" 
-             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 
+             'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite' 'lcms2'
              'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils'
 	         'ttf-dejavu') # to satisfy regression tests
 
@@ -276,7 +276,7 @@ package_libreoffice-common() {
  pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
  install=libreoffice-common.install
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6"
-          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 
+          'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2'
           'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2')
           #'saxon'
  optdepends=('libreoffice-langpack: additional language support'
@@ -291,7 +291,6 @@ package_libreoffice-common() {
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
              'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images'
-             'clucene:          full-text search engine library needed in the help section'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
              'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress'
diff --git a/testing/libwps/PKGBUILD b/testing/libwps/PKGBUILD
new file mode 100644
index 000000000..1d7c87e6c
--- /dev/null
+++ b/testing/libwps/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 165826 2012-08-31 04:51:19Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Robert McCathie <archaur at rmcc dot com dot au>
+
+pkgname=libwps
+pkgver=0.2.7
+pkgrel=1
+pkgdesc="a Microsoft Works file word processor format import filter library"
+arch=('i686' 'x86_64')
+url="http://libwps.sourceforge.net/"
+license=('LGPL')
+depends=('libwpd>=0.9.4')
+makedepends=('boost')
+options=(!libtool)
+source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2")
+md5sums=('d197bd6211669a2fa4ca648faf04bcb1')
+
+build() {
+	cd "$srcdir/$pkgname-$pkgver"
+	./configure  --prefix=/usr \
+	  --disable-static \
+	  --disable-werror
+	make
+}
+
+package() {
+	cd "$srcdir/$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
+}
+
diff --git a/testing/modemmanager/PKGBUILD b/testing/modemmanager/PKGBUILD
index d48648e45..8ec1d2f81 100644
--- a/testing/modemmanager/PKGBUILD
+++ b/testing/modemmanager/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165461 2012-08-20 10:57:16Z heftig $
+# $Id: PKGBUILD 165839 2012-08-31 20:12:30Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgname=modemmanager
 _realname=ModemManager
-pkgver=0.5.2.0
-pkgrel=4
+pkgver=0.6.0.0
+pkgrel=1
 pkgdesc="Mobile broadband modem management service"
 arch=('i686' 'x86_64')
 url="http://cgit.freedesktop.org/ModemManager/ModemManager/"
@@ -12,9 +12,9 @@ depends=('dbus-glib' 'udev' 'ppp')
 makedepends=('intltool')
 optdepends=('usb_modeswitch: install if your modem shows up as a storage drive')
 options=('!libtool')
-source=(http://download.gnome.org/sources/$_realname/0.5/$_realname-$pkgver.tar.xz
+source=(http://download.gnome.org/sources/$_realname/0.6/$_realname-$pkgver.tar.xz
         modem-manager.service)
-sha256sums=('7f8b3e1996a24e031df7534e226a0f0c7c2dd8b30322e6c5f4611dc1a848e6c8'
+sha256sums=('d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2'
             '118e36f2f956d719cf4036f3fd5f5bf0fde88ca55bdf7ed95051b5b09066fcbe')
 
 build() {
diff --git a/testing/qpdf/PKGBUILD b/testing/qpdf/PKGBUILD
new file mode 100644
index 000000000..6b7ab96cd
--- /dev/null
+++ b/testing/qpdf/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 165886 2012-09-02 20:15:26Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
+# Contributor: Miguel Revilla <yo at miguelrevilla.com>
+# Contributor: David Sotelo <dvsotelo at gmail.com>
+# Contributor: Nuno Araujo <nuno.araujo@russo79.com>
+
+pkgname=qpdf
+pkgver=3.0.1
+pkgrel=2
+pkgdesc="QPDF: A Content-Preserving PDF Transformation System"
+arch=('i686' 'x86_64')
+url="http://qpdf.sourceforge.net/"
+license=('custom:Artistic-2.0')
+depends=('pcre' 'perl')
+makedepends=('make')
+options=('!libtool')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('48767e2519029d0214cd0fcafa3a8f8c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  # fix rpath errors (from Fedora spec)
+  autoreconf -vfi
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}/" install
+
+  mkdir -m755 -p ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 Artistic-2.0 ${pkgdir}/usr/share/licenses/${pkgname}/
+}
diff --git a/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch b/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
new file mode 100644
index 000000000..2694334c8
--- /dev/null
+++ b/testing/upower/0001-Send-resume-signal-when-built-with-systemd-and-using.patch
@@ -0,0 +1,35 @@
+From a5b3dd887dcd60e981626ae2e15c874311fc4fef Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Sun, 2 Sep 2012 04:36:13 +0200
+Subject: [PATCH] Send resume signal when built with systemd and using
+ pm-utils suspend
+
+This case was apparently overlooked when adding systemd support.
+
+Signed-off-by: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+---
+ src/linux/up-backend.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/linux/up-backend.c b/src/linux/up-backend.c
+index ddd4472..52b430e 100644
+--- a/src/linux/up-backend.c
++++ b/src/linux/up-backend.c
+@@ -603,10 +603,11 @@ gboolean
+ up_backend_emits_resuming (UpBackend *backend)
+ {
+ #ifdef HAVE_SYSTEMD
+-	return TRUE;
+-#else
+-	return FALSE;
++	if (sd_booted ())
++		return TRUE;
++	else
+ #endif
++	return FALSE;
+ }
+ 
+ /**
+-- 
+1.7.12
+
diff --git a/testing/upower/PKGBUILD b/testing/upower/PKGBUILD
index 962c304bc..22697257d 100644
--- a/testing/upower/PKGBUILD
+++ b/testing/upower/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 165781 2012-08-29 21:43:32Z heftig $
+# $Id: PKGBUILD 165871 2012-09-02 02:46:11Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
 pkgver=0.9.18
-pkgrel=1
+pkgrel=2
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
 url="http://upower.freedesktop.org"
@@ -11,8 +11,10 @@ license=('GPL')
 depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
 options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz)
-md5sums=('bfaaa1e7f8479fca5594406b3c36dff9')
+source=($url/releases/$pkgname-$pkgver.tar.xz
+        0001-Send-resume-signal-when-built-with-systemd-and-using.patch)
+md5sums=('bfaaa1e7f8479fca5594406b3c36dff9'
+         '188afea4919dc324b2efbae35d9d216a')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -20,6 +22,9 @@ build() {
   # put udev files in /usr/lib
   sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
 
+  # https://bugs.freedesktop.org/show_bug.cgi?id=54371
+  patch -Np1 -i ../0001-Send-resume-signal-when-built-with-systemd-and-using.patch
+
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var \
     --libexecdir=/usr/lib/$pkgname \