[arch-commits] Commit in autofs/repos (4 files)

[Andrea Scarpino]

    Date: Tuesday, January 13, 2009 @ 03:28:34
  Author: andrea
Revision: 24092

Merged revisions 23763,24091 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/autofs/trunk

........
  r23763 | andrea | 2009-01-11 17:21:49 +0100 (Sun, 11 Jan 2009) | 1 line
........
  r24091 | andrea | 2009-01-13 09:28:15 +0100 (Tue, 13 Jan 2009) | 1 line
  
  upgpkg: autofs 5.0.4-2
........

Added:
  autofs/repos/testing-i686/heimdal.patch
    (from rev 24091, autofs/trunk/heimdal.patch)
Modified:
  autofs/repos/testing-i686/	(properties)
  autofs/repos/testing-i686/PKGBUILD
  autofs/repos/testing-i686/autofs

---------------+
 PKGBUILD      |    6 +++---
 autofs        |   13 +++++++++----
 heimdal.patch |   34 ++++++++++++++++++++++++++++++++++
 3 files changed, 46 insertions(+), 7 deletions(-)


Property changes on: autofs/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /autofs/trunk:1-23758
   + /autofs/trunk:1-24091

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2009-01-13 08:28:15 UTC (rev 24091)
+++ testing-i686/PKGBUILD	2009-01-13 08:28:34 UTC (rev 24092)
@@ -5,7 +5,7 @@
 
 pkgname=autofs
 pkgver=5.0.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A kernel-based automounter for Linux."
 arch=('i686' 'x86_64')
 url="http://wiki.autofs.net/FrontPage"
@@ -15,7 +15,7 @@
 source=("http://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.bz2"
 	'autofs' 'autofs.conf.d' 'auto.master' 'auto.misc' 'auto.net' 'heimdal.patch')
 md5sums=('2646dde61edd08dd952255558c733c08'
-         '6febd98b29bb83d7bc8dbd3ea953e698'
+         'e857b28b8a660602d349a5e21edab9f0'
          'ddd69346754419faee15fc4c7edeb8b8'
          '036bb5731400b7b0a89797e949169734'
          'd8a15ec9186c5c0b36e5cea1e2739e8a'
@@ -41,7 +41,7 @@
   done
 
   install -m 755 ${srcdir}/auto.net ${pkgdir}/etc/autofs/auto.net
-  sed -i "s:/etc:/etc/autofs:g" ${pkgdir}/usr/man/man5/auto.master.5
+  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
 }

Modified: testing-i686/autofs
===================================================================
--- testing-i686/autofs	2009-01-13 08:28:15 UTC (rev 24091)
+++ testing-i686/autofs	2009-01-13 08:28:34 UTC (rev 24092)
@@ -3,15 +3,21 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-PID=`pidof -o %PPID /usr/bin/automuonter`
+# 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 &> /dev/null`
 case "$1" in
   start)
     stat_busy "Starting Automounter"
-    [ -z "$PID" ] && /usr/bin/automuonter &> /dev/null &
+    [ -z "$PID" ] && /usr/sbin/automount $daemonoptions &> /dev/null &
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      echo $PID > /var/run/autofs.pid
       add_daemon autofs
       stat_done
     fi
@@ -22,7 +28,6 @@
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      rm -f /var/run/autofs.pid
       rm_daemon autofs
       stat_done
     fi

Copied: autofs/repos/testing-i686/heimdal.patch (from rev 24091, autofs/trunk/heimdal.patch)
===================================================================
--- testing-i686/heimdal.patch	                        (rev 0)
+++ testing-i686/heimdal.patch	2009-01-13 08:28:34 UTC (rev 24092)
@@ -0,0 +1,34 @@
+--- 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
+@@ -66,6 +66,15 @@
+ #endif
+ #endif
+ 
++/**
++ * The type of a principal is different for MIT Krb5 and Heimdal.
++ * These macros are provided by Heimdal, and introduced here for MIT.
++ */
++#ifndef krb5_realm_length
++#define krb5_realm_length(r) ((r).length)
++#define krb5_realm_data(r) ((r).data)
++#endif
++
+ /*
+  *  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 @@
+ 
+ 	/* 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)),
+ 		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)),
+ 		0);
+ 	if (ret) {
+ 		error(logopt,