[Pkg-samba-maint] [samba] 05/07: Remove the samba service

[Mathieu Parent]

This is an automated email from the git hooks/post-receive script.

sathieu pushed a commit to branch master
in repository samba.

commit 58b2d08fd873c02a3dd341b02eba563f9d7d1af0
Author: Mathieu Parent <math.parent at gmail.com>
Date:   Tue Jul 18 22:54:20 2017 +0200

    Remove the samba service
    
    And mention it in NEWS
---
 debian/NEWS                    | 10 ++++++++
 debian/rules                   |  1 -
 debian/samba.init              | 54 ------------------------------------------
 debian/samba.links             |  2 --
 debian/samba.lintian-overrides |  3 ---
 debian/samba.maintscript       |  1 +
 6 files changed, 11 insertions(+), 60 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 401416e..c6d285a 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,13 @@
+samba (2:4.6.5+dfsg-5) unstable; urgency=medium
+
+    The samba service has been removed. Use the individual services instead:
+
+    * nmbd
+    * smbd
+    * samba-ad-dc
+
+ -- Mathieu Parent <sathieu at debian.org>  Tue, 18 Jul 2017 22:52:05 +0200
+
 samba (2:4.4.1+dfsg-1) experimental; urgency=medium
 
     This Samba security addresses both Denial of Service and Man in
diff --git a/debian/rules b/debian/rules
index 05751a4..3336bd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -210,7 +210,6 @@ ifneq (,$(filter samba, $(shell dh_listpackages)))
 	dh_installinit -psamba --name smbd
 	dh_installinit -psamba --name nmbd
 	dh_installinit -psamba --name samba-ad-dc
-	dh_installinit -psamba --noscripts
 endif
 ifneq (,$(filter winbind, $(shell dh_listpackages)))
 	dh_installinit -pwinbind
diff --git a/debian/samba.init b/debian/samba.init
deleted file mode 100644
index ce58c88..0000000
--- a/debian/samba.init
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-### BEGIN INIT INFO
-# Provides:          samba
-# Required-Start:
-# Required-Stop:
-# Default-Start:
-# Default-Stop:
-# Short-Description: ensure Samba daemons are started (nmbd, smbd and samba)
-# Description: Starts Samba, a Windows AD and SMB/CIFS fileserver for UNIX
-### END INIT INFO
-
-set -e
-
-# start nmbd, smbd and samba-ad-dc unconditionally
-# the init scripts themselves check if they are needed or not
-case $1 in
-	start)
-		/etc/init.d/nmbd start
-		/etc/init.d/smbd start
-		/etc/init.d/samba-ad-dc start
-		;;
-	stop)
-		/etc/init.d/samba-ad-dc stop
-		/etc/init.d/smbd stop
-		/etc/init.d/nmbd stop
-		;;
-	reload)
-		/etc/init.d/smbd reload
-		;;
-	restart|force-reload)
-		/etc/init.d/nmbd "$1"
-		/etc/init.d/smbd "$1"
-		/etc/init.d/samba-ad-dc "$1"
-		;;
-	status)
-		status=0
-		NMBD_DISABLED=`testparm -s --parameter-name='disable netbios' 2>/dev/null || true`
-		SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1 || true`
-		if [ "$SERVER_ROLE" != "active directory domain controller" ]; then
-			if [ "$NMBD_DISABLED" != "Yes" ]; then
-				/etc/init.d/nmbd status || status=$?
-			fi
-			/etc/init.d/smbd status || status=$?
-		else
-			/etc/init.d/samba-ad-dc status || status=$?
-		fi
-		exit $status
-		;;
-	*)
-		echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload|status}"
-		exit 1
-		;;
-esac
diff --git a/debian/samba.links b/debian/samba.links
deleted file mode 100644
index fb7055f..0000000
--- a/debian/samba.links
+++ /dev/null
@@ -1,2 +0,0 @@
-# mask /etc/init.d/samba init script for systemd
-/dev/null /lib/systemd/system/samba.service
diff --git a/debian/samba.lintian-overrides b/debian/samba.lintian-overrides
index d89b358..763c82d 100644
--- a/debian/samba.lintian-overrides
+++ b/debian/samba.lintian-overrides
@@ -1,5 +1,2 @@
 # Standard path for [printers] section is world-writeable with sticky bit set
 samba: non-standard-dir-perm var/spool/samba/ 1777 != 0755
-# /etc/init.d/samba is not a real init script, just a compatibility wrapper
-samba: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/samba
-samba: init.d-script-does-not-source-init-functions etc/init.d/samba
diff --git a/debian/samba.maintscript b/debian/samba.maintscript
index a4d25d1..fa1db4c 100644
--- a/debian/samba.maintscript
+++ b/debian/samba.maintscript
@@ -2,3 +2,4 @@ rm_conffile /etc/init/nmbd.conf 2:4.6.5+dfsg-5~
 rm_conffile /etc/init/reload-smbd.conf 2:4.6.5+dfsg-5~
 rm_conffile /etc/init/samba-ad-dc.conf 2:4.6.5+dfsg-5~
 rm_conffile /etc/init/smbd.conf 2:4.6.5+dfsg-5~
+rm_conffile /etc/init.d/samba 2:4.6.5+dfsg-5~

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git