From a880a76292500ca83a040bd1e76ad45e3da73ec3 Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Apr 13 2018 14:47:29 +0000 Subject: Bump version to 1.4.0.7 Ticket 49477 - Missing pbkdf python Ticket 49552 - Fix the last of the build issues on F28/29 Ticket 49522 - Fix build issues on F28 Ticket 49631 - same csn generated twice Ticket 49585 - Add py3 support to password test suite : part-3 Ticket 49585 - Add py3 support to password test suite : part-2 Ticket 48184 - revert previous patch around unuc-stans shutdown crash Ticket 49585 - Add py3 support to password test suite Ticket 46918 - Fix compiler warnings on arm Ticket 49601 - Replace HAVE_SYSTEMD define with WITH_SYSTEMD in svrcore Ticket 49619 - adjustment of csn_generator can fail so next generated csn can be equal to the most recent one received Ticket 49608 - Add support for gcc/clang sanitizers Ticket 49606 - Improve lib389 documentation Ticket 49552 - Fix build issues on F28 Ticket 49603 - 389-ds-base package rebuilt on EPEL can't be installed due to missing dependencies Ticket 49593 - NDN cache stats should be under the global stats Ticket 49599 - Revise replication total init status messages Ticket 49596 - repl-monitor.pl fails to find db tombstone/RUV entry Ticket 49589 - merge svrcore into 389-ds-base Ticket 49560 - Add a test case for extract-pemfiles Ticket 49239 - Add a test suite for ds-replcheck tool RFE Ticket 49369 - merge svrcore into 389-ds-base --- diff --git a/.gitignore b/.gitignore index 854c5f4..7a40a6d 100644 --- a/.gitignore +++ b/.gitignore @@ -157,3 +157,4 @@ /389-ds-base-1.4.0.4.tar.bz2 /389-ds-base-1.4.0.5.tar.bz2 /389-ds-base-1.4.0.6.tar.bz2 +/389-ds-base-1.4.0.7.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index f4f2436..0ebbf9a 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -44,8 +44,8 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 1.4.0.6 -Release: %{?relprefix}3%{?prerel}%{?dist} +Version: 1.4.0.7 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv3+ URL: http://www.port389.org Group: System Environment/Daemons @@ -57,7 +57,6 @@ Provides: ldif2ldbm >= 0 BuildRequires: nspr-devel BuildRequires: nss-devel >= 3.34 BuildRequires: perl-generators -BuildRequires: svrcore-devel >= 4.1.3 BuildRequires: openldap-devel BuildRequires: libdb-devel BuildRequires: cyrus-sasl-devel @@ -89,6 +88,9 @@ BuildRequires: libasan BuildRequires: cargo BuildRequires: rust %endif +BuildRequires: pkgconfig +BuildRequires: pkgconfig(systemd) + # Needed to support regeneration of the autotool artifacts. BuildRequires: autoconf BuildRequires: automake @@ -160,7 +162,6 @@ Requires: perl-Socket %endif Requires: perl-NetAddr-IP Requires: systemd-libs -Requires: svrcore >= 4.1.3 Obsoletes: %{name} <= 1.3.5.4 @@ -183,7 +184,6 @@ Summary: Core libraries for 389 Directory Server Group: System Environment/Daemons BuildRequires: nspr-devel BuildRequires: nss-devel >= 3.34 -BuildRequires: svrcore-devel >= 4.1.3 BuildRequires: openldap-devel BuildRequires: libdb-devel BuildRequires: cyrus-sasl-devel @@ -194,6 +194,9 @@ BuildRequires: libevent-devel BuildRequires: libtevent-devel Requires: libevent BuildRequires: systemd-devel +Provides: svrcore = 4.1.4 +Conflicts: svrcore +Obsoletes: svrcore <= 4.1.3 %description libs Core libraries for the 389 Directory Server base package. These libraries @@ -207,12 +210,14 @@ Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig Requires: nspr-devel Requires: nss-devel >= 3.34 -Requires: svrcore-devel >= 4.1.3 Requires: openldap-devel Requires: libtalloc Requires: libevent Requires: libtevent Requires: systemd-libs +Provides: svrcore = 4.1.4 +Conflicts: svrcore +Obsoletes: svrcore <= 4.1.3 %description devel Development Libraries and headers for the 389 Directory Server base package. @@ -270,7 +275,7 @@ sed -r -i '1s|^#!\s*/usr/bin.*python.*|#!%{__python3}|' ldap/admin/src/scripts/{ OPENLDAP_FLAG="--with-openldap" %{?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" +NSSARGS="--with-nss-lib=%{_libdir} --with-nss-inc=%{_includedir}/nss3" %if %{use_asan} ASAN_FLAGS="--enable-asan --enable-debug" @@ -294,6 +299,9 @@ export CXX=clang++ CLANG_FLAGS="--enable-clang" %endif +# Enforce strict linking +%define _strict_symbol_defs_build 1 + # Rebuild the autotool artifacts now. autoreconf -fiv @@ -320,7 +328,8 @@ popd # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS -make %{?_smp_mflags} +#make %{?_smp_mflags} +make %install @@ -550,18 +559,24 @@ fi %defattr(-,root,root,-) %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel %{_mandir}/man3/* +%{_includedir}/svrcore.h %{_includedir}/%{pkgname} +%{_libdir}/libsvrcore.so %{_libdir}/%{pkgname}/libslapd.so %{_libdir}/%{pkgname}/libns-dshttpd.so %{_libdir}/%{pkgname}/libnunc-stans.so %{_libdir}/%{pkgname}/libsds.so %{_libdir}/%{pkgname}/libldaputil.so -%{_libdir}/pkgconfig/* +%{_libdir}/pkgconfig/svrcore.pc +%{_libdir}/pkgconfig/dirsrv.pc +%{_libdir}/pkgconfig/libsds.pc +%{_libdir}/pkgconfig/nunc-stans.pc %files libs %defattr(-,root,root,-) %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel %dir %{_libdir}/%{pkgname} +%{_libdir}/libsvrcore.so.* %{_libdir}/%{pkgname}/libslapd.so.* %{_libdir}/%{pkgname}/libns-dshttpd-*.so %{_libdir}/%{pkgname}/libnunc-stans.so.* @@ -594,6 +609,31 @@ fi %{python3_sitelib}/dirsrvtests* %changelog +* Fri Apr 13 2018 Mark Reynolds - 1.4.0.7-1 +- Bump version to 1.4.0.7 +- Ticket 49477 - Missing pbkdf python +- Ticket 49552 - Fix the last of the build issues on F28/29 +- Ticket 49522 - Fix build issues on F28 +- Ticket 49631 - same csn generated twice +- Ticket 49585 - Add py3 support to password test suite : part-3 +- Ticket 49585 - Add py3 support to password test suite : part-2 +- Ticket 48184 - revert previous patch around unuc-stans shutdown crash +- Ticket 49585 - Add py3 support to password test suite +- Ticket 46918 - Fix compiler warnings on arm +- Ticket 49601 - Replace HAVE_SYSTEMD define with WITH_SYSTEMD in svrcore +- Ticket 49619 - adjustment of csn_generator can fail so next generated csn can be equal to the most recent one received +- Ticket 49608 - Add support for gcc/clang sanitizers +- Ticket 49606 - Improve lib389 documentation +- Ticket 49552 - Fix build issues on F28 +- Ticket 49603 - 389-ds-base package rebuilt on EPEL can't be installed due to missing dependencies +- Ticket 49593 - NDN cache stats should be under the global stats +- Ticket 49599 - Revise replication total init status messages +- Ticket 49596 - repl-monitor.pl fails to find db tombstone/RUV entry +- Ticket 49589 - merge svrcore into 389-ds-base +- Ticket 49560 - Add a test case for extract-pemfiles +- Ticket 49239 - Add a test suite for ds-replcheck tool RFE +- Ticket 49369 - merge svrcore into 389-ds-base + * Thu Mar 29 2018 Till Maas - 1.4.0.6-3 - Remove BR on tcp_wrappers (https://bugzilla.redhat.com/show_bug.cgi?id=1518749) diff --git a/sources b/sources index 544e073..5a7c407 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (389-ds-base-1.4.0.6.tar.bz2) = 612bd31c3818b045070f7ceed91fce2d6ceabafb33f274e62c0db355e89463d333d9d397e7c03a30f997345fbe5fe7f3f7f590f584c54c7f71ef34ca225ca7d2 +SHA512 (389-ds-base-1.4.0.7.tar.bz2) = 16dd67f6a82ff5692d74c1774983b0f6a9f9c9ff761ac4ce021497a7766dc72952b3adb46ba87e7ca100aadf837703f6b42bede19275a6bda1cd1d5839e7eea4