Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at Tue May 11 18:58:32 CEST 2010. -------- --- autofs/autofs.changes 2010-02-24 16:53:07.000000000 +0100 +++ /mounts/work_src_done/STABLE/autofs/autofs.changes 2010-05-11 01:29:55.000000000 +0200 @@ -1,0 +2,17 @@ +Mon May 10 23:26:47 UTC 2010 - lchiquitto@novell.com + +- init script: improve stop routine to avoid problems on restart + (bnc#604497) + +------------------------------------------------------------------- +Wed Mar 31 18:02:13 UTC 2010 - lchiquitto@novell.com + +- update 5.0.5 upstream patches to 20100326: + * fix reconnect get base dn + * add missing sasl mutex callbacks + * fix get query dn failure + * fix ampersand escape in auto.smb + * add locality as valid ldap master map attribute + * add locality as valid ldap master map attribute fix + +------------------------------------------------------------------- @@ -12 +29 @@ - be linked against krb5 (bnc#572934, bnc#578655). + be linked against krb5 (bnc#572934, bnc#578655) calling whatdependson for head-i586 Old: ---- autofs-5.0.5-upstream-patches-20100201.bz2 New: ---- autofs-5.0.5-upstream-patches-20100326.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.nCgMD8/_old 2010-05-11 17:18:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nCgMD8/_new 2010-05-11 17:18:54.000000000 +0200 @@ -20,12 +20,13 @@ Name: autofs Url: http://www.kernel.org/pub/linux/daemons/autofs/v5/ -BuildRequires: bison e2fsprogs flex krb5-devel libxml2-devel module-init-tools nfs-client openldap2-devel +BuildRequires: bison e2fsprogs flex module-init-tools nfs-client +BuildRequires: krb5-devel libxml2-devel openldap2-devel License: GPLv2+ Group: System/Daemons AutoReqProv: on Version: 5.0.5 -Release: 3 +Release: 4 Summary: A Kernel-Based Automounter BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 @@ -35,7 +36,7 @@ Source5: README.SuSE Source7: NetworkManager-autofs Source8: get-upstream-patches -%define patchdate 20100201 +%define patchdate 20100326 Patch0: autofs-%{version}-upstream-patches-%{patchdate}.bz2 Patch10: autofs-suse-auto_master_default.patch Patch11: autofs-suse-autofs_init.patch @@ -46,11 +47,10 @@ Recommends: nfs-client %description -Autofs is a kernel-based automounter for Linux. It is still under -development, although the features currently implemented seem to work -well. There is nowhere near enough documentation available yet. Help -in getting some written would be appreciated. This package replaces the -amd package. +AutoFS is a kernel-based automounter for Linux. It automatically +mounts filesystems when you use them, and unmounts them later when +you are not using them. This can include network filesystems, CD-ROMs, +floppies, and so forth. @@ -122,37 +122,14 @@ %dir /etc/NetworkManager %dir /etc/NetworkManager/dispatcher.d /etc/NetworkManager/dispatcher.d/autofs -/usr/sbin/rcautofs %doc COPYRIGHT README README.changer README.ncpfs README.replicated-server %doc README.smbfs README.v5.release autofs.schema README.active-restart %doc README.SuSE README.SuSE.ldap %dir %{_libdir}/autofs/ -%{_libdir}/autofs/lookup_file.so -%{_libdir}/autofs/lookup_files.so -%{_libdir}/autofs/lookup_hosts.so -%{_libdir}/autofs/lookup_ldap.so -%{_libdir}/autofs/lookup_ldaps.so -%{_libdir}/autofs/lookup_multi.so -%{_libdir}/autofs/lookup_nis.so -%{_libdir}/autofs/lookup_nisplus.so -%{_libdir}/autofs/lookup_program.so -%{_libdir}/autofs/lookup_userhome.so -%{_libdir}/autofs/lookup_yp.so -%{_libdir}/autofs/mount_afs.so -%{_libdir}/autofs/mount_autofs.so -%{_libdir}/autofs/mount_bind.so -%{_libdir}/autofs/mount_changer.so -%{_libdir}/autofs/mount_ext2.so -%{_libdir}/autofs/mount_ext3.so -%if %suse_version >= 1120 -%{_libdir}/autofs/mount_ext4.so -%endif -%{_libdir}/autofs/mount_generic.so -%{_libdir}/autofs/mount_nfs.so -%{_libdir}/autofs/mount_nfs4.so -%{_libdir}/autofs/parse_sun.so +%{_libdir}/autofs/ %{_mandir}/man5/* %{_mandir}/man8/* -/usr/sbin/automount +%{_sbindir}/rcautofs +%{_sbindir}/automount %changelog ++++++ autofs-suse-autofs_init.patch ++++++ --- /var/tmp/diff_new_pack.nCgMD8/_old 2010-05-11 17:18:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nCgMD8/_new 2010-05-11 17:18:54.000000000 +0200 @@ -2,15 +2,15 @@ =================================================================== --- autofs-5.0.5.orig/samples/rc.autofs.in +++ autofs-5.0.5/samples/rc.autofs.in -@@ -1,20 +1,33 @@ +@@ -1,20 +1,34 @@ #!/bin/bash -+# Copyright (C) 2008 SUSE Linux Products GmbH, Nuernberg, Germany. # -# rc file for automount using a Sun-style "master map". -# -# On most distributions, this file should be called: -# /etc/rc.d/init.d/autofs or /etc/init.d/autofs or /etc/rc.d/rc.autofs --# ++# Copyright (C) 2010 SUSE Linux Products GmbH, Nuernberg, Germany. + # +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or @@ -48,7 +48,7 @@ # # Location of the automount daemon and the init directory # -@@ -23,37 +36,35 @@ prog=`basename $DAEMON` +@@ -23,37 +37,35 @@ prog=`basename $DAEMON` MODULE="autofs4" DEVICE="autofs" confdir=@@autofsconfdir@@ @@ -64,7 +64,7 @@ + # -# load customized configuation settings -+# load customized configuration settings ++# Load customized configuration settings # if [ -r $confdir/autofs ]; then . $confdir/autofs @@ -89,15 +89,16 @@ fi - elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4] - then +- # wrong autofs filesystem module loaded + elif ([ -f /proc/modules ] && lsmod) | grep -q autofs[^4]; then - # wrong autofs filesystem module loaded ++ # Wrong autofs filesystem module loaded echo - echo "Error: autofs kernel module is loaded, autofs4 required" + echo "Error: autofs kernel module is loaded, $MODULE required" return 1 fi -@@ -75,79 +86,85 @@ function start() { +@@ -75,79 +87,86 @@ function start() { fi fi @@ -129,14 +130,14 @@ - echo "failed." - fi - return $RETVAL -+ return $? - } - +-} +- -function restart() { - stop - start --} -- ++ return $? + } + -function reload() { - pid=`pidof $prog` - if [ -z $pid ]; then @@ -149,8 +150,9 @@ - fi - return $RETVAL +function stop() { -+ # Normal stop, terminate daemon, we don't care about busy leftovers here -+ /sbin/killproc -p $PIDFILE -TERM $DAEMON ++ # Send SIGTERM first and set a maximum wait time of 45 seconds ++ # before sending SIGKILL ++ /sbin/killproc -t 45 -p $PIDFILE $DAEMON } RETVAL=0 ++++++ get-upstream-patches ++++++ --- /var/tmp/diff_new_pack.nCgMD8/_old 2010-05-11 17:18:54.000000000 +0200 +++ /var/tmp/diff_new_pack.nCgMD8/_new 2010-05-11 17:18:54.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/bash # get autofs upstream patched from -# http://www.fht.lkams.kernel.org/pub/linux/daemons/autofs/v5/ +# http://www.kernel.org/pub/linux/daemons/autofs/v5/ # and cat them in one bzipped file # autofs-$VERSION-upstream-patches-$DATE # where DATE is the date of the top patch in the series ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org