[tools] master update
The branch master has been updated via d9dd40cdad7cdcb6e6160430958a8a5e9998a369 (commit) from 4a5441d5602435cd801aeee4add5908cfc86acab (commit) - Log - commit d9dd40cdad7cdcb6e6160430958a8a5e9998a369 Author: Matt Caswell Date: Wed Aug 25 09:46:14 2021 +0100 Make it more explicit how to push tags Reviewed-by: Richard Levitte Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/tools/pull/90) --- Summary of changes: HOWTO-make-a-release.md | 8 +--- release-tools/README.md | 7 +++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/HOWTO-make-a-release.md b/HOWTO-make-a-release.md index 7456b6a..d378a4b 100644 --- a/HOWTO-make-a-release.md +++ b/HOWTO-make-a-release.md @@ -286,9 +286,11 @@ instructed by `dev/release.sh`. You may want to sanity check the pushes by inserting the `-n` (dry-run) option. *For OpenSSL before 3.0*, simply push your local changes to the main source -repo, and please do remember to push the release tags as well, which is done -separately with the `--tags` option. You may want to sanity check the -pushes by inserting the `-n` (dry-run) option. +repo, and please do remember to push the release tags as well. You may want to +sanity check the pushes by inserting the `-n` (dry-run) option. You must specify +the repository / remote and tag to be pushed: + +git push ## Updating the website diff --git a/release-tools/README.md b/release-tools/README.md index dc18f74..c4d1462 100644 --- a/release-tools/README.md +++ b/release-tools/README.md @@ -141,11 +141,10 @@ typically want to sanity check this with: git push -n -Push new tags to public repo. Again sanity check with: +Push new tags to public repo. You must specify the repository / remote and tag +name explicitly. Again sanity check with: -git push --tags -n - -to make sure no local tags were pushed. +git push -n ## Updating the website
[tools] master update
The branch master has been updated
via 4a5441d5602435cd801aeee4add5908cfc86acab (commit)
via 522710ebddbc2b17ad949174c3b30900be36e79c (commit)
via fb3ea4fea8a625bbf36516d0e329bf4790a12641 (commit)
via f6ecc7fef076779d1dde76fc6c7e4719aa685cb6 (commit)
via b92201c5a37ae8ef57298899464fc6c9eac0e70a (commit)
via e2c1ff33aaa776b465f23989107e2a72d3d2804f (commit)
from 3189d5753970fa290365b02acb535ea5ef09e995 (commit)
- Log -
commit 4a5441d5602435cd801aeee4add5908cfc86acab
Author: Dr. David von Oheimb
Date: Mon Oct 25 10:01:19 2021 +0200
pick-to-branch: Further improve user guidance on commit id
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/95)
commit 522710ebddbc2b17ad949174c3b30900be36e79c
Author: Dr. David von Oheimb
Date: Mon Oct 25 09:47:18 2021 +0200
pick-to-branch: Fix behavior on failed cherry-pick
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/95)
commit fb3ea4fea8a625bbf36516d0e329bf4790a12641
Author: Dr. David von Oheimb
Date: Mon Oct 25 09:36:51 2021 +0200
pick-to-branch: Improve diagnostics on bad target branch
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/95)
commit f6ecc7fef076779d1dde76fc6c7e4719aa685cb6
Author: Dr. David von Oheimb
Date: Sat Oct 23 13:10:41 2021 +0200
pick-to-branch: Fix the case that commit id is derived from HEAD of master
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/95)
commit b92201c5a37ae8ef57298899464fc6c9eac0e70a
Author: Dr. David von Oheimb
Date: Sat Oct 23 12:49:30 2021 +0200
pick-to-branch: Preserve current branch and its state if it is not the
target
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/95)
commit e2c1ff33aaa776b465f23989107e2a72d3d2804f
Author: Dr. David von Oheimb
Date: Sat Oct 23 12:32:35 2021 +0200
pick-to-branch: Improve user guidance
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/95)
---
Summary of changes:
review-tools/pick-to-branch | 61 ++---
1 file changed, 47 insertions(+), 14 deletions(-)
diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch
index c446763..6513a36 100755
--- a/review-tools/pick-to-branch
+++ b/review-tools/pick-to-branch
@@ -1,6 +1,15 @@
#! /bin/bash
-# If one arg, intuit commit id from master
+function usage {
+echo "Usage: pick-to-branch []
+Cherry-pick a commit on the given release target branch.
+If this is not the current branch, the current branch and its state are
preserved.
+
+The commit can be given in the form of a branch name.
+If no arg is given, intuit commit id from master.
+The arg must match a release branch or start with 'm' for master.
+A release branch may be given simply as 102, 110, 111, 30, 31."
+}
case $# in
2)
@@ -8,11 +17,11 @@ case $# in
b=$2
;;
1)
-id=`git branch -v | awk '$2=="master" { print $3; }'`
+id=`git branch -v | awk '$1=="master" { print $2; }'`
b=$1
;;
*)
-echo "Usage $0 [commitid] branch"
+usage
exit 1
;;
esac
@@ -31,22 +40,27 @@ case $b in
*3*0*)
branch=openssl-3.0
;;
+*3*1*)
+branch=openssl-3.1
+;;
m*)
branch=master
;;
*)
-echo Unknown branch
+echo Unknown release target branch \'$b\'
exit 1
;;
esac
-echo "id is $id"
-echo "branch is $branch"
-echo "Are these correct?"
+echo "Commit to chery-pick is:"
+git show $id | head -n 5
+echo
+echo "Target branch is: $branch"
+echo "Are both of these correct?"
while true
do
-echo -n "Enter 'yes' to continue or 'no' to abort: "
+echo -n "Enter 'y'/'yes' to continue or 'n'/'no' to abort: "
read x
x="`echo $x | tr A-Z a-z`"
if [ "$x" = "y" -o "$x" = "yes" -o "$x" = "n" -o "$x" = "no" ]
@@ -60,13 +74,34 @@ then
exit 1
fi
-git checkout --quiet master || exit 1
-git checkout $branch || exit 1
-git cherry-pick -e -x $id
+
+ORIG_REF=`git rev-parse --abbrev-ref HEAD` # usually this will be 'master'
+if [ "$branch" != "$ORIG_REF" ]; then
+STASH_OUT=`git stash`
+fi
+
+function cleanup {
+rv=$?
+echo # make sure to enter new line, needed, e.g., after Ctrl-C
+[ $rv -ne 0 ] && echo -e "pick-to-branch failed"
+if [ "$branch" != "$ORIG_REF" ]; then
+echo Returning to previous branch $ORIG_REF
+git checkout -q $ORIG_REF
+if [ "$STASH_OUT" != "No local changes to save" ]; then
+git stash pop -q # restore original state, pruning
[tools] master update
The branch master has been updated
via 3189d5753970fa290365b02acb535ea5ef09e995 (commit)
via 485aa62c661197601a7648a9c6bc7b8350270bb6 (commit)
via 670fbf0eec6cbca664de2ec5e17208499bf99ca2 (commit)
from f6070cac86caad71cde3b62cd3fd0e35c724eae3 (commit)
- Log -
commit 3189d5753970fa290365b02acb535ea5ef09e995
Author: Dr. David von Oheimb
Date: Thu Oct 7 16:00:40 2021 +0200
ghmerge: Avoid checking out ref branch if not needed
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/94)
commit 485aa62c661197601a7648a9c6bc7b8350270bb6
Author: Dr. David von Oheimb
Date: Thu Oct 7 15:54:44 2021 +0200
ghmerge: Improve robustness and clarity regarding which ref branch is used
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/94)
commit 670fbf0eec6cbca664de2ec5e17208499bf99ca2
Author: Dr. David von Oheimb
Date: Thu Oct 7 15:43:21 2021 +0200
ghmerge: Correct saving and restoring original state
Also properly catch the error that copy-of-... already exists
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/tools/pull/94)
---
Summary of changes:
review-tools/ghmerge | 64 ++--
1 file changed, 37 insertions(+), 27 deletions(-)
diff --git a/review-tools/ghmerge b/review-tools/ghmerge
index 7f0746e..7d1fc25 100755
--- a/review-tools/ghmerge
+++ b/review-tools/ghmerge
@@ -22,7 +22,7 @@ Examples:
ghmerge 12345 mattcaswell
ghmerge 12345 paulidale t8m --nobuild --myemail=d...@ddvo.net
ghmerge edd05b7..19692bb2c32 --squash -- 12345 levitte
- ghmerge 12345 slontis --ref OpenSSL_1_1_1-stable"
+ ghmerge 12345 slontis --ref openssl-3.0"
exit 9
}
@@ -155,64 +155,74 @@ if [ -z "$WHO" -o -z "$BRANCH" -o -z "$REPO" ]; then
exit 1
fi
-if [ "$REF" = "" ]; then
-REF=`git rev-parse --abbrev-ref HEAD` # usually this will be 'master' or,
e.g., 'OpenSSL_1_1_1-stable'
-else
-echo -n "Press Enter to checkout $REF: "; read foo
-git checkout $REF
-fi
-
-echo -n "Press Enter to pull the latest $REMOTE/$REF: "; read foo
-git pull $REMOTE $REF || (git rebase --abort; exit 1)
-
+ORIG_REF=`git rev-parse --abbrev-ref HEAD` # usually this will be 'master'
+STASH_OUT=`git stash`
WORK="copy-of-${WHO}-${BRANCH}"
+(git branch | grep -q "$WORK") && (echo "Branch already exists: $WORK"; exit 1)
+
function cleanup {
rv=$?
-echo # new line
+echo # make sure to enter new line, needed, e.g., after Ctrl-C
[ $rv -ne 0 ] && echo -e "\nghmerge failed"
-if [ "$WORK" != "$REF" ]; then
-echo Restoring local $REF
-git checkout -q $REF
-git branch -qD $WORK 2>/dev/null
+if [ "$REF" != "$ORIG_REF" ] || [ "$WORK_USED" != "" ]; then
+echo Returning to previous branch $ORIG_REF
+git checkout -q $ORIG_REF
+fi
+if [ "$WORK_USED" != "" ]; then
+git branch -qD $WORK_USED
+fi
+if [ "$STASH_OUT" != "No local changes to save" ]; then
+git stash pop -q # restore original state, pruning any leftover
commits added locally
fi
-git reset --hard $REMOTE/$REF # prune any leftover commits added locally
}
trap 'cleanup' EXIT
+[ "$REF" = "" ] && REF=$ORIG_REF
+if [ "$REF" != "$ORIG_REF" ]; then
+echo -n "Press Enter to checkout $REF: "; read foo
+git checkout $REF
+fi
+
+echo -n "Press Enter to pull the latest $REMOTE/$REF: "; read foo
+git pull $REMOTE $REF || (git rebase --abort; exit 1)
+
+WORK_USED=$WORK
# append new commits from $REPO/$BRANCH
if [ "$PICK" != "yes" ]; then
echo Rebasing $REPO/$BRANCH on $REF...
git fetch $REPO $BRANCH && git checkout -b $WORK FETCH_HEAD
+WORK_USED=$WORK
git rebase $REF || (echo 'Fix or Ctrl-d to abort' ; read || (git rebase
--abort; exit 1))
else
echo Cherry-picking $REPO/$BRANCH to $REF...
git checkout -b $WORK $REF
+WORK_USED=$WORK
git fetch $REPO $BRANCH && git cherry-pick FETCH_HEAD
fi
-echo Diff against $REF
-git diff $REF
+echo Diff against $REMOTE/$REF
+git diff $REMOTE/$REF
if [ "$INTERACTIVE" == "yes" ] ; then
-echo -n "Press Enter to interactively rebase $AUTOSQUASH on $REF: "; read
foo
-git rebase -i $AUTOSQUASH $REF || (git rebase --abort; exit 1)
-echo "Calling addrev $ADDREVOPTS --prnum=$PRNUM $TEAM ${REF}.."
-addrev $ADDREVOPTS --prnum=$PRNUM $TEAM ${REF}..
+echo -n "Press Enter to interactively rebase $AUTOSQUASH on $REMOTE/$REF:
"; read foo
+git rebase -i $AUTOSQUASH $REMOTE/$REF || (git rebase --abort; exit 1)
+echo "Calling addrev $ADDREVOPTS --prnum=$PRNUM $TEAM $REMOTE/$REF.."
+addrev $ADDREVOPTS --prnum=$PRNUM $TEAM $REMOTE/$REF..
fi
-echo Log since $REF
-g
[web] master update
The branch master has been updated via cbf57da0fc9ef2a5842f6a9dd3f4ed7d4a2e47a0 (commit) from acbb83e4accab58fab385371c8835316a33fb21c (commit) - Log - commit cbf57da0fc9ef2a5842f6a9dd3f4ed7d4a2e47a0 Author: Richard Levitte Date: Mon Nov 1 09:47:45 2021 +0100 Make sure to create missing directories The source/old directory tree isn't guaranteed to be there any more, now that we have removed that copy of the tarball archive. However, HTML files are still produced there, so we must ensure that those directories exist, or we'd get a build break. Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/web/pull/276) --- Summary of changes: Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 0f79120..38b5738 100644 --- a/Makefile +++ b/Makefile @@ -350,9 +350,11 @@ source/index.inc: $(wildcard $(RELEASEDIR)/openssl-*.tar.gz) bin/mk-filelist # $(1) = release, $(2) = release title define mkoldsourceindex source/old/$(1)/index.inc: $(wildcard $(RELEASEDIR)/old/$(1)/*.gz) bin/mk-filelist + @mkdir -p `dirname $$@` @rm -f $$@ ./bin/mk-filelist $(RELEASEDIR)/old/$(1) '' '*.gz' > $$@ source/old/$(1)/index.html: source/old/sub-index.html.tt bin/from-tt + @mkdir -p `dirname $$@` @rm -f $$@ ./bin/from-tt -d source/old/$(1) \ release='$(1)' releasetitle='Old $(2) Releases' \ @@ -367,6 +369,7 @@ endef $(foreach S,fips $(SERIES) $(OLDSERIES2),$(eval $(call mkoldsourceindex,$(S),$(patsubst fips,FIPS,$(S) source/old/index.html: source/old/index.html.tt Makefile bin/from-tt + @mkdir -p `dirname $@` @rm -f $@ ./bin/from-tt releases='$(SERIES) $(OLDSERIES2) fips' $<
[web] master update
The branch master has been updated via acbb83e4accab58fab385371c8835316a33fb21c (commit) from 469d1a406bf21372d301396c66b8aec97bd8a32a (commit) - Log - commit acbb83e4accab58fab385371c8835316a33fb21c Author: Mark J. Cox Date: Mon Nov 1 10:14:50 2021 + Update to match reality, our sources of income are sponsorship and support contracts. --- Summary of changes: support/donations.html | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/support/donations.html b/support/donations.html index 0228569..7de3620 100644 --- a/support/donations.html +++ b/support/donations.html @@ -13,11 +13,10 @@ OpenSSL. You can support the OpenSSL project financially with the -purchase of a support contract, by a -sponsorship donation, or by hiring OSF for consulting services or -custom software development. +purchase of a support contract, or by a +sponsorship donation. -We can also accept smaller donations +We can accept smaller sponsorship donations via https://github.com/sponsors/openssl";>GitHub Sponsors. We do not have a PayPal account. Please do not donate to any
