diff --git a/.gitignore b/.gitignore index dfa1e6e..867ec88 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,2 @@ 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 -/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 -/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 -/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 -/ldap-sdk-5.6.0-alpha1.tar.gz -/ldap-sdk-5.6.0.tar.gz diff --git a/.packit.yaml b/.packit.yaml deleted file mode 100644 index d982622..0000000 --- a/.packit.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -# 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 deleted file mode 100644 index 07bc213..0000000 --- a/README.packit +++ /dev/null @@ -1,3 +0,0 @@ -This repository is maintained by packit. -https://packit.dev/ -The file was generated using packit 0.76.0.post10+g0dcb396. diff --git a/copr-build.sh b/copr-build.sh deleted file mode 100755 index 156c705..0000000 --- a/copr-build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/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 new file mode 100644 index 0000000..a380a1b --- /dev/null +++ b/ldapjdk-4.19.pom @@ -0,0 +1,6 @@ + + 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 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 eb973a8..ebcdce0 100644 --- a/ldapjdk.spec +++ b/ldapjdk.spec @@ -1,250 +1,247 @@ -################################################################################ -Name: ldapjdk -################################################################################ +%global spname ldapsp +%global filtname ldapfilt +%global beansname ldapbeans -%global vendor_id dogtag -%global product_id %{vendor_id}-ldapjdk +Name: ldapjdk +Version: 4.19 +Release: 5%{?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 -# Upstream version number: -%global major_version 5 -%global minor_version 6 -%global update_version 0 +####################### +## ldapjdk-4.19-4 +####################### +Patch0: ldapjdk-Added-getter-methods-for-JDAPFilter-classes.patch +Patch1: ldapjdk-Added-gitignore-file.patch -# Downstream release number: -# - development/stabilization (unsupported): 0. where n >= 1 -# - GA/update (supported): where n >= 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 - -%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 -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 \ -# --format=tar.gz \ -# --prefix ldap-sdk-/ \ -# -o ldap-sdk-.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 \ -# --stdout \ -# \ -# > ldap-sdk-VERSION-RELEASE.patch -# Patch: ldap-sdk-VERSION-RELEASE.patch - -BuildArch: noarch -%if 0%{?java_arches:1} -ExclusiveArch: %{java_arches} noarch +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 -################################################################################ -# Java -################################################################################ - -%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} -BuildRequires: mvn(org.slf4j:slf4j-api) -BuildRequires: mvn(org.slf4j:slf4j-jdk14) -BuildRequires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 +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 -n %{product_id} -################################################################################ +%package javadoc +Group: Development/Documentation +Summary: Javadoc for %{name} +Obsoletes: openjmx-javadoc -Summary: LDAP SDK +%description javadoc +Javadoc for %{name} -Requires: %{java_headless} -Requires: mvn(org.slf4j:slf4j-api) -Requires: mvn(org.slf4j:slf4j-jdk14) -Requires: mvn(org.dogtagpki.jss:jss-base) >= 5.6.0 - -Obsoletes: ldapjdk < %{version}-%{release} -Provides: ldapjdk = %{version}-%{release} -Provides: ldapjdk = %{major_version}.%{minor_version} -Provides: %{product_id} = %{major_version}.%{minor_version} - -%description -n %{product_id} -The Mozilla LDAP SDKs enable you to write applications which access, -manage, and update the information stored in an LDAP directory. - -%license docs/ldapjdk/license.txt - -################################################################################ -%package -n %{product_id}-javadoc -################################################################################ - -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 - -################################################################################ %prep -################################################################################ +%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 -%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 -################################################################################ +# cleanup CVS dirs +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 -export JAVA_HOME=%{java_home} - -%mvn_build - -################################################################################ %install -################################################################################ +rm -rf $RPM_BUILD_ROOT -%mvn_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 -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 +install -d -m 755 $RPM_BUILD_ROOT%{_javadir}-1.3.0 -################################################################################ -%files -n %{product_id} -f .mfiles -################################################################################ +pushd $RPM_BUILD_ROOT%{_javadir}-1.3.0 + ln -fs ../java/*%{spname}.jar jndi-ldap.jar +popd -%{_mavenpomdir}/JPP-ldapjdk.pom -%{_mavenpomdir}/JPP-ldapsp.pom -%{_mavenpomdir}/JPP-ldapfilter.pom -%{_mavenpomdir}/JPP-ldapbeans.pom -%{_mavenpomdir}/JPP-ldaptools.pom +mkdir -p %{buildroot}%{_mavenpomdir} +install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "ldapsdk:ldapsdk" -################################################################################ -%files -n %{product_id}-javadoc -f .mfiles-javadoc -################################################################################ +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}/* -################################################################################ %changelog -* Tue Nov 04 2025 Dogtag PKI Team - 5.6.0-1 -- Rebase to LDAP SDK 5.6.0 +* Thu Oct 12 2017 Matthew Harmsen 0:4.19-5 +- Fix build for CentOS 7 -* Wed Jul 30 2025 Yaakov Selkowitz - 5.6.0-0.1.alpha1.4 -- Really rebuilt for java-25-openjdk as system jdk +* Wed Oct 11 2017 Matthew Harmsen 0:4.19-4 +- Mozilla Bug #1376300 - Missing getter methods in JDAPFilter classes -* Tue Jul 29 2025 jiri vanek - 5.6.0-0.1.alpha1.3 -- Rebuilt for java-25-openjdk as preffered jdk +* 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 -* Thu Jul 24 2025 Fedora Release Engineering - 5.6.0-0.1.alpha1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild +* Wed Jul 26 2017 Fedora Release Engineering - 0:4.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_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 +* Wed Mar 8 2017 Matthew Harmsen 0:4.19-1 +- Resolves: rhbz #1394372 - Rebase ldapjdk to 4.19 -* Wed Nov 20 2024 Dogtag PKI Team 5.5.0-0.1 -- Rebase to LDAP SDK 5.6.0-alpha1 +* Fri Feb 10 2017 Fedora Release Engineering - 0:4.18-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Thu Jul 18 2024 Fedora Release Engineering - 5.5.0-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_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) -* Sun Mar 03 2024 Yaakov Selkowitz - 5.5.0-2 -- Really rebuilt for java-21-openjdk as system jdk +* Tue Aug 9 2016 Matthew Harmsen 0:4.18-19 +- Resolves: rhbz #1353564 - ldapjdk needs to support IPv6 (mreynolds) -* Tue Feb 27 2024 Jiri Vanek - 5.5.0-1.1 -- Rebuilt for java-21-openjdk as system jdk +* Thu Feb 04 2016 Fedora Release Engineering - 0:4.18-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Wed Feb 21 2024 Dogtag PKI Team 5.5.0-1 -- Rebase to LDAP SDK 5.5.0 +* Wed Jun 17 2015 Fedora Release Engineering - 0:4.18-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Thu Jan 25 2024 Fedora Release Engineering - 5.4.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Mon Feb 16 2015 Michal Srb - 0:4.18-16 +- Fix FTBFS (Resolves: rhbz#1105978) -* Sun Jan 21 2024 Fedora Release Engineering - 5.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Sat Jun 07 2014 Fedora Release Engineering - 0:4.18-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Thu Jul 20 2023 Fedora Release Engineering - 5.4.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild +* Sat Aug 03 2013 Fedora Release Engineering - 0:4.18-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_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) -- Introduce Packit configuration for ldapjdk (Chris Kelley) +* Thu Feb 14 2013 Fedora Release Engineering - 0:4.18-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Tue Feb 07 2023 Dogtag PKI Team - 5.3.0-1 -- Rebase to LDAP SDK 5.3.0 +* Tue Nov 13 2012 Matthew Harmsen 0:4.18-12 +- Appended full URLs in front of source files -* Thu Jan 19 2023 Fedora Release Engineering - 5.2.0-1.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Sat Aug 18 2012 gil cattaneo 0:4.18-11 +- Added maven pom -* Thu Jul 21 2022 Fedora Release Engineering - 5.2.0-1.2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild +* Thu Jul 19 2012 Fedora Release Engineering - 0:4.18-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Fri Jul 08 2022 Jiri Vanek - 5.2.0-1.1 -- Rebuilt for Drop i686 JDKs +* Fri Jan 13 2012 Fedora Release Engineering - 0:4.18-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Thu Jun 30 2022 Dogtag PKI Team - 5.2.0-1 -- Rebase to LDAP SDK 5.2.0 +* 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 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 +* Fri Feb 18 2011 Alexander Kurtakov 0:4.18-7 +- Drop gcj. +- Adapt to current guidelines. -* Mon Apr 11 2022 Dogtag PKI Team - 5.2.0-0.2.beta1 -- Rebase to LDAP SDK 5.2.0-beta1 +* Mon Feb 07 2011 Fedora Release Engineering - 0:4.18-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Mon Feb 14 2022 Dogtag PKI Team - 5.1.0-1 -- Rebase to LDAP SDK 5.1.0 +* Fri Jul 24 2009 Fedora Release Engineering - 0:4.18-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -* Sat Feb 05 2022 Jiri Vanek - 5.0.0-3 -- Rebuilt for java-17-openjdk as system jdk +* Fri Mar 20 2009 Deepak Bhole - 0:4.18-4 +- RPM was using pre-built jars before. Fixed that problem. -* Thu Jan 20 2022 Fedora Release Engineering - 5.0.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild +* Wed Feb 25 2009 Fedora Release Engineering - 0:4.18-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -* Thu Sep 30 2021 Dogtag PKI Team - 5.0.0-1 -- Rebase to LDAP SDK 5.0.0 +* Thu May 29 2008 Tom "spot" Callaway - 4.18-2 +- fix license tag -* Thu Aug 12 2021 Dogtag PKI Team - 5.0.0-0.3.alpha2 -- Rebase to LDAP SDK 5.0.0-alpha2 +* 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 -* Thu Jul 22 2021 Fedora Release Engineering - 5.0.0-0.2.alpha1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild +* Tue Feb 19 2008 Fedora Release Engineering - 0:4.17-2jpp.7 +- Autorebuild for GCC 4.3 -* Tue Jun 22 2021 Dogtag PKI Team - 5.0.0-0.1.alpha1 -- Rebase to LDAP SDK 5.0.0-alpha1 +* 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 fc04926..ef2b655 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ldap-sdk-5.6.0.tar.gz) = 4e86246ecd0a772a09cfc09081319d4e32abd173ce167cfe7c569636d3bd323b75d1d90d9faf65b43ca67c4e123bfb5bff2620158fff3b011c580e6eca07515d +SHA512 (ldapjdk-4.19.tar.gz) = 2a63827572423eab513a831b49ebe2fd0c93259f82f953576bf30050a51b5d2effcf167826c0ce213ef1bc4e8230ac56fd004987b4adb5a38cbb09598d0fccf8 diff --git a/sources-update.sh b/sources-update.sh deleted file mode 100755 index 96129ca..0000000 --- a/sources-update.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -SOURCE=$1 -TARGET=`basename $1` - -cp $SOURCE $TARGET -sha512sum --tag $TARGET > sources