You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/04/23 15:43:27 UTC

[tomcat-native] branch master updated (db11788 -> cdee1db)

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git.


    from db11788  Add changelog entry for BZ 63701
     new c49be39  Remove OpenSSL 1.0.2 patch file as that version is no longer supported
     new 04497fe  Update version recommendations
     new cdee1db  Estimate 1.2.24 release date as 2020-04-29. Update news pages.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 native/srclib/VERSIONS                     |  9 ++++---
 native/srclib/openssl/openssl-msvcrt.patch | 41 ------------------------------
 xdocs/miscellaneous/project.xml            |  3 +++
 xdocs/news/2019.xml                        |  4 +--
 xdocs/news/{2019.xml => 2020.xml}          | 15 ++++-------
 xdocs/project.xml                          |  2 ++
 6 files changed, 18 insertions(+), 56 deletions(-)
 delete mode 100644 native/srclib/openssl/openssl-msvcrt.patch
 copy xdocs/news/{2019.xml => 2020.xml} (69%)


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat-native] 03/03: Estimate 1.2.24 release date as 2020-04-29. Update news pages.

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit cdee1db5349ae139d8244a21754b2ac5aad524e8
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 16:43:09 2020 +0100

    Estimate 1.2.24 release date as 2020-04-29. Update news pages.
    
    Add new page for 2020. Fix copy/paste issues for 2019. Add links for
    2019 and 2020. (and 2017 & 2018 for the changelog)
---
 xdocs/miscellaneous/project.xml   |  3 +++
 xdocs/news/2019.xml               |  4 ++--
 xdocs/news/{2019.xml => 2020.xml} | 15 +++++----------
 xdocs/project.xml                 |  2 ++
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/xdocs/miscellaneous/project.xml b/xdocs/miscellaneous/project.xml
index 2d413f6..c73abc8 100644
--- a/xdocs/miscellaneous/project.xml
+++ b/xdocs/miscellaneous/project.xml
@@ -34,6 +34,9 @@
     </menu>
 
     <menu name="News">
+        <item name="2020"                       href="../news/2020.html"/>
+        <item name="2019"                       href="../news/2019.html"/>
+        <item name="2018"                       href="../news/2018.html"/>
         <item name="2017"                       href="../news/2017.html"/>
         <item name="2016"                       href="../news/2016.html"/>
         <item name="2015"                       href="../news/2015.html"/>
diff --git a/xdocs/news/2019.xml b/xdocs/news/2019.xml
index 8521eec..7c8fa58 100644
--- a/xdocs/news/2019.xml
+++ b/xdocs/news/2019.xml
@@ -18,12 +18,12 @@
 <!DOCTYPE document [
   <!ENTITY project SYSTEM "project.xml">
 ]>
-<document url="2018.html">
+<document url="2019.html">
 
   &project;
 
   <properties>
-    <title>2018 News and Status</title>
+    <title>2019 News and Status</title>
   </properties>
 
 <body>
diff --git a/xdocs/news/2019.xml b/xdocs/news/2020.xml
similarity index 69%
copy from xdocs/news/2019.xml
copy to xdocs/news/2020.xml
index 8521eec..74ac3b0 100644
--- a/xdocs/news/2019.xml
+++ b/xdocs/news/2020.xml
@@ -18,25 +18,20 @@
 <!DOCTYPE document [
   <!ENTITY project SYSTEM "project.xml">
 ]>
-<document url="2018.html">
+<document url="2020.html">
 
   &project;
 
   <properties>
-    <title>2018 News and Status</title>
+    <title>2020 News and Status</title>
   </properties>
 
 <body>
 
-<section name="2019 News &amp; Status">
- <subsection anchor="20190702" name="07 Jul 2019 - TC-Native-1.2.23 released">
+<section name="2020 News &amp; Status">
+ <subsection anchor="20200429" name="29 Apr 2020 - TC-Native-1.2.24 released">
   <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.23. This is a bugfix release.
