mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-02-05 00:07:38 -08:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
88 lines
3.8 KiB
Diff
88 lines
3.8 KiB
Diff
diff -uNr inetlib.orig/source/gnu/inet/imap/IMAPConnection.java inetlib/source/gnu/inet/imap/IMAPConnection.java
|
|
--- inetlib.orig/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 10:25:48.402313856 +0200
|
|
+++ inetlib/source/gnu/inet/imap/IMAPConnection.java 2006-09-19 10:27:02.775026067 +0200
|
|
@@ -46,7 +46,6 @@
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
-import java.util.Properties;
|
|
|
|
import javax.net.ssl.SSLContext;
|
|
import javax.net.ssl.SSLSocket;
|
|
@@ -653,7 +652,7 @@
|
|
String[] m = new String[] { mechanism };
|
|
CallbackHandler ch = new SaslCallbackHandler (username, password);
|
|
// Avoid lengthy callback procedure for GNU Crypto
|
|
- Properties p = new Properties ();
|
|
+ HashMap p = new HashMap();
|
|
p.put ("gnu.crypto.sasl.username", username);
|
|
p.put ("gnu.crypto.sasl.password", password);
|
|
SaslClient sasl = Sasl.createSaslClient (m, null, "smtp",
|
|
diff -uNr inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java inetlib/source/gnu/inet/nntp/NNTPConnection.java
|
|
--- inetlib.orig/source/gnu/inet/nntp/NNTPConnection.java 2006-09-19 10:25:48.420311609 +0200
|
|
+++ inetlib/source/gnu/inet/nntp/NNTPConnection.java 2006-09-19 10:29:02.781039000 +0200
|
|
@@ -42,7 +42,7 @@
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.GregorianCalendar;
|
|
-import java.util.Properties;
|
|
+import java.util.HashMap;
|
|
import java.util.TimeZone;
|
|
|
|
import javax.security.auth.callback.CallbackHandler;
|
|
@@ -1140,7 +1140,7 @@
|
|
String[] m = new String[] { mechanism };
|
|
CallbackHandler ch = new SaslCallbackHandler (username, password);
|
|
// Avoid lengthy callback procedure for GNU Crypto
|
|
- Properties p = new Properties ();
|
|
+ HashMap p = new HashMap();
|
|
p.put ("gnu.crypto.sasl.username", username);
|
|
p.put ("gnu.crypto.sasl.password", password);
|
|
SaslClient sasl =
|
|
diff -uNr inetlib.orig/source/gnu/inet/pop3/POP3Connection.java inetlib/source/gnu/inet/pop3/POP3Connection.java
|
|
--- inetlib.orig/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 10:25:48.426310859 +0200
|
|
+++ inetlib/source/gnu/inet/pop3/POP3Connection.java 2006-09-19 10:27:59.374957608 +0200
|
|
@@ -41,10 +41,10 @@
|
|
import java.security.NoSuchAlgorithmException;
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
+import java.util.HashMap;
|
|
import java.util.LinkedHashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
-import java.util.Properties;
|
|
|
|
import javax.net.ssl.SSLContext;
|
|
import javax.net.ssl.SSLSocket;
|
|
@@ -232,7 +232,7 @@
|
|
String[] m = new String[] { mechanism };
|
|
CallbackHandler ch = new SaslCallbackHandler (username, password);
|
|
// Avoid lengthy callback procedure for GNU Crypto
|
|
- Properties p = new Properties ();
|
|
+ HashMap p = new HashMap();
|
|
p.put ("gnu.crypto.sasl.username", username);
|
|
p.put ("gnu.crypto.sasl.password", password);
|
|
SaslClient sasl =
|
|
diff -uNr inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java inetlib/source/gnu/inet/smtp/SMTPConnection.java
|
|
--- inetlib.orig/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 10:25:48.428310610 +0200
|
|
+++ inetlib/source/gnu/inet/smtp/SMTPConnection.java 2006-09-19 10:26:34.107606132 +0200
|
|
@@ -38,8 +38,8 @@
|
|
import java.security.GeneralSecurityException;
|
|
import java.util.ArrayList;
|
|
import java.util.Collections;
|
|
+import java.util.HashMap;
|
|
import java.util.List;
|
|
-import java.util.Properties;
|
|
|
|
import javax.net.ssl.SSLContext;
|
|
import javax.net.ssl.SSLSocket;
|
|
@@ -598,7 +598,7 @@
|
|
String[] m = new String[] { mechanism };
|
|
CallbackHandler ch = new SaslCallbackHandler (username, password);
|
|
// Avoid lengthy callback procedure for GNU Crypto
|
|
- Properties p = new Properties ();
|
|
+ HashMap p = new HashMap();
|
|
p.put ("gnu.crypto.sasl.username", username);
|
|
p.put ("gnu.crypto.sasl.password", password);
|
|
SaslClient sasl =
|