From 4bc2a66e3107f5a485abc1561a475a172e1f508d Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Oct 26 2020 21:15:46 +0000 Subject: Bump version to 1.4.4.6 Issue 4262 - Remove legacy tools subpackage (final cleanup) Issue 4262 - Remove legacy tools subpackage (restart instances after rpm install) Issue 4262 - Remove legacy tools subpackage Issue 2526 - revert API change in slapi_be_getsuffix() Issue 4363 - Sync repl: per thread structure was incorrectly initialized (#4395) Issue 4392 - Update create_test.py Issue 2820 - Fix CI tests (#4365) Issue 2526 - suffix management in backends incorrect Issue 4389 - errors log with incorrectly formatted message parent_update_on_childchange Issue 4295 - Fix a closing quote issue (#4386) Issue 1199 - Misleading message in access log for idle timeout (#4385) Issue 3600 - RFE - openldap migration tooling (#4318) Issue 4176 - import ldif2cl task should not close all changelogs Issue 4159 - Healthcheck code DSBLE0002 not returned on disabled suffix Issue 4379 - allow more than 1 empty AttributeDescription for ldapsearch, without the risk of denial of service (#4380) Issue 4329 - Sync repl - if a serie of updates target the same entry then the cookie get wrong changenumber (#4356) Issue 3555 - Fix npm audit issues (#4370) Issue 4372 - BUG - Chaining DB did not validate bind mech parameters (#4374) Issue 4334 - RFE - Task timeout may cause larger dataset imports to fail (#4359) Issue 4361 - RFE - add - dscreate --advanced flag to avoid user confusion Issue 4368 - ds-replcheck crashes when processing glue entries Issue 4366 - lib389 - Fix account status inactivity checks Issue 4265 - UI - Make the secondary plugins read-only (#4364) Issue 4360 - password policy max sequence sets is not working as expected Issue 4348 - Add tests for dsidm Issue 4350 - One line, fix invalid type error in tls_cacertdir check (#4358) --- diff --git a/.gitignore b/.gitignore index 2726e88..fa5f35b 100644 --- a/.gitignore +++ b/.gitignore @@ -197,3 +197,4 @@ /389-ds-base-1.4.4.3.tar.bz2 /389-ds-base-1.4.4.4.tar.bz2 /389-ds-base-1.4.4.5.tar.bz2 +/389-ds-base-1.4.4.6.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index db5daed..90627a2 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -17,7 +17,6 @@ ExcludeArch: i686 %global use_asan 0 %global use_rust 0 -%global use_legacy 1 %global bundle_jemalloc 1 %if %{use_asan} %global bundle_jemalloc 0 @@ -47,13 +46,15 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 1.4.4.5 +Version: 1.4.4.6 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv3+ URL: https://www.port389.org Conflicts: selinux-policy-base < 3.9.8 Conflicts: freeipa-server < 4.0.3 Obsoletes: %{name} <= 1.4.0.9 +Obsoletes: %{name}-legacy-tools < 1.4.4.6 +Obsoletes: %{name}-legacy-tools-debuginfo < 1.4.4.6 Provides: ldif2ldbm >= 0 BuildRequires: nspr-devel @@ -119,8 +120,6 @@ BuildRequires: python%{python3_pkgversion}-policycoreutils # For cockpit %if %{use_cockpit} BuildRequires: rsync -BuildRequires: npm -BuildRequires: nodejs %endif Requires: %{name}-libs = %{version}-%{release} @@ -205,33 +204,6 @@ Core libraries for the 389 Directory Server base package. These libraries are used by the main package and the -devel package. This allows the -devel package to be installed with just the -libs package and without the main package. -%if %{use_legacy} -%package legacy-tools -Summary: Legacy utilities for 389 Directory Server -Obsoletes: %{name} <= 1.4.0.9 -Requires: 389-ds-base-libs = %{version}-%{release} -# for setup-ds.pl to support ipv6 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -%if %{use_Socket6} -Requires: perl-Socket6 -%else -Requires: perl-Socket -%endif -Requires: perl-NetAddr-IP -# use_openldap assumes perl-Mozilla-LDAP is built with openldap support -Requires: perl-Mozilla-LDAP -# for setup-ds.pl -Requires: bind-utils -%global __provides_exclude_from %{_libdir}/%{pkgname}/perl -%global __requires_exclude perl\\((DSCreate|DSMigration|DSUpdate|DSUtil|Dialog|DialogManager|FileConn|Inf|Migration|Resource|Setup|SetupLog) -%{?perl_default_filter} - -%description legacy-tools -Legacy (and deprecated) utilities for 389 Directory Server. This includes -the old account management and task scripts. These are deprecated in favour of -the dscreate, dsctl, dsconf and dsidm tools. -%endif - %package devel Summary: Development libraries for 389 Directory Server Requires: %{name}-libs = %{version}-%{release} @@ -319,12 +291,6 @@ ASAN_FLAGS="--enable-asan --enable-debug" RUST_FLAGS="--enable-rust" %endif -%if %{use_legacy} -LEGACY_FLAGS="--enable-legacy --enable-perl" -%else -LEGACY_FLAGS="--disable-legacy --disable-perl" -%endif - %if !%{use_cockpit} COCKPIT_FLAGS="--disable-cockpit" %endif @@ -375,7 +341,7 @@ autoreconf -fiv --with-systemdsystemconfdir=%{_sysconfdir}/systemd/system \ --with-systemdgroupname=%{groupname} \ --libexecdir=%{_libexecdir}/%{pkgname} \ - $NSSARGS $ASAN_FLAGS $RUST_FLAGS $CLANG_FLAGS $LEGACY_FLAGS $COCKPIT_FLAGS \ + $NSSARGS $ASAN_FLAGS $RUST_FLAGS $CLANG_FLAGS $COCKPIT_FLAGS \ --enable-cmocka \ --enable-perl @@ -425,14 +391,13 @@ mkdir -p $RPM_BUILD_ROOT/var/lock/%{pkgname} # for systemd mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/%{groupname}.wants -#remove libtool archives and static libs -find %{buildroot} -type f -name "*.la" -delete -find %{buildroot} -type f -name "*.a" -delete - -%if %{use_legacy} -# make sure perl scripts have a proper shebang -sed -i -e 's|#{{PERL-EXEC}}|#!/usr/bin/perl|' $RPM_BUILD_ROOT%{_datadir}/%{pkgname}/script-templates/template-*.pl -%endif +# remove libtool archives and static libs +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/%{pkgname}/plugins/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/libsvrcore.a +rm -f $RPM_BUILD_ROOT%{_libdir}/libsvrcore.la %if %{bundle_jemalloc} pushd ../%{jemalloc_name}-%{jemalloc_ver} @@ -477,45 +442,9 @@ fi # Reload our sysctl before we restart (if we can) sysctl --system &> $output; true -%preun -if [ $1 -eq 0 ]; then # Final removal - # remove instance specific service files/links - rm -rf %{_sysconfdir}/systemd/system/%{groupname}.wants/* > /dev/null 2>&1 || : -fi - -%postun -if [ $1 = 0 ]; then # Final removal - rm -rf /var/run/%{pkgname} -fi - -%post snmp -%systemd_post %{pkgname}-snmp.service - -%preun snmp -%systemd_preun %{pkgname}-snmp.service %{groupname} - -%postun snmp -%systemd_postun_with_restart %{pkgname}-snmp.service - -%if %{use_legacy} -%post legacy-tools - -# START UPGRADE SCRIPT - -if [ -n "$DEBUGPOSTTRANS" ] ; then - output=$DEBUGPOSTTRANS - output2=${DEBUGPOSTTRANS}.upgrade -else - output=/dev/null - output2=/dev/null -fi - -# find all instances -instances="" # instances that require a restart after upgrade -ninst=0 # number of instances found in total - -echo looking for instances in %{_sysconfdir}/%{pkgname} > $output 2>&1 || : +# Gather the running instances so we can restart them instbase="%{_sysconfdir}/%{pkgname}" +ninst=0 for dir in $instbase/slapd-* ; do echo dir = $dir >> $output 2>&1 || : if [ ! -d "$dir" ] ; then continue ; fi @@ -534,34 +463,41 @@ done if [ $ninst -eq 0 ] ; then echo no instances to upgrade >> $output 2>&1 || : exit 0 # have no instances to upgrade - just skip the rest -fi -# shutdown all instances -echo shutting down all instances . . . >> $output 2>&1 || : -for inst in $instances ; do - echo stopping instance $inst >> $output 2>&1 || : - /bin/systemctl stop $inst >> $output 2>&1 || : -done -echo remove pid files . . . >> $output 2>&1 || : -/bin/rm -f /var/run/%{pkgname}*.pid /var/run/%{pkgname}*.startpid -# do the upgrade -echo upgrading instances . . . >> $output 2>&1 || : -DEBUGPOSTSETUPOPT=`/usr/bin/echo $DEBUGPOSTSETUP | /usr/bin/sed -e "s/[^d]//g"` -if [ -n "$DEBUGPOSTSETUPOPT" ] ; then - %{_sbindir}/setup-ds.pl -$DEBUGPOSTSETUPOPT -u -s General.UpdateMode=offline >> $output 2>&1 || : else - %{_sbindir}/setup-ds.pl -u -s General.UpdateMode=offline >> $output 2>&1 || : + # restart running instances + echo shutting down all instances . . . >> $output 2>&1 || : + for inst in $instances ; do + echo stopping instance $inst >> $output 2>&1 || : + /bin/systemctl stop $inst >> $output 2>&1 || : + done + for inst in $instances ; do + echo starting instance $inst >> $output 2>&1 || : + /bin/systemctl start $inst >> $output 2>&1 || : + done fi -# restart instances that require it -for inst in $instances ; do - echo restarting instance $inst >> $output 2>&1 || : - /bin/systemctl start $inst >> $output 2>&1 || : -done -#END UPGRADE -%endif -exit 0 +%preun +if [ $1 -eq 0 ]; then # Final removal + # remove instance specific service files/links + rm -rf %{_sysconfdir}/systemd/system/%{groupname}.wants/* > /dev/null 2>&1 || : +fi + +%postun +if [ $1 = 0 ]; then # Final removal + rm -rf /var/run/%{pkgname} +fi + +%post snmp +%systemd_post %{pkgname}-snmp.service + +%preun snmp +%systemd_preun %{pkgname}-snmp.service %{groupname} + +%postun snmp +%systemd_postun_with_restart %{pkgname}-snmp.service +exit 0 %files %if %{bundle_jemalloc} @@ -592,11 +528,11 @@ exit 0 %{_mandir}/man1/logconv.pl.1.gz %{_bindir}/pwdhash %{_mandir}/man1/pwdhash.1.gz -%{_bindir}/readnsstate -%{_mandir}/man1/readnsstate.1.gz #%caps(CAP_NET_BIND_SERVICE=pe) {_sbindir}/ns-slapd %{_sbindir}/ns-slapd %{_mandir}/man8/ns-slapd.8.gz +%{_sbindir}/openldap_to_ds +%{_mandir}/man8/openldap_to_ds.8.gz %{_libexecdir}/%{pkgname}/ds_systemd_ask_password_acl %{_mandir}/man5/99user.ldif.5.gz %{_mandir}/man5/certmap.conf.5.gz @@ -656,117 +592,6 @@ exit 0 %{_libdir}/%{pkgname}/librsds.so %endif -%if %{use_legacy} -%files legacy-tools -%doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel -%{_bindir}/infadd -%{_mandir}/man1/infadd.1.gz -%{_bindir}/ldif -%{_mandir}/man1/ldif.1.gz -%{_bindir}/migratecred -%{_mandir}/man1/migratecred.1.gz -%{_bindir}/mmldif -%{_mandir}/man1/mmldif.1.gz -%{_bindir}/rsearch -%{_mandir}/man1/rsearch.1.gz -%{_libexecdir}/%{pkgname}/ds_selinux_enabled -%{_libexecdir}/%{pkgname}/ds_selinux_port_query -%config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig -%{_mandir}/man5/template-initconfig.5.gz -%{_datadir}/%{pkgname}/properties/*.res -%{_datadir}/%{pkgname}/script-templates -%{_datadir}/%{pkgname}/updates -%{_sbindir}/ldif2ldap -%{_mandir}/man8/ldif2ldap.8.gz -%{_sbindir}/bak2db -%{_mandir}/man8/bak2db.8.gz -%{_sbindir}/db2bak -%{_mandir}/man8/db2bak.8.gz -%{_sbindir}/db2index -%{_mandir}/man8/db2index.8.gz -%{_sbindir}/db2ldif -%{_mandir}/man8/db2ldif.8.gz -%{_sbindir}/dbverify -%{_mandir}/man8/dbverify.8.gz -%{_sbindir}/ldif2db -%{_mandir}/man8/ldif2db.8.gz -%{_sbindir}/restart-dirsrv -%{_mandir}/man8/restart-dirsrv.8.gz -%{_sbindir}/start-dirsrv -%{_mandir}/man8/start-dirsrv.8.gz -%{_sbindir}/status-dirsrv -%{_mandir}/man8/status-dirsrv.8.gz -%{_sbindir}/stop-dirsrv -%{_mandir}/man8/stop-dirsrv.8.gz -%{_sbindir}/upgradedb -%{_mandir}/man8/upgradedb.8.gz -%{_sbindir}/vlvindex -%{_mandir}/man8/vlvindex.8.gz -%{_sbindir}/monitor -%{_mandir}/man8/monitor.8.gz -%{_sbindir}/dbmon.sh -%{_mandir}/man8/dbmon.sh.8.gz -%{_sbindir}/dn2rdn -%{_mandir}/man8/dn2rdn.8.gz -%{_sbindir}/restoreconfig -%{_mandir}/man8/restoreconfig.8.gz -%{_sbindir}/saveconfig -%{_mandir}/man8/saveconfig.8.gz -%{_sbindir}/suffix2instance -%{_mandir}/man8/suffix2instance.8.gz -%{_sbindir}/upgradednformat -%{_mandir}/man8/upgradednformat.8.gz -%{_mandir}/man1/dbgen.pl.1.gz -%{_bindir}/repl-monitor -%{_mandir}/man1/repl-monitor.1.gz -%{_bindir}/repl-monitor.pl -%{_mandir}/man1/repl-monitor.pl.1.gz -%{_bindir}/cl-dump -%{_mandir}/man1/cl-dump.1.gz -%{_bindir}/cl-dump.pl -%{_mandir}/man1/cl-dump.pl.1.gz -%{_bindir}/dbgen.pl -%{_mandir}/man8/bak2db.pl.8.gz -%{_sbindir}/bak2db.pl -%{_sbindir}/cleanallruv.pl -%{_mandir}/man8/cleanallruv.pl.8.gz -%{_sbindir}/db2bak.pl -%{_mandir}/man8/db2bak.pl.8.gz -%{_sbindir}/db2index.pl -%{_mandir}/man8/db2index.pl.8.gz -%{_sbindir}/db2ldif.pl -%{_mandir}/man8/db2ldif.pl.8.gz -%{_sbindir}/fixup-linkedattrs.pl -%{_mandir}/man8/fixup-linkedattrs.pl.8.gz -%{_sbindir}/fixup-memberof.pl -%{_mandir}/man8/fixup-memberof.pl.8.gz -%{_sbindir}/ldif2db.pl -%{_mandir}/man8/ldif2db.pl.8.gz -%{_sbindir}/migrate-ds.pl -%{_mandir}/man8/migrate-ds.pl.8.gz -%{_sbindir}/ns-accountstatus.pl -%{_mandir}/man8/ns-accountstatus.pl.8.gz -%{_sbindir}/ns-activate.pl -%{_mandir}/man8/ns-activate.pl.8.gz -%{_sbindir}/ns-inactivate.pl -%{_mandir}/man8/ns-inactivate.pl.8.gz -%{_sbindir}/ns-newpwpolicy.pl -%{_mandir}/man8/ns-newpwpolicy.pl.8.gz -%{_sbindir}/remove-ds.pl -%{_mandir}/man8/remove-ds.pl.8.gz -%{_sbindir}/schema-reload.pl -%{_mandir}/man8/schema-reload.pl.8.gz -%{_sbindir}/setup-ds.pl -%{_mandir}/man8/setup-ds.pl.8.gz -%{_sbindir}/syntax-validate.pl -%{_mandir}/man8/syntax-validate.pl.8.gz -%{_sbindir}/usn-tombstone-cleanup.pl -%{_mandir}/man8/usn-tombstone-cleanup.pl.8.gz -%{_sbindir}/verify-db.pl -%{_mandir}/man8/verify-db.pl.8.gz -%{_libdir}/%{pkgname}/perl -%endif - %files snmp %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel %config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf @@ -794,6 +619,35 @@ exit 0 %endif %changelog +* Mon Oct 26 2020 Mark Reynolds - 1.4.4.6-1 +- Bump version to 1.4.4.6 +- Issue 4262 - Remove legacy tools subpackage (final cleanup) +- Issue 4262 - Remove legacy tools subpackage (restart instances after rpm install) +- Issue 4262 - Remove legacy tools subpackage +- Issue 2526 - revert API change in slapi_be_getsuffix() +- Issue 4363 - Sync repl: per thread structure was incorrectly initialized (#4395) +- Issue 4392 - Update create_test.py +- Issue 2820 - Fix CI tests (#4365) +- Issue 2526 - suffix management in backends incorrect +- Issue 4389 - errors log with incorrectly formatted message parent_update_on_childchange +- Issue 4295 - Fix a closing quote issue (#4386) +- Issue 1199 - Misleading message in access log for idle timeout (#4385) +- Issue 3600 - RFE - openldap migration tooling (#4318) +- Issue 4176 - import ldif2cl task should not close all changelogs +- Issue 4159 - Healthcheck code DSBLE0002 not returned on disabled suffix +- Issue 4379 - allow more than 1 empty AttributeDescription for ldapsearch, without the risk of denial of service (#4380) +- Issue 4329 - Sync repl - if a serie of updates target the same entry then the cookie get wrong changenumber (#4356) +- Issue 3555 - Fix npm audit issues (#4370) +- Issue 4372 - BUG - Chaining DB did not validate bind mech parameters (#4374) +- Issue 4334 - RFE - Task timeout may cause larger dataset imports to fail (#4359) +- Issue 4361 - RFE - add - dscreate --advanced flag to avoid user confusion +- Issue 4368 - ds-replcheck crashes when processing glue entries +- Issue 4366 - lib389 - Fix account status inactivity checks +- Issue 4265 - UI - Make the secondary plugins read-only (#4364) +- Issue 4360 - password policy max sequence sets is not working as expected +- Issue 4348 - Add tests for dsidm +- Issue 4350 - One line, fix invalid type error in tls_cacertdir check (#4358) + * Mon Oct 5 2020 Mark Reynolds - 1.4.4.5-1 - Bump version to 1.4.4.5 - Issue 4347 - log when server requires a restart for a plugin to become active (#4352) @@ -845,6 +699,15 @@ exit 0 - Ticket 49300 - entryUSN is duplicated after memberOf operation - Ticket 50984 - Fix disk_mon_check_diskspace types - Ticket 50791 - Healthcheck to find notes=F +<<<<<<< HEAD +======= + +* Tue Sep 29 22:52:34 CEST 2020 Zbigniew Jędrzejewski-Szmek - 1.4.4.4-1.4 +- Rebuilt for libevent 2.1.12 (attempt #2) + +* Tue Sep 29 20:25:49 CEST 2020 Zbigniew Jędrzejewski-Szmek - 1.4.4.4-1.3 +- Rebuilt for libevent 2.1.12 +>>>>>>> 1aab708... Bump version to 1.4.4.6 * Thu Aug 27 2020 Josef Řídký - 1.4.4.4-1.2 - Rebuilt for new net-snmp release diff --git a/sources b/sources index 58a243d..b516217 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (389-ds-base-1.4.4.5.tar.bz2) = 87057246e4fa9e2efb079a54c160871d0da8639cb269f96fd9f4698e625a6e78039558500306cbff8d659915a9e8dd60f899585ae57f5ddc3bfdaf0c33946825 +SHA512 (389-ds-base-1.4.4.6.tar.bz2) = 4ce55096ce82b4de40341348ee6e8e785b27759980b5400567033ebeafd4b87317932d005ea213985db9a642aab11799c01e96a0a6df6747a92cbbda0c283c81 SHA512 (jemalloc-5.2.1.tar.bz2) = 0bbb77564d767cef0c6fe1b97b705d368ddb360d55596945aea8c3ba5889fbce10479d85ad492c91d987caacdbbdccc706aa3688e321460069f00c05814fae02