From: Bjorn Ketelaars <bket@openbsd.org>
Subject: CHANGE net/samba - drop meta rc-script
To: ports@openbsd.org, Ian McWilliam <kaosagnt@gmail.com>
Date: Tue, 2 Jul 2024 20:57:34 +0200

The meta rc-script for Samba does not play nice with 'rcctl ls rogue'.
When a meta script is used, services started by the child scripts are
seen as rogue [0].

Samba's meta script provides little functionality, which can be easily
replaced by using its two child scipts. Proposal is to remove the meta
script and inform users via faq/current.html.

Diff for net/samba below.
Diff for current.html attached.

OK?


diff --git Makefile Makefile
index 311e62490ab..594ec3d5b0f 100644
--- Makefile
+++ Makefile
@@ -1,6 +1,7 @@
 VERSION =		4.20.2
 DISTNAME =		samba-${VERSION}
 EPOCH =			0
+REVISION =		0
 
 COMMENT-main =		SMB and CIFS client and server for UNIX
 COMMENT-docs =		additional documentation and examples for Samba
diff --git pkg/PLIST-main pkg/PLIST-main
index 65400a77f88..e5af321c94b 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -8,7 +8,6 @@
 @pkgpath net/samba,-tevent
 @pkgpath net/samba,-util
 @rcscript ${RCDIR}/nmbd
-@rcscript ${RCDIR}/samba
 @rcscript ${RCDIR}/smbd
 @rcscript ${RCDIR}/winbindd
 @sample ${SYSCONFDIR}/samba/
diff --git pkg/samba.rc pkg/samba.rc
deleted file mode 100644
index 71080d984c7..00000000000
--- pkg/samba.rc
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/ksh
-
-# "meta" script running the following rc.d(8) scripts with the given argument;
-# note that "daemon_*" variables are not passed to the child scripts.
-_pkg_scripts="smbd nmbd"
-
-if [[ $1 == restart ]]; then
-	$0 stop && $0 start
-	exit
-fi
-
-if [[ $1 == stop ]]; then
-	for _i in ${_pkg_scripts}; do _l="${_i} ${_l}"; done
-	_pkg_scripts=${_l% }
-fi
-
-for _i in ${_pkg_scripts}; do
-	if [[ -x ${RCDIR}/${_i} ]]; then
-		${RCDIR}/${_i} $@ || exit $?
-	fi
-done
Index: current.html
===================================================================
RCS file: /cvs/www/faq/current.html,v
diff -u -p -r1.1120 current.html
--- current.html	7 May 2024 09:20:30 -0000	1.1120
+++ current.html	2 Jul 2024 18:42:14 -0000
@@ -84,6 +84,19 @@ Once the new tables are installed, no ch
 are needed.
 
 
+<h3 id="r20240702">2024/07/02 - [packages] Samba port change</h3>
+
+The meta rc-script for Samba (<code>samba</code>) has been dropped as it does
+not play nicely with <code>rcctl ls rogue</code>.
+When a meta script is used, services started by the child scripts are seen as
+rogue.
+To replace the meta script by the child script one can use:
+<blockquote><pre>
+rcctl disable samba
+rcctl enable nmbd smbd
+</pre></blockquote>
+
+
 <!--
      Two blank lines before new sections.
      New sentences start on new lines.