-  </p>
- </subsection>
- <subsection anchor="20190131" name="31 Jan 2019 - TC-Native-1.2.21 released">
-  <p>The Apache Tomcat team is proud to announce the immediate availability of
-  Tomcat Native 1.2.21. This is a bugfix release.
+  Tomcat Native 1.2.24. This is a bugfix release.
   </p>
  </subsection>
 </section>
diff --git a/xdocs/project.xml b/xdocs/project.xml
index 976dba4..2eb025c 100644
--- a/xdocs/project.xml
+++ b/xdocs/project.xml
@@ -34,6 +34,8 @@
     </menu>
 
     <menu name="News">
+      <item name="2020" href="news/2020.html"/>
+      <item name="2019" href="news/2019.html"/>
       <item name="2018" href="news/2018.html"/>
       <item name="2017" href="news/2017.html"/>
       <item name="2016" href="news/2016.html"/>


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat-native] 01/03: Remove OpenSSL 1.0.2 patch file as that version is no longer supported

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit c49be394cc945c0c1c4656d68eb5c69846791e7e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 16:21:13 2020 +0100

    Remove OpenSSL 1.0.2 patch file as that version is no longer supported
---
 native/srclib/openssl/openssl-msvcrt.patch | 41 ------------------------------
 1 file changed, 41 deletions(-)

diff --git a/native/srclib/openssl/openssl-msvcrt.patch b/native/srclib/openssl/openssl-msvcrt.patch
deleted file mode 100644
index d494e89..0000000
--- a/native/srclib/openssl/openssl-msvcrt.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- crypto/o_time.c
-+++ crypto/o_time.c
-@@ -109,10 +109,6 @@
-     if (gmtime_r(timer, result) == NULL)
-         return NULL;
-     ts = result;
--#elif defined (OPENSSL_SYS_WINDOWS) && defined(_MSC_VER) && _MSC_VER >= 1400
--    if (gmtime_s(result, timer))
--        return NULL;
--    ts = result;
- #elif !defined(OPENSSL_SYS_VMS) || defined(VMS_GMTIME_OK)
-     ts = gmtime(timer);
-     if (ts == NULL)
---- util/pl/VC-32.pl
-+++ util/pl/VC-32.pl
-@@ -45,7 +45,7 @@
-     # considered safe to ignore.
-     # 
-     $base_cflags= " $mf_cflag";
--    my $f = $shlib || $fips ?' /MD':' /MT';
-+    my $f = ' /MD';
-     $opt_cflags=$f.' /Ox';
-     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-     $lflags="/nologo /subsystem:console /opt:ref";
-@@ -130,7 +130,7 @@
- else	# Win32
-     {
-     $base_cflags= " $mf_cflag";
--    my $f = $shlib || $fips ?' /MD':' /MT';
-+    my $f = ' /MD';
-     $ff = "/fixed";
-     $opt_cflags=$f.' /Ox /O2 /Ob2';
-     $dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
-@@ -194,6 +194,7 @@
- 	{
- 	$ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
- 	$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
-+	$ex_libs.=' $(EXTRA_LIBS)';
- 	# WIN32 UNICODE build gets linked with unicows.lib for
- 	# backward compatibility with Win9x.
- 	$ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ /\-DUNICODE/);


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: [tomcat-native] 02/03: Update version recommendations

Posted by Mark Thomas <ma...@apache.org>.
On 23/04/2020 17:29, Michael Osipov wrote:
> Am 2020-04-23 um 17:43 schrieb markt@apache.org:
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> markt pushed a commit to branch master
>> in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
>>
>> commit 04497fe553ac4a5497eeb7c011275c8e14eb6fec
>> Author: Mark Thomas <ma...@apache.org>
>> AuthorDate: Thu Apr 23 16:25:10 2020 +0100
>>
>>      Update version recommendations
>> ---
>>   native/srclib/VERSIONS | 9 ++++++---
>>   1 file changed, 6 insertions(+), 3 deletions(-)
>>
>> diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
>> index a5feb4c..52ef8fa 100644
>> --- a/native/srclib/VERSIONS
>> +++ b/native/srclib/VERSIONS
>> @@ -1,4 +1,7 @@
>> -Use the following version of the libraries
>> +The following version of the libraries are recommended:
>>   -- APR 1.6.5 or later, http://apr.apache.org
>> -- OpenSSL 1.0.2r or later, http://www.openssl.org
>> +- APR 1.7.0 or later, http://apr.apache.org
>> +- OpenSSL 1.1.1g or later, http://www.openssl.org
>> +
>> +Older versions may also work but are not as throughly tested by the
>> Tomcat
>> +Native team
> 
> This looks wrong to me in a patch version. This should have happened in
> December with a proper announcement and with a 1.3 release of
> libtcnative. Also consider that there are no effective changes in 1.7.0
> [1] for us which require/recommend using 1.7.x at all.
> 
> Please revert, release 1.2.24, announce recommendation for 1.3, bump
> master to 1.3.

No.

Recommended != Required.

We always recommend using the latest versions.

If you look at the history of the file you will see similar transitions
during the Tomcat 1.2.x lifetime.

Mark

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: [tomcat-native] 02/03: Update version recommendations

Posted by Michael Osipov <mi...@apache.org>.
Am 2020-04-23 um 17:43 schrieb markt@apache.org:
> This is an automated email from the ASF dual-hosted git repository.
> 
> markt pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat-native.git
> 
> commit 04497fe553ac4a5497eeb7c011275c8e14eb6fec
> Author: Mark Thomas <ma...@apache.org>
> AuthorDate: Thu Apr 23 16:25:10 2020 +0100
> 
>      Update version recommendations
> ---
>   native/srclib/VERSIONS | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
> index a5feb4c..52ef8fa 100644
> --- a/native/srclib/VERSIONS
> +++ b/native/srclib/VERSIONS
> @@ -1,4 +1,7 @@
> -Use the following version of the libraries
> +The following version of the libraries are recommended:
>   
> -- APR 1.6.5 or later, http://apr.apache.org
> -- OpenSSL 1.0.2r or later, http://www.openssl.org
> +- APR 1.7.0 or later, http://apr.apache.org
> +- OpenSSL 1.1.1g or later, http://www.openssl.org
> +
> +Older versions may also work but are not as throughly tested by the Tomcat
> +Native team

This looks wrong to me in a patch version. This should have happened in 
December with a proper announcement and with a 1.3 release of 
libtcnative. Also consider that there are no effective changes in 1.7.0 
[1] for us which require/recommend using 1.7.x at all.

Please revert, release 1.2.24, announce recommendation for 1.3, bump 
master to 1.3.

Michael

[1] https://downloads.apache.org/apr/CHANGES-APR-1.7

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


[tomcat-native] 02/03: Update version recommendations

Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-native.git

commit 04497fe553ac4a5497eeb7c011275c8e14eb6fec
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Apr 23 16:25:10 2020 +0100

    Update version recommendations
---
 native/srclib/VERSIONS | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/native/srclib/VERSIONS b/native/srclib/VERSIONS
index a5feb4c..52ef8fa 100644
--- a/native/srclib/VERSIONS
+++ b/native/srclib/VERSIONS
@@ -1,4 +1,7 @@
-Use the following version of the libraries
+The following version of the libraries are recommended:
 
-- APR 1.6.5 or later, http://apr.apache.org
-- OpenSSL 1.0.2r or later, http://www.openssl.org
+- APR 1.7.0 or later, http://apr.apache.org
+- OpenSSL 1.1.1g or later, http://www.openssl.org
+
+Older versions may also work but are not as throughly tested by the Tomcat
+Native team
\ No newline at end of file


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org