commit/latin-unity: 2 new changesets
9 years, 6 months
Bitbucket
2 new commits in latin-unity:
https://bitbucket.org/xemacs/latin-unity/commits/9f42027b14e0/
Changeset: 9f42027b14e0
User: Norbert Koch
Date: 2014-10-16 11:52:11+00:00
Summary: XEmacs Package Release 1.23
Affected #: 2 files
diff -r c3d348f230f98ee8f174c14b651a24d75323355f -r 9f42027b14e09d49beea7bfb1b0e812b05a3b607 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,7 ＠＠
+2014-10-16 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.23 released.
+
2014-09-29 Jerry James <james(a)xemacs.org>
* Makefile: Drop XEmacs 21.1 support.
diff -r c3d348f230f98ee8f174c14b651a24d75323355f -r 9f42027b14e09d49beea7bfb1b0e812b05a3b607 Makefile
--- a/Makefile
+++ b/Makefile
＠＠ -22,7 +22,7 ＠＠
# Last-modified: 2005 February 7
# The XEmacs CVS version is canonical. Keep versions n'sync.
-VERSION = 1.22
+VERSION = 1.23
AUTHOR_VERSION = $(VERSION)
MAINTAINER = Stephen J. Turnbull <stephen(a)xemacs.org>
PACKAGE = latin-unity
https://bitbucket.org/xemacs/latin-unity/commits/3e3a50524f1c/
Changeset: 3e3a50524f1c
User: Norbert Koch
Date: 2014-10-16 11:52:11+00:00
Summary: Added tag latin-unity-1_23 for changeset 9f42027b14e0
Affected #: 1 file
diff -r 9f42027b14e09d49beea7bfb1b0e812b05a3b607 -r 3e3a50524f1cde035fc7da21055dab387793e6e2 .hgtags
--- a/.hgtags
+++ b/.hgtags
＠＠ -52,3 +52,4 ＠＠
a318b386506556f8847fd3e69d3c49127f7ee6ef sumo-2006-05-10
25858b98738920ab54dc7b0b25e0377a8bd36a44 latin-unity-1_21
7ed60bc30666be4ae0a6d9c25f4eae906082b450 latin-unity-1_22
+9f42027b14e09d49beea7bfb1b0e812b05a3b607 latin-unity-1_23
Repository URL: https://bitbucket.org/xemacs/latin-unity/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/leim: 2 new changesets
9 years, 6 months
Bitbucket
2 new commits in leim:
https://bitbucket.org/xemacs/leim/commits/8ff49d750443/
Changeset: 8ff49d750443
User: Norbert Koch
Date: 2014-10-16 11:52:49+00:00
Summary: XEmacs Package Release 1.38
Affected #: 2 files
diff -r c42c0c9d42345554333cbf7e45f9dffc1a3f718c -r 8ff49d7504438d03802b53d95ca3d7a5ea6d7d69 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,7 ＠＠
+2014-10-16 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.38 released.
+
2014-09-29 Jerry James <james(a)xemacs.org>
* Makefile: move elisp files in EXTRA_SOURCES to ELCS_1 instead if
diff -r c42c0c9d42345554333cbf7e45f9dffc1a3f718c -r 8ff49d7504438d03802b53d95ca3d7a5ea6d7d69 Makefile
--- a/Makefile
+++ b/Makefile
＠＠ -17,7 +17,7 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.37
+VERSION = 1.38
AUTHOR_VERSION =
MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
PACKAGE = leim
https://bitbucket.org/xemacs/leim/commits/5edb048d450b/
Changeset: 5edb048d450b
User: Norbert Koch
Date: 2014-10-16 11:52:50+00:00
Summary: Added tag leim-1_38 for changeset 8ff49d750443
Affected #: 1 file
diff -r 8ff49d7504438d03802b53d95ca3d7a5ea6d7d69 -r 5edb048d450b31b1b8d4352e554204b14299e63c .hgtags
--- a/.hgtags
+++ b/.hgtags
＠＠ -76,3 +76,4 ＠＠
4b9b2529afcdce9eefb679d0a0660a9230770e16 leim-1_35
d0ba5694dfccc5bce279bcdce2ddec057578a353 leim-1_36
8f196369715b7b0205e758de82b758bdb5a7f380 leim-1_37
+8ff49d7504438d03802b53d95ca3d7a5ea6d7d69 leim-1_38
Repository URL: https://bitbucket.org/xemacs/leim/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[PATCH 21.5] Fix build on OS X Yosemite
9 years, 6 months
Marcus Crestani
PATCH 21.5
To build XEmacs on OS X 10.10 Yosemite, we need to disable address space
layout randomization.
I'll commit in two days if nobody objects.
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,8 ＠＠
+2014-10-10 Marcus Crestani <crestani(a)xemacs.org>
+
+ * configure.ac: Disable ASLR on Yosemite.
+ * configure: Rebuild.
+
2014-10-09 Jerry James <james(a)xemacs.org>
* configure.ac: Check for TLS headers as well as libraries.
diff --git a/configure b/configure
--- a/configure
+++ b/configure
＠＠ -12226,7 +12226,7 ＠＠
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ASLR needs to be disabled" >&5
$as_echo_n "checking whether ASLR needs to be disabled... " >&6; }
case `uname -s`:`uname -r` in
- Darwin:1[123].*)
+ Darwin:1[1234].*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
LDFLAGS="$LDFLAGS -Wl,-no_pie" && if test "$verbose" = "yes"; then echo " Appending \"-Wl,-no_pie\" to \$LDFLAGS"; fi
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
＠＠ -2820,8 +2820,8 ＠＠
dnl Disable ASLR on systems where it breaks pdump.
AC_MSG_CHECKING([whether ASLR needs to be disabled])
case `uname -s`:`uname -r` in
- dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks
- Darwin:1[[123]].*)
+ dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks, 10.10 Yosemite
+ Darwin:1[[1234]].*)
AC_MSG_RESULT(yes)
XE_APPEND([-Wl,-no_pie], LDFLAGS)
;;
--
Marcus
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/XEmacs: Marcus Crestani: Disable ASLR on Yosemite.
9 years, 6 months
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/a58070ee1f31/
Changeset: a58070ee1f31
User: Marcus Crestani
Date: 2014-10-12 05:17:55+00:00
Summary: Disable ASLR on Yosemite.
Affected #: 3 files
diff -r 5de7b6d1e752040c4177357af6c017945f784b04 -r a58070ee1f31f90bdeb9dea88a9f488630be9744 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,8 ＠＠
+2014-10-10 Marcus Crestani <crestani(a)xemacs.org>
+
+ * configure.ac: Disable ASLR on Yosemite.
+ * configure: Rebuild.
+
2014-10-09 Jerry James <james(a)xemacs.org>
* configure.ac: Check for TLS headers as well as libraries.
diff -r 5de7b6d1e752040c4177357af6c017945f784b04 -r a58070ee1f31f90bdeb9dea88a9f488630be9744 configure
--- a/configure
+++ b/configure
＠＠ -12226,7 +12226,7 ＠＠
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ASLR needs to be disabled" >&5
$as_echo_n "checking whether ASLR needs to be disabled... " >&6; }
case `uname -s`:`uname -r` in
- Darwin:1[123].*)
+ Darwin:1[1234].*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
LDFLAGS="$LDFLAGS -Wl,-no_pie" && if test "$verbose" = "yes"; then echo " Appending \"-Wl,-no_pie\" to \$LDFLAGS"; fi
diff -r 5de7b6d1e752040c4177357af6c017945f784b04 -r a58070ee1f31f90bdeb9dea88a9f488630be9744 configure.ac
--- a/configure.ac
+++ b/configure.ac
＠＠ -2820,8 +2820,8 ＠＠
dnl Disable ASLR on systems where it breaks pdump.
AC_MSG_CHECKING([whether ASLR needs to be disabled])
case `uname -s`:`uname -r` in
- dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks
- Darwin:1[[123]].*)
+ dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks, 10.10 Yosemite
+ Darwin:1[[1234]].*)
AC_MSG_RESULT(yes)
XE_APPEND([-Wl,-no_pie], LDFLAGS)
;;
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[PATCH 21.5] TLS support
9 years, 6 months
Jerry James
PATCH 21.5
This is the latest iteration of the TLS patch I've been working on
(and off) for some time now. I believe this iteration is ready for
serious consideration for inclusion in XEmacs. It gives us an
Emacs-compatible open-network-stream on systems where one of NSS,
gnutls, or openssl is available. This version incoporates changes
requested by Aidan during the last go-around: it uses Boolint in the C
code instead of hanging onto references to Lisp objects, and TLS
connections now self-identify as such.
We still need an Emacs-compatible gnutls.el. That's going to be hard,
since Emacs's Lisp code is very gnutls-specific; i.e., if you build
with NSS or openssl, the matchup between gnutls.el and the underlying
code isn't great. I'm considering a couple of approaches, but don't
want to hold up this part of the work.
Also, Windows ships with DLLs that contain TLS code, so in principle
it should be possible to extend this work to the WIndows part of the
code. In practice, I'm having some really fundamental trouble with
that which I will discuss on xemacs-beta.
The patch is attached in an attempt to avoid whitespace mangling
courtesy of gmail.
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
Re: [AC 21.5] TLS support
9 years, 6 months
Jerry James
On Thu, Oct 9, 2014 at 3:04 PM, Jerry James <james(a)xemacs.org> wrote:
> Do you have a pre-1.0 version of libssl? I'll have to insert some
> version checks on those functions and use (poorer) substitutes if they
> are not available. Thanks for the report.
No, that's not the problem. There's no -lssl on the link line. Can
you try again with the patch I just pushed? If the same thing
happens, could you send me your config.log? Thanks Vin.
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/XEmacs: Jerry James: Check for TLS headers as well as libraries. See xemacs-patches message
9 years, 6 months
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/5de7b6d1e752/
Changeset: 5de7b6d1e752
User: Jerry James
Date: 2014-10-09 21:45:16+00:00
Summary: Check for TLS headers as well as libraries. See xemacs-patches message
<CAHCOHQ=6SZuGB1zmOwQMgVqVtOXdaLy_=4yfOqULDkRjHEiNcA(a)mail.gmail.com>.
Affected #: 3 files
diff -r d59bfb050ca81e88144e93a0176a5ba3f89de241 -r 5de7b6d1e752040c4177357af6c017945f784b04 ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
＠＠ -1,3 +1,7 ＠＠
+2014-10-09 Jerry James <james(a)xemacs.org>
+
+ * configure.ac: Check for TLS headers as well as libraries.
+
2014-10-07 Jerry James <james(a)xemacs.org>
* configure.ac: Add TLS support.
diff -r d59bfb050ca81e88144e93a0176a5ba3f89de241 -r 5de7b6d1e752040c4177357af6c017945f784b04 configure
--- a/configure
+++ b/configure
＠＠ -21021,7 +21021,9 ＠＠
fi
-if test "$with_tls" = "yes"; then
+if test "$with_tls" = "gnutls"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
+if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5
$as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
if ${ac_cv_lib_gnutls_gnutls_global_init+:} false; then :
＠＠ -21061,6 +21063,17 ＠＠
if test "x$ac_cv_lib_gnutls_gnutls_global_init" = xyes; then :
with_tls=gnutls
else
+ { echo "Error:" "Required gnutls support cannot be provided." >&2; exit 1; }
+fi
+
+else
+ { echo "Error:" "Required gnutls support cannot be provided." >&2; exit 1; }
+fi
+
+
+elif test "$with_tls" = "nss"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "nss.h" "ac_cv_header_nss_h" "$ac_includes_default"
+if test "x$ac_cv_header_nss_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS_InitContext in -lnss3" >&5
$as_echo_n "checking for NSS_InitContext in -lnss3... " >&6; }
if ${ac_cv_lib_nss3_NSS_InitContext+:} false; then :
＠＠ -21100,6 +21113,17 ＠＠
if test "x$ac_cv_lib_nss3_NSS_InitContext" = xyes; then :
with_tls=nss
else
+ { echo "Error:" "Required NSS support cannot be provided." >&2; exit 1; }
+fi
+
+else
+ { echo "Error:" "Required NSS support cannot be provided." >&2; exit 1; }
+fi
+
+
+elif test "$with_tls" = "openssl"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
＠＠ -21139,14 +21163,18 ＠＠
if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
with_tls=openssl
else
- with_tls=no
-fi
-
-fi
-
-fi
-
-elif test "$with_tls" = "gnutls"; then
+ { echo "Error:" "Required openssl support cannot be provided." >&2; exit 1; }
+fi
+
+else
+ { echo "Error:" "Required openssl support cannot be provided." >&2; exit 1; }
+fi
+
+
+fi
+if test "$with_tls" = "yes"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
+if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_global_init in -lgnutls" >&5
$as_echo_n "checking for gnutls_global_init in -lgnutls... " >&6; }
if ${ac_cv_lib_gnutls_gnutls_global_init+:} false; then :
＠＠ -21185,11 +21213,15 ＠＠
$as_echo "$ac_cv_lib_gnutls_gnutls_global_init" >&6; }
if test "x$ac_cv_lib_gnutls_gnutls_global_init" = xyes; then :
with_tls=gnutls
-else
- { echo "Error:" "Required gnutls support cannot be provided." >&2; exit 1; }
-fi
-
-elif test "$with_tls" = "nss"; then
+fi
+
+fi
+
+
+fi
+if test "$with_tls" = "yes"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "nss.h" "ac_cv_header_nss_h" "$ac_includes_default"
+if test "x$ac_cv_header_nss_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSS_InitContext in -lnss3" >&5
$as_echo_n "checking for NSS_InitContext in -lnss3... " >&6; }
if ${ac_cv_lib_nss3_NSS_InitContext+:} false; then :
＠＠ -21228,11 +21260,15 ＠＠
$as_echo "$ac_cv_lib_nss3_NSS_InitContext" >&6; }
if test "x$ac_cv_lib_nss3_NSS_InitContext" = xyes; then :
with_tls=nss
-else
- { echo "Error:" "Required NSS support cannot be provided." >&2; exit 1; }
-fi
-
-elif test "$with_tls" = "openssl"; then
+fi
+
+fi
+
+
+fi
+if test "$with_tls" = "yes"; then
+ ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_library_init in -lssl" >&5
$as_echo_n "checking for SSL_library_init in -lssl... " >&6; }
if ${ac_cv_lib_ssl_SSL_library_init+:} false; then :
＠＠ -21272,8 +21308,11 ＠＠
if test "x$ac_cv_lib_ssl_SSL_library_init" = xyes; then :
with_tls=openssl
else
- { echo "Error:" "Required openssl support cannot be provided." >&2; exit 1; }
-fi
+ with_tls=no
+fi
+
+fi
+
fi
if test "$with_tls" != "no"; then
diff -r d59bfb050ca81e88144e93a0176a5ba3f89de241 -r 5de7b6d1e752040c4177357af6c017945f784b04 configure.ac
--- a/configure.ac
+++ b/configure.ac
＠＠ -5332,20 +5332,35 ＠＠
fi
dnl TLS support
-if test "$with_tls" = "yes"; then
- AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls],
- AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss],
- AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl], [with_tls=no])))
-elif test "$with_tls" = "gnutls"; then
- AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls],
+if test "$with_tls" = "gnutls"; then
+ AC_CHECK_HEADER([gnutls/gnutls.h],
+ [AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls],
+ [XE_DIE("Required gnutls support cannot be provided.")])],
[XE_DIE("Required gnutls support cannot be provided.")])
elif test "$with_tls" = "nss"; then
- AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss],
+ AC_CHECK_HEADER([nss.h],
+ [AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss],
+ [XE_DIE("Required NSS support cannot be provided.")])],
[XE_DIE("Required NSS support cannot be provided.")])
elif test "$with_tls" = "openssl"; then
- AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl],
+ AC_CHECK_HEADER([openssl/ssl.h],
+ [AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl],
+ [XE_DIE("Required openssl support cannot be provided.")])],
[XE_DIE("Required openssl support cannot be provided.")])
fi
+dnl Autodetection
+if test "$with_tls" = "yes"; then
+ AC_CHECK_HEADER([gnutls/gnutls.h],
+ [AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls])])
+fi
+if test "$with_tls" = "yes"; then
+ AC_CHECK_HEADER([nss.h],
+ [AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss])])
+fi
+if test "$with_tls" = "yes"; then
+ AC_CHECK_HEADER([openssl/ssl.h],
+ [AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl], [with_tls=no])])
+fi
if test "$with_tls" != "no"; then
AC_DEFINE(WITH_TLS)
if test "$with_tls" = "gnutls"; then
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[AC 21.5] Check TLS headers as well as libraries
9 years, 6 months
Jerry James
AC 21.5
This patch adds checks for headers to the existing TLS library checks.
This should fix the first failure Vin reported recently. The second
failure (missing openssl symbols at link time) needs a more extensive
fix.
diff -r d59bfb050ca8 ChangeLog
--- a/ChangeLog Wed Oct 08 12:58:20 2014 -0600
+++ b/ChangeLog Thu Oct 09 15:43:06 2014 -0600
＠＠ -1,3 +1,7 ＠＠
+2014-10-09 Jerry James <james(a)xemacs.org>
+
+ * configure.ac: Check for TLS headers as well as libraries.
+
2014-10-07 Jerry James <james(a)xemacs.org>
* configure.ac: Add TLS support.
diff -r d59bfb050ca8 configure.ac
--- a/configure.ac Wed Oct 08 12:58:20 2014 -0600
+++ b/configure.ac Thu Oct 09 15:43:06 2014 -0600
＠＠ -5332,20 +5332,35 ＠＠
fi
dnl TLS support
-if test "$with_tls" = "yes"; then
- AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls],
- AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss],
- AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl], [with_tls=no])))
-elif test "$with_tls" = "gnutls"; then
- AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls],
+if test "$with_tls" = "gnutls"; then
+ AC_CHECK_HEADER([gnutls/gnutls.h],
+ [AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls],
+ [XE_DIE("Required gnutls support cannot be provided.")])],
[XE_DIE("Required gnutls support cannot be provided.")])
elif test "$with_tls" = "nss"; then
- AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss],
+ AC_CHECK_HEADER([nss.h],
+ [AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss],
+ [XE_DIE("Required NSS support cannot be provided.")])],
[XE_DIE("Required NSS support cannot be provided.")])
elif test "$with_tls" = "openssl"; then
- AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl],
+ AC_CHECK_HEADER([openssl/ssl.h],
+ [AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl],
+ [XE_DIE("Required openssl support cannot be provided.")])],
[XE_DIE("Required openssl support cannot be provided.")])
fi
+dnl Autodetection
+if test "$with_tls" = "yes"; then
+ AC_CHECK_HEADER([gnutls/gnutls.h],
+ [AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls])])
+fi
+if test "$with_tls" = "yes"; then
+ AC_CHECK_HEADER([nss.h],
+ [AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss])])
+fi
+if test "$with_tls" = "yes"; then
+ AC_CHECK_HEADER([openssl/ssl.h],
+ [AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl], [with_tls=no])])
+fi
if test "$with_tls" != "no"; then
AC_DEFINE(WITH_TLS)
if test "$with_tls" = "gnutls"; then
I will push this patch momentarily.
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[AC 21.5] TLS support
9 years, 6 months
Jerry James
APPROVE COMMIT 21.5
On Fri, Oct 3, 2014 at 12:41 PM, Jerry James <james(a)xemacs.org> wrote:
> PATCH 21.5
>
> This is the latest iteration of the TLS patch I've been working on
> (and off) for some time now. I believe this iteration is ready for
> serious consideration for inclusion in XEmacs. It gives us an
> Emacs-compatible open-network-stream on systems where one of NSS,
> gnutls, or openssl is available. This version incoporates changes
> requested by Aidan during the last go-around: it uses Boolint in the C
> code instead of hanging onto references to Lisp objects, and TLS
> connections now self-identify as such.
>
> We still need an Emacs-compatible gnutls.el. That's going to be hard,
> since Emacs's Lisp code is very gnutls-specific; i.e., if you build
> with NSS or openssl, the matchup between gnutls.el and the underlying
> code isn't great. I'm considering a couple of approaches, but don't
> want to hold up this part of the work.
>
> Also, Windows ships with DLLs that contain TLS code, so in principle
> it should be possible to extend this work to the WIndows part of the
> code. In practice, I'm having some really fundamental trouble with
> that which I will discuss on xemacs-beta.
I have committed this patch. Let the bug reports start rolling in.
--
Jerry James
http://www.jamezone.org/
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit/XEmacs: Jerry James: Fix TLS-related build failures. See xemacs-patches message with ID
9 years, 6 months
Bitbucket
1 new commit in XEmacs:
https://bitbucket.org/xemacs/xemacs/commits/d59bfb050ca8/
Changeset: d59bfb050ca8
User: Jerry James
Date: 2014-10-08 18:58:20+00:00
Summary: Fix TLS-related build failures. See xemacs-patches message with ID
<CAHCOHQ=YBtU8kx9UEGZa09-hz-40XJyHJ95t=tidSgbSVEU7nQ(a)mail.gmail.com>.
Affected #: 3 files
diff -r a216b3c2b09e93494d82507ff5dd36e4d2474d16 -r d59bfb050ca81e88144e93a0176a5ba3f89de241 src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
＠＠ -1,3 +1,11 ＠＠
+2014-10-08 Jerry James <james(a)xemacs.org>
+
+ * tls.c (init_tls): Remove blatant Fedoraism from the OpenSSL version.
+ * tls.h (tls_open):
+ (make_tls_input_stream):
+ (make_tls_output_stream):
+ (tls_get_fd): Fix build failures in the !WITH_TLS case.
+
2014-10-07 Jerry James <james(a)xemacs.org>
* Makefile.in.in: Add tls.o to the link.
diff -r a216b3c2b09e93494d82507ff5dd36e4d2474d16 -r d59bfb050ca81e88144e93a0176a5ba3f89de241 src/tls.c
--- a/src/tls.c
+++ b/src/tls.c
＠＠ -1116,7 +1116,7 ＠＠
SSL_MODE_AUTO_RETRY | SSL_MODE_RELEASE_BUFFERS);
/* Let the system select the ciphers */
- if (SSL_CTX_set_cipher_list (ssl_ctx, "PROFILE=SYSTEM") != 1)
+ if (SSL_CTX_set_cipher_list (ssl_ctx, "DEFAULT") != 1)
signal_error (Qtls_error, "SSL_CTX_set_cipher_list failed",
openssl_error_string ());
diff -r a216b3c2b09e93494d82507ff5dd36e4d2474d16 -r d59bfb050ca81e88144e93a0176a5ba3f89de241 src/tls.h
--- a/src/tls.h
+++ b/src/tls.h
＠＠ -80,14 +80,17 ＠＠
#else /* WITH_TLS */
typedef int tls_state_t;
#define TLS_SETUP_SOCK 1
-#define tls_open(x,y) \
- signal_error (Qtls_error, "TLS support unavailable", Qnil), NULL
+#define tls_open(x,y) ({ \
+ signal_error (Qtls_error, "TLS support unavailable", Qnil); \
+ NULL; })
#define tls_negotiate(x,y,z) NULL
-#define make_tls_input_stream(x) \
- signal_error (Qtls_error, "TLS support unavailable", Qnil), NULL
-#define make_tls_output_stream(x) \
- signal_error (Qtls_error, "TLS support unavailable", Qnil), NULL
-#define tls_get_fd(x, y) -1
+#define make_tls_input_stream(x) ({ \
+ signal_error (Qtls_error, "TLS support unavailable", Qnil); \
+ NULL; })
+#define make_tls_output_stream(x) ({ \
+ signal_error (Qtls_error, "TLS support unavailable", Qnil); \
+ NULL; })
+#define tls_get_fd(x) -1
#define tls_read(w,x,y,z) -1
#define tls_write(w,x,y,z) -1
#define tls_close(x) -1
Repository URL: https://bitbucket.org/xemacs/xemacs/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches