Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2014-05-18 21:36:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autofs (Old) and /work/SRC/openSUSE:Factory/.autofs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autofs" Changes: -------- --- /work/SRC/openSUSE:Factory/autofs/autofs.changes 2014-04-02 17:19:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2014-05-18 21:36:50.000000000 +0200 @@ -1,0 +2,16 @@ +Wed May 14 11:57:22 UTC 2014 - [email protected] + +- autofs.init: drop when systemd is enabled (bnc#863970) + +------------------------------------------------------------------- +Fri Mar 28 14:32:15 UTC 2014 - [email protected] + +- update to version 5.0.9: + * fixes for samples/auto.master + * fix variable substitution description + * fix incorrect append options description in README.v5-release +- rebase, refresh and rename all patches on top of 5.0.9 +- switch to .xz compressed tarball instead of bzip2 +- autofs-5.0.8-upstream-patches-20140324.bz2: remove + +------------------------------------------------------------------- Old: ---- autofs-5.0.8-dbus-udisks-monitor.patch autofs-5.0.8-task-use-after-free.patch autofs-5.0.8-upstream-patches-20140324.bz2 autofs-5.0.8.tar.bz2 autofs-suse-auto_master_default.patch New: ---- autofs-5.0.9-dbus-udisks-monitor.patch autofs-5.0.9-suse-auto_master_default.patch autofs-5.0.9-task-use-after-free.patch autofs-5.0.9.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.fwxn9u/_old 2014-05-18 21:36:52.000000000 +0200 +++ /var/tmp/diff_new_pack.fwxn9u/_new 2014-05-18 21:36:52.000000000 +0200 @@ -50,6 +50,7 @@ BuildRequires: nfs-client BuildRequires: openldap2-devel BuildRequires: pkg-config +BuildRequires: xz %if %{with_sssd} BuildRequires: sssd %endif @@ -59,13 +60,13 @@ %if %{with_systemd} BuildRequires: systemd %endif -Version: 5.0.8 +Version: 5.0.9 Release: 0 Summary: A Kernel-Based Automounter License: GPL-2.0+ Group: System/Daemons BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.kernel.org/pub/linux/daemons/autofs/v5/%{name}-%{version}.tar.xz Source1: sysconfig.autofs Source2: autofs.init Source3: autofs.schema @@ -76,15 +77,12 @@ Source8: get-upstream-patches Source42: org.freedesktop.AutoMount.conf Source100: autofs-rpmlintrc -# Upstream patches that will be in the next release -%define patchdate 20140324 -Patch0: autofs-%{version}-upstream-patches-%{patchdate}.bz2 -# PATCH-FIX-UPSTREAM autofs-5.0.8-task-use-after-free.patch [bnc#727392] -Patch82: autofs-5.0.8-task-use-after-free.patch -# PATCH-FIX-OPENSUSE autofs-suse-auto_master_default.patch -Patch100: autofs-suse-auto_master_default.patch +# PATCH-FIX-UPSTREAM autofs-5.0.9-task-use-after-free.patch [bnc#727392] +Patch82: autofs-5.0.9-task-use-after-free.patch +# PATCH-FIX-OPENSUSE autofs-5.0.9-suse-auto_master_default.patch +Patch100: autofs-5.0.9-suse-auto_master_default.patch # PATCH-EXTEND-OPENSUSE autofs-5.0.8-dbus-udisks-monitor.patch -Patch102: autofs-5.0.8-dbus-udisks-monitor.patch +Patch102: autofs-5.0.9-dbus-udisks-monitor.patch Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq Requires(pre): aaa_base @@ -105,7 +103,6 @@ cp %{SOURCE4} . cp %{SOURCE5} . # -%patch0 -p1 %patch82 -p1 %patch100 -p1 %patch102 -p0 -b .udisks @@ -133,11 +130,13 @@ install -d -m 755 %{buildroot}%{_sysconfdir}/auto.master.d install -D -m 644 %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.autofs install -D -m 755 %{SOURCE7} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/autofs -install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/autofs -ln -s ../../etc/init.d/autofs %{buildroot}%{_sbindir}/rcautofs ln -s %{_mandir}/man8/autofs.8.gz %{buildroot}/%{_mandir}/man8/rcautofs.8.gz %if %{with_systemd} install -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/autofs.service +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcautofs +%else +install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/autofs +ln -s ../../etc/init.d/autofs %{buildroot}%{_sbindir}/rcautofs %endif %if %{with_udisks} install -D -m 644 %{SOURCE42} %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf @@ -180,7 +179,6 @@ %config(noreplace) %{_sysconfdir}/auto.net %config(noreplace) %{_sysconfdir}/auto.smb %config(noreplace) %{_sysconfdir}/autofs_ldap_auth.conf -%config %{_sysconfdir}/init.d/autofs %if %{with_udisks} %config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf %endif @@ -199,6 +197,8 @@ %{_sbindir}/rcautofs %if %{with_systemd} %{_unitdir}/autofs.service +%else +%config %{_sysconfdir}/init.d/autofs %endif %changelog ++++++ autofs-5.0.8-dbus-udisks-monitor.patch -> autofs-5.0.9-dbus-udisks-monitor.patch ++++++ ++++++ autofs-5.0.9-suse-auto_master_default.patch ++++++ Index: autofs-5.0.9/samples/auto.master =================================================================== --- autofs-5.0.9.orig/samples/auto.master +++ autofs-5.0.9/samples/auto.master @@ -4,18 +4,18 @@ # mount-point [map-type[,format]:]map [options] # For details of the format look at auto.master(5). # -/misc /etc/auto.misc +#/misc /etc/auto.misc # # NOTE: mounts done from a hosts map will be mounted with the # "nosuid" and "nodev" options unless the "suid" and "dev" # options are explicitly given. # -/net -hosts +#/net -hosts # # Include /etc/auto.master.d/*.autofs # The included files must conform to the format of this file. # -+dir:/etc/auto.master.d +#+dir:/etc/auto.master.d # # Include central master map if it can be found using # nsswitch sources. ++++++ autofs-5.0.8-task-use-after-free.patch -> autofs-5.0.9-task-use-after-free.patch ++++++ --- /work/SRC/openSUSE:Factory/autofs/autofs-5.0.8-task-use-after-free.patch 2013-12-05 21:31:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs-5.0.9-task-use-after-free.patch 2014-05-18 21:36:50.000000000 +0200 @@ -2,10 +2,10 @@ Subject: fix segmentation fault in st_queue_handler() References: bnc#727392 -Index: autofs-5.0.8/daemon/state.c +Index: autofs-5.0.9/daemon/state.c =================================================================== ---- autofs-5.0.8.orig/daemon/state.c -+++ autofs-5.0.8/daemon/state.c +--- autofs-5.0.9.orig/daemon/state.c ++++ autofs-5.0.9/daemon/state.c @@ -1171,12 +1171,12 @@ remove: struct state_queue, pending); ++++++ get-upstream-patches ++++++ --- /var/tmp/diff_new_pack.fwxn9u/_old 2014-05-18 21:36:52.000000000 +0200 +++ /var/tmp/diff_new_pack.fwxn9u/_new 2014-05-18 21:36:52.000000000 +0200 @@ -8,8 +8,8 @@ # # usage: get-upstream-patches -LATEST_RELEASE="5.0.8" -NEXT_RELEASE="5.0.9" +LATEST_RELEASE="5.0.9" +NEXT_RELEASE="5.0.10" BASE=http://www.kernel.org/pub/linux/daemons/autofs/v5/patches-$NEXT_RELEASE/ SERIES=patch_order-$LATEST_RELEASE -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
