[kaffe] CVS kaffe (robilad): Resynced with GNU inetlib

Kaffe CVS cvs-commits at kaffe.org
Wed Jul 6 16:26:05 PDT 2005


PatchSet 6709 
Date: 2005/07/06 23:19:52
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU inetlib

Members: 
	ChangeLog:1.4233->1.4234 
	libltdl/configure:1.84->1.85 
	libraries/javalib/Makefile.am:1.370->1.371 
	libraries/javalib/Makefile.in:1.460->1.461 
	libraries/javalib/all.files:1.141->1.142 
	libraries/javalib/gnu/inet/comsat/ComsatClient.java:1.3->1.4 
	libraries/javalib/gnu/inet/comsat/ComsatInfo.java:1.3->1.4 
	libraries/javalib/gnu/inet/finger/FingerConnection.java:1.5->1.6 
	libraries/javalib/gnu/inet/finger/FingerURLConnection.java:1.5->1.6 
	libraries/javalib/gnu/inet/finger/Handler.java:1.5->1.6 
	libraries/javalib/gnu/inet/gopher/DirectoryEntry.java:1.5->1.6 
	libraries/javalib/gnu/inet/gopher/DirectoryListing.java:1.5->1.6 
	libraries/javalib/gnu/inet/gopher/GopherConnection.java:1.5->1.6 
	libraries/javalib/gnu/inet/gopher/GopherContentHandler.java:1.5->1.6 
	libraries/javalib/gnu/inet/gopher/GopherURLConnection.java:1.5->1.6 
	libraries/javalib/gnu/inet/gopher/Handler.java:1.5->1.6 
	libraries/javalib/gnu/inet/https/Handler.java:1.6->1.7(DEAD) 
	libraries/javalib/gnu/inet/imap/IMAPConnection.java:1.8->1.9 
	libraries/javalib/gnu/inet/imap/IMAPConstants.java:1.6->1.7 
	libraries/javalib/gnu/inet/imap/IMAPException.java:1.6->1.7 
	libraries/javalib/gnu/inet/imap/IMAPResponse.java:1.6->1.7 
	libraries/javalib/gnu/inet/imap/IMAPResponseTokenizer.java:1.6->1.7 
	libraries/javalib/gnu/inet/imap/ListEntry.java:1.6->1.7 
	libraries/javalib/gnu/inet/imap/MailboxStatus.java:1.6->1.7 
	libraries/javalib/gnu/inet/imap/MessageStatus.java:1.6->1.7 
	libraries/javalib/gnu/inet/imap/Namespaces.java:1.3->1.4 
	libraries/javalib/gnu/inet/imap/Pair.java:1.6->1.7 
	libraries/javalib/gnu/inet/imap/Quota.java:1.3->1.4 
	libraries/javalib/gnu/inet/imap/UTF7imap.java:1.6->1.7 
	libraries/javalib/gnu/inet/ldap/AttributeValues.java:1.3->1.4 
	libraries/javalib/gnu/inet/ldap/BERConstants.java:1.3->1.4 
	libraries/javalib/gnu/inet/ldap/BERDecoder.java:1.4->1.5 
	libraries/javalib/gnu/inet/ldap/BEREncoder.java:1.4->1.5 
	libraries/javalib/gnu/inet/ldap/BERException.java:1.3->1.4 
	libraries/javalib/gnu/inet/ldap/LDAPConnection.java:1.4->1.5 
	libraries/javalib/gnu/inet/ldap/LDAPResult.java:1.3->1.4 
	libraries/javalib/gnu/inet/ldap/Modification.java:1.3->1.4 
	libraries/javalib/gnu/inet/ldap/ResultHandler.java:1.3->1.4 
	libraries/javalib/gnu/inet/nntp/ActiveTime.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/ActiveTimesIterator.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/ArticleNumberIterator.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/ArticleResponse.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/ArticleStream.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/FileNewsrc.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/Group.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/GroupIterator.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/GroupResponse.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/HeaderEntry.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/HeaderIterator.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/LineIterator.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/NNTPConnection.java:1.6->1.7 
	libraries/javalib/gnu/inet/nntp/NNTPConstants.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/NNTPException.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/Newsrc.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/Overview.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/OverviewIterator.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/Pair.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/PairIterator.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/PendingData.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/PostStream.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/Range.java:1.5->1.6 
	libraries/javalib/gnu/inet/nntp/StatusResponse.java:1.5->1.6 
	libraries/javalib/gnu/inet/pop3/POP3Connection.java:1.6->1.7 
	libraries/javalib/gnu/inet/smtp/Parameter.java:1.6->1.7 
	libraries/javalib/gnu/inet/smtp/ParameterList.java:1.6->1.7 
	libraries/javalib/gnu/inet/smtp/SMTPConnection.java:1.8->1.9 
	libraries/javalib/gnu/inet/util/BASE64.java:1.9->1.10 
	libraries/javalib/gnu/inet/util/CRLFInputStream.java:1.10->1.11 
	libraries/javalib/gnu/inet/util/CRLFOutputStream.java:1.6->1.7 
	libraries/javalib/gnu/inet/util/EmptyX509TrustManager.java:1.6->1.7 
	libraries/javalib/gnu/inet/util/GetLocalHostAction.java:1.6->1.7 
	libraries/javalib/gnu/inet/util/LineInputStream.java:1.8->1.9 
	libraries/javalib/gnu/inet/util/Logger.java:1.6->1.7(DEAD) 
	libraries/javalib/gnu/inet/util/MessageInputStream.java:1.6->1.7 
	libraries/javalib/gnu/inet/util/MessageOutputStream.java:1.6->1.7 
	libraries/javalib/gnu/inet/util/SaslCallbackHandler.java:1.7->1.8 
	libraries/javalib/gnu/inet/util/SaslCramMD5.java:1.3->1.4 
	libraries/javalib/gnu/inet/util/SaslInputStream.java:1.6->1.7 
	libraries/javalib/gnu/inet/util/SaslLogin.java:1.4->1.5 
	libraries/javalib/gnu/inet/util/SaslOutputStream.java:1.6->1.7 
	libraries/javalib/gnu/inet/util/SaslPlain.java:1.4->1.5 
	libraries/javalib/gnu/inet/util/StderrLogger.java:1.6->1.7(DEAD) 
	libraries/javalib/gnu/inet/util/TraceLevel.java:INITIAL->1.1 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4233 kaffe/ChangeLog:1.4234
