svn commit: r1893873 - in /httpd/dev-tools: ./ release/r4-stage-release.sh

[ic...@apache.org]

Author: icing
Date: Mon Oct  4 09:12:51 2021
New Revision: 1893873

URL: http://svn.apache.org/viewvc?rev=1893873&view=rev
Log:
 * fixed script error in new cve processing
 * staging removal of pmc/SECURITY/httpd-${FULL_VERSION} directory


Modified:
    httpd/dev-tools/   (props changed)
    httpd/dev-tools/release/r4-stage-release.sh

Propchange: httpd/dev-tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Oct  4 09:12:51 2021
@@ -0,0 +1 @@
+.idea

Modified: httpd/dev-tools/release/r4-stage-release.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/r4-stage-release.sh?rev=1893873&r1=1893872&r2=1893873&view=diff
==============================================================================
--- httpd/dev-tools/release/r4-stage-release.sh (original)
+++ httpd/dev-tools/release/r4-stage-release.sh Mon Oct  4 09:12:51 2021
@@ -125,6 +125,7 @@ rm -rf "${DIST_SITEPATH}"
 git clone "${GIT_SITE_URL}" "${DIST_SITEPATH}"
 
 #Update the site content with the new release date and version
+echo "updating site content for ${PROJECT}-${VERSION}"
 iso_date=`date +%Y-%m-%d`
 perl -pi -e "s/${v_major}\.${v_minor}\.\d+/${VERSION}/g" "${DIST_SITEPATH}"/content/doap.rdf
 perl -pi -e "s|<created>.*|<created>$iso_date</created>|g" "${DIST_SITEPATH}"/content/doap.rdf
@@ -141,18 +142,23 @@ if ! grep -e "# Apache HTTP Server ${VER
 fi
 
 if test -n "${CVE_DIRS}"; then
+    echo "adding timeline entry to CVEs and copy to site"
     TIMELINE_ENTRY='{"lang":"eng","time":"'"${iso_date}"'","value":"'"${VERSION}"' released"}'
     for CVE in $CVE_DIRS; do
       CVE_JSON="${DIST_DIR}/pmc/SECURITY/${CVE}/CVE.json"
       test -f "$CVE_JSON" || fail "not found: ${CVE_JSON}"
-      CVE_ID=`jq -r .CVE_d`a`ta_meta.ID "${CVE_JSON}"`
+      CVE_ID=`jq -r .CVE_data_meta.ID "${CVE_JSON}"`
       test -n "${CVE_ID}" -a "${CVE_ID}" != "null" || fail "CVE ID missing in ${CVE_JSON}"
+      echo "adding ${CVE_ID}"
       # add a timeline entry for the release and copy to website
-      jq '.timeline[.timeline|length] |= . + '"${TIMELINE_ENTRY}" "${CVE_JSON}"\
-        >"${DIST_SITEPATH}"/content/security/json/${CVE_ID}.json
+      rm -f "${CVE_JSON}".tmp
+      jq '.timeline[.timeline|length] |= . + '"${TIMELINE_ENTRY}" "${CVE_JSON}" > "${CVE_JSON}".tmp
+      mv "${CVE_JSON}".tmp "${CVE_JSON}"
+      cp "${CVE_JSON}" "${DIST_SITEPATH}"/content/security/json/${CVE_ID}.json
     done
 fi
 
+echo "adding site changes"
 (cd "${DIST_SITEPATH}" && git add .)
 
 # finally, move CVEs we handled to resolved
@@ -161,6 +167,9 @@ if test -n "${CVE_DIRS}"; then
   for CVE in $CVE_DIRS; do
     svn mv "${DIST_DIR}/pmc/SECURITY/${CVE}" "${DIST_DIR}/pmc/resolved/" >/dev/null
   done
+  if test -d "${DIST_DIR}/pmc/SECURITY/${PROJECT}-${FULL_VERSION}"; then
+    svn rm "${DIST_DIR}/pmc/SECURITY/${PROJECT}-${FULL_VERSION}"
+  fi
 fi
 
 ########################################
@@ -168,7 +177,6 @@ fi
 # step the patch level and update local files for the next version
 stage_checkout_release
 
-
 echo
 echo "PENDING REPOSITORY CHANGES"
 echo "--------"