Rebase to LDAP SDK 5.0.0-alpha1

Resolves: #1975905

.gitignore

@@ -3,3 +3,4 @@ ldapjdk-4.18.tar.gz
 /ldap-sdk-4.20.0.tar.gz
 /ldap-sdk-4.21.0.tar.gz
 /ldap-sdk-4.22.0.tar.gz
+/ldap-sdk-5.0.0-alpha1.tar.gz

0001-Use-JDK8-target-as-suggested-by-Fabio.patch

@@ -1,65 +0,0 @@
-From a652cceb4b8993c0af90d3fa590bcf92fadcfd71 Mon Sep 17 00:00:00 2001
-From: Fabio Valentini <decathorpe@gmail.com>
-Date: Mon, 17 Aug 2020 18:54:51 -0400
-Subject: [PATCH] Use JDK8 target as suggested by Fabio
-
-Signed-off-by: Alexander Scheel <ascheel@redhat.com>
----
- java-sdk/build.xml | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/java-sdk/build.xml b/java-sdk/build.xml
-index e310c73..545bcb1 100644
---- a/java-sdk/build.xml
-+++ b/java-sdk/build.xml
-@@ -187,14 +187,20 @@
-         <javac srcdir="${basedir}/ldapjdk/com" destdir="${jdk.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}:${slf4j.lib}"
-+            source="1.8"
-+            target="1.8"
-         />
-         <javac srcdir="${basedir}/ldapjdk/netscape" destdir="${jdk.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}:${slf4j.lib}"
-+            source="1.8"
-+            target="1.8"
-         />
-         <javac srcdir="${basedir}/tools" destdir="${jdk.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}:${slf4j.lib}"
-+            source="1.8"
-+            target="1.8"
-         />
-       </target>
- 
-@@ -202,6 +208,8 @@
-         <javac srcdir="${basedir}/ldapfilter" destdir="${filter.dist}"
-             excludes="cvs/**"
-             classpath="${jdk.dist}:${jsselibs}:${slf4j.lib}"
-+            source="1.8"
-+            target="1.8"
-         />
-       </target>
- 
-@@ -210,6 +218,8 @@
-         <javac srcdir="${basedir}/ldapbeans" destdir="${jdk.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}:${slf4j.lib}"
-+            source="1.8"
-+            target="1.8"
-         />
-       </target>
- 
-@@ -218,6 +228,8 @@
-         <javac srcdir="${basedir}/ldapsp" destdir="${jndi.dist}"
-             excludes="cvs/**"
-             classpath="${jsselibs}:${basedir}/ldapsp/lib/jndi.jar:${slf4j.lib}"
-+            source="1.8"
-+            target="1.8"
-         />
-       </target>
- 
--- 
-2.26.2
-

ldapjdk.spec

@@ -8,9 +8,11 @@ License:          MPLv1.1 or GPLv2+ or LGPLv2+
 
 BuildArch:        noarch
 
-Version:          4.22.0
+# For development (i.e. unsupported) releases, use x.y.z-0.n.<phase>.
-Release:          6%{?_timestamp}%{?_commit_id}%{?dist}
+# For official (i.e. supported) releases, use x.y.z-r where r >=1.
-# global           _phase -a1
+Version:          5.0.0
+Release:          0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist}
+%global           _phase -alpha1
 
 %global spname		ldapsp
 %global filtname	ldapfilt
@@ -30,43 +32,35 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap
 #     <version tag> \
 #     > ldap-sdk-VERSION-RELEASE.patch
 # Patch: ldap-sdk-VERSION-RELEASE.patch
-Patch1: 0001-Use-JDK8-target-as-suggested-by-Fabio.patch
+
+################################################################################
+# Java
+################################################################################
+
+%define java_devel java-11-openjdk-devel
+%define java_headless java-11-openjdk-headless
+%define java_home /usr/lib/jvm/java-11-openjdk
 
 ################################################################################
 # Build Dependencies
 ################################################################################
 
-# autosetup
-BuildRequires:    git
-
 BuildRequires:    ant
-BuildRequires:    java-devel
+BuildRequires:    %{java_devel}
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires:	  jpackage-utils >= 0:1.5
-%else
 BuildRequires:    javapackages-local
-%endif
 BuildRequires:    slf4j
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no slf4j-jdk14
-%else
 BuildRequires:    slf4j-jdk14
