diff --git a/.gitignore b/.gitignore index 136df8a..81514c1 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,4 @@ /389-ds-base-1.3.5.1.tar.bz2 /389-ds-base-1.3.5.3.tar.bz2 /389-ds-base-1.3.5.4.tar.bz2 +/389-ds-base-1.3.5.5.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index d12655e..ac67bd7 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.4 -Release: %{?relprefix}1%{?prerel}%{?dist}.1 +Version: 1.3.5.5 +Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv3+ URL: https://port389.org/ Group: System Environment/Daemons @@ -135,6 +135,9 @@ Source3: https://git.fedorahosted.org/cgit/nunc-stans.git/snapshot/nunc 389 Directory Server is an LDAPv3 compliant server. The base package includes the LDAP server and command line utilities for server administration. +# upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp +Obsoletes: %{name} <= 1.3.5.4 + %package libs Summary: Core libraries for 389 Directory Server Group: System Environment/Daemons @@ -189,6 +192,25 @@ Requires: systemd-libs %description devel Development Libraries and headers for the 389 Directory Server base package. +%package snmp +Summary: SNMP Agent for 389 Directory Server +Group: System Environment/Daemons +Requires: %{name} = %{version}-%{release} + +%description snmp +SNMP Agent for the 389 Directory Server base package. + +# upgrade path from monolithic %{name} (including -libs & -devel) to %{name} + %{name}-snmp +Obsoletes: %{name} <= 1.3.5.4 + +%package tests +Summary: The lib389 Continuous Integration Tests +Group: Development/Libraries +Requires: python-lib389 + +%description tests +The lib389 CI tests that can be run against the Directory Server. + %prep %setup -q -n %{name}-%{version}%{?prerel} %if %{use_nunc_stans} @@ -219,7 +241,7 @@ OPENLDAP_FLAG="--with-openldap" # 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" %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}" %endif %configure --enable-autobind --with-selinux $OPENLDAP_FLAG $TMPFILES_FLAG \ --with-systemdsystemunitdir=%{_unitdir} \ @@ -256,19 +278,26 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/%{groupname}.wants find %{buildroot} -type f -name "*.la" -delete find %{buildroot} -type f -name "*.a" -delete -# make sure perl scripts have a proper shebang +# 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 +# Why are we not making this a proper python package? +pushd ../%{name}-%{version}%{?prerel} +cp -r dirsrvtests $RPM_BUILD_ROOT/%{_sysconfdir}/%{pkgname} +find $RPM_BUILD_ROOT/%{_sysconfdir}/%{pkgname}/dirsrvtests -type f -name '*.pyc' -delete +find $RPM_BUILD_ROOT/%{_sysconfdir}/%{pkgname}/dirsrvtests -type f -name '*.pyo' -delete +find $RPM_BUILD_ROOT/%{_sysconfdir}/%{pkgname}/dirsrvtests -type d -name '__pycache__' -delete +popd + +%clean +rm -rf $RPM_BUILD_ROOT %post output=/dev/null -%systemd_post %{pkgname}-snmp.service # reload to pick up any changes to systemd files /bin/systemctl daemon-reload >$output 2>&1 || : # reload to pick up any shared lib changes /sbin/ldconfig -# restart the snmp subagent if needed -/bin/systemctl try-restart %{pkgname}-snmp.service > $output 2>&1 || : # find all instances instances="" # instances that require a restart after upgrade ninst=0 # number of instances found in total @@ -339,8 +368,6 @@ exit 0 %preun if [ $1 -eq 0 ]; then # Final removal - # Package removal, not upgrade - %systemd_preun %{pkgname}-snmp.service %{groupname} # remove instance specific service files/links rm -rf %{_sysconfdir}/systemd/system/%{groupname}.wants/* > /dev/null 2>&1 || : fi @@ -351,6 +378,15 @@ 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 + %files %defattr(-,root,root,-) %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl @@ -361,7 +397,6 @@ fi %dir %{_sysconfdir}/systemd/system/%{groupname}.wants %config(noreplace)%{_sysconfdir}/%{pkgname}/config/slapd-collations.conf %config(noreplace)%{_sysconfdir}/%{pkgname}/config/certmap.conf -%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf %config(noreplace)%{_sysconfdir}/%{pkgname}/config/template-initconfig %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname} %config(noreplace)%{_sysconfdir}/sysconfig/%{pkgname}.systemd @@ -378,12 +413,15 @@ fi %ghost %dir %{_localstatedir}/lock/%{pkgname} %{_mandir}/man1/* %{_mandir}/man8/* +%exclude %{_sbindir}/ldap-agent* +%exclude %{_mandir}/man1/ldap-agent.1.gz %files devel %defattr(-,root,root,-) %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel %{_includedir}/%{pkgname} %{_libdir}/%{pkgname}/libslapd.so +%{_libdir}/%{pkgname}/libns-dshttpd.so %if %{use_nunc_stans} %{_libdir}/%{pkgname}/libnunc-stans.so %endif @@ -394,12 +432,65 @@ fi %doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel %dir %{_libdir}/%{pkgname} %{_libdir}/%{pkgname}/libslapd.so.* -%{_libdir}/%{pkgname}/libns-dshttpd.so* +%{_libdir}/%{pkgname}/libns-dshttpd.so.* %if %{use_nunc_stans} -%{_libdir}/%{pkgname}/libnunc-stans.so* +%{_libdir}/%{pkgname}/libnunc-stans.so.* %endif +%files snmp +%defattr(-,root,root,-) +%doc LICENSE LICENSE.GPLv3+ LICENSE.openssl README.devel +%config(noreplace)%{_sysconfdir}/%{pkgname}/config/ldap-agent.conf +%{_sbindir}/ldap-agent* +%{_mandir}/man1/ldap-agent.1.gz + +%files tests +%defattr(-,root,root,-) +%doc LICENSE LICENSE.GPLv3+ +%{_sysconfdir}/%{pkgname}/dirsrvtests + %changelog +* Mon Jun 13 2016 Noriko Hosoi - 1.3.5.5-1 +- Release 1.3.5.5-1 +- Ticket 48848 - modrdn deleteoldrdn can fail to find old attribute value, perhaps due to case folding +- Ticket 48832 - CI test - fix ticket failures +- Ticket 48833 - 389 showing inconsistent values for shadowMax and shadowWarning in 1.3.5.1 +- Ticket 48873 - Backend should accept the reduced cache allocation when issane == 1 +- Ticket 48815 - ns-accountstatus.pl - fix DN normalization +- Ticket 48880 - adding pre/post extop ability +- Ticket 48449 - Import readNSState from richm's repo +- Ticket 48877 - Fixes for RPM spec with spectool +- Ticket 48404 - libslapd owned by libs and devel +- Ticket 48326 - Move CI test to config test suite and refactor +- Ticket 48755 - CI test: test case for ticket 48755 +- Ticket 48755 - moving an entry could make the online init fail +- Ticket 48870 - Correct plugin execution order due to changes in exop +- Ticket 48799 - Test cases for objectClass values being dropped. +- Ticket 48863 - remove check for vmsize from util_info_sys_pages +- Ticket 48872 - Fix segfault and use after free in plugin shutdown +- Ticket 48862 - At startup DES to AES password conversion causes timeout in start script +- Ticket 48275 - search returns no entry when OR filter component contains non readable attribute +- Ticket 47911 - split out snmp agent into a subpackageTicket 47911 +- Ticket 48336 - setup-ds should detect if port is already defined +- Ticket 48858 - Segfault changing nsslapd-rootpw +- Ticket 48855 - Add basic pwdPolicy tests +- Ticket 48747 - dirsrv service fails to start when nsslapd-listenhost is configured +- Ticket 48752 - Page result search should return empty cookie if there is no returned entry +- Ticket 48854 - Running db2index with no options breaks replication +- Ticket 48850 - Correct memory leaks in pwdhash-bin and ns-slapd +- Ticket 48849 - Systemd introduced incompatible changes that breaks ds build +- Ticket 48846 - 32 bit systems set low vmsize +- Ticket 48846 - Older kernels do not expose memavailable +- Ticket 48846 - Rlimit checks should detect RLIM_INFINITY +- Ticket 48617 - Coverity fixes +- Ticket 48745 - Matching Rule caseExactIA5Match indexes incorrectly values with upper cases +- Ticket 48844 - Regression introduced in matching rules by DS 48746 +- Ticket 48363 - CI test - add test suite +- Ticket 48795 - Make various improvements to create_test.py +- Ticket 48834 - Fix jenkins: discared qualifier on auditlog.c +- Ticket 48834 - Modifier's name is not recorded in the audit log with modrdn and moddn operations +- Ticket 48754 - ldclt should support -H + * Thu May 19 2016 Jitka Plesnikova - 1.3.5.4-1.1 - Perl 5.24 re-rebuild of bootstrapped packages diff --git a/sources b/sources index 2c2f7fa..4c1fd1d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -56aec73b69456a1f6b380ac1064255c4 389-ds-base-1.3.5.4.tar.bz2 +ed0de8701992bb318e57b4c245f7229f 389-ds-base-1.3.5.5.tar.bz2 22a201e208b82b307ba425e099b066ed nunc-stans-0.1.8.tar.bz2