--- kaffe/ChangeLog:1.4233	Wed Jul  6 21:18:24 2005
+++ kaffe/ChangeLog	Wed Jul  6 23:19:52 2005
@@ -1,5 +1,44 @@
 2005-07-06  Dalibor Topic  <robilad at kaffe.org>
 
+	Resynced with GNU inetlib.
+
+	2005-06-20  Chris Burdess  <dog at gnu.org>
+
+        * Request.java: If request method is HEAD or OPTIONS, never attempt
+        to read response body.
+
+	2005-06-15  Goffredo Baroncelli  <kreijack at inwind.it>
+
+        * HTTPURLConnection.java: Check index.
+
+	2005-06-06  Chris Burdess  <dog at gnu.org>
+
+        * IMAPConnection.java,POP3Connection.java,SMTPConnection.java,
+        NNTPConnection.java,TraceLevel.java: New logging framework.
+        * POP3Connection.java,SMTPConnection.java: Permit TLS negotiation on
+        socket connection.
+
+	2005-05-28  Chris Burdess  <dog at gnu.org>
+
+        * HTTPURLConnection.java: Check that Location is not null on
+        redirect.
+        * FTPURLConnection.java: URL paths are relative.
+
+	2005-04-28  Chris Burdess  <dog at gnu.org>
+
+        * NNTPConnection.java: As below for createSaslClient.
+
+	2005-04-27  Chris Burdess  <dog at gnu.org>
+
+        * HTTPURLConnection.java: Accept absolute and relative paths in
+        Location header. Throw FileNotFoundException and implement
+        getErrorStream on 404.
+        * SMTPConnection.java,IMAPConnection.java,POP3Connection.java:
+        Use HashMap instead of Properties in argument to createSaslClient
+        to ensure compatibility with Java 1.5 generics syntax.
+
+2005-07-06  Dalibor Topic  <robilad at kaffe.org>
+
 	* FAQ/FAQ.classlibrary-compile: Recommend jikes 1.22.
 
         Reported by:  Akhilesh Shirbhate <akhilesh.hacking at gmail.com>
Index: kaffe/libltdl/configure
diff -u kaffe/libltdl/configure:1.84 kaffe/libltdl/configure:1.85
--- kaffe/libltdl/configure:1.84	Wed Jul  6 02:26:09 2005
+++ kaffe/libltdl/configure	Wed Jul  6 23:19:55 2005
@@ -7330,12 +7330,11 @@
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
 	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
+	  whole_archive_flag_spec=
 	  ;;
 	pgf77* | pgf90* )			# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	  whole_archive_flag_spec=
+	  tmp_addflag=' -fpic -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
@@ -8499,7 +8498,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -8564,8 +8563,8 @@
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -9355,7 +9354,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9358 "configure"
+#line 9357 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9453,7 +9452,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9456 "configure"
+#line 9455 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10951,12 +10950,12 @@
 	;;
       pgCC*)
         # Portland Group C++ compiler
-	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-  	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+  	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 
 	hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
+	whole_archive_flag_spec_CXX=''
         ;;
       cxx*)
 	# Compaq C++
@@ -11705,11 +11704,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11708: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11707: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11712: \$? = $ac_status" >&5
+   echo "$as_me:11711: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11767,11 +11766,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11770: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11769: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11774: \$? = $ac_status" >&5
+   echo "$as_me:11773: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12280,7 +12279,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -12345,8 +12344,8 @@
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -13136,7 +13135,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13139 "configure"
+#line 13138 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13234,7 +13233,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13237 "configure"
+#line 13236 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14119,11 +14118,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14122: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14121: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14126: \$? = $ac_status" >&5
+   echo "$as_me:14125: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14181,11 +14180,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14184: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14183: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14188: \$? = $ac_status" >&5
+   echo "$as_me:14187: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14396,12 +14395,11 @@
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
 	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
+	  whole_archive_flag_spec_F77=
 	  ;;
 	pgf77* | pgf90* )			# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_F77='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	  whole_archive_flag_spec_F77=
+	  tmp_addflag=' -fpic -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
@@ -15545,7 +15543,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -15610,8 +15608,8 @@
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -16307,11 +16305,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16310: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16308: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16314: \$? = $ac_status" >&5
+   echo "$as_me:16312: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16569,11 +16567,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16572: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16570: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16576: \$? = $ac_status" >&5
+   echo "$as_me:16574: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -16631,11 +16629,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16634: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16632: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16638: \$? = $ac_status" >&5
+   echo "$as_me:16636: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16846,12 +16844,11 @@
 	tmp_addflag=
 	case $cc_basename,$host_cpu in
 	pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag'
+	  whole_archive_flag_spec_GCJ=
 	  ;;
 	pgf77* | pgf90* )			# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec_GCJ='${wl}--whole-archive,`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	  whole_archive_flag_spec_GCJ=
+	  tmp_addflag=' -fpic -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
 	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
@@ -18015,7 +18012,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -18080,8 +18077,8 @@
   need_lib_prefix=no
   # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
   case $host_os in
-    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-    *)                         need_version=no  ;;
+    openbsd3.3 | openbsd3.3.*)	need_version=yes ;;
+    *)				need_version=no  ;;
   esac
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -18871,7 +18868,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18874 "configure"
+#line 18871 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18969,7 +18966,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 18972 "configure"
+#line 18969 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -21235,7 +21232,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 21238 "configure"
+#line 21235 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.370 kaffe/libraries/javalib/Makefile.am:1.371
--- kaffe/libraries/javalib/Makefile.am:1.370	Wed Jul  6 02:26:13 2005
+++ kaffe/libraries/javalib/Makefile.am	Wed Jul  6 23:19:56 2005
@@ -115,7 +115,6 @@
 	$(gnu_inet_comsat_SRCS) \
 	$(gnu_inet_finger_SRCS) \
 	$(gnu_inet_gopher_SRCS) \
-	$(gnu_inet_https_SRCS) \
 	$(gnu_inet_imap_SRCS) \
 	$(gnu_inet_ldap_SRCS) \
 	$(gnu_inet_nntp_SRCS) \
@@ -1042,8 +1041,6 @@
 	gnu/inet/gopher/GopherContentHandler.java \
 	gnu/inet/gopher/GopherURLConnection.java \
 	gnu/inet/gopher/Handler.java
-gnu_inet_https_SRCS = \
-	gnu/inet/https/Handler.java
 gnu_inet_imap_SRCS = \
 	gnu/inet/imap/IMAPConnection.java \
 	gnu/inet/imap/IMAPConstants.java \
