Author: rjung
Date: Sun May 24 16:43:57 2015
New Revision: 1681488
URL: http://svn.apache.org/r1681488
Log:
New API SSL.clearOptions() introduced by
r1437082 in 2013 needs OpenSSL 0.9.8m.
Modified:
tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
tomcat/native/branches/1.1.x/native/build/tcnative.m4
tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
Modified: tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in?rev=1681488&r1=1681487&r2=1681488&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in (original)
+++ tomcat/native/branches/1.1.x/native/build/rpm/tcnative.spec.in Sun May 24
16:43:57 2015
@@ -27,7 +27,7 @@ Group: System Environment/Libraries
URL: http://apr.apache.org/
Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release},
openssl >= 0.9.7
+BuildPrereq: autoconf, libtool, doxygen, apr-devel >= 0:{version}-{release},
openssl >= 0.9.8
%description
The mission of the Tomcat Native Library (TCN) is to provide a
@@ -37,7 +37,7 @@ contains additional utility interfaces f
%package devel
Group: Development/Libraries
Summary: Tomcat Native development kit
-Requires: tcnative = %{version}-%{release}, apr-devel >=
0:{version}-{release}, openssl-devel >= 0.9.7
+Requires: tcnative = %{version}-%{release}, apr-devel >=
0:{version}-{release}, openssl-devel >= 0.9.8
%description devel
The mission of the Tomcat Native Library (TCN) is to provide a
Modified: tomcat/native/branches/1.1.x/native/build/tcnative.m4
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/build/tcnative.m4?rev=1681488&r1=1681487&r2=1681488&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/build/tcnative.m4 (original)
+++ tomcat/native/branches/1.1.x/native/build/tcnative.m4 Sun May 24 16:43:57
2015
@@ -370,14 +370,11 @@ yes|'')
#include <stdio.h>
#include <openssl/opensslv.h>
int main() {
- if ((OPENSSL_VERSION_NUMBER >= 0x0090701fL &&
- OPENSSL_VERSION_NUMBER < 0x00908000L) ||
- OPENSSL_VERSION_NUMBER >= 0x0090801fL)
+ if (OPENSSL_VERSION_NUMBER >= 0x009080dfL)
return (0);
printf("\n\nFound OPENSSL_VERSION_NUMBER %#010x\n",
OPENSSL_VERSION_NUMBER);
- printf("Require OPENSSL_VERSION_NUMBER 0x0090701f or greater (0.9.7a)\n"
- "Require OPENSSL_VERSION_NUMBER 0x0090801f or greater
(0.9.8a)\n\n");
+ printf("Require OPENSSL_VERSION_NUMBER 0x009080df or greater
(0.9.8m)\n\n");
return (1);
}
],
Modified: tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml?rev=1681488&r1=1681487&r2=1681488&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/branches/1.1.x/xdocs/miscellaneous/changelog.xml Sun May 24
16:43:57 2015
@@ -49,6 +49,9 @@
The APIs SSL.generateRSATempKey() and SSL.loadDSATempKey()
are no longer supported. (rjung)
</update>
+ <update>
+ Require minimum version 0.9.8m of OpenSSL. (rjung)
+ </update>
<fix>
Use APR pool pre-cleanup API if available to reduce
possibility of JVM core on shutdown. (mturk, rjung)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
