Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2021-05-02 18:35:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autofs" Sun May 2 18:35:16 2021 rev:124 rq:889569 version:5.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2020-12-05 20:35:10.218586243 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new.1947/autofs.changes 2021-05-02 18:35:25.489124531 +0200 @@ -1,0 +2,84 @@ +Thu Apr 22 14:43:15 UTC 2021 - Goldwyn Rodrigues <[email protected]> + +- Upgrade to 5.1.7 + - make bind mounts propagation slave by default. + - update ldap READMEs and schema definitions. + - fix program map multi-mount lookup after mount fail. + - fix browse dir not re-created on symlink expire. + - fix a regression with map instance lookup. + - correct fsf address. + - samples: fix Makefile targets' directory dependencies + - remove intr hosts map mount option. + - fix trailing dollar sun entry expansion. + - initialize struct addrinfo for getaddrinfo() calls. + - fix quoted string length calc in expandsunent(). + - fix autofs mount options construction. + - mount_nfs.c fix local rdma share not mounting. + - configure.in: Remove unneeded second call to PKG_PROG_PKG_CONFIG. + - configure.in: Do not append parentheses to PKG_PROG_PKG_CONFIG. + - Use PKG_CHECK_MODULES to detect the libxml2 library. + - fix ldap sasl reconnect problem. + - samples/ldap.schema fix. + - fix configure force shutdown check. + - fix crash in sun_mount(). + - fix lookup_nss_read_master() nsswicth check return. + - fix typo in open_sss_lib(). + - fix sss_master_map_wait timing. + - add sss ECONREFUSED return handling. + - use mapname in sss context for setautomntent(). + - add support for new sss autofs proto version call. + - fix retries check in setautomntent_wait(). + - refactor sss setautomntent(). + - improve sss setautomntent() error handling. + - refactor sss getautomntent(). + - improve sss getautomntent() error handling. + - sss introduce calculate_retry_count() function. + - move readall into struct master. + - sss introduce a flag to indicate map being read. + - update sss timeout documentation. + - refactor sss getautomntbyname(). + - improve sss getautomntbyname() error handling. + - use a valid timeout in lookup_prune_one_cache(). + - dont prune offset map entries. + - simplify sss source stale check. + - include linux/nfs.h directly in rpc_subs.h. + - fix typo in daemon/automount.c. + - fix direct mount unlink_mount_tree() path. + - fix unlink mounts umount order. + - fix incorrect logical compare in unlink_mount_tree(). + - use bit flag for force unlink mounts. + - improve force unlink option description. + - remove command fifo on autofs mount fail. + - add force unlink mounts and exit option. + - cleanup stale logpri fifo pipes on unlink and exit. + - fix incorrect systemctl command syntax in autofs(8). + - update list.h. + - add hashtable implementation. + - change mountpoint to mp in struct ext_mount. + - make external mounts independent of amd_entry. + - make external mounts use simpler hashtable. + - add a hash index to mnt_list. + - use mnt_list for submounts. + - use mnt_list for amdmounts. + - make umount_autofs() static. + - remove force parameter from umount_all(). + - fix remount expire. + - fix stale offset directories disable mount. + - use struct mnt_list to track mounted mounts. + - use struct mnt_list mounted list for expire. + - remove unused function tree_get_mnt_list(). + - only add expre alarm for active mounts. + - move submount check into conditional_alarm_add(). + - move lib/master.c to daemon/master.c. + - use master_list_empty() for list empty check. + - add helper to construct mount point path. + - check defaults_read_config() return. + - move AUTOFS_LIB to end of build rule lines. + - make autofs.a a shared library. + - make lookup_file.c nss map read status return handling consistent. + - fix empty mounts list return from unlink_mount_tree(). +- Refreshed autofs-5.1.1-dbus-udisks-monitor.patch +- Replaced automount-fix-master-wait.patch with upstream patch + autofs-5.1.7-Fix-option-for-master_read_wait.patch + +------------------------------------------------------------------- Old: ---- autofs-5.1.6.tar.sign autofs-5.1.6.tar.xz automount-fix-master-wait.patch New: ---- autofs-5.1.7-Fix-option-for-master_read_wait.patch autofs-5.1.7.tar.sign autofs-5.1.7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.F449MB/_old 2021-05-02 18:35:26.861118684 +0200 +++ /var/tmp/diff_new_pack.F449MB/_new 2021-05-02 18:35:26.865118667 +0200 @@ -1,7 +1,7 @@ # # spec file for package autofs # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -61,7 +61,7 @@ BuildRequires: pkgconfig(udisks2) %endif BuildRequires: pkgconfig(libsystemd) -Version: 5.1.6 +Version: 5.1.7 Release: 0 Summary: A Kernel-Based Automounter License: GPL-2.0-or-later @@ -89,7 +89,7 @@ Patch105: autofs-5-1-3-fix-unset-tsd-group-name-handling.patch # bsc#1175238 - Use /usr/etc/nsswitch.conf if /etc/nsswitch.conf is not available Patch106: autofs-nsswitch-usr-etc.patch -Patch107: automount-fix-master-wait.patch +Patch107: autofs-5.1.7-Fix-option-for-master_read_wait.patch Requires(pre): %fillup_prereq Requires(pre): aaa_base BuildRequires: systemd-rpm-macros @@ -182,6 +182,7 @@ %doc README.smbfs README.v5.release autofs.schema README.active-restart %doc README.SUSE README.SUSE.ldap %dir %{_libdir}/autofs/ +%{_libdir}/libautofs.so %{_libdir}/autofs/ %{_mandir}/man5/* %{_mandir}/man8/* ++++++ autofs-5.1.1-dbus-udisks-monitor.patch ++++++ --- /var/tmp/diff_new_pack.F449MB/_old 2021-05-02 18:35:26.909118480 +0200 +++ /var/tmp/diff_new_pack.F449MB/_new 2021-05-02 18:35:26.909118480 +0200 @@ -1,8 +1,8 @@ --- Makefile.conf.in | 3 daemon/lookup.c | 4 + daemon/master_tok.l | 2 include/lookup_udisks.h | 381 +++++++ - lib/master_tok.l | 2 lib/parse_subs.c | 2 man/autofs.udisks.5.in | 121 ++ modules/Makefile | 12 @@ -14,7 +14,7 @@ --- a/Makefile.conf.in +++ b/Makefile.conf.in -@@ -40,6 +40,9 @@ KRB5_FLAGS=@KRB5_FLAGS@ +@@ -46,6 +46,9 @@ # NIS+ support: yes (1) no (0) NISPLUS = @HAVE_NISPLUS@ @@ -26,7 +26,7 @@ --- a/daemon/lookup.c +++ b/daemon/lookup.c -@@ -239,6 +239,10 @@ int lookup_nss_read_master(struct master +@@ -198,6 +198,10 @@ (name[3] == ',' || name[3] == ':')) || (!strncmp(name, "nisplus", 7) && (name[7] == ',' || name[7] == ':')) || @@ -37,6 +37,17 @@ (!strncmp(name, "ldap", 4) && (name[4] == ',' || name[4] == ':')) || (!strncmp(name, "ldaps", 5) && +--- a/daemon/master_tok.l ++++ b/daemon/master_tok.l +@@ -120,7 +120,7 @@ + INTMAP (-hosts|-null) + MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS})) + MULTISEP ([\-]{2}[[:blank:]]+) +-MTYPE ((file|program|exec|sss|yp|nis|nisplus|ldap|ldaps|hesiod|userdir)(,(sun|hesiod|amd))?(:{OPTWS}|{WS})) ++MTYPE ((file|program|exec|sss|yp|nis|nisplus|udisks|udisks2|ldap|ldaps|hesiod|userdir)(,(sun|hesiod|amd))?(:{OPTWS}|{WS})) + + + OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS}) --- /dev/null +++ b/include/lookup_udisks.h @@ -0,0 +1,381 @@ @@ -421,20 +432,9 @@ +} cnfxml_t; + +#endif ---- a/lib/master_tok.l -+++ b/lib/master_tok.l -@@ -119,7 +119,7 @@ DNNAMESTR2 ([[:alnum:]_.\-]+) - INTMAP (-hosts|-null) - MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS})) - MULTISEP ([\-]{2}[[:blank:]]+) --MTYPE ((file|program|exec|sss|yp|nis|nisplus|ldap|ldaps|hesiod|userdir)(,(sun|hesiod|amd))?(:{OPTWS}|{WS})) -+MTYPE ((file|program|exec|sss|yp|nis|nisplus|udisks|udisks2|ldap|ldaps|hesiod|userdir)(,(sun|hesiod|amd))?(:{OPTWS}|{WS})) - - - OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS}) --- a/lib/parse_subs.c +++ b/lib/parse_subs.c -@@ -98,6 +98,8 @@ static struct types map_type[] = { +@@ -98,6 +98,8 @@ { "yp", 2 }, { "nis", 3 }, { "nisplus", 7 }, @@ -569,7 +569,7 @@ +This manual page was written by Werner Fink <[email protected]>. --- a/modules/Makefile +++ b/modules/Makefile -@@ -62,6 +62,14 @@ ifeq ($(SSSD), 1) +@@ -62,6 +62,14 @@ MODS += lookup_sss.so endif @@ -584,8 +584,8 @@ CFLAGS += -I../include -I../lib -fPIC -D_GNU_SOURCE CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\" -@@ -133,6 +141,10 @@ lookup_ldap.so: lookup_ldap.c dclist.o b - $(LDFLAGS) $(AUTOFS_LIB) $(LIBLDAP) $(LIBRESOLV) $(LIBS) +@@ -143,6 +151,10 @@ + $(LDFLAGS) $(LIBLDAP) $(LIBRESOLV) $(LIBS) $(AUTOFS_LIB_LINK) $(STRIP) lookup_ldap.so +lookup_udisks.so: lookup_udisks.c ../include/lookup_udisks.h @@ -594,10 +594,10 @@ + mount_nfs.so: mount_nfs.c replicated.o $(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ - mount_nfs.c replicated.o $(LDFLAGS) $(AUTOFS_LIB) $(LIBS) + mount_nfs.c replicated.o $(LDFLAGS) $(LIBS) $(AUTOFS_LIB_LINK) --- a/modules/lookup_multi.c +++ b/modules/lookup_multi.c -@@ -56,6 +56,8 @@ static struct lookup_mod *nss_open_looku +@@ -189,6 +189,8 @@ if (!strncmp(argv[0], "file", 4) || !strncmp(argv[0], "yp", 2) || !strncmp(argv[0], "nisplus", 7) || @@ -3060,7 +3060,7 @@ +} --- a/modules/parse_sun.c +++ b/modules/parse_sun.c -@@ -847,6 +847,7 @@ static int validate_location(unsigned in +@@ -901,6 +901,7 @@ ((esc = strchr(ptr, '\\')) && *(esc + 1) == ':') || !strncmp(ptr, "file:", 5) || !strncmp(ptr, "yp:", 3) || !strncmp(ptr, "nis:", 4) || !strncmp(ptr, "nisplus:", 8) || ++++++ autofs-5.1.7-Fix-option-for-master_read_wait.patch ++++++ autofs-5.1.7 - Fix option for master read wait From: Goldwyn Rodrigues <[email protected]> The master-wait program option expects a value, and if provided automount crashes with the following trace: #0 __GI_____strtoul_l_internal (nptr=0x0, endptr=0x7fffffffe120, base=0, group=<optimized out>, loc=0x7ffff77a63a0 <_nl_global_locale>) at ../stdlib/strtol_l.c:292 #1 0x0000555555562c52 in getnumopt () #2 0x0000555555564ec0 in main () This is because the options string is not correct and does not expect an argument for master-wait (M), which sets optarg to NULL. Fixes: e68f07f ("autofs-5.1.2 - add master read wait option") Signed-off-by: Goldwyn Rodrigues <[email protected]> Signed-off-by: Ian Kent <[email protected]> --- daemon/automount.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/daemon/automount.c +++ b/daemon/automount.c @@ -2274,7 +2274,7 @@ time_t timeout; time_t age = monotonic_time(NULL); struct rlimit rlim; - const char *options = "+hp:t:vmdD:SfVrO:l:n:CFUM"; + const char *options = "+hp:t:vmdD:SfVrO:l:n:CFUM:"; static const struct option long_options[] = { {"help", 0, 0, 'h'}, {"pid-file", 1, 0, 'p'}, ++++++ autofs-5.1.6.tar.xz -> autofs-5.1.7.tar.xz ++++++ ++++ 14957 lines of diff (skipped)
