diff --git a/.gitignore b/.gitignore index 5d24349..1e40481 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,4 @@ /389-ds-base-1.3.5.13.tar.bz2 /389-ds-base-1.3.5.14.tar.bz2 /nunc-stans-0.2.0.tar.bz2 +/389-ds-base-1.3.6.1.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index d8fa8bf..1fb49b5 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -33,8 +33,8 @@ Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 1.3.5.14 -Release: %{?relprefix}2%{?prerel}%{?dist} +Version: 1.3.6.1 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv3+ URL: https://www.port389.org Group: System Environment/Daemons @@ -237,11 +237,15 @@ sed -r -i '1s|^#!\s*/usr/bin.*python.*|#!%{__python3}|' ldap/admin/src/scripts/* %if %{use_nunc_stans} pushd ../nunc-stans-%{nunc_stans_ver} %configure --with-fhs --libdir=%{_libdir}/%{pkgname} -make %{?_smp_mflags} -mkdir -p lib -cp .libs/libnunc-stans.so.0.0.0 lib/libnunc-stans.so -mkdir -p include/nunc-stans -cp nunc-stans.h include/nunc-stans/nunc-stans.h +# We install into our build dir first, then later we install to the correct build root. +# This is to make it possible for directory server to use us, else we can't resolve +# liblfds during link time. +# Frankly, this is horrible, but until we can make nunc-stans a package, it'll +# have to do... :( +# Can't use SMP flags here +make DESTDIR=`pwd` install +# Remove these else it breaks libtool +rm ./%{_libdir}/%{pkgname}/*.{a,la} popd %endif @@ -253,7 +257,7 @@ OPENLDAP_FLAG="--with-openldap" NSSARGS="--with-svrcore-inc=%{_includedir} --with-svrcore-lib=%{_libdir} --with-nss-lib=%{_libdir} --with-nss-inc=%{_includedir}/nss3" %if %{use_nunc_stans} -NUNC_STANS_FLAGS="--enable-nunc-stans --with-nunc-stans=../nunc-stans-%{nunc_stans_ver}" +NUNC_STANS_FLAGS="--enable-nunc-stans --with-nunc-stans=../nunc-stans-%{nunc_stans_ver}/usr --with-nunc-stans-inc=../nunc-stans-%{nunc_stans_ver}/%{_includedir} --with-nunc-stans-lib=../nunc-stans-%{nunc_stans_ver}/%{_libdir}/%{pkgname}" %endif # Rebuild the autotool artifacts now. @@ -275,9 +279,8 @@ make %{?_smp_mflags} %install %if %{use_nunc_stans} pushd ../nunc-stans-%{nunc_stans_ver} +# This is the *actual* install of nunc-stans. make DESTDIR="$RPM_BUILD_ROOT" install -rm -rf $RPM_BUILD_ROOT%{_includedir} $RPM_BUILD_ROOT%{_datadir} \ - $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/pkgconfig popd %endif @@ -431,6 +434,9 @@ fi %{_mandir}/man8/* %exclude %{_sbindir}/ldap-agent* %exclude %{_mandir}/man1/ldap-agent.1.gz +# Don't rm these files, just exclude them! +%exclude %{_libdir}/%{pkgname}/pkgconfig/nunc-stans.pc +%exclude %{_includedir}/nunc-stans/nunc-stans.h %files devel %defattr(-,root,root,-) @@ -440,7 +446,7 @@ fi %{_libdir}/%{pkgname}/libns-dshttpd.so %if %{use_nunc_stans} %{_libdir}/%{pkgname}/libnunc-stans.so -%{_libdir}/%{pkgname}/liblfds710.so.* +%{_libdir}/%{pkgname}/liblfds710.so %endif %{_libdir}/pkgconfig/* @@ -468,6 +474,65 @@ fi %{_sysconfdir}/%{pkgname}/dirsrvtests %changelog +* Thu Oct 27 2016 Noriko Hosoi - 1.3.6.1-0 +- Bump version to 1.3.6.1-1 +- Ticket 142 - Refactor and move CI test +- Ticket 47703 - remove search limit for aci group evaluation +- Ticket 47978 - Refactor slapi_log_error +- Ticket 48272 - ADDN Sytle prebind plugin +- Ticket 48272 - Fix compiler warnings for addn +- Ticket 48278 - cleanAllRUV should remove keep-alive entry +- Ticket 48328 - Add missing dependency +- Ticket 48414 - cleanAllRUV should clean the agreement RUV +- Ticket 48538 - Failed to delete old semaphore +- Ticket 48805 - Misleading indent and Uninitialised struct member +- Ticket 48805 - Sign comparison checks. +- Ticket 48832 - Fix CI test suite for password min age +- Ticket 48896 - CI test: test case for ticket 48896 +- Ticket 48896 - Default Setting for passwordMinTokenLength does not work +- Ticket 48906 - Allow nsslapd-db-locks to be configurable online +- Ticket 48909 - Replication stops working in FIPS mode +- Ticket 48921 - CI Replication stress tests have limits set too low +- Ticket 48944 - on a read only replica invalid state info can accumulate +- Ticket 48947 - Update default password hash to SSHA512 +- Ticket 48957 - Update repl-monitor to handle new status messages +- Ticket 48969 - nsslapd-auditfaillog always has an explicit path +- Ticket 48978 - Build fails on i686 +- Ticket 48978 - Convert slapi_log_error() to a variadic macro +- Ticket 48978 - Fine tune error logging +- Ticket 48978 - Fix CI test to account for new logging format +- Ticket 48978 - Fix logging format errors and replace LDAP_DEBUG +- Ticket 48978 - refactor LDADebug() to slapi_log_err() +- Ticket 48978 - refactor LDAPDebug() +- Ticket 48978 - Update error logging with new codes +- Ticket 48978 - Update the logging function to accept sev level +- Ticket 48979 - Allow to compile 389ds with warning Wstrict-prototypes +- Ticket 48979 - Strict Prototypes +- Ticket 48982 - Comment about resolving failure to open plugin. +- Ticket 48982 - Enabling a plugin that has a versioned so causes overflow +- Ticket 48982 - One line fix, remove unused variable. +- Ticket 48982 - When plugin doesn't enable, actually log the path it used +- Ticket 48983 - Configure and Makefile.in from new default paths work. +- Ticket 48983 - generate install path info from autotools scripts +- Ticket 48984 - Add lib389 paths module +- Ticket 48986 - 47808 triggers overflow in uiduniq.c +- Ticket 48992 - Total init may fail if the pushed schema is rejected +- Ticket 48996 - Fix rpm to work with ns 0.2.0 +- Ticket 48996 - remove unused variable. +- Ticket 48996 - update DS for ns 0.2.0 +- Ticket 49005 - Update lib389 to work in containers correctly. +- Ticket 49006 - Enable nunc-stans by default. +- Ticket 49006 - Nunc stans use DS stack size +- Ticket 49007 - Update configure scripts +- Ticket 49007 - Update DS basic test to better work with systemd. +- Ticket 49009 - args debug logging must be more restrictive +- Ticket 49011 - Remove configure artifacts +- Ticket 49012 - Removed un-used counters +- Ticket 49013 - Correct signal handling with NS in DS +- Ticket 49014 - ns-accountstatus.pl shows wrong status for accounts inactivated by Account policy plugin +- Ticket 49017 - Various minor test failures +- use a consumer maxcsn only as anchor if supplier is more advanced + * Mon Oct 24 2016 Mark Reynolds - 1.3.5.14-2 - Bump version to 1.3.5.14-2 - Ticket 49011 - Remove configure artifacts diff --git a/sources b/sources index 0dfec84..4b6e168 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -da904ecf941ff53ee2e066187cb79d50 nunc-stans-0.2.0.tar.bz2 +cf6c4698fca2d4a3214f07276f70b121 nunc-stans-0.2.0.tar.bz2 +615eaea5306dd22c4407352ebaf95eb1 389-ds-base-1.3.6.1.tar.bz2