commit 6b6115e3dfe111148b7f115740f2f1d7dd8c7201
Author: Elan Ruusamäe <[email protected]>
Date: Wed Apr 3 18:04:18 2013 +0300
OpenLDAP 2.4.35 Release (2013/03/31)
- Fixed liblmdb mdb_cursor_put with MDB_MULTIPLE (ITS#7551)
- Fixed liblmdb page rebalance (ITS#7536)
- Fixed liblmdb missing parens (ITS#7377)
- Fixed liblmdb mdb_cursor_del crash (ITS#7553)
- Fixed slapd syncrepl updateCookie status (ITS#7531)
- Fixed slapd connection logging (ITS#7543)
- Fixed slapd segfault on modify (ITS#7542, ITS#7432)
- Fixed slapd-mdb to reject undefined attrs (ITS#7540)
- Fixed slapo-pcache with +/- attrsets (ITS#7552)
- Build Environment
- don't install DB_CONFIG if no BDB backends (ITS#7533)
- Documentation
- slapschema(8) fix tool name (ITS#7534)
- admin24 fixed pcache example (ITS#7546)
- admin24 fixed config examples (ITS#7522)
openldap-install.patch | 12 ++++++------
openldap.spec | 43 ++++++++++++++++++++++---------------------
2 files changed, 28 insertions(+), 27 deletions(-)
---
diff --git a/openldap.spec b/openldap.spec
index 98a9b0e..a69250e 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -24,12 +24,12 @@ Summary(pt_BR.UTF-8): Clientes e servidor para LDAP
Summary(ru.UTF-8): Образцы клиентов LDAP
Summary(uk.UTF-8): Зразки клієнтів LDAP
Name: openldap
-Version: 2.4.34
+Version: 2.4.35
Release: 1
License: OpenLDAP Public License
Group: Networking/Daemons
Source0:
ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
-# Source0-md5: df93a62e396ac312333cdeab0c5b48b6
+# Source0-md5: cd75d82ca89fb0280cba66ca6bd97448
Source1: http://download.oracle.com/berkeley-db/db-%{db_version}.tar.gz
# Source1-md5: 718082e7e35fc48478a2334b0bc4cd11
Source2: ldap.init
@@ -1169,24 +1169,22 @@ Requires(post,preun): sed >= 4.0
Requires: %{name}-servers = %{version}-%{release}
%description overlay-samba4
-This package contains overlays specific to samba4 LDAP backend.
-pguid overlay maintains the operational attribute "parentUUID".
-It contains the entryUUID of the parent entry.
-rdnval overlay maintains the operational attribute "rdnValue".
-It contains the value of the entry's RDN.
-vernum overlay increments a counter any time an attribute is modified.
-It is intended to increment the counter 'msDS-KeyVersionNumber' when
-the attribute 'unicodePwd' is modified.
+This package contains overlays specific to samba4 LDAP backend. pguid
+overlay maintains the operational attribute "parentUUID". It contains
+the entryUUID of the parent entry. rdnval overlay maintains the
+operational attribute "rdnValue". It contains the value of the entry's
+RDN. vernum overlay increments a counter any time an attribute is
+modified. It is intended to increment the counter
+'msDS-KeyVersionNumber' when the attribute 'unicodePwd' is modified.
%description overlay-samba4 -l pl.UTF-8
Ten pakiet zawiera nakładki specyficzne dla backendu LDAP samba4.
pguid obsługuje atrybut operacyjny "parentUUID", który zawiera
-entryUUID nadrzędnej pozycji.
-rdnval obsługuje atrybut operacyjny "rdnValue", który zawiera
-wartość RDN danej pozycji.
-vernum zwiększa licznik za każdym razem gdy jakiś atrybut jest
-modyfikowany. Jest przeznaczony do zwiększania licznika
-'msDS-KeyVersionNumber' gdy modyfikowany jest atrybut 'unicodePwd'.
+entryUUID nadrzędnej pozycji. rdnval obsługuje atrybut operacyjny
+"rdnValue", który zawiera wartość RDN danej pozycji. vernum zwiększa
+licznik za każdym razem gdy jakiś atrybut jest modyfikowany. Jest
+przeznaczony do zwiększania licznika 'msDS-KeyVersionNumber' gdy
+modyfikowany jest atrybut 'unicodePwd'.
%package overlay-smbk5pwd
Summary: smbk5pwd overlay for OpenLDAP server
@@ -1455,7 +1453,7 @@ rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{/etc/{sysconfig,rc.d/init.d},/var/lib/openldap-data} \
$RPM_BUILD_ROOT{%{_sbindir},%{_libdir},%{schemadir}} \
$RPM_BUILD_ROOT/var/run/{slapd,nslcd} \
- $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
+ $RPM_BUILD_ROOT%{systemdtmpfilesdir}
%if %{with exchange}
# Install evolution hack first and remove everything but devel stuff
@@ -1497,8 +1495,8 @@ echo ".so ldap.conf.5"
>$RPM_BUILD_ROOT%{_mandir}/man5/ldaprc.5
# Config for nss_ldap and pam_ldap
cp -p %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/ldap.conf
-cp -p %{SOURCE6} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/slapd.conf
-cp -p %{SOURCE7} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/nssov.conf
+cp -p %{SOURCE6} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/slapd.conf
+cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/nssov.conf
echo "localhost" > $RPM_BUILD_ROOT%{_sysconfdir}/openldap/ldapserver
@@ -1542,6 +1540,9 @@ for i in $RPM_BUILD_ROOT%{_libdir}/openldap/*.so ; do
fi
done
+# bogus include
+%{__sed} -i -e '/^\.so \.\.\/Project/d'
$RPM_BUILD_ROOT%{_mandir}/man5/slapo-nops.5
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -2020,7 +2021,7 @@ fi
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/openldap/schema/*.schema
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ldap
%attr(754,root,root) /etc/rc.d/init.d/ldap
-/usr/lib/tmpfiles.d/slapd.conf
+%{systemdtmpfilesdir}/slapd.conf
%attr(770,root,slapd) %{_var}/run/slapd
%dir %attr(770,root,slapd) %{_localstatedir}/openldap-data
%attr(660,root,slapd) %{_localstatedir}/openldap-data/*
@@ -2345,7 +2346,7 @@ fi
%{schemadir}/ldapns.schema
%{_mandir}/man5/slapo-nssov.5*
%attr(755,slapd,slapd) %dir /var/run/nslcd
-/usr/lib/tmpfiles.d/nssov.conf
+%{systemdtmpfilesdir}/nssov.conf
%files overlay-proxyOld
%defattr(644,root,root,755)
diff --git a/openldap-install.patch b/openldap-install.patch
index 4f85857..8174bcd 100644
--- a/openldap-install.patch
+++ b/openldap-install.patch
@@ -1,11 +1,11 @@
---- openldap-2.3.20/servers/slapd/Makefile.in~ 2006-02-28 12:21:11.000000000
+0200
-+++ openldap-2.3.20/servers/slapd/Makefile.in 2006-02-28 12:56:13.000000000
+0200
-@@ -370,7 +370,7 @@
- done
+--- openldap-2.4.35/servers/slapd/Makefile.in~ 2013-04-03 18:01:39.000000000
+0300
++++ openldap-2.4.35/servers/slapd/Makefile.in 2013-04-03 18:02:55.360948577
+0300
+@@ -373,7 +373,7 @@
+ install-dbc-no:
install-local-srv: install-slapd install-tools \
-- install-conf install-db-config install-schema install-tools
-+ install-conf install-db-config install-schema
+- install-conf install-dbc-maybe install-schema install-tools
++ install-conf install-dbc-maybe install-schema
install-slapd: FORCE
-$(MKDIR) $(DESTDIR)$(libexecdir)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openldap.git/commitdiff/6b6115e3dfe111148b7f115740f2f1d7dd8c7201
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