@@ -1105,7 +1102,6 @@
 	gnu/inet/util/EmptyX509TrustManager.java \
 	gnu/inet/util/GetLocalHostAction.java \
 	gnu/inet/util/LineInputStream.java \
-	gnu/inet/util/Logger.java \
 	gnu/inet/util/MessageInputStream.java \
 	gnu/inet/util/MessageOutputStream.java \
 	gnu/inet/util/SaslCallbackHandler.java \
@@ -1114,7 +1110,7 @@
 	gnu/inet/util/SaslLogin.java \
 	gnu/inet/util/SaslOutputStream.java \
 	gnu/inet/util/SaslPlain.java \
-	gnu/inet/util/StderrLogger.java
+	gnu/inet/util/TraceLevel.java
 gnu_java_awt_SRCS = \
 	gnu/java/awt/AWTUtilities.java \
 	gnu/java/awt/BitMaskExtent.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.460 kaffe/libraries/javalib/Makefile.in:1.461
--- kaffe/libraries/javalib/Makefile.in:1.460	Wed Jul  6 02:26:16 2005
+++ kaffe/libraries/javalib/Makefile.in	Wed Jul  6 23:19:56 2005
@@ -470,7 +470,6 @@
 	$(gnu_inet_comsat_SRCS) \
 	$(gnu_inet_finger_SRCS) \
 	$(gnu_inet_gopher_SRCS) \
-	$(gnu_inet_https_SRCS) \
 	$(gnu_inet_imap_SRCS) \
 	$(gnu_inet_ldap_SRCS) \
 	$(gnu_inet_nntp_SRCS) \
@@ -1462,9 +1461,6 @@
 	gnu/inet/gopher/GopherURLConnection.java \
 	gnu/inet/gopher/Handler.java
 
-gnu_inet_https_SRCS = \
-	gnu/inet/https/Handler.java
-
 gnu_inet_imap_SRCS = \
 	gnu/inet/imap/IMAPConnection.java \
 	gnu/inet/imap/IMAPConstants.java \
@@ -1531,7 +1527,6 @@
 	gnu/inet/util/EmptyX509TrustManager.java \
 	gnu/inet/util/GetLocalHostAction.java \
 	gnu/inet/util/LineInputStream.java \
-	gnu/inet/util/Logger.java \
 	gnu/inet/util/MessageInputStream.java \
 	gnu/inet/util/MessageOutputStream.java \
 	gnu/inet/util/SaslCallbackHandler.java \
@@ -1540,7 +1535,7 @@
 	gnu/inet/util/SaslLogin.java \
 	gnu/inet/util/SaslOutputStream.java \
 	gnu/inet/util/SaslPlain.java \
-	gnu/inet/util/StderrLogger.java
+	gnu/inet/util/TraceLevel.java
 
 gnu_java_awt_SRCS = \
 	gnu/java/awt/AWTUtilities.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.141 kaffe/libraries/javalib/all.files:1.142
--- kaffe/libraries/javalib/all.files:1.141	Wed Jul  6 02:26:17 2005
+++ kaffe/libraries/javalib/all.files	Wed Jul  6 23:20:00 2005
@@ -607,7 +607,6 @@
 gnu/inet/gopher/GopherContentHandler.java
 gnu/inet/gopher/GopherURLConnection.java
 gnu/inet/gopher/Handler.java
-gnu/inet/https/Handler.java
 gnu/inet/imap/IMAPConnection.java
 gnu/inet/imap/IMAPConstants.java
 gnu/inet/imap/IMAPException.java
@@ -663,7 +662,6 @@
 gnu/inet/util/EmptyX509TrustManager.java
 gnu/inet/util/GetLocalHostAction.java
 gnu/inet/util/LineInputStream.java
-gnu/inet/util/Logger.java
 gnu/inet/util/MessageInputStream.java
 gnu/inet/util/MessageOutputStream.java
 gnu/inet/util/SaslCallbackHandler.java
@@ -672,7 +670,7 @@
 gnu/inet/util/SaslLogin.java
 gnu/inet/util/SaslOutputStream.java
 gnu/inet/util/SaslPlain.java
-gnu/inet/util/StderrLogger.java
+gnu/inet/util/TraceLevel.java
 gnu/java/awt/AWTUtilities.java
 gnu/java/awt/BitMaskExtent.java
 gnu/java/awt/BitwiseXORComposite.java
