[web] master update

[Richard Levitte]

The branch master has been updated
       via  47a7a6de93b5fd3f1fd73b638d4119d2ca55a61f (commit)
      from  08d5ca8ee5e497a78944ceacd9df305d1773a811 (commit)


- Log -----------------------------------------------------------------
commit 47a7a6de93b5fd3f1fd73b638d4119d2ca55a61f
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Oct 22 13:05:00 2021 +0200

    bin/mk-latest: Treat post 1.x.x releases right
    
    The currently produced .htaccess has this RewriteRule
    
        RewriteRule ^openssl-3.0.0-latest.tar.gz$ openssl-3.0.0.tar.gz [L,R=302,NC]
    
    It should really be this:
    
        RewriteRule ^openssl-3.0-latest.tar.gz$ openssl-3.0.0.tar.gz [L,R=302,NC]
    
    Also, since all other scripts that handle our tarballs are passed
    $(RELEASEDIR), not just 'source', so should this one.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/web/pull/271)

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

Summary of changes:
 Makefile      | 2 +-
 bin/mk-latest | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a271213..83d8e53 100644
--- a/Makefile
+++ b/Makefile
@@ -332,7 +332,7 @@ $(eval $(call mknews_vulnerability,-$(S),-b $(S))))
 
 source/.htaccess: $(wildcard source/openssl-*.tar.gz) bin/mk-latest
 	@rm -f @?
-	./bin/mk-latest source >$@
+	./bin/mk-latest $(RELEASEDIR) >$@
 source/index.inc: $(wildcard $(RELEASEDIR)/openssl-*.tar.gz) bin/mk-filelist
 	@rm -f $@
 	./bin/mk-filelist $(RELEASEDIR) '' 'openssl-*.tar.gz' >$@
diff --git a/bin/mk-latest b/bin/mk-latest
index 7a57fdd..8a43268 100755
--- a/bin/mk-latest
+++ b/bin/mk-latest
@@ -12,7 +12,8 @@ my @tarballs =
 
 my %series = ();
 foreach(@tarballs) {
-	my ($version, $serie) = /^openssl-((\d+\.\d+\.\d+)[a-z]*)\./;
+    my ($version, $serie) =
+        /^openssl-(?|(([01]\.\d+\.\d+)[a-z]*)|((\d+\.\d+)\.\d+))\./;
 	$series{$serie} = $_;
 }
 my $latest = $series{ (reverse sort keys %series)[0] };