svn commit: r1893376 - in /httpd/dev-tools/release: r5-commit-staged-release.sh r6-announce.sh

[ic...@apache.org]

Author: icing
Date: Thu Sep 16 09:02:16 2021
New Revision: 1893376

URL: http://svn.apache.org/viewvc?rev=1893376&view=rev
Log:
 * changing r5 to actually commit after confirmation
 * r6 creating announce mail templates and commands to send them


Modified:
    httpd/dev-tools/release/r5-commit-staged-release.sh
    httpd/dev-tools/release/r6-announce.sh

Modified: httpd/dev-tools/release/r5-commit-staged-release.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/r5-commit-staged-release.sh?rev=1893376&r1=1893375&r2=1893376&view=diff
==============================================================================
--- httpd/dev-tools/release/r5-commit-staged-release.sh (original)
+++ httpd/dev-tools/release/r5-commit-staged-release.sh Thu Sep 16 09:02:16 2021
@@ -75,14 +75,14 @@ if ask_yes_no "Do you want to commit the
   if ask_yes_no "Do you REALLY want to commit these changes?"; then
     MSG="publishing release ${PROJECT}-${VERSION}"
 
-    echo nop: svn commit -m "${MSG}" "${DIST_DIR}/pmc"
-    # svn commit -m "${MSG}" "${DIST_DIR}/pmc"
-    echo nop: svn commit -m "${MSG}" "${AO_DIST_RELEASE_PATH}"
-    # svn commit -m "${MSG}" "${AO_DIST_RELEASE_PATH}"
-    echo nop: svn commit -m "${MSG}" .
-    # svn commit -m "${MSG}" .
-    echo "nop: cd ${DIST_SITEPATH}; git commit -m ${MSG}"
-    # (cd "${DIST_SITEPATH}" && git commit -m "${MSG}" )
+    # echo nop: svn commit -m "${MSG}" "${DIST_DIR}/pmc"
+    svn commit -m "${MSG}" "${DIST_DIR}/pmc"
+    # echo nop: svn commit -m "${MSG}" "${AO_DIST_RELEASE_PATH}"
+    svn commit -m "${MSG}" "${AO_DIST_RELEASE_PATH}"
+    # echo nop: svn commit -m "${MSG}" .
+    svn commit -m "${MSG}" .
+    # echo "nop: cd ${DIST_SITEPATH}; git commit -m ${MSG}"
+    (cd "${DIST_SITEPATH}" && git commit -m "${MSG}" )
 
     # success exit
     save_version

Modified: httpd/dev-tools/release/r6-announce.sh
URL: http://svn.apache.org/viewvc/httpd/dev-tools/release/r6-announce.sh?rev=1893376&r1=1893375&r2=1893376&view=diff
==============================================================================
--- httpd/dev-tools/release/r6-announce.sh (original)
+++ httpd/dev-tools/release/r6-announce.sh Thu Sep 16 09:02:16 2021
@@ -16,14 +16,19 @@ usage: $0 [options] [version]
     version        as 'm.n.p(-suffix)?', the version to use.
   Options:
     -h             print usage information
+    -u user-id     your apache user-id, e.g 'ylavic'
 EOF
   exit 1
 }
 
-while getopts "h" opt; do
+asf_id=""
+
+while getopts "hu:y" opt; do
     case $opt in
         h)  usage
             ;;
+        u)  asf_id="$OPTARG"
+            ;;
         y)  ALWAYS_YES=1
             ;;
     esac
@@ -36,12 +41,14 @@ source `dirname $0`/env.sh
 detect_checkout
 detect_version $1
 
+test -n "${asf_id}" || fail "please specify your ASF id as '-u <asf-id>'"
+
 AO_DIST_PATH="dist/apache.org-dist"
 AO_DIST_RELEASE_PATH="${AO_DIST_PATH}/release/${PROJECT}"
 
 TAR_BASENAME="${PROJECT}-${VERSION}"
 ANNOUNCEMENT="Announcement${v_major}.${v_minor}.txt"
-ANNOUNCE_LISTS="<an...@apache.org>, <an...@httpd.apache.org>"
+ANNOUNCE_LISTS="announce@apache.org announce@httpd.apache.org"
 
 # SVN repository is huge, carefully check out only what we need
 rm -rf "${AO_DIST_PATH}"
@@ -60,16 +67,40 @@ if ! test -f "${AO_DIST_RELEASE_PATH}/${
   fail "not found: ${AO_DIST_RELEASE_PATH}/${ANNOUNCEMENT}"
 fi
 
-cat << EOF
-Please email, using your ASF mail id
-
-To: ${ANNOUNCE_LISTS}
+counter=0
+MID="<`perl -e 'print time . ".";@chars=("A".."Z",0..0);print $chars[rand @chars] for 1..8;'`@httpd.apache.org>"
+DATE=`date '+%a, %d %b %Y %H:%M:%S %z'`
+
+email="${asf_id}@apache.org"
+
+for rcpt in ${ANNOUNCE_LISTS}; do
+    mail_file="${DIST_DIR}/mail_announce_${VERSION}-${counter}.txt"
+    cat <<EOF > "$mail_file"
+From: ${asf_id} <$email>
+To: $rcpt
 Reply-To: dev@httpd.apache.org
 Subject: [ANNOUNCEMENT] Apache HTTP Server $VERSION Released
+Date: $DATE
+Message-ID: $MID
 
-with the text from ${AO_DIST_RELEASE_PATH}/${ANNOUNCEMENT}.
+EOF
+  cat "${AO_DIST_RELEASE_PATH}/${ANNOUNCEMENT}" >> "${mail_file}"
+  counter=`expr $counter + 1`
+done
+
+echo "Announcement Emails have been prepared in ${DIST_DIR}/mail_announce_*."
+echo "You may use the following commands to send these:"
+echo ""
+for mail_announce in "${DIST_DIR}/mail_announce_${VERSION}-"*.txt; do
+cat <<EOF
+  curl --url 'smtps://mail-relay.apache.org:465' \\
+    --ssl-reqd --mail-from "${email}" \\
+    --mail-rcpt "${rcpt}"  --user '${asf_id}' \\
+    --upload-file '${mail_announce}'
 
 EOF
+done
+
 
 CVES_MENTIONED=`fgrep CVE- dist/apache.org-dist/release/httpd/CHANGES_${VERSION}`
 if test -n "${CVES_MENTIONED}"; then