Sync changes to SLFO-1.2 branch

389-ds-base-3.1.2~git90.2bc7250be.tar.zst

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

389-ds-base.obsinfo

@@ -1,4 +1,4 @@
 name: 389-ds-base
-version: 3.1.2~git90.2bc7250be
-mtime: 1746540576
-commit: 2bc7250be92f22f47c2e6dda30bd68f3a1a460c4
+version: 3.0.6~git86.dce421a0d
+mtime: 1746541011
+commit: dce421a0dea2e946b603745e17d22f1e0ea7d33b

389-ds-rpmlintrc

@@ -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")

389-ds.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package 389-ds
 #
-# Copyright (c) 2025 SUSE LLC
+# 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
@@ -33,7 +33,7 @@
 %define svrcorelib libsvrcore0
 
 Name:           389-ds
-Version:        3.1.2~git90.2bc7250be
+Version:        3.0.6~git86.dce421a0d
 Release:        0
 Summary:        389 Directory Server
 License:        GPL-3.0-or-later AND MPL-2.0
@@ -78,7 +78,6 @@ BuildRequires:  openssl-devel
 # pam-devel is required by the pam passthru auth plug-in
 BuildRequires:  %use_python-argcomplete
 BuildRequires:  %use_python-argparse-manpage
-BuildRequires:  %use_python-cryptography
 BuildRequires:  %use_python-devel
 BuildRequires:  %use_python-ldap >= 3
 BuildRequires:  %use_python-psutil
@@ -86,6 +85,8 @@ 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
@@ -178,7 +179,6 @@ License:        GPL-3.0-or-later AND MPL-2.0
 Group:          Development/Languages/Python
 Requires:       %{use_python}-argcomplete
 Requires:       %{use_python}-argparse-manpage
-Requires:       %{use_python}-cryptography
 Requires:       %{use_python}-distro
 Requires:       %{use_python}-ldap >= 3.0
 Requires:       %{use_python}-psutil
@@ -186,6 +186,8 @@ 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

_constraints

@@ -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>

_service

@@ -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>
   -->

_servicedata

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

dirsrv-user.conf

@@ -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