Index: kaffe/libraries/javalib/gnu/inet/comsat/ComsatClient.java
diff -u kaffe/libraries/javalib/gnu/inet/comsat/ComsatClient.java:1.3 kaffe/libraries/javalib/gnu/inet/comsat/ComsatClient.java:1.4
--- kaffe/libraries/javalib/gnu/inet/comsat/ComsatClient.java:1.3	Mon Jul  4 00:05:13 2005
+++ kaffe/libraries/javalib/gnu/inet/comsat/ComsatClient.java	Wed Jul  6 23:20:00 2005
@@ -1,5 +1,5 @@
 /*
- * $Id: ComsatClient.java,v 1.3 2005/07/04 00:05:13 robilad Exp $
+ * ComsatClient.java
  * Copyright (C) 2004 The Free Software Foundation
  * 
  * This file is part of GNU inetlib, a library.
@@ -16,7 +16,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  * 
  * Linking this library statically or dynamically with other modules is
  * making a combined work based on this library.  Thus, the terms and
@@ -58,13 +58,13 @@
 
   protected DatagramSocket socket;
 
-  public ComsatClient ()
+  public ComsatClient()
     throws IOException
   {
-    this (DEFAULT_PORT, 0);
+    this(DEFAULT_PORT, 0);
   }
   
-  public ComsatClient (int port, int timeout)
+  public ComsatClient(int port, int timeout)
     throws IOException
   {
     if (port < 0)
@@ -72,43 +72,43 @@
         port = DEFAULT_PORT;
       }
     
-    socket = new DatagramSocket (port);
+    socket = new DatagramSocket(port);
     if (timeout > 0)
       {
-        socket.setSoTimeout (timeout);
+        socket.setSoTimeout(timeout);
       }
-    socket.setReceiveBufferSize (1024);
+    socket.setReceiveBufferSize(1024);
   }
 
-  public void close ()
+  public void close()
     throws IOException
   {
-    socket.close ();
+    socket.close();
   }
 
-  public ComsatInfo read ()
+  public ComsatInfo read()
     throws IOException
   {
-    byte[] buf = new byte[socket.getReceiveBufferSize ()];
+    byte[] buf = new byte[socket.getReceiveBufferSize()];
     int len = buf.length;
-    DatagramPacket packet = new DatagramPacket (buf, len);
-    socket.receive (packet);
-    buf = packet.getData ();
-    len = packet.getLength ();
-    String data = new String (buf, 0, len, "ISO-8859-1");
-
-    ComsatInfo info = new ComsatInfo ();
-    StringTokenizer st = new StringTokenizer (data, "\n");
-    String mailbox = st.nextToken ();
-    info.setMailbox (mailbox);
+    DatagramPacket packet = new DatagramPacket(buf, len);
+    socket.receive(packet);
+    buf = packet.getData();
+    len = packet.getLength();
+    String data = new String(buf, 0, len, "ISO-8859-1");
+
+    ComsatInfo info = new ComsatInfo();
+    StringTokenizer st = new StringTokenizer(data, "\n");
+    String mailbox = st.nextToken();
+    info.setMailbox(mailbox);
     boolean inBody = false;
     String lastHeader = null;
-    while (st.hasMoreTokens ())
+    while (st.hasMoreTokens())
       {
-        String line = st.nextToken ();
+        String line = st.nextToken();
         if (inBody)
           {
-            String body = info.getBody ();
+            String body = info.getBody();
             if (body == null)
               {
                 body = line;
@@ -117,28 +117,28 @@
               {
                 body += "\n" + line;
               }
-            info.setBody (body);
+            info.setBody(body);
           }
         else
           {
-            if (line.length () == 0)
+            if (line.length() == 0)
               {
                 inBody = true;
               }
             else
               {
-                int ci = line.indexOf (':');
+                int ci = line.indexOf(':');
                 if (ci != -1)
                   {
-                    lastHeader = line.substring (0, ci);
-                    info.setHeader (lastHeader,
-                                    line.substring (ci + 1).trim ());
+                    lastHeader = line.substring(0, ci);
+                    info.setHeader(lastHeader,
+                                   line.substring(ci + 1).trim());
                   }
                 else
                   {
-                    String val = info.getHeader (lastHeader);
+                    String val = info.getHeader(lastHeader);
                     val += "\n" + line;
-                    info.setHeader (lastHeader, val);
+                    info.setHeader(lastHeader, val);
                   }
               }
           }
@@ -147,3 +147,4 @@
   }
 
 }
+
Index: kaffe/libraries/javalib/gnu/inet/comsat/ComsatInfo.java
diff -u kaffe/libraries/javalib/gnu/inet/comsat/ComsatInfo.java:1.3 kaffe/libraries/javalib/gnu/inet/comsat/ComsatInfo.java:1.4
--- kaffe/libraries/javalib/gnu/inet/comsat/ComsatInfo.java:1.3	Mon Jul  4 00:05:14 2005
+++ kaffe/libraries/javalib/gnu/inet/comsat/ComsatInfo.java	Wed Jul  6 23:20:00 2005
@@ -1,5 +1,5 @@
 /*
- * $Id: ComsatInfo.java,v 1.3 2005/07/04 00:05:14 robilad Exp $
+ * ComsatInfo.java
  * Copyright (C) 2004 The Free Software Foundation
  * 
  * This file is part of GNU inetlib, a library.
@@ -16,7 +16,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  * 
  * Linking this library statically or dynamically with other modules is
  * making a combined work based on this library.  Thus, the terms and
@@ -39,8 +39,8 @@
 package gnu.inet.comsat;
 
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.TreeMap;
 
 /**
  * A comsat notification message.
@@ -58,46 +58,47 @@
   /**
    * The message headers.
    */
-  protected Map headers;
+  protected Map headers = new LinkedHashMap();
 
   /**
    * The first few lines of the message body.
    */
   protected String body;
 
-  public String getMailbox ()
+  public String getMailbox()
   {
     return mailbox;
   }
 
-  protected void setMailbox (String mailbox)
+  protected void setMailbox(String mailbox)
   {
     this.mailbox = mailbox;
   }
 
-  public String getHeader (String key)
+  public String getHeader(String key)
   {
-    return (String) headers.get (key);
+    return (String) headers.get(key);
   }
 
-  public Iterator getHeaderNames ()
+  public Iterator getHeaderNames()
   {
-    return headers.keySet ().iterator ();
+    return headers.keySet().iterator();
   }
 
-  protected void setHeader (String key, String value)
+  protected void setHeader(String key, String value)
   {
-    headers.put (key, value);
+    headers.put(key, value);
   }
 
-  public String getBody ()
+  public String getBody()
   {
     return body;
   }
 
-  protected void setBody (String body)
+  protected void setBody(String body)
   {
     this.body = body;
   }
   
 }
+
Index: kaffe/libraries/javalib/gnu/inet/finger/FingerConnection.java
diff -u kaffe/libraries/javalib/gnu/inet/finger/FingerConnection.java:1.5 kaffe/libraries/javalib/gnu/inet/finger/FingerConnection.java:1.6
--- kaffe/libraries/javalib/gnu/inet/finger/FingerConnection.java:1.5	Mon Jul  4 00:05:14 2005
+++ kaffe/libraries/javalib/gnu/inet/finger/FingerConnection.java	Wed Jul  6 23:20:01 2005
@@ -1,5 +1,5 @@
 /*
- * $Id: FingerConnection.java,v 1.5 2005/07/04 00:05:14 robilad Exp $
+ * FingerConnection.java
  * Copyright (C) 2003 The Free Software Foundation
  * 
  * This file is part of GNU inetlib, a library.
@@ -16,7 +16,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * Linking this library statically or dynamically with other modules is
  * making a combined work based on this library.  Thus, the terms and
@@ -35,6 +35,7 @@
  * obliged to do so.  If you do not wish to do so, delete this
  * exception statement from your version.
  */
+
 package gnu.inet.finger;
 
 import java.io.BufferedOutputStream;
@@ -76,61 +77,61 @@
    * Creates a new finger connection.
    * @param host the name of the internet host to connect to
    */
-  public FingerConnection (String host)
+  public FingerConnection(String host)
     throws IOException
-    {
-      this (host, DEFAULT_PORT);
-    }
+  {
+    this(host, DEFAULT_PORT);
+  }
 
   /**
    * Creates a new finger connection.
    * @param host the name of the internet host to connect to
    * @param port the port to connect to
    */
-  public FingerConnection (String host, int port)
+  public FingerConnection(String host, int port)
     throws IOException
