summaryrefslogtreecommitdiff
path: root/dev-java/ldapsdk
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java/ldapsdk')
-rw-r--r--dev-java/ldapsdk/Manifest5
-rw-r--r--dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch151
-rw-r--r--dev-java/ldapsdk/files/ldapsdk-gentoo.patch129
-rw-r--r--dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild55
-rw-r--r--dev-java/ldapsdk/metadata.xml14
5 files changed, 354 insertions, 0 deletions
diff --git a/dev-java/ldapsdk/Manifest b/dev-java/ldapsdk/Manifest
new file mode 100644
index 000000000000..d8a0f519e468
--- /dev/null
+++ b/dev-java/ldapsdk/Manifest
@@ -0,0 +1,5 @@
+AUX 4.1.7-fix-jdk-1.7-enum.patch 8395 BLAKE2B 44a69a7364592f1913f04a8ddd4f9b9792093e644084b2e0414f2168e788de87511d5c0e91d3ded0de8abd78bcc52e8c76cf1e68a2d5cee7ae733735dfef809c SHA512 b62749328c9ca64342550771a4aeed8321b2995a81b15a103c8c3383beaa471f657c13b9eefa6035f0820c7b39e4640f6af1eec4af8bcbbce75a2d97252bc20e
+AUX ldapsdk-gentoo.patch 5569 BLAKE2B ade856d7048ab2ab7b728bc3bc7b49ad9c3bac9dcf8e1fa860c8ab6a164e57df1e570c0611c153f7da3a391e0a299dafb1a20ee5b0f0bc4b4a5d08398867235b SHA512 2b3eb2b0cd819f6a5885235eb75b20c60a1b2805910fd0f11c4e54edfa5c5c802db79378e43b02182ef6acb60eae20fa5110835e8a772c9a34daf6a4352a3b0c
+DIST ldapsdk_java_20020819.tar.gz 1068301 BLAKE2B bb49f97908014218ed7a2c38bbc4ee4cb84e63866a7cc300a484588e0868a844367428c7a1008f6d69ba7e40031f03bd50ae595c2122d7a5b1fed91d4570b082 SHA512 e27be2a3c41db07589a0f4ee32f5b9dc2700f27aadf07c6c3db32041b3284ea8132d4aafad3cc0e132a68e1d438013df0068ea838c98cfed5ec9227f39d3c33d
+EBUILD ldapsdk-4.1.7-r4.ebuild 1309 BLAKE2B 9f0a6a0248bb9288e3875ff29baae0a9c656db77efc6287c5457662e4178a05ed0af16001f6c8041637c7d672d7c431df9696a8f332d7e60b8a2d87b5e275cfa SHA512 8c6b76e8f3f72016c2fec988d4faf90530e8d0c1e45a7fcec313d78ac734591500325b1fcf7a6bec8411c9204abcb6818447d5019e8f039b5c1bf2d498dfc205
+MISC metadata.xml 313 BLAKE2B 9e8564589bccd808a56750e2cd40cf23c8d7414a458a69ef2f11b567c36c5d3013199b743c25efc56ac5c4bd9f2653ee0d2235e2365e5fbe2bc07f0c8bbe74de SHA512 5b8c3260975827e81ee947fa27f70953bdeb6adb436eed116c63f377fb957aaf16e686bc86a0a3ee4d25ed8c752f9f5403bd831dafe731d8d297c9ecbb3b0240
diff --git a/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch b/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
new file mode 100644
index 000000000000..13cdf30f843b
--- /dev/null
+++ b/dev-java/ldapsdk/files/4.1.7-fix-jdk-1.7-enum.patch
@@ -0,0 +1,151 @@
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
+index a0ba7e8..42834c1 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
+@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
+ BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+ numRead);
+
+- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+
+- _changeTypes = enum.getValue();
++ _changeTypes = enumx.getValue();
+
+ if (s.size() > 1) {
+ if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
+index c73bb68..5539f11 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
+@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
+ BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+ numRead);
+
+- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+
+- con.setChangeType(enum.getValue());
++ con.setChangeType(enumx.getValue());
+
+ if (s.size() > 1) {
+ if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
+index e126d47..b5f6809 100644
+--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
++++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
+@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
+ * @see org.ietf.ldap.util.RDN#getAttributeSyntax
+ */
+ public static String[] getAttributesForSyntax( String oid ) {
+- Enumeration enum = m_attributehash.keys();
++ Enumeration enumx = m_attributehash.keys();
+ Vector key_v = new Vector();
+ String tmp_str = null;
+
+- while ( enum.hasMoreElements() ) {
+- tmp_str = (String)enum.nextElement();
++ while ( enumx.hasMoreElements() ) {
++ tmp_str = (String)enumx.nextElement();
+ if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
+ key_v.addElement( tmp_str );
+ }
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
+index a4d9e88..85cc7af 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
+@@ -4519,9 +4519,9 @@ public class LDAPConnection
+ LDAPControl[] controls = null;
+
+ synchronized(m_responseControlTable) {
+- Enumeration enum = m_responseControlTable.keys();
+- while (enum.hasMoreElements()) {
+- Object client = enum.nextElement();
++ Enumeration enumx = m_responseControlTable.keys();
++ while (enumx.hasMoreElements()) {
++ Object client = enumx.nextElement();
+ ResponseControls rspCtrls = (ResponseControls)m_responseControlTable.get(client);
+
+ if (msgID == rspCtrls.msgID) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
+index 8e486c5..9256aa0 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
+@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
+ BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+ numRead);
+
+- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+
+- m_changeTypes = enum.getValue();
++ m_changeTypes = enumx.getValue();
+
+ if (s.size() > 1) {
+ if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
+index 9bab06a..a5836e8 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
+@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
+ BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
+ numRead);
+
+- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
++ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
+
+- con.setChangeType(enum.getValue());
++ con.setChangeType(enumx.getValue());
+
+ if (s.size() > 1) {
+ if (s.elementAt(1) instanceof BEROctetString) {
+diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
+index 57bce3a..392d7ea 100644
+--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
++++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
+@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
+ * @see netscape.ldap.util.RDN#getAttributeSyntax
+ */
+ public static String[] getAttributesForSyntax( String oid ) {
+- Enumeration enum = m_attributehash.keys();
++ Enumeration enumx = m_attributehash.keys();
+ Vector key_v = new Vector();
+ String tmp_str = null;
+
+- while ( enum.hasMoreElements() ) {
+- tmp_str = (String)enum.nextElement();
++ while ( enumx.hasMoreElements() ) {
++ tmp_str = (String)enumx.nextElement();
+ if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
+ key_v.addElement( tmp_str );
+ }
+diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
+index 4bcb46d..7b22371 100644
+--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
++++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
+@@ -151,8 +151,8 @@ class AttributesImpl implements Attributes {
+ */
+ static LDAPAttributeSet jndiAttrsToLdapAttrSet(Attributes jndiAttrs) throws NamingException{
+ LDAPAttributeSet attrs = new LDAPAttributeSet();
+- for (Enumeration enum = jndiAttrs.getAll(); enum.hasMoreElements();) {
+- attrs.add(jndiAttrToLdapAttr((Attribute) enum.nextElement()));
++ for (Enumeration enumx = jndiAttrs.getAll(); enumx.hasMoreElements();) {
++ attrs.add(jndiAttrToLdapAttr((Attribute) enumx.nextElement()));
+ }
+ return attrs;
+ }
+diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
+index 2595b8a..d9bd103 100644
+--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
++++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
+@@ -465,8 +465,8 @@ public class ObjectMapper {
+ */
+ static Attributes encodeDirCtxObj(DirContext obj, Attributes attrs) throws NamingException{
+ Attributes ctxAttrs = obj.getAttributes("");
+- for (NamingEnumeration enum = ctxAttrs.getAll(); enum.hasMore();) {
+- attrs.put((Attribute)enum.next());
++ for (NamingEnumeration enumx = ctxAttrs.getAll(); enumx.hasMore();) {
++ attrs.put((Attribute)enumx.next());
+ }
+ return attrs;
+ }
diff --git a/dev-java/ldapsdk/files/ldapsdk-gentoo.patch b/dev-java/ldapsdk/files/ldapsdk-gentoo.patch
new file mode 100644
index 000000000000..539b0f79d033
--- /dev/null
+++ b/dev-java/ldapsdk/files/ldapsdk-gentoo.patch
@@ -0,0 +1,129 @@
+diff -uprN mozilla.orig/directory/java-sdk/build.properties mozilla/directory/java-sdk/build.properties
+--- mozilla.orig/directory/java-sdk/build.properties 2004-12-13 16:19:25.626622784 +0100
++++ mozilla/directory/java-sdk/build.properties 2004-12-13 16:23:48.285692536 +0100
+@@ -12,6 +12,6 @@
+ # place the location of this file in the following line.
+ # the library may be downloaded from http://www.oroinc.com
+
+-#ororegexp.jar=../lib/oroinc.jar
+-
++#ororegexp.jar=
++#jss.jar=
+
+diff -uprN mozilla.orig/directory/java-sdk/build.xml mozilla/directory/java-sdk/build.xml
+--- mozilla.orig/directory/java-sdk/build.xml 2004-12-13 16:19:25.636621264 +0100
++++ mozilla/directory/java-sdk/build.xml 2004-12-13 16:36:40.320325432 +0100
+@@ -58,8 +58,7 @@
+
+ <!-- the following is to setup the correct info for sun jsse which
+ is jdk dependent -->
+- <property name="ssllibs14" value="${basedir}/ldapjdk/lib/jss32_stub.jar"/>
+- <property name="ssllibs13" value="${basedir}/ldapjdk/lib/jaas.jar:${basedir}/ldapjdk/lib/jnet.jar:${basedir}/ldapjdk/lib/jsse.jar:${basedir}/ldapjdk/lib/jss32_stub.jar"/>
++ <property name="ssllibs14" value="${jss.jar}"/>
+
+ <!-- we do not use the users existing classpath and instead build our own
+ comment the following line out if this is not desired -->
+@@ -75,7 +74,7 @@
+ dist-jndi : will build only the jndi service provider (ldapsp.jar)
+ dist-docs : will package up all the documentation (ldapdoc.zip)
+
+- build : will compile the entire sdk but not package
++ bild : will compile the entire sdk but not package
+ build-jdk : will compile only the ldap jdk jar
+ build-filter : will compile only the filter classes
+ build-beans : will compile only the ldap beans
+@@ -173,15 +172,21 @@
+ <!-- Compile the java jdk code from ${src} into ${dest} -->
+ <javac srcdir="${basedir}/ldapjdk/com" destdir="${jdk.dist}"
+ excludes="cvs/**"
+- classpath="${jsselibs}"
++ classpath="${jsselibs}"
++ source="1.4"
++ target="1.4"
+ />
+ <javac srcdir="${basedir}/ldapjdk/netscape" destdir="${jdk.dist}"
+ excludes="cvs/**"
+ classpath="${jsselibs}"
++ source="1.4"
++ target="1.4"
+ />
+ <javac srcdir="${basedir}/tools" destdir="${jdk.dist}"
+ excludes="cvs/**"
+ classpath="${jsselibs}"
++ source="1.4"
++ target="1.4"
+ />
+ </target>
+
+@@ -191,6 +196,8 @@
+ <javac srcdir="${basedir}/ldapfilter" destdir="${filter.dist}"
+ excludes="cvs/**"
+ classpath="${jdk.dist}:${jsselibs}:${ororegexp.jar}"
++ source="1.4"
++ target="1.4"
+ />
+ </target>
+
+@@ -199,6 +206,8 @@
+ <javac srcdir="${basedir}/ldapbeans" destdir="${jdk.dist}"
+ excludes="cvs/**"
+ classpath="${jsselibs}"
++ source="1.4"
++ target="1.4"
+ />
+ </target>
+
+@@ -207,6 +216,8 @@
+ <javac srcdir="${basedir}/ldapsp" destdir="${jndi.dist}"
+ excludes="cvs/**"
+ classpath="${jsselibs}:${basedir}/ldapsp/lib/jndi.jar"
++ source="1.4"
++ target="1.4"
+ />
+ </target>
+
+@@ -221,7 +232,7 @@
+ author="true"
+ version="true"
+ use="true"
+- classpath="${basedir}/ldapjdk:${basedir}/ldapjdk/lib/jss32_stub.jar:${basedir}/ldapbeans" >
++ classpath="${basedir}/ldapjdk:${jss.jar}:${basedir}/ldapbeans" >
+ </javadoc>
+
+ <javadoc packagenames="com.netscape.jndi.ldap.controls.*"
+diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java
+--- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java 2004-12-13 16:19:25.601626584 +0100
++++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPFilterDescriptor.java 2004-12-13 16:19:51.198735232 +0100
+@@ -24,7 +24,7 @@ package netscape.ldap.util;
+ import java.io.*;
+ import java.util.*;
+ import java.net.*;
+-import com.oroinc.text.regex.*;
++import org.apache.oro.text.regex.*;
+ import netscape.ldap.*;
+
+ /**
+diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java
+--- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java 2004-12-13 16:19:25.601626584 +0100
++++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterList.java 2004-12-13 16:20:23.892764984 +0100
+@@ -22,7 +22,7 @@
+ package netscape.ldap.util;
+
+ import java.util.*;
+-import com.oroinc.text.regex.*;
++import org.apache.oro.text.regex.*;
+
+ /**
+ * Represents an Internal LDAPFilterList object. This is an internal object
+diff -uprN mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java
+--- mozilla.orig/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java 2004-12-13 16:19:25.601626584 +0100
++++ mozilla/directory/java-sdk/ldapfilter/netscape/ldap/util/LDAPIntFilterSet.java 2004-12-13 16:20:11.728614216 +0100
+@@ -22,7 +22,7 @@
+ package netscape.ldap.util;
+
+ import java.util.*;
+-import com.oroinc.text.regex.*;
++import org.apache.oro.text.regex.*;
+ /**
+ * Represents an LDAPIntFilterSet object. This is an internal object that
+ * should never be instantiated directly by the developer.
diff --git a/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
new file mode 100644
index 000000000000..9d6a64e8db56
--- /dev/null
+++ b/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Netscape Directory SDK for Java"
+HOMEPAGE="http://www.mozilla.org/directory/javasdk.html"
+SRC_URI="http://www.mozilla.org/directory/${PN}_java_20020819.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="4.1"
+KEYWORDS="amd64 x86"
+IUSE="doc"
+
+RDEPEND=">=virtual/jre-1.4
+ dev-java/jss:3.4
+ dev-java/jakarta-oro:2.0"
+DEPEND=">=virtual/jdk-1.4
+ ${RDEPEND}"
+
+S=${WORKDIR}/mozilla/directory/java-sdk
+
+java_prepare() {
+ cd "${WORKDIR}"/mozilla || die
+ epatch "${FILESDIR}"/ldapsdk-gentoo.patch
+ epatch "${FILESDIR}"/${PV}-*.patch
+
+ echo "ororegexp.jar=$(java-pkg_getjars jakarta-oro-2.0)" > "${S}"/build.properties || die
+ echo "jss.jar=$(java-pkg_getjars jss-3.4)" >> "${S}"/build.properties || die
+
+ cd "${S}"/ldapjdk/lib || die
+ rm -f *.jar || die
+ java-pkg_jar-from jss-3.4
+
+ cd "${S}"/ldapsp/lib || die
+ rm *.jar || die
+
+ java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+ eant dist-jdk dist-filter dist-beans dist-jndi $(use_doc build-docs)
+}
+
+src_install() {
+ java-pkg_dojar dist/packages/*.jar
+
+ use doc && java-pkg_dojavadoc dist/doc/ldapsp
+ use source && \
+ java-pkg_dosrc {ldapsp,ldapjdk}/com {ldapjdk,ldapbeans,ldapfilter}/netscape
+}
diff --git a/dev-java/ldapsdk/metadata.xml b/dev-java/ldapsdk/metadata.xml
new file mode 100644
index 000000000000..730175bdcb9d
--- /dev/null
+++ b/dev-java/ldapsdk/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
+
+<longdescription>
+
+The Mozilla Directory (LDAP) SDK Project
+
+</longdescription>
+</pkgmetadata>