Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bird/PKGBUILD
	community/drbd/PKGBUILD
	community/etherape/PKGBUILD
	community/ext4magic/PKGBUILD
	community/fcron/PKGBUILD
	community/fcron/systab.orig
	community/gnome-panel/PKGBUILD
	community/libident/PKGBUILD
	community/libtorrent/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/usbipd.service
	community/makedev/PKGBUILD
	community/minbif/PKGBUILD
	community/noip/PKGBUILD
	community/notmuch/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/pound/PKGBUILD
	community/preload/PKGBUILD
	community/python-cchardet/PKGBUILD
	community/rtorrent/PKGBUILD
	community/tor/PKGBUILD
	community/ude/PKGBUILD
	core/openldap/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cvs/PKGBUILD
	extra/epiphany-extensions/PKGBUILD
	extra/fbset/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libical/PKGBUILD
	extra/mutt/PKGBUILD
	extra/netkit-bsd-finger/PKGBUILD
	extra/ossp/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/rtkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/liferea-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD

6 files changed, 44 insertions, 87 deletions

diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD
index 0bb255058..271b52fe7 100644
--- a/community/fcron/PKGBUILD
+++ b/community/fcron/PKGBUILD
@@ -1,91 +1,89 @@
-# $Id: PKGBUILD 83238 2013-01-28 15:29:15Z ttoepper $
+# $Id: PKGBUILD 90861 2013-05-15 00:13:25Z seblu $
 # Contributor: Giorgio Lando <lando at imap dot cc>
 # Contributor: Sergej Pupykin
 # Contributor: Thomas Bächler
+# Contributor: Sébastien Luttringer
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 
 pkgname=fcron
-pkgver=3.1.1
-pkgrel=1
+pkgver=3.1.2
+pkgrel=5
 pkgdesc='Feature-rich cron implementation'
 arch=(i686 x86_64 mips64el)
-url="http://fcron.free.fr"
+url='http://fcron.free.fr'
 license=('GPL')
 depends=('pam')
-makedepends=('smtp-server')
-optdepends=('smtp-server: to receive mails from cron jobs')
+makedepends=('smtp-server' 'vi')
+optdepends=('smtp-server: to receive mails from cron jobs'
+            'vi: default editor for fcrontab')
 provides=('cron')
 conflicts=('dcron')
-backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \
-        var/spool/fcron/systab var/spool/fcron/systab.orig)
+backup=('etc/fcron/fcron.conf'
+        'etc/fcron/fcron.allow'
+        'etc/fcron/fcron.deny'
+        'var/spool/fcron/systab'
+        'var/spool/fcron/systab.orig')
 options=('emptydirs' '!makeflags')
-source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \
-        systab systab.orig run-cron fcron.service)
-md5sums=('230b91f308e6012957a3a71a94f03838'
-         'e0c3f0bdc3c98fbbe46eff19001c18f2'
-         '938722c6654ef7b07f4aa10001905ba1'
-         'bfb7daa22ebe22b9917e455c1ca4a382'
-         '5ff0cdcb9ec99778938ac6ef26800327'
-         '973e440ba6d9ea5aa00b45377140fae4')
+source=("http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz"
+        'systab'
+        'systab.orig'
+        'run-cron')
+md5sums=('36bf213e15f3a480f2274f8e46cced0a'
+         '55be3e80fb2545608feae6f2e0eebece'
+         '5384c607d842ca3d5cbb612ac1dceb15'
+         '524eba827447a6b7ef7515eedf305698')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr \
+              --sbindir=/usr/bin \
               --sysconfdir=/etc/fcron \
               --with-answer-all=no \
               --with-boot-install=no \
               --with-username=root \
               --with-groupname=root \
               --datarootdir=/usr/share \
-	            --datadir=/usr/share \
+              --datadir=/usr/share \
               --with-docdir=/usr/share/doc \
               --localstatedir=/var \
               --with-systemdsystemunitdir=/usr/lib/systemd/system \
               --with-piddir=/run \
