From c31a292fdf684e97b85d0d9153f657f25e9d12ce Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 12 Jul 2010 16:59:51 -0500 Subject: autofs: Update to 5.0.5. ref 647 --- abs/extra-testing/autofs/Changelog | 2 ++ abs/extra-testing/autofs/PKGBUILD | 37 +++++++++++++++++---------------- abs/extra-testing/autofs/autofs.install | 6 +++--- abs/extra-testing/autofs/heimdal.patch | 24 ++++++++++++++------- 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/abs/extra-testing/autofs/Changelog b/abs/extra-testing/autofs/Changelog index 7807b97..d8df4dc 100755 --- a/abs/extra-testing/autofs/Changelog +++ b/abs/extra-testing/autofs/Changelog @@ -2,3 +2,5 @@ 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-testing/autofs/PKGBUILD b/abs/extra-testing/autofs/PKGBUILD index 907795f..ac317d2 100755 --- a/abs/extra-testing/autofs/PKGBUILD +++ b/abs/extra-testing/autofs/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 36638 2009-04-26 19:00:46Z andrea $ +# $Id: PKGBUILD 75323 2010-04-01 10:16:24Z allan $ # Maintainer: Andrea Scarpino # Contributor: Dale Blount # Contributor: Manolis Tzanidakis pkgname=autofs -pkgver=5.0.4 -pkgrel=8 -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.conf.d' 'auto.master' 'auto.misc' 'heimdal.patch' 'run' 'log.run' 'finish') @@ -29,28 +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 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 mkdir -p ${pkgdir}/etc/sv/autofs/log/supervise - install -D -m 744 ${srcdir}/run ${pkgdir}/etc/sv/autofs - install -D -m 744 ${srcdir}/finish ${pkgdir}/etc/sv/autofs - install -D -m 744 ${srcdir}/log.run ${pkgdir}/etc/sv/autofs/log/run + 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=('2646dde61edd08dd952255558c733c08' +md5sums=('a1d262cb6ebef0c2dd0fe22232fb3d5a' '47f597c870410055e0fdb66103daf928' 'a6cefb591e77b31b79dbb7243646c96b' 'd8a15ec9186c5c0b36e5cea1e2739e8a' - '1ee4825e26ad72bfe86acec3d3da5d2a' + 'efd46b6406b940cb48f7c6197790fb8e' 'f2048c24da7fa1421c2e8b0b90fb17f9' '518e277f960a1af837ba6c5cca13c615' '5b30948886b6d71287652d784fccf1fb') diff --git a/abs/extra-testing/autofs/autofs.install b/abs/extra-testing/autofs/autofs.install index 61120bb..7806efa 100644 --- a/abs/extra-testing/autofs/autofs.install +++ b/abs/extra-testing/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-testing/autofs/heimdal.patch b/abs/extra-testing/autofs/heimdal.patch index c49b1fd..4aa3218 100644 --- a/abs/extra-testing/autofs/heimdal.patch +++ b/abs/extra-testing/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 -- cgit v0.12