Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at 2020-08-19 18:43:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openldap2 (Old) and /work/SRC/openSUSE:Factory/.openldap2.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openldap2" Wed Aug 19 18:43:17 2020 rev:155 rq:826785 version:unknown Changes: -------- --- /work/SRC/openSUSE:Factory/openldap2/openldap2.changes 2020-08-14 09:32:41.924379034 +0200 +++ /work/SRC/openSUSE:Factory/.openldap2.new.3399/openldap2.changes 2020-08-19 18:43:58.975437737 +0200 @@ -1,0 +2,13 @@ +Sat Aug 15 06:56:27 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Drop obsolete, not working DB_CONFIG +- Remove init.d header from start script, does not work +- Use bash for start script as syntax is not POSIX sh supported +- Remove UPDATE_NEEDED section in start script, does never match + +------------------------------------------------------------------- +Sat Aug 15 06:36:43 UTC 2020 - Thorsten Kukuk <[email protected]> + +- Remove remaining rc.status usage in start script + +------------------------------------------------------------------- Old: ---- DB_CONFIG ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2.spec ++++++ --- /var/tmp/diff_new_pack.QyXHnq/_old 2020-08-19 18:44:07.235442127 +0200 +++ /var/tmp/diff_new_pack.QyXHnq/_new 2020-08-19 18:44:07.239442129 +0200 @@ -44,7 +44,6 @@ Source: https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-%{version_main}.tgz Source1: slapd.conf Source2: slapd.conf.olctemplate -Source3: DB_CONFIG Source4: sasl-slapd.conf Source5: README.module-loading Source6: schema2ldif @@ -369,7 +368,6 @@ install -m 755 %{SOURCE17} %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_tmpfilesdir}/ install -m 644 %{SOURCE18} %{buildroot}%{_tmpfilesdir}/ -install -m 644 %{SOURCE3} %{buildroot}/usr/lib/openldap/ # Install ppolicy check module make -C contrib/slapd-modules/ppolicy-check-password STRIP="" DESTDIR="%{buildroot}" "sysconfdir=%{_sysconfdir}/openldap" "libdir=%{_libdir}" "libexecdir=%{_libexecdir}" install @@ -473,7 +471,6 @@ %config(noreplace) %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.olctemplate %config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.default %config %attr(640, root, ldap) %{_sysconfdir}/openldap/slapd.conf.example -%config(noreplace) %attr(640, ldap, ldap) /usr/lib/openldap/DB_CONFIG %dir %{_libdir}/openldap %dir /usr/lib/openldap %dir %{_sysconfdir}/sasl2 ++++++ openldap2.conf ++++++ --- /var/tmp/diff_new_pack.QyXHnq/_old 2020-08-19 18:44:07.375442202 +0200 +++ /var/tmp/diff_new_pack.QyXHnq/_new 2020-08-19 18:44:07.375442202 +0200 @@ -1,3 +1,2 @@ # openldap needs a directory in /var/lib/: d /var/lib/ldap 0750 ldap ldap - -L /var/lib/ldap/DB_CONFIG - - - - ../../../usr/lib/openldap/ ++++++ start ++++++ --- /var/tmp/diff_new_pack.QyXHnq/_old 2020-08-19 18:44:07.499442267 +0200 +++ /var/tmp/diff_new_pack.QyXHnq/_new 2020-08-19 18:44:07.499442267 +0200 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # Copyright (c) 1997-2000 SuSE GmbH Nuernberg, Germany. # Copyright (c) 2002 SuSE Linux AG Nuernberg, Germany. # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. @@ -6,18 +6,6 @@ # Author: Carsten Hoeger # Ralf Haferkamp # -# /etc/init.d/ldap -# -### BEGIN INIT INFO -# Provides: ldap -# Required-Start: $network $remote_fs -# Required-Stop: $network $remote_fs -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: OpenLDAP Server (slapd) -# Description: Start and Stop the OpenLDAP Server (slapd) to -# provide LDAP directory services. -### END INIT INFO # Determine the base and follow a runlevel link name. base=${0##*/} @@ -34,20 +22,6 @@ test -x $SLAPD_BIN || exit 5 -# Shell functions sourced from /etc/rc.status: -# rc_check check and set local and overall rc status -# rc_status check and set local and overall rc status -# rc_status -v ditto but be verbose in local rc status -# rc_status -v -r ditto and clear the local rc status -# rc_failed set local and overall rc status to failed -# rc_failed <num> set local and overall rc status to <num><num> -# rc_reset clear local rc status (overall remains) -# rc_exit exit appropriate to overall rc status -. /etc/rc.status - -# First reset status of this service -rc_reset - function init_ldap_listener_urls(){ case "$OPENLDAP_START_LDAP" in [Yy][Ee][Ss]) @@ -142,16 +116,6 @@ [ ! "x$OPENLDAP_CONFIG_BACKEND" = "xldap" ] && SLAPD_CONFIG_ARG="-f /etc/openldap/slapd.conf" -if [ -f /etc/openldap/UPDATE_NEEDED ]; then - rc_failed 6 - echo " The configuration of your LDAP server needs to be updated." - echo " Please see /usr/share/doc/packages/openldap2/README.update" - echo " for details." - echo " After the update please remove the file:" - echo " /etc/openldap/UPDATE_NEEDED" - rc_status -v - exit -fi # chown backend directories if OPENLDAP_CHOWN_DIRS ist set if [ "$(echo "$OPENLDAP_CHOWN_DIRS" | tr 'A-Z' 'a-z')" = "yes" ]; then if [ -n "$OPENLDAP_USER" -o -n "$OPENLDAP_GROUP" ]; then
