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

Author: covener
Date: Fri Jul 31 14:40:36 2026
New Revision: 1936769

Log:
fix apu, simplify readiness, readability

Modified:
   apr/site/trunk/release/common-lib.sh
   apr/site/trunk/release/r0-make-candidate.sh

Modified: apr/site/trunk/release/common-lib.sh
==============================================================================
--- apr/site/trunk/release/common-lib.sh	Fri Jul 31 14:33:43 2026	(r1936768)
+++ apr/site/trunk/release/common-lib.sh	Fri Jul 31 14:40:36 2026	(r1936769)
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/bash -x
 
 #Make sure English is used when formating dates and other things
 export LANG=en_US.UTF-8
@@ -494,16 +494,22 @@ stage_checkout_release() {
 checkout_pmc() {
   dest="$1"
   test -n "${SVN_PMC_URL}" || fail "SVN_PMC_URL not set"
-  echo "checking out pmc/${PROJECT} as ${dest}"
+  local PMC_PROJECT=${PROJECT/apr-util/apr}
+  echo "checking out pmc/${PMC_PROJECT} as ${dest} for project ${PROJECT}"
   rm -rf "${dest}"
-  svn checkout "${SVN_PMC_URL}/${PROJECT}" "${dest}" >/dev/null
+  svn checkout "${SVN_PMC_URL}/${PMC_PROJECT}" "${dest}" >/dev/null
 }
 
 calc_ready_CVE_DIRS() {
   dest="$1"
   checkout_pmc "${dest}"
   pushd "${dest}/SECURITY" >/dev/null
-  CVE_SUBDIRS=`./tools/readiness.sh -n | fgrep '[OK]'| awk '{print $2}' | sort `
+  local project=apr
+  if [ $is_apr -eq 0 ]; then
+    project=aprutil
+  fi
+
+  CVE_SUBDIRS=`./tools/readiness.sh -n -p $project | fgrep '[OK]'| awk '{print $2}' | sort `
   popd >/dev/null
 
   cves_ok=1

Modified: apr/site/trunk/release/r0-make-candidate.sh
==============================================================================
--- apr/site/trunk/release/r0-make-candidate.sh	Fri Jul 31 14:33:43 2026	(r1936768)
+++ apr/site/trunk/release/r0-make-candidate.sh	Fri Jul 31 14:40:36 2026	(r1936769)
@@ -27,23 +27,14 @@ 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
@@ -52,12 +43,6 @@ while [[ $# -gt 0 ]]; do
 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
@@ -97,6 +82,17 @@ EOF
   fail "Please correct this and try again."
 fi
 
+# Format CVE list with newlines for readability
+if test -n "${CVE_DIRS}"; then
+  CVE_COUNT=$(echo "${CVE_DIRS}" | wc -w | tr -d ' ')
+  CVE_LIST=$(echo "${CVE_DIRS}" | tr ' ' '\n' | sed 's/^/    /')
+  CVE_HEADER="  CVEs (${CVE_COUNT}):"
+else
+  CVE_COUNT=0
+  CVE_LIST="    none"
+  CVE_HEADER="  CVEs:"
+fi
+
 cat <<EOF
 creating release candidate:
   PROJECT: $PROJECT
@@ -106,7 +102,9 @@ creating release candidate:
   SOURCE: $SVN_SRC@$SVN_REV
   DEST: $SVN_DEST
   LOCAL: $DEST_DIR
-  CVEs: ${CVE_DIRS:-none}
+${CVE_HEADER}
+${CVE_LIST}
+
 EOF
 if ! ask_yes_no "Is this as expected?"; then
   exit 1