Thu Feb 28 00:03:24 PST 2013

11 files changed, 60 insertions, 88 deletions

diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 2f1412f2c..7ee20c4bf 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178338 2013-02-20 11:50:07Z andrea $
+# $Id: PKGBUILD 178833 2013-02-27 14:34:41Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -18,14 +18,14 @@ pkgname=('calligra-filters'
          'calligra-braindump'
          'calligra-flow')
 pkgver=2.6.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'lcms2' 'libmysqlclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
              'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa')
+             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa' 'vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('8ba98f3ccb3c5097eb059d86b51f6139')
diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD
index 9703e1d54..c3a4e00a2 100644
--- a/extra/gnutls/PKGBUILD
+++ b/extra/gnutls/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177918 2013-02-10 18:54:41Z andyrtr $
+# $Id: PKGBUILD 178865 2013-02-27 20:55:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=gnutls
-pkgver=3.1.8
+pkgver=3.1.9
 pkgrel=1
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ options=('!libtool' '!zipman')
 depends=('gcc-libs>=4.7.1-5' 'libtasn1>=3.0' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit>=0.12')
 makedepends=('valgrind' 'strace' 'datefudge')
 source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('ffac9e22aba66057d5155ad0e3b62485'
-         'f3f0f2b81fa62bbe878a181d87a9cabd')
+md5sums=('0674032fe6de0d90d08eed81fcac2e1d'
+         '503f49f55459ef4229fa4f35841fde2f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gnutls/gnutls.install b/extra/gnutls/gnutls.install
index 691f3c69d..48052cc02 100644
--- a/extra/gnutls/gnutls.install
+++ b/extra/gnutls/gnutls.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info.gz gnutls-guile.info.gz)
+filelist=(gnutls.info-1.gz gnutls.info-2.gz gnutls.info-3.gz gnutls.info-4.gz gnutls.info-5.gz gnutls.info.gz gnutls-guile.info.gz)
 
 post_install() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/extra/hylafax/PKGBUILD b/extra/hylafax/PKGBUILD
index 4a952f56c..43e9a1b9f 100644
--- a/extra/hylafax/PKGBUILD
+++ b/extra/hylafax/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 166869 2012-09-20 09:33:33Z tpowa $
+# $Id: PKGBUILD 178774 2013-02-27 13:50:36Z tpowa $
 # Maintainer: Paul Mattal <paul@archlinux.org>
 pkgname=hylafax
 pkgver=6.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Fax Server"
 arch=('i686' 'x86_64')
 install='hylafax.install'
@@ -18,7 +18,8 @@ source=(ftp://ftp.hylafax.org/source/${pkgname}-${pkgver}.tar.gz
         hylafax.cron.daily 
         config.local
         faxq.service
-        hfaxd.service)
+        hfaxd.service
+        faxgetty@.service)
 
 build () {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -42,7 +43,7 @@ package () {
   # add systemd files
   install -D -m644 $srcdir/hfaxd.service $pkgdir/usr/lib/systemd/system/hfaxd.service
   install -D -m644 $srcdir/faxq.service $pkgdir/usr/lib/systemd/system/faxq.service
-
+  install -D -m644 $srcdir/faxgetty@.service $pkgdir/usr/lib/systemd/system/faxgetty@.service
   install -D -m644 COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/COPYRIGHT
 }
 md5sums=('d063d45049c8fcbabefe09d662313067'
@@ -51,3 +52,10 @@ md5sums=('d063d45049c8fcbabefe09d662313067'
          '60f2a7e62c256ead4e9238cb31b35b90'
          '832c8e8098e2dfa56040c975b554590c'
          '38a00db6d9d765d130b2d8d3a98e5c24')
+md5sums=('d063d45049c8fcbabefe09d662313067'
+         '6602288a405324d8c8e3c5eac2bf19fd'
+         '52beffe7dc296b4f9ce9fd0387f7804e'
+         '60f2a7e62c256ead4e9238cb31b35b90'
+         '832c8e8098e2dfa56040c975b554590c'
+         '38a00db6d9d765d130b2d8d3a98e5c24'
+         'fe10ea597e786fe8c09e4104fbdf16de')
diff --git a/extra/hylafax/faxgetty@.service b/extra/hylafax/faxgetty@.service
new file mode 100644
index 000000000..476715c19
--- /dev/null
+++ b/extra/hylafax/faxgetty@.service
@@ -0,0 +1,24 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=faxgetty on %I
+Documentation=man:faxgetty(8)
+After=faxq.service hfaxd.service
+
+[Service]
+ExecStart=/usr/lib/fax/faxgetty %I
+Type=simple
+Restart=always
+RestartSec=0
+KillMode=process
+
+KillSignal=SIGTERM
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 873ad157f..b66b9963a 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177982 2013-02-12 19:24:37Z andyrtr $
+# $Id: PKGBUILD 178842 2013-02-27 16:20:48Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.3
-pkgrel=2
+pkgver=4.4.4
+pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
 license=('GPL3')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b877c1f82b2d4dc503f40dcce4978ff4')
+md5sums=('f1fa7aec113219952d18e4dd87d531ca')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index d4540f420..88a5e11ea 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178767 2013-02-26 20:04:18Z ioni $
+# $Id: PKGBUILD 178844 2013-02-27 16:21:24Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
 pkgver=3.14.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
@@ -76,8 +76,8 @@ package() {
   				-e "s,%prefix%,/usr,g" \
 				-e "s,%exec_prefix%,/usr/bin,g" \
 				-e "s,%includedir%,/usr/include/nss,g" \
-				-e "s,%NSPR_VERSION%,${_pkgver},g" \
-				-e "s,%NSS_VERSION%,${_pkgver},g" > \
+				-e "s,%NSPR_VERSION%,${_nsprver},g" \
+				-e "s,%NSS_VERSION%,${pkgver},g" > \
 			"${pkgdir}/usr/lib/pkgconfig/nss.pc"
   ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
   chmod 644 ${pkgdir}/usr/lib/pkgconfig/*.pc
diff --git a/extra/watchdog/PKGBUILD b/extra/watchdog/PKGBUILD
index f1c3d4986..df19144f9 100644
--- a/extra/watchdog/PKGBUILD
+++ b/extra/watchdog/PKGBUILD
@@ -1,25 +1,19 @@
-# $Id: PKGBUILD 165803 2012-08-30 17:35:28Z thomas $
+# $Id: PKGBUILD 178840 2013-02-27 15:05:46Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=watchdog
-pkgver=5.12
-pkgrel=2
+pkgver=5.13
+pkgrel=1
 pkgdesc="Watchdog daemon"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/watchdog"
 license=('GPL')
 depends=('glibc')
-backup=(etc/watchdog.conf
-        etc/conf.d/watchdog
-        etc/conf.d/wd_keepalive)
+backup=(etc/watchdog.conf)
 source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        watchdog.sh
-        watchdog.cf
         watchdog-5.12-fix-oom-in-wd_keepalive.patch
         watchdog.systemd)
-md5sums=('cea28bea70e54f3625062bc808aef9af'
-         'f57d33967eb9404dd52e3c4e73795a20'
-         '01c1e2e13f515131180b4ebe9b8b7cc3'
+md5sums=('153455f008f1cf8f65f6ad9586a21ff1'
          'c90c2686975b5254f82b3de683f1f442'
          'a835ae5cbdbb21c19a468dedb5d734e4')
 
@@ -41,13 +35,5 @@ build() {
 package() {
   cd "${srcdir}"/${pkgname}-${pkgver}
   make install DESTDIR="${pkgdir}"
-  for fil in watchdog wd_keepalive ; do
-	install -D -m755 "${srcdir}"/watchdog.sh "${pkgdir}"/etc/rc.d/${fil}
-	install -D -m644 "${srcdir}"/watchdog.cf "${pkgdir}"/etc/conf.d/${fil}
-  done
   install -D -m644 "${srcdir}"/watchdog.systemd "${pkgdir}"/usr/lib/systemd/system/watchdog.service
-
-  sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/rc.d/wd_keepalive
-  sed -i 's/watchdog/wd_keepalive/g' "${pkgdir}"/etc/conf.d/wd_keepalive
-  sed -i 's/Watchdog/Simple Watchdog/' "${pkgdir}"/etc/rc.d/wd_keepalive
 }
diff --git a/extra/watchdog/watchdog.cf b/extra/watchdog/watchdog.cf
deleted file mode 100644
index a33e1ea91..000000000
--- a/extra/watchdog/watchdog.cf
+++ /dev/null
@@ -1,2 +0,0 @@
-# watchdog configuration
-WATCHDOG_OPTIONS=""
diff --git a/extra/watchdog/watchdog.sh b/extra/watchdog/watchdog.sh
deleted file mode 100644
index 54f78454f..000000000
--- a/extra/watchdog/watchdog.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID="$( cat /run/watchdog.pid 2>/dev/null )"
-[ -r /etc/conf.d/watchdog ] && source /etc/conf.d/watchdog
-
-case "$1" in
-  start)
-    stat_busy "Starting Watchdog Daemon"
-
-    [ -z "$PID" ] && /usr/sbin/watchdog ${WATCHDOG_OPTIONS}
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon watchdog
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Watchdog Daemon"
-
-    [ -n "$PID" ] && kill $PID &> /dev/null
-
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon watchdog
-      stat_done
-    fi
-
-    rm -f /run/watchdog.pid
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/xterm/PKGBUILD b/extra/xterm/PKGBUILD
index e1befcbb9..aac5cd08e 100644
--- a/extra/xterm/PKGBUILD
+++ b/extra/xterm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178168 2013-02-17 17:21:11Z andyrtr $
+# $Id: PKGBUILD 178846 2013-02-27 16:25:21Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xterm
-pkgver=290
+pkgver=291
 pkgrel=1
 pkgdesc="X Terminal Emulator"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('custom')
 depends=('libxft' 'libxaw' 'ncurses' 'xorg-luit' 'xbitmaps' 'libutempter')
 source=(ftp://invisible-island.net/${pkgname}/${pkgname}-${pkgver}.tgz
         LICENSE)
-md5sums=('92ce4a161dc4a16daa987e5a6511da61'
+md5sums=('9925cd564c84746442e640f0e32f0493'
          '10ecc3f8ee91e3189863a172f68282d2')
 
 build() {