Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2012-11-22 16:11:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-11-14 16:33:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2012-11-22 16:11:43.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 15 11:53:37 UTC 2012 - [email protected] + +- UDisks dbus module support: use private connection, do not refer + to a reply if already handled, install dbus AutoMount.conf in + direct way + +------------------------------------------------------------------- Old: ---- autofs-5.0.6-dbus-udisks-monitor.patch New: ---- autofs-5.0.7-dbus-udisks-monitor.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.eNlNpn/_old 2012-11-22 16:11:46.000000000 +0100 +++ /var/tmp/diff_new_pack.eNlNpn/_new 2012-11-22 16:11:46.000000000 +0100 @@ -84,8 +84,8 @@ Patch100: autofs-suse-auto_master_default.patch # PATCH-FIX-OPENSUSE autofs-suse-build.patch Patch101: autofs-suse-build.patch -# PATCH-EXTEND-OPENSUSE autofs-5.0.6-dbus-udisks-monitor.patch -Patch102: autofs-5.0.6-dbus-udisks-monitor.patch +# PATCH-EXTEND-OPENSUSE autofs-5.0.7-dbus-udisks-monitor.patch +Patch102: autofs-5.0.7-dbus-udisks-monitor.patch # PATCH-EXTEND-OPENSUSE autofs-5.0.7-eaccess.patch Patch103: autofs-5.0.7-eaccess.patch Requires(pre): %fillup_prereq @@ -149,8 +149,7 @@ %if %{with_systemd} install -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/autofs.service %endif -##install -D -m 644 %{SOURCE42} %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf -install -D -m 644 %{SOURCE42} %{buildroot}%{_localstatedir}/adm/fillup-templates/org.freedesktop.AutoMount.conf +install -D -m 644 %{SOURCE42} %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf # will be installed by fillup scripts rm -f %{buildroot}%{_sysconfdir}/sysconfig/autofs @@ -167,10 +166,6 @@ %if %{with_systemd} %service_add_post %{name}.service %endif -## -mkdir -p %{_sysconfdir}/dbus-1/system.d -cp %{_localstatedir}/adm/fillup-templates/org.freedesktop.AutoMount.conf \ -%{_sysconfdir}/dbus-1/system.d/ %preun %{stop_on_removal autofs} @@ -194,8 +189,7 @@ %config(noreplace) %{_sysconfdir}/auto.smb %config(noreplace) %{_sysconfdir}/autofs_ldap_auth.conf %config %{_sysconfdir}/init.d/autofs -##%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf -%{_localstatedir}/adm/fillup-templates/org.freedesktop.AutoMount.conf +%config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf %dir %{_sysconfdir}/auto.master.d %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/dispatcher.d ++++++ autofs-5.0.6-dbus-udisks-monitor.patch -> autofs-5.0.7-dbus-udisks-monitor.patch ++++++ --- /work/SRC/openSUSE:Factory/autofs/autofs-5.0.6-dbus-udisks-monitor.patch 2012-10-22 21:44:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs-5.0.7-dbus-udisks-monitor.patch 2012-11-22 16:11:43.000000000 +0100 @@ -1,7 +1,5 @@ -Index: Makefile.conf.in -=================================================================== ---- Makefile.conf.in.orig -+++ Makefile.conf.in +--- Makefile.conf.in ++++ Makefile.conf.in 2012-11-15 00:00:00.000000000 +0000 @@ -42,6 +42,9 @@ KRB5_FLAGS=@KRB5_FLAGS@ # NIS+ support: yes (1) no (0) NISPLUS = @HAVE_NISPLUS@ @@ -12,10 +10,8 @@ # SMBFS support: yes (1) no (0) SMBFS = @HAVE_SMBMOUNT@ -Index: daemon/automount.c -=================================================================== ---- daemon/automount.c.orig -+++ daemon/automount.c +--- daemon/automount.c ++++ daemon/automount.c 2012-11-15 00:00:00.000000000 +0000 @@ -120,7 +120,8 @@ static int do_mkdir(const char *parent, status = -1; if (*parent) @@ -26,10 +22,8 @@ contained_in_local_fs(path)) { if (mkdir(path, mode) == -1) { errno = EACCES; -Index: daemon/lookup.c -=================================================================== ---- daemon/lookup.c.orig -+++ daemon/lookup.c +--- daemon/lookup.c ++++ daemon/lookup.c 2012-11-15 00:00:00.000000000 +0000 @@ -175,6 +175,8 @@ int lookup_nss_read_master(struct master !strncmp(name, "yp:", 3) || !strncmp(name, "nis:", 4) || @@ -39,10 +33,8 @@ !strncmp(name, "ldap:", 5) || !strncmp(name, "ldaps:", 6) || !strncmp(name, "sss:", 4) || -Index: include/automount.h -=================================================================== ---- include/automount.h.orig -+++ include/automount.h +--- include/automount.h ++++ include/automount.h 2012-11-15 00:00:00.000000000 +0000 @@ -23,6 +23,7 @@ #include "list.h" @@ -67,10 +59,8 @@ /* This sould be enough for at least 20 host aliases */ #define HOST_ENT_BUF_SIZE 2048 -Index: include/lookup_udisks.h -=================================================================== ---- /dev/null -+++ include/lookup_udisks.h +--- include/lookup_udisks.h ++++ include/lookup_udisks.h 2012-11-15 10:32:36.924675206 +0000 @@ -0,0 +1,381 @@ +/* + * loopup_udisks.h - Header file for lookup_udisks automount module @@ -222,7 +212,7 @@ + struct parse_mod *parse; +}; + -+extern inline void lock(struct lookup_context *ctxt) ++static inline void lock(struct lookup_context *ctxt) +{ + int status = pthread_mutex_lock(&ctxt->mtx); + if (status) @@ -230,7 +220,7 @@ + return; +} + -+extern inline void unlock(struct lookup_context *ctxt) ++static inline void unlock(struct lookup_context *ctxt) +{ + int status = pthread_mutex_unlock(&ctxt->mtx); + if (status) @@ -453,10 +443,8 @@ +} cnfxml_t; + +#endif -Index: lib/master_tok.l -=================================================================== ---- lib/master_tok.l.orig -+++ lib/master_tok.l +--- lib/master_tok.l ++++ lib/master_tok.l 2012-11-15 00:00:00.000000000 +0000 @@ -119,7 +119,7 @@ DNNAMESTR2 ([[:alnum:]_.\-]+) INTMAP (-hosts|-null) MULTI ((multi)(,(sun|hesiod))?(:{OPTWS}|{WS})) @@ -466,10 +454,8 @@ OPTTOUT (-t{OPTWS}|-t{OPTWS}={OPTWS}|--timeout{OPTWS}|--timeout{OPTWS}={OPTWS}) -Index: lib/parse_subs.c -=================================================================== ---- lib/parse_subs.c.orig -+++ lib/parse_subs.c +--- lib/parse_subs.c ++++ lib/parse_subs.c 2012-11-15 00:00:00.000000000 +0000 @@ -31,6 +31,8 @@ static struct types map_type[] = { { "yp", 2 }, { "nis", 3 }, @@ -479,10 +465,8 @@ { "ldap", 4 }, { "ldaps", 5 }, { "hesiod", 6 }, -Index: man/autofs.udisks.5.in -=================================================================== ---- /dev/null -+++ man/autofs.udisks.5.in +--- man/autofs.udisks.5.in ++++ man/autofs.udisks.5.in 2012-11-15 10:51:08.881926065 +0000 @@ -0,0 +1,121 @@ +.\" t +.TH AUTOFS.UDISKS 5 "22 Aug 2012" @@ -506,7 +490,7 @@ +.RS +.2i +.ta 1.0i +.nf -+.I /media udisks:@@autofsmapdir@@/autofs.udisks \-\-timeout=5 \-\-ghost ++.I /media/autofs udisks:@@autofsmapdir@@/autofs.udisks \-\-timeout=5 \-\-ghost +.fi +.RE +.sp @@ -605,10 +589,8 @@ +.BR udisks\-daemon (8) +.SH AUTHOR +This manual page was written by Werner Fink <[email protected]>. -Index: modules/Makefile -=================================================================== ---- modules/Makefile.orig -+++ modules/Makefile +--- modules/Makefile ++++ modules/Makefile 2012-11-15 00:00:00.000000000 +0000 @@ -53,6 +53,14 @@ ifeq ($(SSSD), 1) MODS += lookup_sss.so endif @@ -635,10 +617,8 @@ mount_nfs.so: mount_nfs.c replicated.o $(CC) $(SOLDFLAGS) $(CFLAGS) -o mount_nfs.so \ mount_nfs.c replicated.o $(AUTOFS_LIB) $(LIBNSL) -Index: modules/lookup_multi.c -=================================================================== ---- modules/lookup_multi.c.orig -+++ modules/lookup_multi.c +--- modules/lookup_multi.c ++++ modules/lookup_multi.c 2012-11-15 00:00:00.000000000 +0000 @@ -56,6 +56,8 @@ static struct lookup_mod *nss_open_looku if (!strncmp(argv[0], "file", 4) || !strncmp(argv[0], "yp", 2) || @@ -648,11 +628,9 @@ !strncmp(argv[0], "nis", 3) || !strncmp(argv[0], "ldaps", 5) || !strncmp(argv[0], "ldap", 4)) { -Index: modules/lookup_udisks.c -=================================================================== ---- /dev/null -+++ modules/lookup_udisks.c -@@ -0,0 +1,2441 @@ +--- modules/lookup_udisks.c ++++ modules/lookup_udisks.c 2012-11-15 11:35:29.786526881 +0000 +@@ -0,0 +1,2449 @@ +/* + * lookup_udisks.c - Module for Linux automount to access removable devices + * listed by the dbus based udisks-daemon @@ -2195,12 +2173,12 @@ + xmlFreeDoc(doc); + xmlCleanupParser(); +} -+#else ++#else /* !LIBXML_TREE_ENABLED */ +static void parse_config(struct lookup_context ctxt, const char* path) +{ + ctxt->config.enabled = 0; +} -+#endif ++#endif /* !LIBXML_TREE_ENABLED */ + +static void free_context(struct lookup_context *ctxt) +{ @@ -2237,8 +2215,10 @@ + + if (ctxt->error && dbus_error_is_set(ctxt->error)) + dbus_error_free(ctxt->error); -+ if (ctxt->conn) ++ if (ctxt->conn) { ++ dbus_connection_close(ctxt->conn); + dbus_connection_unref(ctxt->conn); ++ } + dbus_shutdown(); + + free(ctxt); @@ -2248,6 +2228,7 @@ +int lookup_init(const char *mapfmt, int argc, const char *const *argv, void **context) +{ + struct lookup_context *restrict ctxt; ++ const char *address; + struct stat st; + int ret; + @@ -2277,10 +2258,10 @@ + * library used. + */ + LIBXML_TEST_VERSION -+#else ++#else /* !LIBXML_TREE_ENABLED */ + logerr(MODPREFIX "there was no XML support compiled in"); + goto err; -+#endif ++#endif /* !LIBXML_TREE_ENABLED */ + ctxt = newaligned(alignof(struct lookup_context)+sizeof(struct DBusError)); + if (!ctxt) + goto err; @@ -2340,12 +2321,13 @@ + return NSS_STATUS_UNAVAIL; + } + -+ ctxt->conn = dbus_bus_get(DBUS_BUS_SYSTEM, ctxt->error); ++ ctxt->conn = dbus_bus_get_private(DBUS_BUS_SYSTEM, ctxt->error); + if (!ctxt->conn) { + logerr(MODPREFIX "udisks map %s, can not connect system dbus: %s", + ctxt->mapname, ctxt->error->message); + goto ferr; + } ++ dbus_connection_set_exit_on_disconnect(ctxt->conn, FALSE); + + ret = dbus_bus_start_service_by_name(ctxt->conn, "org.freedesktop.UDisks", 0, 0, ctxt->error); + if ((dbus_bool_t)ret == FALSE) { @@ -2475,6 +2457,8 @@ + } + if (!reply) + goto err; ++ if (dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN) ++ goto unref; + + /* + * As reply we assume an array of strings here, @@ -2503,8 +2487,6 @@ + ret = NSS_STATUS_SUCCESS; +unref: + dbus_message_unref(reply); -+ if (dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN) -+ goto unref; +err: + if (ret != NSS_STATUS_SUCCESS) + logerr(MODPREFIX "%s faild", __FUNCTION__); @@ -2538,6 +2520,8 @@ + } + if (!reply) + goto err; ++ if (dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN) ++ goto unref; + + /* + * As reply we assume an array of strings here, @@ -2566,8 +2550,6 @@ + ret = NSS_STATUS_SUCCESS; +unref: + dbus_message_unref(reply); -+ if (dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN) -+ goto unref; +err: + if (ret != NSS_STATUS_SUCCESS) + logerr(MODPREFIX "%s faild", __FUNCTION__); @@ -2676,7 +2658,9 @@ + + ctxt->ap = ap; + ctxt->map = ap->entry->current; -+//ctxt->ap->logopt = LOGOPT_DEBUG; ++#if defined(DEBUG) && (DEBUG > 0) ++ ctxt->ap->logopt = LOGOPT_DEBUG; ++#endif + + source = ap->entry->current; + ap->entry->current = NULL; @@ -2928,11 +2912,13 @@ + ret = NSS_STATUS_SUCCESS; + break; + } ++#if defined(DEBUG) && (DEBUG > 0) + opt = get_session(session, x11_display); + if (opt.error) + break; + if (*opt.string == ':') + ret = NSS_STATUS_SUCCESS; ++#endif + break; + } + } @@ -3094,10 +3080,8 @@ +out: + return ret; +} -Index: modules/parse_sun.c -=================================================================== ---- modules/parse_sun.c.orig -+++ modules/parse_sun.c +--- modules/parse_sun.c ++++ modules/parse_sun.c 2012-11-15 00:00:00.000000000 +0000 @@ -880,6 +880,7 @@ static int validate_location(unsigned in ((esc = strchr(ptr, '\\')) && *(esc + 1) == ':') || !strncmp(ptr, "file:", 5) || !strncmp(ptr, "yp:", 3) || @@ -3106,10 +3090,8 @@ !strncmp(ptr, "ldap:", 5) || !strncmp(ptr, "ldaps:", 6) || !strncmp(ptr, "sss:", 4) || !strncmp(ptr, "dir:", 4)) return 1; -Index: samples/autofs.udisks -=================================================================== ---- /dev/null -+++ samples/autofs.udisks +--- samples/autofs.udisks ++++ samples/autofs.udisks 2012-11-15 00:00:00.000000000 +0000 @@ -0,0 +1,28 @@ +<?xml version="1.0" ?> +<!-- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
