diff --git a/.gitignore b/.gitignore index cb1dd40..0876895 100644 --- a/.gitignore +++ b/.gitignore @@ -171,3 +171,4 @@ /389-ds-base-1.4.0.16.tar.bz2 /389-ds-base-1.4.0.17.tar.bz2 /389-ds-base-1.4.0.18.tar.bz2 +/389-ds-base-1.4.0.19.tar.bz2 diff --git a/389-ds-base.spec b/389-ds-base.spec index 6017750..305656d 100644 --- a/389-ds-base.spec +++ b/389-ds-base.spec @@ -44,7 +44,7 @@ ExcludeArch: i686 Summary: 389 Directory Server (base) Name: 389-ds-base -Version: 1.4.0.18 +Version: 1.4.0.19 Release: %{?relprefix}1%{?prerel}%{?dist} License: GPLv3+ URL: https://www.port389.org @@ -112,9 +112,13 @@ BuildRequires: python%{python3_pkgversion}-pyasn1-modules BuildRequires: python%{python3_pkgversion}-dateutil BuildRequires: python%{python3_pkgversion}-argcomplete BuildRequires: python%{python3_pkgversion}-argparse-manpage +BuildRequires: python%{python3_pkgversion}-libselinux +BuildRequires: python%{python3_pkgversion}-policycoreutils # For cockpit BuildRequires: rsync +BuildRequires: npm +BuildRequires: nodejs Requires: %{name}-libs = %{version}-%{release} Requires: python%{python3_pkgversion}-lib389 = %{version}-%{release} @@ -271,22 +275,13 @@ Requires: python%{python3_pkgversion}-pyasn1 Requires: python%{python3_pkgversion}-pyasn1-modules Requires: python%{python3_pkgversion}-dateutil Requires: python%{python3_pkgversion}-argcomplete +Requires: python%{python3_pkgversion}-libselinux %{?python_provide:%python_provide python%{python3_pkgversion}-lib389} %description -n python%{python3_pkgversion}-lib389 This module contains tools and libraries for accessing, testing, and configuring the 389 Directory Server. -%package -n python%{python3_pkgversion}-%{srcname}-tests -Summary: The lib389 Continuous Integration Tests -Group: Development/Libraries -BuildArch: noarch -Requires: python%{python3_pkgversion} -Requires: python%{python3_pkgversion}-lib389 - -%description -n python%{python3_pkgversion}-%{srcname}-tests -The lib389 CI tests that can be run against the Directory Server. - %package -n cockpit-389-ds Summary: Cockpit UI Plugin for configuring and administering the 389 Directory Server BuildArch: noarch @@ -306,10 +301,6 @@ A cockpit UI Plugin for configuring and administering the 389 Directory Server cp %{SOURCE2} README.devel -# Make sure python3 is used in shebangs -sed -r -i '1s|^#!\s*/usr/bin.*python.*|#!%{__python3}|' ldap/admin/src/scripts/{*.py,ds-replcheck} - - %build OPENLDAP_FLAG="--with-openldap" @@ -360,8 +351,6 @@ autoreconf -fiv $NSSARGS $ASAN_FLAGS $RUST_FLAGS $PERL_FLAGS $CLANG_FLAGS \ --enable-cmocka -make setup.py - # lib389 pushd ./src/lib389 %py3_build @@ -373,9 +362,6 @@ sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/m sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsidm.8 sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dscreate.8 -# tests -%py3_build - # Generate symbolic info for debuggers export XCFLAGS=$RPM_OPT_FLAGS @@ -388,7 +374,10 @@ mkdir -p %{buildroot}%{_datadir}/gdb/auto-load%{_sbindir} mkdir -p %{buildroot}%{_datadir}/cockpit make DESTDIR="$RPM_BUILD_ROOT" install -# Cockpit directory and file list +# Cockpit branding, and directory and file list +%if 0%{?rhel} > 7 +mv -f %{buildroot}%{_datadir}/cockpit/389-console/rhds-banner.html %{buildroot}%{_datadir}/cockpit/389-console/banner.html +%endif find %{buildroot}%{_datadir}/cockpit/389-console -type d | sed -e "s@%{buildroot}@@" | sed -e 's/^/\%dir /' > cockpit.list find %{buildroot}%{_datadir}/cockpit/389-console -type f | sed -e "s@%{buildroot}@@" >> cockpit.list @@ -400,9 +389,6 @@ pushd src/lib389 %py3_install popd -# tests -%py3_install - mkdir -p $RPM_BUILD_ROOT/var/log/%{pkgname} mkdir -p $RPM_BUILD_ROOT/var/lib/%{pkgname} mkdir -p $RPM_BUILD_ROOT/var/lock/%{pkgname} @@ -590,10 +576,9 @@ exit 0 %{_mandir}/man1/pwdhash.1.gz %{_bindir}/readnsstate %{_mandir}/man1/readnsstate.1.gz -%caps(CAP_NET_BIND_SERVICE=pe) %{_sbindir}/ns-slapd +#%caps(CAP_NET_BIND_SERVICE=pe) {_sbindir}/ns-slapd +%{_sbindir}/ns-slapd %{_mandir}/man8/ns-slapd.8.gz -%{_libexecdir}/%{pkgname}/ds_selinux_enabled -%{_libexecdir}/%{pkgname}/ds_selinux_port_query %{_libexecdir}/%{pkgname}/ds_systemd_ask_password_acl %{_sbindir}/bak2db %{_mandir}/man8/bak2db.8.gz @@ -706,6 +691,8 @@ exit 0 %{_mandir}/man8/suffix2instance.8.gz %{_sbindir}/upgradednformat %{_mandir}/man8/upgradednformat.8.gz +%{_libexecdir}/%{pkgname}/ds_selinux_enabled +%{_libexecdir}/%{pkgname}/ds_selinux_port_query %if %{use_perl} %{_datadir}/%{pkgname}/properties/*.res %{_datadir}/%{pkgname}/script-templates @@ -780,14 +767,42 @@ exit 0 %{_sbindir}/dsidm %{_mandir}/man8/dsidm.8.gz -%files -n python%{python3_pkgversion}-%{srcname}-tests -%doc LICENSE LICENSE.GPLv3+ -%{python3_sitelib}/dirsrvtests* - %files -n cockpit-389-ds -f cockpit.list +%{_datarootdir}/metainfo/389-console/org.cockpit-project.389-console.metainfo.xml %doc README.md %changelog +* Thu Nov 1 2018 Mark Reynolds - 1.4.0.19-1 +- Bump version to 1.4.0.19 +- Ticket 50026 - audit logs does not capture the operation where nsslapd-lookthroughlimit is modified +- Ticket 50020 - during MODRDN referential integrity can fail erronously while updating large groups +- Ticket 49999 - Finish up the transfer to React +- Ticket 50004 - lib389 - improve X-ORIGIN schema parsing +- Ticket 50013 - Log warn instead of ERR when aci target does not exist. +- Ticket 49975 - followup for broken prefix deployment +- Ticket 49999 - Add dist-bz2 target for Koji build system +- Ticket 49814 - Add specfile requirements for python3-libselinux +- Ticket 49814 - Add specfile requirements for python3-selinux +- Ticket 49999 - Integrate React structure into cockpit-389-ds +- Ticket 49995 - Fix Tickets with internal op logging +- Ticket 49997 - RFE: ds-replcheck could validate suffix exists and it's replicated +- Ticket 49985 - memberof may silently fails to update a member +- Ticket 49967 - entry cache corruption after failed MODRDN +- Ticket 49975 - Add missing include file to main.c +- Ticket 49814 - skip standard ports for selinux labelling +- Ticket 49814 - dscreate should set the port selinux labels +- Ticket 49856 - Remove backend option from bak2db +- Ticket 49926 - Fix various Tickets with replication UI +- Ticket 49975 - SUSE rpmlint Tickets +- Ticket 49939 - Fix ldapi path in lib389 +- Ticket 49978 - Add CLI logging function for UI +- Ticket 49929 - Modifications required for the Test Case Management System +- Ticket 49979 - Fix regression in last commit +- Ticket 49979 - Remove dirsrv tests subpackage +- Ticket 49928 - Fix various small WebUI schema Tickets +- Ticket 49926 - UI - comment out dev cli patchs +- Ticket 49926 - Add replication functionality to UI + * Wed Oct 10 2018 Mark Reynolds - 1.4.0.18-1 - Bump version to 1.4.0.18 - Ticket 49968 - Confusing CRITICAL message: list_candidates - NULL idl was recieved from filter_candidates_ext diff --git a/sources b/sources index a8b8c3a..405c1c3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (389-ds-base-1.4.0.18.tar.bz2) = ac658801fe3343b48947b1a2599dde173e2850f54873ccb04862c5b166333bcc0967b4e4dde52d94dd1ce216fd81f55ed4505a47799b04d9dadba7d006deffe3 -SHA512 (jemalloc-5.1.0.tar.bz2) = d9abebe54d303ca931b8c31c1033f23ff5fb060f2377ec8386f4d79c352e65c78ed34f680c352dac14f7d7115d10245782d553d988bc13df2eb34a2f0942ef6f +SHA512 (389-ds-base-1.4.0.19.tar.bz2) = 8ae906bd30bf646f2b157fd259b0f92ed6cdba47f44e0c928cf9cb10529858464616b11bab9301e9c51bae139b1c3fe9131694217ce99901b0e8fd3421329b62