[openssl-commits] [tools] master update

Wed Feb 21 19:18:06 UTC 2018

The branch master has been updated
       via  4a45104b1146f500bd0db1c921d3101cd10099b4 (commit)
       via  8609abfd6aca838ed58095e670005791466e4307 (commit)
      from  81f14d3c92704e0a1bc18fdc5f47d62cf086812f (commit)


- Log -----------------------------------------------------------------
commit 4a45104b1146f500bd0db1c921d3101cd10099b4
Author: Rich Salz <rsalz at openssl.org>
Date:   Wed Feb 21 14:17:49 2018 -0500

    Add "last chance looking for" webpage generator

commit 8609abfd6aca838ed58095e670005791466e4307
Author: Rich Salz <rsalz at openssl.org>
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 0000000..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';
+<html>
+  <head>
+    <title>Help find these hackers</title>
+    <link rel="stylesheet" type="text/css" href="/style.css">
+  </head>
+  <body>
+    <h1>Help find these hackers</h1>
+    <p>
+If you know where to find any of the following people, please email their
+current address to license at 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!
+</p>
+<pre>
+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';
+
+    </pre>
+</body>
+</html>
+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
