From c17c87db1387c810cc5217b859468664c6f5408fff404b7e6a61f60d13d9f8fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 19 Aug 2014 15:36:09 +0000
Subject: [PATCH 1/2] Remove cifstab file; obsoleted by the more generic cifs
 credentials feature.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=109
---
 cifs-utils.changes |  5 +++++
 cifs-utils.spec    | 22 ----------------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/cifs-utils.changes b/cifs-utils.changes
index bdb820b..888ecf0 100644
--- a/cifs-utils.changes
+++ b/cifs-utils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 19 15:24:31 UTC 2014 - lmuelle@suse.com
+
+- Remove cifstab file; obsoleted by the more generic cifs credentials feature.
+
 -------------------------------------------------------------------
 Mon Jul 28 11:27:12 UTC 2014 - lmuelle@suse.com
 
diff --git a/cifs-utils.spec b/cifs-utils.spec
index e4bb52b..977da43 100644
--- a/cifs-utils.spec
+++ b/cifs-utils.spec
@@ -34,7 +34,6 @@ Source6:        ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/cifs-utils-pubkey_
 Source1:        cifs.init
 Source2:        mkinitrd_scripts_boot-cifs.sh
 Source3:        mkinitrd_scripts_setup-cifs.sh
-Source4:        cifstab
 %if 0%{?suse_version}
 PreReq:         insserv %{?fillup_prereq} mkinitrd
 %else
@@ -149,7 +148,6 @@ mkdir -p \
 	${RPM_BUILD_ROOT}/%{_sbindir} \
 	${RPM_BUILD_ROOT}/%{_rundir}
 install -m 0755 -p ${RPM_SOURCE_DIR}/cifs.init ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/cifs
-install -m 0600 -p ${RPM_SOURCE_DIR}/cifstab ${RPM_BUILD_ROOT}/%{_sysconfdir}/samba/cifstab
 ln -s %{_sysconfdir}/init.d/${cifs_init_script} ${RPM_BUILD_ROOT}/%{_sbindir}/rccifs
 touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${script} \
 	${RPM_BUILD_ROOT}%{_rundir}/cifs
@@ -159,26 +157,7 @@ touch ${RPM_BUILD_ROOT}/%{_sysconfdir}/sysconfig/%{NET_CFGDIR}/if-{down,up}.d/${
 %fdupes ${RPM_BUILD_ROOT}
 %endif
 
-%pre
-# non SUSE + post-12.2, update, no cifstab, but smbfstab
-if [ ! 0%{?suse_version} -lt 1221 -a \
-	${1:-0} -gt 1 -a \
-	! -e /etc/samba/cifstab -a \
-	-f /etc/samba/smbfstab ]; then
-	cp -a /etc/samba/smbfstab /var/adm/backup/etc_samba_smbfstab-move
-	chkconfig -c smbfs && >/var/adm/backup/etc_samba_smbfs-enabled || :
-fi
-
 %post
-if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then
-	test -f /etc/samba/cifstab && \
-		mv /etc/samba/cifstab /etc/samba/cifstab.rpmnew
-	mv /var/adm/backup/etc_samba_smbfstab-move /etc/samba/cifstab
-	if [ -f /var/adm/backup/etc_samba_smbfs-enabled ]; then
-		chkconfig -a cifs >/dev/null
-		rm /var/adm/backup/etc_samba_smbfs-enabled
-	fi
-fi
 [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
 exit 0
 
@@ -222,7 +201,6 @@ exit 0
 %endif
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1221
 %attr(0754,root,root) %config %{_sysconfdir}/init.d/cifs
-%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/samba/cifstab
 %{_sbindir}/rccifs
 %dir %{_sysconfdir}/samba
 %ghost %{_rundir}/cifs

From 95755613fb59cf1d1425eb902e6615196374bf3e2fe1ec2fee98e70b9c481bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?= <lmuelle@suse.com>
Date: Tue, 19 Aug 2014 16:01:32 +0000
Subject: [PATCH 2/2] Remove the no longer used file too.

OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=110
---
 cifstab | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 cifstab

diff --git a/cifstab b/cifstab
deleted file mode 100644
index 4bec591..0000000
--- a/cifstab
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file allows you to mount SMB/ CIFS shares during system boot while
-# hiding passwords to other people than root.  Use /etc/fstab for public
-# available services.  You have to specify at least a service name and a mount
-# point.  Current default vfstype is cifs.
-#
-# The options are explained in the manual page of mount.cifs.
-#
-# service       moint-point     vfstype options
-
-;//fjall/test    /data/test      cifs    username=tridge,password=foobar