Author: rfm
Date: Tue Jun 28 12:40:33 2016
New Revision: 39937
URL: http://svn.gna.org/viewcvs/gnustep?rev=39937&view=rev
Log:
Remove the obsolete openssl bundle code.
Removed:
libs/base/trunk/SSL/
Modified:
libs/base/trunk/ChangeLog
libs/base/trunk/Documentation/ReleaseNotes.gsdoc
libs/base/trunk/Documentation/install.texi
libs/base/trunk/Documentation/news.texi
libs/base/trunk/Documentation/readme.texi
libs/base/trunk/GNUmakefile
libs/base/trunk/Source/NSFileHandle.m
libs/base/trunk/configure
libs/base/trunk/configure.ac
Modified: libs/base/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/ChangeLog?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/ChangeLog (original)
+++ libs/base/trunk/ChangeLog Tue Jun 28 12:40:33 2016
@@ -1,3 +1,16 @@
+2016-06-28 Richard Frith-Macdonald <r...@gnu.org>
+
+ * SSL: Openssl bundle directory deleted
+ * GNUmakefile: Don't build openssl bundle
+ * Source/NSFileHandle.m: Don't load openssl bundle
+ * configure.ac: remove option to build bundle
+ * configure: regenerate
+ * Documentation/ReleaseNotes.gsdoc:
+ * Documentation/install.texi:
+ * Documentation/news.texi:
+ * Documentation/readme.texi:
+ Updates to note that the obsolete openssl bundle has been removed.
+
2016-06-26 Richard Frith-Macdonald <r...@gnu.org>
* Headers/Foundation/NSTask.h:
Modified: libs/base/trunk/Documentation/ReleaseNotes.gsdoc
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Documentation/ReleaseNotes.gsdoc?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/Documentation/ReleaseNotes.gsdoc (original)
+++ libs/base/trunk/Documentation/ReleaseNotes.gsdoc Tue Jun 28 12:40:33 2016
@@ -36,7 +36,9 @@
NSGarbageCollector class remains as a stub).<br />
Changes multi-architecture support to match the scheme used by
Debian.<br />
+ OpenSSL bundle removed since it didn't match GNUTLS support.<br />
Improved support for 64bit little-endian systems.<br />
+ Ported to Debian/Hurd.<br />
As usual, this release also contains an update to include the
most recent international timezone data.
</p>
Modified: libs/base/trunk/Documentation/install.texi
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Documentation/install.texi?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/Documentation/install.texi (original)
+++ libs/base/trunk/Documentation/install.texi Tue Jun 28 12:40:33 2016
@@ -91,7 +91,6 @@
@menu
* Reading Command-Line Arguments::
* FFI Library::
-* OpenSSL::
@end menu
@node Reading Command-Line Arguments, FFI Library, Configuration, Configuration
@@ -131,7 +130,7 @@
arguments to NSProcessInfo (This would be done automatically if you use
the NSApplicationMain function in a gui application).
-@node FFI Library, OpenSSL, Reading Command-Line Arguments, Configuration
+@node FFI Library, , Reading Command-Line Arguments, Configuration
@subsection FFI Library
GNUstep's NSInvocations and Distributed Objects code involves detailed
@@ -140,17 +139,6 @@
libffi library. Use of libffi is automatically enabled if the libffi
library is found (and the same with ffcall, although libffi takes
precedence), unless specifically disabled with @code{--disable-do}.
-
-@node OpenSSL, , FFI Library, Configuration
-@subsection OpenSSL
-
-While GNUstep base has full support for HTTPS/TLS using gnustls, it also
-has optional support for using the OpenSSL libraries for secure URL
-connections (though only with the NSURL classes). This functionality is
-compiled as a separate bundle since the OpenSSL license is not
-compatible with GPL, and in the hopes that if someone writes an openssl
-replacement, it can quickly be used by creating another bundle. The
-openssl libraries need to be installed for this to work.
@node Compilation, , Configuration, Top
@section Compilation
Modified: libs/base/trunk/Documentation/news.texi
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Documentation/news.texi?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/Documentation/news.texi (original)
+++ libs/base/trunk/Documentation/news.texi Tue Jun 28 12:40:33 2016
@@ -15,6 +15,8 @@
@itemize @bullet
@item Garbage collection support removed (NSGarbageCollector stub remains)
@item Support for Debian style multi-architecture installations added
+@item OpenSSL bundle removed since it didn't match GNUTLS support
+@item Ported to Debian/Hurd
@item As usual, this release also contains an update to include the
most recent international timezone data.
@end itemize
Modified: libs/base/trunk/Documentation/readme.texi
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Documentation/readme.texi?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/Documentation/readme.texi (original)
+++ libs/base/trunk/Documentation/readme.texi Tue Jun 28 12:40:33 2016
@@ -29,7 +29,7 @@
you must make the improvements you have made
to the libraries freely available. You should read the COPYING.LIB file
for more information. All files in the @file{Source}, @file{Headers}
-@file{NSCharacterSets}, @file{NSTimeZones}, @file{Resources}, and @file{SSL}
+@file{NSCharacterSets}, @file{NSTimeZones}, and @file{Resources}
directories and subdirectories under this are covered under the LGPL.
GNUstep tools, test programs, and other files are covered under the
Modified: libs/base/trunk/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/GNUmakefile?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/GNUmakefile (original)
+++ libs/base/trunk/GNUmakefile Tue Jun 28 12:40:33 2016
@@ -71,13 +71,6 @@
#
ifeq ($(_have_makefiles),yes)
SUBPROJECTS = Source
-ifeq ($(GNUSTEP_BASE_HAVE_GNUTLS), 0)
-ifneq ($(GNUSTEP_TARGET_OS), mingw32)
- ifneq ($(GNUSTEP_TARGET_OS), mingw64)
- SUBPROJECTS += SSL
- endif
-endif
-endif
SUBPROJECTS += Tools NSTimeZones Resources Tests
endif
Modified: libs/base/trunk/Source/NSFileHandle.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/Source/NSFileHandle.m?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/Source/NSFileHandle.m (original)
+++ libs/base/trunk/Source/NSFileHandle.m Tue Jun 28 12:40:33 2016
@@ -57,6 +57,20 @@
static Class NSFileHandle_concrete_class = nil;
static Class NSFileHandle_ssl_class = nil;
+#if defined(HAVE_GNUTLS) && !defined(_WIN32)
+@interface GSTLSHandle : GSFileHandle
+{
+@public
+ NSDictionary *opts;
+ GSTLSSession *session;
+}
+- (void) sslDisconnect;
+- (BOOL) sslHandshakeEstablished: (BOOL*)result outgoing: (BOOL)isOutgoing;
+- (NSString*) sslSetOptions: (NSDictionary*)options;
+@end
+#endif
+
+
/**
* <p>
* <code>NSFileHandle</code> is a class that provides a wrapper for accessing
@@ -78,6 +92,9 @@
{
NSFileHandle_abstract_class = self;
NSFileHandle_concrete_class = [GSFileHandle class];
+#if defined(HAVE_GNUTLS) && !defined(_WIN32)
+ NSFileHandle_ssl_class = [GSTLSHandle class];
+#endif
}
}
@@ -726,26 +743,6 @@
*/
+ (Class) sslClass
{
- if (0 == NSFileHandle_ssl_class)
- {
- NSFileHandle_ssl_class = NSClassFromString(@"GSTLSHandle");
-
- if (0 == NSFileHandle_ssl_class)
- {
- NSString *path;
- NSBundle *bundle;
-
- path = [[NSBundle bundleForClass: [NSObject class]] bundlePath];
- path = [path stringByAppendingPathComponent: @"SSL.bundle"];
-
- bundle = [NSBundle bundleWithPath: path];
- NSFileHandle_ssl_class = [bundle principalClass];
- if (NSFileHandle_ssl_class == 0 && bundle != nil)
- {
- NSLog(@"Failed to load principal class from bundle (%@)", path);
- }
- }
- }
return NSFileHandle_ssl_class;
}
@@ -885,21 +882,7 @@
@end
-#if defined(HAVE_GNUTLS)
-
-#if !defined(_WIN32)
-
-@interface GSTLSHandle : GSFileHandle
-{
-@public
- NSDictionary *opts;
- GSTLSSession *session;
-}
-- (void) sslDisconnect;
-- (BOOL) sslHandshakeEstablished: (BOOL*)result outgoing: (BOOL)isOutgoing;
-- (NSString*) sslSetOptions: (NSDictionary*)options;
-@end
-
+#if defined(HAVE_GNUTLS) && !defined(_WIN32)
/* Callback to allow the TLS code to pull data from the remote system.
* If the operation fails, this sets the error number.
@@ -1082,7 +1065,6 @@
}
@end
-#endif /* _WIN32 */
-
-#endif /* HAVE_GNUTLS */
-
+
+#endif /* defined(HAVE_GNUTLS) && !defined(_WIN32) */
+
Modified: libs/base/trunk/configure
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/configure?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/configure (original)
+++ libs/base/trunk/configure Tue Jun 28 12:40:33 2016
@@ -619,7 +619,6 @@
# include <unistd.h>
#endif"
-enable_option_checking=no
ac_subst_vars='LTLIBOBJS
LIBOBJS
GCC_VERSION
@@ -627,7 +626,6 @@
MINOR_VERSION
MAJOR_VERSION
VERSION
-subdirs
GNUSTEP_INSTALL_GDOMAP_AS_SETUID
GNUSTEP_GDOMAP_PORT_OVERRIDE
WARN_FLAGS
@@ -826,9 +824,6 @@
with_sort_algorithm
with_gdomap_port
enable_setuid_gdomap
-enable_openssl
-with_openssl_include
-with_openssl_library
'
ac_precious_vars='build_alias
host_alias
@@ -839,7 +834,7 @@
LIBS
CPPFLAGS
CPP'
-ac_subdirs_all='SSL'
+
# Initialize some variables set by options.
ac_init_help=
@@ -1513,7 +1508,6 @@
option if you are happy having the program
started automatically on demand.
- --disable-openssl Disable support for openssl in URL classes
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1582,8 +1576,6 @@
Possible values are timsort, quicksort, and
shellsort.
Defaults to shellsort (others broken).
--with-gdomap-port=PORT alternative port for gdomap
- --with-openssl-include=PATH include path for openssl headers
- --with-openssl-library=PATH library path for openssl libraries
Some influential environment variables:
CC C compiler command
@@ -10404,10 +10396,8 @@
#--------------------------------------------------------------------
# Check for FFI interface libraries for invocations
-# We enable ffi by default now, as it's fixed for some previouly bad
-# platforms, and it has the advantage over ffcall that it does not
-# mess up the stack, so stacktraces and native exception handling
-# work better with it.
+# We enable ffi by default now, as it's the only well supported
+# library nowadays.
#--------------------------------------------------------------------
do_broken_libffi=no
do_broken_libffcall=no
@@ -12686,46 +12676,6 @@
fi
-
-# If there's no TLS support ... try to get some limited functionality
-# by using OpenSSL instead.
-
-if test "$HAVE_TLS" = "0"; then
-
-#--------------------------------------------------------------------
-# Configure flags from sub-configure runs, so they show up in our
-# help file.
-#--------------------------------------------------------------------
-# Check whether --enable-openssl was given.
-if test "${enable_openssl+set}" = set; then :
- enableval=$enable_openssl;
-else
- enable_openssl=yes
-fi
-
- HAVE_GNUTLS=0
-
-# Check whether --with-openssl-include was given.
-if test "${with_openssl_include+set}" = set; then :
- withval=$with_openssl_include; openssl_incdir="$withval"
-else
- openssl_incdir="no"
-fi
-
-
-# Check whether --with-openssl-library was given.
-if test "${with_openssl_library+set}" = set; then :
- withval=$with_openssl_library; openssl_libdir="$withval"
-else
- openssl_libdir="no"
-fi
-
-
-
-
-subdirs="$subdirs SSL"
-
-fi
#--------------------------------------------------------------------
# Record the version
@@ -14018,151 +13968,6 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || as_fn_exit 1
fi
-
-#
-# CONFIG_SUBDIRS section.
-#
-if test "$no_recursion" != yes; then
-
- # Remove --cache-file, --srcdir, and --disable-option-checking arguments
- # so they do not pile up.
- ac_sub_configure_args=
- ac_prev=
- eval "set x $ac_configure_args"
- shift
- for ac_arg
- do
- if test -n "$ac_prev"; then
- ac_prev=
- continue
- fi
- case $ac_arg in
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \
- | --c=*)
- ;;
- --config-cache | -C)
- ;;
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- ;;
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- ;;
- --disable-option-checking)
- ;;
- *)
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- as_fn_append ac_sub_configure_args " '$ac_arg'" ;;
- esac
- done
-
- # Always prepend --prefix to ensure using the same prefix
- # in subdir configurations.
- ac_arg="--prefix=$prefix"
- case $ac_arg in
- *\'*) ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
-
- # Pass --silent
- if test "$silent" = yes; then
- ac_sub_configure_args="--silent $ac_sub_configure_args"
- fi
-
- # Always prepend --disable-option-checking to silence warnings, since
- # different subdirs can have different --enable and --with options.
- ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args"
-
- ac_popdir=`pwd`
- for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
-
- # Do not complain, so a configure script can configure whichever
- # parts of a large source tree are present.
- test -d "$srcdir/$ac_dir" || continue
-
- ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
- $as_echo "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5
- $as_echo "$ac_msg" >&6
- as_dir="$ac_dir"; as_fn_mkdir_p
- ac_builddir=.
-
-case "$ac_dir" in
-.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-*)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
- # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed
's|/[^\\/]*|/..|g;s|/||'`
- case $ac_top_builddir_sub in
- "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
- *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
- esac ;;
-esac
-ac_abs_top_builddir=$ac_pwd
-ac_abs_builddir=$ac_pwd$ac_dir_suffix
-# for backward compatibility:
-ac_top_builddir=$ac_top_build_prefix
-
-case $srcdir in
- .) # We are building in place.
- ac_srcdir=.
- ac_top_srcdir=$ac_top_builddir_sub
- ac_abs_top_srcdir=$ac_pwd ;;
- [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir
- ac_abs_top_srcdir=$srcdir ;;
- *) # Relative name.
- ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_build_prefix$srcdir
- ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-esac
-ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-
- cd "$ac_dir"
-
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f "$ac_srcdir/configure.gnu"; then
- ac_sub_configure=$ac_srcdir/configure.gnu
- elif test -f "$ac_srcdir/configure"; then
- ac_sub_configure=$ac_srcdir/configure
- elif test -f "$ac_srcdir/configure.in"; then
- # This should be Cygnus configure.
- ac_sub_configure=$ac_aux_dir/configure
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: no configuration
information is in $ac_dir" >&5
-$as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2;}
- ac_sub_configure=
- fi
-
- # The recursion is here.
- if test -n "$ac_sub_configure"; then
- # Make the cache file name correct relative to the subdirectory.
- case $cache_file in
- [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
- *) # Relative name.
- ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
- esac
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL
$ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file
--srcdir=$ac_srcdir" >&5
-$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args
--cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;}
- # The eval makes quoting arguments work.
- eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \
- --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" ||
- as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5
- fi
-
- cd "$ac_popdir"
- done
-fi
if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no;
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options:
$ac_unrecognized_opts" >&5
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
Modified: libs/base/trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/gnustep/libs/base/trunk/configure.ac?rev=39937&r1=39936&r2=39937&view=diff
==============================================================================
--- libs/base/trunk/configure.ac (original)
+++ libs/base/trunk/configure.ac Tue Jun 28 12:40:33 2016
@@ -3523,29 +3523,6 @@
AC_SUBST(GNUSTEP_INSTALL_GDOMAP_AS_SETUID)
-# If there's no TLS support ... try to get some limited functionality
-# by using OpenSSL instead.
-
-if test "$HAVE_TLS" = "0"; then
-
-#--------------------------------------------------------------------
-# Configure flags from sub-configure runs, so they show up in our
-# help file.
-#--------------------------------------------------------------------
-AC_ARG_ENABLE(openssl,
- [ --disable-openssl Disable support for openssl in URL classes],,
- enable_openssl=yes)
- HAVE_GNUTLS=0
-AC_ARG_WITH(openssl-include,
- [ --with-openssl-include=PATH include path for openssl headers],
- openssl_incdir="$withval", openssl_incdir="no")
-AC_ARG_WITH(openssl-library,
- [ --with-openssl-library=PATH library path for openssl libraries],
- openssl_libdir="$withval", openssl_libdir="no")
-
-AC_CONFIG_SUBDIRS(SSL)
-fi
-
#--------------------------------------------------------------------
# Record the version
#--------------------------------------------------------------------
_______________________________________________
Gnustep-cvs mailing list
Gnustep-cvs@gna.org
https://mail.gna.org/listinfo/gnustep-cvs
