From 112a9bf87cbed91f337a486ea698e71290fb9464 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Thu, 12 Oct 2017 17:12:27 -0600 Subject: [PATCH 01/50] Mozilla Bug #1376300 - Missing getter methods in JDAPFilter classes --- ...etter-methods-for-JDAPFilter-classes.patch | 447 ++++++++++++++++++ ldapjdk-Added-gitignore-file.patch | 45 ++ ldapjdk.spec | 13 +- 3 files changed, 504 insertions(+), 1 deletion(-) create mode 100644 ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch create mode 100644 ldapjdk-Added-gitignore-file.patch diff --git a/ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch b/ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch new file mode 100644 index 0000000..4c7232b --- /dev/null +++ b/ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch @@ -0,0 +1,447 @@ +From 3258e4276bd13f3c9cd45ddf416e77b9732f079a Mon Sep 17 00:00:00 2001 +From: "Endi S. Dewata" +Date: Mon, 2 Oct 2017 17:44:02 +0200 +Subject: [PATCH] Added getter methods for JDAPFilter classes. + +Some JDAPFilter classes have been modified to provide getter +methods to access the elements of parsed LDAP filters. + +Eclipse project files have been added to simplify development +using Eclipse. + +The LDAPUrl has been modified to fix complie error in Eclipse. + +Some unused import statements have been removed as well. + +https://bugzilla.mozilla.org/show_bug.cgi?id=1376300 +--- + .classpath | 11 +++++ + .project | 17 ++++++++ + java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java | 2 +- + java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java | 2 - + .../netscape/ldap/client/JDAPBERTagDecoder.java | 1 - + .../ldapjdk/netscape/ldap/client/JDAPFilter.java | 1 - + .../netscape/ldap/client/JDAPFilterAVA.java | 2 - + .../netscape/ldap/client/JDAPFilterAnd.java | 2 - + .../ldap/client/JDAPFilterApproxMatch.java | 2 - + .../ldap/client/JDAPFilterEqualityMatch.java | 2 - + .../netscape/ldap/client/JDAPFilterExtensible.java | 2 - + .../ldap/client/JDAPFilterGreaterOrEqual.java | 2 - + .../ldap/client/JDAPFilterLessOrEqual.java | 2 - + .../netscape/ldap/client/JDAPFilterNot.java | 12 ++++-- + .../ldapjdk/netscape/ldap/client/JDAPFilterOr.java | 4 +- + .../netscape/ldap/client/JDAPFilterPresent.java | 10 ++++- + .../netscape/ldap/client/JDAPFilterSet.java | 10 ++++- + .../netscape/ldap/client/JDAPFilterSubString.java | 50 +++++++++++++++++++--- + 18 files changed, 100 insertions(+), 34 deletions(-) + create mode 100644 .classpath + create mode 100644 .project + +diff --git a/.classpath b/.classpath +new file mode 100644 +index 0000000..426c9dd +--- /dev/null ++++ b/.classpath +@@ -0,0 +1,11 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/.project b/.project +new file mode 100644 +index 0000000..b6607c7 +--- /dev/null ++++ b/.project +@@ -0,0 +1,17 @@ ++ ++ ++ ldap-sdks ++ ++ ++ ++ ++ ++ org.eclipse.jdt.core.javabuilder ++ ++ ++ ++ ++ ++ org.eclipse.jdt.core.javanature ++ ++ +diff --git a/java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java b/java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java +index 5fcd70e..fd808de 100644 +--- a/java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java ++++ b/java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java +@@ -383,7 +383,7 @@ public class LDAPUrl implements java.io.Serializable { + + try { + // then try Sun JSSESocketFactory +- _factory = new JSSESocketFactory(null); ++ _factory = new JSSESocketFactory((String[])null); + } + catch (Throwable e) { + } +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java +index 6d16bd4..2cc4d76 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java +@@ -37,8 +37,6 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; +-import java.io.*; + import netscape.ldap.ber.stream.*; + + /** +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPBERTagDecoder.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPBERTagDecoder.java +index 94b69ca..5b87223 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPBERTagDecoder.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPBERTagDecoder.java +@@ -37,7 +37,6 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; + import java.io.*; + +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilter.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilter.java +index 366d49d..0e16fff 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilter.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilter.java +@@ -39,7 +39,6 @@ package netscape.ldap.client; + + import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the filter. +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAVA.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAVA.java +index bf80dbe..d31785d 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAVA.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAVA.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the attribute value assertion filter. +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAnd.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAnd.java +index 0a47917..f780cfb 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAnd.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAnd.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the filter And. +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterApproxMatch.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterApproxMatch.java +index 747f5ed..91ca4a0 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterApproxMatch.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterApproxMatch.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the approximate match filter. +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterEqualityMatch.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterEqualityMatch.java +index c6e0bfe..6d891eb 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterEqualityMatch.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterEqualityMatch.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the equality match filter. +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterExtensible.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterExtensible.java +index 2e83117..04c9710 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterExtensible.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterExtensible.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the extended match filter. +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterGreaterOrEqual.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterGreaterOrEqual.java +index cbf066f..8aa7878 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterGreaterOrEqual.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterGreaterOrEqual.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the greater or equal filter. +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterLessOrEqual.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterLessOrEqual.java +index 8368ad3..7b1b434 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterLessOrEqual.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterLessOrEqual.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the less or equal filter. +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterNot.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterNot.java +index 4aabd66..e25ea14 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterNot.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterNot.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the filter not. +@@ -66,6 +64,14 @@ public class JDAPFilterNot extends JDAPFilter { + } + + /** ++ * Gets original filter. ++ * @return original filter ++ */ ++ public JDAPFilter getFilter() { ++ return m_filter; ++ } ++ ++ /** + * Gets ber representation of the filter. + * @return ber representation + */ +@@ -76,7 +82,7 @@ public class JDAPFilterNot extends JDAPFilter { + } + + /** +- * Gets string reprensetation of the filter. ++ * Gets string representation of the filter. + * @return string representation + */ + public String toString() { +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterOr.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterOr.java +index 430760f..d624f01 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterOr.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterOr.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the filter And. +@@ -59,7 +57,7 @@ public class JDAPFilterOr extends JDAPFilterSet { + } + + /** +- * Gets string reprensetation of the filter. ++ * Gets string representation of the filter. + * @return string representation + */ + public String toString() { +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterPresent.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterPresent.java +index db408a2..796e14e 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterPresent.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterPresent.java +@@ -37,9 +37,7 @@ + * ***** END LICENSE BLOCK ***** */ + package netscape.ldap.client; + +-import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the filter present. +@@ -66,6 +64,14 @@ public class JDAPFilterPresent extends JDAPFilter { + } + + /** ++ * Gets attribute type. ++ * @return attribute type ++ */ ++ public String getType() { ++ return m_type; ++ } ++ ++ /** + * Gets ber representation of the filter. + * @return ber representation + */ +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSet.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSet.java +index 72a0098..5f5a71e 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSet.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSet.java +@@ -51,7 +51,7 @@ public abstract class JDAPFilterSet extends JDAPFilter { + * Internal variables + */ + private int m_tag; +- private Vector m_set = new Vector(); ++ private Vector m_set = new Vector<>(); + + /** + * Constructs the filter set. +@@ -63,6 +63,14 @@ public abstract class JDAPFilterSet extends JDAPFilter { + } + + /** ++ * Gets the filter set. ++ * @return filter set ++ */ ++ public Collection getFilters() { ++ return m_set; ++ } ++ ++ /** + * Adds filter into the filter set. + * @param filter adding filter + */ +diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSubString.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSubString.java +index 129a8ec..b660082 100644 +--- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSubString.java ++++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSubString.java +@@ -39,11 +39,10 @@ package netscape.ldap.client; + + import java.util.*; + import netscape.ldap.ber.stream.*; +-import java.io.*; + + /** + * This class implements the filter substring. +- * See RFC 1777. ++ * See RFC 1777 and 2254. + * 
+  * [4] SEQUENCE {
+  *   type AttributeType,
+@@ -52,7 +51,12 @@ import java.io.*;
+  *     any [1] LDAPString,
+  *     final [2] LDAPString
+  *   }
+- *     }
++ * }
++ *
++ * substring  = attr "=" [initial] any [final]
++ * initial    = value
++ * any        = "*" *(value "*")
++ * final      = value
+  *
+ * + * @version 1.0 +@@ -62,9 +66,9 @@ public class JDAPFilterSubString extends JDAPFilter { + * Internal variables + */ + private String m_type = null; +- private Vector m_initial = new Vector(); +- private Vector m_any = new Vector(); +- private Vector m_final = new Vector(); ++ private Vector m_initial = new Vector<>(); ++ private Vector m_any = new Vector<>(); ++ private Vector m_final = new Vector<>(); + + /** + * Constructs the filter. +@@ -76,6 +80,23 @@ public class JDAPFilterSubString extends JDAPFilter { + } + + /** ++ * Get attribute type. ++ * @return attribute type ++ */ ++ public String getType() { ++ return m_type; ++ } ++ ++ /** ++ * Get initial substring. ++ * @return initial substring. ++ */ ++ public String getInitialSubstring() { ++ // RFC 2254: there is only one optional initial substring ++ return m_initial.isEmpty() ? null : m_initial.get(0); ++ } ++ ++ /** + * Adds initial substring. + * @param s initial substring + */ +@@ -84,6 +105,14 @@ public class JDAPFilterSubString extends JDAPFilter { + } + + /** ++ * Get any substrings. ++ * @return any substrings. ++ */ ++ public Collection getAnySubstrings() { ++ return m_any; ++ } ++ ++ /** + * Adds any substring. + * @param s any substring + */ +@@ -92,6 +121,15 @@ public class JDAPFilterSubString extends JDAPFilter { + } + + /** ++ * Get final substring. ++ * @return final substring. ++ */ ++ public String getFinalSubstring() { ++ // RFC 2254: there is only one optional final substring ++ return m_final.isEmpty() ? null : m_final.get(0); ++ } ++ ++ /** + * Adds final substring. + * @param s final substring + */ +-- +2.13.6 + diff --git a/ldapjdk-Added-gitignore-file.patch b/ldapjdk-Added-gitignore-file.patch new file mode 100644 index 0000000..3eefdff --- /dev/null +++ b/ldapjdk-Added-gitignore-file.patch @@ -0,0 +1,45 @@ +From 8066b70367ea28a2e053a23172b230a938152bd8 Mon Sep 17 00:00:00 2001 +From: Matthew Harmsen +Date: Thu, 12 Oct 2017 10:35:46 -0600 +Subject: [PATCH] Added .gitignore file + +ldapjdk Pagure Issue #1 - Add .gitignore file based upon contents + of .hgignore file + +Change-Id: I6ceb4653a0b51eecf9314109fed9f4326bb07821 +--- + .gitignore | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + create mode 100644 .gitignore + +diff --git a/.gitignore b/.gitignore +new file mode 100644 +index 0000000..e4ad492 +--- /dev/null ++++ b/.gitignore +@@ -0,0 +1,22 @@ ++# .gitignore - List of filenames git should ignore ++ ++# Filenames that should be ignored wherever they appear ++.pyc ++TAGS ++Makefile ++now ++ ++ ++# User files that may appear at the root ++**/config/.cache ++**/config/.log ++**/config/.status ++**/config/autoconf.mk ++**/config/nsinstall ++.fast-update ++ ++sdkver.h ++dirver.h ++ ++# Ignore Eclipse build directory ++bin +-- +2.13.6 + diff --git a/ldapjdk.spec b/ldapjdk.spec index 76398b6..b82882b 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -4,7 +4,7 @@ Name: ldapjdk Version: 4.19 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: The Mozilla LDAP Java SDK License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -18,6 +18,12 @@ Source: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{name}-%{v # changed: gId, aId and version Source1: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{name}-%{version}.pom +####################### +## ldapjdk-4.19-4 +####################### +Patch0: ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch +Patch1: ldapjdk-Added-gitignore-file.patch + Requires: jpackage-utils >= 0:1.5 Requires: jss BuildRequires: ant @@ -44,6 +50,8 @@ Javadoc for %{name} %setup -q # Remove all bundled jars, we must build against build-system jars rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar +%patch0 -p1 +%patch1 -p1 %build # cleanup CVS dirs @@ -91,6 +99,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name}/* %changelog +* Wed Oct 11 2017 Matthew Harmsen 0:4.19-4 +- Mozilla Bug #1376300 - Missing getter methods in JDAPFilter classes + * Wed Sep 6 2017 Mikolaj Izdebski - 0:4.19-3 - Don't rely on build-jar-repository for locating JVM extension JARs - Resolves: rhbz#1488851 From 6821ae27445d7ca6f90e45aea6efdcf6b6c519a2 Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Thu, 12 Oct 2017 18:06:36 -0600 Subject: [PATCH 02/50] Fixed builds for CentOS 7 --- ldapjdk.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index b82882b..ebcdce0 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -4,7 +4,7 @@ Name: ldapjdk Version: 4.19 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: The Mozilla LDAP Java SDK License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -28,7 +28,11 @@ Requires: jpackage-utils >= 0:1.5 Requires: jss BuildRequires: ant BuildRequires: java-devel +%if 0%{?rhel} +BuildRequires: jpackage-utils >= 0:1.5 +%else BuildRequires: javapackages-local +%endif BuildRequires: jss Provides: jndi-ldap = 1.3.0 @@ -58,8 +62,12 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar rm -fr $(find . -name CVS -type d) # Link to build-system BRs pwd +%if 0%{?rhel} +( 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 @@ -99,6 +107,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name}/* %changelog +* Thu Oct 12 2017 Matthew Harmsen 0:4.19-5 +- Fix build for CentOS 7 + * Wed Oct 11 2017 Matthew Harmsen 0:4.19-4 - Mozilla Bug #1376300 - Missing getter methods in JDAPFilter classes From 59e646f0c77cb466868fdead77529a4ad94e0e4e Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mon, 22 Jan 2018 11:51:01 +0100 Subject: [PATCH 03/50] fix some conditionals in the spec file --- ldapjdk.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index ebcdce0..ef9690a 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -4,7 +4,7 @@ Name: ldapjdk Version: 4.19 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: The Mozilla LDAP Java SDK License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -28,7 +28,7 @@ Requires: jpackage-utils >= 0:1.5 Requires: jss BuildRequires: ant BuildRequires: java-devel -%if 0%{?rhel} +%if 0%{?rhel} <= 7 BuildRequires: jpackage-utils >= 0:1.5 %else BuildRequires: javapackages-local @@ -62,7 +62,7 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar rm -fr $(find . -name CVS -type d) # Link to build-system BRs pwd -%if 0%{?rhel} +%if 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 ) @@ -107,6 +107,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name}/* %changelog +* Wed Jan 03 2018 Karsten Hopp - 4.19-5+4 +- fix some conditionals + * Thu Oct 12 2017 Matthew Harmsen 0:4.19-5 - Fix build for CentOS 7 From 56999e4ec9c2d42b36725756f9d95245e23dd09d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 20:56:41 +0000 Subject: [PATCH 04/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index ef9690a..6d55ec0 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -4,7 +4,7 @@ Name: ldapjdk Version: 4.19 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: The Mozilla LDAP Java SDK License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -107,6 +107,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name}/* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0:4.19-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jan 03 2018 Karsten Hopp - 4.19-5+4 - fix some conditionals From 2012c5c96db628e1fa026ca8e6f0924d9106324c Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Wed, 30 May 2018 09:34:06 -0700 Subject: [PATCH 05/50] Fix rhel conditionals --- ldapjdk.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 6d55ec0..717b304 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ Requires: jpackage-utils >= 0:1.5 Requires: jss BuildRequires: ant BuildRequires: java-devel -%if 0%{?rhel} <= 7 +%if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: jpackage-utils >= 0:1.5 %else BuildRequires: javapackages-local @@ -62,7 +62,7 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar rm -fr $(find . -name CVS -type d) # Link to build-system BRs pwd -%if 0%{?rhel} <= 7 +%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 ) @@ -109,6 +109,7 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %changelog * Wed Feb 07 2018 Fedora Release Engineering - 0:4.19-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild +- Fix rhel conditionals * Wed Jan 03 2018 Karsten Hopp - 4.19-5+4 - fix some conditionals From dc55f2d62ae401222097ecf1656e30c80bc8cdbe Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 01:35:13 -0500 Subject: [PATCH 06/50] Remove needless use of %defattr --- ldapjdk.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 717b304..2f23eea 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -95,14 +95,12 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files -f .mfiles -%defattr(-,root,root,-) %{_javadir}/%{spname}*.jar %{_javadir}/%{filtname}*.jar %{_javadir}/%{beansname}*.jar %{_javadir}-1.3.0/*.jar %files javadoc -%defattr(-,root,root,) %dir %{_javadocdir}/%{name} %{_javadocdir}/%{name}/* From 888751f5e3349fac939964637eb9c9e2cba80331 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 07:38:46 +0000 Subject: [PATCH 07/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 2f23eea..9dd6213 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -4,7 +4,7 @@ Name: ldapjdk Version: 4.19 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: The Mozilla LDAP Java SDK License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -105,6 +105,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name}/* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0:4.19-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Feb 07 2018 Fedora Release Engineering - 0:4.19-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Fix rhel conditionals From 8408e753022259b8a8174b7c5ef8e1f64890b172 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 10 Aug 2018 21:19:15 +0200 Subject: [PATCH 08/50] Rebased to LDAP SDK 4.20.0 --- .gitignore | 1 + copr-build.sh | 9 + ldapjdk-4.19.pom | 6 - ...etter-methods-for-JDAPFilter-classes.patch | 447 ------------------ ldapjdk-Added-gitignore-file.patch | 45 -- ldapjdk.spec | 254 +++------- sources | 2 +- sources-update.sh | 7 + 8 files changed, 87 insertions(+), 684 deletions(-) create mode 100755 copr-build.sh delete mode 100644 ldapjdk-4.19.pom delete mode 100644 ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch delete mode 100644 ldapjdk-Added-gitignore-file.patch create mode 100755 sources-update.sh diff --git a/.gitignore b/.gitignore index 867ec88..04b63b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ ldapjdk-4.18.tar.gz /ldapjdk-4.19.tar.gz +/ldap-sdk-4.20.0.tar.gz 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-4.19.pom b/ldapjdk-4.19.pom deleted file mode 100644 index a380a1b..0000000 --- a/ldapjdk-4.19.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - ldapjdk - ldapjdk - 4.19 - diff --git a/ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch b/ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch deleted file mode 100644 index 4c7232b..0000000 --- a/ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch +++ /dev/null @@ -1,447 +0,0 @@ -From 3258e4276bd13f3c9cd45ddf416e77b9732f079a Mon Sep 17 00:00:00 2001 -From: "Endi S. Dewata" -Date: Mon, 2 Oct 2017 17:44:02 +0200 -Subject: [PATCH] Added getter methods for JDAPFilter classes. - -Some JDAPFilter classes have been modified to provide getter -methods to access the elements of parsed LDAP filters. - -Eclipse project files have been added to simplify development -using Eclipse. - -The LDAPUrl has been modified to fix complie error in Eclipse. - -Some unused import statements have been removed as well. - -https://bugzilla.mozilla.org/show_bug.cgi?id=1376300 ---- - .classpath | 11 +++++ - .project | 17 ++++++++ - java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java | 2 +- - java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java | 2 - - .../netscape/ldap/client/JDAPBERTagDecoder.java | 1 - - .../ldapjdk/netscape/ldap/client/JDAPFilter.java | 1 - - .../netscape/ldap/client/JDAPFilterAVA.java | 2 - - .../netscape/ldap/client/JDAPFilterAnd.java | 2 - - .../ldap/client/JDAPFilterApproxMatch.java | 2 - - .../ldap/client/JDAPFilterEqualityMatch.java | 2 - - .../netscape/ldap/client/JDAPFilterExtensible.java | 2 - - .../ldap/client/JDAPFilterGreaterOrEqual.java | 2 - - .../ldap/client/JDAPFilterLessOrEqual.java | 2 - - .../netscape/ldap/client/JDAPFilterNot.java | 12 ++++-- - .../ldapjdk/netscape/ldap/client/JDAPFilterOr.java | 4 +- - .../netscape/ldap/client/JDAPFilterPresent.java | 10 ++++- - .../netscape/ldap/client/JDAPFilterSet.java | 10 ++++- - .../netscape/ldap/client/JDAPFilterSubString.java | 50 +++++++++++++++++++--- - 18 files changed, 100 insertions(+), 34 deletions(-) - create mode 100644 .classpath - create mode 100644 .project - -diff --git a/.classpath b/.classpath -new file mode 100644 -index 0000000..426c9dd ---- /dev/null -+++ b/.classpath -@@ -0,0 +1,11 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/.project b/.project -new file mode 100644 -index 0000000..b6607c7 ---- /dev/null -+++ b/.project -@@ -0,0 +1,17 @@ -+ -+ -+ ldap-sdks -+ -+ -+ -+ -+ -+ org.eclipse.jdt.core.javabuilder -+ -+ -+ -+ -+ -+ org.eclipse.jdt.core.javanature -+ -+ -diff --git a/java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java b/java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java -index 5fcd70e..fd808de 100644 ---- a/java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java -+++ b/java-sdk/ietfldap/org/ietf/ldap/LDAPUrl.java -@@ -383,7 +383,7 @@ public class LDAPUrl implements java.io.Serializable { - - try { - // then try Sun JSSESocketFactory -- _factory = new JSSESocketFactory(null); -+ _factory = new JSSESocketFactory((String[])null); - } - catch (Throwable e) { - } -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java -index 6d16bd4..2cc4d76 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPAVA.java -@@ -37,8 +37,6 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; --import java.io.*; - import netscape.ldap.ber.stream.*; - - /** -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPBERTagDecoder.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPBERTagDecoder.java -index 94b69ca..5b87223 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPBERTagDecoder.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPBERTagDecoder.java -@@ -37,7 +37,6 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; - import java.io.*; - -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilter.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilter.java -index 366d49d..0e16fff 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilter.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilter.java -@@ -39,7 +39,6 @@ package netscape.ldap.client; - - import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the filter. -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAVA.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAVA.java -index bf80dbe..d31785d 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAVA.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAVA.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the attribute value assertion filter. -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAnd.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAnd.java -index 0a47917..f780cfb 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAnd.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterAnd.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the filter And. -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterApproxMatch.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterApproxMatch.java -index 747f5ed..91ca4a0 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterApproxMatch.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterApproxMatch.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the approximate match filter. -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterEqualityMatch.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterEqualityMatch.java -index c6e0bfe..6d891eb 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterEqualityMatch.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterEqualityMatch.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the equality match filter. -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterExtensible.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterExtensible.java -index 2e83117..04c9710 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterExtensible.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterExtensible.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the extended match filter. -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterGreaterOrEqual.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterGreaterOrEqual.java -index cbf066f..8aa7878 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterGreaterOrEqual.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterGreaterOrEqual.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the greater or equal filter. -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterLessOrEqual.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterLessOrEqual.java -index 8368ad3..7b1b434 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterLessOrEqual.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterLessOrEqual.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the less or equal filter. -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterNot.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterNot.java -index 4aabd66..e25ea14 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterNot.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterNot.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the filter not. -@@ -66,6 +64,14 @@ public class JDAPFilterNot extends JDAPFilter { - } - - /** -+ * Gets original filter. -+ * @return original filter -+ */ -+ public JDAPFilter getFilter() { -+ return m_filter; -+ } -+ -+ /** - * Gets ber representation of the filter. - * @return ber representation - */ -@@ -76,7 +82,7 @@ public class JDAPFilterNot extends JDAPFilter { - } - - /** -- * Gets string reprensetation of the filter. -+ * Gets string representation of the filter. - * @return string representation - */ - public String toString() { -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterOr.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterOr.java -index 430760f..d624f01 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterOr.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterOr.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the filter And. -@@ -59,7 +57,7 @@ public class JDAPFilterOr extends JDAPFilterSet { - } - - /** -- * Gets string reprensetation of the filter. -+ * Gets string representation of the filter. - * @return string representation - */ - public String toString() { -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterPresent.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterPresent.java -index db408a2..796e14e 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterPresent.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterPresent.java -@@ -37,9 +37,7 @@ - * ***** END LICENSE BLOCK ***** */ - package netscape.ldap.client; - --import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the filter present. -@@ -66,6 +64,14 @@ public class JDAPFilterPresent extends JDAPFilter { - } - - /** -+ * Gets attribute type. -+ * @return attribute type -+ */ -+ public String getType() { -+ return m_type; -+ } -+ -+ /** - * Gets ber representation of the filter. - * @return ber representation - */ -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSet.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSet.java -index 72a0098..5f5a71e 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSet.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSet.java -@@ -51,7 +51,7 @@ public abstract class JDAPFilterSet extends JDAPFilter { - * Internal variables - */ - private int m_tag; -- private Vector m_set = new Vector(); -+ private Vector m_set = new Vector<>(); - - /** - * Constructs the filter set. -@@ -63,6 +63,14 @@ public abstract class JDAPFilterSet extends JDAPFilter { - } - - /** -+ * Gets the filter set. -+ * @return filter set -+ */ -+ public Collection getFilters() { -+ return m_set; -+ } -+ -+ /** - * Adds filter into the filter set. - * @param filter adding filter - */ -diff --git a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSubString.java b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSubString.java -index 129a8ec..b660082 100644 ---- a/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSubString.java -+++ b/java-sdk/ldapjdk/netscape/ldap/client/JDAPFilterSubString.java -@@ -39,11 +39,10 @@ package netscape.ldap.client; - - import java.util.*; - import netscape.ldap.ber.stream.*; --import java.io.*; - - /** - * This class implements the filter substring. -- * See RFC 1777. -+ * See RFC 1777 and 2254. - * 
-  * [4] SEQUENCE {
-  *   type AttributeType,
-@@ -52,7 +51,12 @@ import java.io.*;
-  *     any [1] LDAPString,
-  *     final [2] LDAPString
-  *   }
-- *     }
-+ * }
-+ *
-+ * substring  = attr "=" [initial] any [final]
-+ * initial    = value
-+ * any        = "*" *(value "*")
-+ * final      = value
-  *
- * - * @version 1.0 -@@ -62,9 +66,9 @@ public class JDAPFilterSubString extends JDAPFilter { - * Internal variables - */ - private String m_type = null; -- private Vector m_initial = new Vector(); -- private Vector m_any = new Vector(); -- private Vector m_final = new Vector(); -+ private Vector m_initial = new Vector<>(); -+ private Vector m_any = new Vector<>(); -+ private Vector m_final = new Vector<>(); - - /** - * Constructs the filter. -@@ -76,6 +80,23 @@ public class JDAPFilterSubString extends JDAPFilter { - } - - /** -+ * Get attribute type. -+ * @return attribute type -+ */ -+ public String getType() { -+ return m_type; -+ } -+ -+ /** -+ * Get initial substring. -+ * @return initial substring. -+ */ -+ public String getInitialSubstring() { -+ // RFC 2254: there is only one optional initial substring -+ return m_initial.isEmpty() ? null : m_initial.get(0); -+ } -+ -+ /** - * Adds initial substring. - * @param s initial substring - */ -@@ -84,6 +105,14 @@ public class JDAPFilterSubString extends JDAPFilter { - } - - /** -+ * Get any substrings. -+ * @return any substrings. -+ */ -+ public Collection getAnySubstrings() { -+ return m_any; -+ } -+ -+ /** - * Adds any substring. - * @param s any substring - */ -@@ -92,6 +121,15 @@ public class JDAPFilterSubString extends JDAPFilter { - } - - /** -+ * Get final substring. -+ * @return final substring. -+ */ -+ public String getFinalSubstring() { -+ // RFC 2254: there is only one optional final substring -+ return m_final.isEmpty() ? null : m_final.get(0); -+ } -+ -+ /** - * Adds final substring. - * @param s final substring - */ --- -2.13.6 - diff --git a/ldapjdk-Added-gitignore-file.patch b/ldapjdk-Added-gitignore-file.patch deleted file mode 100644 index 3eefdff..0000000 --- a/ldapjdk-Added-gitignore-file.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8066b70367ea28a2e053a23172b230a938152bd8 Mon Sep 17 00:00:00 2001 -From: Matthew Harmsen -Date: Thu, 12 Oct 2017 10:35:46 -0600 -Subject: [PATCH] Added .gitignore file - -ldapjdk Pagure Issue #1 - Add .gitignore file based upon contents - of .hgignore file - -Change-Id: I6ceb4653a0b51eecf9314109fed9f4326bb07821 ---- - .gitignore | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - create mode 100644 .gitignore - -diff --git a/.gitignore b/.gitignore -new file mode 100644 -index 0000000..e4ad492 ---- /dev/null -+++ b/.gitignore -@@ -0,0 +1,22 @@ -+# .gitignore - List of filenames git should ignore -+ -+# Filenames that should be ignored wherever they appear -+.pyc -+TAGS -+Makefile -+now -+ -+ -+# User files that may appear at the root -+**/config/.cache -+**/config/.log -+**/config/.status -+**/config/autoconf.mk -+**/config/nsinstall -+.fast-update -+ -+sdkver.h -+dirver.h -+ -+# Ignore Eclipse build directory -+bin --- -2.13.6 - diff --git a/ldapjdk.spec b/ldapjdk.spec index 9dd6213..4da094c 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -1,65 +1,86 @@ +################################################################################ +Name: ldapjdk +################################################################################ + +Summary: LDAP SDK +URL: http://www.dogtagpki.org/ +License: MPLv1.1 or GPLv2+ or LGPLv2+ + +BuildArch: noarch + +Version: 4.20.0 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +# global _phase -a1 + %global spname ldapsp %global filtname ldapfilt %global beansname ldapbeans -Name: ldapjdk -Version: 4.19 -Release: 8%{?dist} -Epoch: 0 -Summary: The Mozilla LDAP Java SDK -License: MPLv1.1 or GPLv2+ or LGPLv2+ -Group: Development/Java -URL: http://www-archive.mozilla.org/directory/javasdk.html -# mkdir ldapjdk-4.19 ; -# cvs -d:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot Export -r LDAPJavaSDK_419 DirectorySDKSourceJava -# tar -zcf ldapjdk-4.19.tar.gz ldapjdk-4.19 -Source: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{name}-%{version}.tar.gz -# originally taken from http://mirrors.ibiblio.org/pub/mirrors/maven2/ldapsdk/ldapsdk/4.1/ldapsdk-4.1.pom -# changed: gId, aId and version -Source1: http://pki.fedoraproject.org/pki/sources/%{name}/%{version}/%{name}-%{version}.pom +# 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 -####################### -## ldapjdk-4.19-4 -####################### -Patch0: ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch -Patch1: ldapjdk-Added-gitignore-file.patch +# 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 -Requires: jpackage-utils >= 0:1.5 -Requires: jss -BuildRequires: ant -BuildRequires: java-devel +################################################################################ +# Build Dependencies +################################################################################ + +# autosetup +BuildRequires: git + +BuildRequires: ant +BuildRequires: java-devel %if 0%{?rhel} && 0%{?rhel} <= 7 -BuildRequires: jpackage-utils >= 0:1.5 +BuildRequires: jpackage-utils >= 0:1.5 %else -BuildRequires: javapackages-local +BuildRequires: javapackages-local %endif -BuildRequires: jss +BuildRequires: jss >= 4.5.0-1 + +################################################################################ +# Runtime Dependencies +################################################################################ + +Requires: jpackage-utils >= 0:1.5 +Requires: jss >= 4.5.0-1 -Provides: jndi-ldap = 1.3.0 -BuildArch: noarch %description The Mozilla LDAP SDKs enable you to write applications which access, manage, and update the information stored in an LDAP directory. +################################################################################ %package javadoc -Group: Development/Documentation +################################################################################ + Summary: Javadoc for %{name} -Obsoletes: openjmx-javadoc %description javadoc Javadoc for %{name} +################################################################################ %prep -%setup -q +################################################################################ + +%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 -%patch0 -p1 -%patch1 -p1 +################################################################################ %build -# cleanup CVS dirs -rm -fr $(find . -name CVS -type d) +################################################################################ + # Link to build-system BRs pwd %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -72,8 +93,9 @@ cd java-sdk if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi sh -x ant dist +################################################################################ %install -rm -rf $RPM_BUILD_ROOT +################################################################################ install -d -m 755 $RPM_BUILD_ROOT%{_javadir} install -m 644 java-sdk/dist/packages/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar @@ -88,168 +110,30 @@ pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0 popd mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{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 -* Fri Jul 13 2018 Fedora Release Engineering - 0:4.19-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild +* Fri Aug 10 2018 Dogtag PKI Team 4.20.0-0 +- Rebased to LDAP SDK 4.20.0 -* Wed Feb 07 2018 Fedora Release Engineering - 0:4.19-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -- Fix rhel conditionals - -* Wed Jan 03 2018 Karsten Hopp - 4.19-5+4 -- fix some conditionals - -* Thu Oct 12 2017 Matthew Harmsen 0:4.19-5 -- Fix build for CentOS 7 - -* Wed Oct 11 2017 Matthew Harmsen 0:4.19-4 -- Mozilla Bug #1376300 - Missing getter methods in JDAPFilter classes - -* Wed Sep 6 2017 Mikolaj Izdebski - 0:4.19-3 -- Don't rely on build-jar-repository for locating JVM extension JARs -- Resolves: rhbz#1488851 - -* Wed Jul 26 2017 Fedora Release Engineering - 0:4.19-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 8 2017 Matthew Harmsen 0:4.19-1 -- Resolves: rhbz #1394372 - Rebase ldapjdk to 4.19 - -* Fri Feb 10 2017 Fedora Release Engineering - 0:4.18-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 31 2016 Matthew Harmsen 0:4.18-20 -- Resolves: rhbz #1382856 - ldapjdk fails to parse ldap url with no host:port (mreynolds) - -* Tue Aug 9 2016 Matthew Harmsen 0:4.18-19 -- Resolves: rhbz #1353564 - ldapjdk needs to support IPv6 (mreynolds) - -* Thu Feb 04 2016 Fedora Release Engineering - 0:4.18-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 0:4.18-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Feb 16 2015 Michal Srb - 0:4.18-16 -- Fix FTBFS (Resolves: rhbz#1105978) - -* Sat Jun 07 2014 Fedora Release Engineering - 0:4.18-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 0:4.18-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0:4.18-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Nov 13 2012 Matthew Harmsen 0:4.18-12 -- Appended full URLs in front of source files - -* Sat Aug 18 2012 gil cattaneo 0:4.18-11 -- Added maven pom - -* Thu Jul 19 2012 Fedora Release Engineering - 0:4.18-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 0:4.18-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Mar 31 2011 Rich Megginson 0:4.18-8 -- Resolves: bug 684012 - LDAPSchemaElement.getOptionalValues() mangles values -- upstream bug https://bugzilla.mozilla.org/show_bug.cgi?id=640750 - -* Fri Feb 18 2011 Alexander Kurtakov 0:4.18-7 -- Drop gcj. -- Adapt to current guidelines. - -* Mon Feb 07 2011 Fedora Release Engineering - 0:4.18-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 0:4.18-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Mar 20 2009 Deepak Bhole - 0:4.18-4 -- RPM was using pre-built jars before. Fixed that problem. - -* Wed Feb 25 2009 Fedora Release Engineering - 0:4.18-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu May 29 2008 Tom "spot" Callaway - 4.18-2 -- fix license tag - -* Tue Feb 19 2008 Dennis Gilmore - 4.18-1 -- update to 4.18 -- spec contents pulled from RHEL5 srpm -- fedora spec changelog -- update buildroot -- use jss from fedora for building - -* Tue Feb 19 2008 Fedora Release Engineering - 0:4.17-2jpp.7 -- Autorebuild for GCC 4.3 - -* Fri Aug 11 2006 Vivek Lakshmanan 0:4.17-1jpp.7 -- Rebuild with new naming convention. - -* Mon Jul 24 2006 Vivek Lakshmanan 0:4.17-1jpp_6fc -- Add conditional native compilation. - -* Sat Jul 22 2006 Jakub Jelinek - 0:4.17-1jpp_5fc -- Rebuilt - -* Wed Jul 19 2006 Jesse Keating - 0:4.17-1jpp_4fc -- fix release -- remove silly name, version, release defines. - -* Wed Jul 12 2006 Jesse Keating - 0:4.17-1jpp_3fc.1.1.2.1 -- rebuild - -* Tue Jul 11 2006 Archit Shah -- add java-devel BuildRequires (bug #192530) - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Sat Nov 5 2005 Archit Shah 0:4.17-1jpp_3fc -- Call javadoc with sourcepath to work aroung gjdoc bug (#170611) - -* Thu Jan 27 2005 Gary Benson 0:4.17-1jpp_2fc -- Remove non-distributable files from the source tarball. - -* Fri Jan 21 2005 Gary Benson 0:4.17-1jpp_1fc -- Build into Fedora. - -* Tue Nov 16 2004 Fernando Nasser 0:4.17-1jpp_1rh -- Merge with upstream for upgrade - -* Thu Aug 26 2004 Fernando Nasser 0:4.17-1jpp -- Upgrade to 4.17 -- Rebuilt with Ant 1.6.2 - -* Fri Mar 5 2004 Frank Ch. Eigler 0:4.1-5jpp_1rh -- RH vacuuming -- added ldapjdk-javaxssl.patch to stop using com.sun.* - -* Sun Sep 28 2003 David Walluck 0:4.1-5jpp -- add Distribution and Vendor tags -- fix jpackage-utils requirement -- change gmake to %%__make -- break %%description lines - -* Thu Mar 27 2003 Nicolas Mailhot -- Initial build. diff --git a/sources b/sources index ef2b655..b6e10b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldapjdk-4.19.tar.gz) = 2a63827572423eab513a831b49ebe2fd0c93259f82f953576bf30050a51b5d2effcf167826c0ce213ef1bc4e8230ac56fd004987b4adb5a38cbb09598d0fccf8 +SHA512 (ldap-sdk-4.20.0.tar.gz) = f04530a314e91f7be6f5fbcb847a5a2554ca3e8131dc8cd8888f4ace01e7da86fa044b78299b937c49723f82f0c55cf81c3f4f249c11932f9a70cb0a7e9e9f84 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 From d8bfa7dd9c42b64933c35547ed0eb63831165365 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 14 Aug 2018 23:42:39 +0200 Subject: [PATCH 09/50] Fixed changelog --- ldapjdk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 4da094c..372cb81 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -134,6 +134,6 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog -* Fri Aug 10 2018 Dogtag PKI Team 4.20.0-0 +* Fri Aug 10 2018 Dogtag PKI Team 4.20.0-1 - Rebased to LDAP SDK 4.20.0 From 0ac0fbe0df7f6091784c0e035705ea1fd1a76ae2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 06:26:27 +0000 Subject: [PATCH 10/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 372cb81..2a8d366 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 4.20.0 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 2%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -134,6 +134,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* 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 From c74243a8dfe3872fe1dd8ec22615c07b0e6354a0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 12:33:07 +0000 Subject: [PATCH 11/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 2a8d366..2d62037 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 4.20.0 -Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +Release: 3%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -134,6 +134,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* 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 From 3ed6f8dbab8751f13b2159893790d4707b206e88 Mon Sep 17 00:00:00 2001 From: Dinesh Prasanth M K Date: Thu, 8 Aug 2019 16:11:36 -0400 Subject: [PATCH 12/50] Rebased to ldapjdk v4.21.0 Signed-off-by: Dinesh Prasanth M K --- .gitignore | 1 + ldapjdk.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 04b63b9..34701a6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ ldapjdk-4.18.tar.gz /ldapjdk-4.19.tar.gz /ldap-sdk-4.20.0.tar.gz +/ldap-sdk-4.21.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index 2d62037..af06aa1 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -8,8 +8,8 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch -Version: 4.20.0 -Release: 3%{?_timestamp}%{?_commit_id}%{?dist} +Version: 4.21.0 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -45,6 +45,7 @@ BuildRequires: jpackage-utils >= 0:1.5 %else BuildRequires: javapackages-local %endif +BuildRequires: slf4j BuildRequires: jss >= 4.5.0-1 ################################################################################ @@ -52,6 +53,7 @@ BuildRequires: jss >= 4.5.0-1 ################################################################################ Requires: jpackage-utils >= 0:1.5 +Requires: slf4j Requires: jss >= 4.5.0-1 @@ -134,6 +136,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* 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 diff --git a/sources b/sources index b6e10b8..00bb264 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-4.20.0.tar.gz) = f04530a314e91f7be6f5fbcb847a5a2554ca3e8131dc8cd8888f4ace01e7da86fa044b78299b937c49723f82f0c55cf81c3f4f249c11932f9a70cb0a7e9e9f84 +SHA512 (ldap-sdk-4.21.0.tar.gz) = c1a01c179d5f2f7635327124439089b68c387e9f93038072feff719624f913fa0efbfa6bad71f9229bc3314e732b020e007cc60d942fed06a2a6bf1ea40d5f7b From 6b7268705ad62218816a4759089d66b5c6251600 Mon Sep 17 00:00:00 2001 From: Dinesh Prasanth M K Date: Thu, 8 Aug 2019 18:32:14 -0400 Subject: [PATCH 13/50] Bump min required JSS version to 4.6.0 Signed-off-by: Dinesh Prasanth M K --- ldapjdk.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index af06aa1..19fef9f 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 4.21.0 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 2%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -46,7 +46,7 @@ BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: javapackages-local %endif BuildRequires: slf4j -BuildRequires: jss >= 4.5.0-1 +BuildRequires: jss >= 4.6.0 ################################################################################ # Runtime Dependencies @@ -54,7 +54,7 @@ BuildRequires: jss >= 4.5.0-1 Requires: jpackage-utils >= 0:1.5 Requires: slf4j -Requires: jss >= 4.5.0-1 +Requires: jss >= 4.6.0 %description @@ -136,6 +136,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* 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 From 89f64f2d5d27542dc5b64d13edad9e78f3e45d89 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 08:19:01 +0000 Subject: [PATCH 14/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 19fef9f..29ee6ee 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 4.21.0 -Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +Release: 3%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -136,6 +136,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* 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 From fba596672b4c89fb30d6fa4c7dc8deae9ca95810 Mon Sep 17 00:00:00 2001 From: Dinesh Prasanth M K Date: Wed, 10 Jun 2020 17:00:52 -0400 Subject: [PATCH 15/50] Rebase to match upstream version 4.22.0 Signed-off-by: Dinesh Prasanth M K --- .gitignore | 1 + ldapjdk.spec | 20 ++++++++++++++++++-- sources | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 34701a6..a878baa 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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/ldapjdk.spec b/ldapjdk.spec index 29ee6ee..fb84b63 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -8,8 +8,8 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch -Version: 4.21.0 -Release: 3%{?_timestamp}%{?_commit_id}%{?dist} +Version: 4.22.0 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -46,6 +46,11 @@ BuildRequires: jpackage-utils >= 0:1.5 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 ################################################################################ @@ -54,6 +59,11 @@ BuildRequires: jss >= 4.6.0 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 @@ -61,6 +71,8 @@ Requires: jss >= 4.6.0 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 ################################################################################ @@ -112,6 +124,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0 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" @@ -136,6 +149,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* 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 diff --git a/sources b/sources index 00bb264..05d2bd1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-4.21.0.tar.gz) = c1a01c179d5f2f7635327124439089b68c387e9f93038072feff719624f913fa0efbfa6bad71f9229bc3314e732b020e007cc60d942fed06a2a6bf1ea40d5f7b +SHA512 (ldap-sdk-4.22.0.tar.gz) = 5f8d2a2c0042f281e054cfd3dc1604a5038a77b175268b415cd708031940064b62ec41043bc49d25fdd860aaaaa2a2de95a0c92c409951bfac21770c2d4ff1be From cffceeff834c777809a0d56d2705de331edcdddc Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 01:54:00 +0200 Subject: [PATCH 16/50] Rebuilt for JDK-11 --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index fb84b63..932c29d 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 4.22.0 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 2%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -149,6 +149,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* 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 From c8768c07d44312edbdea12b66db28bc286b6e7a4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:01:49 +0000 Subject: [PATCH 17/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 932c29d..c9be9a9 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 4.22.0 -Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +Release: 3%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -149,6 +149,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* 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 From d04113c89f850def108d9baeba8387e409a1e7d5 Mon Sep 17 00:00:00 2001 From: Alexander Scheel Date: Mon, 17 Aug 2020 18:58:23 -0400 Subject: [PATCH 18/50] Rebuild for JDK8 compatibility Signed-off-by: Alexander Scheel --- ...se-JDK8-target-as-suggested-by-Fabio.patch | 65 +++++++++++++++++++ ldapjdk.spec | 6 +- 2 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 0001-Use-JDK8-target-as-suggested-by-Fabio.patch 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/ldapjdk.spec b/ldapjdk.spec index c9be9a9..010d50e 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 4.22.0 -Release: 3%{?_timestamp}%{?_commit_id}%{?dist} +Release: 4%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -30,6 +30,7 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap # \ # > ldap-sdk-VERSION-RELEASE.patch # Patch: ldap-sdk-VERSION-RELEASE.patch +Patch1: 0001-Use-JDK8-target-as-suggested-by-Fabio.patch ################################################################################ # Build Dependencies @@ -149,6 +150,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_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 From fe4eae1323ff608609d6eb0ae47bf0526d20a981 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 16:27:26 +0000 Subject: [PATCH 19/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 010d50e..c024551 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -9,7 +9,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: 4.22.0 -Release: 4%{?_timestamp}%{?_commit_id}%{?dist} +Release: 5%{?_timestamp}%{?_commit_id}%{?dist} # global _phase -a1 %global spname ldapsp @@ -150,6 +150,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 4.22.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Aug 17 2020 Dogtag PKI Team - 4.22.0-4 - Rebuilt for JDK8 compatibility From 3c2b54cfbcda49d20fa196bb8f2fdb19b381753c Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Mon, 7 Jun 2021 18:16:22 -0500 Subject: [PATCH 20/50] Rebase to LDAP SDK 4.23.0-alpha1 --- .gitignore | 1 + ...se-JDK8-target-as-suggested-by-Fabio.patch | 65 ------------------ ldapjdk.spec | 66 +++++++++++-------- sources | 2 +- 4 files changed, 39 insertions(+), 95 deletions(-) delete mode 100644 0001-Use-JDK8-target-as-suggested-by-Fabio.patch diff --git a/.gitignore b/.gitignore index a878baa..a3d5a50 100644 --- a/.gitignore +++ b/.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-4.23.0-alpha1.tar.gz diff --git a/0001-Use-JDK8-target-as-suggested-by-Fabio.patch b/0001-Use-JDK8-target-as-suggested-by-Fabio.patch deleted file mode 100644 index c71430e..0000000 --- a/0001-Use-JDK8-target-as-suggested-by-Fabio.patch +++ /dev/null @@ -1,65 +0,0 @@ -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/ldapjdk.spec b/ldapjdk.spec index c024551..67c0b57 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -8,9 +8,11 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch -Version: 4.22.0 -Release: 5%{?_timestamp}%{?_commit_id}%{?dist} -# global _phase -a1 +# For development (i.e. unsupported) releases, use x.y.z-0.n.. +# For official (i.e. supported) releases, use x.y.z-r where r >=1. +Version: 4.23.0 +Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist} +%global _phase -alpha1 %global spname ldapsp %global filtname ldapfilt @@ -30,17 +32,21 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap # \ # > 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/jre-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 @@ -58,6 +64,7 @@ BuildRequires: jss >= 4.6.0 # Runtime Dependencies ################################################################################ +Requires: %{java_headless} Requires: jpackage-utils >= 0:1.5 Requires: slf4j %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -87,7 +94,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 +103,16 @@ 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 ) +pushd java-sdk/ldapjdk/lib +build-jar-repository -s -p . jss4 +popd + 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 + +pushd java-sdk +export JAVA_HOME=%{java_home} sh -x ant dist +popd ################################################################################ %install @@ -118,28 +124,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 %{name}.pom %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "ldapsdk:ldapsdk" +install -pm 644 java-sdk/ldapjdk/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom +install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom +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,6 +155,9 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* Mon Jun 07 2021 Dogtag PKI Team - 4.23.0-0.1 +- Rebase to LDAP SDK 4.23.0-alpha1 + * Tue Jan 26 2021 Fedora Release Engineering - 4.22.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 05d2bd1..afccbb6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-4.22.0.tar.gz) = 5f8d2a2c0042f281e054cfd3dc1604a5038a77b175268b415cd708031940064b62ec41043bc49d25fdd860aaaaa2a2de95a0c92c409951bfac21770c2d4ff1be +SHA512 (ldap-sdk-4.23.0-alpha1.tar.gz) = 07146fda16dea7c84ed5f66bf3566120a037a3a4ab80a37030429a66d22b8e42d058b67d04f3a6c7efe9a76d1fd2b3ad62cf270684f8626dcfc996778a1cdbbe From a952d93e6bdf8b0914d10dadfa639b428070213e Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 22 Jun 2021 15:16:24 -0500 Subject: [PATCH 21/50] Rebase to LDAP SDK 5.0.0-alpha1 --- .gitignore | 1 + ldapjdk.spec | 61 ++++++---------------------------------------------- sources | 2 +- 3 files changed, 9 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index a3d5a50..b4bcc4c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-4.21.0.tar.gz /ldap-sdk-4.22.0.tar.gz /ldap-sdk-4.23.0-alpha1.tar.gz +/ldap-sdk-5.0.0-alpha1.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index 67c0b57..c0bb611 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -10,7 +10,7 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. -Version: 4.23.0 +Version: 5.0.0 Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist} %global _phase -alpha1 @@ -39,7 +39,7 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap %define java_devel java-11-openjdk-devel %define java_headless java-11-openjdk-headless -%define java_home /usr/lib/jvm/jre-11-openjdk +%define java_home /usr/lib/jvm/java-11-openjdk ################################################################################ # Build Dependencies @@ -47,18 +47,10 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap 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 +BuildRequires: jss >= 5.0.0 ################################################################################ # Runtime Dependencies @@ -67,13 +59,8 @@ BuildRequires: jss >= 4.6.0 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 >= 4.6.0 - +Requires: jss >= 5.0.0 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -104,7 +91,7 @@ rm -f ./java-sdk/ldapjdk/lib/{jss32_stub,jsse,jnet,jaas,jndi}.jar ################################################################################ pushd java-sdk/ldapjdk/lib -build-jar-repository -s -p . jss4 +build-jar-repository -s -p . jss popd ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib @@ -155,39 +142,5 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog -* Mon Jun 07 2021 Dogtag PKI Team - 4.23.0-0.1 -- Rebase to LDAP SDK 4.23.0-alpha1 - -* Tue Jan 26 2021 Fedora Release Engineering - 4.22.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* 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 - +* Tue Jun 22 2021 Dogtag PKI Team - 5.0.0-0.1 +- Rebase to LDAP SDK 5.0.0-alpha1 diff --git a/sources b/sources index afccbb6..be47f3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-4.23.0-alpha1.tar.gz) = 07146fda16dea7c84ed5f66bf3566120a037a3a4ab80a37030429a66d22b8e42d058b67d04f3a6c7efe9a76d1fd2b3ad62cf270684f8626dcfc996778a1cdbbe +SHA512 (ldap-sdk-5.0.0-alpha1.tar.gz) = dcb1f0da5f7aaaa76151a2c9fc687dbdfec382919177fe38a78f58a1bfcbe9033a5f087755653883cbdfabc762a6ce7d008df3dc4c14854036f3087f7e2568a7 From 1fbd71e2275c9261bebfb9155c0b9781ba9954b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 10:45:04 +0000 Subject: [PATCH 22/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index c0bb611..4b70b93 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -11,7 +11,7 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 5.0.0 -Release: 0.1.alpha1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist} %global _phase -alpha1 %global spname ldapsp @@ -142,5 +142,8 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} ################################################################################ %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 5.0.0-0.2.alpha1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 22 2021 Dogtag PKI Team - 5.0.0-0.1 - Rebase to LDAP SDK 5.0.0-alpha1 From 0a4681e6cc9e9ae019c902d07ff8f9043aeec61a Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 12 Aug 2021 13:05:23 -0500 Subject: [PATCH 23/50] Rebase to LDAP SDK 5.0.0-alpha2 --- .gitignore | 1 + ldapjdk.spec | 67 ++++++++++++++++++++-------------------------------- sources | 2 +- 3 files changed, 28 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index b4bcc4c..0a68efb 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-4.22.0.tar.gz /ldap-sdk-4.23.0-alpha1.tar.gz /ldap-sdk-5.0.0-alpha1.tar.gz +/ldap-sdk-5.0.0-alpha2.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index 4b70b93..6d7568a 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -11,12 +11,8 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 5.0.0 -Release: 0.2.alpha1%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha1 - -%global spname ldapsp -%global filtname ldapfilt -%global beansname ldapbeans +Release: 0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist} +%global _phase -alpha2 # To create a tarball from a version tag: # $ git archive \ @@ -72,10 +68,10 @@ manage, and update the information stored in an LDAP directory. %package javadoc ################################################################################ -Summary: Javadoc for %{name} +Summary: Javadoc for LDAP SDK %description javadoc -Javadoc for %{name} +Javadoc for LDAP SDK ################################################################################ %prep @@ -83,51 +79,37 @@ Javadoc for %{name} %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 - ################################################################################ %build ################################################################################ -pushd java-sdk/ldapjdk/lib -build-jar-repository -s -p . jss -popd - -ln -s /usr/lib/jvm-exports/java/{jsse,jaas,jndi}.jar java-sdk/ldapjdk/lib - -pushd java-sdk export JAVA_HOME=%{java_home} -sh -x ant dist -popd + +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + 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 - -mkdir -p %{buildroot}%{_mavenpomdir} -install -pm 644 java-sdk/ldapjdk/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom -install -pm 644 java-sdk/ldapfilter/pom.xml %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom -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} +./build.sh \ + %{?_verbose:-v} \ + --work-dir=%{_vpath_builddir} \ + --java-lib-dir=%{_javadir} \ + --javadoc-dir=%{_javadocdir} \ + --install-dir=%{buildroot} \ + install ################################################################################ %files ################################################################################ -%{_javadir}/%{name}.jar -%{_javadir}/%{spname}*.jar -%{_javadir}/%{filtname}*.jar -%{_javadir}/%{beansname}*.jar +%{_javadir}/ldapjdk.jar +%{_javadir}/ldapsp.jar +%{_javadir}/ldapfilt.jar +%{_javadir}/ldapbeans.jar %{_mavenpomdir}/JPP-ldapjdk.pom %{_mavenpomdir}/JPP-ldapsp.pom %{_mavenpomdir}/JPP-ldapfilter.pom @@ -137,13 +119,16 @@ cp -r java-sdk/dist/doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files javadoc ################################################################################ -%dir %{_javadocdir}/%{name} -%{_javadocdir}/%{name}/* +%dir %{_javadocdir}/ldapjdk +%{_javadocdir}/ldapjdk/* ################################################################################ %changelog +* Thu Aug 12 2021 Dogtag PKI Team - 5.0.0-0.3.alpha2 +- Rebase to LDAP SDK 5.0.0-alpha2 + * Thu Jul 22 2021 Fedora Release Engineering - 5.0.0-0.2.alpha1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Tue Jun 22 2021 Dogtag PKI Team - 5.0.0-0.1 +* Tue Jun 22 2021 Dogtag PKI Team - 5.0.0-0.1.alpha1 - Rebase to LDAP SDK 5.0.0-alpha1 diff --git a/sources b/sources index be47f3a..1a99ace 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.0.0-alpha1.tar.gz) = dcb1f0da5f7aaaa76151a2c9fc687dbdfec382919177fe38a78f58a1bfcbe9033a5f087755653883cbdfabc762a6ce7d008df3dc4c14854036f3087f7e2568a7 +SHA512 (ldap-sdk-5.0.0-alpha2.tar.gz) = 93deac5ff78de1b02f177249a5ecbd43782c85e788a18178ed33184ef6b94ee2c8c47963e8e3f23d29a8e4ca7806190804c43cf1d07bf51882335210a7b13081 From 417e3a73c699435bebb780e14687ebac5d6cde4e Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 30 Sep 2021 23:41:24 -0500 Subject: [PATCH 24/50] Rebase to LDAP SDK 5.0.0 --- .gitignore | 1 + ldapjdk.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0a68efb..ced6530 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-4.23.0-alpha1.tar.gz /ldap-sdk-5.0.0-alpha1.tar.gz /ldap-sdk-5.0.0-alpha2.tar.gz +/ldap-sdk-5.0.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index 6d7568a..52cb0a3 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -11,8 +11,8 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 5.0.0 -Release: 0.3.alpha2%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -alpha2 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +#global _phase -alpha1 # To create a tarball from a version tag: # $ git archive \ @@ -35,7 +35,7 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap %define java_devel java-11-openjdk-devel %define java_headless java-11-openjdk-headless -%define java_home /usr/lib/jvm/java-11-openjdk +%define java_home /usr/lib/jvm/jre-11-openjdk ################################################################################ # Build Dependencies @@ -124,6 +124,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Thu Sep 30 2021 Dogtag PKI Team - 5.0.0-1 +- Rebase to LDAP SDK 5.0.0 + * Thu Aug 12 2021 Dogtag PKI Team - 5.0.0-0.3.alpha2 - Rebase to LDAP SDK 5.0.0-alpha2 diff --git a/sources b/sources index 1a99ace..d0c0b8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.0.0-alpha2.tar.gz) = 93deac5ff78de1b02f177249a5ecbd43782c85e788a18178ed33184ef6b94ee2c8c47963e8e3f23d29a8e4ca7806190804c43cf1d07bf51882335210a7b13081 +SHA512 (ldap-sdk-5.0.0.tar.gz) = 5d5db89694fc8a8f741da60bd7ac18d95a09fca0d3d592dcc3c799558e7ee931f911ec36112510ce4402c976ecd5e4c9a83248a706a1280a7386e2634208b61d From a6a8c2d2e4b78f6b475f2409a7de8016d2805efd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 15:32:23 +0000 Subject: [PATCH 25/50] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 52cb0a3..15418b3 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -11,7 +11,7 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 5.0.0 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} +Release: 2%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -alpha1 # To create a tarball from a version tag: @@ -124,6 +124,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 5.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Sep 30 2021 Dogtag PKI Team - 5.0.0-1 - Rebase to LDAP SDK 5.0.0 From 60706d94af9a452c0702cd26627477855336c3c4 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 22:17:48 +0100 Subject: [PATCH 26/50] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 15418b3..3e0510e 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -11,7 +11,7 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. Version: 5.0.0 -Release: 2%{?_timestamp}%{?_commit_id}%{?dist} +Release: 3%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -alpha1 # To create a tarball from a version tag: @@ -124,6 +124,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Sat Feb 05 2022 Jiri Vanek - 5.0.0-3 +- Rebuilt for java-17-openjdk as system jdk + * Thu Jan 20 2022 Fedora Release Engineering - 5.0.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 866f1e5171bd45521187b8cce0f5912b7b32b87a Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Mon, 14 Feb 2022 11:02:59 -0600 Subject: [PATCH 27/50] Rebase to LDAP SDK 5.1.0 --- .gitignore | 1 + ldapjdk.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ced6530..d9f5645 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.0.0-alpha1.tar.gz /ldap-sdk-5.0.0-alpha2.tar.gz /ldap-sdk-5.0.0.tar.gz +/ldap-sdk-5.1.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index 3e0510e..c422e7c 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -10,8 +10,8 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. -Version: 5.0.0 -Release: 3%{?_timestamp}%{?_commit_id}%{?dist} +Version: 5.1.0 +Release: 1%{?_timestamp}%{?_commit_id}%{?dist} #global _phase -alpha1 # To create a tarball from a version tag: @@ -33,9 +33,9 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?_phase}/ldap # Java ################################################################################ -%define java_devel java-11-openjdk-devel -%define java_headless java-11-openjdk-headless -%define java_home /usr/lib/jvm/jre-11-openjdk +%define java_devel java-17-openjdk-devel +%define java_headless java-17-openjdk-headless +%define java_home %{_jvmdir}/jre-17-openjdk ################################################################################ # Build Dependencies @@ -46,7 +46,7 @@ BuildRequires: %{java_devel} BuildRequires: javapackages-local BuildRequires: slf4j BuildRequires: slf4j-jdk14 -BuildRequires: jss >= 5.0.0 +BuildRequires: jss >= 5.1.0 ################################################################################ # Runtime Dependencies @@ -56,7 +56,7 @@ Requires: %{java_headless} Requires: jpackage-utils >= 0:1.5 Requires: slf4j Requires: slf4j-jdk14 -Requires: jss >= 5.0.0 +Requires: jss >= 5.1.0 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -124,6 +124,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Mon Feb 14 2022 Dogtag PKI Team - 5.1.0-1 +- Rebase to LDAP SDK 5.1.0 + * Sat Feb 05 2022 Jiri Vanek - 5.0.0-3 - Rebuilt for java-17-openjdk as system jdk diff --git a/sources b/sources index d0c0b8a..85975bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.0.0.tar.gz) = 5d5db89694fc8a8f741da60bd7ac18d95a09fca0d3d592dcc3c799558e7ee931f911ec36112510ce4402c976ecd5e4c9a83248a706a1280a7386e2634208b61d +SHA512 (ldap-sdk-5.1.0.tar.gz) = 5cb5ddb0941e6d812b251d62f4649e97536006d131e0084809ecf231a403cd7f375a874dd7476aac4c2ea247dd6a477e323e30ed2d82167d15ea4d96cd6f7b2e From a252a3fc073f3d6c58ccb6cd5c6d50aee3f3f2ef Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Mon, 11 Apr 2022 18:33:05 -0500 Subject: [PATCH 28/50] Rebase to LDAP SDK 5.2.0-beta1 --- .gitignore | 1 + ldapjdk.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d9f5645..4f61773 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.0.0-alpha2.tar.gz /ldap-sdk-5.0.0.tar.gz /ldap-sdk-5.1.0.tar.gz +/ldap-sdk-5.2.0-beta1.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index c422e7c..c3939be 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -10,9 +10,9 @@ BuildArch: noarch # For development (i.e. unsupported) releases, use x.y.z-0.n.. # For official (i.e. supported) releases, use x.y.z-r where r >=1. -Version: 5.1.0 -Release: 1%{?_timestamp}%{?_commit_id}%{?dist} -#global _phase -alpha1 +Version: 5.2.0 +Release: 0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist} +%global _phase -beta1 # To create a tarball from a version tag: # $ git archive \ @@ -124,6 +124,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Mon Apr 11 2022 Dogtag PKI Team - 5.2.0-0.2.beta1 +- Rebase to LDAP SDK 5.2.0-beta1 + * Mon Feb 14 2022 Dogtag PKI Team - 5.1.0-1 - Rebase to LDAP SDK 5.1.0 diff --git a/sources b/sources index 85975bb..2ec557c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.1.0.tar.gz) = 5cb5ddb0941e6d812b251d62f4649e97536006d131e0084809ecf231a403cd7f375a874dd7476aac4c2ea247dd6a477e323e30ed2d82167d15ea4d96cd6f7b2e +SHA512 (ldap-sdk-5.2.0-beta1.tar.gz) = dfd19dc06d77e57312f7876d82db9edc8416ac0cf279a276290470d8fc0053e578dfc9d2dc605d798b5719f252ab132a1cc570958cffd9bd0c225a2ad1ab16ad From 88c209decaf383bb75329f6b6cda624adcc2931f Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 29 Apr 2022 09:53:08 -0500 Subject: [PATCH 29/50] Rebase to LDAP SDK 5.2.0-beta2 --- .gitignore | 1 + ldapjdk.spec | 68 ++++++++++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 52 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 4f61773..dc8cfc7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.0.0.tar.gz /ldap-sdk-5.1.0.tar.gz /ldap-sdk-5.2.0-beta1.tar.gz +/ldap-sdk-5.2.0-beta2.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index c3939be..b3ffed6 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -2,17 +2,33 @@ Name: ldapjdk ################################################################################ +%global product_id dogtag-ldapjdk + +# Upstream version number: +%global major_version 5 +%global minor_version 2 +%global update_version 0 + +# Downstream release number: +# - development/stabilization (unsupported): 0. where n >= 1 +# - GA/update (supported): where n >= 1 +%global release_number 0.3 + +# Development phase: +# - development (unsupported): alpha where n >= 1 +# - stabilization (unsupported): beta where n >= 1 +# - GA/update (supported): +%global phase beta2 + +%undefine timestamp +%undefine commit_id + Summary: 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.. -# For official (i.e. supported) releases, use x.y.z-r where r >=1. -Version: 5.2.0 -Release: 0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist} -%global _phase -beta1 +Version: %{major_version}.%{minor_version}.%{update_version} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -20,7 +36,7 @@ Release: 0.2.beta1%{?_timestamp}%{?_commit_id}%{?dist} # --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 +Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?phase}/ldap-sdk-%{version}%{?phase:-}%{?phase}.tar.gz # To create a patch for all changes since a version tag: # $ git format-patch \ @@ -46,38 +62,50 @@ BuildRequires: %{java_devel} BuildRequires: javapackages-local BuildRequires: slf4j BuildRequires: slf4j-jdk14 -BuildRequires: jss >= 5.1.0 +BuildRequires: jss >= 5.2.0 + +%description +The Mozilla LDAP SDKs enable you to write applications which access, +manage, and update the information stored in an LDAP directory. ################################################################################ -# Runtime Dependencies +%package -n %{product_id} ################################################################################ +Summary: LDAP SDK + Requires: %{java_headless} Requires: jpackage-utils >= 0:1.5 Requires: slf4j Requires: slf4j-jdk14 -Requires: jss >= 5.1.0 +Requires: jss >= 5.2.0 -%description +Obsoletes: ldapjdk < %{version}-%{release} +Provides: ldapjdk = %{version}-%{release} + +%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 javadoc +%package -n %{product_id}-javadoc ################################################################################ -Summary: Javadoc for LDAP SDK +Summary: Javadoc for LDAP SDK -%description javadoc +Obsoletes: ldapjdk-javadoc < %{version}-%{release} +Provides: ldapjdk-javadoc = %{version}-%{release} + +%description -n %{product_id}-javadoc Javadoc for LDAP SDK ################################################################################ %prep ################################################################################ -%autosetup -n ldap-sdk-%{version}%{?_phase} -p 1 +%autosetup -n ldap-sdk-%{version}%{?phase:-}%{?phase} -p 1 ################################################################################ %build @@ -103,7 +131,7 @@ export JAVA_HOME=%{java_home} install ################################################################################ -%files +%files -n %{product_id} ################################################################################ %{_javadir}/ldapjdk.jar @@ -116,7 +144,7 @@ export JAVA_HOME=%{java_home} %{_mavenpomdir}/JPP-ldapbeans.pom ################################################################################ -%files javadoc +%files -n %{product_id}-javadoc ################################################################################ %dir %{_javadocdir}/ldapjdk @@ -124,6 +152,10 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Fri Apr 29 2022 Dogtag PKI Team - 5.2.0-0.3.beta2 +- Rebase to LDAP SDK 5.2.0-beta2 +- Rename packages to dogtag-ldapjdk + * Mon Apr 11 2022 Dogtag PKI Team - 5.2.0-0.2.beta1 - Rebase to LDAP SDK 5.2.0-beta1 diff --git a/sources b/sources index 2ec557c..f638e39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.2.0-beta1.tar.gz) = dfd19dc06d77e57312f7876d82db9edc8416ac0cf279a276290470d8fc0053e578dfc9d2dc605d798b5719f252ab132a1cc570958cffd9bd0c225a2ad1ab16ad +SHA512 (ldap-sdk-5.2.0-beta2.tar.gz) = 4d53a81e342b227b8acfac22d1f0d7e95361c55950dbdb14c1674e8192e7c36e5fe434e0e1529d8abf9de9992572c179f434b7d6df54dddde34c57529522faaf From d32955a46d996af874d8275ee2747162124d5d02 Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Thu, 30 Jun 2022 15:54:29 -0500 Subject: [PATCH 30/50] Rebase to LDAP SDK 5.2.0 --- .gitignore | 1 + ldapjdk.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index dc8cfc7..d5b02ce 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.1.0.tar.gz /ldap-sdk-5.2.0-beta1.tar.gz /ldap-sdk-5.2.0-beta2.tar.gz +/ldap-sdk-5.2.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index b3ffed6..47944e5 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -12,19 +12,19 @@ Name: ldapjdk # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 0.3 +%global release_number 1 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%global phase beta2 +%undefine phase %undefine timestamp %undefine commit_id Summary: LDAP SDK -URL: http://www.dogtagpki.org/ +URL: https://github.com/dogtagpki/ldap-sdk License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch Version: %{major_version}.%{minor_version}.%{update_version} @@ -152,6 +152,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Thu Jun 30 2022 Dogtag PKI Team - 5.2.0-1 +- Rebase to LDAP SDK 5.2.0 + * Fri Apr 29 2022 Dogtag PKI Team - 5.2.0-0.3.beta2 - Rebase to LDAP SDK 5.2.0-beta2 - Rename packages to dogtag-ldapjdk diff --git a/sources b/sources index f638e39..28b54ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.2.0-beta2.tar.gz) = 4d53a81e342b227b8acfac22d1f0d7e95361c55950dbdb14c1674e8192e7c36e5fe434e0e1529d8abf9de9992572c179f434b7d6df54dddde34c57529522faaf +SHA512 (ldap-sdk-5.2.0.tar.gz) = 8799375fac34d2099601827b08c06f14a40f41f4b119bffab9e052cfa16d1b4b9758e231bac220c617ca4e07a32106f21308615a63a23bb66e0f55a1d992c3bb From 287e4628ea9c3be6d6459cfc80032d0ced9d94ec Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 16:03:24 +0200 Subject: [PATCH 31/50] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- ldapjdk.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 47944e5..f850f4e 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -27,8 +27,9 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 # To create a tarball from a version tag: # $ git archive \ @@ -152,6 +153,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Fri Jul 08 2022 Jiri Vanek - 5.2.0-1.1 +- Rebuilt for Drop i686 JDKs + * Thu Jun 30 2022 Dogtag PKI Team - 5.2.0-1 - Rebase to LDAP SDK 5.2.0 From e63a06461bb0476e245ea9ee35ae07558588604c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:04:31 +0000 Subject: [PATCH 32/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index f850f4e..d4281b1 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -29,7 +29,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch ExclusiveArch: %{java_arches} noarch Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.2 # To create a tarball from a version tag: # $ git archive \ @@ -153,6 +153,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 5.2.0-1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jul 08 2022 Jiri Vanek - 5.2.0-1.1 - Rebuilt for Drop i686 JDKs From c0b0424c8b5bb71fd5e5802bdd0567bc567873a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 15:35:21 +0000 Subject: [PATCH 33/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index d4281b1..a68fc20 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -29,7 +29,7 @@ License: MPLv1.1 or GPLv2+ or LGPLv2+ BuildArch: noarch ExclusiveArch: %{java_arches} noarch Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.2 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3 # To create a tarball from a version tag: # $ git archive \ @@ -153,6 +153,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 5.2.0-1.3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 5.2.0-1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a1e0ff364c4fa3d1aafbeae7d620527d3873c5ff Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Tue, 7 Feb 2023 13:58:32 -0600 Subject: [PATCH 34/50] Rebase to LDAP SDK 5.3.0 --- .gitignore | 1 + ldapjdk.spec | 24 +++++++++++++++++------- sources | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index d5b02ce..459a3e8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.2.0-beta1.tar.gz /ldap-sdk-5.2.0-beta2.tar.gz /ldap-sdk-5.2.0.tar.gz +/ldap-sdk-5.3.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index a68fc20..6a0944b 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -6,7 +6,7 @@ Name: ldapjdk # Upstream version number: %global major_version 5 -%global minor_version 2 +%global minor_version 3 %global update_version 0 # Downstream release number: @@ -18,7 +18,7 @@ Name: ldapjdk # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%undefine phase +#global phase %undefine timestamp %undefine commit_id @@ -26,10 +26,8 @@ Name: ldapjdk Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPLv1.1 or GPLv2+ or LGPLv2+ -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -46,6 +44,9 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p # > ldap-sdk-VERSION-RELEASE.patch # Patch: ldap-sdk-VERSION-RELEASE.patch +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + ################################################################################ # Java ################################################################################ @@ -63,7 +64,7 @@ BuildRequires: %{java_devel} BuildRequires: javapackages-local BuildRequires: slf4j BuildRequires: slf4j-jdk14 -BuildRequires: jss >= 5.2.0 +BuildRequires: jss = 5.3 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -79,10 +80,12 @@ Requires: %{java_headless} Requires: jpackage-utils >= 0:1.5 Requires: slf4j Requires: slf4j-jdk14 -Requires: jss >= 5.2.0 +Requires: jss = 5.3 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, @@ -98,6 +101,8 @@ Summary: Javadoc for LDAP SDK Obsoletes: ldapjdk-javadoc < %{version}-%{release} Provides: ldapjdk-javadoc = %{version}-%{release} +Provides: ldapjdk-javadoc = %{major_version}.%{minor_version} +Provides: %{product_id}-javadoc = %{major_version}.%{minor_version} %description -n %{product_id}-javadoc Javadoc for LDAP SDK @@ -139,10 +144,12 @@ export JAVA_HOME=%{java_home} %{_javadir}/ldapsp.jar %{_javadir}/ldapfilt.jar %{_javadir}/ldapbeans.jar +%{_javadir}/ldaptools.jar %{_mavenpomdir}/JPP-ldapjdk.pom %{_mavenpomdir}/JPP-ldapsp.pom %{_mavenpomdir}/JPP-ldapfilter.pom %{_mavenpomdir}/JPP-ldapbeans.pom +%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %files -n %{product_id}-javadoc @@ -153,6 +160,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Tue Feb 07 2023 Dogtag PKI Team - 5.3.0-1 +- Rebase to LDAP SDK 5.3.0 + * Thu Jan 19 2023 Fedora Release Engineering - 5.2.0-1.3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 28b54ff..ecfddf0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.2.0.tar.gz) = 8799375fac34d2099601827b08c06f14a40f41f4b119bffab9e052cfa16d1b4b9758e231bac220c617ca4e07a32106f21308615a63a23bb66e0f55a1d992c3bb +SHA512 (ldap-sdk-5.3.0.tar.gz) = ee8e757cb5561c0a43b8a180f100a65c3615d2218ec4bfcb547c9e88d1b08213adabf0fe3e6b5f7ac7dea04c6719da6b7f456a422ab9f6787390a1c3a2f3fc3e From ceda1442ed547abc4cc3f7e8472976e05d18e55c Mon Sep 17 00:00:00 2001 From: Chris Kelley Date: Tue, 28 Feb 2023 06:41:31 +0000 Subject: [PATCH 35/50] Update to SPDX licence --- ldapjdk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 6a0944b..c940e6b 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -25,7 +25,7 @@ Name: ldapjdk Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk -License: MPLv1.1 or GPLv2+ or LGPLv2+ +License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} From 752b984163285232fe1be79d5145bee7ee0362dd Mon Sep 17 00:00:00 2001 From: Packit Date: Fri, 16 Jun 2023 12:08:03 +0000 Subject: [PATCH 36/50] [packit] 5.4.1 upstream release Upstream tag: v5.4.1 Upstream commit: 4ee8a4e0 --- .gitignore | 1 + .packit.yaml | 30 ++++++++++++++++++++++++++++++ README.packit | 3 +++ ldapjdk.spec | 19 +++++++++++++------ sources | 2 +- 5 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 .packit.yaml create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index 459a3e8..767c828 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.2.0-beta2.tar.gz /ldap-sdk-5.2.0.tar.gz /ldap-sdk-5.3.0.tar.gz +/ldap-sdk-5.4.1.tar.gz diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..d982622 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,30 @@ +--- +# See the documentation for more information: +# https://packit.dev/docs/configuration/ +specfile_path: ldapjdk.spec + +# add or remove files that should be synced +files_to_sync: + - ldapjdk.spec + - .packit.yaml + +# Allow dist git reactions on packit and ckelley commits and PRs +allowed_pr_authors: + - packit + - ckelleyRH +allowed_committers: + - packit + - ckelleyRH + +upstream_package_name: ldap-sdk +# downstream (Fedora/CentOS) RPM package name +downstream_package_name: ldapjdk +# see: https://packit.dev/docs/configuration/#upstream_tag_template +upstream_tag_template: "v{version}" + +jobs: + - job: propose_downstream + trigger: release + dist_git_branches: + - fedora-development +# - centos-stream-9-x86_64 # When Packit integration with CentOS is avaiable, enable this diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..07bc213 --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.76.0.post10+g0dcb396. diff --git a/ldapjdk.spec b/ldapjdk.spec index c940e6b..3d8ad07 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -6,8 +6,8 @@ Name: ldapjdk # Upstream version number: %global major_version 5 -%global minor_version 3 -%global update_version 0 +%global minor_version 4 +%global update_version 1 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 @@ -26,8 +26,8 @@ Name: ldapjdk Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later -Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} +Version: 5.4.1 +Release: 1%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -45,7 +45,9 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p # Patch: ldap-sdk-VERSION-RELEASE.patch BuildArch: noarch +%if 0%{?fedora} ExclusiveArch: %{java_arches} noarch +%endif ################################################################################ # Java @@ -64,7 +66,7 @@ BuildRequires: %{java_devel} BuildRequires: javapackages-local BuildRequires: slf4j BuildRequires: slf4j-jdk14 -BuildRequires: jss = 5.3 +BuildRequires: jss = 5.4 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -80,7 +82,7 @@ Requires: %{java_headless} Requires: jpackage-utils >= 0:1.5 Requires: slf4j Requires: slf4j-jdk14 -Requires: jss = 5.3 +Requires: jss = 5.4 Obsoletes: ldapjdk < %{version}-%{release} Provides: ldapjdk = %{version}-%{release} @@ -160,6 +162,11 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Fri Jun 16 2023 Packit - 5.4.1-1 +- Updating version to v5.4.1 (Chris Kelley) +- Upstream some spec file changes from Fedora to minimise diff (Chris Kelley) +- Introduce Packit configuration for ldapjdk (Chris Kelley) + * Tue Feb 07 2023 Dogtag PKI Team - 5.3.0-1 - Rebase to LDAP SDK 5.3.0 diff --git a/sources b/sources index ecfddf0..a96f12a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.3.0.tar.gz) = ee8e757cb5561c0a43b8a180f100a65c3615d2218ec4bfcb547c9e88d1b08213adabf0fe3e6b5f7ac7dea04c6719da6b7f456a422ab9f6787390a1c3a2f3fc3e +SHA512 (ldap-sdk-5.4.1.tar.gz) = f63d2f309284bb27d5e2d5714e310f1f5df97eb77883b741b4c9dd69f044428da9907e278b776b12a6891790631daffa604c3e82c7dfe1e6c81edab3702e9896 From 1a74f825e7c1f4ad0623cee0c91b7bad4f3665e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:01:30 +0000 Subject: [PATCH 37/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 3d8ad07..8abb7d1 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -27,7 +27,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later Version: 5.4.1 -Release: 1%{?dist} +Release: 2%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -162,6 +162,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 5.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 16 2023 Packit - 5.4.1-1 - Updating version to v5.4.1 (Chris Kelley) - Upstream some spec file changes from Fedora to minimise diff (Chris Kelley) From 72426aec77f8ac4f90f8a48e615183126f52e8f2 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Tue, 25 Jul 2023 20:04:17 -0400 Subject: [PATCH 38/50] Set ExclusiveArch on any OS with java_arches Fedora builds are not the only ones which no longer build Java for ix86; Fedora ELN and RHEL 10 are following that as well. This will avoid builds landing on Java-less architecture builders and thereby failing. Submitted upstream: https://github.com/dogtagpki/ldap-sdk/pull/53 --- ldapjdk.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 8abb7d1..2456740 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -45,7 +45,7 @@ Source: https://github.com/dogtagpki/ldap-sdk/archive/v%{version}%{?phase:-}%{?p # Patch: ldap-sdk-VERSION-RELEASE.patch BuildArch: noarch -%if 0%{?fedora} +%if 0%{?java_arches:1} ExclusiveArch: %{java_arches} noarch %endif From 2f318e35358144453dd0f68c73995586bc3cf2d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:20:18 +0000 Subject: [PATCH 39/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 2456740..31f3821 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -27,7 +27,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later Version: 5.4.1 -Release: 2%{?dist} +Release: 3%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -162,6 +162,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 5.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 5.4.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From bfadd8129d87d608d4b8cfede44be136341a3227 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:18:10 +0000 Subject: [PATCH 40/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 31f3821..8f2963e 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -27,7 +27,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later Version: 5.4.1 -Release: 3%{?dist} +Release: 4%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -162,6 +162,9 @@ export JAVA_HOME=%{java_home} ################################################################################ %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 5.4.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 5.4.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 2b479204acb28bb0927abcd2c5a15cf0f735415b Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Wed, 21 Feb 2024 18:12:40 -0600 Subject: [PATCH 41/50] Rebase to LDAP SDK 5.5.0 --- .gitignore | 2 ++ ldapjdk.spec | 67 ++++++++++++++++++++++++++-------------------------- sources | 2 +- 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/.gitignore b/.gitignore index 767c828..22372bc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.2.0.tar.gz /ldap-sdk-5.3.0.tar.gz /ldap-sdk-5.4.1.tar.gz +/ldap-sdk-5.5.0-alpha2.tar.gz +/ldap-sdk-5.5.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index 8f2963e..0848cea 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -6,8 +6,8 @@ Name: ldapjdk # Upstream version number: %global major_version 5 -%global minor_version 4 -%global update_version 1 +%global minor_version 5 +%global update_version 0 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 @@ -26,8 +26,8 @@ Name: ldapjdk Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later -Version: 5.4.1 -Release: 4%{?dist} +Version: %{major_version}.%{minor_version}.%{update_version} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -63,10 +63,10 @@ ExclusiveArch: %{java_arches} noarch BuildRequires: ant BuildRequires: %{java_devel} -BuildRequires: javapackages-local -BuildRequires: slf4j -BuildRequires: slf4j-jdk14 -BuildRequires: jss = 5.4 +BuildRequires: maven-local +BuildRequires: mvn(org.slf4j:slf4j-api) +BuildRequires: mvn(org.slf4j:slf4j-jdk14) +BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -79,10 +79,9 @@ manage, and update the information stored in an LDAP directory. Summary: LDAP SDK Requires: %{java_headless} -Requires: jpackage-utils >= 0:1.5 -Requires: slf4j -Requires: slf4j-jdk14 -Requires: jss = 5.4 +Requires: mvn(org.slf4j:slf4j-api) +Requires: mvn(org.slf4j:slf4j-jdk14) +Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 Obsoletes: ldapjdk < %{version}-%{release} Provides: ldapjdk = %{version}-%{release} @@ -115,38 +114,40 @@ Javadoc for LDAP SDK %autosetup -n ldap-sdk-%{version}%{?phase:-}%{?phase} -p 1 +# flatten-maven-plugin is not available in RPM +%pom_remove_plugin org.codehaus.mojo:flatten-maven-plugin + +# specify Maven artifact locations +%mvn_file org.dogtagpki.ldap-sdk:ldapjdk ldapjdk/ldapjdk ldapjdk +%mvn_file org.dogtagpki.ldap-sdk:ldapbeans ldapjdk/ldapbeans ldapbeans +%mvn_file org.dogtagpki.ldap-sdk:ldapfilter ldapjdk/ldapfilter ldapfilt +%mvn_file org.dogtagpki.ldap-sdk:ldapsp ldapjdk/ldapsp ldapsp +%mvn_file org.dogtagpki.ldap-sdk:ldaptools ldapjdk/ldaptools ldaptools + ################################################################################ %build ################################################################################ export JAVA_HOME=%{java_home} -./build.sh \ - %{?_verbose:-v} \ - --work-dir=%{_vpath_builddir} \ - dist +%mvn_build ################################################################################ %install ################################################################################ -./build.sh \ - %{?_verbose:-v} \ - --work-dir=%{_vpath_builddir} \ - --java-lib-dir=%{_javadir} \ - --javadoc-dir=%{_javadocdir} \ - --install-dir=%{buildroot} \ - install +%mvn_install + +ln -sf %{name}/ldapjdk.pom %{buildroot}%{_mavenpomdir}/JPP-ldapjdk.pom +ln -sf %{name}/ldapsp.pom %{buildroot}%{_mavenpomdir}/JPP-ldapsp.pom +ln -sf %{name}/ldapfilter.pom %{buildroot}%{_mavenpomdir}/JPP-ldapfilter.pom +ln -sf %{name}/ldapbeans.pom %{buildroot}%{_mavenpomdir}/JPP-ldapbeans.pom +ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ -%files -n %{product_id} +%files -n %{product_id} -f .mfiles ################################################################################ -%{_javadir}/ldapjdk.jar -%{_javadir}/ldapsp.jar -%{_javadir}/ldapfilt.jar -%{_javadir}/ldapbeans.jar -%{_javadir}/ldaptools.jar %{_mavenpomdir}/JPP-ldapjdk.pom %{_mavenpomdir}/JPP-ldapsp.pom %{_mavenpomdir}/JPP-ldapfilter.pom @@ -154,14 +155,14 @@ export JAVA_HOME=%{java_home} %{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ -%files -n %{product_id}-javadoc +%files -n %{product_id}-javadoc -f .mfiles-javadoc ################################################################################ -%dir %{_javadocdir}/ldapjdk -%{_javadocdir}/ldapjdk/* - ################################################################################ %changelog +* Wed Feb 21 2024 Dogtag PKI Team 5.5.0-1 +- Rebase to LDAP SDK 5.5.0 + * Thu Jan 25 2024 Fedora Release Engineering - 5.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index a96f12a..77779dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.4.1.tar.gz) = f63d2f309284bb27d5e2d5714e310f1f5df97eb77883b741b4c9dd69f044428da9907e278b776b12a6891790631daffa604c3e82c7dfe1e6c81edab3702e9896 +SHA512 (ldap-sdk-5.5.0.tar.gz) = 8f3502a731cfd8275664bdef5413db2fadcb80252b847cd5835de4ff6ba75e975c65aa4ea068ae18d35ecfeccf086a113c2763cf3160144e12b4c58c9b698d59 From e9a91ab3faf9cfb344f3f90e1bb3405bf2c3dead Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:50:25 +0100 Subject: [PATCH 42/50] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 0848cea..6f7e126 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -27,7 +27,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 # To create a tarball from a version tag: # $ git archive \ @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Tue Feb 27 2024 Jiri Vanek - 5.5.0-1.1 +- Rebuilt for java-21-openjdk as system jdk + * Wed Feb 21 2024 Dogtag PKI Team 5.5.0-1 - Rebase to LDAP SDK 5.5.0 From 70e4cd9e69ecb708bddf510239c647391b7677ec Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 3 Mar 2024 17:37:08 -0500 Subject: [PATCH 43/50] Really rebuilt for java-21-openjdk as system jdk --- ldapjdk.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 6f7e126..86e9cb2 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -12,7 +12,7 @@ Name: ldapjdk # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 1 +%global release_number 2 # Development phase: # - development (unsupported): alpha where n >= 1 @@ -27,7 +27,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -53,9 +53,9 @@ ExclusiveArch: %{java_arches} noarch # Java ################################################################################ -%define java_devel java-17-openjdk-devel -%define java_headless java-17-openjdk-headless -%define java_home %{_jvmdir}/jre-17-openjdk +%define java_devel java-devel +%define java_headless java-headless +%define java_home %{_jvmdir}/jre-openjdk ################################################################################ # Build Dependencies @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Sun Mar 03 2024 Yaakov Selkowitz - 5.5.0-2 +- Really rebuilt for java-21-openjdk as system jdk + * Tue Feb 27 2024 Jiri Vanek - 5.5.0-1.1 - Rebuilt for java-21-openjdk as system jdk From 321f1cb461e9531ea4529ee5503903b8fb0e3994 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:04:36 +0000 Subject: [PATCH 44/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 86e9cb2..a5de2c8 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -27,7 +27,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 # To create a tarball from a version tag: # $ git archive \ @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 5.5.0-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sun Mar 03 2024 Yaakov Selkowitz - 5.5.0-2 - Really rebuilt for java-21-openjdk as system jdk From 2ea0add06726525946234d7f274fd77113a69420 Mon Sep 17 00:00:00 2001 From: Marco Fargetta Date: Wed, 20 Nov 2024 19:19:58 +0100 Subject: [PATCH 45/50] Rebase to LDAP-SDH 5.6.0-alpha1 --- .gitignore | 1 + ldapjdk.spec | 27 +++++++++++++++------------ sources | 2 +- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 22372bc..73201cc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.4.1.tar.gz /ldap-sdk-5.5.0-alpha2.tar.gz /ldap-sdk-5.5.0.tar.gz +/ldap-sdk-5.6.0-alpha1.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index a5de2c8..d1448d6 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -2,32 +2,33 @@ Name: ldapjdk ################################################################################ -%global product_id dogtag-ldapjdk +%global vendor_id dogtag +%global product_id %{vendor_id}-ldapjdk # Upstream version number: %global major_version 5 -%global minor_version 5 +%global minor_version 6 %global update_version 0 # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 2 +%global release_number 0.1 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -#global phase +%global phase alpha1 %undefine timestamp %undefine commit_id Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk -License: MPL-1.1 or GPL-2.0-or-later or LGPL-2.1-or-later +License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -53,10 +54,9 @@ ExclusiveArch: %{java_arches} noarch # Java ################################################################################ -%define java_devel java-devel -%define java_headless java-headless -%define java_home %{_jvmdir}/jre-openjdk - +%define java_devel java-21-openjdk-devel +%define java_headless java-21-openjdk-headless +%define java_home %{_jvmdir}/jre-21-openjdk ################################################################################ # Build Dependencies ################################################################################ @@ -66,7 +66,7 @@ BuildRequires: %{java_devel} BuildRequires: maven-local BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-jdk14) -BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 +BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 %description The Mozilla LDAP SDKs enable you to write applications which access, @@ -81,7 +81,7 @@ Summary: LDAP SDK Requires: %{java_headless} Requires: mvn(org.slf4j:slf4j-api) Requires: mvn(org.slf4j:slf4j-jdk14) -Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.5.0 +Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 Obsoletes: ldapjdk < %{version}-%{release} Provides: ldapjdk = %{version}-%{release} @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Wed Nov 20 2024 Dogtag PKI Team 5.5.0-0.1 +- Rebase to LDAP SDK 5.6.0-alpha1 + * Thu Jul 18 2024 Fedora Release Engineering - 5.5.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 77779dc..d06af5a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.5.0.tar.gz) = 8f3502a731cfd8275664bdef5413db2fadcb80252b847cd5835de4ff6ba75e975c65aa4ea068ae18d35ecfeccf086a113c2763cf3160144e12b4c58c9b698d59 +SHA512 (ldap-sdk-5.6.0-alpha1.tar.gz) = 8aafe83086dd378d5db52c5e42ec961115ae9e7add685057ede716f0ba7389b630975c34ae675e1c2e1a1b5e0519badee78d5f59a21cfb88a0f20308b9d6cdaa From 55e8171dc9294115f804e3265ceb9d7149ef69e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 10:18:12 +0000 Subject: [PATCH 46/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index d1448d6..8c3bb81 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 # To create a tarball from a version tag: # $ git archive \ @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Nov 20 2024 Dogtag PKI Team 5.5.0-0.1 - Rebase to LDAP SDK 5.6.0-alpha1 From 01a264532c72a6e2dc2663ac5f17c7250889f87f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:12:17 +0000 Subject: [PATCH 47/50] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ldapjdk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 8c3bb81..88366a8 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.1 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.2 # To create a tarball from a version tag: # $ git archive \ @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From e6e4a0a8cf18ae2924029aee128caf45b4732eca Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:05:41 +0200 Subject: [PATCH 48/50] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- ldapjdk.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 88366a8..775f084 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.2 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3 # To create a tarball from a version tag: # $ git archive \ @@ -61,9 +61,9 @@ ExclusiveArch: %{java_arches} noarch # Build Dependencies ################################################################################ -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: %{java_devel} -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-jdk14) BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Tue Jul 29 2025 jiri vanek - 5.6.0-0.1.alpha1.3 +- Rebuilt for java-25-openjdk as preffered jdk + * Thu Jul 24 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 241a6a75becf3256b5271d739307347f556050ab Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 30 Jul 2025 19:02:15 -0400 Subject: [PATCH 49/50] Really rebuilt for java-25-openjdk as system jdk --- ldapjdk.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ldapjdk.spec b/ldapjdk.spec index 775f084..f986963 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -28,7 +28,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.3 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.4 # To create a tarball from a version tag: # $ git archive \ @@ -54,9 +54,9 @@ ExclusiveArch: %{java_arches} noarch # Java ################################################################################ -%define java_devel java-21-openjdk-devel -%define java_headless java-21-openjdk-headless -%define java_home %{_jvmdir}/jre-21-openjdk +%define java_devel java-25-openjdk-devel +%define java_headless java-25-openjdk-headless +%define java_home %{_jvmdir}/jre-25-openjdk ################################################################################ # Build Dependencies ################################################################################ @@ -160,6 +160,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Wed Jul 30 2025 Yaakov Selkowitz - 5.6.0-0.1.alpha1.4 +- Really rebuilt for java-25-openjdk as system jdk + * Tue Jul 29 2025 jiri vanek - 5.6.0-0.1.alpha1.3 - Rebuilt for java-25-openjdk as preffered jdk From 79818842b6150fd85545ac6aac29856d4a27afc9 Mon Sep 17 00:00:00 2001 From: Jack Magne Date: Wed, 5 Mar 2025 17:15:59 -0800 Subject: [PATCH 50/50] Rebase LDAP SDK to 5.6.0. --- .gitignore | 1 + ldapjdk.spec | 13 +++++++++---- sources | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 73201cc..dfa1e6e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ ldapjdk-4.18.tar.gz /ldap-sdk-5.5.0-alpha2.tar.gz /ldap-sdk-5.5.0.tar.gz /ldap-sdk-5.6.0-alpha1.tar.gz +/ldap-sdk-5.6.0.tar.gz diff --git a/ldapjdk.spec b/ldapjdk.spec index f986963..eb973a8 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -13,13 +13,13 @@ Name: ldapjdk # Downstream release number: # - development/stabilization (unsupported): 0. where n >= 1 # - GA/update (supported): where n >= 1 -%global release_number 0.1 +%global release_number 1 # Development phase: # - development (unsupported): alpha where n >= 1 # - stabilization (unsupported): beta where n >= 1 # - GA/update (supported): -%global phase alpha1 +#global phase alpha1 %undefine timestamp %undefine commit_id @@ -28,7 +28,7 @@ Summary: LDAP SDK URL: https://github.com/dogtagpki/ldap-sdk License: MPL-1.1 OR GPL-2.0-or-later OR LGPL-2.1-or-later Version: %{major_version}.%{minor_version}.%{update_version} -Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist}.4 +Release: %{release_number}%{?phase:.}%{?phase}%{?timestamp:.}%{?timestamp}%{?commit_id:.}%{?commit_id}%{?dist} # To create a tarball from a version tag: # $ git archive \ @@ -57,13 +57,15 @@ ExclusiveArch: %{java_arches} noarch %define java_devel java-25-openjdk-devel %define java_headless java-25-openjdk-headless %define java_home %{_jvmdir}/jre-25-openjdk +%define maven_local maven-local-openjdk25 + ################################################################################ # Build Dependencies ################################################################################ BuildRequires: ant-openjdk25 BuildRequires: %{java_devel} -BuildRequires: maven-local-openjdk25 +BuildRequires: %{maven_local} BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-jdk14) BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 @@ -160,6 +162,9 @@ ln -sf %{name}/ldaptools.pom %{buildroot}%{_mavenpomdir}/JPP-ldaptools.pom ################################################################################ %changelog +* Tue Nov 04 2025 Dogtag PKI Team - 5.6.0-1 +- Rebase to LDAP SDK 5.6.0 + * Wed Jul 30 2025 Yaakov Selkowitz - 5.6.0-0.1.alpha1.4 - Really rebuilt for java-25-openjdk as system jdk diff --git a/sources b/sources index d06af5a..fc04926 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.6.0-alpha1.tar.gz) = 8aafe83086dd378d5db52c5e42ec961115ae9e7add685057ede716f0ba7389b630975c34ae675e1c2e1a1b5e0519badee78d5f59a21cfb88a0f20308b9d6cdaa +SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d