Hello community,
here is the log from the commit of package autofs for openSUSE:Factory checked
in at 2020-12-05 20:35:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autofs (Old)
and /work/SRC/openSUSE:Factory/.autofs.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autofs"
Sat Dec 5 20:35:09 2020 rev:123 rq:852948 version:5.1.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2020-03-06
21:26:10.477511666 +0100
+++ /work/SRC/openSUSE:Factory/.autofs.new.5913/autofs.changes 2020-12-05
20:35:10.218586243 +0100
@@ -1,0 +2,12 @@
+Fri Oct 23 14:28:02 UTC 2020 - Goldwyn Rodrigues <rgold...@suse.com>
+
+- automount-fix-master-wait.patch: Fix options string for master wait
+ (bsc#1178006)
+
+-------------------------------------------------------------------
+Mon Aug 31 18:12:49 UTC 2020 - Goldwyn Rodrigues <rgold...@suse.com>
+
+- autofs-nsswitch-usr-etc.patch: Use /usr/etc/nsswitch.conf if
+ /etc/nsswitch.con is unavailable (bsc#1175238)
+
+-------------------------------------------------------------------
New:
----
autofs-nsswitch-usr-etc.patch
automount-fix-master-wait.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autofs.spec ++++++
--- /var/tmp/diff_new_pack.vnbAgx/_old 2020-12-05 20:35:11.166587205 +0100
+++ /var/tmp/diff_new_pack.vnbAgx/_new 2020-12-05 20:35:11.166587205 +0100
@@ -87,6 +87,9 @@
Patch104: autofs-use-libldap_r-instead-of-libldap-for-thread-safety.patch
# PATCH-FIX-OPENSUSE autofs-5-1-3-fix-unset-tsd-group-name-handling.patch
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
Requires(pre): %fillup_prereq
Requires(pre): aaa_base
BuildRequires: systemd-rpm-macros
@@ -110,6 +113,8 @@
%patch102 -p1
%patch104 -p1
%patch105 -p1
+%patch106 -p1
+%patch107 -p1
%build
autoreconf -fiv
++++++ autofs-nsswitch-usr-etc.patch ++++++
---
lib/nss_parse.y | 2 ++
1 file changed, 2 insertions(+)
--- a/lib/nss_parse.y
+++ b/lib/nss_parse.y
@@ -168,6 +168,8 @@
int status;
nsswitch = open_fopen_r(NSSWITCH_FILE);
+ if (!nsswitch)
+ nsswitch = open_fopen_r("/usr" NSSWITCH_FILE);
if (!nsswitch) {
logerr("couldn't open %s", NSSWITCH_FILE);
return 1;
++++++ automount-fix-master-wait.patch ++++++
Subject: [PATCH] Fix option for master wait
References: bsc#1178006
master wait expects a value, and if provided automount crashes
#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)
Signed-off-by: Goldwyn Rodrigues <rgold...@suse.com>
diff --git a/daemon/automount.c b/daemon/automount.c
index 0391bfb..c2a0f58 100644
--- a/daemon/automount.c
+++ b/daemon/automount.c
@@ -2219,7 +2219,7 @@ int main(int argc, char *argv[])
time_t timeout;
time_t age = monotonic_time(NULL);
struct rlimit rlim;
- const char *options = "+hp:t:vmdD:SfVrO:l:n:CFM";
+ const char *options = "+hp:t:vmdD:SfVrO:l:n:CFM:";
static const struct option long_options[] = {
{"help", 0, 0, 'h'},
{"pid-file", 1, 0, 'p'},
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