-    {
-      socket = new Socket (host, port);
-    }
+  {
+    socket = new Socket(host, port);
+  }
 
   /**
    * Retrieves the verbose flag.
    * If true, the server should provide more output.
    */
-  public boolean isVerbose ()
-    {
-      return verbose;
-    }
+  public boolean isVerbose()
+  {
+    return verbose;
+  }
 
   /**
    * Sets the verbose flag.
    * If true, the server should provide more output.
    * @param verbose true for more verbose, false otherwise
    */
-  public void setVerbose (boolean verbose)
-    {
-      this.verbose = verbose;
-    }
+  public void setVerbose(boolean verbose)
+  {
+    this.verbose = verbose;
+  }
 
   /**
    * Lists the available users.
    */
-  public String list ()
+  public String list()
     throws IOException
-    {
-      return finger (null, null);
-    }
+  {
+    return finger(null, null);
+  }
 
   /**
    * Fingers the specified user.
    * @param username the user to finger
    * @return information about all matching users
    */
-  public String finger (String username)
+  public String finger(String username)
     throws IOException
-    {
-      return finger (username, null);
-    }
+  {
+    return finger(username, null);
+  }
 
   /**
    * Fingers the specified user at the specified host.
@@ -138,43 +139,44 @@
    * @param hostname the domain of the user (null for any domain)
    * @return information about all matching users
    */
-  public String finger (String username, String hostname)
+  public String finger(String username, String hostname)
     throws IOException
-    {
-      // Send the command
-      OutputStream out = socket.getOutputStream ();
-      out = new BufferedOutputStream (out);
-      if (verbose)
-        {
-          out.write ('/');
-          out.write ('W');
-          if (username != null || hostname != null)
-            {
-              out.write (' ');
-            }
-        }
-      if (username != null)
-        {
-          out.write (username.getBytes (US_ASCII));
-        }
-      if (hostname != null)
-        {
-          out.write ('@');
-          out.write (hostname.getBytes (US_ASCII));
-        }
-      out.write ('\r');
-      out.write ('\n');
-      out.flush ();
+  {
+    // Send the command
+    OutputStream out = socket.getOutputStream();
+    out = new BufferedOutputStream(out);
+    if (verbose)
+      {
+        out.write('/');
+        out.write('W');
+        if (username != null || hostname != null)
+          {
+            out.write(' ');
+          }
+      }
+    if (username != null)
+      {
+        out.write(username.getBytes(US_ASCII));
+      }
+    if (hostname != null)
+      {
+        out.write('@');
+        out.write(hostname.getBytes(US_ASCII));
+      }
+    out.write('\r');
+    out.write('\n');
+    out.flush();
       
-      // Read the response
-      InputStream in = socket.getInputStream ();
-      ByteArrayOutputStream acc = new ByteArrayOutputStream ();
-      byte[] buf = new byte[4096];
-      for (int len = in.read (buf); len != -1; len = in.read (buf))
-        {
-          acc.write (buf, 0, len);
-        }
-      return acc.toString (US_ASCII);
-    }
+    // Read the response
+    InputStream in = socket.getInputStream();
+    ByteArrayOutputStream acc = new ByteArrayOutputStream();
+    byte[] buf = new byte[4096];
+    for (int len = in.read(buf); len != -1; len = in.read(buf))
+      {
+        acc.write(buf, 0, len);
+      }
+    return acc.toString(US_ASCII);
+  }
 
 }
+
Index: kaffe/libraries/javalib/gnu/inet/finger/FingerURLConnection.java
diff -u kaffe/libraries/javalib/gnu/inet/finger/FingerURLConnection.java:1.5 kaffe/libraries/javalib/gnu/inet/finger/FingerURLConnection.java:1.6
--- kaffe/libraries/javalib/gnu/inet/finger/FingerURLConnection.java:1.5	Mon Jul  4 00:05:14 2005
+++ kaffe/libraries/javalib/gnu/inet/finger/FingerURLConnection.java	Wed Jul  6 23:20:01 2005
@@ -1,5 +1,5 @@
 /*
- * $Id: FingerURLConnection.java,v 1.5 2005/07/04 00:05:14 robilad Exp $
+ * FingerURLConnection.java
  * Copyright (C) 2003 The Free Software Foundation
  * 
  * This file is part of GNU inetlib, a library.
@@ -16,7 +16,7 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

*** Patch too long, truncated ***



More information about the kaffe mailing list