[arch-commits] Commit in autofs/trunk (PKGBUILD autofs autofs.conf.d)

[Sébastien Luttringer]

    Date: Friday, May 31, 2013 @ 00:21:27
  Author: seblu
Revision: 92004

upgpkg: autofs 5.0.7-3

- /usr merge
- remove rc.D
- add 'etc/default/autofs' into backup (used by systemd)

Modified:
  autofs/trunk/PKGBUILD
Deleted:
  autofs/trunk/autofs
  autofs/trunk/autofs.conf.d

---------------+
 PKGBUILD      |   19 ++++++++-----------
 autofs        |   50 --------------------------------------------------
 autofs.conf.d |    4 ----
 3 files changed, 8 insertions(+), 65 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-30 22:03:56 UTC (rev 92003)
+++ PKGBUILD	2013-05-30 22:21:27 UTC (rev 92004)
@@ -6,7 +6,7 @@
 
 pkgname=autofs
 pkgver=5.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc='A kernel-based automounter for Linux.'
 arch=('i686' 'x86_64')
 url='http://freshmeat.net/projects/autofs'
@@ -14,19 +14,15 @@
 depends=('libxml2')
 makedepends=('libldap' 'krb5' 'kmod')
 optdepends=('krb5: for LDAP support')
-backup=('etc/autofs/auto.master'
-        'etc/autofs/auto.misc'
-        'etc/conf.d/autofs')
+backup=('etc/default/autofs'
+        'etc/autofs/auto.master'
+        'etc/autofs/auto.misc')
 options=(!makeflags)
 install='autofs.install'
 source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
-        'autofs'
-        'autofs.conf.d'
         'auto.master'
         'auto.misc')
 md5sums=('bc46838dece83c02d800ff144ed9f431'
-         'e307bf6d2638e46eeb916cf42fe029b2'
-         '47f597c870410055e0fdb66103daf928'
          'a6cefb591e77b31b79dbb7243646c96b'
          'd8a15ec9186c5c0b36e5cea1e2739e8a')
 
@@ -36,7 +32,8 @@
   sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
     Makefile.rules
 
-  ./configure --prefix=/usr --sysconfdir=/etc/autofs --with-mapdir=/etc/autofs --without-hesiod \
+  ./configure --prefix=/usr --sysconfdir=/etc/autofs --sbindir=/usr/bin \
+    --with-mapdir=/etc/autofs --without-hesiod \
     --enable-ignore-busy --with-systemd
   make
 }
@@ -48,8 +45,8 @@
 
   install -Dm0644 "${srcdir}/auto.master" "${pkgdir}/etc/autofs/auto.master"
   install -Dm0644 "${srcdir}/auto.misc" "${pkgdir}/etc/autofs/auto.misc"
-  install -Dm0755 "${srcdir}/autofs" "${pkgdir}/etc/rc.d/autofs"
-  install -Dm0644 "${srcdir}/autofs.conf.d" "${pkgdir}/etc/conf.d/autofs"
 
   install -Dm0644 "samples/autofs.service" "${pkgdir}/usr/lib/systemd/system/autofs.service"
 }
+
+# vim:set ts=2 sw=2 et:

Deleted: autofs
===================================================================
--- autofs	2013-05-30 22:03:56 UTC (rev 92003)
+++ autofs	2013-05-30 22:21:27 UTC (rev 92004)
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-daemon_name=autofs
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs
-
-if [ ! -z "$TIMEOUT" ]; then
-  daemonoptions="--timeout=$TIMEOUT $daemonoptions"
-fi
-
-PID=`cat /var/run/autofs-running 2> /dev/null`
-case "$1" in
-  start)
-    stat_busy "Starting $daemon_name daemon"
-    [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping $daemon_name daemon"
-    [ ! -z "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon $daemon_name
-      stat_done
-    fi
-    ;;
-  restart)
-    stat_busy "Restarting $daemon_name daemon"
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  status)
-    stat_busy "Checking $daemon_name status";
-    ck_status $daemon_name
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|status}"  
-esac
-exit 0

Deleted: autofs.conf.d
===================================================================
--- autofs.conf.d	2013-05-30 22:03:56 UTC (rev 92003)
+++ autofs.conf.d	2013-05-30 22:21:27 UTC (rev 92004)
@@ -1,4 +0,0 @@
-#localoptions='rsize=8192,wsize=8192'
-
-# e.g. --timeout=60
-daemonoptions=''