Author: buildbot
Date: Thu Mar 5 11:22:55 2020
New Revision: 1057435
Log:
Staging update by buildbot for ooo-site
Modified:
websites/staging/ooo-site/trunk/cgi-bin/ (props changed)
websites/staging/ooo-site/trunk/content/ (props changed)
websites/staging/ooo-site/trunk/content/download/checksums.html
websites/staging/ooo-site/trunk/content/download/globalvars.js
websites/staging/ooo-site/trunk/content/download/test/globalvars.js
websites/staging/ooo-site/trunk/content/security/cves/CVE-2012-0037.html
websites/staging/ooo-site/trunk/content/security/cves/CVE-2013-1571.html
Propchange: websites/staging/ooo-site/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 5 11:22:55 2020
@@ -1 +1 @@
-1874761
+1874832
Propchange: websites/staging/ooo-site/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar 5 11:22:55 2020
@@ -1 +1 @@
-1874761
+1874832
Modified: websites/staging/ooo-site/trunk/content/download/checksums.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/checksums.html (original)
+++ websites/staging/ooo-site/trunk/content/download/checksums.html Thu Mar 5
11:22:55 2020
@@ -122,8 +122,8 @@ SHA256 hash, otherwise use the MD5 hash.
<li> </li>
<li>Save the following file with your Internet browser to the location where
the downloaded AOO and PGP/ASC file is
stored:</li>
- <li><a href="https://www.apache.org/dist/openoffice/KEYS"
title="https://www.apache.org/dist/openoffice/KEYS">
- https://www.apache.org/dist/openoffice/KEYS</a></li>
+ <li><a href="https://downloads.apache.org/openoffice/KEYS"
title="https://downloads.apache.org/openoffice/KEYS">
+ https://downloads.apache.org/openoffice/KEYS</a></li>
<li>Open the start menu and enter <code>cmd.exe</code> into the search
box.</li>
<li>Now change to the directory with the downloaded AOO, KEYS and PGP/ASC
file, import and verify with the following
commands:</li>
@@ -178,7 +178,7 @@ SHA256 hash, otherwise use the MD5 hash.
<li>Type in the following commands:</li>
<li> </li>
<li><pre>cd <path_to_AOO_and_ASC_files></pre></li>
- <li><pre>wget https://www.apache.org/dist/openoffice/KEYS</pre></li>
+ <li><pre>wget https://downloads.apache.org/openoffice/KEYS</pre></li>
<li><pre>gpg --import KEYS</pre></li>
<li><pre>gpg --verify <installation_file>.asc</pre></li>
<li> </li>
@@ -222,7 +222,7 @@ SHA256 hash, otherwise use the MD5 hash.
<li>Type in the following commands:</li>
<li> </li>
<li><pre>cd <path_to_AOO_and_ASC_files></pre></li>
- <li><pre>curl https://www.apache.org/dist/openoffice/KEYS -o KEYS</pre></li>
+ <li><pre>curl https://downloads.apache.org/openoffice/KEYS -o KEYS</pre></li>
<li><pre>gpg --import KEYS</pre></li>
<li><pre>gpg --verify <installation_file>.asc</pre></li>
<li> </li>
Modified: websites/staging/ooo-site/trunk/content/download/globalvars.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/globalvars.js (original)
+++ websites/staging/ooo-site/trunk/content/download/globalvars.js Thu Mar 5
11:22:55 2020
@@ -101,7 +101,7 @@ DL.SEL_VER = [ "4.1.7", "4.1.7",
// Base URLs to the Sourceforge and Apache mirror server.
DL.SF =
"https://sourceforge.net/projects/openofficeorg.mirror/files/";
DL.ASF =
"https://www.apache.org/dyn/aoo-closer.cgi/openoffice/";
-DL.ASF_DIST = "https://www.apache.org/dist/openoffice/";
+DL.ASF_DIST = "https://downloads.apache.org/openoffice/";
DL.ASF_ARC = "https://archive.apache.org/dist/openoffice/";
// Only used in "download_other.js".
@@ -149,7 +149,7 @@ DL_BETA.SDK_LANG = [ "en-US" ];
DL_BETA.SOURCEFORGE =
"https://sourceforge.net/projects/openofficeorg.mirror/files/milestones/" +
DL_BETA.VERSION;
DL_BETA.SOURCEFORGE = DL_BETA.SOURCEFORGE + "/binaries/";
DL_BETA.ASF =
"https://www.apache.org/dyn/aoo-closer.cgi/openoffice/" +
DL_BETA.VERSION;
-DL_BETA.ASF_DIST = "https://www.apache.org/dist/openoffice/"
+ DL_BETA.VERSION;
+DL_BETA.ASF_DIST = "https://downloads.apache.org/openoffice/"
+ DL_BETA.VERSION;
DL_BETA.ASF_ARC =
"https://archive.apache.org/dist/openoffice/" +
DL_BETA.VERSION;
// Debug: Uncomment to use different base URLs.
Modified: websites/staging/ooo-site/trunk/content/download/test/globalvars.js
==============================================================================
--- websites/staging/ooo-site/trunk/content/download/test/globalvars.js
(original)
+++ websites/staging/ooo-site/trunk/content/download/test/globalvars.js Thu Mar
5 11:22:55 2020
@@ -98,7 +98,7 @@ DL.SEL_VER = [ "4.1.4", "4.1.4",
// Base URLs to the Sourceforge and Apache mirror server.
DL.SF =
"https://sourceforge.net/projects/openofficeorg.mirror/files/";
DL.ASF =
"https://www.apache.org/dyn/aoo-closer.cgi/openoffice/";
-DL.ASF_DIST = "https://www.apache.org/dist/openoffice/";
+DL.ASF_DIST = "https://downloads.apache.org/openoffice/";
DL.ASF_ARC = "https://archive.apache.org/dist/openoffice/";
// Only used in "download_other.js".
@@ -146,7 +146,7 @@ DL_BETA.SDK_LANG = [ "en-US" ];
DL_BETA.SOURCEFORGE =
"https://sourceforge.net/projects/openofficeorg.mirror/files/milestones/" +
DL_BETA.VERSION;
DL_BETA.SOURCEFORGE = DL_BETA.SOURCEFORGE + "/binaries/";
DL_BETA.ASF =
"https://www.apache.org/dyn/aoo-closer.cgi/openoffice/" +
DL_BETA.VERSION;
-DL_BETA.ASF_DIST = "https://www.apache.org/dist/openoffice/"
+ DL_BETA.VERSION;
+DL_BETA.ASF_DIST = "https://downloads.apache.org/openoffice/"
+ DL_BETA.VERSION;
DL_BETA.ASF_ARC =
"https://archive.apache.org/dist/openoffice/" +
DL_BETA.VERSION;
// Debug: Uncomment to use different base URLs.
Modified:
websites/staging/ooo-site/trunk/content/security/cves/CVE-2012-0037.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/security/cves/CVE-2012-0037.html
(original)
+++ websites/staging/ooo-site/trunk/content/security/cves/CVE-2012-0037.html
Thu Mar 5 11:22:55 2020
@@ -71,7 +71,7 @@ We have provided MD5 and SHA1 hashes of
<p>
The MD5 and SHA1 hashes can be verified using Unix tools like sha1, sha1sum or
md5sum.
<p>
-The PGP signatures can be verified using PGP or GPG. First download the <a
href="http://www.apache.org/dist/openoffice/KEYS">KEYS</a> file, as well as the
asc signature file for the particular patch from above. Make sure you get these
files from the main distribution directory, rather than from a mirror. Then
verify the signatures as follows:
+The PGP signatures can be verified using PGP or GPG. First download the <a
href="https://downloads.apache.org/openoffice/KEYS">KEYS</a> file, as well as
the asc signature file for the particular patch from above. Make sure you get
these files from the main distribution directory, rather than from a mirror.
Then verify the signatures as follows:
<p>
<code>
% pgpk -a KEYS <br>
Modified:
websites/staging/ooo-site/trunk/content/security/cves/CVE-2013-1571.html
==============================================================================
--- websites/staging/ooo-site/trunk/content/security/cves/CVE-2013-1571.html
(original)
+++ websites/staging/ooo-site/trunk/content/security/cves/CVE-2013-1571.html
Thu Mar 5 11:22:55 2020
@@ -69,7 +69,7 @@ We have provided <a href="http://archive
<p>
The MD5 and SHA256 hashes can be verified using Unix tools like md5sum or
sha256sum.
<p>
-The PGP signatures can be verified using PGP or GPG. First download the <a
href="http://www.apache.org/dist/openoffice/KEYS">KEYS</a> file, as well as the
asc signature file for the particular patch from above. Make sure you get these
files from the main distribution directory, rather than from a mirror. Then
verify the signatures as follows:
+The PGP signatures can be verified using PGP or GPG. First download the <a
href="https://downloads.apache.org/openoffice/KEYS">KEYS</a> file, as well as
the asc signature file for the particular patch from above. Make sure you get
these files from the main distribution directory, rather than from a mirror.
Then verify the signatures as follows:
<p>
<code>
% pgpk -a KEYS <br>