Sync changes to SLFO-1.2 branch

autofs-5.1.1-dbus-udisks-monitor.patch

@@ -587,13 +587,14 @@ Index: autofs-5.1.9/modules/Makefile
 ===================================================================
 --- autofs-5.1.9.orig/modules/Makefile
 +++ autofs-5.1.9/modules/Makefile
-@@ -62,6 +62,13 @@ ifeq ($(SSSD), 1)
+@@ -62,6 +62,14 @@ ifeq ($(SSSD), 1)
    MODS += lookup_sss.so
  endif
  
 +ifeq ($(UDISKS), 1)
 +  UDISKS_FLAGS += $(shell pkg-config --cflags dbus-1)
 +  UDISKS_LIBS += $(shell pkg-config --libs dbus-1)
++  UDISKS_LIBS += $(AUTOFS_LIB)
 +  SRCS += lookup_udisks.c
 +  MODS += lookup_udisks.so
 +endif
@@ -601,13 +602,12 @@ Index: autofs-5.1.9/modules/Makefile
  CFLAGS += -I../include -I../lib -fPIC -D_GNU_SOURCE
  CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\"
  CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\"
-@@ -145,6 +152,11 @@ lookup_ldap.so: lookup_ldap.c dclist.o b
+@@ -145,6 +153,10 @@ lookup_ldap.so: lookup_ldap.c dclist.o b
  		$(LDFLAGS) $(LIBLDAP) $(LIBRESOLV) $(LIBS) $(AUTOFS_LIB_LINK)
  	$(STRIP) lookup_ldap.so
  
 +lookup_udisks.so: lookup_udisks.c ../include/lookup_udisks.h
-+	$(CC) $(SOLDFLAGS) $(CFLAGS) $(UDISKS_FLAGS) -o $@ $< \
-+		$(LDFLAGS) $(UDISKS_LIBS) $(LIBS) $(AUTOFS_LIB_LINK)
++	$(CC) $(SOLDFLAGS) $(CFLAGS) $(UDISKS_FLAGS) -o $@ $< $(UDISKS_LIBS)
 +	$(STRIP) $@
 +
  mount_nfs.so: mount_nfs.c replicated.o

autofs.changes

@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Wed Jul 16 20:29:16 UTC 2025 - David Disseldorp <ddiss@suse.com>
-
-- Fix autofs-5.1.1-dbus-udisks-monitor.patch (bsc#1246612) to account for:
-  * d2feac6784b6 autofs-5.1.6 - make autofs.a a shared library
-  * bcd8e1b642e9 autofs-5.0.7 - use LIBS for link libraries
-
 -------------------------------------------------------------------
 Tue Jan 14 18:14:14 UTC 2025 - Goldwyn Rodrigues <rgoldwyn@suse.com>
 

autofs.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package autofs
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed