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&gt;. 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&gt; + + * 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&gt; * 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