[arch-commits] Commit in autofs/repos (7 files)
Giovanni Scafora
giovanni at archlinux.org
Mon Mar 16 21:48:10 UTC 2009
Date: Monday, March 16, 2009 @ 17:48:10
Author: giovanni
Revision: 30167
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-x86_64/heimdal.patch
(from rev 30166, autofs/trunk/heimdal.patch)
Modified:
autofs/repos/extra-x86_64/ (properties)
autofs/repos/extra-x86_64/PKGBUILD
autofs/repos/extra-x86_64/auto.master
autofs/repos/extra-x86_64/auto.misc
autofs/repos/extra-x86_64/auto.net
autofs/repos/extra-x86_64/autofs
---------------+
PKGBUILD | 57 ++++++++++++++++++++++++++++++--------------------------
auto.master | 4 +--
auto.misc | 10 ++++-----
auto.net | 2 -
autofs | 18 +++++++++++------
heimdal.patch | 34 +++++++++++++++++++++++++++++++++
6 files changed, 85 insertions(+), 40 deletions(-)
Property changes on: autofs/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /autofs/trunk:1
+ /autofs/trunk:1-30166
Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2009-03-16 21:44:38 UTC (rev 30166)
+++ extra-x86_64/PKGBUILD 2009-03-16 21:48:10 UTC (rev 30167)
@@ -1,48 +1,53 @@
# $Id$
-# Maintainer: Dale Blount <dale at archlinux.org>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
# Contributor: Manolis Tzanidakis
pkgname=autofs
pkgver=4.1.4
-pkgrel=4
+pkgrel=6
pkgdesc="A kernel-based automounter for Linux."
-arch=(i686 x86_64)
-url="ftp://ftp.kernel.org/pub/linux/daemons/autofs"
+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
auto.misc
auto.net)
-md5sums=('7e3949114c00665b4636f0c318179657' '80b77182aa957646a2074433d3890518'\
- 'ddd69346754419faee15fc4c7edeb8b8' '0543a0d172eaec300e8d08708440dd4b'\
- '0be409ef0cdf0255ce701ed4ba9e46b5' 'e4d945d63abc0488a47a5e2a750e8c3b')
+md5sums=('7e3949114c00665b4636f0c318179657'
+ '4eec0f479d5a85ca9ca515fd41937a4e'
+ 'ddd69346754419faee15fc4c7edeb8b8'
+ '2fd068c5b84a3f408670fe23afd34759'
+ '6d84d7ea43cdf092c64956f8cf4977f9'
+ '74d102e637e53050ef095f1cbd9d461b')
build() {
export MAKEFLAGS="-j1"
- cd ${startdir}/src/${pkgname}-${pkgver}
- /bin/sed -i "s:-O3 -fomit-frame-pointer -Wall:${CFLAGS}:" \
- Makefile.rules
- /bin/sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
- Makefile.rules
- ./configure --prefix=/usr --sysconfdir=/etc/autofs
- /usr/bin/make || return 1
- /usr/bin/make INSTALLROOT=${startdir}/pkg install
+
+ cd ${srcdir}/${pkgname}-${pkgver}
+ sed -i "s:-O3 -fomit-frame-pointer -Wall:${CFLAGS}:" \
+ Makefile.rules
+ sed -i "s:SUBDIRS = lib daemon modules man samples:SUBDIRS = lib daemon modules man:" \
+ Makefile.rules
+ ./configure --prefix=/usr --sysconfdir=/etc/autofs --mandir=/usr/share/man
+ make || return 1
+ make INSTALLROOT=${pkgdir} install
local conf_file
for conf_file in auto.{master,misc}; do
- /bin/install -D -m 644 ${startdir}/$conf_file \
- ${startdir}/pkg/etc/autofs/$conf_file
+ install -D -m 644 ${srcdir}/$conf_file \
+ ${pkgdir}/etc/autofs/$conf_file
done
- /bin/install -m 755 ${startdir}/auto.net \
- ${startdir}/pkg/etc/autofs/auto.net
- /bin/sed -i "s:/etc:/etc/autofs:g" \
- ${startdir}/pkg/usr/man/man5/auto.master.5
- /bin/install -D -m 755 ${startdir}/autofs ${startdir}/pkg/etc/rc.d/autofs
- /bin/install -D -m 644 ${startdir}/autofs.conf.d \
- ${startdir}/pkg/etc/conf.d/autofs
+ 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
+ install -D -m 755 ${srcdir}/autofs ${pkgdir}/etc/rc.d/autofs
+ install -D -m 644 ${srcdir}/autofs.conf.d \
+ ${pkgdir}/etc/conf.d/autofs
}
-# vim: ts=2 sw=2 et ft=sh
Modified: extra-x86_64/auto.master
===================================================================
--- extra-x86_64/auto.master 2009-03-16 21:44:38 UTC (rev 30166)
+++ extra-x86_64/auto.master 2009-03-16 21:48:10 UTC (rev 30167)
@@ -3,5 +3,5 @@
# mountpoint map options
# For details of the format look at autofs(5).
-/var/autofs/misc /etc/autofs/auto.misc
-/var/autofs/net /etc/autofs/auto.net
+/var/autofs/misc /etc/autofs/auto.misc
+/var/autofs/net /etc/autofs/auto.net
Modified: extra-x86_64/auto.misc
===================================================================
--- extra-x86_64/auto.misc 2009-03-16 21:44:38 UTC (rev 30166)
+++ extra-x86_64/auto.misc 2009-03-16 21:48:10 UTC (rev 30167)
@@ -2,8 +2,8 @@
# key [ -mount-options-separated-by-comma ] location
# Details may be found in the autofs(5) manpage
-kernel -ro ftp.kernel.org:/pub/linux
-boot -fstype=ext2 :/dev/hda1
-removable -fstype=ext2 :/dev/hdd
-cd -fstype=iso9660,ro :/dev/hdc
-floppy -fstype=auto :/dev/fd0
+#kernel -ro ftp.kernel.org:/pub/linux
+#boot -fstype=ext2 :/dev/hda1
+usbstick -fstype=auto,async,nodev,nosuid,umask=000 :/dev/sda1
+cdrom -fstype=iso9660,ro :/dev/cdrom
+#floppy -fstype=auto :/dev/fd0
\ No newline at end of file
Modified: extra-x86_64/auto.net
===================================================================
--- extra-x86_64/auto.net 2009-03-16 21:44:38 UTC (rev 30166)
+++ extra-x86_64/auto.net 2009-03-16 21:48:10 UTC (rev 30167)
@@ -21,7 +21,7 @@
# Newer distributions get this right
SHOWMOUNT="/usr/sbin/showmount --no-headers -e $key"
-$SHOWMOUNT | LC_ALL=C sort +0 | \
+$SHOWMOUNT | LC_ALL=C sort -k 1 | \
awk -v key="$key" -v opts="$opts" -- '
BEGIN { ORS=""; first=1 }
{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
Modified: extra-x86_64/autofs
===================================================================
--- extra-x86_64/autofs 2009-03-16 21:44:38 UTC (rev 30166)
+++ extra-x86_64/autofs 2009-03-16 21:48:10 UTC (rev 30167)
@@ -277,23 +277,29 @@
FS="="
daemon_opts[ "timeout" ] = "timeout"
daemon_opts[ "t" ] = "timeout"
+ daemon_opts[ "ghost" ] = "ghost"
+ daemon_opts[ "g" ] = "ghost"
}
{
if ( $0 ~ /^$/ )
next
if ( $1 in daemon_opts ) {
daemon[ daemon_opts[ $1 ] ] = $2
- } else if ($1 ~ /^D.+/) {
- defines[ $1 ] = $2
- } else {
- mount[NR] = $0
+ } else if ($1 ~ /^D.+/) {
+ defines[ $1 ] = $2
+ } else {
+ mount[NR] = $0
}
}
END {
if ( which ~ "^daemon$" ) {
- if ( "timeout" in daemon ) {
- printf "--timeout=%s\n", daemon["timeout"]
+ for ( parameter in daemon ) {
+ if ( daemon[ parameter ] ~ /^$/ )
+ printf "--%s ", parameter
+ else
+ printf "--%s=%s ", parameter, daemon[ parameter ]
}
+ printf "\n"
} else {
for ( a in defines ) {
printf "-%s=%s ", a, defines[a]
Copied: autofs/repos/extra-x86_64/heimdal.patch (from rev 30166, autofs/trunk/heimdal.patch)
===================================================================
--- extra-x86_64/heimdal.patch (rev 0)
+++ extra-x86_64/heimdal.patch 2009-03-16 21:48:10 UTC (rev 30167)
@@ -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,
More information about the arch-commits
mailing list