.gitignore

@@ -1 +1,2 @@
-SOURCES/ldap-sdk-4.24.0.tar.gz
+SOURCES/ldap-sdk-4.23.0.tar.gz
+/ldap-sdk-4.23.0.tar.gz

.ldapjdk.metadata

@@ -1 +0,0 @@
-5ae502d4aec13f94d581384faedf2fa67d87cffa SOURCES/ldap-sdk-4.24.0.tar.gz

copr-build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+REPO=$1
+
+if [ "$REPO" == "" ]; then
+    REPO="pki-10.6"
+fi
+
+fedpkg copr-build --nowait $REPO

gating.yaml

@@ -0,0 +1,7 @@
+# recipients: rhcs-team
+--- !Policy
+product_versions:
+  - rhel-9
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

ldapjdk.spec

@@ -2,24 +2,16 @@
 Name:             ldapjdk
 ################################################################################
 
-%global           product_id idm-ldapjdk
-
-# Upstream version number:
-%global           major_version 4
-%global           minor_version 24
-%global           update_version 0
-
 Summary:          LDAP SDK
-URL:              https://github.com/dogtagpki/ldap-sdk
+URL:              http://www.dogtagpki.org/
 License:          MPLv1.1 or GPLv2+ or LGPLv2+
 
 BuildArch:        noarch
 
 # For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
 # For official (i.e. supported) releases, use x.y.z-r where r >=1.
-%global           release_number 1
+Version:          4.23.0
-Version:          %{major_version}.%{minor_version}.%{update_version}
+Release:          1%{?_timestamp}%{?_commit_id}%{?dist}
-Release:          %{release_number}%{?_timestamp}%{?_commit_id}%{?dist}
 #global           _phase -alpha1
 
 %global spname		ldapsp
@@ -64,50 +56,32 @@ BuildRequires:    %{java_devel}
 BuildRequires:    javapackages-local
 BuildRequires:    slf4j
 BuildRequires:    slf4j-jdk14
-
+BuildRequires:    jss >= 4.9.0, jss < 5.0.0
-BuildRequires:    jss >= 4.11.0, jss < 5.0.0
-
-%description
-The Mozilla LDAP SDKs enable you to write applications which access,
-manage, and update the information stored in an LDAP directory.
 
 ################################################################################
-%package -n %{product_id}
+# Runtime Dependencies
 ################################################################################
 
-Summary:          LDAP SDK
-
 Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.5
 Requires:         slf4j
 Requires:         slf4j-jdk14
+Requires:         jss >= 4.9.0, jss < 5.0.0
 
-Requires:         jss >= 4.11.0, jss < 5.0.0
+%description
-
-Obsoletes:        ldapjdk < %{version}-%{release}
-Provides:         ldapjdk = %{version}-%{release}
-Provides:         ldapjdk = %{major_version}.%{minor_version}
-Provides:         %{product_id} = %{major_version}.%{minor_version}
-
-%description -n %{product_id}
 The Mozilla LDAP SDKs enable you to write applications which access,
 manage, and update the information stored in an LDAP directory.
 
 %license docs/ldapjdk/license.txt
 
 ################################################################################
-%package -n %{product_id}-javadoc
+%package javadoc
 ################################################################################
 
-Summary:          Javadoc for LDAP SDK
+Summary:        Javadoc for %{name}
 
-Obsoletes:        ldapjdk-javadoc < %{version}-%{release}
+%description javadoc
-Provides:         ldapjdk-javadoc = %{version}-%{release}
+Javadoc for %{name}
-Provides:         ldapjdk-javadoc = %{major_version}.%{minor_version}
-Provides:         %{product_id}-javadoc = %{major_version}.%{minor_version}
-
-%description -n %{product_id}-javadoc
-Javadoc for LDAP SDK
 
 ################################################################################
 %prep
@@ -138,7 +112,7 @@ popd
 ################################################################################
 
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 java-sdk/dist/packages/ldapjdk.jar $RPM_BUILD_ROOT%{_javadir}/ldapjdk.jar
+install -m 644 java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%{spname}.jar
 install -m 644 java-sdk/dist/packages/%{filtname}.jar $RPM_BUILD_ROOT%{_javadir}/%{filtname}.jar
 install -m 644 java-sdk/dist/packages/%{beansname}.jar $RPM_BUILD_ROOT%{_javadir}/%{beansname}.jar
@@ -149,14 +123,14 @@ install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldap
 install -pm 644 java-sdk/ldapbeans/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom
 install -pm 644 java-sdk/ldapsp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
+cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 ################################################################################
-%files -n %{product_id}
+%files
 ################################################################################
 
-%{_javadir}/ldapjdk.jar
+%{_javadir}/%{name}.jar
 %{_javadir}/%{spname}*.jar
 %{_javadir}/%{filtname}*.jar
 %{_javadir}/%{beansname}*.jar
@@ -166,20 +140,14 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
 %{_mavenpomdir}/JPP-ldapbeans.pom
 
 ################################################################################
-%files -n %{product_id}-javadoc
+%files javadoc
 ################################################################################
 