-%endif
+BuildRequires:    jss >= 5.0.0
-BuildRequires:    jss >= 4.6.0
 
 ################################################################################
 # Runtime Dependencies
 ################################################################################
 
+Requires:         %{java_headless}
 Requires:         jpackage-utils >= 0:1.5
 Requires:         slf4j
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# no slf4j-jdk14
-%else
 Requires:         slf4j-jdk14
-%endif
+Requires:         jss >= 5.0.0
-Requires:         jss >= 4.6.0
-
 
 %description
 The Mozilla LDAP SDKs enable you to write applications which access,
@@ -87,7 +81,7 @@ Javadoc for %{name}
 %prep
 ################################################################################
 
-%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1 -S git
+%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1
 
 # Remove all bundled jars, we must build against build-system jars
 rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
@@ -96,17 +90,16 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar
 %build
 ################################################################################
 
-# Link to build-system BRs
+pushd java-sdk/ldapjdk/lib
-pwd
+build-jar-repository -s -p . jss
-%if 0%{?rhel} && 0%{?rhel} <= 7
+popd
-( cd  java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 jsse jaas jndi )
+
-%else
-( cd  java-sdk/ldapjdk/lib && build-jar-repository -s -p . jss4 )
 ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib
-%endif
+
-cd java-sdk
+pushd java-sdk
-if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
+export JAVA_HOME=%{java_home}
 sh -x ant dist
+popd
 
 ################################################################################
 %install
@@ -118,28 +111,27 @@ install -m 644 java-sdk/dist/packages/%{spname}.jar $RPM_BUILD_ROOT%{_javadir}/%
 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
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0
-
-pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0
-	ln -fs ../java/*%{spname}.jar jndi-ldap.jar
-popd
-
 mkdir -p %{buildroot}%{_mavenpomdir}
-sed -i 's/@VERSION@/%{version}/g' %{name}.pom
+install -pm 644 java-sdk/ldapjdk/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom
-install -pm 644 %{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "ldapsdk:ldapsdk"
+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}/%{name}
 cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 ################################################################################
-%files -f .mfiles
+%files
 ################################################################################
 
+%{_javadir}/%{name}.jar
 %{_javadir}/%{spname}*.jar
 %{_javadir}/%{filtname}*.jar
 %{_javadir}/%{beansname}*.jar
-%{_javadir}-1.3.0/*.jar
+%{_mavenpomdir}/JPP-ldapjdk.pom
+%{_mavenpomdir}/JPP-ldapsp.pom
+%{_mavenpomdir}/JPP-ldapfilter.pom
+%{_mavenpomdir}/JPP-ldapbeans.pom
 
 ################################################################################
 %files javadoc
@@ -150,39 +142,5 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 ################################################################################
 %changelog
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.22.0-6
+* Fri Jun 25 2021 Red Hat PKI Team <rhcs-maint@redhat.com> - 5.0.0-0.1
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- Rebase to LDAP SDK 5.0.0-alpha1
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.22.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Aug 17 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.22.0-4
-- Rebuilt for JDK8 compatibility
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.22.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 4.22.0-2
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jun 10 2020 Dogtag PKI Team <pki-devel@redhat.com> - 4.22.0-1
-- Rebase to match latest upstream version: 4.22.0
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.21.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Aug 08 2019 Dogtag PKI Team <pki-team@redhat.com> 4.21.0-2
-- Bump min required JSS version to 4.6.0
-
-* Thu Aug 08 2019 Dogtag PKI Team <pki-team@redhat.com> 4.21.0-1
-- Rebased to LDAP SDK 4.21.0
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.20.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.20.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Aug 10 2018 Dogtag PKI Team <pki-team@redhat.com> 4.20.0-1
-- Rebased to LDAP SDK 4.20.0
-

sources

@@ -1 +1 @@
-SHA512 (ldap-sdk-4.22.0.tar.gz) = 5f8d2a2c0042f281e054cfd3dc1604a5038a77b175268b415cd708031940064b62ec41043bc49d25fdd860aaaaa2a2de95a0c92c409951bfac21770c2d4ff1be
+SHA512 (ldap-sdk-5.0.0-alpha1.tar.gz) = dcb1f0da5f7aaaa76151a2c9fc687dbdfec382919177fe38a78f58a1bfcbe9033a5f087755653883cbdfabc762a6ce7d008df3dc4c14854036f3087f7e2568a7