From 53173c291e35e648c89fc096ccd3a44f16f73d4b Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Aug 20 2012 18:01:00 +0000 Subject: 6c0778f bumped version to 1.2.11.11 Ticket 429 - added nsslapd-readonly to DS schema Ticket 403 - fix CLEANALLRUV regression from last commit Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values --- diff --git a/.gitignore b/.gitignore index d1a8d6c..2b750ac 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /389-ds-base-1.2.11.8.tar.bz2 /389-ds-base-1.2.11.9.tar.bz2 /389-ds-base-1.2.11.10.tar.bz2 +/389-ds-base-1.2.11.11.tar.bz2 diff --git a/389-ds-base-git-local.sh b/389-ds-base-git-local.sh index d3e215f..6a54b5e 100644 --- a/389-ds-base-git-local.sh +++ b/389-ds-base-git-local.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.11.10 +VERSION=1.2.11.11 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} #SRCNAME=$PKGNAME-$VERSION-$DATE diff --git a/389-ds-base-git.sh b/389-ds-base-git.sh index 2d9ca85..1439bc1 100644 --- a/389-ds-base-git.sh +++ b/389-ds-base-git.sh @@ -2,7 +2,7 @@ DATE=`date +%Y%m%d` # use a real tag name here -VERSION=1.2.11.10 +VERSION=1.2.11.11 PKGNAME=389-ds-base TAG=${TAG:-$PKGNAME-$VERSION} URL="http://git.fedorahosted.org/git/?p=389/ds.git;a=snapshot;h=$TAG;sf=tgz" diff --git a/389-ds-base.spec b/389-ds-base.spec index 729bdee..ba92fd5 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -21,7 +21,11 @@ Summary: 389 Directory Server (base) Name: 389-ds-base +<<<<<<< HEAD Version: 1.2.11.10 +======= +Version: 1.2.11.11 +>>>>>>> master Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv2 with exceptions URL: http://port389.org/ @@ -167,10 +171,12 @@ cp %{SOURCE2} README.devel OPENLDAP_FLAG="--with-openldap" %endif %{?with_tmpfiles_d: TMPFILES_FLAG="--with-tmpfiles-d=%{with_tmpfiles_d}"} +# hack hack hack https://bugzilla.redhat.com/show_bug.cgi?id=833529 +NSSARGS="--with-svrcore-inc=%{_includedir} --with-svrcore-lib=%{_libdir} --with-nss-lib=%{_libdir} --with-nss-inc=%{_includedir}/nss3" %configure --enable-autobind --with-selinux $OPENLDAP_FLAG $TMPFILES_FLAG \ --with-systemdsystemunitdir=%{_unitdir} \ --with-systemdsystemconfdir=%{_sysconfdir}/systemd/system \ - --with-systemdgroupname=%{groupname} + --with-systemdgroupname=%{groupname} $NSSARGS # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -309,6 +315,12 @@ fi %{_libdir}/%{pkgname}/libslapd.so.* %changelog +*Mon Aug 20 2012 Mark Reynolds - 1.2.11.11-1 +6c0778f bumped version to 1.2.11.11 +Ticket 429 - added nsslapd-readonly to DS schema +Ticket 403 - fix CLEANALLRUV regression from last commit +Trac Ticket #346 - Slow ldapmodify operation time for large quantities of multi-valued attribute values + * Tue Aug 15 2012 Mark Reynolds - 1.2.11.10-1 db6b354 bumped version to 1.2.11.10 Ticket 403 - CLEANALLRUV revisions @@ -339,6 +351,15 @@ Ticket #406 - Impossible to rename entry (modrdn) with Attribute Uniqueness plug Ticket #405 - referint modrdn not working if case is different Ticket 399 - slapi_ldap_bind() doesn't check bind results +<<<<<<< HEAD +======= +* Wed Jul 18 2012 Fedora Release Engineering - 1.2.11.7-2.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jun 28 2012 Petr Pisar - 1.2.11.7-2.1 +- Perl 5.16 rebuild + +>>>>>>> master * Wed Jun 27 2012 Rich Megginson - 1.2.11.7-2 - Ticket 378 - unhashed#user#password visible after changing password - fix func declaration from previous patch @@ -352,6 +373,12 @@ Ticket 399 - slapi_ldap_bind() doesn't check bind results - Ticket #378 - unhashed#user#password visible after changing password - Ticket #365 - passwords in clear text in the audit log +<<<<<<< HEAD +======= +* Tue Jun 19 2012 Rich Megginson - 1.2.11.5-2 +- workaround for https://bugzilla.redhat.com/show_bug.cgi?id=833529 + +>>>>>>> master * Mon Jun 18 2012 Rich Megginson - 1.2.11.5-1 - Ticket #387 - managed entry sometimes doesn't delete the managed entry - 5903815 improve txn test index handling @@ -363,6 +390,12 @@ Ticket 399 - slapi_ldap_bind() doesn't check bind results - Ticket 368 - Make the cleanAllRUV task one step - Ticket #110 - RFE limiting root DN by host, IP, time of day, day of week +<<<<<<< HEAD +======= +* Mon Jun 11 2012 Petr Pisar - 1.2.11.4-1.1 +- Perl 5.16 rebuild + +>>>>>>> master * Tue May 22 2012 Rich Megginson - 1.2.11.4-1 - Ticket #360 - ldapmodify returns Operations error - Ticket #321 - krbExtraData is being null modified and replicated on each ssh login diff --git a/sources b/sources index c0b3ce5..beee089 100644 --- a/sources +++ b/sources @@ -1 +1,5 @@ +<<<<<<< HEAD d8ceee738c93f9de746d0a11393bad6b 389-ds-base-1.2.11.10.tar.bz2 +======= +26c430ed287218c4fa55e336ee5498a7 389-ds-base-1.2.11.11.tar.bz2 +>>>>>>> master