From a09457033aaf2aa33b1e6b95d54324e63e8265be90452f48bfd476f33501cfb3 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Tue, 5 Dec 2017 15:25:00 +0000 Subject: [PATCH] Accepting request 548171 from home:computersalat:devel:fs update to 1.5.4 OBS-URL: https://build.opensuse.org/request/show/548171 OBS-URL: https://build.opensuse.org/package/show/filesystems/davfs2?expand=0&rev=14 --- davfs2-1.5.2.tar.gz | 3 -- davfs2-1.5.2.tar.gz.sig | Bin 72 -> 0 bytes davfs2-1.5.4.tar.gz | 3 ++ davfs2-1.5.4.tar.gz.sig | Bin 0 -> 72 bytes davfs2.changes | 10 +++++++ davfs2.spec | 60 ++++++++++++++++++++-------------------- 6 files changed, 43 insertions(+), 33 deletions(-) delete mode 100644 davfs2-1.5.2.tar.gz delete mode 100644 davfs2-1.5.2.tar.gz.sig create mode 100644 davfs2-1.5.4.tar.gz create mode 100644 davfs2-1.5.4.tar.gz.sig diff --git a/davfs2-1.5.2.tar.gz b/davfs2-1.5.2.tar.gz deleted file mode 100644 index 953a3ff..0000000 --- a/davfs2-1.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be34a19ab57a6ea77ecb82083e9e4c1882e12b2de64257de567ad5ee7a17b358 -size 464458 diff --git a/davfs2-1.5.2.tar.gz.sig b/davfs2-1.5.2.tar.gz.sig deleted file mode 100644 index a02e1a33da8cd67dc9d5943b411cc8d7b462411f0034f6ebe0030ae6129f5912..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmV-O0Jr~$Mg#y60ssaD0#o?f`~V6G5W)3XGnvw&ZoVr3ofQObN@VUr>{LrG(kvjU eyrQBYzyP0P7T4+d!TgYE=-=j2ke-pIH2s|BSRnTR diff --git a/davfs2-1.5.4.tar.gz b/davfs2-1.5.4.tar.gz new file mode 100644 index 0000000..a45f456 --- /dev/null +++ b/davfs2-1.5.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9c4e0f0912a782386216b2147eb9c36c47f193b8fcf3d637719e0b9fe7c96e0 +size 478377 diff --git a/davfs2-1.5.4.tar.gz.sig b/davfs2-1.5.4.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..012a0f177e813b8ad21651ab1ec7cbe6d2913677b95fce2a26d6218fcbafaa4e GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0#^~~g8&K%5W)3XGnvw&Zn>oZpI!-}9J&|pEj4yIexXCj eXuM|4h5(@Bl`KdinIz1XZWk8bs<+6QYGM3~dmV59 literal 0 HcmV?d00001 diff --git a/davfs2.changes b/davfs2.changes index 27df7ed..8ae7362 100644 --- a/davfs2.changes +++ b/davfs2.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 4 16:07:50 UTC 2017 - chris@computersalat.de + +- update to 1.5.4 + * mount.davfs frequently reads /proc/mounts. This is necessary with + coda but not with fuse. When running two instances of mount.davfs + using fuse these reads may trigger a kernel bug and create a deadlock. + * when mount.davfs receives SIGTERM it stops reading from the fuse + device. In this case kernel fuse will make umount(8) hang forever. + ------------------------------------------------------------------- Fri Sep 11 14:22:23 UTC 2015 - meissner@suse.com diff --git a/davfs2.spec b/davfs2.spec index 417043f..7daf958 100644 --- a/davfs2.spec +++ b/davfs2.spec @@ -1,7 +1,7 @@ # # spec file for package davfs2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,29 +20,29 @@ Summary: FUSE-Filesystem to access WebDAV servers License: GPL-3.0 Group: System/Filesystems Name: davfs2 -Version: 1.5.2 +Version: 1.5.4 Release: 0 -Url: http://savannah.nongnu.org/projects/davfs2 -#Source: http://download.savannah.gnu.org/releases/davfs2/davfs2-%%{version}.tar.gz -Source: davfs2-%{version}.tar.gz -Source3: davfs2-%{version}.tar.gz.sig -Source98: memberlist-gpgkeys.gpg -Source99: %{name}-rpmlintrc +Url: http://savannah.nongnu.org/projects/%{name} +Source0: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz +Source1: http://download.savannah.nongnu.org/releases/%{name}/%{name}-%{version}.tar.gz.sig +Source2: %{name}-rpmlintrc +Source3: memberlist-gpgkeys.gpg BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fuse-devel >= 2.2 BuildRequires: neon-devel BuildRequires: pwdutils Requires: fuse >= 2.2 -Obsoletes: fuse-davfs2 < %{version} -Provides: fuse-davfs2 = %{version} PreReq: /usr/sbin/groupadd PreReq: /usr/sbin/useradd %if 0%{?fedora} == 0 -Requires(pre): pwdutils -Requires(pre): permissions +Requires(pre): pwdutils +Requires(pre): permissions %else -Requires(pre): shadow-utils +Requires(pre): shadow-utils %endif +# +Obsoletes: fuse-%{name} < %{version} +Provides: fuse-%{name} = %{version} %description davfs2 is a FUSE file system driver that allows you to mount a WebDAV server @@ -55,13 +55,13 @@ systems. To connect to the WebDAV server it makes use of the neon library. Neon supports TLS/SSL (using OpenSSL or GnuTLS) and access via proxy server. %prep -%setup -q -n "davfs2-%{version}" +%setup -q -n %{name}-%{version} cd src %build ssbindir="%{_sbindir}" \ -dav_user="davfs2" \ -dav_group="davfs2" \ +dav_user="%{name}" \ +dav_group="%{name}" \ %configure \ --disable-static %if 0%{?suse_version} >= 1000 @@ -76,17 +76,17 @@ make AM_CFLAGS="-Wall $PIE" AM_LDFLAGS="$pie" %{?_smp_mflags} %__rm -rf "%{buildroot}%{_datadir}/doc" -%__install -d "%{buildroot}/var/cache/davfs2" +%__install -d "%{buildroot}/var/cache/%{name}" -%find_lang davfs2 +%find_lang %{name} %__rm -rf "%{buildroot}%{_docdir}" %__debug_install_post %pre -/usr/bin/getent group davfs2 >/dev/null 2>&1 || /usr/sbin/groupadd -r davfs2 || : -/usr/bin/getent passwd davfs2 >/dev/null 2>&1 || /usr/sbin/useradd -r -g davfs2 -d /var/cache/davfs2 davfs2 || : +/usr/bin/getent group %{name} >/dev/null 2>&1 || /usr/sbin/groupadd -r %{name} || : +/usr/bin/getent passwd %{name} >/dev/null 2>&1 || /usr/sbin/useradd -r -g %{name} -d /var/cache/%{name} %{name} || : %post %if 0%{?set_permissions:1} > 0 @@ -102,23 +102,23 @@ make AM_CFLAGS="-Wall $PIE" AM_LDFLAGS="$pie" %{?_smp_mflags} %verify_permissions -e %{_sbindir}/mount.davfs %endif -%files -f davfs2.lang +%files -f %{name}.lang %defattr(-, root, root, 0755) -%doc AUTHORS BUGS COPYING FAQ NEWS README* THANKS TODO etc/davfs2.conf etc/secrets -%dir %{_sysconfdir}/davfs2 -%doc %{_mandir}/man5/davfs2.conf.5%{ext_man} +%doc AUTHORS BUGS COPYING FAQ NEWS README* THANKS TODO etc/%{name}.conf etc/secrets +%doc %{_mandir}/man5/%{name}.conf.5%{ext_man} %doc %{_mandir}/man8/mount.davfs.8%{ext_man} %doc %{_mandir}/man8/umount.davfs.8%{ext_man} -%doc %{_mandir}/*/man5/davfs2.conf.5%{ext_man} +%doc %{_mandir}/*/man5/%{name}.conf.5%{ext_man} %doc %{_mandir}/*/man8/mount.davfs.8%{ext_man} %doc %{_mandir}/*/man8/umount.davfs.8%{ext_man} -%config(noreplace) %{_sysconfdir}/davfs2/davfs2.conf -%config %{_sysconfdir}/davfs2/secrets -%config %{_sysconfdir}/davfs2/certs/ +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf +%config %{_sysconfdir}/%{name}/secrets +%config %{_sysconfdir}/%{name}/certs/ %verify(not user group mode) %attr(0755,root,root) %{_sbindir}/mount.davfs %{_sbindir}/umount.davfs -%{_datadir}/davfs2 -%attr(0750, davfs2, davfs2) /var/cache/davfs2 +%{_datadir}/%{name} +%attr(0750, %{name}, %{name}) /var/cache/%{name} /sbin/mount.davfs /sbin/umount.davfs