[openssl-commits] [web] master update

[Richard Levitte]

The branch master has been updated
       via  10f51c150d25d1c8eab25e8eb44d411edbbb36f4 (commit)
      from  b830206a38fef328b6d7c4a56b8d316a5839db45 (commit)


- Log -----------------------------------------------------------------
commit 10f51c150d25d1c8eab25e8eb44d411edbbb36f4
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Aug 25 19:38:40 2016 +0200

    source/.htaccess is generated, it was a mistake to have it versioned

-----------------------------------------------------------------------

Summary of changes:
 bin/mk-latest    | 17 +++++++++++++----
 source/.htaccess | 28 ----------------------------
 2 files changed, 13 insertions(+), 32 deletions(-)
 delete mode 100644 source/.htaccess

diff --git a/bin/mk-latest b/bin/mk-latest
index 93805c8..7643255 100755
--- a/bin/mk-latest
+++ b/bin/mk-latest
@@ -18,10 +18,17 @@ foreach(@tarballs) {
 }
 my $latest = $series{ (reverse sort keys %series)[0] };
 
-print "RewriteEngine on\n";
-print "RewriteBase /source\n";
-print "# First, rewrite all the 'latest' URLs\n";
-print "RewriteRule ^latest.tar.gz\$ $latest [L,R=302,NC]\n";
+print <<\EOF
+######################################################################
+# Please do NOT edit this file directly!
+# Instead, edit bin/mk-latest in the master branch of openssl-web.git
+#####
+
+RewriteEngine on
+RewriteBase /source
+# First, rewrite all the 'latest' URLs
+RewriteRule ^latest.tar.gz\$ $latest [L,R=302,NC]
+EOF
 
 foreach (sort keys %series) {
 	my $rule = "openssl-$_-latest.tar.gz";
@@ -42,6 +49,8 @@ RewriteRule ^openssl-(1\.0\.1.*) old/1.0.1/openssl-$1 [L]
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^openssl-(1\.0\.2.*) old/1.0.2/openssl-$1 [L]
 RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^openssl-(1\.1\.0.*) old/1.1.0/openssl-$1 [L]
+RewriteCond %{REQUEST_FILENAME} !-f
 RewriteRule ^openssl-(fips.*)  old/fips/openssl-$1 [L]
 
 <Files *.gz.asc>
diff --git a/source/.htaccess b/source/.htaccess
deleted file mode 100644
index 6b01612..0000000
--- a/source/.htaccess
+++ /dev/null
@@ -1,28 +0,0 @@
-RewriteEngine on
-RewriteBase /source
-# First, rewrite all the 'latest' URLs
-RewriteRule ^latest.tar.gz$ openssl-1.0.2h.tar.gz [L,R=302,NC]
-RewriteRule ^openssl-1.0.1-latest.tar.gz$ openssl-1.0.1t.tar.gz [L,R=302,NC]
-RewriteRule ^openssl-1.0.2-latest.tar.gz$ openssl-1.0.2h.tar.gz [L,R=302,NC]
-
-# Old distro's are in subdirs.
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(openssl-0\.9\.8.*) old/0.9.x/$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^openssl-(1\.0\.0.*) old/1.0.0/openssl-$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^openssl-(1\.0\.1.*) old/1.0.1/openssl-$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^openssl-(1\.0\.2.*) old/1.0.2/openssl-$1 [L]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^openssl-(fips.*)  old/fips/openssl-$1 [L]
-
-<Files *.gz.asc>
-    RemoveEncoding .gz
-</Files>
-<Files *.gz.md5>
-    RemoveEncoding .gz
-</Files>
-<Files *.gz.sha1>
-    RemoveEncoding .gz
-</Files>