summaryrefslogtreecommitdiffstats
path: root/abs/extra/autofs
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-08-30 22:26:00 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-08-30 22:26:00 (GMT)
commit1f175a7b07b9553ce98d0546ac04dbb925ec0bc9 (patch)
treec969070115611a8a75f23d468aa5e0cf86a08121 /abs/extra/autofs
parentc4bd4457b5d640e1c8f5afbca7cd54c53691e5fc (diff)
downloadlinhes_pkgbuild-1f175a7b07b9553ce98d0546ac04dbb925ec0bc9.zip
linhes_pkgbuild-1f175a7b07b9553ce98d0546ac04dbb925ec0bc9.tar.gz
linhes_pkgbuild-1f175a7b07b9553ce98d0546ac04dbb925ec0bc9.tar.bz2
RESYNC EXTRA:
synced extra-testing -> extra repo Signed-off-by: James Meyer <james.meyer@operamail.com>
Diffstat (limited to 'abs/extra/autofs')
-rwxr-xr-x[-rw-r--r--]abs/extra/autofs/Changelog4
-rwxr-xr-x[-rw-r--r--]abs/extra/autofs/PKGBUILD55
-rw-r--r--abs/extra/autofs/autofs.install6
-rwxr-xr-xabs/extra/autofs/finish8
-rw-r--r--abs/extra/autofs/heimdal.patch24
-rwxr-xr-xabs/extra/autofs/log.run2
-rwxr-xr-xabs/extra/autofs/run16
7 files changed, 77 insertions, 38 deletions
diff --git a/abs/extra/autofs/Changelog b/abs/extra/autofs/Changelog
index f25555e..d8df4dc 100644..100755
--- a/abs/extra/autofs/Changelog
+++ b/abs/extra/autofs/Changelog
@@ -1,2 +1,6 @@
5.0.4-5 4/29/09
Cecil - Added run and finish files for runit.
+6/28/10
+Britney - Updated run to manage automount; removed finish and /etc/rc.d/autofs; added logger
+5.0.5-1 6/12/10
+Britney - Updated to 5.0.5 based on arch autofs 5.0.5 PKGBUILD and heimdal.patch with runit support added.
diff --git a/abs/extra/autofs/PKGBUILD b/abs/extra/autofs/PKGBUILD
index 7524ae4..ac317d2 100644..100755
--- a/abs/extra/autofs/PKGBUILD
+++ b/abs/extra/autofs/PKGBUILD
@@ -1,29 +1,21 @@
-# $Id: PKGBUILD 36638 2009-04-26 19:00:46Z andrea $
+# $Id: PKGBUILD 75323 2010-04-01 10:16:24Z allan $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Dale Blount <dale@archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=autofs
-pkgver=5.0.4
-pkgrel=5
-pkgdesc="A kernel-based automounter for Linux."
+pkgver=5.0.5
+pkgrel=1
+pkgdesc="A kernel-based automounter for Linux"
arch=('i686' 'x86_64')
url="http://wiki.autofs.net/FrontPage"
license=('GPL2')
depends=('libldap' 'libxml2' 'heimdal')
backup=(etc/autofs/auto.master etc/autofs/auto.misc etc/conf.d/autofs)
-install=autofs.install
+install=${pkgname}.install
source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
- 'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc'
- 'heimdal.patch' 'run' 'finish')
-md5sums=('2646dde61edd08dd952255558c733c08'
- 'b4984b3161f50cba3d189b0ec594d014'
- '47f597c870410055e0fdb66103daf928'
- 'a6cefb591e77b31b79dbb7243646c96b'
- 'd8a15ec9186c5c0b36e5cea1e2739e8a'
- '1ee4825e26ad72bfe86acec3d3da5d2a'
- '74d3b5b6c4421275448084472cfa691a'
- '43410e98ecb224cde73ce32be5a6aa14')
+ 'autofs.conf.d' 'auto.master' 'auto.misc'
+ 'heimdal.patch' 'run' 'log.run' 'finish')
build() {
export MAKEFLAGS="-j1"
@@ -37,18 +29,29 @@ build() {
--with-mapdir=/etc/autofs \
--without-hesiod
make || return 1
+
+ sed -i "s:/etc:/etc/autofs:g" man/auto.master.5
+}
+
+package(){
+ cd ${srcdir}/${pkgname}-${pkgver}
make INSTALLROOT=${pkgdir} install
- local conf_file
- for conf_file in auto.{master,misc}; do
- install -D -m 644 ${srcdir}/$conf_file ${pkgdir}/etc/autofs/$conf_file
- done
-
- sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/share/man/man5/auto.master.5
- install -D -m 755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs
- install -D -m 644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs
+ install -Dm644 ${srcdir}/auto.master ${pkgdir}/etc/autofs/auto.master || return 1
+ install -Dm644 ${srcdir}/auto.misc ${pkgdir}/etc/autofs/auto.misc || return 1
+ install -Dm644 ${srcdir}/autofs.conf.d ${pkgdir}/etc/conf.d/autofs || return 1
mkdir -p ${pkgdir}/etc/sv/autofs/supervise
- install -D -m 744 ${srcdir}/run ${pkgdir}/etc/sv/autofs
- install -D -m 744 ${srcdir}/finish ${pkgdir}/etc/sv/autofs
+ mkdir -p ${pkgdir}/etc/sv/autofs/log/supervise
+ install -Dm744 ${srcdir}/run ${pkgdir}/etc/sv/autofs || return 1
+ install -Dm744 ${srcdir}/finish ${pkgdir}/etc/sv/autofs || return 1
+ install -Dm744 ${srcdir}/log.run ${pkgdir}/etc/sv/autofs/log/run || return 1
}
-# vim: ts=2 sw=2 et ft=sh
+
+md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a'
+ '47f597c870410055e0fdb66103daf928'
+ 'a6cefb591e77b31b79dbb7243646c96b'
+ 'd8a15ec9186c5c0b36e5cea1e2739e8a'
+ 'efd46b6406b940cb48f7c6197790fb8e'
+ 'f2048c24da7fa1421c2e8b0b90fb17f9'
+ '518e277f960a1af837ba6c5cca13c615'
+ '5b30948886b6d71287652d784fccf1fb')
diff --git a/abs/extra/autofs/autofs.install b/abs/extra/autofs/autofs.install
index 61120bb..7806efa 100644
--- a/abs/extra/autofs/autofs.install
+++ b/abs/extra/autofs/autofs.install
@@ -1,5 +1,5 @@
post_install(){
- echo "########################################################"
- echo "In autofs5 --ghost option isn't valid. In order to start"
- echo "autofs you must remove it from your /etc/conf.d/autofs. "
+ echo "#########################################################"
+ echo "In autofs5 --ghost option isn't valid. In order to start autofs"
+ echo "you must remove that option from your /etc/conf.d/autofs. "
}
diff --git a/abs/extra/autofs/finish b/abs/extra/autofs/finish
index 26f9d19..40d2fdc 100755
--- a/abs/extra/autofs/finish
+++ b/abs/extra/autofs/finish
@@ -1,3 +1,9 @@
#!/bin/sh
exec 2>&1
-sv down autofs
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+stat_runit "Stopping autofs4 kernel module" && echo ""
+set -e # barf if modprobe fails
+/sbin/modprobe -r autofs4
diff --git a/abs/extra/autofs/heimdal.patch b/abs/extra/autofs/heimdal.patch
index c49b1fd..4aa3218 100644
--- a/abs/extra/autofs/heimdal.patch
+++ b/abs/extra/autofs/heimdal.patch
@@ -1,5 +1,5 @@
---- autofs-5.0.4/modules/cyrus-sasl.c~ 2009-01-11 17:18:55.000000000 +0100
-+++ autofs-5.0.4/modules/cyrus-sasl.c 2009-01-11 17:18:55.000000000 +0100
+--- autofs-5.0.5/modules/cyrus-sasl.c~ 2010-03-03 01:38:41.582901786 +0100
++++ autofs-5.0.5/modules/cyrus-sasl.c 2010-03-03 01:41:32.313704755 +0100
@@ -66,6 +66,15 @@
#endif
#endif
@@ -16,19 +16,29 @@
/*
* Once a krb5 credentials cache is setup, we need to set the KRB5CCNAME
* environment variable so that the library knows where to find it.
-@@ -451,11 +460,11 @@
+@@ -452,11 +452,11 @@
/* setup a principal for the ticket granting service */
ret = krb5_build_principal_ext(ctxt->krb5ctxt, &tgs_princ,
- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
-+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
++ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
++ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
strlen(KRB5_TGS_NAME), KRB5_TGS_NAME,
- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->length,
- krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)->data,
-+ krb5_realm_length(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
-+ krb5_realm_data(*krb5_princ_realm(ctxt->krb5ctxt, krb5_client_princ)),
++ krb5_realm_length(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
++ krb5_realm_data(*krb5_principal_get_realm(ctxt->krb5ctxt, krb5_client_princ)),
0);
if (ret) {
error(logopt,
+--- autofs-5.0.5/modules/Makefile~ 2010-03-03 01:42:18.532868539 +0100
++++ autofs-5.0.5/modules/Makefile 2010-03-03 01:42:35.360367371 +0100
+@@ -43,7 +43,7 @@
+ ifeq ($(SASL), 1)
+ SASL_OBJ = cyrus-sasl.o
+ LDAP_FLAGS += $(SASL_FLAGS) $(XML_FLAGS) -DLDAP_THREAD_SAFE
+- LIBLDAP += $(LIBSASL) $(XML_LIBS)
++ LIBLDAP += $(LIBSASL) $(XML_LIBS) -lkrb5
+ endif
+ endif \ No newline at end of file
diff --git a/abs/extra/autofs/log.run b/abs/extra/autofs/log.run
new file mode 100755
index 0000000..d184328
--- /dev/null
+++ b/abs/extra/autofs/log.run
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/logger -p info -i -t autofs
diff --git a/abs/extra/autofs/run b/abs/extra/autofs/run
index b35a4ea..342ade6 100755
--- a/abs/extra/autofs/run
+++ b/abs/extra/autofs/run
@@ -1,5 +1,19 @@
#!/bin/sh
exec 2>&1
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+stat_runit "Starting autofs4 kernel module" && echo ""
set -e # barf if modprobe fails
/sbin/modprobe autofs4
-exec /etc/rc.d/autofs start
+
+stat_runit "Starting autofs automount" && echo ""
+# source application-specific settings
+[ -f /etc/conf.d/autofs ] && . /etc/conf.d/autofs
+
+if [ ! -z "$TIMEOUT" ]; then
+ daemonoptions="--timeout=$TIMEOUT $daemonoptions"
+fi
+
+exec /usr/sbin/automount -f $daemonoptions