Rebased to LDAP SDK 4.20.0
This commit is contained in:
parent
888751f5e3
commit
8408e75302
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
||||
ldapjdk-4.18.tar.gz
|
||||
/ldapjdk-4.19.tar.gz
|
||||
/ldap-sdk-4.20.0.tar.gz
|
||||
|
9
copr-build.sh
Executable file
9
copr-build.sh
Executable file
@ -0,0 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
REPO=$1
|
||||
|
||||
if [ "$REPO" == "" ]; then
|
||||
REPO="pki-10.6"
|
||||
fi
|
||||
|
||||
fedpkg copr-build --nowait $REPO
|
@ -1,6 +0,0 @@
|
||||
<project>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>ldapjdk</groupId>
|
||||
<artifactId>ldapjdk</artifactId>
|
||||
<version>4.19</version>
|
||||
</project>
|
@ -1,447 +0,0 @@
|
||||
From 3258e4276bd13f3c9cd45ddf416e77b9732f079a Mon Sep 17 00:00:00 2001
|
||||
From: "Endi S. Dewata" <edewata@redhat.com>
|
||||
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 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<classpath>
|
||||
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
|
||||
+ <classpathentry excluding="tools/" kind="src" path="java-sdk/ietfldap"/>
|
||||
+ <classpathentry kind="src" path="java-sdk/ldapbeans"/>
|
||||
+ <classpathentry kind="src" path="java-sdk/ldapfilter"/>
|
||||
+ <classpathentry kind="src" path="java-sdk/ldapjdk"/>
|
||||
+ <classpathentry kind="src" path="java-sdk/ldapsp"/>
|
||||
+ <classpathentry kind="lib" path="/usr/lib/java/jss4.jar"/>
|
||||
+ <classpathentry kind="output" path="bin"/>
|
||||
+</classpath>
|
||||
diff --git a/.project b/.project
|
||||
new file mode 100644
|
||||
index 0000000..b6607c7
|
||||
--- /dev/null
|
||||
+++ b/.project
|
||||
@@ -0,0 +1,17 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<projectDescription>
|
||||
+ <name>ldap-sdks</name>
|
||||
+ <comment></comment>
|
||||
+ <projects>
|
||||
+ </projects>
|
||||
+ <buildSpec>
|
||||
+ <buildCommand>
|
||||
+ <name>org.eclipse.jdt.core.javabuilder</name>
|
||||
+ <arguments>
|
||||
+ </arguments>
|
||||
+ </buildCommand>
|
||||
+ </buildSpec>
|
||||
+ <natures>
|
||||
+ <nature>org.eclipse.jdt.core.javanature</nature>
|
||||
+ </natures>
|
||||
+</projectDescription>
|
||||
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<JDAPFilter> 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<JDAPFilter> 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.
|
||||
* <pre>
|
||||
* [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
|
||||
* </pre>
|
||||
*
|
||||
* @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<String> m_initial = new Vector<>();
|
||||
+ private Vector<String> m_any = new Vector<>();
|
||||
+ private Vector<String> 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<String> 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
|
||||
|
@ -1,45 +0,0 @@
|
||||
From 8066b70367ea28a2e053a23172b230a938152bd8 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Harmsen <mharmsen@redhat.com>
|
||||
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
|
||||
|
246
ldapjdk.spec
246
ldapjdk.spec
@ -1,31 +1,43 @@
|
||||
################################################################################
|
||||
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-<version>/ \
|
||||
# -o ldap-sdk-<version>.tar.gz \
|
||||
# <version tag>
|
||||
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 \
|
||||
# <version tag> \
|
||||
# > ldap-sdk-VERSION-RELEASE.patch
|
||||
# Patch: ldap-sdk-VERSION-RELEASE.patch
|
||||
|
||||
################################################################################
|
||||
# Build Dependencies
|
||||
################################################################################
|
||||
|
||||
# autosetup
|
||||
BuildRequires: git
|
||||
|
||||
Requires: jpackage-utils >= 0:1.5
|
||||
Requires: jss
|
||||
BuildRequires: ant
|
||||
BuildRequires: java-devel
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 7
|
||||
@ -33,33 +45,42 @@ BuildRequires: jpackage-utils >= 0:1.5
|
||||
%else
|
||||
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 <releng@fedoraproject.org> - 0:4.19-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
* Fri Aug 10 2018 Dogtag PKI Team <pki-team@redhat.com> 4.20.0-0
|
||||
- Rebased to LDAP SDK 4.20.0
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.19-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
- Fix rhel conditionals
|
||||
|
||||
* Wed Jan 03 2018 Karsten Hopp <karsten@redhat.com> - 4.19-5+4
|
||||
- fix some conditionals
|
||||
|
||||
* Thu Oct 12 2017 Matthew Harmsen <mharmsen@redhat.com> 0:4.19-5
|
||||
- Fix build for CentOS 7
|
||||
|
||||
* Wed Oct 11 2017 Matthew Harmsen <mharmsen@redhat.com> 0:4.19-4
|
||||
- Mozilla Bug #1376300 - Missing getter methods in JDAPFilter classes
|
||||
|
||||
* Wed Sep 6 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 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 <releng@fedoraproject.org> - 0:4.19-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Mar 8 2017 Matthew Harmsen <mharmsen@redhat.com> 0:4.19-1
|
||||
- Resolves: rhbz #1394372 - Rebase ldapjdk to 4.19
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.18-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Oct 31 2016 Matthew Harmsen <mharmsen@redhat.com> 0:4.18-20
|
||||
- Resolves: rhbz #1382856 - ldapjdk fails to parse ldap url with no host:port (mreynolds)
|
||||
|
||||
* Tue Aug 9 2016 Matthew Harmsen <mharmsen@redhat.com> 0:4.18-19
|
||||
- Resolves: rhbz #1353564 - ldapjdk needs to support IPv6 (mreynolds)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:4.18-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-17
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Mon Feb 16 2015 Michal Srb <msrb@redhat.com> - 0:4.18-16
|
||||
- Fix FTBFS (Resolves: rhbz#1105978)
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-15
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Tue Nov 13 2012 Matthew Harmsen <mharmsen@redhat.com> 0:4.18-12
|
||||
- Appended full URLs in front of source files
|
||||
|
||||
* Sat Aug 18 2012 gil cattaneo <puntogil@libero.it> 0:4.18-11
|
||||
- Added maven pom
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Mar 31 2011 Rich Megginson <rmeggins@redhat.com> 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 <akurtako@redhat.com> 0:4.18-7
|
||||
- Drop gcj.
|
||||
- Adapt to current guidelines.
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Mar 20 2009 Deepak Bhole <dbhole@redhat.com> - 0:4.18-4
|
||||
- RPM was using pre-built jars before. Fixed that problem.
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.18-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Thu May 29 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 4.18-2
|
||||
- fix license tag
|
||||
|
||||
* Tue Feb 19 2008 Dennis Gilmore <dennis@ausil.us> - 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 <rel-eng@fedoraproject.org> - 0:4.17-2jpp.7
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
* Fri Aug 11 2006 Vivek Lakshmanan <vivekl@redhat.com> 0:4.17-1jpp.7
|
||||
- Rebuild with new naming convention.
|
||||
|
||||
* Mon Jul 24 2006 Vivek Lakshmanan <vivekl@redhat.com> 0:4.17-1jpp_6fc
|
||||
- Add conditional native compilation.
|
||||
|
||||
* Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:4.17-1jpp_5fc
|
||||
- Rebuilt
|
||||
|
||||
* Wed Jul 19 2006 Jesse Keating <jkeating@redhat.com> - 0:4.17-1jpp_4fc
|
||||
- fix release
|
||||
- remove silly name, version, release defines.
|
||||
|
||||
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0:4.17-1jpp_3fc.1.1.2.1
|
||||
- rebuild
|
||||
|
||||
* Tue Jul 11 2006 Archit Shah <ashah@redhat.com>
|
||||
- add java-devel BuildRequires (bug #192530)
|
||||
|
||||
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Sat Nov 5 2005 Archit Shah <ashah@redhat.com> 0:4.17-1jpp_3fc
|
||||
- Call javadoc with sourcepath to work aroung gjdoc bug (#170611)
|
||||
|
||||
* Thu Jan 27 2005 Gary Benson <gbenson@redhat.com> 0:4.17-1jpp_2fc
|
||||
- Remove non-distributable files from the source tarball.
|
||||
|
||||
* Fri Jan 21 2005 Gary Benson <gbenson@redhat.com> 0:4.17-1jpp_1fc
|
||||
- Build into Fedora.
|
||||
|
||||
* Tue Nov 16 2004 Fernando Nasser <fnasser@redhat.com> 0:4.17-1jpp_1rh
|
||||
- Merge with upstream for upgrade
|
||||
|
||||
* Thu Aug 26 2004 Fernando Nasser <fnasser@redhat.com> 0:4.17-1jpp
|
||||
- Upgrade to 4.17
|
||||
- Rebuilt with Ant 1.6.2
|
||||
|
||||
* Fri Mar 5 2004 Frank Ch. Eigler <fche@redhat.com> 0:4.1-5jpp_1rh
|
||||
- RH vacuuming
|
||||
- added ldapjdk-javaxssl.patch to stop using com.sun.*
|
||||
|
||||
* Sun Sep 28 2003 David Walluck <david@anti-microsoft.org> 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 <Nicolas.Mailhot (at) JPackage.org>
|
||||
- Initial build.
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (ldapjdk-4.19.tar.gz) = 2a63827572423eab513a831b49ebe2fd0c93259f82f953576bf30050a51b5d2effcf167826c0ce213ef1bc4e8230ac56fd004987b4adb5a38cbb09598d0fccf8
|
||||
SHA512 (ldap-sdk-4.20.0.tar.gz) = f04530a314e91f7be6f5fbcb847a5a2554ca3e8131dc8cd8888f4ace01e7da86fa044b78299b937c49723f82f0c55cf81c3f4f249c11932f9a70cb0a7e9e9f84
|
||||
|
7
sources-update.sh
Executable file
7
sources-update.sh
Executable file
@ -0,0 +1,7 @@
|
||||
#!/bin/sh
|
||||
|
||||
SOURCE=$1
|
||||
TARGET=`basename $1`
|
||||
|
||||
cp $SOURCE $TARGET
|
||||
sha512sum --tag $TARGET > sources
|
Loading…
Reference in New Issue
Block a user