[openldap] remove redundant sysconfig-related stuff
jsynacek
jsynacek at fedoraproject.org
Thu Feb 20 07:58:31 UTC 2014
commit cb0643e6285d35302758d2c72048afec180a3307
Author: Jan Synacek <jsynacek at redhat.com>
Date: Wed Feb 19 16:14:35 2014 +0100
remove redundant sysconfig-related stuff
openldap.spec | 36 ++++--------------------------------
slapd.service | 4 +---
slapd.sysconfig | 15 ---------------
3 files changed, 5 insertions(+), 50 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index a4a6d2a..d43964d 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -5,14 +5,13 @@
Name: openldap
Version: 2.4.39
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: LDAP support libraries
Group: System Environment/Daemons
License: OpenLDAP
URL: http://www.openldap.org/
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
Source1: slapd.service
-Source2: slapd.sysconfig
Source3: slapd.tmpfiles
Source4: slapd.ldif
Source5: ldap.conf
@@ -317,10 +316,6 @@ rm -f %{buildroot}%{_sysconfdir}/openldap/schema/*.default
mkdir -p %{buildroot}%{_unitdir}
install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/slapd.service
-# install syconfig/ldap
-mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
-install -m 644 %SOURCE2 %{buildroot}%{_sysconfdir}/sysconfig/slapd
-
# move slapd out of _libdir
mv %{buildroot}%{_libdir}/slapd %{buildroot}%{_sbindir}/
@@ -416,31 +411,6 @@ if [ -f %{_sharedstatedir}/ldap/rpm_upgrade_openldap ]; then
rm -f %{_sharedstatedir}/ldap/rpm_upgrade_openldap
fi
-# conversion from /etc/sysconfig/ldap to /etc/sysconfig/slapd
-if [ $1 -eq 2 ]; then
- # we expect that 'ldap' will be renamed to 'ldap.rpmsave' after removing the old package
- [ -r %{_sysconfdir}/sysconfig/ldap ] || exit 0
- source %{_sysconfdir}/sysconfig/ldap &>/dev/null
-
- new_urls=
- [ "$SLAPD_LDAP" != "no" ] && new_urls="$new_urls ldap:///"
- [ "$SLAPD_LDAPI" != "no" ] && new_urls="$new_urls ldapi:///"
- [ "$SLAPD_LDAPS" == "yes" ] && new_urls="$new_urls ldaps:///"
- [ -n "$SLAPD_URLS" ] && new_urls="$new_urls $SLAPD_URLS"
-
- failure=0
- cp -f %{_sysconfdir}/sysconfig/slapd %{_sysconfdir}/sysconfig/slapd.rpmconvert
- sed -i '/^#\?SLAPD_URLS=/s at .*@SLAPD_URLS="'"$new_urls"'"@' %{_sysconfdir}/sysconfig/slapd.rpmconvert &>/dev/null || failure=1
- [ -n "$SLAPD_OPTIONS" ] && \
- sed -i '/^#\?SLAPD_OPTIONS=/s at .*$@SLAPD_OPTIONS="'"$SLAPD_OPTIONS"'"@' %{_sysconfdir}/sysconfig/slapd.rpmconvert &>/dev/null || failure=1
-
- if [ $failure -eq 0 ]; then
- mv -f %{_sysconfdir}/sysconfig/slapd.rpmconvert %{_sysconfdir}/sysconfig/slapd
- else
- rm -f %{_sysconfdir}/sysconfig/slapd.rpmconvert
- fi
-fi
-
# restart after upgrade
if [ $1 -ge 1 ]; then
if [ $start_slapd -eq 1 ]; then
@@ -535,7 +505,6 @@ exit 0
%doc README.schema
%config(noreplace) %dir %attr(0750,ldap,ldap) %{_sysconfdir}/openldap/slapd.d
%config(noreplace) %{_sysconfdir}/openldap/schema
-%config(noreplace) %{_sysconfdir}/sysconfig/slapd
%config(noreplace) %{_sysconfdir}/openldap/check_password.conf
%{_tmpfilesdir}/slapd.conf
%dir %attr(0700,ldap,ldap) %{_sharedstatedir}/ldap
@@ -602,6 +571,9 @@ exit 0
%{_mandir}/man3/*
%changelog
+* Wed Feb 19 2014 Jan Synáček <jsynacek at redhat.com> - 2.4.39-3
+- remove redundant sysconfig-related stuff
+
* Tue Feb 4 2014 Jan Synáček <jsynacek at redhat.com> - 2.4.39-2
- CVE-2013-4449: segfault on certain queries with rwm overlay (#1060851)
diff --git a/slapd.service b/slapd.service
index 7e0589c..db31d39 100644
--- a/slapd.service
+++ b/slapd.service
@@ -5,10 +5,8 @@ After=syslog.target network.target
[Service]
Type=forking
PIDFile=/var/run/openldap/slapd.pid
-Environment="SLAPD_URLS=ldap:/// ldapi:///" "SLAPD_OPTIONS="
-EnvironmentFile=/etc/sysconfig/slapd
ExecStartPre=/usr/libexec/openldap/check-config.sh
-ExecStart=/usr/sbin/slapd -u ldap -h ${SLAPD_URLS} $SLAPD_OPTIONS
+ExecStart=/usr/sbin/slapd -u ldap -h "ldap:/// ldapi:///"
[Install]
WantedBy=multi-user.target
More information about the scm-commits
mailing list