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

[Giovanni Scafora]

    Date: Monday, March 16, 2009 @ 17:54:43
  Author: giovanni
Revision: 30168

Merged revisions 356,2304,22264,23660,23757,23763,24091,30098-30100,30166 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/autofs/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (ven, 18 apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r2304 | paul | 2008-05-30 22:00:40 -0700 (ven, 30 mag 2008) | 2 lines
  
  Added licenses for 64 packages.
........
  r22264 | allan | 2008-12-24 22:14:06 -0800 (mer, 24 dic 2008) | 1 line
  
  add etc/autofs/auto.misc to backup array (FS#6418)
........
  r23660 | andrea | 2009-01-11 07:02:25 -0800 (dom, 11 gen 2009) | 1 line
........
  r23757 | andrea | 2009-01-11 08:21:20 -0800 (dom, 11 gen 2009) | 1 line
  
  upgpkg: autofs 5.0.4-1
........
  r23763 | andrea | 2009-01-11 08:21:49 -0800 (dom, 11 gen 2009) | 1 line
........
  r24091 | andrea | 2009-01-13 00:28:15 -0800 (mar, 13 gen 2009) | 1 line
  
  upgpkg: autofs 5.0.4-2
........
  r30098 | andrea | 2009-03-16 08:13:09 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30099 | andrea | 2009-03-16 08:28:35 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30100 | andrea | 2009-03-16 08:38:47 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-5
........
  r30166 | giovanni | 2009-03-16 14:44:38 -0700 (lun, 16 mar 2009) | 1 line
  
  upgpkg: autofs 4.1.4-6
........

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

---------------+
 PKGBUILD      |    6 +++---
 heimdal.patch |   34 ++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)


Property changes on: autofs/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /autofs/trunk:1
   + /autofs/trunk:1-30167

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-16 21:48:10 UTC (rev 30167)
+++ extra-i686/PKGBUILD	2009-03-16 21:54:43 UTC (rev 30168)
@@ -5,14 +5,14 @@
 
 pkgname=autofs
 pkgver=4.1.4
-pkgrel=5
+pkgrel=6
 pkgdesc="A kernel-based automounter for Linux."
 arch=('i686' 'x86_64')
 url="http://wiki.autofs.net/FrontPage"
 license=('GPL2')
 depends=('libldap')
 backup=(etc/autofs/auto.master etc/conf.d/autofs)
-source=($url/v4/${pkgname}-${pkgver}.tar.bz2
+source=(http://www.kernel.org/pub/linux/daemons/autofs/v4/autofs-4.1.4.tar.bz2
         ${pkgname}
         ${pkgname}.conf.d
         auto.master
@@ -33,7 +33,7 @@
     Makefile.rules
   sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
     Makefile.rules
-  ./configure --prefix=/usr --sysconfdir=/etc/autofs
+  ./configure --prefix=/usr --sysconfdir=/etc/autofs --mandir=/usr/share/man
   make || return 1
   make INSTALLROOT=${pkgdir} install
   

Copied: autofs/repos/extra-i686/heimdal.patch (from rev 30166, autofs/trunk/heimdal.patch)
===================================================================
--- extra-i686/heimdal.patch	                        (rev 0)
+++ extra-i686/heimdal.patch	2009-03-16 21:54:43 UTC (rev 30168)
@@ -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,