-%dir %{_javadocdir}/ldapjdk
+%dir %{_javadocdir}/%{name}
-%{_javadocdir}/ldapjdk/*
+%{_javadocdir}/%{name}/*
 
 ################################################################################
 %changelog
-* Thu Feb 08 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-1
-- Rebase to LDAP SDK 4.24.0
-
-* Tue Jan 16 2024 Red Hat PKI Team <rhcs-maint@redhat.com> 4.24.0-0.1
-- Rebase to LDAP SDK 4.24.0-alpha1
-
 * Mon Jul 26 2021 Red Hat PKI Team <rhcs-maint@redhat.com> 4.23.0-1
 - Rebase to LDAP SDK 4.23.0
 
@@ -197,3 +165,4 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/ldapjdk
 
 * Fri Aug 10 2018 Red Hat PKI Team <rhcs-maint@redhat.com> 4.20.0-0
 - Rebase to LDAP SDK 4.20.0
+

sources

@@ -0,0 +1 @@
+SHA512 (ldap-sdk-4.23.0.tar.gz) = 62d8ce1fd904a5c78056491ab14b6f6e2e337a5098702fd340136b43970a17b3e964c5cf6963e96de89e778e45d6188b865b74668419163704ae7c956d0868b1

sources-update.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+SOURCE=$1
+TARGET=`basename $1`
+
+cp $SOURCE $TARGET
+sha512sum --tag $TARGET > sources

tests/roles/Test_Setup/files/ca.cfg

@@ -0,0 +1,25 @@
+[DEFAULT]
+pki_server_database_password=Secret.123
+
+[CA]
+pki_admin_email=caadmin@example.com
+pki_admin_name=caadmin
+pki_admin_nickname=caadmin
+pki_admin_password=Secret.123
+pki_admin_uid=caadmin
+
+pki_client_database_password=Secret.123
+pki_client_database_purge=False
+pki_client_pkcs12_password=Secret.123
+
+pki_ds_base_dn=dc=ca,dc=pki,dc=example,dc=com
+pki_ds_database=ca
+pki_ds_password=Secret.123
+
+pki_security_domain_name=EXAMPLE
+
+pki_ca_signing_nickname=ca_signing
+pki_ocsp_signing_nickname=ca_ocsp_signing
+pki_audit_signing_nickname=ca_audit_signing
+pki_sslserver_nickname=sslserver
+pki_subsystem_nickname=subsystem

tests/roles/Test_Setup/files/ds-create.sh

@@ -0,0 +1,24 @@
+#!/bin/bash -ex
+
+# This command needs to be executed as it pulls the machine name
+# dynamically.
+dscreate create-template /tmp/test_dir/ds.inf
+
+sed -i \
+    -e "s/;instance_name = .*/instance_name = localhost/g" \
+    -e "s/;root_password = .*/root_password = Secret.123/g" \
+    -e "s/;suffix = .*/suffix = dc=example,dc=com/g" \
+    -e "s/;self_sign_cert = .*/self_sign_cert = False/g" \
+    /tmp/test_dir/ds.inf
+
+dscreate from-file /tmp/test_dir/ds.inf
+
+ldapadd -h $HOSTNAME -x -D "cn=Directory Manager" -w Secret.123 << EOF
+dn: dc=example,dc=com
+objectClass: domain
+dc: example
+
+dn: dc=pki,dc=example,dc=com
+objectClass: domain
+dc: pki
+EOF

tests/roles/Test_Setup/files/kra.cfg

@@ -0,0 +1,27 @@
+[DEFAULT]
+pki_server_database_password=Secret.123
+
+[KRA]
+pki_admin_email=kraadmin@example.com
+pki_admin_name=kraadmin
+pki_admin_nickname=kraadmin
+pki_admin_password=Secret.123
+pki_admin_uid=kraadmin
+
+pki_client_database_password=Secret.123
+pki_client_database_purge=False
+pki_client_pkcs12_password=Secret.123
+
+pki_ds_base_dn=dc=kra,dc=pki,dc=example,dc=com
+pki_ds_database=kra
+pki_ds_password=Secret.123
+
+pki_security_domain_name=EXAMPLE
+pki_security_domain_user=caadmin
+pki_security_domain_password=Secret.123
+
+pki_storage_nickname=kra_storage
+pki_transport_nickname=kra_transport
+pki_audit_signing_nickname=kra_audit_signing
+pki_sslserver_nickname=sslserver
+pki_subsystem_nickname=subsystem

tests/roles/Test_Setup/tasks/main.yml

@@ -0,0 +1,26 @@
+---
+
+- name: Install ldapjdk
+  dnf:
+    name: >
+      ldapjdk
+
+- name: Install required packages
+  dnf:
+    name: >
+      389-ds-base, pki-ca, pki-kra
+
+- name: Creates directory
+  file: path=/tmp/test_files state=directory
+
+- name: Copying templates to /tmp folder
+  copy : src=.  dest=/tmp/test_dir
+
+- name: Setup DS Service
+  shell: sh /tmp/test_dir/ds-create.sh
+
+- name: Install CA subsystem
+  shell: pkispawn -f /tmp/test_dir/ca.cfg -s CA -v
+
+- name: Install KRA subsystem
+  shell: pkispawn -f /tmp/test_dir/kra.cfg -s KRA -v

tests/tests.yml

@@ -0,0 +1,30 @@
+- hosts: localhost
+  remote_user: root
+  tags:
+    - classic
+  roles:
+  - role: Test_Setup
+  - role: standard-test-basic
+    tests:
+    - verify_spawn_ca:
+        dir: .
+        run: "curl http://localhost:8080/ca/admin/ca/getStatus | grep '<Status>running</Status>'"
+    - verify_spawn_kra:
+        dir: .
+        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep '<Status>running</Status>'"
+    - destroy_kra:
+        dir: .
+        run: "pkidestroy -i pki-tomcat -s KRA && sleep 5"
+    - verify_destroy_kra:
+        dir: .
+        run: "curl http://localhost:8080/kra/admin/kra/getStatus | grep 'HTTP Status 404'"
+    - destroy_ca:
+        dir: .
+        run: "pkidestroy -i pki-tomcat -s CA"
+    - verify_destroy_ca:
+        dir: .
+        run: "curl http://localhost:8080/ca/admin/ca/getStatus  &> testfile.log || true && grep 'Connection refused' testfile.log"
+    required_packages:
+    - ldapjdk
+    - pki-ca
+    - pki-kra