Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2012-10-22 21:44:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autofs", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2012-10-07 18:53:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2012-10-22 21:44:49.000000000 +0200 @@ -1,0 +2,33 @@ +Fri Oct 19 12:56:57 UTC 2012 - [email protected] + +- autofs-5.0.7-upstream-patches-20121018.bz2: update 5.0.7 upstream + patches to 20121018, fixing some bugs: + * fix recursive mount deadlock + * increase file map read buffer size + * handle new location of systemd +- remove patches that are now upstream: + * autofs-5.0.7-handle-new-location-of-systemd.patch + +------------------------------------------------------------------- +Wed Oct 17 11:49:11 UTC 2012 - [email protected] + +- rpm spec: don't try to build with udisks support on old versions + of the distribution + +------------------------------------------------------------------- +Wed Oct 17 11:16:44 UTC 2012 - [email protected] + +- autofs-5.0.7-upstream-patches-20121016.bz2: update 5.0.7 upstream + patches to 20121016, fixing some bugs: + * add timeout option description to man page + * fix null map entry order handling + * make description of default MOUNT_WAIT setting clear + * configure.in: allow cross compilation + * README: update mailing list subscription info + +------------------------------------------------------------------- +Wed Oct 17 09:07:35 UTC 2012 - [email protected] + +- autofs-systemd-path.patch: handle new location of systemd + +------------------------------------------------------------------- @@ -4 +37 @@ -- Make it possible to use tmpfs nbased parents for autofs mount points +- Make it possible to use tmpfs based parents for autofs mount points Old: ---- autofs-5.0.7-upstream-patches-20120911.bz2 New: ---- autofs-5.0.7-upstream-patches-20121018.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.WJ0h3O/_old 2012-10-22 21:44:51.000000000 +0200 +++ /var/tmp/diff_new_pack.WJ0h3O/_new 2012-10-22 21:44:51.000000000 +0200 @@ -22,6 +22,12 @@ %define with_systemd 0 %endif +%if 0%{?suse_version} >= 1140 +%define with_udisks 1 +%else +%define with_udisks 0 +%endif + Name: autofs Url: http://www.kernel.org/pub/linux/daemons/autofs/v5/ BuildRequires: autoconf @@ -36,7 +42,9 @@ BuildRequires: nfs-client BuildRequires: openldap2-devel BuildRequires: pkg-config +%if %{with_udisks} BuildRequires: udisks-devel +%endif %if %{with_systemd} BuildRequires: systemd %endif @@ -58,7 +66,7 @@ Source42: org.freedesktop.AutoMount.conf Source100: autofs-rpmlintrc # Upstream patches that will be in the next release -%define patchdate 20120911 +%define patchdate 20121018 Patch0: autofs-%{version}-upstream-patches-%{patchdate}.bz2 # PATCH-FIX-OPENSUSE autofs-5.0.7-revert-fix-libtirpc-name-clash.patch Patch1: autofs-5.0.7-revert-fix-libtirpc-name-clash.patch @@ -71,8 +79,9 @@ # PATCH-FIX-OPENSUSE autofs-suse-build.patch Patch101: autofs-suse-build.patch # PATCH-EXTEND-OPENSUSE autofs-5.0.6-dbus-udisks-monitor.patch -Patch42: autofs-5.0.6-dbus-udisks-monitor.patch -Patch43: autofs-5.0.7-eaccess.patch +Patch102: autofs-5.0.6-dbus-udisks-monitor.patch +# PATCH-EXTEND-OPENSUSE autofs-5.0.7-eaccess.patch +Patch103: autofs-5.0.7-eaccess.patch Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq Requires(pre): aaa_base @@ -99,10 +108,11 @@ %patch82 -p1 %patch100 -p1 %patch101 -p1 -%patch42 -p0 -b .udisks -%patch43 -p0 -b .eaccess +%patch102 -p0 -b .udisks +%patch103 -p0 -b .eaccess %build + SUSE_ASNEEDED=0 %configure %{_target_cpu}-suse-linux \ --libdir=%{_libdir} --mandir=%{_mandir} \ ++++++ autofs-5.0.6-dbus-udisks-monitor.patch ++++++ --- /var/tmp/diff_new_pack.WJ0h3O/_old 2012-10-22 21:44:51.000000000 +0200 +++ /var/tmp/diff_new_pack.WJ0h3O/_new 2012-10-22 21:44:51.000000000 +0200 @@ -1,6 +1,8 @@ ---- Makefile.conf.in -+++ Makefile.conf.in 2012-08-24 08:51:28.964509714 +0000 -@@ -40,6 +40,9 @@ KRB5_FLAGS=@KRB5_FLAGS@ +Index: Makefile.conf.in +=================================================================== +--- Makefile.conf.in.orig ++++ Makefile.conf.in +@@ -42,6 +42,9 @@ KRB5_FLAGS=@KRB5_FLAGS@ # NIS+ support: yes (1) no (0) NISPLUS = @HAVE_NISPLUS@ @@ -10,8 +12,10 @@ # SMBFS support: yes (1) no (0) SMBFS = @HAVE_SMBMOUNT@ ---- daemon/automount.c -+++ daemon/automount.c 2012-09-20 12:27:42.479507026 +0000 +Index: daemon/automount.c +=================================================================== +--- daemon/automount.c.orig ++++ daemon/automount.c @@ -120,7 +120,8 @@ static int do_mkdir(const char *parent, status = -1; if (*parent) @@ -22,8 +26,10 @@ contained_in_local_fs(path)) { if (mkdir(path, mode) == -1) { errno = EACCES; ---- daemon/lookup.c -+++ daemon/lookup.c 2012-08-24 08:51:29.116509641 +0000 +Index: daemon/lookup.c +=================================================================== +--- daemon/lookup.c.orig ++++ daemon/lookup.c @@ -175,6 +175,8 @@ int lookup_nss_read_master(struct master !strncmp(name, "yp:", 3) || !strncmp(name, "nis:", 4) || @@ -33,8 +39,10 @@ !strncmp(name, "ldap:", 5) || !strncmp(name, "ldaps:", 6) || !strncmp(name, "sss:", 4) || ---- include/automount.h -+++ include/automount.h 2012-09-20 12:39:15.811007350 +0000 +Index: include/automount.h +=================================================================== +--- include/automount.h.orig ++++ include/automount.h @@ -23,6 +23,7 @@ #include "list.h" @@ -59,8 +67,10 @@ /* This sould be enough for at least 20 host aliases */ #define HOST_ENT_BUF_SIZE 2048 ---- include/lookup_udisks.h -+++ include/lookup_udisks.h 2012-08-24 08:51:29.208510764 +0000 +Index: include/lookup_udisks.h +=================================================================== +--- /dev/null ++++ include/lookup_udisks.h @@ -0,0 +1,381 @@ +/* + * loopup_udisks.h - Header file for lookup_udisks automount module @@ -434,7 +444,7 @@ + +typedef enum { + AutofsUdisks = 0, -+ MountOptions, ++ MountOptions, + Common, + DiskById, + DiskByLabel, @@ -443,9 +453,11 @@ +} cnfxml_t; + +#endif ---- lib/master_tok.l -+++ lib/master_tok.l 2012-08-24 08:54:06.826465461 +0000 -@@ -118,7 +118,7 @@ DNNAMESTR2 ([[:alnum:]_\.\-]+) +Index: lib/master_tok.l +=================================================================== +--- lib/master_tok.l.orig ++++ lib/master_tok.l +@@ -119,7 +119,7 @@ DNNAMESTR2 ([[:alnum:]_.\-]+) INTMAP (-hosts|-null) MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS})) MULTISEP ([\-]{2}[[:blank:]]+) @@ -454,8 +466,10 @@ OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS}) ---- lib/parse_subs.c -+++ lib/parse_subs.c 2012-08-24 08:51:29.476561375 +0000 +Index: lib/parse_subs.c +=================================================================== +--- lib/parse_subs.c.orig ++++ lib/parse_subs.c @@ -31,6 +31,8 @@ static struct types map_type[] = { { "yp", 2 }, { "nis", 3 }, @@ -465,8 +479,10 @@ { "ldap", 4 }, { "ldaps", 5 }, { "hesiod", 6 }, ---- man/autofs.udisks.5.in -+++ man/autofs.udisks.5.in 2012-08-24 08:51:29.568511634 +0000 +Index: man/autofs.udisks.5.in +=================================================================== +--- /dev/null ++++ man/autofs.udisks.5.in @@ -0,0 +1,121 @@ +.\" t +.TH AUTOFS.UDISKS 5 "22 Aug 2012" @@ -589,8 +605,10 @@ +.BR udisks\-daemon (8) +.SH AUTHOR +This manual page was written by Werner Fink <[email protected]>. ---- modules/Makefile -+++ modules/Makefile 2012-08-24 08:51:29.652961050 +0000 +Index: modules/Makefile +=================================================================== +--- modules/Makefile.orig ++++ modules/Makefile @@ -53,6 +53,14 @@ ifeq ($(SSSD), 1) MODS += lookup_sss.so endif @@ -617,8 +635,10 @@ mount_nfs.so: mount_nfs.c replicated.o $(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) ---- modules/lookup_multi.c -+++ modules/lookup_multi.c 2012-08-24 08:51:29.760510295 +0000 +Index: modules/lookup_multi.c +=================================================================== +--- modules/lookup_multi.c.orig ++++ modules/lookup_multi.c @@ -56,6 +56,8 @@ static struct lookup_mod *nss_open_looku if (!strncmp(argv[0], "file", 4) || !strncmp(argv[0], "yp", 2) || @@ -628,11 +648,13 @@ !strncmp(argv[0], "nis", 3) || !strncmp(argv[0], "ldaps", 5) || !strncmp(argv[0], "ldap", 4)) { ---- modules/lookup_udisks.c -+++ modules/lookup_udisks.c 2012-08-24 09:27:20.912065333 +0000 +Index: modules/lookup_udisks.c +=================================================================== +--- /dev/null ++++ modules/lookup_udisks.c @@ -0,0 +1,2441 @@ +/* -+ * lookup_udisks.c - Module for Linux automount to access removable devices ++ * lookup_udisks.c - Module for Linux automount to access removable devices + * listed by the dbus based udisks-daemon + * + * Copyright 2012 SuSE LINUX Products GmbH - All Rights Reserved @@ -1589,7 +1611,7 @@ + err: + warn(LOGOPT_NONE, MODPREFIX "udisks reply type `%c' not handled", type); + break; -+ } ++ } + } while (dbus_message_iter_next(iter)); +} + @@ -3072,8 +3094,10 @@ +out: + return ret; +} ---- modules/parse_sun.c -+++ modules/parse_sun.c 2012-08-24 08:51:29.952509740 +0000 +Index: modules/parse_sun.c +=================================================================== +--- modules/parse_sun.c.orig ++++ modules/parse_sun.c @@ -880,6 +880,7 @@ static int validate_location(unsigned in ((esc = strchr(ptr, '\\')) && *(esc + 1) == ':') || !strncmp(ptr, "file:", 5) || !strncmp(ptr, "yp:", 3) || @@ -3082,8 +3106,10 @@ !strncmp(ptr, "ldap:", 5) || !strncmp(ptr, "ldaps:", 6) || !strncmp(ptr, "sss:", 4) || !strncmp(ptr, "dir:", 4)) return 1; ---- samples/autofs.udisks -+++ samples/autofs.udisks 2012-08-24 08:51:30.060061959 +0000 +Index: samples/autofs.udisks +=================================================================== +--- /dev/null ++++ samples/autofs.udisks @@ -0,0 +1,28 @@ +<?xml version="1.0" ?> +<!-- ++++++ autofs-5.0.7-eaccess.patch ++++++ --- /var/tmp/diff_new_pack.WJ0h3O/_old 2012-10-22 21:44:51.000000000 +0200 +++ /var/tmp/diff_new_pack.WJ0h3O/_new 2012-10-22 21:44:51.000000000 +0200 @@ -1,5 +1,7 @@ ---- daemon/automount.c -+++ daemon/automount.c 2012-09-20 12:27:42.479507026 +0000 +Index: daemon/automount.c +=================================================================== +--- daemon/automount.c.orig ++++ daemon/automount.c @@ -107,9 +107,9 @@ static int do_mkdir(const char *parent, /* If path exists we're done */ status = stat(path, &st); ++++++ autofs-5.0.7-revert-fix-libtirpc-name-clash.patch ++++++ --- /var/tmp/diff_new_pack.WJ0h3O/_old 2012-10-22 21:44:51.000000000 +0200 +++ /var/tmp/diff_new_pack.WJ0h3O/_new 2012-10-22 21:44:51.000000000 +0200 @@ -39,7 +39,7 @@ =================================================================== --- autofs-5.0.7.orig/CHANGELOG +++ autofs-5.0.7/CHANGELOG -@@ -59,7 +59,6 @@ +@@ -66,7 +66,6 @@ - fix kernel verion check of version components. - dont retry ldap connect if not required. - fix initialization in rpc create_client(). -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
