From 12029931264001904a5aaf25934b2d668dd734ed Mon Sep 17 00:00:00 2001
From: Brice Goglin <Brice.Goglin@inria.fr>
Date: Thu, 19 Oct 2023 09:18:06 +0000
Subject: [PATCH] hwloc: add latest_release.txt near latest_snapshop.txt

Some people want the latest release version number, not including
release candidates.

Refs Homebrew/homebrew-core#151735

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
---
 .htaccess                                           | 6 ++++--
 software/hwloc/current/downloads/latest_release.txt | 8 ++++++++
 software/hwloc/v2.9/downloads/latest_release.txt    | 8 ++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 software/hwloc/current/downloads/latest_release.txt
 create mode 100644 software/hwloc/v2.9/downloads/latest_release.txt

diff --git a/.htaccess b/.htaccess
index 13e081a8d..c40979866 100644
--- a/.htaccess
+++ b/.htaccess
@@ -35,9 +35,9 @@ Deny from 180.211.180.14
 # With build artifacts in S3, latest_snapshot.txt is a
 # PHP script that generates the right answer, so turn
 # on PHP processing for those files.
-<Files "latest_snapshot.txt">
+<FilesMatch "^latest_(snapshot|release).txt$">
      AddHandler application/x-httpd-php .txt
-</Files>
+</FilesMatch>
 
 ## Comment these rules in if you want to have nice URLs using
 ## $conf['rewrite'] = 1 - not needed for rewrite mode 2
@@ -81,12 +81,14 @@ RewriteRule nightly/(.*)/(latest_snapshot\.txt|.*\.tar\.gz|.*\.tar\.bz2) https:/
 
 # Redirect requests for release artifacts to download.open-mpi.org
 RewriteCond %{REQUEST_URI} !latest_snapshot.txt$ [NC]
+RewriteCond %{REQUEST_URI} !latest_release.txt$ [NC]
 RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/[0-9a-zA-Z_-]+$
 RewriteCond %{REQUEST_URI} !^/\.well-known/cpanel-dcv/[0-9a-zA-Z_-]+$
 RewriteCond %{REQUEST_URI} !^/\.well-known/pki-validation/[A-F0-9]{32}\.txt(?:\ Comodo\ DCV)?$
 RewriteRule software/ompi/(.*)/downloads/(.*) https://download.open-mpi.org/release/open-mpi/$1/$2 [L,R=301]
 
 RewriteCond %{REQUEST_URI} !latest_snapshot.txt$ [NC]
+RewriteCond %{REQUEST_URI} !latest_release.txt$ [NC]
 RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge/[0-9a-zA-Z_-]+$
 RewriteCond %{REQUEST_URI} !^/\.well-known/cpanel-dcv/[0-9a-zA-Z_-]+$
 RewriteCond %{REQUEST_URI} !^/\.well-known/pki-validation/[A-F0-9]{32}\.txt(?:\ Comodo\ DCV)?$
diff --git a/software/hwloc/current/downloads/latest_release.txt b/software/hwloc/current/downloads/latest_release.txt
new file mode 100644
index 000000000..bad6735e8
--- /dev/null
+++ b/software/hwloc/current/downloads/latest_release.txt
@@ -0,0 +1,8 @@
+<?php
+
+$topdir = "../../../..";
+include_once("../version.inc");
+include_once("$topdir/includes/downloads.inc");
+
+latest_snapshot_output("hwloc", $s3_prefix, [], $releases);
+?>
diff --git a/software/hwloc/v2.9/downloads/latest_release.txt b/software/hwloc/v2.9/downloads/latest_release.txt
new file mode 100644
index 000000000..bad6735e8
--- /dev/null
+++ b/software/hwloc/v2.9/downloads/latest_release.txt
@@ -0,0 +1,8 @@
+<?php
+
+$topdir = "../../../..";
+include_once("../version.inc");
+include_once("$topdir/includes/downloads.inc");
+
+latest_snapshot_output("hwloc", $s3_prefix, [], $releases);
+?>