gentoo resync : 14.07.2018

2 files changed, 280 insertions, 0 deletions

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.