From 9968018c08839c4e2c86b25fcd8c176598543ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 15:12:20 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/ldapjdk#d04113c89f850def108d9baeba8387e409a1e7d5 --- .gitignore | 5 + ...se-JDK8-target-as-suggested-by-Fabio.patch | 65 +++++++ copr-build.sh | 9 + ldapjdk.spec | 182 ++++++++++++++++++ sources | 1 + sources-update.sh | 7 + 6 files changed, 269 insertions(+) create mode 100644 0001-Use-JDK8-target-as-suggested-by-Fabio.patch create mode 100755 copr-build.sh create mode 100644 ldapjdk.spec create mode 100644 sources create mode 100755 sources-update.sh diff --git a/.gitignore b/.gitignore index e69de29..a878baa 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,5 @@ +ldapjdk-4.18.tar.gz +/ldapjdk-4.19.tar.gz +/ldap-sdk-4.20.0.tar.gz +/ldap-sdk-4.21.0.tar.gz +/ldap-sdk-4.22.0.tar.gz diff --git a/0001-Use-JDK8-target-as-suggested-by-Fabio.patch b/0001-Use-JDK8-target-as-suggested-by-Fabio.patch new file mode 100644 index 0000000..c71430e --- /dev/null +++ b/0001-Use-JDK8-target-as-suggested-by-Fabio.patch @@ -0,0 +1,65 @@ +From a652cceb4b8993c0af90d3fa590bcf92fadcfd71 Mon Sep 17 00:00:00 2001 +From: Fabio Valentini +Date: Mon, 17 Aug 2020 18:54:51 -0400 +Subject: [PATCH] Use JDK8 target as suggested by Fabio + +Signed-off-by: Alexander Scheel +--- + 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 @@ + + + + + +@@ -202,6 +208,8 @@ + + + +@@ -210,6 +218,8 @@ + + + +@@ -218,6 +228,8 @@ + + + +-- +2.26.2 + diff --git a/copr-build.sh b/copr-build.sh new file mode 100755 index 0000000..156c705 --- /dev/null +++ b/copr-build.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +REPO=$1 + +if [ "$REPO" == "" ]; then + REPO="pki-10.6" +fi + +fedpkg copr-build --nowait $REPO diff --git a/ldapjdk.spec b/ldapjdk.spec new file mode 100644 index 0000000..010d50e --- /dev/null +++ b/ldapjdk.spec @@ -0,0 +1,182 @@ +################################################################################ +Name: ldapjdk +################################################################################ + +Summary: LDAP SDK +URL: http://www.dogtagpki.org/ +License: MPLv1.1 or GPLv2+ or LGPLv2+ + +BuildArch: noarch + +Version: 4.22.0 +Release: 4%{?_timestamp}%{?_commit_id}%{?dist} +# global _phase -a1 + +%global spname ldapsp +%global filtname ldapfilt +%global beansname ldapbeans + +# To create a tarball from a version tag: +# $ git archive \ +# --format=tar.gz \ +# --prefix ldap-sdk-/ \ +# -o ldap-sdk-.tar.gz \ +# +Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap-sdk-%{version}%{?_phase}.tar.gz + +# To create a patch for all changes since a version tag: +# $ git format-patch \ +# --stdout \ +# \ +# > ldap-sdk-VERSION-RELEASE.patch +# Patch: ldap-sdk-VERSION-RELEASE.patch +Patch1: 0001-Use-JDK8-target-as-suggested-by-Fabio.patch + +################################################################################ +# Build Dependencies +################################################################################ + +# autosetup +BuildRequires: git + +BuildRequires: ant +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 >= 4.6.0 + +################################################################################ +# Runtime Dependencies +################################################################################ + +Requires: jpackage-utils >= 0:1.5 +Requires: slf4j +%if 0%{?rhel} && 0%{?rhel} <= 7 +# no slf4j-jdk14 +%else +Requires: slf4j-jdk14 +%endif +Requires: jss >= 4.6.0 + + +%description +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 javadoc +################################################################################ + +Summary: Javadoc for %{name} + +%description javadoc +Javadoc for %{name} + +################################################################################ +%prep +################################################################################ + +%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1 -S git + +# Remove all bundled jars, we must build against build-system jars +rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar + +################################################################################ +%build +################################################################################ + +# Link to build-system BRs +pwd +%if 0%{?rhel} && 0%{?rhel} <= 7 +( 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 +if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi +sh -x ant dist + +################################################################################ +%install +################################################################################ + +install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +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 + +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 %{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "ldapsdk:ldapsdk" + +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} + +################################################################################ +%files -f .mfiles +################################################################################ + +%{_javadir}/%{spname}*.jar +%{_javadir}/%{filtname}*.jar +%{_javadir}/%{beansname}*.jar +%{_javadir}-1.3.0/*.jar + +################################################################################ +%files javadoc +################################################################################ + +%dir %{_javadocdir}/%{name} +%{_javadocdir}/%{name}/* + +################################################################################ +%changelog +* Mon Aug 17 2020 Dogtag PKI Team - 4.22.0-4 +- Rebuilt for JDK8 compatibility + +* Tue Jul 28 2020 Fedora Release Engineering - 4.22.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 4.22.0-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jun 10 2020 Dogtag PKI Team - 4.22.0-1 +- Rebase to match latest upstream version: 4.22.0 + +* Wed Jan 29 2020 Fedora Release Engineering - 4.21.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Aug 08 2019 Dogtag PKI Team 4.21.0-2 +- Bump min required JSS version to 4.6.0 + +* Thu Aug 08 2019 Dogtag PKI Team 4.21.0-1 +- Rebased to LDAP SDK 4.21.0 + +* Thu Jul 25 2019 Fedora Release Engineering - 4.20.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 4.20.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Aug 10 2018 Dogtag PKI Team 4.20.0-1 +- Rebased to LDAP SDK 4.20.0 + diff --git a/sources b/sources new file mode 100644 index 0000000..05d2bd1 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (ldap-sdk-4.22.0.tar.gz) = 5f8d2a2c0042f281e054cfd3dc1604a5038a77b175268b415cd708031940064b62ec41043bc49d25fdd860aaaaa2a2de95a0c92c409951bfac21770c2d4ff1be diff --git a/sources-update.sh b/sources-update.sh new file mode 100755 index 0000000..96129ca --- /dev/null +++ b/sources-update.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +SOURCE=$1 +TARGET=`basename $1` + +cp $SOURCE $TARGET +sha512sum --tag $TARGET > sources