[openssl-commits] [tools] master update
The branch master has been updated via 191d279c0e11953cd1a3d02e3fe422391cf9674f (commit) via 617dbc4a479831adbf711df0879324b23d5f4cb6 (commit) via a89caedb7667bec77ca155ef99b6beacd7a4479c (commit) from 1de20a3a49e1b4f6e7104b84b8fc5594b144712a (commit) - Log - commit 191d279c0e11953cd1a3d02e3fe422391cf9674f Author: Richard Levitte Date: Tue Nov 20 16:34:16 2018 +0100 release-tools/do-copyright-year: skip versioned directories These are submodules, and we have no interest changing those. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/tools/pull/36) commit 617dbc4a479831adbf711df0879324b23d5f4cb6 Author: Richard Levitte Date: Tue Nov 20 16:33:12 2018 +0100 release-tools/do-copyright-year: more efficient skip of D records Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/tools/pull/36) commit a89caedb7667bec77ca155ef99b6beacd7a4479c Author: Richard Levitte Date: Tue Nov 20 16:30:21 2018 +0100 release-tools/do-copyright-year: add a spinner+counter to show process When a lot of changes has happened in a branch, processing all the files can take some time, so this adds some visual progress feedback. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/tools/pull/36) --- Summary of changes: release-tools/do-copyright-year | 30 -- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/release-tools/do-copyright-year b/release-tools/do-copyright-year index 6c3d710..8bebf6a 100755 --- a/release-tools/do-copyright-year +++ b/release-tools/do-copyright-year @@ -29,12 +29,30 @@ EOF NYD=`date +%Y-01-01` echo Updating copryight -git diff-tree -r --name-status `git rev-list -1 --before=$NYD HEAD`..HEAD \ - | while read STATUS FILE ; do -if [ "$STATUS" = 'D' ]; then continue; fi -sed -E -f /tmp/sed$$ -i "$FILE" -git add "$FILE" -done +git diff-tree -r --name-status `git rev-list -1 --before=$NYD HEAD`..HEAD | \ +grep -v '^ *D' | \ +( + count=0 + sp="/-\|" + sc=0 + spin() { + printf "\r${sp:sc++:1} %s" "$@" + ((sc==${#sp})) && sc=0 + } + endspin() { + printf "\r%s\n" "$@" + } + + while read STATUS FILE ; do + if [ -d "$FILE" ]; then continue; fi + (( count++ )) + spin $count + sed -E -f /tmp/sed$$ -i "$FILE" + git add "$FILE" + done + endspin "Files considered: $count" +) +echo Files changed: $(git status --porcelain | grep '^ *M' | wc -l) echo Committing change locally. git commit -m 'Update copyright year' rm -f $ss _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 1de20a3a49e1b4f6e7104b84b8fc5594b144712a (commit) via cd0711f60154d5da0f9974349b897a2615934554 (commit) from b7d03f8bd7e918a96c25eb6fadd1b70f28cc6e39 (commit) - Log - commit 1de20a3a49e1b4f6e7104b84b8fc5594b144712a Author: Pauli Date: Sun Nov 18 15:59:41 2018 +1000 add dependencies to Makefile.PL Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/tools/pull/35) commit cd0711f60154d5da0f9974349b897a2615934554 Author: Pauli Date: Sun Nov 18 10:06:32 2018 +1000 Tool changes for Mac OS/X. Perl ends up with a different path when installed using _brew_. The system perl seems to have broken _cpan_ somehow. Some additional packages need to be installed. PATH also needs to be set so it can find the _plackup_ executable. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/tools/pull/35) --- Summary of changes: OpenSSL-Query/Makefile.PL | 2 ++ OpenSSL-Query/README.md | 2 ++ review-tools/addrev | 2 +- review-tools/gitaddrev| 2 +- review-tools/gitlabutil | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/OpenSSL-Query/Makefile.PL b/OpenSSL-Query/Makefile.PL index ac80b4a..a98f4e6 100644 --- a/OpenSSL-Query/Makefile.PL +++ b/OpenSSL-Query/Makefile.PL @@ -35,6 +35,8 @@ requires ( 'URI::Encode'=> 0, Moo => 0, Carp => 0, + 'LWP::UserAgent' => 0, + 'LWP::Protocol::https' =>0, ); install_as_site; diff --git a/OpenSSL-Query/README.md b/OpenSSL-Query/README.md index df036d8..27dd3fd 100644 --- a/OpenSSL-Query/README.md +++ b/OpenSSL-Query/README.md @@ -23,6 +23,8 @@ OpenSSL::Query requires these extra modules to run: - Class::Method::Modifiers (debian package libclass-method-modifiers-perl) - Moo (debian package libmoo-perl) - URI::Encode (debian package liburi-encode-perl) +- LWP::UserAgent +- LWP::Protocol::https Any other module OpenSSL::Query depends on should be part of core perl. diff --git a/review-tools/addrev b/review-tools/addrev index ce770f3..5cadfdb 100755 --- a/review-tools/addrev +++ b/review-tools/addrev @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use warnings; diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 4b97298..1c2071e 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use strict; use warnings; diff --git a/review-tools/gitlabutil b/review-tools/gitlabutil index 03fb02d..f700644 100755 --- a/review-tools/gitlabutil +++ b/review-tools/gitlabutil @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!/usr/bin/env perl use HTTP::Tiny; use JSON::PP; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via b7d03f8bd7e918a96c25eb6fadd1b70f28cc6e39 (commit) from e759eccf4e6bd38f8a16e8ee053b1da978d4fb89 (commit) - Log - commit b7d03f8bd7e918a96c25eb6fadd1b70f28cc6e39 Author: Richard Levitte Date: Fri Nov 16 00:55:11 2018 +0100 gitaddrev: don't lowercase the git author email address That may lead to difficulties matching with the person database. Reviewed-by: Matthias St. Pierre Reviewed-by: Paul Yang (Merged from https://github.com/openssl/tools/pull/34) --- Summary of changes: review-tools/gitaddrev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 08cc5d8..4b97298 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -128,7 +128,7 @@ if (my $rev = try_add_reviewer($ENV{GIT_AUTHOR_EMAIL})) { # In case the author is unknown to our databases or is lacking a CLA, # we need to be extra careful to check if this is supposed to be a # trivial commit. -my $author = lc($ENV{GIT_AUTHOR_EMAIL}); +my $author = $ENV{GIT_AUTHOR_EMAIL}; # Note: it really should be enough to check if $author is unknown, since # the databases are supposed to be consistent with each other. However, _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via e759eccf4e6bd38f8a16e8ee053b1da978d4fb89 (commit) from ca2469ca133476e1fb3f89bbaf43f8d7a4244c25 (commit) - Log - commit e759eccf4e6bd38f8a16e8ee053b1da978d4fb89 Author: Dr. Matthias St. Pierre Date: Wed Oct 24 08:53:38 2018 +0200 cherry-checker: add a 'fixes' column Scans the commit messages for 'Fixes' annotations and displays them in an additional column. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/tools/pull/33) --- Summary of changes: review-tools/cherry-checker | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/review-tools/cherry-checker b/review-tools/cherry-checker index d65e801..dbdbd06 100755 --- a/review-tools/cherry-checker +++ b/review-tools/cherry-checker @@ -76,13 +76,16 @@ def pick_cherries(left, right, all = False): left + "..." + right, "--pretty=%at;%m;%h;%s" ] -regex = re.compile("|".join([ +prnum_regex = re.compile("|".join([ # The standard pull request annotation "\(Merged from https://github.com/openssl/openssl/pull/([0-9]+)\)", # @kroeck's special pull request annotation ;-) "GH: #([0-9]+)" ])) +fixes_regex = re.compile( +"Fixes[:]?\s+(#|https://github.com/openssl/openssl/pull/)([0-9]+)") + for line in subprocess.check_output(git_command).decode().splitlines(): timestamp, branch, commit, subject = line.split(";") @@ -99,7 +102,7 @@ def pick_cherries(left, right, all = False): ["git", "show", "--no-patch", commit] ).decode() -match = regex.search(message) +match = prnum_regex.search(message) if match: if match.group(1): prnum = match.group(1) @@ -108,7 +111,13 @@ def pick_cherries(left, right, all = False): else: prnum = "" -yield prnum, timestamp, branch, commit, subject +match = fixes_regex.search(message) +if match: +fixes = "#" + match.group(2) +else: +fixes = "" + +yield prnum, fixes, timestamp, branch, commit, subject @@ -136,17 +145,17 @@ if __name__ == '__main__': -> {right} == both - prnum | br | commit | subject - - | -- | -- | ---""".format( + prnum | fixes | br | commit | subject + - | - | -- | -- | ---""".format( left = left, right = right)) branch_marker = { '<': '<-', '>': '->', '=' : '==' } try: -for prnum, _, branch, commit, subject in commits: -print(' #{:>4} | {} | {} | {} '.format( -prnum, branch_marker[branch], commit, subject +for prnum, fixes, _, branch, commit, subject in commits: +print(' #{:>4} | {:>5} | {} | {} | {} '.format( +prnum, fixes, branch_marker[branch], commit, subject )) except subprocess.CalledProcessError as e: print(e, file=sys.stderr) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via ca2469ca133476e1fb3f89bbaf43f8d7a4244c25 (commit) from 2d16f8da11fe0bab487d936f13a63ea8fba5204e (commit) - Log - commit ca2469ca133476e1fb3f89bbaf43f8d7a4244c25 Author: Paul Yang Date: Thu Sep 13 10:24:17 2018 +0900 Add 1.1.1 stable branch when doing 'opensslpull' Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/tools/pull/31) --- Summary of changes: review-tools/opensslpull | 1 + 1 file changed, 1 insertion(+) diff --git a/review-tools/opensslpull b/review-tools/opensslpull index 3776a30..0c8a40b 100755 --- a/review-tools/opensslpull +++ b/review-tools/opensslpull @@ -8,6 +8,7 @@ test -f ./config || { git checkout --quiet OpenSSL_1_0_2-stable ; git pull --rebase git checkout --quiet OpenSSL_1_1_0-stable ; git pull --rebase +git checkout --quiet OpenSSL_1_1_1-stable ; git pull --rebase git checkout --quiet master git rebase -p origin/master _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 2d16f8da11fe0bab487d936f13a63ea8fba5204e (commit) via b747cccd90b142bcfa7c264af6c3aba50d233f82 (commit) from 16fe6d400dcef56b5ffbe6ddc416cbc77bff7782 (commit) - Log - commit 2d16f8da11fe0bab487d936f13a63ea8fba5204e Author: Dr. Matthias St. Pierre Date: Sun Oct 14 14:05:09 2018 +0200 cherry-checker: initial commit usage: cherry-checker [-h] [-a] [-s] [-r] Shows the commits in 'master...OpenSSL_1_1_1-stable' which are eligible for cherry-picking. A commit is considered cherry-picked, if there is another commit on the "other side" which introduces an equivalent patch. For details, see the documentation of the '--cherry-mark' option in the git-log(1) manpage. optional arguments: -h, --helpshow this help message and exit -a, --all Show all commits, also those which have been cherry-picked. -s, --sortSort commits w.r.t. pull request number and author date. -r, --remote Compare the remote branches instead of the local ones. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/tools/pull/32) commit b747cccd90b142bcfa7c264af6c3aba50d233f82 Author: Richard Levitte Date: Sat Sep 22 23:06:18 2018 +0200 gitaddrev: do lowercase when checking CLA entries We know that we lowercase all email addresses in the CLA database, so we need to lowercase the identity that we use there, but nowhere else. --- Summary of changes: review-tools/cherry-checker | 152 review-tools/gitaddrev | 6 +- 2 files changed, 155 insertions(+), 3 deletions(-) create mode 100755 review-tools/cherry-checker diff --git a/review-tools/cherry-checker b/review-tools/cherry-checker new file mode 100755 index 000..d65e801 --- /dev/null +++ b/review-tools/cherry-checker @@ -0,0 +1,152 @@ +#!/usr/bin/env python3 + +import argparse +import subprocess +import re +import sys + +left = "master" +right = "OpenSSL_1_1_1-stable" + + +def parse_arguments(): +parser = argparse.ArgumentParser( +description = """Shows the commits in '{left}...{right}' +which are eligible for cherry-picking. A commit is considered +cherry-picked, if there is another commit on the "other side" +which introduces an equivalent patch. +For details, see the documentation of the '--cherry-mark' option +in the git-log(1) manpage. +""".format(left=left, right=right)) + +parser.add_argument( +'-a', '--all', +action = 'store_true', +help = "Show all commits, also those which have been cherry-picked."\ +) + +parser.add_argument( +'-s', '--sort', +action = 'store_true', +help = "Sort commits w.r.t. pull request number and author date."\ +) + +parser.add_argument( +'-r', '--remote', +action = 'store_true', +help = "Compare the remote branches instead of the local ones."\ +) + +args = parser.parse_args() + +return args + + +def check_openssl_git_repo(): +"""Checks whether we're inside a openssl.git downstrem repository""" +try: +if "/openssl.git" in subprocess.check_output( +["git", "remote", "-v"] +).decode(): +return True; +except: +pass + +return False + + +def get_remote(): +try: +return subprocess.check_output( +["git", "config", "branch.master.remote"] +).decode().trim() +except: +return "origin" + + +def pick_cherries(left, right, all = False): +"""Lists all commits from the symmetric difference of left and right + +By default, all commits are omitted which have an 'equivalent' commit +on the other side, unless 'all' == True. +""" + +git_command = [ +"git", "log", "--oneline", "--cherry-mark", "--left-right", +left + "..." + right, "--pretty=%at;%m;%h;%s" +] + +regex = re.compile("|".join([ +# The standard pull request annotation +"\(Merged from https://github.com/openssl/openssl/pull/([0-9]+)\)", +# @kroeck's special pull request annotation ;-) +"GH: #([0-9]+)" +])) + +for line in subprocess.check_output(git_command).decode().splitlines(): + +timestamp, branch, commit, subject = line.split(";") + +if branch == '=' and not all: +continue + +# shorten overlong subject lines +if len(subject) > 70: +subject = subject[:70] + "..." + +# search commit message for pull request number +message = subprocess.check_output( +["git", "show", "--no-patch", commit] +).decode() + +match = regex.search(message) +if match: +if match.gr
[openssl-commits] [tools] master update
The branch master has been updated via 16fe6d400dcef56b5ffbe6ddc416cbc77bff7782 (commit) from eb4d1f2af762c9674d1461ddbe652f18bcd21415 (commit) - Log - commit 16fe6d400dcef56b5ffbe6ddc416cbc77bff7782 Author: Bernd Edlinger Date: Thu Sep 13 07:18:08 2018 +1000 pick-to-branch: Update active branches Reviewed-by: Richard Levitte Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/30) --- Summary of changes: review-tools/pick-to-branch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch index 9160ef5..1c385e5 100755 --- a/review-tools/pick-to-branch +++ b/review-tools/pick-to-branch @@ -19,15 +19,15 @@ esac case $b in -*1*0*1*) -branch=OpenSSL_1_0_1-stable -;; *1*0*2*) branch=OpenSSL_1_0_2-stable ;; *1*1*0*) branch=OpenSSL_1_1_0-stable ;; +*1*1*1*) +branch=OpenSSL_1_1_1-stable +;; m*) branch=master ;; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via eb4d1f2af762c9674d1461ddbe652f18bcd21415 (commit) from 1f45f077ae95e501865207cc9aba81a7c3791756 (commit) - Log - commit eb4d1f2af762c9674d1461ddbe652f18bcd21415 Author: Richard Levitte Date: Mon Sep 10 17:34:52 2018 +0200 release-tools: use 'make tar' instead of 'make dist' 'make dist' will pre-configure the OpenSSL source for distribution with a simple generic configuration, which is nice... as long as you're on Unix. Unfortunately, the resulting Makefile will be picked up by NMAKE (on Windows) and MMS / MMK (on VMS) and will spew out errors because those are very different environments. Therefore, it's better not to pre-configure, and just create an archive from the source proper. (note that pre-configuration would still work on the 1.0.2 series, since the Windows and VMS builds are entirely different there, but it's no big loss to force everyone to configure when using 1.0.2 as well) Reviewed-by: Viktor Dukhovni (Merged from https://github.com/openssl/openssl/pull/29) --- Summary of changes: release-tools/README.md| 2 +- release-tools/mkrelease.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/release-tools/README.md b/release-tools/README.md index 5376eec..af2b78f 100644 --- a/release-tools/README.md +++ b/release-tools/README.md @@ -276,7 +276,7 @@ or if you want to use the openssl-team key: Make the release tarball. You do this with: -make dist +make tar Create .sha1, .sha256 and .asc files manually. You can use: diff --git a/release-tools/mkrelease.pl b/release-tools/mkrelease.pl index 69e337f..48f18d7 100644 --- a/release-tools/mkrelease.pl +++ b/release-tools/mkrelease.pl @@ -257,7 +257,7 @@ if ( !$no_release ) { my $gpgann = $ENV{"OPENSSL_GPG_ANNOUNCE"} // "$gpg --use-agent -sta --clearsign"; my $tarfile = "openssl-${expected_version}.tar.gz"; -system("(./config; make $TAR dist) >../$tarfile.log 2>&1"); +system("(./config; make $TAR tar) >../$tarfile.log 2>&1"); die "Error generating release!" if $?; die "Can't find tarball!!" unless -f "../$tarfile"; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 1f45f077ae95e501865207cc9aba81a7c3791756 (commit) from 2a01977682aadf36adcc66dd7ac2bbe0cbc26d24 (commit) - Log - commit 1f45f077ae95e501865207cc9aba81a7c3791756 Author: Richard Levitte Date: Tue Sep 4 21:18:58 2018 +0200 gitaddrev: don't lowercase the reviewers If we lowercase them, the occasional registered mixed case ID will not be recognised. Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/28) --- Summary of changes: review-tools/gitaddrev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index cf041d4..18930b4 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -31,7 +31,7 @@ my @unknown_reviewers; my $skip_reviewer; my $omccount = 0; sub try_add_reviewer { -my $id = lc(shift); +my $id = shift; my $rc = undef; my $id2 = $id =~ /^\@(.*)$/ ? { github => $1 } : $id; my $rev = $query->find_person_tag($id2, 'rev'); _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 2a01977682aadf36adcc66dd7ac2bbe0cbc26d24 (commit) from 4e85c274b47997105dad347852584d464e2cef02 (commit) - Log - commit 2a01977682aadf36adcc66dd7ac2bbe0cbc26d24 Author: Matt Caswell Date: Thu Aug 16 10:47:14 2018 +0100 The "tls13downgrade" Configure option no longer exists So, we need to remove checking of it from run-checker. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/tools/pull/27) --- Summary of changes: run-checker/run-checker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-checker/run-checker.sh b/run-checker/run-checker.sh index a04b68f..499fb02 100755 --- a/run-checker/run-checker.sh +++ b/run-checker/run-checker.sh @@ -31,7 +31,7 @@ no-err no-filenames no-aria no-asan no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer no-heartbeats no-md2 no-msan no-rc5 no-sctp no-ssl no-ssl-trace no-tests -no-tls13downgrade no-ubsan no-ui-console no-unit-test no-weak-ssl-ciphers +no-ubsan no-ui-console no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic enable-fuzz-afl enable-fuzz-libfuzzer enable-heartbeats no-hw no-hw-padlock no-idea no-makedepend enable-md2 no-md4 no-mdc2 no-gost no-multiblock _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 4e85c274b47997105dad347852584d464e2cef02 (commit) from cab68a3abe9fa4d8b8837b98540bb0d25ee4f55b (commit) - Log - commit 4e85c274b47997105dad347852584d464e2cef02 Author: Matt Caswell Date: Mon Jul 23 09:44:03 2018 +0100 Don't test no-md5 no-md5 is not a valid option so we shouldn't be testing it Reviewed-by: Rich Salz (Merged from https://github.com/openssl/tools/pull/25) --- Summary of changes: run-checker/run-checker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-checker/run-checker.sh b/run-checker/run-checker.sh index ab8910e..a04b68f 100755 --- a/run-checker/run-checker.sh +++ b/run-checker/run-checker.sh @@ -34,7 +34,7 @@ no-heartbeats no-md2 no-msan no-rc5 no-sctp no-ssl no-ssl-trace no-tests no-tls13downgrade no-ubsan no-ui-console no-unit-test no-weak-ssl-ciphers no-zlib no-zlib-dynamic enable-fuzz-afl enable-fuzz-libfuzzer enable-heartbeats no-hw no-hw-padlock -no-idea no-makedepend enable-md2 no-md4 no-md5 no-mdc2 no-gost no-multiblock +no-idea no-makedepend enable-md2 no-md4 no-mdc2 no-gost no-multiblock no-nextprotoneg no-ocb no-ocsp no-pic no-poly1305 no-posix-io no-psk no-rc2 no-rc4 enable-rc5 no-rdrand no-rfc3779 no-ripemd no-rmd160 no-scrypt enable-sctp no-seed no-shared no-sock no-srp no-srtp no-sse2 enable-ssl-trace _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via cab68a3abe9fa4d8b8837b98540bb0d25ee4f55b (commit) from 1fb2c1d2155c25b18b00bc9cc6f1a9169d1b9460 (commit) - Log - commit cab68a3abe9fa4d8b8837b98540bb0d25ee4f55b Author: Richard Levitte Date: Mon Jul 16 11:53:48 2018 +0200 build-gost: CMAKE_MODULE_LINKER_FLAGS, not CMAKE_SHARED_LINKER_FLAGS Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/24) --- Summary of changes: run-checker/build-gost.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-checker/build-gost.sh b/run-checker/build-gost.sh index c9004c3..a6f3468 100755 --- a/run-checker/build-gost.sh +++ b/run-checker/build-gost.sh @@ -35,7 +35,7 @@ OPENSSL_PREFIX=$(pwd)/openssl/_install ) && ( cd gost-engine cmake -DOPENSSL_ROOT_DIR=$OPENSSL_PREFIX \ - -DCMAKE_SHARED_LINKER_FLAGS='-Wl,--enable-new-dtags' \ + -DCMAKE_MODULE_LINKER_FLAGS='-Wl,--enable-new-dtags' \ . make ) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 1fb2c1d2155c25b18b00bc9cc6f1a9169d1b9460 (commit) from 45ea2185ce1a2f39c6fb72abd076dbb191b0d016 (commit) - Log - commit 1fb2c1d2155c25b18b00bc9cc6f1a9169d1b9460 Author: Richard Levitte Date: Mon Jul 16 11:33:18 2018 +0200 build-gost: ensure gost.so is built with RUNPATH, not RPATH This allows us to point to whatever libcrypto we want. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/23) --- Summary of changes: run-checker/build-gost.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/run-checker/build-gost.sh b/run-checker/build-gost.sh index f3d205f..c9004c3 100755 --- a/run-checker/build-gost.sh +++ b/run-checker/build-gost.sh @@ -34,6 +34,8 @@ OPENSSL_PREFIX=$(pwd)/openssl/_install && make install_dev ) && ( cd gost-engine -cmake -DOPENSSL_ROOT_DIR=$OPENSSL_PREFIX . +cmake -DOPENSSL_ROOT_DIR=$OPENSSL_PREFIX \ + -DCMAKE_SHARED_LINKER_FLAGS='-Wl,--enable-new-dtags' \ + . make ) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 45ea2185ce1a2f39c6fb72abd076dbb191b0d016 (commit) from 5f62625fdbc9dba7d402ea9d5ee91f5b8280df50 (commit) - Log - commit 45ea2185ce1a2f39c6fb72abd076dbb191b0d016 Author: Richard Levitte Date: Sat Jul 14 11:47:17 2018 +0200 run-checker: Add script to build gost.so It gets built against a 1.1.0 build, on purpose to check that it links and runs correctly against any libcrypto.so.1.1. Fixes #21 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/22) --- Summary of changes: run-checker/build-gost.sh | 39 +++ 1 file changed, 39 insertions(+) create mode 100755 run-checker/build-gost.sh diff --git a/run-checker/build-gost.sh b/run-checker/build-gost.sh new file mode 100755 index 000..f3d205f --- /dev/null +++ b/run-checker/build-gost.sh @@ -0,0 +1,39 @@ +#! /bin/bash +# +# Run in a directory for a gost engine build. +# Two subdirectories will be created: +# +#gost-engine a checkout of https://github.com/gost-engine/engine.git +#openssl a checkout of https://github.com/openssl/openssl.git +# +# Required ubuntu packages to run this script: +# +#build-essential +#cmake +#perl +#git + +if [ -d openssl ]; then +(cd openssl; git pull --rebase) +else +git clone -b OpenSSL_1_1_0-stable --depth 1 --single-branch \ + https://github.com/openssl/openssl.git openssl +fi + +if [ -d gost-engine ]; then +(cd gost-engine; git pull --rebase) +else +git clone https://github.com/gost-engine/engine.git gost-engine +fi + +OPENSSL_PREFIX=$(pwd)/openssl/_install +( +cd openssl +./config --prefix=$OPENSSL_PREFIX \ + && make -j8 build_libs \ + && make install_dev +) && ( +cd gost-engine +cmake -DOPENSSL_ROOT_DIR=$OPENSSL_PREFIX . +make +) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 5f62625fdbc9dba7d402ea9d5ee91f5b8280df50 (commit) from 805106fc21b3bb4337c68f736fe43518344862a8 (commit) - Log - commit 5f62625fdbc9dba7d402ea9d5ee91f5b8280df50 Author: Pauli Date: Thu Jul 12 12:22:20 2018 -0400 Export CC variable The default for CC wasn't exporting the environment variable. Likewise, the variable wasn't used. Hence it didn't take effect. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/20) --- Summary of changes: review-tools/opensslbuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/review-tools/opensslbuild b/review-tools/opensslbuild index 404a04e..e9abfb3 100755 --- a/review-tools/opensslbuild +++ b/review-tools/opensslbuild @@ -21,7 +21,7 @@ test "$1" = "-x" && { } # Set compiler -test "$CC" = "" && CC="ccache clang-3.6" +test "$CC" = "" && export CC="ccache clang-3.6" # Set basic config arguments CONFIGARGS="-d --strict-warnings --prefix=/usr/local/openssl" _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 805106fc21b3bb4337c68f736fe43518344862a8 (commit) from 3660c7ff2c23ae4d89e463f0abd5a359b6172775 (commit) - Log - commit 805106fc21b3bb4337c68f736fe43518344862a8 Author: Rich Salz Date: Mon May 21 08:50:06 2018 -0400 Better flag parsing; build by default Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/tools/pull/15) --- Summary of changes: review-tools/ghmerge | 69 1 file changed, 42 insertions(+), 27 deletions(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index 7f00b7c..1fb70c8 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -12,36 +12,49 @@ if [ ! -d .git ] ; then exit 1 fi -if [ "$1" = "--tools" ] ; then -WHAT=tools ; MERGE=yes ; BUILD=no ; shift -fi -if [ "$1" = "--web" ] ; then -WHAT=web ; MERGE=yes ; BUILD=no ; shift -fi -if [ "$1" == "--trivial" ] ; then -TRIVIAL="--trivial" ; shift -fi -if [ "$1" == "--merge" -o "$1" == "--squash" ] ; then -MERGE=yes ; shift -fi -if [ "$1" == "--nomerge" -o "$1" == "--nosquash" ] ; then -MERGE=no ; shift -fi +# Parse JCL. +while true ; do +case "$1" in +--tools) +WHAT=tools ; MERGE=yes ; BUILD=no ; shift +;; +--web) +WHAT=web ; MERGE=yes ; BUILD=no ; shift +;; +--trivial) +TRIVIAL="--trivial" ; shift +;; +--merge | --squash) +MERGE=yes ; shift +;; +--nomerge | --nosquash) +MERGE=no ; shift +;; +--nobuild) +BUILD=no ; shift +;; +--) +shift +break +;; +-*) +echo "$0: Unknown flag $1" +exit 1 +;; +*) +break +;; +esac +done if [ $# -lt 2 ] ; then -echo Usage: `basename $0` '[--trivial] [--merge] prnum reviewer...' +echo "Usage: $0 [flags] prnum reviewer..." exit 1 fi PRNUM=$1 ; shift -case "$PRNUM" in --*) -echo Usage: `basename $0` '[--trivial] [--[no]merge] prnum reviewer...' -exit 1 -;; -esac +TEAM=$* curl -s https://api.github.com/repos/openssl/$WHAT/pulls/$PRNUM >/tmp/gh$$ -TEAM=$* set -- `python -c ' from __future__ import print_function import json, sys; @@ -69,13 +82,13 @@ function cleanup { } trap 'cleanup' EXIT - git pull --rebase https://github.com/$WHO/$WHAT.git $BRANCH git rebase $REL + echo Diff against $REL git diff $REL -echo -n Press return to merge to $REL and build: ; read foo +echo -n Press return to merge to $REL: ; read foo addrev $TRIVIAL --prnum=$PRNUM $TEAM ${REL}.. git checkout $REL if [ "$MERGE" == "yes" ] ; then @@ -86,8 +99,10 @@ else git rebase $WORK fi -# echo Rebuilding -# opensslbuild |& tail -3 +if [ "$BUILD" == "yes" ] ; then +echo Rebuilding +( opensslbuild 2>&1 ) | tail -3 +fi while true ; do echo -n "Enter YES to push or NO to abort: " _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 3660c7ff2c23ae4d89e463f0abd5a359b6172775 (commit) from 897f0887b4fecf22e522c248800b158c2e6a7422 (commit) - Log - commit 3660c7ff2c23ae4d89e463f0abd5a359b6172775 Author: Matt Caswell Date: Tue Jun 19 21:43:07 2018 +0100 Test no-sm2, no-sm3, no-sm4 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/tools/pull/19) --- Summary of changes: run-checker/run-checker.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/run-checker/run-checker.sh b/run-checker/run-checker.sh index 843cccb..ab8910e 100755 --- a/run-checker/run-checker.sh +++ b/run-checker/run-checker.sh @@ -42,7 +42,8 @@ no-static-engine no-stdio no-threads no-ts enable-ubsan no-ui enable-unit-test no-whirlpool enable-weak-ssl-ciphers enable-zlib enable-zlib-dynamic 386 no-dtls no-tls no-ssl3 no-tls1 no-tls1_1 no-tls1_2 no-dtls1 no-dtls1_2 no-ssl3-method no-tls1-method no-tls1_1-method -no-tls1_2-method no-dtls1-method no-dtls1_2-method no-siphash no-tls1_3 ) +no-tls1_2-method no-dtls1-method no-dtls1_2-method no-siphash no-tls1_3 no-sm2 +no-sm3 no-sm4 ) run-hook () { local hookname=$1; shift _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 897f0887b4fecf22e522c248800b158c2e6a7422 (commit) via 7ab7e43a50c400c49bf3e0608a1d292e62d020f9 (commit) from ddda55afb15458bc21187ef80397134193a8982e (commit) - Log - commit 897f0887b4fecf22e522c248800b158c2e6a7422 Author: Richard Levitte Date: Tue May 29 15:20:11 2018 +0200 do-release.pl: Move old dist files before copying the new ones Also, extend the patterns we glob for to include pre-releases Fixes #17 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/18) commit 7ab7e43a50c400c49bf3e0608a1d292e62d020f9 Author: Richard Levitte Date: Tue May 29 15:07:11 2018 +0200 do-release.pl: make sure pre-releases contribute to the array of series Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/18) --- Summary of changes: release-tools/do-release.pl | 45 + 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/release-tools/do-release.pl b/release-tools/do-release.pl index 1725055..9bc7137 100644 --- a/release-tools/do-release.pl +++ b/release-tools/do-release.pl @@ -9,6 +9,8 @@ use strict; use warnings; +use File::Basename; + my $homedir = glob("~openssl"); my $tmpdir = $ENV{"OPENSSL_TMP_DIR"} // $homedir . "/dist/new"; my $olddir = $ENV{"OPENSSL_OLD_DIR"} // $homedir . "/dist/old"; @@ -68,7 +70,7 @@ foreach (@files) { } } foreach (@versions) { -if (/^(\d+\.\d+\.\d+)[a-z]*$/) { +if (/^(\d+\.\d+\.\d+)[a-z]*(?:-pre\d+)$/) { my $serie = $1; push @series, $serie unless grep /^$serie/, @series; } @@ -125,32 +127,27 @@ print "Directory sanity check OK\n"; print "Starting release for OpenSSL @versions\n"; if ($do_copy) { -foreach (@distfiles) { -system("cp $tmpdir/$_ $srcdir/$_"); -die "Error copying $_ to source directory!" if $?; -system("cp $tmpdir/$_ $ftpdir/$_"); -die "Error copying $_ to ftp directory!" if $?; -} -print "Copied distributions files to source and ftp directories\n"; foreach my $serie (@series) { +my @glob_patterns = ( +"openssl-$serie.tar.gz", +"openssl-$serie?.tar.gz", +"openssl-$serie-pre[0-9].tar.gz", +"openssl-$serie?-pre[0-9].tar.gz", +"openssl-$serie-pre[0-9][0-9].tar.gz", +"openssl-$serie?-pre[0-9][0-9].tar.gz", +); my $tomove_oldsrc = "$srcdir/old/$serie"; my @tomove_src = - map { -my $x = $_; -$x =~ s|.*/||g; -grep( /^$x$/, @distfiles ) ? () : $x - } + map { basename ($_) } grep { -f $_ } - glob("$srcdir/openssl-$serie.tar.gz $srcdir/openssl-$serie?.tar.gz"); + map { glob("$srcdir/$_") } + @glob_patterns; my $tomove_oldftp = "$ftpdir/old/$serie"; my @tomove_ftp = - map { -my $x = $_; -$x =~ s|.*/||g; -grep( /^$x$/, @distfiles ) ? () : $x - } + map { basename ($_) } grep { -f $_ } - glob("$ftpdir/openssl-$serie.tar.gz $ftpdir/openssl-$serie?.tar.gz"); + map { glob("$ftpdir/$_") } + @glob_patterns; mkdir $tomove_oldsrc or die "Couldn't mkdir $tomove_oldsrc : $!" @@ -169,6 +166,14 @@ if ($do_copy) { } print "Moved old distributions files to source/old and ftp/old directories\n"; + +foreach (@distfiles) { +system("cp $tmpdir/$_ $srcdir/$_"); +die "Error copying $_ to source directory!" if $?; +system("cp $tmpdir/$_ $ftpdir/$_"); +die "Error copying $_ to ftp directory!" if $?; +} +print "Copied distributions files to source and ftp directories\n"; } else { print "Test mode: no files copied\n"; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via ddda55afb15458bc21187ef80397134193a8982e (commit) from 845c25d8db7fc784cbf92a523300376a8d69b2a1 (commit) - Log - commit ddda55afb15458bc21187ef80397134193a8982e Author: Rich Salz Date: Wed May 23 11:44:44 2018 -0400 Add --web and --tools to support other repo's. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/tools/pull/1t) --- Summary of changes: review-tools/addrev| 4 review-tools/gitaddrev | 9 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/review-tools/addrev b/review-tools/addrev index 0bd28a5..ce770f3 100755 --- a/review-tools/addrev +++ b/review-tools/addrev @@ -22,6 +22,10 @@ foreach (@ARGV) { $args .= "--rmreviewers "; } elsif (/^--trivial$/) { $args .= "--trivial "; +} elsif (/^--web$/) { +$args .= "--web "; +} elsif (/^--tools$/) { +$args .= "--tools "; } elsif (/^--verbose$/) { $args .= "--verbose "; } elsif (/^--noself$/) { diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 2beb48a..cf041d4 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -21,6 +21,7 @@ my $num = 0; my $refuse = 0; my $prnum = 0; my $verbose = 0; +my $WHAT = 'openssl'; my $query = OpenSSL::Query->new(); @@ -99,6 +100,10 @@ foreach (@ARGV) { try_add_reviewer($1); } elsif (/^--verbose$/) { $verbose = 1; +} elsif (/^--web$/) { +$WHAT = 'web'; +} elsif (/--tools$/) { +$WHAT = 'tools' } } @@ -189,7 +194,7 @@ my $last_is_rev = 0; foreach (@commit_message) { # Start each line with assuming it's not a reviewed-by line $last_is_rev = 0; -if (/^\(Merged from https:\/\/github\.com\/openssl\/openssl\/pull\//) { +if (/^\(Merged from https:\/\/github\.com\/openssl\/$WHAT\/pull\//) { next if $rmrev == 1; $last_is_rev = 1; next; # Because we're rewriting it below @@ -211,5 +216,5 @@ if ($rmrev == 0) { } } -print "(Merged from https://github.com/openssl/openssl/pull/$prnum)\n" +print "(Merged from https://github.com/openssl/$WHAT/pull/$prnum)\n" if $prnum; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 845c25d8db7fc784cbf92a523300376a8d69b2a1 (commit) from c0ba851e324ad25cf4734ea93b22e315a51e5106 (commit) - Log - commit 845c25d8db7fc784cbf92a523300376a8d69b2a1 Author: Matt Caswell Date: Tue Feb 13 11:16:42 2018 + tls1_3 is now on by default so we should instead test no-tls1_3 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/11) --- Summary of changes: run-checker/run-checker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run-checker/run-checker.sh b/run-checker/run-checker.sh index 23121b1..843cccb 100755 --- a/run-checker/run-checker.sh +++ b/run-checker/run-checker.sh @@ -42,7 +42,7 @@ no-static-engine no-stdio no-threads no-ts enable-ubsan no-ui enable-unit-test no-whirlpool enable-weak-ssl-ciphers enable-zlib enable-zlib-dynamic 386 no-dtls no-tls no-ssl3 no-tls1 no-tls1_1 no-tls1_2 no-dtls1 no-dtls1_2 no-ssl3-method no-tls1-method no-tls1_1-method -no-tls1_2-method no-dtls1-method no-dtls1_2-method no-siphash enable-tls1_3 ) +no-tls1_2-method no-dtls1-method no-dtls1_2-method no-siphash no-tls1_3 ) run-hook () { local hookname=$1; shift _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via a3215cfa675b64baaa570f374c55f098479b0df6 (commit) from f37c4f5e3a9ef27283a395ffd0975e78067121ea (commit) - Log - commit a3215cfa675b64baaa570f374c55f098479b0df6 Author: Rich Salz Date: Sun May 20 21:00:32 2018 -0400 Add --web flag for web repo Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/tools/pull/13) --- Summary of changes: review-tools/ghmerge | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index b1aebb9..ea6b0ec 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -2,16 +2,22 @@ set -o errexit +WHAT=openssl +BUILD=yes +TRIVIAL="" +MERGE="yes" + if [ ! -d .git ] ; then echo Not at top-level exit 1 fi -TRIVIAL="" +if [ "$1" = "--web" ] ; then +WHAT=web ; MERGE=yes ; BUILD=no ; shift +fi if [ "$1" == "--trivial" ] ; then TRIVIAL="--trivial" ; shift fi -MERGE="yes" if [ "$1" == "--merge" -o "$1" == "--squash" ] ; then MERGE=yes ; shift fi @@ -31,7 +37,7 @@ case "$PRNUM" in ;; esac -curl -s https://api.github.com/repos/openssl/openssl/pulls/$PRNUM >/tmp/gh$$ +curl -s https://api.github.com/repos/openssl/$WHAT/pulls/$PRNUM >/tmp/gh$$ TEAM=$* set -- `python -c ' from __future__ import print_function @@ -61,7 +67,7 @@ function cleanup { trap 'cleanup' EXIT -git pull --rebase https://github.com/$WHO/openssl.git $BRANCH +git pull --rebase https://github.com/$WHO/$WHAT.git $BRANCH git rebase $REL echo Diff against $REL git diff $REL _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via c0ba851e324ad25cf4734ea93b22e315a51e5106 (commit) from a3215cfa675b64baaa570f374c55f098479b0df6 (commit) - Log - commit c0ba851e324ad25cf4734ea93b22e315a51e5106 Author: Rich Salz Date: Mon May 21 08:13:07 2018 -0400 Add --tools flag Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/tools/pull/14) --- Summary of changes: review-tools/ghmerge | 4 1 file changed, 4 insertions(+) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index ea6b0ec..7f00b7c 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -12,6 +12,9 @@ if [ ! -d .git ] ; then exit 1 fi +if [ "$1" = "--tools" ] ; then +WHAT=tools ; MERGE=yes ; BUILD=no ; shift +fi if [ "$1" = "--web" ] ; then WHAT=web ; MERGE=yes ; BUILD=no ; shift fi @@ -82,6 +85,7 @@ if [ "$MERGE" == "yes" ] ; then else git rebase $WORK fi + # echo Rebuilding # opensslbuild |& tail -3 _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via f37c4f5e3a9ef27283a395ffd0975e78067121ea (commit) from 232417f8a0c556b5325d14ebc7630b776b2f1dfd (commit) - Log - commit f37c4f5e3a9ef27283a395ffd0975e78067121ea Author: Richard Levitte Date: Mon May 7 09:53:44 2018 +0200 QueryApp: keep the bureau parameter key for backward compatibility --- Summary of changes: QueryApp/lib/OpenSSL/Query/Role/OMC.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/QueryApp/lib/OpenSSL/Query/Role/OMC.pm b/QueryApp/lib/OpenSSL/Query/Role/OMC.pm index 9410084..6cce602 100644 --- a/QueryApp/lib/OpenSSL/Query/Role/OMC.pm +++ b/QueryApp/lib/OpenSSL/Query/Role/OMC.pm @@ -17,13 +17,14 @@ use File::Spec::Functions; use Moo::Role; has omc => ( is => 'ro' ); +has bureau => ( is => 'ro' ); # Backward compat, omc takes precedense sub _find_file { my $self = shift; my $filename = shift; my $envvar = shift; - my $omc = $ENV{OMC} // $ENV{BUREAU} // $self->omc; + my $omc = $ENV{OMC} // $self->omc // $ENV{BUREAU} // $self->bureau; my @paths = ( $ENV{$envvar} // (), $omc ? catfile($omc, $filename) : (), catfile('.', $filename) ); _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 232417f8a0c556b5325d14ebc7630b776b2f1dfd (commit) via 73ef6aa692b56c1602abcb4fd090077cb7234d95 (commit) from ba63b292f904eca32e6c707575af3bee1a238172 (commit) - Log - commit 232417f8a0c556b5325d14ebc7630b776b2f1dfd Author: Richard Levitte Date: Mon May 7 09:39:37 2018 +0200 release-tools, review-tools: bureau => omc rename commit 73ef6aa692b56c1602abcb4fd090077cb7234d95 Author: Richard Levitte Date: Mon May 7 09:38:52 2018 +0200 clacheck: bureau => omc rename --- Summary of changes: clacheck/clacheck.py| 2 +- release-tools/README.md | 2 +- review-tools/README | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/clacheck/clacheck.py b/clacheck/clacheck.py index f63d9b2..afa09f0 100755 --- a/clacheck/clacheck.py +++ b/clacheck/clacheck.py @@ -18,7 +18,7 @@ Trivial = re.compile("^\s*CLA\s*:\s*TRIVIAL", re.IGNORECASE) URLpattern = re.compile("https?://([^/]*)/(.*)") SUCCESS = 'success' FAILURE = 'failure' -CLAFILE = "/var/cache/openssl/checkouts/bureau/cladb.txt" # +CLAFILE = "/var/cache/openssl/checkouts/omc/cladb.txt" # null_actions = ( 'assigned', 'unassigned', 'labeled', 'unlabeled', 'closed', diff --git a/release-tools/README.md b/release-tools/README.md index c10cb75..5376eec 100644 --- a/release-tools/README.md +++ b/release-tools/README.md @@ -221,7 +221,7 @@ Unfreeze the repository. ssh openssl-...@git.openssl.org unfreeze openssl If this release includes security fixes with a CVE then you should inform -MITRE about them. See the instructions at the top of cvepool.txt in bureau. +MITRE about them. See the instructions at the top of cvepool.txt in omc. Check mailing lists over the next few hours for reports of any success or failure. If necessary fix these and in the worst case make another diff --git a/review-tools/README b/review-tools/README index e601cc6..83f7802 100644 --- a/review-tools/README +++ b/review-tools/README @@ -13,7 +13,7 @@ Environment Some of the scripts use the information REST API on https://api.openssl.org. If you have direct access to the databases and want to use that instead, set -the environment variable BUREAU to the directory where they are located. +the environment variable OMC to the directory where they are located. The scripts === _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via ba63b292f904eca32e6c707575af3bee1a238172 (commit) from 6c9eac0cab97aa1e4d98721ef3e68452f1839c5e (commit) - Log - commit ba63b292f904eca32e6c707575af3bee1a238172 Author: Richard Levitte Date: Mon May 7 09:31:51 2018 +0200 QueryApp: rename bureau => omc, bump version --- Summary of changes: QueryApp/MANIFEST | 2 +- QueryApp/Makefile.PL | 2 +- QueryApp/bin/query.psgi | 18 +- QueryApp/lib/OpenSSL/Query/ClaDB.pm | 2 +- QueryApp/lib/OpenSSL/Query/PersonDB.pm| 2 +- QueryApp/lib/OpenSSL/Query/Role/{Bureau.pm => OMC.pm} | 8 6 files changed, 17 insertions(+), 17 deletions(-) rename QueryApp/lib/OpenSSL/Query/Role/{Bureau.pm => OMC.pm} (81%) diff --git a/QueryApp/MANIFEST b/QueryApp/MANIFEST index 99f1b16..d9f0654 100644 --- a/QueryApp/MANIFEST +++ b/QueryApp/MANIFEST @@ -1,7 +1,7 @@ bin/query.psgi lib/OpenSSL/Query/ClaDB.pm lib/OpenSSL/Query/DB.pm -lib/OpenSSL/Query/Role/Bureau.pm +lib/OpenSSL/Query/Role/OMC.pm lib/OpenSSL/Query/PersonDB.pm Makefile.PL MANIFEST diff --git a/QueryApp/Makefile.PL b/QueryApp/Makefile.PL index bb1dac9..56d57ca 100644 --- a/QueryApp/Makefile.PL +++ b/QueryApp/Makefile.PL @@ -4,7 +4,7 @@ use warnings; use inc::Module::Install; name 'QueryApp'; -version '1.2'; +version '2.0'; abstract 'An OpenSSL query web app'; author q{Richard Levitte }; license 'apache'; diff --git a/QueryApp/bin/query.psgi b/QueryApp/bin/query.psgi index ec9a994..523fb8f 100644 --- a/QueryApp/bin/query.psgi +++ b/QueryApp/bin/query.psgi @@ -55,7 +55,7 @@ use OpenSSL::Query::DB; use URI::Encode qw(uri_decode); set serializer => 'JSON'; -set bureau => '/var/cache/openssl/checkouts/bureau'; +set omc => '/var/cache/openssl/checkouts/omc'; # Version 0 API. # Feel free to add new routes, but never to change them or remove them, @@ -73,7 +73,7 @@ sub name_decode { } get '/People' => sub { - my $query = OpenSSL::Query->new(bureau => config->{bureau}); + my $query = OpenSSL::Query->new(omc => config->{omc}); my @response = $query->list_people(); return [ @response ] if @response; @@ -81,7 +81,7 @@ get '/People' => sub { }; get '/Person/:name' => sub { - my $query = OpenSSL::Query->new(bureau => config->{bureau}); + my $query = OpenSSL::Query->new(omc => config->{omc}); my $name = name_decode(uri_decode(param('name'))); my %response = $query->find_person($name); @@ -90,7 +90,7 @@ get '/Person/:name' => sub { }; get '/Person/:name/Membership' => sub { - my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); + my $query = OpenSSL::Query->new(omc => config->{omc}, REST => 0); my $name = name_decode(uri_decode(param('name'))); my %response = $query->find_person($name); @@ -99,7 +99,7 @@ get '/Person/:name/Membership' => sub { }; get '/Person/:name/IsMemberOf/:group' => sub { - my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); + my $query = OpenSSL::Query->new(omc => config->{omc}, REST => 0); my $name = name_decode(uri_decode(param('name'))); my $group = uri_decode(param('group')); my $response = $query->is_member_of($name, $group); @@ -109,7 +109,7 @@ get '/Person/:name/IsMemberOf/:group' => sub { }; get '/Person/:name/ValueOfTag/:tag' => sub { - my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); + my $query = OpenSSL::Query->new(omc => config->{omc}, REST => 0); my $name = name_decode(uri_decode(param('name'))); my $tag = uri_decode(param('tag')); my $response = $query->find_person_tag($name, $tag); @@ -119,7 +119,7 @@ get '/Person/:name/ValueOfTag/:tag' => sub { }; get '/Person/:name/HasCLA' => sub { - my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); + my $query = OpenSSL::Query->new(omc => config->{omc}, REST => 0); my $name = name_decode(uri_decode(param('name'))); my %person = $query->find_person($name); my @response = (); @@ -134,7 +134,7 @@ get '/Person/:name/HasCLA' => sub { }; get '/Group/:group/Members' => sub { - my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); + my $query = OpenSSL::Query->new(omc => config->{omc}, REST => 0); my $group = uri_decode(param('group')); my @response = $query->members_of($group); @@ -143,7 +143,7 @@ get '/Group/:group/Members' => sub { }; get '/HasCLA/:id' => sub { - my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); + my $query = OpenSSL::Query->new(omc => config->{omc}, REST => 0); my $id = uri_decode(param('id')); if ($id =~ m|^\S+\@\S+$|) { my $response = $query->has_cla($id); diff --git a/QueryApp/lib/OpenSSL/Query/ClaDB.pm b/QueryApp/lib/OpenSSL/Query/
[openssl-commits] [tools] master update
The branch master has been updated via 6c9eac0cab97aa1e4d98721ef3e68452f1839c5e (commit) from fbf4b00f0993c7922ceb639f281a501169464f75 (commit) - Log - commit 6c9eac0cab97aa1e4d98721ef3e68452f1839c5e Author: Richard Levitte Date: Tue Apr 3 15:21:41 2018 +0200 release-tools/release-check.pl: handle versions like "1.1.1-pre4-dev" too --- Summary of changes: release-tools/release-check.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-tools/release-check.pl b/release-tools/release-check.pl index 2eac1e3..fe16e42 100644 --- a/release-tools/release-check.pl +++ b/release-tools/release-check.pl @@ -112,7 +112,7 @@ sub openssl_check_version_h { check_str( "opensslv.h: HEX version", $hexversion, $1, \$ok ); $hex_done = 1; } elsif (/OPENSSL_VERSION_TEXT\s+\"OpenSSL\s - ([^-\s]+(?!-fips)(?:-[^-\s]*)?) # version without -fips + ([^-\s]+(?!-fips)(?:-[^-\s]*)*) # version without -fips \s+ (\([[:alpha:]]+\)\s+)?# Possible lable (.*)\"# The rest (date) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via fbf4b00f0993c7922ceb639f281a501169464f75 (commit) from 3c38191688d11d556dee96ddf3c9edf87491d52b (commit) - Log - commit fbf4b00f0993c7922ceb639f281a501169464f75 Author: Matt Caswell Date: Wed Mar 28 10:39:04 2018 +0100 Add a reminder to include a link to the advisory in newflash.txt --- Summary of changes: release-tools/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release-tools/README.md b/release-tools/README.md index 93888cf..c10cb75 100644 --- a/release-tools/README.md +++ b/release-tools/README.md @@ -94,7 +94,8 @@ The changes in this section should be made in your copy of the web repo. Update the news/newsflash.txt file. This normally is one or two lines. Just copy and paste existing announcements making minor changes for the date and -version number as necessary. +version number as necessary. If there is an advisory then ensure you include a +link to it. Update the news/vulnerabilities.xml file if appropriate. _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 3c38191688d11d556dee96ddf3c9edf87491d52b (commit) from d54658dd5fd7d7de0f967055b8933f1a5eb2c88e (commit) - Log - commit 3c38191688d11d556dee96ddf3c9edf87491d52b Author: Matt Caswell Date: Tue Mar 27 15:54:17 2018 +0100 Correct the notes for doing a release --- Summary of changes: release-tools/README.md | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/release-tools/README.md b/release-tools/README.md index acdceb3..93888cf 100644 --- a/release-tools/README.md +++ b/release-tools/README.md @@ -54,6 +54,9 @@ the directory where this README is): $HERE/do-copyright-year +Obtain approval for these commits from the reviewer and add the reviewed-by +headers as required. + Perform the local automated release steps. This can normally be done with: perl $HERE/mkrelease.pl --reviewer=NAME @@ -199,7 +202,7 @@ openssl user home directory, and then do the following sudo -u openssl gpg -u 8B3D79F5 --clearsign secadv_FILENAME sudo -u openssl mutt -s "OpenSSL Security Advisory" \ -openssl-project openssl-users openssl-announce +openssl-project openssl-users openssl-announce \ <~openssl/secadv_FILENAME.txt.asc Approve the openssl-announce email. Go to _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via d54658dd5fd7d7de0f967055b8933f1a5eb2c88e (commit) from 9b9a6e181f1e52b5b9eaef975c31885324db4ece (commit) - Log - commit d54658dd5fd7d7de0f967055b8933f1a5eb2c88e Author: Richard Levitte Date: Tue Mar 27 15:18:00 2018 +0200 release-tools: More precise extraction of version number, avoiding fips version --- Summary of changes: release-tools/release-check.pl | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/release-tools/release-check.pl b/release-tools/release-check.pl index 42fbbfc..2eac1e3 100644 --- a/release-tools/release-check.pl +++ b/release-tools/release-check.pl @@ -111,8 +111,12 @@ sub openssl_check_version_h { if (/OPENSSL_VERSION_NUMBER\s+(0x[0-9a-f]+)L/) { check_str( "opensslv.h: HEX version", $hexversion, $1, \$ok ); $hex_done = 1; -} elsif ( -/OPENSSL_VERSION_TEXT\s+\"OpenSSL ([^-\s]+(?:-[^-\s]*)?)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/ +} elsif (/OPENSSL_VERSION_TEXT\s+\"OpenSSL\s + ([^-\s]+(?!-fips)(?:-[^-\s]*)?) # version without -fips + \s+ + (\([[:alpha:]]+\)\s+)?# Possible lable + (.*)\"# The rest (date) +/x ) { check_str( "opensslv.h: version", $version, $1, \$ok ); _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 9b9a6e181f1e52b5b9eaef975c31885324db4ece (commit) from ab0c22d2655c626cbc93835d9f3042be28efa64c (commit) - Log - commit 9b9a6e181f1e52b5b9eaef975c31885324db4ece Author: Richard Levitte Date: Tue Mar 27 15:18:00 2018 +0200 release-tools: More precise extraction of version number, avoiding fips version --- Summary of changes: release-tools/release-check.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-tools/release-check.pl b/release-tools/release-check.pl index cac5918..42fbbfc 100644 --- a/release-tools/release-check.pl +++ b/release-tools/release-check.pl @@ -112,7 +112,7 @@ sub openssl_check_version_h { check_str( "opensslv.h: HEX version", $hexversion, $1, \$ok ); $hex_done = 1; } elsif ( -/OPENSSL_VERSION_TEXT\s+\"OpenSSL (\S*)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/ +/OPENSSL_VERSION_TEXT\s+\"OpenSSL ([^-\s]+(?:-[^-\s]*)?)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/ ) { check_str( "opensslv.h: version", $version, $1, \$ok ); _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via ab0c22d2655c626cbc93835d9f3042be28efa64c (commit) from 38108eb94667a35f449685fc34832b1255311b13 (commit) - Log - commit ab0c22d2655c626cbc93835d9f3042be28efa64c Author: Rich Salz Date: Mon Mar 26 15:16:51 2018 -0400 Ignore CHANGES changes --- Summary of changes: license/add-lastchance | 1 + license/get-summary| 1 + 2 files changed, 2 insertions(+) diff --git a/license/add-lastchance b/license/add-lastchance index 5a21f03..e763b6e 100755 --- a/license/add-lastchance +++ b/license/add-lastchance @@ -72,6 +72,7 @@ while ( <> ) { open my $F, "git diff --numstat $pattern|" || die "Can't open git diff, $!\n"; while ( <$F> ) { + next if /CHANGES/; $files++; next unless /(\d+)\s+(\d+)\s+(.*)/; $adds += int($1); diff --git a/license/get-summary b/license/get-summary index 46e0efd..3e0089c 100755 --- a/license/get-summary +++ b/license/get-summary @@ -26,6 +26,7 @@ while ( <$FH> ) { open my $F, "git diff --numstat $pattern|" || die "Can't open git diff, $!\n"; while ( <$F> ) { + next if /CHANGES/; $files++; next unless /(\d+)\s+(\d+)\s+(.*)/; $adds += int($1); _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 38108eb94667a35f449685fc34832b1255311b13 (commit) from c24b4571fda7c7bfa526f91494d61f7bc94c4807 (commit) - Log - commit 38108eb94667a35f449685fc34832b1255311b13 Author: Rich Salz Date: Mon Mar 26 14:32:54 2018 -0400 Add -m flag --- Summary of changes: license/rmcommit | 41 ++--- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/license/rmcommit b/license/rmcommit index f128c47..02bc769 100755 --- a/license/rmcommit +++ b/license/rmcommit @@ -1,9 +1,14 @@ #! /usr/bin/env python -"""Remove commits from a user. +"""Remove commits from the log. + +Flags: +-m X Just the specified commits from the user X + +Arguments is a list of commit prefixes. """ import mysql.connector, os, re, subprocess, sys -import string, random +import getopt, string, random dbconfig = { 'user': 'license', 'password': open('rwpass.txt').read().strip(), @@ -12,22 +17,36 @@ dbconfig = { conn = mysql.connector.connect(**dbconfig) cursor = conn.cursor() -# Get email identifier -cursor.execute('SELECT uid FROM users WHERE email = %s', (sys.argv[1],)) email = None -for c in cursor: -email = c[0] -if not email: -print sys.argv[1], "not found" +try: +opts, args = getopt.getopt(sys.argv[1:], "hm:") +except: +print __doc__ raise SystemExit +for o,a in opts: +if o == '-h': +print __doc__ +raise SystemExit +elif o == '-m': +cursor.execute('SELECT uid FROM users WHERE email = %s', (a,)) +for c in cursor: +email = c[0] +if not email: +print a, "not found" +raise SystemExit -for cids in sys.argv[2:]: +for cids in args: pat = cids + '%' cursor.execute('SELECT cid FROM commits WHERE commit LIKE %s', (pat,)) cid = None for c in cursor: cid = c[0] if cid: -cursor.execute('DELETE FROM log WHERE uid=%s AND cid LIKE %s', -(email, cid)) +if email: +cursor.execute('DELETE FROM log WHERE uid=%s AND cid=%s', +(email, cid)) +else: +cursor.execute('DELETE FROM log WHERE cid=%s', (cid,)) conn.commit() +else: +print "Commit", cids, "not found" _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via c24b4571fda7c7bfa526f91494d61f7bc94c4807 (commit) from c4cba40bbb70057a10b858829a8d2c3289cb356d (commit) - Log - commit c24b4571fda7c7bfa526f91494d61f7bc94c4807 Author: Matt Caswell Date: Tue Mar 20 14:28:56 2018 + Tweak the release instructions --- Summary of changes: release-tools/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/release-tools/README.md b/release-tools/README.md index 7b3767e..acdceb3 100644 --- a/release-tools/README.md +++ b/release-tools/README.md @@ -170,12 +170,13 @@ Check the download page has updated properly: Check the notes look sensible at: -https://www.openssl.org/news/news.html +https://www.openssl.org/news/newslog.html Also check the notes here: https://www.openssl.org/news/openssl-1.0.2-notes.html https://www.openssl.org/news/openssl-1.1.0-notes.html +https://www.openssl.org/news/openssl-1.1.1-notes.html ## Send the announcement mail _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via c4cba40bbb70057a10b858829a8d2c3289cb356d (commit) from dd672a5f06f5ca4e516170902f1876b249445351 (commit) - Log - commit c4cba40bbb70057a10b858829a8d2c3289cb356d Author: Rich Salz Date: Mon Mar 19 13:44:32 2018 -0400 Add net changes --- Summary of changes: license/get-summary | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/license/get-summary b/license/get-summary index b88627f..46e0efd 100755 --- a/license/get-summary +++ b/license/get-summary @@ -18,13 +18,10 @@ while ( <$FH> ) { } next unless /([0-da-f]{8}) .*/; my $cid = $1; -# Skip a big import -next if $cid eq 'd02b48c6'; my $pattern = "$cid^..$cid"; my $files = 0; my $adds = 0; my $dels = 0; -my $name = ''; $total++; open my $F, "git diff --numstat $pattern|" || die "Can't open git diff, $!\n"; @@ -33,17 +30,18 @@ while ( <$FH> ) { next unless /(\d+)\s+(\d+)\s+(.*)/; $adds += int($1); $dels += int($2); - $name = $3 if $name eq ''; } $tot_files += $files; $tot_adds += $adds; $tot_dels += $dels; close $F || die "Can't close git diff, $!\n"; } +close $FH || die "Can't close, $!,"; + printf "Authors : %4d\n", $authors; printf "Commits : %4d\n", $total; printf "Files: %4d (%.2f average)\n", $tot_files, $tot_files / $total; printf "Added lines : %4d (%.2f average)\n", $tot_adds, $tot_adds / $total; printf "Deleted lines: %4d (%.2f average)\n", $tot_dels, $tot_dels / $total; - -close $FH || die "Can't close, $!,"; +my $tot = $tot_adds - $tot_dels; +printf "Net change : %4d (%.2f average)\n", $tot, $tot / $total; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via dd672a5f06f5ca4e516170902f1876b249445351 (commit) from 78f6c4c25ac5a0264903aefa00dfd5ab71da9fff (commit) - Log - commit dd672a5f06f5ca4e516170902f1876b249445351 Author: Rich Salz Date: Tue Mar 6 14:34:26 2018 -0500 Formatting --- Summary of changes: license/get-summary | 14 ++ 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/license/get-summary b/license/get-summary index b1b51df..b88627f 100755 --- a/license/get-summary +++ b/license/get-summary @@ -10,7 +10,12 @@ my $total = 0; my $tot_adds = 0; my $tot_files = 0; my $tot_dels = 0; +my $authors = 0; while ( <$FH> ) { +if ( /https:/ ) { + $authors++; + next; +} next unless /([0-da-f]{8}) .*/; my $cid = $1; # Skip a big import @@ -35,9 +40,10 @@ while ( <$FH> ) { $tot_dels += $dels; close $F || die "Can't close git diff, $!\n"; } -print "Commits : $total\n"; -print "Files: $tot_files avg ", $tot_files / $total, "\n"; -print "Added lines : $tot_adds avg ", $tot_adds / $total, "\n"; -print "Deleted lines: $tot_dels avg ", $tot_dels / $total, "\n"; +printf "Authors : %4d\n", $authors; +printf "Commits : %4d\n", $total; +printf "Files: %4d (%.2f average)\n", $tot_files, $tot_files / $total; +printf "Added lines : %4d (%.2f average)\n", $tot_adds, $tot_adds / $total; +printf "Deleted lines: %4d (%.2f average)\n", $tot_dels, $tot_dels / $total; close $FH || die "Can't close, $!,"; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 78f6c4c25ac5a0264903aefa00dfd5ab71da9fff (commit) from b884ccda58cf9e72c56f76d5aeac1663860d8c0b (commit) - Log - commit 78f6c4c25ac5a0264903aefa00dfd5ab71da9fff Author: Rich Salz Date: Tue Mar 6 11:58:48 2018 -0500 Add summary script --- Summary of changes: license/get-summary | 43 +++ 1 file changed, 43 insertions(+) create mode 100755 license/get-summary diff --git a/license/get-summary b/license/get-summary new file mode 100755 index 000..b1b51df --- /dev/null +++ b/license/get-summary @@ -0,0 +1,43 @@ +#! /usr/bin/env perl +# Annotate the output of "get-followups -d" to show the summary +# of all outstanding commits. +use strict; +use warnings; + +open my $FH, "./get-followups -d|" || die "Can't pipe, $!,"; + +my $total = 0; +my $tot_adds = 0; +my $tot_files = 0; +my $tot_dels = 0; +while ( <$FH> ) { +next unless /([0-da-f]{8}) .*/; +my $cid = $1; +# Skip a big import +next if $cid eq 'd02b48c6'; +my $pattern = "$cid^..$cid"; +my $files = 0; +my $adds = 0; +my $dels = 0; +my $name = ''; +$total++; +open my $F, "git diff --numstat $pattern|" + || die "Can't open git diff, $!\n"; +while ( <$F> ) { + $files++; + next unless /(\d+)\s+(\d+)\s+(.*)/; + $adds += int($1); + $dels += int($2); + $name = $3 if $name eq ''; +} +$tot_files += $files; +$tot_adds += $adds; +$tot_dels += $dels; +close $F || die "Can't close git diff, $!\n"; +} +print "Commits : $total\n"; +print "Files: $tot_files avg ", $tot_files / $total, "\n"; +print "Added lines : $tot_adds avg ", $tot_adds / $total, "\n"; +print "Deleted lines: $tot_dels avg ", $tot_dels / $total, "\n"; + +close $FH || die "Can't close, $!,"; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via b884ccda58cf9e72c56f76d5aeac1663860d8c0b (commit) from 9be200755a8b9d64b1f3d60b62e0e8909facc976 (commit) - Log - commit b884ccda58cf9e72c56f76d5aeac1663860d8c0b Author: Rich Salz Date: Sat Mar 3 16:20:49 2018 -0500 Script to generate AUTHORS file text --- Summary of changes: license/get-authors | 35 +++ 1 file changed, 35 insertions(+) create mode 100755 license/get-authors diff --git a/license/get-authors b/license/get-authors new file mode 100755 index 000..32c6bd1 --- /dev/null +++ b/license/get-authors @@ -0,0 +1,35 @@ +#! /usr/bin/env python +"""get-authors + +Outputs text for an AUTHORS file. No parameters. +""" + +import mysql.connector +import datetime, os, re, subprocess, sys, string, random +import getopt + +dbconfig = { +'user': 'licensereader', +'password': open('ropass.txt').read().strip(), +'database': 'license' +} +conn = mysql.connector.connect(**dbconfig) +cursor = conn.cursor() + +try: +opts, args = getopt.getopt(sys.argv[1:], "") +except: +print __doc__ +raise SystemExit + +for o,a in opts: +pass + +q = "SELECT name,email FROM users WHERE reply='y' OR reply='d' ORDER BY name" +cursor.execute(q) +for row in cursor: +name,email = row +if name == email: +print "<%s>" % (name,) +else: +print "%s <%s>" % (name, email) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 9be200755a8b9d64b1f3d60b62e0e8909facc976 (commit) from d0ea3ada5275a432bd0e0fa4885f2b4df5668701 (commit) - Log - commit 9be200755a8b9d64b1f3d60b62e0e8909facc976 Author: Rich Salz Date: Fri Mar 2 15:02:51 2018 -0500 Remove debugging print --- Summary of changes: license/approved | 1 - 1 file changed, 1 deletion(-) diff --git a/license/approved b/license/approved index eb0b218..c501bf8 100755 --- a/license/approved +++ b/license/approved @@ -37,7 +37,6 @@ for o,a in opts: verbose = 1 elif o == '-m': comment = datetime.date.today().strftime('Email %Y-%m-%d') -print comment else: print __doc__ raise SystemExit _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via d0ea3ada5275a432bd0e0fa4885f2b4df5668701 (commit) from 11eee1439b2d9ed968d9bf39997765811f5c88a5 (commit) - Log - commit d0ea3ada5275a432bd0e0fa4885f2b4df5668701 Author: Rich Salz Date: Fri Mar 2 10:41:14 2018 -0500 Add -m flag --- Summary of changes: license/approved | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/license/approved b/license/approved index 0cc2847..eb0b218 100755 --- a/license/approved +++ b/license/approved @@ -3,6 +3,7 @@ Flags: -c text... Comment to use +-m Use email+date as the comment -r Reject not approve -h This help -v List emails as processed @@ -26,7 +27,7 @@ cursor = conn.cursor() comment = 'From CLI'; reply = 'y' verbose = 0 -opts, args = getopt.getopt(sys.argv[1:], "c:hrv") +opts, args = getopt.getopt(sys.argv[1:], "c:hrvm") for o,a in opts: if o == '-c': comment = a @@ -34,6 +35,9 @@ for o,a in opts: reply = 'n' elif o == '-v': verbose = 1 +elif o == '-m': +comment = datetime.date.today().strftime('Email %Y-%m-%d') +print comment else: print __doc__ raise SystemExit _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 11eee1439b2d9ed968d9bf39997765811f5c88a5 (commit) via 5d89101b1a73f36045a2dd1c2c2b2cd4f92512f7 (commit) from bffcd7e08a130d77ad480e35a3eec485fe06d23b (commit) - Log - commit 11eee1439b2d9ed968d9bf39997765811f5c88a5 Author: Rich Salz Date: Fri Mar 2 07:57:29 2018 -0500 Add last-chance update commit 5d89101b1a73f36045a2dd1c2c2b2cd4f92512f7 Author: Rich Salz Date: Fri Mar 2 07:56:53 2018 -0500 Reformatting --- Summary of changes: license/add-lastchance | 39 ++- license/index.html | 7 +++ 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/license/add-lastchance b/license/add-lastchance index 963da01..5a21f03 100755 --- a/license/add-lastchance +++ b/license/add-lastchance @@ -6,7 +6,8 @@ use warnings; die "Feed this the output of 'get-followups -d'\n" if -t 0; -print <<'EOF'; +my $blog = 'https://www.openssl.org//blog/blog/2017/03/22/license'; +print < Help find these people @@ -14,25 +15,22 @@ print <<'EOF'; Help find these people - -We are looking for some people who have previously contributed to OpenSSL. See -https://www.openssl.org//blog/blog/2017/03/22/license/";>https://www.openssl.org/blog/blog/2017/03/22/license/ -for some background. - -If you know where to find any of the following people, please email their -current address to -mailto:lice...@openssl.org";>lice...@openssl.org, -or ask them to get in touch. - - -Each contributor is separated by a blank line. The first line is the last -known email we have (not valid), and the full name if known. Each following -line has the number of files changed, lines added and deleted, the commit ID -and date, and then the commit subject line. - - -Thank you! - +We are looking for some people who have previously contributed +to OpenSSL. See $blog for some background. +If you know where to find any of the following people, please +email their current address to +mailto:license\@openssl.org";>license\@openssl.org, +or ask them to get in touch. + +Each contributor is separated by a blank line. The first +line is the last known email we have, and the full name if known. +Each following line has the number of files changed, lines added +and deleted, the commit ID and date, and then the commit subject line. + +Thank you! + +Main page + EOF my $users = 0; @@ -84,7 +82,6 @@ while ( <> ) { } print < $users contributors, $commits commits diff --git a/license/index.html b/license/index.html index 2335ddb..300f223 100644 --- a/license/index.html +++ b/license/index.html @@ -15,6 +15,13 @@ https://www.apache.org/licenses/LICENSE-2.0.txt";> Apache License Version 2.0. + +Update: We are looking for the last few contributors, please +see the https://license.openssl.org/trying-to-find +page. Share it with your friends and colleagues who might have worked +on or with OpenSSL. + If you received an email from us, please visit that link in a _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via bffcd7e08a130d77ad480e35a3eec485fe06d23b (commit) from fcdb9f7458689f85815d9bd81d4b7c6dfdd5ced8 (commit) - Log - commit bffcd7e08a130d77ad480e35a3eec485fe06d23b Author: Rich Salz Date: Thu Mar 1 20:03:03 2018 -0500 Enhance "trying to find" page generator Make links to each commit. Put summary counts at the end. --- Summary of changes: license/add-lastchance | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/license/add-lastchance b/license/add-lastchance index 8249952..963da01 100755 --- a/license/add-lastchance +++ b/license/add-lastchance @@ -16,7 +16,7 @@ print <<'EOF'; Help find these people We are looking for some people who have previously contributed to OpenSSL. See -https://www.openssl.org/blog/blog/2017/03/22/license/ +https://www.openssl.org//blog/blog/2017/03/22/license/";>https://www.openssl.org/blog/blog/2017/03/22/license/ for some background. If you know where to find any of the following people, please email their @@ -33,11 +33,14 @@ and date, and then the commit subject line. Thank you! - EOF +my $users = 0; +my $commits = 0; +my $base = 'https://github.com/openssl/openssl/commit'; while ( <> ) { unless ( /([0-da-f]{8}) .*/ ) { + $users++ if /https:/; s/.*uid.[0-9]+, //; s/, \d, /, /; s/"//g; @@ -50,13 +53,18 @@ while ( <> ) { } else { print; } + print "\n"; next; } +$commits++; my $cid = $1; +chop; my $line = $_; $line =~ s/^\s*//; +$line =~ s/\n"; next; } my $pattern = "$cid^..$cid"; @@ -72,11 +80,13 @@ while ( <> ) { $dels += int($2); } close $F || die "Can't close git diff, $!\n"; -print "$files +$adds -$dels $line"; +print "$files +$adds -$dels $line\n"; } -print <<'EOF'; +print < +$users contributors, $commits commits + Main page _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via fcdb9f7458689f85815d9bd81d4b7c6dfdd5ced8 (commit) from b56ac254a6398d5611e8b48fad9c50e43520ea31 (commit) - Log - commit fcdb9f7458689f85815d9bd81d4b7c6dfdd5ced8 Author: Richard Levitte Date: Thu Mar 1 11:30:41 2018 +0100 addrev: better parsing of github IDs dot-asm was accepted but not t-j-h --- Summary of changes: review-tools/addrev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/review-tools/addrev b/review-tools/addrev index fdf2aa5..0bd28a5 100755 --- a/review-tools/addrev +++ b/review-tools/addrev @@ -14,7 +14,7 @@ my $useself = 1; my $my_email; foreach (@ARGV) { -if (/^[a-z]+$/ || /^\@(?:\w|\w-\w)+$/) { +if (/^[a-z]+$/ || /^\@\w(?:[-\w]*\w)?$/) { $args .= "--reviewer=$_ "; } elsif (/^--reviewer=(.+)$/) { $args .= "--reviewer=$1 "; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via b56ac254a6398d5611e8b48fad9c50e43520ea31 (commit) from 4a45104b1146f500bd0db1c921d3101cd10099b4 (commit) - Log - commit b56ac254a6398d5611e8b48fad9c50e43520ea31 Author: Rich Salz Date: Fri Feb 23 16:03:26 2018 -0500 Formatting tweaks --- Summary of changes: license/add-lastchance | 24 +--- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/license/add-lastchance b/license/add-lastchance index 3d963f6..8249952 100755 --- a/license/add-lastchance +++ b/license/add-lastchance @@ -9,20 +9,28 @@ die "Feed this the output of 'get-followups -d'\n" if -t 0; print <<'EOF'; -Help find these hackers +Help find these people -Help find these hackers - +Help find these people + +We are looking for some people who have previously contributed to OpenSSL. See +https://www.openssl.org/blog/blog/2017/03/22/license/ +for some background. + If you know where to find any of the following people, please email their -current address to lice...@openssl.org, or ask them to get in touch. - +current address to +mailto:lice...@openssl.org";>lice...@openssl.org, +or ask them to get in touch. + + Each contributor is separated by a blank line. The first line is the last known email we have (not valid), and the full name if known. Each following line has the number of files changed, lines added and deleted, the commit ID and date, and then the commit subject line. - + + Thank you! @@ -69,6 +77,8 @@ while ( <> ) { print <<'EOF'; - + +Main page + EOF _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 4a45104b1146f500bd0db1c921d3101cd10099b4 (commit) via 8609abfd6aca838ed58095e670005791466e4307 (commit) from 81f14d3c92704e0a1bc18fdc5f47d62cf086812f (commit) - Log - commit 4a45104b1146f500bd0db1c921d3101cd10099b4 Author: Rich Salz Date: Wed Feb 21 14:17:49 2018 -0500 Add "last chance looking for" webpage generator commit 8609abfd6aca838ed58095e670005791466e4307 Author: Rich Salz Date: Wed Feb 21 13:54:21 2018 -0500 Secondary sort in email order --- Summary of changes: license/README | 2 ++ license/add-lastchance | 74 ++ license/get-followups | 2 +- 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100755 license/add-lastchance diff --git a/license/README b/license/README index aa713db..3db5742 100644 --- a/license/README +++ b/license/README @@ -10,6 +10,8 @@ Tools rmcommit -- Remove a set of commits from a user's activity rmuser -- Remove specified email authors from database whattoremove -- Commits to remove for folks who said no +add-counts -- add commit data to output of get-followups +add-lastchance -- "last chance trying to reach" version of add-counts Passwords; create these files. One line per each adpass.txt -- HTTP password for admin functions diff --git a/license/add-lastchance b/license/add-lastchance new file mode 100755 index 000..3d963f6 --- /dev/null +++ b/license/add-lastchance @@ -0,0 +1,74 @@ +#! /usr/bin/env perl +# Annotate the output of "get-followups -d" to show the stats +# of each commit for a "last chance trying to find" page. +use strict; +use warnings; + +die "Feed this the output of 'get-followups -d'\n" if -t 0; + +print <<'EOF'; + + +Help find these hackers + + + +Help find these hackers + +If you know where to find any of the following people, please email their +current address to lice...@openssl.org, or ask them to get in touch. + +Each contributor is separated by a blank line. The first line is the last +known email we have (not valid), and the full name if known. Each following +line has the number of files changed, lines added and deleted, the commit ID +and date, and then the commit subject line. + +Thank you! + + +EOF + +while ( <> ) { +unless ( /([0-da-f]{8}) .*/ ) { + s/.*uid.[0-9]+, //; + s/, \d, /, /; + s/"//g; + if ( /([^,]*), (.*)/ ) { + if ( $1 eq $2 ) { + print "<$1>\n"; + } else { + print "$2 <$1>\n"; + } + } else { + print; + } + next; +} +my $cid = $1; +my $line = $_; +$line =~ s/^\s*//; +if ( $cid eq 'd02b48c6' ) { + print "- +0/-0 ", $_; + next; +} +my $pattern = "$cid^..$cid"; +my $files = 0; +my $adds = 0; +my $dels = 0; +open my $F, "git diff --numstat $pattern|" + || die "Can't open git diff, $!\n"; +while ( <$F> ) { + $files++; + next unless /(\d+)\s+(\d+)\s+(.*)/; + $adds += int($1); + $dels += int($2); +} +close $F || die "Can't close git diff, $!\n"; +print "$files +$adds -$dels $line"; +} +print <<'EOF'; + + + + +EOF diff --git a/license/get-followups b/license/get-followups index 11fafb3..1d9472c 100755 --- a/license/get-followups +++ b/license/get-followups @@ -34,7 +34,7 @@ for o,a in opts: rows = [] q = ('SELECT users.uid,email,reply,name,count(log.uid) FROM users' ' LEFT JOIN log ON log.uid = users.uid' -' WHERE reply = "-" GROUP BY email ORDER BY count(log.uid)' ) +' WHERE reply = "-" GROUP BY email ORDER BY count(log.uid), email' ) cursor.execute(q) for row in cursor: uid,email,reply,name,count = row _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 81f14d3c92704e0a1bc18fdc5f47d62cf086812f (commit) via a930f701aee0dc0c4ad61ebc792c2281b1f90cbb (commit) from 4beedb93e58fd4a25c2d4a293dfade202c980633 (commit) - Log - commit 81f14d3c92704e0a1bc18fdc5f47d62cf086812f Author: Richard Levitte Date: Tue Feb 13 15:10:22 2018 +0100 release-tools/do-copyright-year: in file sed To make sure we don't lose file permissions, use sed -i Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/12) commit a930f701aee0dc0c4ad61ebc792c2281b1f90cbb Author: Richard Levitte Date: Tue Feb 13 15:08:37 2018 +0100 release-tools/do-copyright-year: don't resurect deleted files Use 'git diff-tree --name-status' to get the current status of each file. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/12) --- Summary of changes: release-tools/do-copyright-year | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release-tools/do-copyright-year b/release-tools/do-copyright-year index 59b9235..6c3d710 100755 --- a/release-tools/do-copyright-year +++ b/release-tools/do-copyright-year @@ -29,10 +29,10 @@ EOF NYD=`date +%Y-01-01` echo Updating copryight -git diff-tree -r --name-only `git rev-list -1 --before=$NYD HEAD`..HEAD \ - | while read FILE ; do -sed -E -f /tmp/sed$$ "$FILE" >/tmp/$$ -mv /tmp/$$ "$FILE" +git diff-tree -r --name-status `git rev-list -1 --before=$NYD HEAD`..HEAD \ + | while read STATUS FILE ; do +if [ "$STATUS" = 'D' ]; then continue; fi +sed -E -f /tmp/sed$$ -i "$FILE" git add "$FILE" done echo Committing change locally. _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 4beedb93e58fd4a25c2d4a293dfade202c980633 (commit) from 027c9909fca039095fe8c69ebe9bd3ce0bba59cd (commit) - Log - commit 4beedb93e58fd4a25c2d4a293dfade202c980633 Author: Rich Salz Date: Tue Feb 13 10:03:03 2018 -0500 Fix typo, mention GH source --- Summary of changes: release-tools/mkrelease.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release-tools/mkrelease.pl b/release-tools/mkrelease.pl index 4012e4d..69e337f 100644 --- a/release-tools/mkrelease.pl +++ b/release-tools/mkrelease.pl @@ -333,10 +333,11 @@ if ( !$no_release ) { Please download and check this $label release as soon as possible. To report a bug, open an issue on GitHub: -ttps://github.com/openssl/openssl/issues +https://github.com/openssl/openssl/issues Please check the release notes and mailing lists to avoid duplicate - reports of known issues. + reports of known issues. (Of course, the source is also available + on GitHub.) Yours, _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 027c9909fca039095fe8c69ebe9bd3ce0bba59cd (commit) from 9d9fdc1727e3ff90d25dbccb4c530312b897536f (commit) - Log - commit 027c9909fca039095fe8c69ebe9bd3ce0bba59cd Author: Matt Caswell Date: Tue Feb 13 10:34:40 2018 + Don't sanity check the FIPS version during a release This is no longer included in the opensslv.h header file for 1.1.1, so we should not sanity check it. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10) --- Summary of changes: release-tools/release-check.pl | 9 + 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/release-tools/release-check.pl b/release-tools/release-check.pl index 91ee7c0..cac5918 100644 --- a/release-tools/release-check.pl +++ b/release-tools/release-check.pl @@ -112,13 +112,6 @@ sub openssl_check_version_h { check_str( "opensslv.h: HEX version", $hexversion, $1, \$ok ); $hex_done = 1; } elsif ( -/OPENSSL_VERSION_TEXT\s+\"OpenSSL (\S*fips\S*)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/ - ) -{ -check_str( "opensslv.h: FIPS version", $version_fips, $1, \$ok ); -check_str( "opensslv.h: FIPS date",$date, $3, \$ok ); -$fips_done = 1; -} elsif ( /OPENSSL_VERSION_TEXT\s+\"OpenSSL (\S*)\s+(\([[:alpha:]]+\)\s+)?(.*)\"/ ) { @@ -126,7 +119,7 @@ sub openssl_check_version_h { check_str( "opensslv.h: date",$date,$3, \$ok ); $version_done = 1; } -if ( $hex_done && $fips_done && $version_done ) { +if ( $hex_done && $version_done ) { close IN; return $ok; } _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 9d9fdc1727e3ff90d25dbccb4c530312b897536f (commit) via 7723f7c116e2024e727648fe369133b0fc8f70e5 (commit) from da7d7b372dc15d739df3ba7aff2c1a4292148515 (commit) - Log - commit 9d9fdc1727e3ff90d25dbccb4c530312b897536f Author: Richard Levitte Date: Thu Feb 8 19:39:21 2018 +0100 run-checker-autohooks: make some variables mandatory REPORT_FROM and REPORT_RECIPIENT *must* be assigned something to be useful. The defaults are removed, as they are internal for the OpenSSL Team machinery Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/9) commit 7723f7c116e2024e727648fe369133b0fc8f70e5 Author: Richard Levitte Date: Thu Feb 8 19:37:59 2018 +0100 run-checker-autohooks: update README for accuracy Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/9) --- Summary of changes: run-checker/run-checker-autohooks/README | 14 run-checker/run-checker-autohooks/hook-end | 56 -- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/run-checker/run-checker-autohooks/README b/run-checker/run-checker-autohooks/README index a4039b7..87e4be4 100644 --- a/run-checker/run-checker-autohooks/README +++ b/run-checker/run-checker-autohooks/README @@ -9,11 +9,11 @@ repeatedly, for example as a cron job. Example setup: -$ git clone openssl-...@git.openssl.org:bureau.git bureau +$ git clone git://git.openssl.org/tools.git tools $ mkdir ~/run-checker $ cd ~/run-checker -$ ln -s ../bureau/run-checker.sh \ - ../bureau/run-checker-autohooks/hook-{prepare,start,end,takedown} \ +$ ln -s ../tools/run-checker/run-checker.sh \ + ../tools/run-checker/run-checker-autohooks/hook-{prepare,start,end,takedown} \ . $ git clone openssl-...@git.openssl.org:openssl.git openssl @@ -30,13 +30,13 @@ In addition to the hooks, one can also have a shell script called - REPORT_FROM - The email address used in the report From: header. Defaults to - 'OpenSSL run-checker ' + The email address used in the report From: header. This MUST be + assigned a value or reports will not be posted. - REPORT_RECIPIENT - The email address reports will get sent to. Defaults to - '' + The email address reports will get sent to. This MUST be assigned a + value or reports will not be posted. - SKIP_OPTS diff --git a/run-checker/run-checker-autohooks/hook-end b/run-checker/run-checker-autohooks/hook-end index 70c51b9..c95051b 100755 --- a/run-checker/run-checker-autohooks/hook-end +++ b/run-checker/run-checker-autohooks/hook-end @@ -3,8 +3,8 @@ here=$(cd $(dirname $0); pwd) rcd=$here/.run-checker-data -REPORT_RECIPIENT='' -REPORT_FROM='OpenSSL run-checker ' +REPORT_RECIPIENT= +REPORT_FROM= if [ -f $rcd/new/hook-config ]; then . $rcd/new/hook-config fi @@ -38,47 +38,49 @@ if ( # If the build failed or the status changed since last time, report if [ "$newstatus" == "fail" -o "$newstatus" != "$curstatus" ]; then -( -statusword=FAILED -if [ "$newstatus" == "pass" ]; then -statusword=SUCCESSFUL -elif [ "$curstatus" == "fail" ]; then -statusword="Still FAILED" -fi -echo "From: $REPORT_FROM" -echo "To: $REPORT_RECIPIENT" -echo "Subject: $statusword build of OpenSSL branch $gitbranch with options $expandedopts" -cat
[openssl-commits] [tools] master update
The branch master has been updated via da7d7b372dc15d739df3ba7aff2c1a4292148515 (commit) from 7823d374c6841eac48a7baf1f2955eb962b5305d (commit) - Log - commit da7d7b372dc15d739df3ba7aff2c1a4292148515 Author: Richard Levitte Date: Thu Feb 8 19:25:20 2018 +0100 run-checker: enhance README Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/8) --- Summary of changes: run-checker/README | 90 -- 1 file changed, 88 insertions(+), 2 deletions(-) diff --git a/run-checker/README b/run-checker/README index cc589b6..b9540a0 100644 --- a/run-checker/README +++ b/run-checker/README @@ -1,2 +1,88 @@ -This tool is used to build various config options of openssl -and generate okay/fail reports. +This tool is used to build various predefined config options of +openssl and generate okay/fail reports. The array of config options +is found in run-checker.sh, assigned to 'opts'. + +Quick manual run + + +To run a check on the master branch: + +git clone git://git.openssl.org/openssl.git openssl +/path/to/run-checker.sh + +To run a check on a release branch: + +git clone -b OpenSSL_1_1_0-stable git://git.openssl.org/openssl.git openssl +/path/to/run-checker.sh + + +Hooks +- + +run-checker supports a few hooks, in form of scripts that are +executed: + +hook-prepare This script is run once, when run-checker is + starting. If it exits with a status other + than zero, run-checker.sh will stop. It gets + no arguments. + +hook-start This script is run before each option build. + If it exits with a status other than zero, + run-checker.sh will skip the current build. + It gets the following arguments: + + $1 The build directory. + $2 The option being checked. + $3... Configure options and arguments. + +hook-end This script is run after each option build. + If gets the following arguments: + + $1 The build directory. + $2 "pass" or "fail", depending on the + build result. + +hook-takedown This script is run once, just before + run-checker terminates. It gets no arguments. + + +The hooks and documentation in run-checker-autohooks are an advanced +example, and what the OpenSSL Team runs daily (automatically). + + +Example hooks 1 +--- + +The run-checker script uses disk space by leaving every build tree +behind! It may be that you want to clear the build tree after each +build. This little hook can help: + +hook-end: + +#! /bin/sh +builddir="$1" +mv "$builddir"/build.log "$builddir".log && rm -rf "$builddir" + +Example hook 2 +-- + +This is a variant of Example hook 1 that saves away the build dir into +a tarball: + +hook-end: + +#! /bin/sh +builddir="$1" +tar --remove-files -cJf "$builddir.tar.xz" "./$builddir" + +Example hook 3 +-- + +You might want to avoid some builds, based on the options. For +example, all the fuzz builds may require installations that you're not +willing to do. hook-start is the perfect place for this: + +#! /bin/sh +if [ echo "$2" | grep -E '.*fuzz.*' ]; then exit 1; fi +exit 0 _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 7823d374c6841eac48a7baf1f2955eb962b5305d (commit) from 27296557068a17464f17533d89d4fa6f3555b909 (commit) - Log - commit 7823d374c6841eac48a7baf1f2955eb962b5305d Author: Matt Caswell Date: Fri Dec 8 10:13:21 2017 + Add an option to not add yourself as a reviewer Every now and then I need to merge a commit that I did not author or review (someone else has done those things). This adds an option to addrev to enable you to add the "Reviewed by" headers without also adding yourself. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/6) --- Summary of changes: review-tools/addrev | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/review-tools/addrev b/review-tools/addrev index 6b3d64a..fdf2aa5 100755 --- a/review-tools/addrev +++ b/review-tools/addrev @@ -9,6 +9,7 @@ my $list_reviewers = 0; my $help = 0; my $haveprnum = 0; my $trivial = 0; +my $useself = 1; my $my_email; @@ -23,6 +24,8 @@ foreach (@ARGV) { $args .= "--trivial "; } elsif (/^--verbose$/) { $args .= "--verbose "; +} elsif (/^--noself$/) { +$useself = 0; } elsif (/^--myemail=(.+)$/) { $my_email = $1; } elsif (/^--nopr$/) { @@ -56,11 +59,13 @@ if ($help) { die "Need either --prnum or --nopr flag" unless $haveprnum; -if (!defined $my_email) { -$my_email = `git config --get user.email`; -} +if ($useself) { +if (!defined $my_email) { +$my_email = `git config --get user.email`; +} -$args .= "--myemail=$my_email "; +$args .= "--myemail=$my_email "; +} system("git filter-branch -f --tag-name-filter cat --msg-filter \"gitaddrev $args\" $filterargs"); _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 27296557068a17464f17533d89d4fa6f3555b909 (commit) from bb40e3e6bcd68b3ba9ba4e71751d9f8e630f63cf (commit) - Log - commit 27296557068a17464f17533d89d4fa6f3555b909 Author: Rich Salz Date: Sat Feb 3 18:23:50 2018 -0500 Add our release tools --- Summary of changes: release-tools/MKRELEASE.md | 168 +++ release-tools/README.md | 320 + release-tools/do-copyright-year | 40 release-tools/do-release.pl | 209 +++ release-tools/mkrelease.pl | 427 +++ release-tools/release-check.pl | 215 release-tools/release-date.pl| 64 ++ release-tools/release-git.pl | 164 +++ release-tools/release-update.pl | 153 ++ release-tools/release-version.pl | 179 10 files changed, 1939 insertions(+) create mode 100644 release-tools/MKRELEASE.md create mode 100644 release-tools/README.md create mode 100755 release-tools/do-copyright-year create mode 100644 release-tools/do-release.pl create mode 100644 release-tools/mkrelease.pl create mode 100644 release-tools/release-check.pl create mode 100644 release-tools/release-date.pl create mode 100644 release-tools/release-git.pl create mode 100644 release-tools/release-update.pl create mode 100644 release-tools/release-version.pl diff --git a/release-tools/MKRELEASE.md b/release-tools/MKRELEASE.md new file mode 100644 index 000..04d6dc7 --- /dev/null +++ b/release-tools/MKRELEASE.md @@ -0,0 +1,168 @@ +# Documentation on the mkrelease.pl script + +This file provides an overview of the mkrelease.pl script, and how to +configure some of its parameters (by setting environment variables). +It is normally run by following the process in README.md and should be +run in a pristine directgory of the branch to be released, which must +be a stable branch. + +The script handles most of the processes involved in making a release +including: + +1. Doing `make update` +2. Changing version numbers in various files +3. Tagging release +4. Making the tarballs, .md5, .sha1, .sha256 and .gpg files +5. Creating the signed email announcement, including hashes of release +6. Uploading files to dev.openssl.org +7. Updating the version for next release + +If you plan to make an actual release make sure your GPG key is included +in the [OMC list](https://www.openssl.org/community/omc.html) on the website +and in the file doc/fingerprints.txt of *all* active branches. + +The script mkrelease.pl calls the files release-check.pl, release-date.pl, +release-git.pl, release-update.pl and release-version.pl, which are expected +to all be in the same directory. + +You are advised to clone a fresh repository. Unless you specify `--no-clean` +the release process will run `git clean -x -d -f` +*WARNING* this will delete ALL untracked files from the current branch. + +From the branch directory if you run: + +perl /path/to/mkrelease.pl --reviewer=name + +It should perform all of the above steps and commit changes locally. You can +then sanity check these with `git log` before pushing them to the public repo. + +## Environment Variables + +- OPENSSL + Path to openssl utility to use. Default is `openssl`. + +- OPENSSL_TAR + The tar command to use when creating the tarball. Default is `tar`. + +- OPENSSL_GPG + The gpg command to use when signing a tarball or announcement. + The default is `gpg` which will use gpg with the default key. + If you wish to use a different, key set OPENSSL_GPG to include + appropriate options. + +- OPENSSL_GPG_TAR + Command to use to sign a tarball. + The default is: `$OPENSSL_GPG --use-agent -sba` + +- OPENSSL_GPG_ANNOUNCE + The command to use to sign a tarball. + The default is: `$OPENSSL_GPG --use-agent -sta --clearsign` + +- OPENSSL_SCP + The command to use to upload files. + The default is `scp` + +- OPENSSL_SCP_HOST + The host (and optional username) needed to upload files. + The default is `dev.openssl.org`, but you might want to change this to + `usern...@dev.openssl.org` + +- OPENSSL_SCP_DIR + The directory to upload files to. + Normally this wont be changed from the default which is + `$OPENSSL_SCP_HOST:~openssl/dist/new` + This is a holding area on dev.openssl.org where distributions are uploaded + temporarily before being moved to the web and ftp directories. + +For local testing, you can do something like this: + +export OPENSSL_SCP=cp +export OPENSSL_SCP_DIR="$HOME/testdir" + +## Options + +- `--revert` + Remove all local changes from repository and delete any release tag. This + returns the local tree to the same state as before a release attempt was + made. + +- `--reviewer=name` + Add reviewer `name` to list of reviewers in commit
[openssl-commits] [tools] master update
The branch master has been updated via bb40e3e6bcd68b3ba9ba4e71751d9f8e630f63cf (commit) via f2effd8b3868d3aff563d3a3c31c873598a08e2b (commit) via c74b36e1cb2dec9183928b00a065131909c9412e (commit) from 9c2a1bcbb06f1075307267fe16bd34e43f750cd4 (commit) - Log - commit bb40e3e6bcd68b3ba9ba4e71751d9f8e630f63cf Author: Dr. Matthias St. Pierre Date: Fri Jan 26 15:32:35 2018 +0100 add missing quotes to fix runtime error [fixup] commit f2effd8b3868d3aff563d3a3c31c873598a08e2b Author: Dr. Matthias St. Pierre Date: Fri Jan 26 12:08:48 2018 +0100 correct whitespace errors [fixup] commit c74b36e1cb2dec9183928b00a065131909c9412e Author: Dr. Matthias St. Pierre Date: Fri Jan 26 10:33:22 2018 +0100 ghmerge: improve error handling When python3 is the default python interpreter, the embedded script fails with a syntax error at the print statement. In the absence of error checking, this leads to a cascade of unhandled errors, ending up in an empty pager window. Here an example: ghmerge prnum reviewer1 reviewer2 - the empty output of the python command causes the env command to print the (named and positional) parameters instead of clearing $1 and $2. Consequently, the script assigns WHO=reviewer1 and BRANCH=reviewer2. - git checks out a local branch reviewer1-reviewer2 and tries to pull from https://github.com/reviewer1/openssl.git reviewer2 This call fails, and again the error is ignored. - The call `git diff reviewer1-reviewer2` leads to the empty pager window, since git has no diffs to show. Countermeasures - make the python script work for python2 and python3 - add a break-on-error statement (`set -o errexit`, aka `set -e`) - replace `set` by `set --` which changes the behaviour of the set command as desired (see `man set`). - add an explicit check for $WHO and $BRANCH - add an exit trap for cleaning up the branch Signed-off-by: Dr. Matthias St. Pierre --- Summary of changes: review-tools/ghmerge | 29 +++-- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index 401d80c..b1aebb9 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -1,5 +1,7 @@ #! /bin/bash +set -o errexit + if [ ! -d .git ] ; then echo Not at top-level exit 1 @@ -31,17 +33,34 @@ esac curl -s https://api.github.com/repos/openssl/openssl/pulls/$PRNUM >/tmp/gh$$ TEAM=$* -set `python -c ' +set -- `python -c ' +from __future__ import print_function import json, sys; -print str(json.load(sys.stdin)["head"]["label"]).replace(":", " ")' https://github.com/$WHO/openssl.git $BRANCH git rebase $REL echo Diff against $REL @@ -52,7 +71,7 @@ addrev $TRIVIAL --prnum=$PRNUM $TEAM ${REL}.. git checkout $REL if [ "$MERGE" == "yes" ] ; then git merge --no-commit --squash $WORK -AUTHOR=`git show --no-patch --pretty=format:%an <%ae> $WORK` +AUTHOR=`git show --no-patch --pretty="format:%an <%ae>" $WORK` git commit --author="$AUTHOR" else git rebase $WORK @@ -72,5 +91,3 @@ done if [ "$x" = "y" -o "$x" = "yes" ] ; then git push origin $REL fi - -git branch -D $WORK _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 9c2a1bcbb06f1075307267fe16bd34e43f750cd4 (commit) from c1388cc424c5c1aaab2b1193e7d9a82310a0e6de (commit) - Log - commit 9c2a1bcbb06f1075307267fe16bd34e43f750cd4 Author: Matt Caswell Date: Fri Dec 8 09:48:09 2017 + Ignore case when checking author against cladb Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/5) --- Summary of changes: review-tools/gitaddrev | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index a53d9ad..2beb48a 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -30,7 +30,7 @@ my @unknown_reviewers; my $skip_reviewer; my $omccount = 0; sub try_add_reviewer { -my $id = shift; +my $id = lc(shift); my $rc = undef; my $id2 = $id =~ /^\@(.*)$/ ? { github => $1 } : $id; my $rev = $query->find_person_tag($id2, 'rev'); @@ -123,7 +123,7 @@ if (my $rev = try_add_reviewer($ENV{GIT_AUTHOR_EMAIL})) { # In case the author is unknown to our databases or is lacking a CLA, # we need to be extra careful to check if this is supposed to be a # trivial commit. -my $author = $ENV{GIT_AUTHOR_EMAIL}; +my $author = lc($ENV{GIT_AUTHOR_EMAIL}); # Note: it really should be enough to check if $author is unknown, since # the databases are supposed to be consistent with each other. However, _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via c1388cc424c5c1aaab2b1193e7d9a82310a0e6de (commit) from 4d6363793d47c66069634a58c0d21c5e52e2e3b7 (commit) - Log - commit c1388cc424c5c1aaab2b1193e7d9a82310a0e6de Author: Richard Levitte Date: Wed Dec 6 17:15:19 2017 +0100 run-checker: add run-checker-cleanup.sh This is a companion script for run-checker.sh, to be used as emergency cleanup if run-checker.sh was killed in the middle of its operation and left behind lock files / directories. Typically, this would appear in a crontab, like this: @reboot (set -x; cd ${HOME}/run-checker && bash ./run-checker-cleanup.sh) --- Summary of changes: run-checker/run-checker-cleanup.sh | 18 ++ 1 file changed, 18 insertions(+) create mode 100755 run-checker/run-checker-cleanup.sh diff --git a/run-checker/run-checker-cleanup.sh b/run-checker/run-checker-cleanup.sh new file mode 100755 index 000..6e8b383 --- /dev/null +++ b/run-checker/run-checker-cleanup.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +#Script for emergency cleanup of the run-checker.sh work directory +#Place this script in the same directory as run-checker.sh + +#This really just runs the takedown hook, so unless there are any +#hooks present, nothing at all will happen. + +here=$(cd $(dirname $0); pwd) + +run-hook () { +local hookname=$1; shift +if [ -x $here/hook-$hookname ]; then +(cd $here; ./hook-$hookname "$@") +fi +} + +run-hook takedown _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 4d6363793d47c66069634a58c0d21c5e52e2e3b7 (commit) via 63a6cb9771263aff1462a5ad60c30051706db0ea (commit) from 9a7c7931d7d8d1b26955026acdd32a1fa447cc95 (commit) - Log - commit 4d6363793d47c66069634a58c0d21c5e52e2e3b7 Author: Richard Levitte Date: Sat Nov 11 20:09:44 2017 +0100 gitaddrev: small typo commit 63a6cb9771263aff1462a5ad60c30051706db0ea Author: Richard Levitte Date: Sat Nov 11 20:09:20 2017 +0100 gitaddrev: reviewers must be commit or OMC members --- Summary of changes: review-tools/gitaddrev | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 4dfd04b..a53d9ad 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -65,12 +65,13 @@ foreach (@ARGV) { my $rev = $query->find_person_tag($email_id, 'rev'); my $omc = $query->is_member_of($email_id, 'omc'); next unless $query->has_cla($rev); + next unless $query->is_member_of($email_id, 'commit') || $omc; my @ids = sort grep { $_ =~ /^[a-z]+$/ || $_ =~ /^\@(?:\w|\w-\w)+$/ } map { if (ref($_) eq "HASH") { my %h = %$_; - map { $_ eq "github" ? '@'.$h{$_} : $h{$_} } %h; + map { $_ eq "github" ? '@'.$h{$_} : $h{$_} } keys %h; } else { $_; } _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 9a7c7931d7d8d1b26955026acdd32a1fa447cc95 (commit) from 4541a9148f4228ab41b2098a1f1920cd62373d06 (commit) - Log - commit 9a7c7931d7d8d1b26955026acdd32a1fa447cc95 Author: Rich Salz Date: Thu Nov 9 11:44:41 2017 -0500 Tweak output format, add warning --- Summary of changes: license/add-counts | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/license/add-counts b/license/add-counts index e842fc4..4a796fe 100755 --- a/license/add-counts +++ b/license/add-counts @@ -4,6 +4,8 @@ use strict; use warnings; +die "Feed this the output of 'get-followups -d'\n" if -t 0; + while ( <> ) { unless ( /([0-da-f]{8}) .*/ ) { print; @@ -11,6 +13,7 @@ while ( <> ) { } my $cid = $1; my $line = $_; +$line =~ s/^\s*//; if ( $cid eq 'd02b48c6' ) { print "931 +17534 -0 ", $_; next; @@ -19,14 +22,20 @@ while ( <> ) { my $files = 0; my $adds = 0; my $dels = 0; +my $name = ''; open my $F, "git diff --numstat $pattern|" || die "Can't open git diff, $!\n"; while ( <$F> ) { $files++; - next unless /(\d+)\s+(\d+)/; + next unless /(\d+)\s+(\d+)\s+(.*)/; $adds += int($1); $dels += int($2); + $name = $3 if $name eq ''; } close $F || die "Can't close git diff, $!\n"; -print "$files +$adds -$dels $line"; +if ( $files == 1 ) { + print "$name +$adds -$dels $line"; +} else { + print "$files +$adds -$dels $line"; +} } _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 4541a9148f4228ab41b2098a1f1920cd62373d06 (commit) from cf3acbc8a45ca5d8aec275f2ec37463681f0b48a (commit) - Log - commit 4541a9148f4228ab41b2098a1f1920cd62373d06 Author: Rich Salz Date: Wed Nov 8 10:44:09 2017 -0500 chmod +x add-counts --- Summary of changes: license/add-counts | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 license/add-counts diff --git a/license/add-counts b/license/add-counts old mode 100644 new mode 100755 _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via cf3acbc8a45ca5d8aec275f2ec37463681f0b48a (commit) from 22a99d3c8611bc0fa48895197292cb652fe80ae2 (commit) - Log - commit cf3acbc8a45ca5d8aec275f2ec37463681f0b48a Author: Rich Salz Date: Tue Nov 7 12:00:52 2017 -0500 Add add-counts filter --- Summary of changes: license/add-counts | 32 1 file changed, 32 insertions(+) create mode 100644 license/add-counts diff --git a/license/add-counts b/license/add-counts new file mode 100644 index 000..e842fc4 --- /dev/null +++ b/license/add-counts @@ -0,0 +1,32 @@ +#! /usr/bin/env perl +# Annotate the output of "get-followups -d" to show the stats +# of each commit. +use strict; +use warnings; + +while ( <> ) { +unless ( /([0-da-f]{8}) .*/ ) { + print; + next; +} +my $cid = $1; +my $line = $_; +if ( $cid eq 'd02b48c6' ) { + print "931 +17534 -0 ", $_; + next; +} +my $pattern = "$cid^..$cid"; +my $files = 0; +my $adds = 0; +my $dels = 0; +open my $F, "git diff --numstat $pattern|" + || die "Can't open git diff, $!\n"; +while ( <$F> ) { + $files++; + next unless /(\d+)\s+(\d+)/; + $adds += int($1); + $dels += int($2); +} +close $F || die "Can't close git diff, $!\n"; +print "$files +$adds -$dels $line"; +} _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 22a99d3c8611bc0fa48895197292cb652fe80ae2 (commit) via 4d6da42f5bb47a90173bbd0ff4d42df33abd66ee (commit) from 789508be793ffbe64186efc7348bccd0e61d9b03 (commit) - Log - commit 22a99d3c8611bc0fa48895197292cb652fe80ae2 Author: Rich Salz Date: Mon Nov 6 12:56:34 2017 -0500 Add -d flag commit 4d6da42f5bb47a90173bbd0ff4d42df33abd66ee Author: Rich Salz Date: Mon Nov 6 12:56:22 2017 -0500 Use UPCASE for select keywords --- Summary of changes: license/approved | 2 +- license/get-followups | 34 +++--- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/license/approved b/license/approved index 6d84dab..0cc2847 100755 --- a/license/approved +++ b/license/approved @@ -38,7 +38,7 @@ for o,a in opts: print __doc__ raise SystemExit -q = 'select uid from users where email = %s' +q = 'SELECT uid FROM users WHERE email = %s' update = ("UPDATE users SET date_replied=%s, reply=%s, comment=%s" " WHERE uid=%s") today = datetime.datetime.today().date() diff --git a/license/get-followups b/license/get-followups index ab3d4d7..11fafb3 100755 --- a/license/get-followups +++ b/license/get-followups @@ -1,5 +1,8 @@ #! /usr/bin/env python -"""get-followups +"""get-followups [flags] + +Flags: +-d List details (commits) per user Get list of users (in CSV format) who have not been reached. """ @@ -8,7 +11,6 @@ import mysql.connector import datetime, os, re, subprocess, sys, string, random import getopt -urlbase = 'https://license.openssl.org/cgi-bin/lookup.py?uid=' dbconfig = { 'user': 'licensereader', 'password': open('ropass.txt').read().strip(), @@ -17,17 +19,35 @@ dbconfig = { conn = mysql.connector.connect(**dbconfig) cursor = conn.cursor() -single = 0 -opts, args = getopt.getopt(sys.argv[1:], "") +urlbase = 'https://license.openssl.org/cgi-bin/lookup.py?uid=' +fmtstring = urlbase + '%d, %s, %d, "%s"' + +details = 0 +opts, args = getopt.getopt(sys.argv[1:], "dh") for o,a in opts: -print __doc__ -raise SystemExit +if o == '-d': +details = 1 +else: +print __doc__ +raise SystemExit +rows = [] q = ('SELECT users.uid,email,reply,name,count(log.uid) FROM users' ' LEFT JOIN log ON log.uid = users.uid' ' WHERE reply = "-" GROUP BY email ORDER BY count(log.uid)' ) cursor.execute(q) -fmtstring = urlbase + '%d, %s, %d, "%s"' for row in cursor: uid,email,reply,name,count = row +rows.append((uid, email, reply, name, count)) + +q = ('SELECT commit,date,descrip FROM commits' +' LEFT JOIN log ON log.cid=commits.cid WHERE log.uid=%s') +for row in rows: +uid,email,reply,name,count = row print fmtstring % (uid, email, count, name) +if details and count > 0: +cursor.execute(q, (uid,)) +for c in cursor: +commit,date,descrip = c +print "\t", commit[0:8],date,descrip +print _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 789508be793ffbe64186efc7348bccd0e61d9b03 (commit) from 8bdaf7f34539129ef26e9aadaca98fb7ab50f267 (commit) - Log - commit 789508be793ffbe64186efc7348bccd0e61d9b03 Author: Rich Salz Date: Tue Oct 24 15:53:22 2017 -0400 Add mention of recent scripts --- Summary of changes: license/README | 3 +++ 1 file changed, 3 insertions(+) diff --git a/license/README b/license/README index 7523fc2..aa713db 100644 --- a/license/README +++ b/license/README @@ -3,10 +3,13 @@ Tools createdb -- Create the license approval database finduser -- List specified email or names devteam.py -- List of dev team members; edit this for your project +get-followups -- Make list of people who have not replied git-import -- Import specified commits git-import-all -- Script to import all git commits mailuser -- Send license mail to specified addresses (SQL patterns) +rmcommit -- Remove a set of commits from a user's activity rmuser -- Remove specified email authors from database +whattoremove -- Commits to remove for folks who said no Passwords; create these files. One line per each adpass.txt -- HTTP password for admin functions _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 8bdaf7f34539129ef26e9aadaca98fb7ab50f267 (commit) via ab822408ff71f781b77056e57d38124ba54fb689 (commit) from 582229603e58fa824befa40c12df3e187f4e1553 (commit) - Log - commit 8bdaf7f34539129ef26e9aadaca98fb7ab50f267 Author: Rich Salz Date: Tue Oct 24 15:26:26 2017 -0400 Add help option to finduser commit ab822408ff71f781b77056e57d38124ba54fb689 Author: Rich Salz Date: Tue Oct 24 15:26:07 2017 -0400 Add rmcommit script Removes a set of commits from a specified user. --- Summary of changes: license/finduser | 10 ++ license/rmcommit | 33 + 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100755 license/rmcommit diff --git a/license/finduser b/license/finduser index 1b44299..481c04b 100755 --- a/license/finduser +++ b/license/finduser @@ -23,15 +23,17 @@ cursor = conn.cursor() single = 0 full = 0 -opts, args = getopt.getopt(sys.argv[1:], "1f") +try: +opts, args = getopt.getopt(sys.argv[1:], "1f") +except: +print __doc__ +raise SystemExit + for o,a in opts: if o == '-1': single = 1 elif o == '-f': full = 1 -else: -print __doc__ -raise SystemExit q = ('SELECT users.uid,email,reply,name,count(log.uid),comment FROM users' ' LEFT JOIN log ON log.uid = users.uid' diff --git a/license/rmcommit b/license/rmcommit new file mode 100755 index 000..f128c47 --- /dev/null +++ b/license/rmcommit @@ -0,0 +1,33 @@ +#! /usr/bin/env python +"""Remove commits from a user. +""" + +import mysql.connector, os, re, subprocess, sys +import string, random +dbconfig = { +'user': 'license', +'password': open('rwpass.txt').read().strip(), +'database': 'license' +} +conn = mysql.connector.connect(**dbconfig) +cursor = conn.cursor() + +# Get email identifier +cursor.execute('SELECT uid FROM users WHERE email = %s', (sys.argv[1],)) +email = None +for c in cursor: +email = c[0] +if not email: +print sys.argv[1], "not found" +raise SystemExit + +for cids in sys.argv[2:]: +pat = cids + '%' +cursor.execute('SELECT cid FROM commits WHERE commit LIKE %s', (pat,)) +cid = None +for c in cursor: +cid = c[0] +if cid: +cursor.execute('DELETE FROM log WHERE uid=%s AND cid LIKE %s', +(email, cid)) +conn.commit() _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 582229603e58fa824befa40c12df3e187f4e1553 (commit) from b1c40977caef9d447da0f94a6496648c56fcd6a6 (commit) - Log - commit 582229603e58fa824befa40c12df3e187f4e1553 Author: Rich Salz Date: Wed Oct 4 12:40:42 2017 -0400 Add -f flag for full output --- Summary of changes: license/finduser | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/license/finduser b/license/finduser index 13caad4..1b44299 100755 --- a/license/finduser +++ b/license/finduser @@ -3,6 +3,7 @@ Flags: -1 Print just email +-f Also print the comment Arguments is a list of SQL paterns (will get wrapped in wildcards, %), by default display full information as CSV. @@ -21,25 +22,30 @@ conn = mysql.connector.connect(**dbconfig) cursor = conn.cursor() single = 0 -opts, args = getopt.getopt(sys.argv[1:], "1") +full = 0 +opts, args = getopt.getopt(sys.argv[1:], "1f") for o,a in opts: if o == '-1': single = 1 +elif o == '-f': +full = 1 else: print __doc__ raise SystemExit -q = ('SELECT users.uid,email,reply,name,count(log.uid) FROM users' +q = ('SELECT users.uid,email,reply,name,count(log.uid),comment FROM users' ' LEFT JOIN log ON log.uid = users.uid' ' WHERE email like %s GROUP BY email' ) for email in args: pat = '%' + email + '%' cursor.execute(q, (pat,)) for row in cursor: -uid,email,reply,name,count = row +uid,email,reply,name,count,comment = row if reply == None: reply = '-' if single: print email else: print '%d, %s, %s, %d, "%s"' % (uid, email, reply, count, name) +if full: +print '# ', comment _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via b1c40977caef9d447da0f94a6496648c56fcd6a6 (commit) from 9d414292fe1a0ae6453284e11775ce3597032348 (commit) - Log - commit b1c40977caef9d447da0f94a6496648c56fcd6a6 Author: Rich Salz Date: Tue Sep 26 14:59:15 2017 -0400 Sort by # of commits --- Summary of changes: license/get-followups | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/license/get-followups b/license/get-followups index ba08f1f..ab3d4d7 100755 --- a/license/get-followups +++ b/license/get-followups @@ -25,7 +25,7 @@ for o,a in opts: q = ('SELECT users.uid,email,reply,name,count(log.uid) FROM users' ' LEFT JOIN log ON log.uid = users.uid' -' WHERE reply = "-" GROUP BY email' ) +' WHERE reply = "-" GROUP BY email ORDER BY count(log.uid)' ) cursor.execute(q) fmtstring = urlbase + '%d, %s, %d, "%s"' for row in cursor: _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 9d414292fe1a0ae6453284e11775ce3597032348 (commit) from b04864d53c9b7a32c9d0957b2760688e0d6696c3 (commit) - Log - commit 9d414292fe1a0ae6453284e11775ce3597032348 Author: Andy Polyakov Date: Tue Sep 26 06:14:55 2017 -0400 Lowercase names; fix status update Check names as a lowercase match. Properly update status if 'CLA trivial' --- Summary of changes: clacheck/clacheck.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/clacheck/clacheck.py b/clacheck/clacheck.py index 24f844b..f63d9b2 100755 --- a/clacheck/clacheck.py +++ b/clacheck/clacheck.py @@ -14,7 +14,7 @@ env = os.environ textplain = "Content-type: text/plain\n\n" what = env.get('HTTP_X_GITHUB_EVENT', 'ping') From = re.compile("^From:.*<(.*)>") -Trivial = re.compile("^\s*cla\s*:\s*trivial", re.IGNORECASE) +Trivial = re.compile("^\s*CLA\s*:\s*TRIVIAL", re.IGNORECASE) URLpattern = re.compile("https?://([^/]*)/(.*)") SUCCESS = 'success' FAILURE = 'failure' @@ -73,7 +73,7 @@ def have_cla(name): if not line or line[0] == '#': continue n = line.split() -if len(n) and n[0] == name: +if len(n) and n[0] == name.lower(): return 1 return 0 @@ -98,7 +98,7 @@ def process(): for line in urllib.urlopen(patch_url): m = Trivial.match(line) if m: -update_state(pr, SUCCESS, "Trivial") +update_status(pr, SUCCESS, "Trivial") return m = From.match(line) if m and not have_cla(m.group(1)): _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via b04864d53c9b7a32c9d0957b2760688e0d6696c3 (commit) from 5a03dc8280b369d8807f0b53fa6a443735b7f030 (commit) - Log - commit b04864d53c9b7a32c9d0957b2760688e0d6696c3 Author: Richard Levitte Date: Tue Sep 26 09:20:11 2017 +0200 QueryApp: touch the version number because of the change --- Summary of changes: QueryApp/Makefile.PL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QueryApp/Makefile.PL b/QueryApp/Makefile.PL index 5d41e64..bb1dac9 100644 --- a/QueryApp/Makefile.PL +++ b/QueryApp/Makefile.PL @@ -4,7 +4,7 @@ use warnings; use inc::Module::Install; name 'QueryApp'; -version '1.1'; +version '1.2'; abstract 'An OpenSSL query web app'; author q{Richard Levitte }; license 'apache'; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 5a03dc8280b369d8807f0b53fa6a443735b7f030 (commit) via a63e7491e49ff8813875a8526d8f0f7cb890e9a7 (commit) from fc9383a4c71378c85708541b0ac18ea296f95cf9 (commit) - Log - commit 5a03dc8280b369d8807f0b53fa6a443735b7f030 Author: Richard Levitte Date: Fri Sep 22 15:27:24 2017 +0200 Test that a casing different from original CLA data works commit a63e7491e49ff8813875a8526d8f0f7cb890e9a7 Author: Richard Levitte Date: Fri Sep 22 15:16:45 2017 +0200 QueryApp: make email addresses in CLA db lower case This resolves any issue with mixed cases. Changed test data to be mixed casing while leaving the queries to use lowercase, to make sure this is properly tested. --- Summary of changes: OpenSSL-Query/t/query.t | 4 ++-- QueryApp/lib/OpenSSL/Query/ClaDB.pm | 12 QueryApp/t/query_data/cdb.txt | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/OpenSSL-Query/t/query.t b/OpenSSL-Query/t/query.t index 5cb7c25..fd557e6 100644 --- a/OpenSSL-Query/t/query.t +++ b/OpenSSL-Query/t/query.t @@ -84,8 +84,8 @@ SKIP: { subtest 'Request of CLA status for Ray Bradbury' => sub { plan tests => 1; -my $res = $query->has_cla( 'r...@ourplace.com' ); -ok( $res, 'Ray Bradbury has CLA as r...@ourplace.com' ); +my $res = $query->has_cla( 'r...@ourplace.com' ); +ok( $res, 'Ray Bradbury has CLA as r...@ourplace.com' ); note( $res ); }; diff --git a/QueryApp/lib/OpenSSL/Query/ClaDB.pm b/QueryApp/lib/OpenSSL/Query/ClaDB.pm index 3ca5852..406b445 100644 --- a/QueryApp/lib/OpenSSL/Query/ClaDB.pm +++ b/QueryApp/lib/OpenSSL/Query/ClaDB.pm @@ -33,10 +33,14 @@ sub _build__cladb { next if $line =~ m|^\s*$|; croak "Malformed CLADB line: $line" unless $line =~ m|^(\S+\@\S+)\s+([ICR])\s+(.+)$|; -croak "Duplicate email address: $1" - if exists $cladb->{$1}; -$cladb->{$1} = { status => $2, name => $3 }; +my $email = lc $1; +my $status = $2; +my $name = $3; +croak "Duplicate email address: $email" + if exists $cladb->{$email}; + +$cladb->{$email} = { status => $status, name => $name }; } close $clafh; @@ -45,7 +49,7 @@ sub _build__cladb { sub has_cla { my $self = shift; - my $id = shift; + my $id = lc shift; if ($id =~ m|<(\S+\@\S+)>|) { $id = $1; } croak "Malformed input ID" unless $id =~ m|^\S+(\@\S+)$|; my $starid = '*' . $1; diff --git a/QueryApp/t/query_data/cdb.txt b/QueryApp/t/query_data/cdb.txt index 36d238c..14fc6c3 100644 --- a/QueryApp/t/query_data/cdb.txt +++ b/QueryApp/t/query_data/cdb.txt @@ -1 +1 @@ -r...@ourplace.com I Ray Bradbury +r...@ourplace.com I Ray Bradbury _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via fc9383a4c71378c85708541b0ac18ea296f95cf9 (commit) from 76acfcbc4c7798a29000208b888fbcf5e73c28db (commit) - Log - commit fc9383a4c71378c85708541b0ac18ea296f95cf9 Author: Richard Levitte Date: Wed Sep 13 15:15:32 2017 +0200 Allow run-checker to run 4 parallel jobs The VM running this has 4 CPUs --- Summary of changes: run-checker/run-checker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/run-checker/run-checker.sh b/run-checker/run-checker.sh index 66d7f99..23121b1 100755 --- a/run-checker/run-checker.sh +++ b/run-checker/run-checker.sh @@ -140,8 +140,8 @@ if run-hook prepare; then echo " make depend" log-eval make depend >>build.log 2>&1 || exit $? -echo " make" -log-eval LDCMD=$ldcmd make >>build.log 2>&1 || exit $? +echo " make -j4" +log-eval LDCMD=$ldcmd make -j4 >>build.log 2>&1 || exit $? # Because 'make test' may hang under certain circumstances, # we have a timeout mechanism around it. _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 76acfcbc4c7798a29000208b888fbcf5e73c28db (commit) via 6f876bb75f08a2aabdb1eac4124395e2f6d34c29 (commit) from 9685c0e6552d24d1ab2ae8392d6078513524bbfc (commit) - Log - commit 76acfcbc4c7798a29000208b888fbcf5e73c28db Author: Rich Salz Date: Wed Sep 6 14:29:05 2017 -0400 Add get-followups commit 6f876bb75f08a2aabdb1eac4124395e2f6d34c29 Author: Rich Salz Date: Wed Sep 6 14:28:55 2017 -0400 Some cleanups --- Summary of changes: license/finduser | 8 +++- license/get-followups | 33 + 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100755 license/get-followups diff --git a/license/finduser b/license/finduser index cea3dc7..13caad4 100755 --- a/license/finduser +++ b/license/finduser @@ -19,7 +19,6 @@ dbconfig = { } conn = mysql.connector.connect(**dbconfig) cursor = conn.cursor() -raw = open("request-approval.txt").read() single = 0 opts, args = getopt.getopt(sys.argv[1:], "1") @@ -30,11 +29,10 @@ for o,a in opts: print __doc__ raise SystemExit -# Get dict of matching users +q = ('SELECT users.uid,email,reply,name,count(log.uid) FROM users' +' LEFT JOIN log ON log.uid = users.uid' +' WHERE email like %s GROUP BY email' ) for email in args: -q = ('SELECT users.uid,email,reply,name,count(log.uid) FROM users' -' LEFT JOIN log ON log.uid = users.uid' -' WHERE email like %s GROUP BY email' ) pat = '%' + email + '%' cursor.execute(q, (pat,)) for row in cursor: diff --git a/license/get-followups b/license/get-followups new file mode 100755 index 000..ba08f1f --- /dev/null +++ b/license/get-followups @@ -0,0 +1,33 @@ +#! /usr/bin/env python +"""get-followups + +Get list of users (in CSV format) who have not been reached. +""" + +import mysql.connector +import datetime, os, re, subprocess, sys, string, random +import getopt + +urlbase = 'https://license.openssl.org/cgi-bin/lookup.py?uid=' +dbconfig = { +'user': 'licensereader', +'password': open('ropass.txt').read().strip(), +'database': 'license' +} +conn = mysql.connector.connect(**dbconfig) +cursor = conn.cursor() + +single = 0 +opts, args = getopt.getopt(sys.argv[1:], "") +for o,a in opts: +print __doc__ +raise SystemExit + +q = ('SELECT users.uid,email,reply,name,count(log.uid) FROM users' +' LEFT JOIN log ON log.uid = users.uid' +' WHERE reply = "-" GROUP BY email' ) +cursor.execute(q) +fmtstring = urlbase + '%d, %s, %d, "%s"' +for row in cursor: +uid,email,reply,name,count = row +print fmtstring % (uid, email, count, name) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 9685c0e6552d24d1ab2ae8392d6078513524bbfc (commit) from 6b16ee4c68fe6ce0d524a0c7e93f996ae421370d (commit) - Log - commit 9685c0e6552d24d1ab2ae8392d6078513524bbfc Author: Rich Salz Date: Mon Aug 28 13:44:20 2017 -0400 Add column header/titles --- Summary of changes: reports/stats2csv.py | 1 + 1 file changed, 1 insertion(+) diff --git a/reports/stats2csv.py b/reports/stats2csv.py index 22bb1bf..5d3211f 100644 --- a/reports/stats2csv.py +++ b/reports/stats2csv.py @@ -11,6 +11,7 @@ files = glob.glob(sys.argv[1]+ "/*.js") files.sort() when = sys.argv[2] +print "open, closed, duration, #, state, user" for f in files: items = json.load(open(f)) for i in items: _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 6b16ee4c68fe6ce0d524a0c7e93f996ae421370d (commit) via 87fa67430066f7abb7f01f8e96ed8c9989717e7a (commit) from 1cd3086c6cf82454b34679bf073f0a3b5bf4c0dc (commit) - Log - commit 6b16ee4c68fe6ce0d524a0c7e93f996ae421370d Author: Rich Salz Date: Sun Aug 27 09:02:21 2017 -0400 Add finduser -1 and adduser -v flags commit 87fa67430066f7abb7f01f8e96ed8c9989717e7a Author: Rich Salz Date: Tue Aug 8 11:34:51 2017 -0400 Add link to blog postings --- Summary of changes: license/approved | 8 +++- license/finduser | 28 +++- license/index.html | 4 +++- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/license/approved b/license/approved index c667a5e..6d84dab 100755 --- a/license/approved +++ b/license/approved @@ -5,6 +5,7 @@ Flags: -c text... Comment to use -r Reject not approve -h This help +-v List emails as processed Args is a list of email addresses. """ @@ -24,12 +25,15 @@ cursor = conn.cursor() # Parse JCL comment = 'From CLI'; reply = 'y' -opts, args = getopt.getopt(sys.argv[1:], "c:hr") +verbose = 0 +opts, args = getopt.getopt(sys.argv[1:], "c:hrv") for o,a in opts: if o == '-c': comment = a elif o == '-r': reply = 'n' +elif o == '-v': +verbose = 1 else: print __doc__ raise SystemExit @@ -44,3 +48,5 @@ for email in args: for uid in cursor: cursor.execute(update, (today, reply, comment, uid[0])) conn.commit() +if verbose: +print email, uid[0] diff --git a/license/finduser b/license/finduser index 217d552..cea3dc7 100755 --- a/license/finduser +++ b/license/finduser @@ -1,10 +1,16 @@ #! /usr/bin/env python -"""Arguments is a list of SQL paterns (will get wrapped in wildcards, %), -display uid email and name +"""finduser [flags] pattern... + +Flags: +-1 Print just email + +Arguments is a list of SQL paterns (will get wrapped in wildcards, %), +by default display full information as CSV. """ import mysql.connector import datetime, os, re, subprocess, sys, string, random +import getopt dbconfig = { 'user': 'licensereader', @@ -15,15 +21,27 @@ conn = mysql.connector.connect(**dbconfig) cursor = conn.cursor() raw = open("request-approval.txt").read() +single = 0 +opts, args = getopt.getopt(sys.argv[1:], "1") +for o,a in opts: +if o == '-1': +single = 1 +else: +print __doc__ +raise SystemExit + # Get dict of matching users -for email in sys.argv[1:]: +for email in args: q = ('SELECT users.uid,email,reply,name,count(log.uid) FROM users' ' LEFT JOIN log ON log.uid = users.uid' -' WHERE email like %s GROUP BY email' ); +' WHERE email like %s GROUP BY email' ) pat = '%' + email + '%' cursor.execute(q, (pat,)) for row in cursor: uid,email,reply,name,count = row if reply == None: reply = '-' -print '%d, %s, %s, %d, "%s"' % (uid, email, reply, count, name) +if single: +print email +else: +print '%d, %s, %s, %d, "%s"' % (uid, email, reply, count, name) diff --git a/license/index.html b/license/index.html index 4b3aeb8..2335ddb 100644 --- a/license/index.html +++ b/license/index.html @@ -40,9 +40,11 @@ We are grateful to all the contributors who have contributed to OpenSSL and look forward to their help and support in this effort. +For some background information, please see our https://www.openssl.org/blog/blog/categories/license/";>blog postings +on this effort. - _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 1cd3086c6cf82454b34679bf073f0a3b5bf4c0dc (commit) via e3a8a33fde90e0c8c9f9704d58061dcda95b865a (commit) via 1610ee4fee5e1599366e418d88e1d3a62afa88d7 (commit) from 1281a53b704f7d2529832003c6d157489f00a4f7 (commit) - Log - commit 1cd3086c6cf82454b34679bf073f0a3b5bf4c0dc Author: Johannes Bauer Date: Fri Aug 11 18:01:23 2017 +0200 Include disableables that were currently not in run-checker Took disableables from "Configure" that were previously not part of run-checker.sh and added them. commit e3a8a33fde90e0c8c9f9704d58061dcda95b865a Author: Johannes Bauer Date: Fri Aug 11 17:13:39 2017 +0200 Actually check for clang and afl-clang-fast Check for presence of clang and afl-clang-fast in path instead of warning about them not being in PATH indiscriminately. commit 1610ee4fee5e1599366e418d88e1d3a62afa88d7 Author: Johannes Bauer Date: Fri Aug 11 17:10:48 2017 +0200 Fix inconsistent indentation Replace tabs by spaces everywhere. --- Summary of changes: run-checker/run-checker.sh | 24 +--- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/run-checker/run-checker.sh b/run-checker/run-checker.sh index dc2d8b8..66d7f99 100755 --- a/run-checker/run-checker.sh +++ b/run-checker/run-checker.sh @@ -28,6 +28,11 @@ enable-crypto-mdebug enable-crypto-mdebug-backtrace no-ct no-deprecated no-des no-dgram no-dh no-dsa no-dso no-dynamic-engine no-ec no-ec2m no-ecdh no-ecdsa enable-ec_nistp_64_gcc_128 enable-egd no-engine 'no-engine no-shared' no-err no-filenames +no-aria no-asan no-crypto-mdebug no-crypto-mdebug-backtrace no-devcryptoeng +no-ec_nistp_64_gcc_128 no-egd no-external-tests no-fuzz-afl no-fuzz-libfuzzer +no-heartbeats no-md2 no-msan no-rc5 no-sctp no-ssl no-ssl-trace no-tests +no-tls13downgrade no-ubsan no-ui-console no-unit-test no-weak-ssl-ciphers +no-zlib no-zlib-dynamic enable-fuzz-afl enable-fuzz-libfuzzer enable-heartbeats no-hw no-hw-padlock no-idea no-makedepend enable-md2 no-md4 no-md5 no-mdc2 no-gost no-multiblock no-nextprotoneg no-ocb no-ocsp no-pic no-poly1305 no-posix-io no-psk no-rc2 @@ -67,7 +72,7 @@ rkill () { done fi if [ "$pid" != "$notpid" ]; then - kill -s "$signal" "$pid" +kill -s "$signal" "$pid" fi } @@ -77,20 +82,25 @@ if [ ! -d openssl/.git ]; then fi if run-hook prepare; then -echo "Ensure chromium clang and afl-clang-fast are on PATH" +for req_binary in clang afl-clang-fast; do +which $req_binary >/dev/null 2>&1 +if [ "$?" != "0" ]; then +echo "Warning: $req_binary does not appear to be in PATH" +fi +done for opt in "${opts[@]}"; do expandedopts="$opt" warnopts="--strict-warnings" - optcc="clang" +optcc="clang" ldcmd="" if [ "$opt" == "enable-asan" ]; then # A documented requirement for enable-asan is no-shared expandedopts="enable-asan no-shared -DOPENSSL_SMALL_FOOTPRINT" elif [ "$opt" == "enable-ubsan" ]; then - # We've seen it on Travis already, ubsan requires -DPEDANTIC and - # -fno-sanitize=alignment, or crypto/modes will fail to build in - # some circumstances. Running on a VM seems to be one of them. +# We've seen it on Travis already, ubsan requires -DPEDANTIC and +# -fno-sanitize=alignment, or crypto/modes will fail to build in +# some circumstances. Running on a VM seems to be one of them. expandedopts="enable-ubsan -DPEDANTIC -DOPENSSL_SMALL_FOOTPRINT -fno-sanitize=alignment" elif [ "$opt" == "enable-fuzz-afl" ]; then warnopts="" @@ -163,7 +173,7 @@ if run-hook prepare; then # The 'exit 0' below will be executed if any preceeding # command fails. rkill SIGTERM $testpid $BASHPID && kill -0 $testpid \ - || exit 0 +|| exit 0 sleep $delay rkill SIGKILL $testpid $BASHPID ) 2> /dev/null & _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 1281a53b704f7d2529832003c6d157489f00a4f7 (commit) from 6c5159cd3dabd643ad9d594e310a6b450bf770aa (commit) - Log - commit 1281a53b704f7d2529832003c6d157489f00a4f7 Author: Rich Salz Date: Thu Jul 27 10:04:50 2017 -0400 Better author-preserve (via Ben Kaduk) --- Summary of changes: review-tools/ghmerge | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index 89220c0..401d80c 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -46,20 +46,21 @@ git pull --rebase https://github.com/$WHO/openssl.git $BRANCH git rebase $REL echo Diff against $REL git diff $REL -if [ "$MERGE" = "yes" ] ; then -echo Edit commits and squash appropriately -git rebase -i $REL -fi echo -n Press return to merge to $REL and build: ; read foo addrev $TRIVIAL --prnum=$PRNUM $TEAM ${REL}.. git checkout $REL -git rebase $WORK +if [ "$MERGE" == "yes" ] ; then +git merge --no-commit --squash $WORK +AUTHOR=`git show --no-patch --pretty=format:%an <%ae> $WORK` +git commit --author="$AUTHOR" +else +git rebase $WORK +fi # echo Rebuilding # opensslbuild |& tail -3 -while true -do +while true ; do echo -n "Enter YES to push or NO to abort: " read x x="`echo $x | tr A-Z a-z`" _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 6c5159cd3dabd643ad9d594e310a6b450bf770aa (commit) from 8d677266c077c4cd43fad2b814dc9ecbac4727d7 (commit) - Log - commit 6c5159cd3dabd643ad9d594e310a6b450bf770aa Author: Rich Salz Date: Thu Jul 27 06:51:38 2017 -0400 Don't lose author on --squash Instead of doing a squash merge, do a rebase -i --- Summary of changes: review-tools/ghmerge | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index 9d00c31..89220c0 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -46,16 +46,15 @@ git pull --rebase https://github.com/$WHO/openssl.git $BRANCH git rebase $REL echo Diff against $REL git diff $REL +if [ "$MERGE" = "yes" ] ; then +echo Edit commits and squash appropriately +git rebase -i $REL +fi echo -n Press return to merge to $REL and build: ; read foo addrev $TRIVIAL --prnum=$PRNUM $TEAM ${REL}.. git checkout $REL -if [ "$MERGE" = "yes" ] ; then -git merge --no-commit --squash $WORK -git commit -else -git rebase $WORK -fi +git rebase $WORK # echo Rebuilding # opensslbuild |& tail -3 @@ -64,14 +63,12 @@ do echo -n "Enter YES to push or 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" ] -then +if [ "$x" = "y" -o "$x" = "yes" -o "$x" = "n" -o "$x" = "no" ] ; then break fi done -if [ "$x" = "y" -o "$x" = "yes" ] -then +if [ "$x" = "y" -o "$x" = "yes" ] ; then git push origin $REL fi _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 8d677266c077c4cd43fad2b814dc9ecbac4727d7 (commit) from 22592d8f89f7a2aad00ab36a38ee698840bf258c (commit) - Log - commit 8d677266c077c4cd43fad2b814dc9ecbac4727d7 Author: Pauli Date: Wed Jul 26 10:29:35 2017 +1000 Modifications to pick-to-branch script. Change the mid-exit to a yes/no to continue or abort loop. Change "git co" to "git checkout". --- Summary of changes: review-tools/pick-to-branch | 30 -- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch index 374b5e5..9160ef5 100755 --- a/review-tools/pick-to-branch +++ b/review-tools/pick-to-branch @@ -12,7 +12,7 @@ case $# in b=$1 ;; *) -echo Usage $0 "[commitid] branch" +echo "Usage $0 [commitid] branch" exit 1 ;; esac @@ -36,11 +36,29 @@ m*) exit 1 ;; esac -exec echo id,b $id $branch -echo $branch -git co --quiet master || exit 1 -git co $branch || exit 1 +echo "id is $id" +echo "branch is $branch" +echo "Are these correct?" + +while true +do +echo -n "Enter YES to continue or 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" ] +then +break +fi +done + +if [ "$x" = "n" -o "$x" = "no" ] +then +exit 1 +fi + +git checkout --quiet master || exit 1 +git checkout $branch || exit 1 git cherry-pick -e -x $id while true @@ -59,4 +77,4 @@ then git push fi -git co master +git checkout master _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 22592d8f89f7a2aad00ab36a38ee698840bf258c (commit) from 5e7c8fc60ec209e332bf707297c6ac3901d7db3b (commit) - Log - commit 22592d8f89f7a2aad00ab36a38ee698840bf258c Author: Rich Salz Date: Sun Jul 23 09:31:33 2017 -0400 Minor tweak to hopefully avoid problem --- Summary of changes: clacheck/clacheck.py | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/clacheck/clacheck.py b/clacheck/clacheck.py index 58fdcce..24f844b 100755 --- a/clacheck/clacheck.py +++ b/clacheck/clacheck.py @@ -95,18 +95,15 @@ def process(): print textplain, "patch_url missing" return missing = {} -trivial = 0 for line in urllib.urlopen(patch_url): m = Trivial.match(line) if m: -trivial = 1 -continue +update_state(pr, SUCCESS, "Trivial") +return m = From.match(line) if m and not have_cla(m.group(1)): missing[m.group(1)] = 1 -if trivial: -update_state(pr, SUCCESS, "Trivial") -elif len(missing) == 0: +if len(missing) == 0: update_status(pr, SUCCESS, 'CLA on file') else: update_status(pr, FAILURE, "CLA missing: " + str(missing.keys())) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 5e7c8fc60ec209e332bf707297c6ac3901d7db3b (commit) from 7dd524ccc83008915d9ae0b7e1a7315e8f01 (commit) - Log - commit 5e7c8fc60ec209e332bf707297c6ac3901d7db3b Author: Pauli Date: Tue Jul 4 12:02:35 2017 +1000 Make the final question before push have a _yes_/_no_ answer. The response is treated case insensitively and short forms are accepted (_y_ and _n_). Reviewed-by: Rich Salz --- Summary of changes: review-tools/ghmerge| 18 -- review-tools/pick-to-branch | 19 --- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/review-tools/ghmerge b/review-tools/ghmerge index fc263a6..9d00c31 100755 --- a/review-tools/ghmerge +++ b/review-tools/ghmerge @@ -59,6 +59,20 @@ fi # echo Rebuilding # opensslbuild |& tail -3 -echo -n Press return to push: ; read foo -git push origin $REL +while true +do +echo -n "Enter YES to push or 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" ] +then +break +fi +done + +if [ "$x" = "y" -o "$x" = "yes" ] +then +git push origin $REL +fi + git branch -D $WORK diff --git a/review-tools/pick-to-branch b/review-tools/pick-to-branch index 54b8058..374b5e5 100755 --- a/review-tools/pick-to-branch +++ b/review-tools/pick-to-branch @@ -43,7 +43,20 @@ git co --quiet master || exit 1 git co $branch || exit 1 git cherry-pick -e -x $id -echo -n 'Git push (ctrl-c to cancel): ' -read x -git push +while true +do +echo -n "Enter YES to push or 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" ] +then +break +fi +done + +if [ "$x" = "y" -o "$x" = "yes" ] +then +git push +fi + git co master _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 7dd524ccc83008915d9ae0b7e1a7315e8f01 (commit) from 718bcaec77e8ac62f5d607e405a29c79af23f758 (commit) - Log - commit 7dd524ccc83008915d9ae0b7e1a7315e8f01 Author: Kurt Roeckx Date: Mon Jun 26 19:34:11 2017 +0200 Add a signed copy of the ssh keys --- Summary of changes: ssh-key.txt.asc | 22 ++ 1 file changed, 22 insertions(+) create mode 100644 ssh-key.txt.asc diff --git a/ssh-key.txt.asc b/ssh-key.txt.asc new file mode 100644 index 000..11cf7f9 --- /dev/null +++ b/ssh-key.txt.asc @@ -0,0 +1,22 @@ +-BEGIN PGP SIGNED MESSAGE- +Hash: SHA512 + +git.openssl.org,2001:608:c00:180::1:ea,194.97.150.234 ssh-ed25519 C3NzaC1lZDI1NTE5IPCs7Wdosr81E6b3a/mX5ro5ZnmRCXhDAsoc4DzK/nG0 +git.openssl.org,2001:608:c00:180::1:ea,194.97.150.234 ecdsa-sha2-nistp256 E2VjZHNhLXNoYTItbmlzdHAyNTYIbmlzdHAyNTYAAABBBCJ/03qS4bc3lskR7V6KxRlz4b8grj1nkoE7nCC+5of2t/BZYJsZ92ZGrH7TX3F8Tg44QHAfLcR575S2VTcnRbM= +git.openssl.org,2001:608:c00:180::1:ea,194.97.150.234 ssh-rsa B3NzaC1yc2EDAQABAAABAQC7cF5JeaUznpFLc2zr+G39SgA5q7wVeDxUFNUaHyF8QiIfE5UT444qKOakvgO+qjaCJBjcLqWcla4cWa2dZaCwWv6zQQlTf5Rdca2kt1sKQTyLTbKk33g+9iINNRgnUrhCTqi0/xZsyxOtTMBM1NmblGVoR8HjPwlwmi0u3CKgaIQQtPFYjhliPACJfSE0637HQ9zL3v0+z7sQqYlJ7hdttb/iHCPRjvbQE+tiTMms35TUIAYJIBQXMyv91PTCu35GcjWtj0jYPnsJAmWKqHPqHB5Y/Be+ulIiNOBf4aljq8auBYCfJhDUkQ1UM14CYFUCOzdWr9wr1sw8bYxQtaQP +-BEGIN PGP SIGNATURE- + +iQIzBAEBCgAdFiEEUWHm1ANgDdycoJP748TdzR5MEkQFAllRRVkACgkQ48TdzR5M +EkSTzg/9ETO8vDgF/FVeey2IxhLiAKfXdwGU/sXkIzAShENq/0bqqVf3EYv1bj5U +QEEX6Bp9B47DolF4dWQR6XguGgyeTNrjY5qKi4OEdYMCUN3kQMdjYcEMQkXxJZWm +a1gS01lW29+IlA47fbq+ooJtft2ZjhDuCt7PiqRURRYjgPjzEEkldcXMC+sFxp7H +B5AjEFc5R1uee4khgINwTR22tNXAHjzLlA/3hptVNwpg1Q6K++yr8XN8qg63uwIo +72UzJ7D/zeMyOYPkenIEGdJ+9eRCx9UltYypX6eAYWKE0zxlyGSiK42TMRbj6H4Z +yhZR5Xu88wIS7cDpmxNb31TJISc+5Q8eHTy3SlK1Qc3/6OrpPaK4fCBtk2UnyR7u +jOiyj4S8Z8QhqGYxsWvp9sWqe6EERX3fQDJ1JI/BZP7CH5ZYTewwHayDvkbcgngH +jpa7wU2u/AFSuT4TuY7xYonFXMsUfq6OhvBobg6pULcQq2Lqz3sy2y9j38Jh8JBk +/MERwnVWMxJ/MGxgJiw/DNvnyKhc9H/GjH3hGLEocO6l3ddL/QuA/SFyIJB9TBPE +/W8JPFpgaW3x/ETUs3q5X2SKVvlcSsW0wIYCDpyNxO7X0KkjZC3xJP/X7YQMGkfP +g4j7iM/opNKB+xY4iwthfKalviBErMFlN0TqAStf8B9Mf+ftxLY= +=pMcw +-END PGP SIGNATURE- _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 718bcaec77e8ac62f5d607e405a29c79af23f758 (commit) via f3c270f43032e296a95868ba2309c37f84baf162 (commit) via fd919bab0b95f3225553af616babec0642a9c0a6 (commit) via 9a50378f356e619c985beb80675a37f6c83d94f9 (commit) via 0da1a9b3fce88f56e2c0ec07d2237f2f68e53ac1 (commit) via ded000860e43844ced47214535ab3e15b2effd74 (commit) via 064fa8b5219684a0c26824fe80e1473cd7a8e895 (commit) from 04003d05734dcd23f7c4a4e505ee7a222ceb8457 (commit) - Log - commit 718bcaec77e8ac62f5d607e405a29c79af23f758 Author: Richard Levitte Date: Sun Jun 25 07:24:29 2017 +0200 Enhance addrev / gitaddrev documentation commit f3c270f43032e296a95868ba2309c37f84baf162 Author: Richard Levitte Date: Sun Jun 25 07:23:37 2017 +0200 gitaddrev: list github identities correctly commit fd919bab0b95f3225553af616babec0642a9c0a6 Author: Richard Levitte Date: Sun Jun 25 07:22:59 2017 +0200 addrev, gitaddrev: handle github ids with distinct syntax github identities should be given with a prefixing @ commit 9a50378f356e619c985beb80675a37f6c83d94f9 Author: Richard Levitte Date: Sun Jun 25 07:17:21 2017 +0200 OpenSSL-Query: add request tests with tagged identities commit 0da1a9b3fce88f56e2c0ec07d2237f2f68e53ac1 Author: Richard Levitte Date: Sun Jun 25 07:17:00 2017 +0200 OpenSSL-Query: handle requests with tagged identities commit ded000860e43844ced47214535ab3e15b2effd74 Author: Richard Levitte Date: Sun Jun 25 07:16:28 2017 +0200 QueryApp: add request tests with tagged identities commit 064fa8b5219684a0c26824fe80e1473cd7a8e895 Author: Richard Levitte Date: Sun Jun 25 07:15:58 2017 +0200 QueryApp: handle requests with tagged identities --- Summary of changes: OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm | 16 --- OpenSSL-Query/t/query.t | 28 ++- QueryApp/bin/query.psgi | 18 + QueryApp/t/query.t| 34 ++- QueryApp/t/query_data/pdb.yaml| 4 +-- QueryApp/t/query_direct.t | 28 ++- review-tools/README | 39 --- review-tools/addrev | 11 +--- review-tools/gitaddrev| 24 ++--- 9 files changed, 147 insertions(+), 55 deletions(-) diff --git a/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm b/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm index a98a627..0b9db66 100644 --- a/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm +++ b/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm @@ -41,9 +41,19 @@ sub list_people { return @$decoded; } +sub _id_encode { + my $id = shift; + + return $id if ref($id) eq ""; + croak "Malformed input ID" if ref($id) ne "HASH" || scalar keys %$id != 1; + + my $tag = (keys %$id)[0]; + return $tag . ':' . $id->{$tag}; +} + sub find_person { my $self = shift; - my $id = shift; + my $id = _id_encode(shift); my $ua = $self->_personhandler; my $json = $ua->get($self->base_url . '/0/Person/' @@ -58,7 +68,7 @@ sub find_person { sub find_person_tag { my $self = shift; - my $id = shift; + my $id = _id_encode(shift); my $tag = shift; my $ua = $self->_personhandler; @@ -77,7 +87,7 @@ sub find_person_tag { sub is_member_of { my $self = shift; - my $id = shift; + my $id = _id_encode(shift); my $group = shift; my $ua = $self->_personhandler; diff --git a/OpenSSL-Query/t/query.t b/OpenSSL-Query/t/query.t index f167a66..5cb7c25 100644 --- a/OpenSSL-Query/t/query.t +++ b/OpenSSL-Query/t/query.t @@ -11,7 +11,7 @@ use Test::More; use OpenSSL::Query::REST; use Data::Dumper; -plan tests => 12; +plan tests => 15; SKIP: { my $query; @@ -42,6 +42,18 @@ SKIP: { note( Dumper( { %res2 } ) ); }; + subtest 'Request of person data for Ray Bradbury as full name' => sub { +plan tests => 2; + +my $res1 = $query->find_person( { fullname => 'Ray Bradbury' } ); +ok( $res1, 'Ray Bradbury is present' ); +note( $res1 ); + +my %res2 = $query->find_person( 'Ray Bradbury' ); +ok(scalar keys %res2 > 1, "Got Ray Bradbury's data" ); +note( Dumper( { %res2 } ) ); + }; + subtest 'Request of membership in specific group for Ray Bradbury' => sub { plan tests => 1; my $res = $query->is_member_of( 'Ray Bradbury', 'scifi' ); @@ -49,6 +61,13 @@ SKIP: { note( $res ); }; + subtest 'Request of membership in specific group for Ray Bradbury as full name' => sub { +plan tests => 1; +my $res = $query->is_member_of( { fullname => 'Ray Bradbury' }, 'scifi' ); +ok( $res, "Ray Bradbury is member of scifi since ".( $res ? $res : "(unknown)" ) ); +note( $res ); + }; + subte
[openssl-commits] [tools] master update
The branch master has been updated via 04003d05734dcd23f7c4a4e505ee7a222ceb8457 (commit) from e455d92da59a1b87e44b62a1c25dd0f5ca568539 (commit) - Log - commit 04003d05734dcd23f7c4a4e505ee7a222ceb8457 Author: Benjamin Kaduk Date: Sat Jun 24 18:57:38 2017 -0500 Remove stale advice from README.md After commit 8909d2161299bafbdb0690cdf8b677c0ce7c2f34, gitaddrev uses OpenSSL::Query to determine valid reviewers, so there is no longer a hardcoded list to update. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1) --- Summary of changes: review-tools/README | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/review-tools/README b/review-tools/README index e154975..c2b2570 100644 --- a/review-tools/README +++ b/review-tools/README @@ -23,8 +23,7 @@ addrev addrev is a simple pair of scripts to add or edit reviewers to commits. -To use add the scripts gitaddrev and addrev to your PATH and edit -gitaddrev to contain your email address. +To use add the scripts gitaddrev and addrev to your PATH. Usage is _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via e455d92da59a1b87e44b62a1c25dd0f5ca568539 (commit) from 0202cbb2985cfcbb3f65e20f5e38bbc11adc386d (commit) - Log - commit e455d92da59a1b87e44b62a1c25dd0f5ca568539 Author: Richard Levitte Date: Thu Jun 22 00:03:51 2017 +0200 OpenSSL-Query: obey proxy settings Proxy settings is done with environment variables {scheme}_proxy. For our use, https_proxy is the variable of choice, for example: export https_proxy=http://pxory.my.place/ --- Summary of changes: OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm| 4 +++- OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm b/OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm index 905fa64..fb1f256 100644 --- a/OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm +++ b/OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm @@ -23,7 +23,9 @@ has base_url => ( is => 'ro', default => 'https://api.openssl.org' ); has _clahandler => ( is => 'ro', builder => 1 ); sub _build__clahandler { - return LWP::UserAgent->new( keep_alive => 1 ); + my $ua = LWP::UserAgent->new( keep_alive => 1 ); + $ua->env_proxy; + return $ua; } sub has_cla { diff --git a/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm b/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm index bebc10a..a98a627 100644 --- a/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm +++ b/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm @@ -23,7 +23,9 @@ has base_url => ( is => 'ro', default => 'https://api.openssl.org' ); has _personhandler => ( is => 'lazy', builder => 1 ); sub _build__personhandler { - return LWP::UserAgent->new( keep_alive => 1 ); + my $ua = LWP::UserAgent->new( keep_alive => 1 ); + $ua->env_proxy; + return $ua; } sub list_people { _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 0202cbb2985cfcbb3f65e20f5e38bbc11adc386d (commit) from c7179aa509ae8e9b5c4b6c51df27bd00c0f698f4 (commit) - Log - commit 0202cbb2985cfcbb3f65e20f5e38bbc11adc386d Author: Richard Levitte Date: Wed Jun 21 11:55:27 2017 +0200 OpenSSL-Query, QueryApp: bump to 1.1 --- Summary of changes: OpenSSL-Query/Makefile.PL | 2 +- QueryApp/Makefile.PL | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSSL-Query/Makefile.PL b/OpenSSL-Query/Makefile.PL index fc4e660..ac80b4a 100644 --- a/OpenSSL-Query/Makefile.PL +++ b/OpenSSL-Query/Makefile.PL @@ -5,7 +5,7 @@ use inc::Module::Install; name'OpenSSL-Query'; module_name 'OpenSSL::Query'; -version '1.0'; +version '1.1'; abstract''; author q{Richard Levitte }; license 'apache'; diff --git a/QueryApp/Makefile.PL b/QueryApp/Makefile.PL index 8fe421d..5d41e64 100644 --- a/QueryApp/Makefile.PL +++ b/QueryApp/Makefile.PL @@ -4,7 +4,7 @@ use warnings; use inc::Module::Install; name 'QueryApp'; -version '1.0'; +version '1.1'; abstract 'An OpenSSL query web app'; author q{Richard Levitte }; license 'apache'; _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via c7179aa509ae8e9b5c4b6c51df27bd00c0f698f4 (commit) from 1eea9fe31110717d2124d75a2414aad66ccb61d7 (commit) - Log - commit c7179aa509ae8e9b5c4b6c51df27bd00c0f698f4 Author: Richard Levitte Date: Wed Jun 21 11:50:38 2017 +0200 QueryApp: use 'param' rather than 'route_parameters->get' The latter is a fairly modern addition to Dancer2 --- Summary of changes: QueryApp/bin/query.psgi | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/QueryApp/bin/query.psgi b/QueryApp/bin/query.psgi index 80d8a53..d6c0e56 100644 --- a/QueryApp/bin/query.psgi +++ b/QueryApp/bin/query.psgi @@ -74,7 +74,7 @@ get '/People' => sub { get '/Person/:name' => sub { my $query = OpenSSL::Query->new(bureau => config->{bureau}); - my $name = uri_decode(route_parameters->get('name')); + my $name = uri_decode(param('name')); my %response = $query->find_person($name); return { %response } if %response; @@ -83,7 +83,7 @@ get '/Person/:name' => sub { get '/Person/:name/Membership' => sub { my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); - my $name = uri_decode(route_parameters->get('name')); + my $name = uri_decode(param('name')); my %response = $query->find_person($name); return $response{memberof} if %response; @@ -92,8 +92,8 @@ get '/Person/:name/Membership' => sub { get '/Person/:name/IsMemberOf/:group' => sub { my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); - my $name = uri_decode(route_parameters->get('name')); - my $group = uri_decode(route_parameters->get('group')); + my $name = uri_decode(param('name')); + my $group = uri_decode(param('group')); my $response = $query->is_member_of($name, $group); return [ $response ] if $response; @@ -102,8 +102,8 @@ get '/Person/:name/IsMemberOf/:group' => sub { get '/Person/:name/ValueOfTag/:tag' => sub { my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); - my $name = uri_decode(route_parameters->get('name')); - my $tag = uri_decode(route_parameters->get('tag')); + my $name = uri_decode(param('name')); + my $tag = uri_decode(param('tag')); my $response = $query->find_person_tag($name, $tag); return [ $response ] if $response; @@ -112,7 +112,7 @@ get '/Person/:name/ValueOfTag/:tag' => sub { get '/Person/:name/HasCLA' => sub { my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); - my $name = uri_decode(route_parameters->get('name')); + my $name = uri_decode(param('name')); my %person = $query->find_person($name); my @response = (); @@ -127,7 +127,7 @@ get '/Person/:name/HasCLA' => sub { get '/Group/:group/Members' => sub { my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); - my $group = uri_decode(route_parameters->get('group')); + my $group = uri_decode(param('group')); my @response = $query->members_of($group); return [ @response ] if @response; @@ -136,7 +136,7 @@ get '/Group/:group/Members' => sub { get '/HasCLA/:id' => sub { my $query = OpenSSL::Query->new(bureau => config->{bureau}, REST => 0); - my $id = uri_decode(route_parameters->get('id')); + my $id = uri_decode(param('id')); if ($id =~ m|^\S+\@\S+$|) { my $response = $query->has_cla($id); _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 1eea9fe31110717d2124d75a2414aad66ccb61d7 (commit) from aa1594ce1e5b338ae79059c7d60d2db9cfb00cda (commit) - Log - commit 1eea9fe31110717d2124d75a2414aad66ccb61d7 Author: Richard Levitte Date: Wed Jun 21 11:48:33 2017 +0200 QueryApp: Clone is also required since recently --- Summary of changes: QueryApp/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/QueryApp/README.md b/QueryApp/README.md index 5fc12bd..fe9c47f 100644 --- a/QueryApp/README.md +++ b/QueryApp/README.md @@ -31,6 +31,7 @@ OpenSSL::Query requires these extra modules to run: - Dancer2 (debian package libdancer2-perl) - Plack(debian package libplack-perl) - URI::Encode (debian package liburi-encode-perl) +- Clone(debian package libclone-perl) - OpenSSL::Query (from ../OpenSSL-Query) Any other module OpenSSL::Query depends on should be part of core _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via aa1594ce1e5b338ae79059c7d60d2db9cfb00cda (commit) from 4095d224953ad6d95793af39076fd0e951581ab2 (commit) - Log - commit aa1594ce1e5b338ae79059c7d60d2db9cfb00cda Author: Richard Levitte Date: Wed Jun 21 11:30:50 2017 +0200 OpenSSL-Query, QueryApp: Actually, Module::Starter is NOT needed to build ... it was only needed to create the initial Makefile.PL --- Summary of changes: OpenSSL-Query/README.md | 1 - QueryApp/README.md | 1 - 2 files changed, 2 deletions(-) diff --git a/OpenSSL-Query/README.md b/OpenSSL-Query/README.md index 83c605f..df036d8 100644 --- a/OpenSSL-Query/README.md +++ b/OpenSSL-Query/README.md @@ -16,7 +16,6 @@ Requirements OpenSSL::Query requires the following modules to build: -- Module::Starter and its dependencies (debian package libmodule-starter-perl) - Module::Install (debian package libmodule-install-perl) OpenSSL::Query requires these extra modules to run: diff --git a/QueryApp/README.md b/QueryApp/README.md index 2326103..5fc12bd 100644 --- a/QueryApp/README.md +++ b/QueryApp/README.md @@ -22,7 +22,6 @@ Requirements OpenSSL::Query requires the following modules to build: -- Module::Starter and its dependencies (debian package libmodule-starter-perl) - Module::Install (debian package libmodule-install-perl) OpenSSL::Query requires these extra modules to run: _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 4095d224953ad6d95793af39076fd0e951581ab2 (commit) from 87710c639a2c2cfc00b690b5d22f541a4bc7b43d (commit) - Log - commit 4095d224953ad6d95793af39076fd0e951581ab2 Author: Richard Levitte Date: Tue Jun 20 23:55:48 2017 +0200 gitaddrev: Never ever try $query->has_cla unless the id has email form --- Summary of changes: review-tools/gitaddrev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 9038137..13a7f8c 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -48,7 +48,7 @@ sub try_add_reviewer { } else { push @unknown_reviewers, $id unless grep {$_ eq $id} @unknown_reviewers; - unless ($query->has_cla($id)) { + unless ($id =~ m|^.*\@.*$| && $query->has_cla($id)) { push @nocla_reviewers, $id unless grep {$_ eq $id} @nocla_reviewers; } _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 87710c639a2c2cfc00b690b5d22f541a4bc7b43d (commit) from ec891a63597c67c0bcbec00ed2d4813dd70eb819 (commit) - Log - commit 87710c639a2c2cfc00b690b5d22f541a4bc7b43d Author: Richard Levitte Date: Tue Jun 20 23:50:00 2017 +0200 OpenSSL-Query, QueryArg: require Module::Install to build --- Summary of changes: OpenSSL-Query/README.md | 2 +- QueryApp/README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenSSL-Query/README.md b/OpenSSL-Query/README.md index bdec164..83c605f 100644 --- a/OpenSSL-Query/README.md +++ b/OpenSSL-Query/README.md @@ -17,13 +17,13 @@ Requirements OpenSSL::Query requires the following modules to build: - Module::Starter and its dependencies (debian package libmodule-starter-perl) +- Module::Install (debian package libmodule-install-perl) OpenSSL::Query requires these extra modules to run: - Class::Method::Modifiers (debian package libclass-method-modifiers-perl) - Moo (debian package libmoo-perl) - URI::Encode (debian package liburi-encode-perl) -- Install (debian package libmodule-install-perl) Any other module OpenSSL::Query depends on should be part of core perl. diff --git a/QueryApp/README.md b/QueryApp/README.md index 0567af2..2326103 100644 --- a/QueryApp/README.md +++ b/QueryApp/README.md @@ -23,6 +23,7 @@ Requirements OpenSSL::Query requires the following modules to build: - Module::Starter and its dependencies (debian package libmodule-starter-perl) +- Module::Install (debian package libmodule-install-perl) OpenSSL::Query requires these extra modules to run: _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via ec891a63597c67c0bcbec00ed2d4813dd70eb819 (commit) from 010c66d97f13363bd3e449a0a371b81b0630c97c (commit) - Log - commit ec891a63597c67c0bcbec00ed2d4813dd70eb819 Author: Richard Levitte Date: Tue Jun 20 23:45:20 2017 +0200 Read commit message after having parsed the options ... because --list isn't fed anything --- Summary of changes: review-tools/gitaddrev | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 0596aca..9038137 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -56,9 +56,6 @@ sub try_add_reviewer { return $rc; } -my @commit_message = map { (my $x = $_) =~ s|\R$||; $x } ; -my $trivial = !! grep(/^CLA:\s*Trivial\s*$/i, @commit_message); - foreach (@ARGV) { if (/^--list$/) { my %list = (); @@ -100,6 +97,9 @@ foreach (@ARGV) { } } +my @commit_message = map { (my $x = $_) =~ s|\R$||; $x } ; +my $trivial = !! grep(/^CLA:\s*Trivial\s*$/i, @commit_message); + # If the author is a registered committer, that identity passes as a reviewer # too. There is a twist, though... see next comment if (my $rev = try_add_reviewer($ENV{GIT_AUTHOR_EMAIL})) { _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 010c66d97f13363bd3e449a0a371b81b0630c97c (commit) from e516fb0ccc922861b26628f06cf32ec5de8b7308 (commit) - Log - commit 010c66d97f13363bd3e449a0a371b81b0630c97c Author: Rich Salz Date: Tue Jun 20 17:44:17 2017 -0400 Add ref to Install module --- Summary of changes: OpenSSL-Query/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenSSL-Query/README.md b/OpenSSL-Query/README.md index dea15f2..bdec164 100644 --- a/OpenSSL-Query/README.md +++ b/OpenSSL-Query/README.md @@ -23,6 +23,7 @@ OpenSSL::Query requires these extra modules to run: - Class::Method::Modifiers (debian package libclass-method-modifiers-perl) - Moo (debian package libmoo-perl) - URI::Encode (debian package liburi-encode-perl) +- Install (debian package libmodule-install-perl) Any other module OpenSSL::Query depends on should be part of core perl. _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via e516fb0ccc922861b26628f06cf32ec5de8b7308 (commit) via 722e16cdc4956dba711ad6009884f0ffd6bdf372 (commit) from a1f9fa9d7592c91f0bb7eee4828d587063843a52 (commit) - Log - commit e516fb0ccc922861b26628f06cf32ec5de8b7308 Author: Richard Levitte Date: Tue Jun 20 16:13:54 2017 +0200 gitaddrev: treat the prnum line separately commit 722e16cdc4956dba711ad6009884f0ffd6bdf372 Author: Richard Levitte Date: Tue Jun 20 16:12:25 2017 +0200 addrev, gitaddrev: use strict and warnings and deal with the consequences --- Summary of changes: review-tools/addrev| 3 +++ review-tools/gitaddrev | 17 - 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/review-tools/addrev b/review-tools/addrev index 8da2b03..b3f5531 100755 --- a/review-tools/addrev +++ b/review-tools/addrev @@ -1,5 +1,8 @@ #!/usr/bin/perl +use strict; +use warnings; + my $args = ""; my $filterargs = "HEAD^.."; my $list_reviewers = 0; diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index e1b5f9a..0596aca 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -1,12 +1,15 @@ #!/usr/bin/perl +use strict; +use warnings; + use File::Basename; use FindBin; use OpenSSL::Query::REST; use Module::Load::Conditional qw(can_load); -can_load(modules => { OpenSSL::Query::DB => undef }); +can_load(modules => { 'OpenSSL::Query::DB' => undef }); my $rmrev = 0; my @commits; @@ -181,19 +184,23 @@ my $last_is_rev = 0; foreach (@commit_message) { # Start each line with assuming it's not a reviewed-by line $last_is_rev = 0; -if (/^\(Merged from https:\/\/github\.com\/openssl\/openssl\/pull\// - || /^Reviewed-by:\s*(\S.*\S)\s*$/) { +if (/^\(Merged from https:\/\/github\.com\/openssl\/openssl\/pull\//) { +next if $rmrev == 1; +$last_is_rev = 1; +next; # Because we're rewriting it below + # (unless --nopr was given in addrev) +} elsif (/^Reviewed-by:\s*(\S.*\S)\s*$/) { my $id = $1; next if $rmrev == 1; $last_is_rev = 1; # Remove reviewers that are already in the message from our reviewer list -@reviewers = grep { $_ ne $id } @reviewers if $id; +@reviewers = grep { $_ ne $id } @reviewers; } print $_,"\n"; } if ($rmrev == 0) { #Add a blank line unless the last one is a review line -print "\n" unless $have_rev; +print "\n" unless $last_is_rev; foreach(@reviewers) { print "Reviewed-by: $_\n"; } _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via a1f9fa9d7592c91f0bb7eee4828d587063843a52 (commit) via e2b3a71e500434b3462748aa8dbbfab2c7e8101b (commit) via 6dc421b7a640888202cfb69c795d36df524a52a9 (commit) via 59c0d003c6841b2e841401194e83893e727f6196 (commit) from 138c39c5d96593910bbacb569c27e914a137eeb7 (commit) - Log - commit a1f9fa9d7592c91f0bb7eee4828d587063843a52 Author: Richard Levitte Date: Tue Jun 20 15:22:48 2017 +0200 gitaddrev: in verbose mode, tell when CLA: Trivial was detected commit e2b3a71e500434b3462748aa8dbbfab2c7e8101b Author: Richard Levitte Date: Tue Jun 20 15:12:28 2017 +0200 gitaddrev: remove ending blank lines from commit message before processing it commit 6dc421b7a640888202cfb69c795d36df524a52a9 Author: Richard Levitte Date: Tue Jun 20 15:10:14 2017 +0200 gitaddrev: the --trivial option is outdated, check the commit message instead commit 59c0d003c6841b2e841401194e83893e727f6196 Author: Richard Levitte Date: Tue Jun 20 15:06:32 2017 +0200 addrev: remove options that were never implemented --- Summary of changes: review-tools/addrev| 6 -- review-tools/gitaddrev | 41 +++-- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/review-tools/addrev b/review-tools/addrev index 169f381..8da2b03 100755 --- a/review-tools/addrev +++ b/review-tools/addrev @@ -77,14 +77,8 @@ option style arguments: --commit= Only apply to commit --myemail= Set email address. Defaults to the result from git configuration setting user.email. ---trivial Add a "CLA: trivial" to the message. ---addcla Add a CLA header for the author of the commit --nopr Do not requre a PR number. --prnum=NNN Add a reference to GitHub pull request NNN ---clatype= Only add a CLA header of the specified type. is - either C for Corporate or I for Individual ---clamatch= Only add a CLA where appears somewhere in the - description (i.e. the third column of cladb.txt) - Change the last commits. Defaults to 1. non-option style arguments can be: diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 8dd3682..e1b5f9a 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -17,7 +17,6 @@ my $found = 0; my $num = 0; my $refuse = 0; my $prnum = 0; -my $trivial = 0; my $verbose = 0; my $query = OpenSSL::Query->new(); @@ -54,6 +53,9 @@ sub try_add_reviewer { return $rc; } +my @commit_message = map { (my $x = $_) =~ s|\R$||; $x } ; +my $trivial = !! grep(/^CLA:\s*Trivial\s*$/i, @commit_message); + foreach (@ARGV) { if (/^--list$/) { my %list = (); @@ -90,8 +92,6 @@ foreach (@ARGV) { $rmrev = 1; } elsif (/^--myemail=(.+\@.+)$/) { try_add_reviewer($1); -} elsif (/^--trivial$/) { -$trivial = 1; } elsif (/^--verbose$/) { $verbose = 1; } @@ -137,6 +137,8 @@ if (@nocla_reviewers) { die "Reviewers without CLA: ", join(", ", @nocla_reviewers), "\n"; } +print STDERR "Detected trivial marker\n" if $verbose && $trivial; + print STDERR "Going with these reviewers:\n ", join("\n ", @reviewers), "\n" if $verbose; @@ -172,35 +174,30 @@ if (scalar @reviewers == 0 && $rmrev == 0) { die "No reviewer set!\n"; } -my $last_line_blank = 0; -my $have_rev = 0; -while() { +# Remove blank lines from the end of commit message +pop @commit_message while $commit_message[$#commit_message] =~ m|^\s*$|; + +my $last_is_rev = 0; +foreach (@commit_message) { +# Start each line with assuming it's not a reviewed-by line +$last_is_rev = 0; if (/^\(Merged from https:\/\/github\.com\/openssl\/openssl\/pull\// || /^Reviewed-by:\s*(\S.*\S)\s*$/) { +my $id = $1; next if $rmrev == 1; -$have_rev = 1; -# Skip if reviewer already in list -next if $1 && grep { $1 eq $_ } @reviewers; +$last_is_rev = 1; +# Remove reviewers that are already in the message from our reviewer list +@reviewers = grep { $_ ne $id } @reviewers if $id; } -print; -$last_line_blank = ($_ =~ /^\s*$/); +print $_,"\n"; } if ($rmrev == 0) { -#Add a blank line unless the last one is already blank or a review line -print "\n" unless $last_line_blank || $have_rev; +#Add a blank line unless the last one is a review line +print "\n" unless $have_rev; foreach(@reviewers) { print "Reviewed-by: $_\n"; } -if ($trivial) { -print "CLA: trivial\n"; -} } print "(Merged from https://github.com/openssl/openssl/pull/$prnum)\n" if $prnum; - -my $email = $ENV{GIT_AUTHOR_EMAIL}; - -if (!$trivial && !$query->has_cla(lc
[openssl-commits] [tools] master update
The branch master has been updated via 138c39c5d96593910bbacb569c27e914a137eeb7 (commit) from e61380828312a7803ea217d10866affedc4582ec (commit) - Log - commit 138c39c5d96593910bbacb569c27e914a137eeb7 Author: Richard Levitte Date: Tue Jun 20 14:17:24 2017 +0200 OpenSSL-Query: use HTTP::Status::is_server_error It was reported that the HTTP::Response attribute is_server_error isn't available in older versions. Instead of that attribute, use HTTP::Status::is_server_error on the server code. --- Summary of changes: OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm| 13 ++--- OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm | 21 ++--- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm b/OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm index 5cb4ae9..905fa64 100644 --- a/OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm +++ b/OpenSSL-Query/lib/OpenSSL/Query/ClaREST.pm @@ -13,6 +13,7 @@ package OpenSSL::Query::ClaREST; use Carp; use Moo; use OpenSSL::Query qw(-register-cla OpenSSL::Query::ClaREST -priority 1); +use HTTP::Status qw(:is); use LWP::UserAgent; use URI::Encode qw(uri_encode uri_decode); use JSON::PP; @@ -25,16 +26,6 @@ sub _build__clahandler { return LWP::UserAgent->new( keep_alive => 1 ); } -## Validation -#sub BUILD { -# my $self = shift; -# -# # print STDERR Dumper(@_); -# my $ua = $self->_clahandler; -# my $resp = $ua->get($self->base_url); -# croak "Server error: ", $resp->message if $resp->is_server_error; -#} - sub has_cla { my $self = shift; my $id = shift; @@ -44,7 +35,7 @@ sub has_cla { my $ua = $self->_clahandler; my $json = $ua->get($self->base_url . '/0/HasCLA/' . uri_encode($id, {encode_reserved => 1})); - croak "Server error: ", $json->message if $json->is_server_error; + croak "Server error: ", $json->message if is_server_error($json->code); return $json->code == 200; } diff --git a/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm b/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm index d4b78b3..bebc10a 100644 --- a/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm +++ b/OpenSSL-Query/lib/OpenSSL/Query/PersonREST.pm @@ -14,6 +14,7 @@ use Carp; use Moo; use OpenSSL::Query qw(-register-person OpenSSL::Query::PersonREST -priority 1); use LWP::UserAgent; +use HTTP::Status qw(:is); use URI::Encode qw(uri_encode uri_decode); use JSON::PP; use Data::Dumper; @@ -25,22 +26,12 @@ sub _build__personhandler { return LWP::UserAgent->new( keep_alive => 1 ); } -## Validation -#sub BUILD { -# my $self = shift; -# -# # print STDERR Dumper(@_); -# my $ua = $self->_personhandler; -# my $resp = $ua->get($self->base_url); -# croak "Server error: ", $resp->message if $resp->is_server_error; -#} - sub list_people { my $self = shift; my $ua = $self->_personhandler; my $json = $ua->get($self->base_url . '/0/People'); - croak "Server error: ", $json->message if $json->is_server_error; + croak "Server error: ", $json->message if is_server_error($json->code); return () unless $json->code == 200; my $decoded = decode_json $json->decoded_content; @@ -55,7 +46,7 @@ sub find_person { my $ua = $self->_personhandler; my $json = $ua->get($self->base_url . '/0/Person/' . uri_encode($id, {encode_reserved => 1})); - croak "Server error: ", $json->message if $json->is_server_error; + croak "Server error: ", $json->message if is_server_error($json->code); return () unless $json->code == 200; my $decoded = decode_json $json->decoded_content; @@ -74,7 +65,7 @@ sub find_person_tag { . uri_encode($id, {encode_reserved => 1}) . '/ValueOfTag/' . uri_encode ($tag, {encode_reserved => 1})); - croak "Server error: ", $json->message if $json->is_server_error; + croak "Server error: ", $json->message if is_server_error($json->code); return undef unless $json->code == 200; my $decoded = decode_json $json->decoded_content; @@ -93,7 +84,7 @@ sub is_member_of { . uri_encode($id, {encode_reserved => 1}) . '/IsMemberOf/' . uri_encode ($group, {encode_reserved => 1})); - croak "Server error: ", $json->message if $json->is_server_error; + croak "Server error: ", $json->message if is_server_error($json->code); return 0 unless $json->code == 200; my $decoded = decode_json $json->decoded_content; @@ -111,7 +102,7 @@ sub members_of { . '/0/Group/' . uri_encode($group, {encode_reserved => 1}) . '/Members'); - croak "Server error: ", $json->message if $json->is_server_error; + croak "Server error: ", $json->message if is_server_error($json->code); return () unless $
[openssl-commits] [tools] master update
The branch master has been updated via e61380828312a7803ea217d10866affedc4582ec (commit) from b8a728d49d075049bc8a571363542ff20c25a331 (commit) - Log - commit e61380828312a7803ea217d10866affedc4582ec Author: Richard Levitte Date: Tue Jun 20 11:35:18 2017 +0200 Register lack of CLA on unknown people and check author carefully If the author is unknown in our person DB, we still need to check that they are covered by a CLA or that the commit is marked trivial. --- Summary of changes: review-tools/gitaddrev | 23 +++ 1 file changed, 23 insertions(+) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 8286dae..8dd3682 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -46,6 +46,10 @@ sub try_add_reviewer { } else { push @unknown_reviewers, $id unless grep {$_ eq $id} @unknown_reviewers; + unless ($query->has_cla($id)) { + push @nocla_reviewers, $id + unless grep {$_ eq $id} @nocla_reviewers; + } } return $rc; } @@ -105,6 +109,25 @@ if (my $rev = try_add_reviewer($ENV{GIT_AUTHOR_EMAIL})) { # solution is to record this rev tag separately and remove it from # @reviewers after the count check. $skip_reviewer = $rev; + +} else { + +# In case the author is unknown to our databases or is lacking a CLA, +# we need to be extra careful to check if this is supposed to be a +# trivial commit. +my $author = $ENV{GIT_AUTHOR_EMAIL}; + +# Note: it really should be enough to check if $author is unknown, since +# the databases are supposed to be consistent with each other. However, +# let's be cautious and check both, in case someone has been registered +# as a known identity without having a CLA in place. +die "Commit author ",$author," has no CLA, and this is a non-trivial commit\n" + if !$trivial && grep { $_ eq $author } (@nocla_reviewers); + +# Now that that's cleared, remove the author from anything that could cause +# more unnecessary errors (false positives). +@nocla_reviewers = grep { $_ ne $author } @nocla_reviewers; +@unknown_reviewers = grep { $_ ne $author } @unknown_reviewers; } if (@unknown_reviewers) { _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via b8a728d49d075049bc8a571363542ff20c25a331 (commit) from 6f80fa00aefcfd39481f17eff9df7e85fa1eb9ab (commit) - Log - commit b8a728d49d075049bc8a571363542ff20c25a331 Author: Richard Levitte Date: Sat Jun 17 15:51:11 2017 +0200 addrev, gitaddrev: allow nicknames that contain dashes --- Summary of changes: review-tools/addrev| 2 +- review-tools/gitaddrev | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/review-tools/addrev b/review-tools/addrev index f4d65a8..169f381 100755 --- a/review-tools/addrev +++ b/review-tools/addrev @@ -10,7 +10,7 @@ my $trivial = 0; my $my_email; foreach (@ARGV) { -if (/^[a-z]+$/) { +if (/^[a-z][-a-z]*$/) { $args .= "--reviewer=$_ "; } elsif (/^--reviewer=(.+)$/) { $args .= "--reviewer=$1 "; diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 5889758..8286dae 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -58,7 +58,7 @@ foreach (@ARGV) { my $rev = $query->find_person_tag($email_id, 'rev'); my $omc = $query->is_member_of($email_id, 'omc'); next unless $query->has_cla($rev); - my @ids = sort grep { $_ =~ m|^[a-z]+$| } map { + my @ids = sort grep { $_ =~ m|^[a-z][-a-z]*$| } map { if (ref($_) eq "HASH") { values %$_; } else { _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 6f80fa00aefcfd39481f17eff9df7e85fa1eb9ab (commit) from 6cb0b16fb56e88999d66b09c47491335c06cfe81 (commit) - Log - commit 6f80fa00aefcfd39481f17eff9df7e85fa1eb9ab Author: Rich Salz Date: Fri Jun 16 11:23:49 2017 -0400 Remove commas in text field --- Summary of changes: license/whattoremove | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/license/whattoremove b/license/whattoremove index 3fc47f0..57cd1ef 100755 --- a/license/whattoremove +++ b/license/whattoremove @@ -53,6 +53,6 @@ for cid in cids: for row in cursor: commit,date,descrip = row commit = commit[0:7] -descrip = descrip.replace('"', '\'') +descrip = descrip.replace('"', '\'').replace(',', '') if include == None or commit in include: print '%s, %s, "%s"' % (commit, emails[cid], descrip) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 6cb0b16fb56e88999d66b09c47491335c06cfe81 (commit) from f3ff55039e7346c1c15f157df20cfe888359b367 (commit) - Log - commit 6cb0b16fb56e88999d66b09c47491335c06cfe81 Author: Rich Salz Date: Fri Jun 16 11:14:22 2017 -0400 Add -i flag --- Summary of changes: license/whattoremove | 31 +++ 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/license/whattoremove b/license/whattoremove index 632ba4b..3fc47f0 100755 --- a/license/whattoremove +++ b/license/whattoremove @@ -1,10 +1,31 @@ #! /usr/bin/env python -"""Takes no arguments. Outputs CSV of what commits people who rejected -the license were involved in. +"""whattoremove [arguments] + +Flags: +-i file File of commits to include +-h This help + +Outputs CSV list of the commits that people who rejected +the license were involved in. The exclude file can be +generated by a command like this: +git log --pretty=fomat:%h """ import mysql.connector import datetime, os, re, subprocess, sys, string, random +import getopt + +# Parse JCL +include = None +opts, args = getopt.getopt(sys.argv[1:], "hi:") +for o,a in opts: +if o == '-i': +f = open(a) +include = [ c.strip() for c in f ] +f.close() +else: +print __doc__ +raise SystemExit dbconfig = { 'user': 'licensereader', @@ -13,7 +34,6 @@ dbconfig = { } conn = mysql.connector.connect(**dbconfig) cursor = conn.cursor() -raw = open("request-approval.txt").read() # Get those who said no and all the commits the did q = ( 'SELECT log.cid,users.email FROM log' @@ -32,4 +52,7 @@ for cid in cids: cursor.execute(q, (cid,)) for row in cursor: commit,date,descrip = row -print '%s, %s, "%s"' % (commit[0:7], emails[cid], descrip) +commit = commit[0:7] +descrip = descrip.replace('"', '\'') +if include == None or commit in include: +print '%s, %s, "%s"' % (commit, emails[cid], descrip) _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via f3ff55039e7346c1c15f157df20cfe888359b367 (commit) via e8e60e3df9e530bc9e02d81ea7be124896109c9d (commit) via ab8e4694162f019994899dab493cdc7f2cf8e553 (commit) via d5e65f7fc2b30baeda99a25f2196cbabd3f17c75 (commit) via 8e02aed895bd7c93cd2439bae7b3ab8767056120 (commit) from c73cece3320a866a6200ecd6615420b346150873 (commit) - Log - commit f3ff55039e7346c1c15f157df20cfe888359b367 Author: Richard Levitte Date: Fri Jun 16 13:56:11 2017 +0200 OpenSSL-Query, QueryApp: Time to bump the version to 1.0 Also, add repository and proper bugtracker info commit e8e60e3df9e530bc9e02d81ea7be124896109c9d Author: Richard Levitte Date: Fri Jun 16 13:52:59 2017 +0200 OpenSSL-Query, QueryApp: change the last OpenSSLQuery to OpenSSL-Query commit ab8e4694162f019994899dab493cdc7f2cf8e553 Author: Richard Levitte Date: Fri Jun 16 10:58:04 2017 +0200 addrev: remove useless duplicate handling of --trivial commit d5e65f7fc2b30baeda99a25f2196cbabd3f17c75 Author: Richard Levitte Date: Fri Jun 16 10:57:36 2017 +0200 addrev: handle --verbose commit 8e02aed895bd7c93cd2439bae7b3ab8767056120 Author: Richard Levitte Date: Fri Jun 16 10:50:33 2017 +0200 gitaddrev: turn the debugging message to a verbosity one --- Summary of changes: OpenSSL-Query/Makefile.PL | 9 - OpenSSL-Query/README.md | 3 ++- QueryApp/Makefile.PL | 7 +++ QueryApp/t/query_direct.t | 2 +- review-tools/addrev | 5 +++-- review-tools/gitaddrev| 8 +++- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/OpenSSL-Query/Makefile.PL b/OpenSSL-Query/Makefile.PL index 83e953a..fc4e660 100644 --- a/OpenSSL-Query/Makefile.PL +++ b/OpenSSL-Query/Makefile.PL @@ -3,9 +3,9 @@ use strict; use warnings; use inc::Module::Install; -name'OpenSSLQuery'; +name'OpenSSL-Query'; module_name 'OpenSSL::Query'; -version '0.0.1'; +version '1.0'; abstract''; author q{Richard Levitte }; license 'apache'; @@ -16,9 +16,8 @@ tests_recursive('t'); resources ( license=> 'http://www.apache.org/licenses/LICENSE-2.0', - #repository => 'git://github.com/Richard Levitte/OpenSSL-query.git', - #repository => 'https://bitbucket.org/Richard Levitte/OpenSSL-query', - bugtracker => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=OpenSSL-query', + repository => 'https://github.com/openssl/tools.git', + bugtracker => 'https://github.com/openssl/tools/issues', ); configure_requires ( diff --git a/OpenSSL-Query/README.md b/OpenSSL-Query/README.md index 182507f..dea15f2 100644 --- a/OpenSSL-Query/README.md +++ b/OpenSSL-Query/README.md @@ -61,6 +61,7 @@ Testing is done like this: However, it requires that a temporary query service is started as well. This is part of QueryApp, and is started like this: +$ here=`pwd` $ cd ../QueryApp # Or wherever you have it checked out $ PERSONDB=./t/query_data/pdb.yaml CLADB=./t/query_data/cdb.txt \ - PERL5LIB=./lib:../OpenSSLQuery/lib plackup bin/query.psgi + PERL5LIB=./lib:$here/lib plackup bin/query.psgi diff --git a/QueryApp/Makefile.PL b/QueryApp/Makefile.PL index 129140e..8fe421d 100644 --- a/QueryApp/Makefile.PL +++ b/QueryApp/Makefile.PL @@ -4,7 +4,7 @@ use warnings; use inc::Module::Install; name 'QueryApp'; -version '0.0.1'; +version '1.0'; abstract 'An OpenSSL query web app'; author q{Richard Levitte }; license 'apache'; @@ -15,9 +15,8 @@ tests_recursive('t'); resources ( license=> 'http://www.apache.org/licenses/LICENSE-2.0', - #repository => 'git://github.com/Richard Levitte/OpenSSL-query.git', - #repository => 'https://bitbucket.org/Richard Levitte/OpenSSL-query', - bugtracker => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=OpenSSL-query', + repository => 'https://github.com/openssl/tools.git', + bugtracker => 'https://github.com/openssl/tools/issues', ); configure_requires ( diff --git a/QueryApp/t/query_direct.t b/QueryApp/t/query_direct.t index bbd9240..e7d8ac4 100644 --- a/QueryApp/t/query_direct.t +++ b/QueryApp/t/query_direct.t @@ -11,7 +11,7 @@ use Test::More tests => 11; use Data::Dumper; use FindBin; -# This picks up if this is part of a checkout with OpenSSLQuery +# This picks up if this is part of a checkout with OpenSSL-Query use if -r $FindBin::Bin.'/../../OpenSSL-Query/lib/OpenSSL/Query.pm', lib => $FindBin::Bin.'/../../OpenSSL-Query/lib'; require OpenSSL::Query::DB; OpenSSL::Query::DB->import(); diff --git a/review-tools/addrev b/review-tools/addrev index 7a99ea7..f4d65a8 100755 --- a/review-tools/addrev +++ b/review-tools/addrev @@ -18,6 +18,8 @@ foreach (@ARGV) { $args .= "--rmreviewers "; } elsif (/^--trivial$/) { $args .= "--trivial "; +} elsif (/^--verbose$/) { +$args
[openssl-commits] [tools] master update
The branch master has been updated via c73cece3320a866a6200ecd6615420b346150873 (commit) from 18464ff9f3635d574daa0aeb310a78969db79d8c (commit) - Log - commit c73cece3320a866a6200ecd6615420b346150873 Author: Richard Levitte Date: Fri Jun 16 01:12:18 2017 +0200 gitaddrev: more logic corrections Refactor reviewer addition to a function of its own. It will return the person's rev tag on success. Furthermore, don't do any further checks on the --myemail argument, just try to add the corresponding rev tag as well. Finally, try to add the rev tag for the committer author, but immediately register that it should be removed from @reviewers after checking the reviewer count. This ensures that the commit author never will figure as reviewer as well, even if the addresses differ from each other. --- Summary of changes: review-tools/gitaddrev | 91 +- 1 file changed, 45 insertions(+), 46 deletions(-) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index f539982..f155e76 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -9,11 +9,6 @@ use Module::Load::Conditional qw(can_load); can_load(modules => { OpenSSL::Query::DB => undef }); my $rmrev = 0; -my @reviewers; -my @nocla_reviewers; -my @unknown_reviewers; -my $skip_reviewer; -my $omccount = 0; my @commits; my $skip = 0; my $matchstr; @@ -26,6 +21,34 @@ my $trivial = 0; my $query = OpenSSL::Query->new(); +my @reviewers; +my @nocla_reviewers; +my @unknown_reviewers; +my $skip_reviewer; +my $omccount = 0; +sub try_add_reviewer { +my $id = shift; +my $rc = undef; +my $rev = $query->find_person_tag($id, 'rev'); +if ($rev) { + my $cla = $query->has_cla($rev); + if ($cla) { + unless (grep {$_ eq $rev} @reviewers) { + $omccount++ if $query->is_member_of($id, 'omc'); + push @reviewers, $rev; + } + $rc = $rev; + } else { + push @nocla_reviewers, $id + unless grep {$_ eq $id} @nocla_reviewers; + } +} else { + push @unknown_reviewers, $id + unless grep {$_ eq $id} @unknown_reviewers; +} +return $rc; +} + foreach (@ARGV) { if (/^--list$/) { my %list = (); @@ -52,22 +75,7 @@ foreach (@ARGV) { } exit 0; } elsif (/^--reviewer=(.+)$/) { - my $rev = $query->find_person_tag($1, 'rev'); - if ($rev) { - my $cla = $query->has_cla($rev); - if ($cla) { - unless (grep {$_ eq $rev} @reviewers) { - $omccount++ if $query->is_member_of($1, 'omc'); - push @reviewers, $rev; - } - } else { - push @nocla_reviewers, $1 - unless grep {$_ eq $1} @nocla_reviewers; - } - } else { - push @unknown_reviewers, $1 - unless grep {$_ eq $1} @unknown_reviewers; - } + try_add_reviewer($1); } elsif (/^--prnum=(.+)$/) { $prnum = $1; } elsif (/^--commit=(.+)$/) { @@ -76,35 +84,26 @@ foreach (@ARGV) { } elsif (/^--rmreviewers$/) { $rmrev = 1; } elsif (/^--myemail=(.+\@.+)$/) { - my $rev = $query->find_person_tag($1, 'rev'); - if ($rev) { - my $cla = $query->has_cla($rev); - if ($cla) { - unless (grep {$_ eq $rev} @reviewers) { - $omccount++ if $query->is_member_of($1, 'omc'); - push @reviewers, $rev; - } - - # We can't add Reviewed-by: lines with our own name on commits - # we have authored ourselves. However, we need to exist as an - # entry in @reviewers so the count check below won't show false - # positives, so instead, we set up this reviewer identity for - # removal before rewriting the commit message. - if ($ENV{GIT_AUTHOR_EMAIL} eq $1) { - $skip_reviewer = $rev; - } - } else { - push @nocla_reviewers, $1 - unless grep {$_ eq $1} @nocla_reviewers; - } - } else { - push @unknown_reviewers, $1 - unless grep {$_ eq $1} @unknown_reviewers; - } + try_add_reviewer($1); } elsif (/^--trivial$/) { $trivial = 1; } } + +# If the author is a registered committer, that identity passes as a reviewer +# too. There is a twist, though... see next comment +if (my $rev = try_add_reviewer($ENV{GIT_AUTHOR_EMAIL})) { + +# So here's the deal: We added the commit author because we need to keep +# count of the total amount of reviewers, which includes the commit author +# if it's a registered commi
[openssl-commits] [tools] master update
The branch master has been updated via 18464ff9f3635d574daa0aeb310a78969db79d8c (commit) from f77de03c5ac4f315f526d80db917255ec50a7f30 (commit) - Log - commit 18464ff9f3635d574daa0aeb310a78969db79d8c Author: Richard Levitte Date: Thu Jun 15 17:17:56 2017 +0200 gitaddrev: correct logic error for --myemail If the --myemail value is someone with a CLA, they count as a reviewer no matter what. If they are a OMC member, they count as such no matter what as well. However, they still need to be removed from the @reviewer list before the commit message is rewritten, since they can't have a Reviewed-by line on their own commit. --- Summary of changes: review-tools/gitaddrev | 20 +++- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/review-tools/gitaddrev b/review-tools/gitaddrev index 64976d1..f539982 100755 --- a/review-tools/gitaddrev +++ b/review-tools/gitaddrev @@ -80,16 +80,18 @@ foreach (@ARGV) { if ($rev) { my $cla = $query->has_cla($rev); if ($cla) { - # If author doesn't match us add us as reviewer - if ($ENV{GIT_AUTHOR_EMAIL} ne $1) { - unless (grep {$_ eq $rev} @reviewers) { - $omccount++ if $query->is_member_of($1, 'omc'); - push @reviewers, $rev; - } - } else { - # Can't review our own commits, setup this one for removal + unless (grep {$_ eq $rev} @reviewers) { + $omccount++ if $query->is_member_of($1, 'omc'); + push @reviewers, $rev; + } + + # We can't add Reviewed-by: lines with our own name on commits + # we have authored ourselves. However, we need to exist as an + # entry in @reviewers so the count check below won't show false + # positives, so instead, we set up this reviewer identity for + # removal before rewriting the commit message. + if ($ENV{GIT_AUTHOR_EMAIL} eq $1) { $skip_reviewer = $rev; - $omccount-- if $query->is_member_of($1, 'omc'); } } else { push @nocla_reviewers, $1 _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via f77de03c5ac4f315f526d80db917255ec50a7f30 (commit) from 09ebad436ac86898bd5671e37b0d2035c6db375d (commit) - Log - commit f77de03c5ac4f315f526d80db917255ec50a7f30 Author: Richard Levitte Date: Thu Jun 15 16:29:16 2017 +0200 Makedownify review-tools/README --- Summary of changes: review-tools/README | 21 + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/review-tools/README b/review-tools/README index c4386ac..e154975 100644 --- a/review-tools/README +++ b/review-tools/README @@ -15,7 +15,12 @@ Some of the scripts use the information REST API on https://api.openssl.org. If you have direct access to the databases and want to use that instead, set the environment variable BUREAU to the directory where they are located. -= +The scripts +=== + +addrev +-- + addrev is a simple pair of scripts to add or edit reviewers to commits. To use add the scripts gitaddrev and addrev to your PATH and edit @@ -58,7 +63,11 @@ Examples: addrev -2 steve rich addrev -2 --reviewer=steve --reviewer=rich -= +gitlabutil +-- + +NOTE: Only useful for OMC members + gitlabutil is a simple gitlab merge request query tool. Before you can use it you need to create a file $HOME/.gitlabtoken containing @@ -107,7 +116,9 @@ Checkout branch for query 145: gitlabutil --checkout 145 -= +ghmerge +--- + ghmerge merges (reviewed and approved!) GitHub pull requests It works on the current branch, which should be master or one of the stable @@ -120,5 +131,7 @@ The ### is the GitHub MR number. The rest of the args are the names of the reviewers (passed to addrev; see above). -= +pick-to-branch +-- + pick-to-branch cherry-picks commits to branches _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [tools] master update
The branch master has been updated via 09ebad436ac86898bd5671e37b0d2035c6db375d (commit) via 2abca90fcbcd5c9703da5e52921a1fb63b01acff (commit) from 8909d2161299bafbdb0690cdf8b677c0ce7c2f34 (commit) - Log - commit 09ebad436ac86898bd5671e37b0d2035c6db375d Author: Richard Levitte Date: Thu Jun 15 16:28:40 2017 +0200 Add requirements commit 2abca90fcbcd5c9703da5e52921a1fb63b01acff Author: Richard Levitte Date: Thu Jun 15 16:24:29 2017 +0200 OpenSSL-Query, QueryApp: Add instructions for local installation --- Summary of changes: OpenSSL-Query/README.md | 17 + QueryApp/README.md | 17 + review-tools/README | 10 ++ 3 files changed, 44 insertions(+) diff --git a/OpenSSL-Query/README.md b/OpenSSL-Query/README.md index cb547b3..182507f 100644 --- a/OpenSSL-Query/README.md +++ b/OpenSSL-Query/README.md @@ -34,6 +34,23 @@ Installation $ make $ make install +Local installation + + +For a local installation, you might want to consider using local::lib +(debian package liblocal-lib-perl). In that case, running Makefile.PL +is slightly different: + +$ perl -Mlocal::lib Makefile.PL + +Other than that, follow the instructions in "Installation" above. + +To get the paths right permanently, you might want to consider adding +this in your `.bash_profile`, `.bashrc` och corresponding shell init +script: + +eval "`perl -I$HOME/perl5/lib/perl5 -Mlocal::lib`" + Testing --- diff --git a/QueryApp/README.md b/QueryApp/README.md index 89a539d..0567af2 100644 --- a/QueryApp/README.md +++ b/QueryApp/README.md @@ -43,6 +43,23 @@ Installation $ make $ make install +Local installation + + +For a local installation, you might want to consider using local::lib +(debian package liblocal-lib-perl). In that case, running Makefile.PL +is slightly different: + +$ perl -Mlocal::lib Makefile.PL + +Other than that, follow the instructions in "Installation" above. + +To get the paths right permanently, you might want to consider adding +this in your `.bash_profile`, `.bashrc` och corresponding shell init +script: + +eval "`perl -I$HOME/perl5/lib/perl5 -Mlocal::lib`" + Testing --- diff --git a/review-tools/README b/review-tools/README index 2baca0b..c4386ac 100644 --- a/review-tools/README +++ b/review-tools/README @@ -1,3 +1,13 @@ +Requirements + + +For the scripts below to work properly, the following must be installed: + +* OpenSSL-Query: Follow the instructions in its README.md + +Optionally, OMC members can benefit from direct database access by installing +the QueryApp libraries as well. + Environment === _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits