gentoo resync : 22.01.2021

4 files changed, 152 insertions, 0 deletions

diff --git a/net-nds/389-ds-base/files/389-ds-base-db-gentoo.patch b/net-nds/389-ds-base/files/389-ds-base-db-gentoo.patch
new file mode 100644
index 000000000000..09bca3e87abf
--- /dev/null
+++ b/net-nds/389-ds-base/files/389-ds-base-db-gentoo.patch
@@ -0,0 +1,17 @@
+diff --git a/m4/db.m4 b/m4/db.m4
+index c916c2b83..a9dd5ef2b 100644
+--- a/m4/db.m4
++++ b/m4/db.m4
+@@ -96,9 +96,9 @@ if test -z "$db_inc"; then
+ fi
+ 
+ dnl figure out which version of db we're using from the header file
+-db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h | awk '{print $3}'`
+-db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'`
+-db_ver_pat=`grep DB_VERSION_PATCH $db_incdir/db.h | awk '{print $3}'`
++db_ver_maj=`gcc -E -fdirectives-only $db_incdir/db.h | grep DB_VERSION_MAJOR | awk '{print $3}'`
++db_ver_min=`gcc -E -fdirectives-only $db_incdir/db.h | grep DB_VERSION_MINOR | awk '{print $3}'`
++db_ver_pat=`gcc -E -fdirectives-only $db_incdir/db.h | grep DB_VERSION_PATCH | awk '{print $3}'`
+ 
+ dnl Ensure that we have libdb at least 4.7, older versions aren't supported
+ if test ${db_ver_maj} -lt 4; then
diff --git a/net-nds/389-ds-base/files/389-ds-base.conf b/net-nds/389-ds-base/files/389-ds-base.conf
new file mode 100644
index 000000000000..67284921bf97
--- /dev/null
+++ b/net-nds/389-ds-base/files/389-ds-base.conf
@@ -0,0 +1,3 @@
+d /var/log/dirsrv 0700 dirsrv dirsrv -
+d /var/lib/dirsrv 0700 dirsrv dirsrv -
+d /run/lock/dirsrv 0770 dirsrv dirsrv -
diff --git a/net-nds/389-ds-base/files/389-ds-snmp.initd b/net-nds/389-ds-base/files/389-ds-snmp.initd
new file mode 100644
index 000000000000..ffc4e172ac1e
--- /dev/null
+++ b/net-nds/389-ds-base/files/389-ds-snmp.initd
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE="/run/ldap-agent.pid"
+CONFIGFILE="/etc/dirsrv/config/ldap-agent.conf"
+
+# instance support in progress
+
+depend() {
+	need net
+	use logger snmpd
+}
+
+start() {
+	ebegin "Starting 389 Directory Server ldap-snmp agent"
+	start-stop-daemon --start --quiet -b \
+		--pidfile ${PIDFILE} --exec /usr/sbin/ldap-agent -- ${CONFIGFILE}
+	eend ${?}
+	if [ "${?}" != "0" ]; then
+		local entries=/etc/dirsrv/slapd-*
+		if [ -n "${entries}" ]; then
+			ewarn "Please make sure that ${CONFIGFILE} contains at least"
+			ewarn "one of the following entries:"
+			for entry in ${entries}; do
+				entry=$(basename ${entry})
+				ewarn "server ${entry}"
+			done
+		fi
+	fi
+}
+
+stop() {
+	ebegin "Stopping 389 Directory Server ldap-snmp agent"
+	start-stop-daemon --stop --quiet --pidfile ${PIDFILE}
+	eend ${?}
+}
+
+restart() {
+	svc_stop
+	sleep 2
+	svc_start
+}
diff --git a/net-nds/389-ds-base/files/389-ds.initd-r1 b/net-nds/389-ds-base/files/389-ds.initd-r1
new file mode 100644
index 000000000000..39744d55bdc9
--- /dev/null
+++ b/net-nds/389-ds-base/files/389-ds.initd-r1
@@ -0,0 +1,89 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+DIRSRV_EXEC="/usr/sbin/ns-slapd"
+PID_DIRECTORY="/run/dirsrv"
+LOCK_DIRECTORY="/var/lock/dirsrv"
+DIRSRV_CONF_DIR="/etc/dirsrv"
+DS_INSTANCES=${DIRSRV_CONF_DIR}/slapd-*
+
+depend() {
+	need net logger
+	use dns
+	provide dirsrv ldap
+}
+
+checkconfig() {
+	if [ -z "${DS_INSTANCES}" ]; then
+		eerror "389 Directory Server has not been configured."
+		eend 1
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	for instance in ${DS_INSTANCES}; do
+		instance=$(basename ${instance})
+		# skip .removed instances, bug #338133
+		if [ "${instance%%.removed}" != "${instance}" ]; then
+			continue
+		fi
+		# Create the required directories in case they got nuked
+		mkdir -p ${PID_DIRECTORY}
+		mkdir -p ${LOCK_DIRECTORY}/${instance}
+		# This will probably break one day, we should be pulling out the suitespotuser from dse.ldif
+		chown dirsrv: ${PID_DIRECTORY}
+		chown dirsrv: ${LOCK_DIRECTORY}/${instance}
+		ebegin "Starting 389 Directory Server: instance ${instance}"
+		start-stop-daemon --start --quiet -m \
+			--pidfile ${PID_DIRECTORY}/${instance}.startpid \
+			--exec ${DIRSRV_EXEC} -- -D ${DIRSRV_CONF_DIR}/${instance} \
+			-i ${PID_DIRECTORY}/${instance}.pid \
+			-w ${PID_DIRECTORY}/${instance}.startpid
+		sts=${?}
+		eend ${sts}
+		if [ "${sts}" != "0" ]; then
+			return 1
+		fi
+	done
+}
+
+
+
+stop() {
+	checkconfig || return 1
+
+	for instance in ${DS_INSTANCES}; do
+		instance=$(basename ${instance})
+		if [ "${instance%%.removed}" != "${instance}" ]; then
+			continue
+		fi
+		ebegin "Stopping 389 Directory Server: instance ${instance}"
+		start-stop-daemon --stop --quiet \
+			--pidfile ${PID_DIRECTORY}/${instance}.pid \
+			--exec ${DIRSRV_EXEC}
+		eend ${?}
+	done
+}
+
+status() {
+	for instance in ${DS_INSTANCES}; do
+		instance=$(basename ${instance})
+		if [ "${instance%%.removed}" != "${instance}" ]; then
+			continue
+		fi
+		if [ -e ${PID_DIRECTORY}/${instance}.pid ]; then
+			pid=$(cat ${PID_DIRECTORY}/${instance}.pid)
+			if [ $(echo "$pid" | grep -c $pid) -ge 1 ]; then
+				einfo "389 Directory Server: instance ${instance} (pid $pid) running."
+			else
+				ewarn "389 Directory Server: instance ${instance} (pid $pid) NOT running."
+			fi
+		else
+			eerror "389 Directory Server: instance ${instance} is NOT running."
+		fi
+	done
+}