svn commit: r1932558 - apr/site/trunk/release

Author: covener
Date: Thu Mar 26 00:39:42 2026
New Revision: 1932558

Log:
avoid APR/APU CVE mixup in an obnoxious way

Modified:
   apr/site/trunk/release/README.md
   apr/site/trunk/release/r0-make-candidate.sh

Modified: apr/site/trunk/release/README.md
==============================================================================
--- apr/site/trunk/release/README.md	Wed Mar 25 20:45:59 2026	(r1932557)
+++ apr/site/trunk/release/README.md	Thu Mar 26 00:39:42 2026	(r1932558)
@@ -5,7 +5,8 @@
 1. Remind yourself of your GPG password
 2. Make sure your key is in the KEYS file of the project and has some useful signatures.
 3. Check CVE status in https://svn.apache.org/repos/private/pmc/apr checkout and make sure there aren't
-   ready CVE's from both APR and APU.
+   ready CVE's from both APR and APU.  Move the other projects' stuff into a subdir that doesn't begin with `CVE`
+   so tools/readiness.sh will ignore it.
 
 ## 1) Release basics
 

Modified: apr/site/trunk/release/r0-make-candidate.sh
==============================================================================
--- apr/site/trunk/release/r0-make-candidate.sh	Wed Mar 25 20:45:59 2026	(r1932557)
+++ apr/site/trunk/release/r0-make-candidate.sh	Thu Mar 26 00:39:42 2026	(r1932558)
@@ -27,10 +27,37 @@ usage: $0 [options] [version]
   Options:
     -h             print usage information
     -y             never ask, always assume yes
+    --i-have-prepared-the-security-dir-to-avoid-apr-apu-confusion
+                   (required) confirm SECURITY dir preparation. 
+                   APR or APU security issues must be moved out of the way
+                   when doing a release for the other project
 EOF
   exit 1
 }
 
+# Parse long options first
+SECURITY_DIR_PREPARED=0
+TEMP_ARGS=()
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --i-have-prepared-the-security-dir-to-avoid-apr-apu-confusion)
+            SECURITY_DIR_PREPARED=1
+            shift
+            ;;
+        *)
+            TEMP_ARGS+=("$1")
+            shift
+            ;;
+    esac
+done
+set -- "${TEMP_ARGS[@]}"
+
+# Check if mandatory flag was provided
+if [ "$SECURITY_DIR_PREPARED" -eq 0 ]; then
+    echo "Error: --i-have-prepared-the-security-dir-to-avoid-apr-apu-confusion flag is required" >&2
+    usage
+fi
+
 while getopts "hy" opt; do
     case $opt in
         h)  usage