-	            --with-editor=/usr/bin/vi \
+              --with-editor=/usr/bin/vi \
               --with-sendmail=/usr/sbin/sendmail
   make
-
-  # Temporary bugfix make install expects the file in the files directory.
-  cp script/fcron.init.systemd files
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  
+  cd $pkgname-$pkgver
+
   make DESTDIR="$pkgdir/" install
-  install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron"
   install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron"
-  
+
   install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab"
   # Install default fcrontab so that fcron can completely replace dcron
-  
-  install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab"
+
+  install -D -m640 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab"
   # In order to preserve the systab crontab in any case it is better to have
   # it in non-binary form too
-  install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
+  install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig"
 
   # Add cron.* directories
   install -d -m755 "$pkgdir/etc/cron.daily"
   install -d -m755 "$pkgdir/etc/cron.hourly"
   install -d -m755 "$pkgdir/etc/cron.monthly"
   install -d -m755 "$pkgdir/etc/cron.weekly"
-  
-  # Install run-cron script to make fcron run without dcron
-  install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron"
 
-  # Install systemd service
-  #install -D -m644 "$srcdir/fcron.service" \
-  #  "$pkgdir/usr/lib/systemd/system/fcron.service"
+  # Install run-cron script to make fcron run without dcron
+  install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/bin/run-cron"
 
   # avoid conflict with filesystem>=2012.06
-  rmdir "$pkgdir/var/run"
+  rmdir "$pkgdir"/{var/,}run
 
   # avoid conflict with libbsd - #31259
   rm "$pkgdir/usr/share/man/man3/bitstring.3" \
     "$pkgdir/usr/share/man/fr/man3/bitstring.3"
   rmdir --ignore-fail-on-non-empty "$pkgdir/usr/share/man/man3" \
-    "$pkgdir/usr/share/man/fr/man3" || true
+    "$pkgdir/usr/share/man/fr/man3"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/fcron/fcron.rc b/community/fcron/fcron.rc
deleted file mode 100644
index 880439a1d..000000000
--- a/community/fcron/fcron.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/fcron`
-case "$1" in
-  start)
-    stat_busy "Starting Fcron Daemon"
-    [ -z "$PID" ] && /usr/sbin/fcron -b
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fcron
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Fcron Daemon"
-    [ -n "$PID" ]  && kill $PID >/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fcron
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/community/fcron/fcron.service b/community/fcron/fcron.service
deleted file mode 100644
index c54e8d9e9..000000000
--- a/community/fcron/fcron.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Cron Daemon
-
-[Service]
-ExecStart=/usr/sbin/fcron --foreground --nosyslog
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/fcron/run-cron b/community/fcron/run-cron
index 51007a15a..8e65e2fd0 100644
--- a/community/fcron/run-cron
+++ b/community/fcron/run-cron
@@ -1,14 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 
-if [ -z $1 ]; then
+if [[ -z "$1" ]]; then
    echo "Usage: $0 crondir"
    exit 1
 fi
 
-for cron in $1/* ; do
-  if [ -x $cron ]; then
-     $cron
+for cron in "$1"/* ; do
+  if [[ -x "$cron" ]]; then
+     "$cron"
   fi
 done
 unset cron
diff --git a/community/fcron/systab b/community/fcron/systab
index 11c7e2fd0..7947f3598 100644
--- a/community/fcron/systab
+++ b/community/fcron/systab
diff --git a/community/fcron/systab.orig b/community/fcron/systab.orig
new file mode 100644
index 000000000..b57ba8ef2
--- /dev/null
+++ b/community/fcron/systab.orig
@@ -0,0 +1,4 @@
+&bootrun 01 * * * *  /usr/bin/run-cron /etc/cron.hourly
+&bootrun 02 00 * * * /usr/bin/run-cron /etc/cron.daily
+&bootrun 22 00 * * 0 /usr/bin/run-cron /etc/cron.weekly
+&bootrun 42 00 1 * * /usr/bin/run-cron /etc/cron.monthly