2 Commits

Author SHA256 Message Date
43606f5a78 Sync changes to SLFO-1.2 branch 2025-08-20 08:39:04 +02:00
a8806e87be Sync changes to SLFO-1.2 branch 2025-08-20 08:35:13 +02:00
11 changed files with 1211 additions and 1425 deletions

Binary file not shown.

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a8e001d8793b1d8b223b379dd7a077ea4d7d4daeca42e3d3841a0e849c88de33
size 6175423

View File

@@ -1,4 +1,4 @@
name: 389-ds-base
version: 3.2.0~git7.7c8a16c6b
mtime: 1768409729
commit: 7c8a16c6bed524fb54d18a5b7e93d4bd5bb19d49
version: 3.0.6~git86.dce421a0d
mtime: 1746541011
commit: dce421a0dea2e946b603745e17d22f1e0ea7d33b

View File

@@ -1,7 +1 @@
# I think this is because of lib389?
addFilter("E: shlib-policy-missing-lib")
# This is a plugin so it belongs here.
addFilter("E: devel-file-in-non-devel-package.*/usr/lib64/dirsrv/librewriters.so")
addFilter("W: incorrect-fsf-address")

File diff suppressed because it is too large Load Diff

View File

@@ -1,8 +1,7 @@
#
# spec file for package 389-ds
#
# Copyright (c) 2026 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +16,9 @@
#
%define pythons python3
%define use_python python3
%define skip_python2 1
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define homedir %{_localstatedir}/lib/dirsrv
%define logdir %{_localstatedir}/log/dirsrv
@@ -32,7 +33,7 @@
%define svrcorelib libsvrcore0
Name: 389-ds
Version: 3.2.0~git7.7c8a16c6b
Version: 3.0.6~git86.dce421a0d
Release: 0
Summary: 389 Directory Server
License: GPL-3.0-or-later AND MPL-2.0
@@ -75,17 +76,17 @@ BuildRequires: openldap2-devel
# Libressl is incompatible with our rust cryptographic needs.
BuildRequires: openssl-devel
# pam-devel is required by the pam passthru auth plug-in
BuildRequires: %{python_module argcomplete}
BuildRequires: %{python_module argparse-manpage}
BuildRequires: %{python_module cryptography}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module ldap}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module psutil}
BuildRequires: %{python_module pyasn1-modules}
BuildRequires: %{python_module pyasn1}
BuildRequires: %{python_module python-dateutil}
BuildRequires: %{python_module setuptools}
BuildRequires: %use_python-argcomplete
BuildRequires: %use_python-argparse-manpage
BuildRequires: %use_python-devel
BuildRequires: %use_python-ldap >= 3
BuildRequires: %use_python-psutil
BuildRequires: %use_python-pyasn1
BuildRequires: %use_python-pyasn1-modules
BuildRequires: %use_python-python-dateutil
BuildRequires: %use_python-setuptools
BuildRequires: %use_python-six
BuildRequires: %use_python-cryptography
BuildRequires: pam-devel
BuildRequires: pkgconfig
BuildRequires: python-rpm-macros
@@ -176,30 +177,17 @@ SNMP Agent for the 389 Directory Server base package.
Summary: 389 Directory Server administration tools and library
License: GPL-3.0-or-later AND MPL-2.0
Group: Development/Languages/Python
BuildRequires: %{python_module argcomplete}
BuildRequires: %{python_module argparse-manpage}
BuildRequires: %{python_module cryptography}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module distro}
BuildRequires: %{python_module ldap}
BuildRequires: %{python_module pip}
BuildRequires: %{python_module psutil}
BuildRequires: %{python_module pyasn1-modules}
BuildRequires: %{python_module pyasn1}
BuildRequires: %{python_module python-dateutil}
BuildRequires: %{python_module python-slugify}
Requires: %{python_module argcomplete}
Requires: %{python_module argparse-manpage}
Requires: %{python_module cryptography}
Requires: %{python_module devel}
Requires: %{python_module distro}
Requires: %{python_module ldap}
Requires: %{python_module pip}
Requires: %{python_module psutil}
Requires: %{python_module pyasn1-modules}
Requires: %{python_module pyasn1}
Requires: %{python_module python-dateutil}
Requires: %{python_module python-slugify}
Requires: %{use_python}-argcomplete
Requires: %{use_python}-argparse-manpage
Requires: %{use_python}-distro
Requires: %{use_python}-ldap >= 3.0
Requires: %{use_python}-psutil
Requires: %{use_python}-pyasn1
Requires: %{use_python}-pyasn1-modules
Requires: %{use_python}-python-dateutil
Requires: %{use_python}-python-slugify
Requires: %{use_python}-six
Requires: %{use_python}-cryptography
Requires: iproute2
Requires: krb5-client
Requires: mozilla-nss-tools
@@ -211,8 +199,8 @@ Recommends: openldap2-client
# These are recommended if you have selinux on your system
# to allow some supplementary automated interactions during
# setup, but it's not required.
Recommends: %{python_module selinux}
Recommends: %{python_module policycoreutils}
Recommends: python3-selinux
Recommends: python3-policycoreutils
Provides: python3-lib389 = %{version}-%{release}
Obsoletes: python-lib389 < %{version}-%{release}
@@ -254,7 +242,7 @@ df -h
%sysusers_generate_pre %{SOURCE10} %{user_group} %{user_group}-user.conf
# Make sure python3 is used in shebangs
# FIX ME!! This should be fixed in the source code !!!
sed -r -i '1s|^#!\s*%{_bindir}.*python.*|#!%{_bindir}/python3|' ldap/admin/src/scripts/{*.py,ds-replcheck} src/lib389/cli/ds*
sed -r -i '1s|^#!\s*%{_bindir}.*python.*|#!%{_bindir}/%{use_python}|' ldap/admin/src/scripts/{*.py,ds-replcheck} src/lib389/cli/ds*
# 389-ds expects the vendor dir in the root.
ln -s ./src/vendor ./vendor
@@ -280,7 +268,7 @@ export CFLAGS="%{optflags}" # -std=gnu99"
--enable-rust-offline \
--disable-perl \
--libexecdir=%{_prefix}/lib/dirsrv/ \
--with-pythonexec="%{_bindir}/python3" \
--with-pythonexec="%{_bindir}/%{use_python}" \
--with-systemd \
--with-systemdgroupname=dirsrv.target \
--with-systemdsystemunitdir="%{_unitdir}" \
@@ -289,15 +277,16 @@ export CFLAGS="%{optflags}" # -std=gnu99"
--with-systemdgroupname=dirsrv.target \
export XCFLAGS="$CFLAGS"
make src/lib389/setup.py
make %{?_smp_mflags}
pushd src/lib389
%pyproject_wheel
%python3_build
popd
%install
%make_install
pushd src/lib389
%pyproject_install
%python3_install
mv %{buildroot}/usr/libexec/dirsrv/dscontainer %{buildroot}%{_prefix}/lib/dirsrv/
rmdir %{buildroot}/usr/libexec/dirsrv/
popd
@@ -332,12 +321,6 @@ mv src/svrcore/LICENSE{,.svrcore}
install -m 0644 %{SOURCE10} %{buildroot}%{_sysusersdir}/
install -m 0644 %{SOURCE11} %{buildroot}%{_unitdir}/dirsrv@.service.d/krbkdcbefore.conf
mv %{buildroot}%{_bindir}/openldap_to_ds %{buildroot}%{_sbindir}/openldap_to_ds
mv %{buildroot}%{_bindir}/dsconf %{buildroot}%{_sbindir}/dsconf
mv %{buildroot}%{_bindir}/dscreate %{buildroot}%{_sbindir}/dscreate
mv %{buildroot}%{_bindir}/dsctl %{buildroot}%{_sbindir}/dsctl
mv %{buildroot}%{_bindir}/dsidm %{buildroot}%{_sbindir}/dsidm
# For the purposes of our krb integration, we enable this by default.
mv %{buildroot}%{_datadir}/dirsrv/data/60kerberos.ldif %{buildroot}%{_datadir}/dirsrv/schema/60kerberos.ldif
@@ -401,7 +384,6 @@ exit 0
%{_libdir}/dirsrv/librewriters.so
%{_libdir}/dirsrv/plugins/*.so
%{_libdir}/dirsrv/python/*.py
%{_libdir}/dirsrv/librobdb.so
%{_libdir}/dirsrv/*.so.*
%exclude %{_mandir}/man1/ldap-agent*
%{_mandir}/man1/*
@@ -470,6 +452,6 @@ exit 0
%{_mandir}/man8/dscreate.8.gz
%{_mandir}/man8/dsctl.8.gz
%{_mandir}/man8/dsidm.8.gz
%{python_sitelib}/lib389*
%{python3_sitelib}/lib389*
%changelog

View File

@@ -1,9 +0,0 @@
<?xml version="1.0"?>
<constraints>
<hardware>
<disk>
<!-- Needed because PPC chronically runs out of disk because sigghhh -->
<size unit="G">25</size>
</disk>
</hardware>
</constraints>

View File

@@ -3,7 +3,7 @@
<param name="url">https://github.com/389ds/389-ds-base.git</param>
<param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
<param name="scm">git</param>
<param name="revision">main</param>
<param name="revision">389-ds-base-3.0</param>
<param name="versionrewrite-pattern">389-ds-base-(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<param name="changesgenerate">enable</param>
@@ -17,29 +17,27 @@
<service mode="disabled" name="set_version" />
<service name="cargo_vendor" mode="disabled">
<param name="srcdir">389-ds-base</param>
<param name="cargotoml">src/Cargo.toml</param>
<param name="compression">zst</param>
<param name="cargotoml">src/Cargo.toml</param>
<param name="update">true</param>
</service>
<service name="cargo_audit" mode="disabled">
<param name="srcdir">389-ds-base</param>
</service>
<!-- obs_scm freaks out with multiple recompress steps -->
<!--
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/SUSE/supportutils-plugin-dirsrv.git</param>
<param name="versionformat">@PARENT_TAG@~git@TAG_OFFSET@.%h</param>
<param name="scm">git</param>
<param name="revision">main</param>
<param name="versionrewrite-pattern">(.*)</param>
<param name="versionrewrite-replacement">\1</param>
<param name="revision">v0.1.0</param>
<param name="match-tag">v0.1.0</param>
<param name="changesgenerate">disable</param>
<param name="without-version">true</param>
</service>
<service mode="disabled" name="tar">
<param name="filename">supportutils-plugin-dirsrv</param>
</service>
<service mode="disabled" name="tar" />
<service mode="disabled" name="recompress">
<param name="file">supportutils-plugin-dirsrv.tar</param>
<param name="file">*.tar</param>
<param name="compression">zst</param>
</service>
-->

View File

@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/389ds/389-ds-base.git</param>
<param name="changesrevision">7c8a16c6bed524fb54d18a5b7e93d4bd5bb19d49</param></service></servicedata>
<param name="changesrevision">dce421a0dea2e946b603745e17d22f1e0ea7d33b</param></service></servicedata>

View File

@@ -1,2 +1,3 @@
#Type Name ID GECOS Home directory Shell
g dirsrv - -
u dirsrv - "User for 389 directory server" /var/lib/dirsrv /sbin/nologin

BIN
vendor.tar.zst LFS

Binary file not shown.