From 64bedda2d815826fcc323ae79c7d8a3953be53be61b535d5301738efb56c17a7 Mon Sep 17 00:00:00 2001
From: David Sterba <dsterba@suse.com>
Date: Mon, 14 Aug 2017 13:36:55 +0000
Subject: [PATCH] Accepting request 515895 from SUSE:SLE-12-SP1:GA

(resync with SLE12, rpmlint rule was merged already)
- remove the setuid root permission files (bsc#907662)

- Import of davfs2 to SLE12-SP1 from SLE11-SP4 (FATE#318116)

OBS-URL: https://build.opensuse.org/request/show/515895
OBS-URL: https://build.opensuse.org/package/show/filesystems/davfs2?expand=0&rev=13
---
 davfs.easy       |  1 -
 davfs.secure     |  1 -
 davfs2-rpmlintrc |  1 -
 davfs2.changes   | 10 ++++++++++
 davfs2.spec      |  9 +--------
 5 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 davfs.easy
 delete mode 100644 davfs.secure

diff --git a/davfs.easy b/davfs.easy
deleted file mode 100644
index 862ac9e..0000000
--- a/davfs.easy
+++ /dev/null
@@ -1 +0,0 @@
-/usr/sbin/mount.davfs   root.root   4755
diff --git a/davfs.secure b/davfs.secure
deleted file mode 100644
index f8227c9..0000000
--- a/davfs.secure
+++ /dev/null
@@ -1 +0,0 @@
-/usr/sbin/mount.davfs       root.root   0755
diff --git a/davfs2-rpmlintrc b/davfs2-rpmlintrc
index 8464d1c..cafba9c 100644
--- a/davfs2-rpmlintrc
+++ b/davfs2-rpmlintrc
@@ -1,3 +1,2 @@
 addFilter("files-duplicate .*/doc/.*")
-setBadness('permissions-unauthorized-file', 0)
 setBadness('non-standard-uid', 0)
diff --git a/davfs2.changes b/davfs2.changes
index a603a7e..27df7ed 100644
--- a/davfs2.changes
+++ b/davfs2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Sep 11 14:22:23 UTC 2015 - meissner@suse.com
+
+- remove the setuid root permission files (bsc#907662)
+
+-------------------------------------------------------------------
+Fri Jul 17 10:07:06 UTC 2015 - jthumshirn@suse.com
+
+- Import of davfs2 to SLE12-SP1 from SLE11-SP4 (FATE#318116)
+
 -------------------------------------------------------------------
 Tue Nov 25 16:13:25 CET 2014 - draht@schaltsekun.de
 
diff --git a/davfs2.spec b/davfs2.spec
index b9f87b0..417043f 100644
--- a/davfs2.spec
+++ b/davfs2.spec
@@ -25,8 +25,6 @@ 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
-Source1:        davfs.easy
-Source2:        davfs.secure
 Source3:        davfs2-%{version}.tar.gz.sig
 Source98:       memberlist-gpgkeys.gpg
 Source99:       %{name}-rpmlintrc
@@ -78,9 +76,6 @@ make AM_CFLAGS="-Wall $PIE" AM_LDFLAGS="$pie" %{?_smp_mflags}
 
 %__rm -rf "%{buildroot}%{_datadir}/doc"
 
-%__install -d "%{buildroot}/%{_sysconfdir}/permissions.d"
-%__install -m0644 "%{SOURCE1}" "%{SOURCE2}" "%{buildroot}/%{_sysconfdir}/permissions.d/"
-
 %__install -d "%{buildroot}/var/cache/davfs2"
 
 %find_lang davfs2
@@ -117,12 +112,10 @@ make AM_CFLAGS="-Wall $PIE" AM_LDFLAGS="$pie" %{?_smp_mflags}
 %doc %{_mandir}/*/man5/davfs2.conf.5%{ext_man}
 %doc %{_mandir}/*/man8/mount.davfs.8%{ext_man}
 %doc %{_mandir}/*/man8/umount.davfs.8%{ext_man}
-%config(noreplace) %{_sysconfdir}/permissions.d/davfs.easy
-%config(noreplace) %{_sysconfdir}/permissions.d/davfs.secure
 %config(noreplace) %{_sysconfdir}/davfs2/davfs2.conf
 %config %{_sysconfdir}/davfs2/secrets
 %config %{_sysconfdir}/davfs2/certs/
-%verify(not user group mode) %attr(4755,root,root) %{_sbindir}/mount.davfs
+%verify(not user group mode) %attr(0755,root,root) %{_sbindir}/mount.davfs
 %{_sbindir}/umount.davfs
 %{_datadir}/davfs2
 %attr(0750, davfs2, davfs2) /var/cache/davfs2