Hello community, here is the log from the commit of package autofs for openSUSE:Factory checked in at 2013-01-14 09:37:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-22 16:11:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.autofs.new/autofs.changes 2013-01-14 09:37:34.000000000 +0100 @@ -1,0 +2,28 @@ +Fri Jan 11 19:02:21 UTC 2013 - [email protected] + +- fix build on older versions of the distribution, do not install + org.freedesktop.AutoMount.conf + +------------------------------------------------------------------- +Fri Jan 11 18:45:14 UTC 2013 - [email protected] + +- autofs-5.0.7-fix-scandir-filter.patch: fix lookup_dir when the + included directory is on an XFS file system (bnc#798158) + +------------------------------------------------------------------- +Fri Jan 11 18:37:56 UTC 2013 - [email protected] + +- autofs-5.0.7-upstream-patches-20121120.bz2: update 5.0.7 upstream + patches to 20121120, fixing some bugs: + * fix map entry duplicate offset detection + * allow nsswitch.conf to not contain "automount:" lines + +------------------------------------------------------------------- +Fri Jan 11 18:28:53 UTC 2013 - [email protected] + +- revert systemd initialization type from "simple" to "forking" + and drop the patch that partially implemented "new style systemd" + daemon (bnc#798162) +- autofs-5.0.7-new-style-systemd-daemon.patch: delete + +------------------------------------------------------------------- Old: ---- autofs-5.0.7-new-style-systemd-daemon.patch autofs-5.0.7-upstream-patches-20121018.bz2 New: ---- autofs-5.0.7-fix-scandir-filter.patch autofs-5.0.7-upstream-patches-20121120.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autofs.spec ++++++ --- /var/tmp/diff_new_pack.HCQUOc/_old 2013-01-14 09:37:37.000000000 +0100 +++ /var/tmp/diff_new_pack.HCQUOc/_new 2013-01-14 09:37:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package autofs # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -66,7 +66,7 @@ Source42: org.freedesktop.AutoMount.conf Source100: autofs-rpmlintrc # Upstream patches that will be in the next release -%define patchdate 20121018 +%define patchdate 20121120 Patch0: autofs-%{version}-upstream-patches-%{patchdate}.bz2 # PATCH-FIX-OPENSUSE autofs-5.0.7-revert-fix-libtirpc-name-clash.patch Patch1: autofs-5.0.7-revert-fix-libtirpc-name-clash.patch @@ -74,12 +74,12 @@ Patch80: autofs-5.0.6-invalid-ghost-dirs.patch # PATCH-FIX-UPSTREAM autofs-5.0.6-task-use-after-free.patch [bnc#727392] Patch82: autofs-5.0.6-task-use-after-free.patch -# PATCH-EXTEND-UPSTREAM autofs-5.0.7-new-style-systemd-daemon.patch -Patch83: autofs-5.0.7-new-style-systemd-daemon.patch # PATCH-FIX-UPSTREAM autofs-5.0.7-dont-reschedule-alarm-after-signals.patch [bnc#783651] Patch84: autofs-5.0.7-dont-reschedule-alarm-after-signals.patch # PATCH-FIX-UPSTREAM autofs-5.0.7-use-protocol-id-instead-of-protoent.patch [bnc#787410] Patch85: autofs-5.0.7-use-protocol-id-instead-of-protoent.patch +# PATCH-FIX-UPSTREAM autofs-5.0.7-fix-scandir-filter.patch [bnc#798158] +Patch86: autofs-5.0.7-fix-scandir-filter.patch # PATCH-FIX-OPENSUSE autofs-suse-auto_master_default.patch Patch100: autofs-suse-auto_master_default.patch # PATCH-FIX-OPENSUSE autofs-suse-build.patch @@ -112,9 +112,9 @@ %patch1 -p1 %patch80 -p1 %patch82 -p1 -%patch83 -p1 %patch84 -p1 %patch85 -p1 +%patch86 -p1 %patch100 -p1 %patch101 -p1 %patch102 -p0 -b .udisks @@ -149,7 +149,9 @@ %if %{with_systemd} install -D -m 644 %{SOURCE6} %{buildroot}%{_unitdir}/autofs.service %endif +%if 0%{?suse_version} >= 1230 install -D -m 644 %{SOURCE42} %{buildroot}%{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf +%endif # will be installed by fillup scripts rm -f %{buildroot}%{_sysconfdir}/sysconfig/autofs @@ -189,7 +191,9 @@ %config(noreplace) %{_sysconfdir}/auto.smb %config(noreplace) %{_sysconfdir}/autofs_ldap_auth.conf %config %{_sysconfdir}/init.d/autofs +%if 0%{?suse_version} >= 1230 %config %{_sysconfdir}/dbus-1/system.d/org.freedesktop.AutoMount.conf +%endif %dir %{_sysconfdir}/auto.master.d %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/dispatcher.d ++++++ autofs-5.0.7-dont-reschedule-alarm-after-signals.patch ++++++ --- /var/tmp/diff_new_pack.HCQUOc/_old 2013-01-14 09:37:37.000000000 +0100 +++ /var/tmp/diff_new_pack.HCQUOc/_new 2013-01-14 09:37:37.000000000 +0100 @@ -55,10 +55,10 @@ =================================================================== --- autofs-5.0.7.orig/CHANGELOG +++ autofs-5.0.7/CHANGELOG -@@ -15,6 +15,7 @@ - - fix recursive mount deadlock. - - increase file map read buffer size. +@@ -17,6 +17,7 @@ - handle new location of systemd. + - fix map entry duplicate offset detection. + - Allow nsswitch.conf to not contain "automount:" lines. +- don't reschedule alarm after signals. 25/07/2012 autofs-5.0.7 ++++++ autofs-5.0.7-fix-scandir-filter.patch ++++++ Do not use dirent->d_type to filter out files in scandir() The "d_type" field of a dirent structure is not filled in by all file systems (XFS being one example), so we can't rely on it to check file types. Index: autofs-5.0.7/modules/lookup_dir.c =================================================================== --- autofs-5.0.7.orig/modules/lookup_dir.c +++ autofs-5.0.7/modules/lookup_dir.c @@ -103,10 +103,6 @@ static int acceptable_dirent_p(const str { size_t namesz; - - if (!(e->d_type == DT_REG || e->d_type == DT_LNK)) - return 0; - namesz = strlen(e->d_name); if (!namesz) return 0; Index: autofs-5.0.7/CHANGELOG =================================================================== --- autofs-5.0.7.orig/CHANGELOG +++ autofs-5.0.7/CHANGELOG @@ -18,6 +18,7 @@ - fix map entry duplicate offset detection. - Allow nsswitch.conf to not contain "automount:" lines. - don't reschedule alarm after signals. +- fix scandir() filter in lookup_dir. 25/07/2012 autofs-5.0.7 ======================= ++++++ autofs-5.0.7-revert-fix-libtirpc-name-clash.patch ++++++ --- /var/tmp/diff_new_pack.HCQUOc/_old 2013-01-14 09:37:37.000000000 +0100 +++ /var/tmp/diff_new_pack.HCQUOc/_new 2013-01-14 09:37:37.000000000 +0100 @@ -39,7 +39,7 @@ =================================================================== --- autofs-5.0.7.orig/CHANGELOG +++ autofs-5.0.7/CHANGELOG -@@ -66,7 +66,6 @@ +@@ -71,7 +71,6 @@ - fix kernel verion check of version components. - dont retry ldap connect if not required. - fix initialization in rpc create_client(). ++++++ autofs.service ++++++ --- /var/tmp/diff_new_pack.HCQUOc/_old 2013-01-14 09:37:37.000000000 +0100 +++ /var/tmp/diff_new_pack.HCQUOc/_new 2013-01-14 09:37:37.000000000 +0100 @@ -3,8 +3,10 @@ After=network.target remote-fs.target ypbind.service [Service] +Type=forking +PIDFile=/var/run/automount.pid EnvironmentFile=-/etc/sysconfig/autofs -ExecStart=/usr/sbin/automount --systemd ${AUTOFS_OPTIONS} +ExecStart=/usr/sbin/automount ${AUTOFS_OPTIONS} -p /var/run/automount.pid ExecReload=/usr/bin/kill -HUP $MAINPID TimeoutSec=180 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
