[ssoma PATCH 0/3] test output cleanups

[ssoma PATCH 0/3] test output cleanups

[Eric Wong]

Are reproducible test outputs required for reproducible builds?
We have no binaries to build :P

Eric Wong (3):
      t/*.t: quiet down "git init"
      t/: try to ensure test output is stable
      t/*: use identifiable tempdir names

 t/all.t             | 8 ++++----
 t/extractor.t       | 6 +++---
 t/git.t             | 4 ++--
 t/mda-badheaders.t  | 7 ++++---
 t/mda-conflict.t    | 4 ++--
 t/mda-missing-mid.t | 4 ++--
 t/remover.t         | 4 ++--
 7 files changed, 19 insertions(+), 18 deletions(-)

[PATCH 1/3] t/*.t: quiet down "git init"

[Eric Wong]

No need to pollute the output with needless messages
---
 t/extractor.t       | 2 +-
 t/git.t             | 2 +-
 t/mda-badheaders.t  | 2 +-
 t/mda-conflict.t    | 2 +-
 t/mda-missing-mid.t | 2 +-
 t/remover.t         | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/t/extractor.t b/t/extractor.t
index abad5b8..154e666 100644
--- a/t/extractor.t
+++ b/t/extractor.t
@@ -18,7 +18,7 @@ my $maildir = "$outdir/maildir/";
 my $mailbox = "$outdir/mbox";
 
 my $mdagit = Ssoma::Git->new("$mdadir/gittest");
-$mdagit->init_db;
+$mdagit->init_db('-q');
 my $mda = Ssoma::MDA->new($mdagit);
 my $email = Email::Simple->new(<<'EOF');
 From: U <u@example.com>
diff --git a/t/git.t b/t/git.t
index c19093d..3af517b 100644
--- a/t/git.t
+++ b/t/git.t
@@ -10,7 +10,7 @@ use File::Temp qw/tempdir/;
 my $tmpdir = tempdir(CLEANUP => 1);
 my $git = Ssoma::Git->new("$tmpdir/gittest");
 
-$git->init_db;
+$git->init_db('-q');
 ok(-d "$tmpdir/gittest", "git repo created");
 
 {
diff --git a/t/mda-badheaders.t b/t/mda-badheaders.t
index b161574..40b15a9 100644
--- a/t/mda-badheaders.t
+++ b/t/mda-badheaders.t
@@ -12,7 +12,7 @@ use File::Temp qw/tempdir/;
 
 my $tmpdir = tempdir(CLEANUP => 1);
 my $git = Ssoma::Git->new("$tmpdir/gittest");
-$git->init_db;
+$git->init_db('-q');
 my $mda = Ssoma::MDA->new($git);
 
 my $email = Email::Simple->new("From: U <u\@example.com>\n\nHIHI\n");
diff --git a/t/mda-conflict.t b/t/mda-conflict.t
index 54b3541..5d3cd6a 100644
--- a/t/mda-conflict.t
+++ b/t/mda-conflict.t
@@ -12,7 +12,7 @@ use File::Temp qw/tempdir/;
 
 my $tmpdir = tempdir(CLEANUP => 1);
 my $git = Ssoma::Git->new("$tmpdir/gittest");
-$git->init_db;
+$git->init_db('-q');
 my $mda = Ssoma::MDA->new($git);
 
 my $email = Email::Simple->new("From: U <u\@example.com>\n\nHIHI\n");
diff --git a/t/mda-missing-mid.t b/t/mda-missing-mid.t
index d375ae9..b87a603 100644
--- a/t/mda-missing-mid.t
+++ b/t/mda-missing-mid.t
@@ -10,7 +10,7 @@ use Email::Simple;
 use File::Temp qw/tempdir/;
 my $tmpdir = tempdir(CLEANUP => 1);
 my $git = Ssoma::Git->new("$tmpdir/gittest");
-$git->init_db;
+$git->init_db('-q');
 my $mda = Ssoma::MDA->new($git);
 my $email = Email::Simple->new("From: U <u\@example.com>\n\nHIHI\n");
 $mda->deliver($email);
diff --git a/t/remover.t b/t/remover.t
index f714aff..9ddb7ff 100644
--- a/t/remover.t
+++ b/t/remover.t
@@ -14,7 +14,7 @@ use File::Temp qw/tempdir/;
 my $tmpdir = tempdir(CLEANUP => 1);
 my $git_dir = "$tmpdir/gittest";
 my $git = Ssoma::Git->new($git_dir);
-$git->init_db;
+$git->init_db('-q');
 my $mda = Ssoma::MDA->new($git);
 my $rm = Ssoma::Remover->new($git);
 my @tree;
-- 
EW

[PATCH 2/3] t/: try to ensure test output is stable

[Eric Wong]

That means we should not rely on random ordering of
hashes or having auto-generated filenames in the output.
This may be useful in helping people reproduce builds
(not that it really matters when we do not have any
binaries to distribute).
---
 t/all.t            | 2 +-
 t/mda-badheaders.t | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/t/all.t b/t/all.t
index 2d86989..8bed302 100644
--- a/t/all.t
+++ b/t/all.t
@@ -25,7 +25,7 @@ ok(-x $cli, "$cli is executable");
 	my $git_dir = "$tmp/input.git";
 	system(qw/git init -q --bare/, $git_dir) == 0 or
 		die "git init -q --bare $git_dir failed: $?\n";
-	ok(-d $git_dir && -f "$git_dir/config", "$git_dir exists and is bare");
+	ok(-d $git_dir && -f "$git_dir/config", '$GIT_DIR exists and is bare');
 
 	# deliver the message
 	my $simple = Email::Simple->new(<<'EOF');
diff --git a/t/mda-badheaders.t b/t/mda-badheaders.t
index 40b15a9..d25c1e1 100644
--- a/t/mda-badheaders.t
+++ b/t/mda-badheaders.t
@@ -45,7 +45,8 @@ is(0, $?, "git cat-file returned: $?");
 my $delivered = Email::Simple->new($raw);
 is("HIHI\n", $delivered->body, "body matches");
 
-while (my ($key, $val) = each %headers) {
+foreach my $key (sort keys %headers) {
+	my $val = $headers{$key};
 	if ($discard{$key}) {
 		is($delivered->header($key), undef, "header $key discarded");
 	} else {
-- 
EW

[PATCH 3/3] t/*: use identifiable tempdir names

[Eric Wong]

This helps the admin nuke stuff in case our tests
are SIGKILL-ed or killed during teardown.
---
 t/all.t             | 6 +++---
 t/extractor.t       | 4 ++--
 t/git.t             | 2 +-
 t/mda-badheaders.t  | 2 +-
 t/mda-conflict.t    | 2 +-
 t/mda-missing-mid.t | 2 +-
 t/remover.t         | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/t/all.t b/t/all.t
index 8bed302..d5680de 100644
--- a/t/all.t
+++ b/t/all.t
@@ -4,13 +4,13 @@
 use strict;
 use warnings;
 use Test::More;
+use File::Temp qw/tempdir/;
+use Email::Simple;
 # test all command-line interfaces at once
 my $mda = "blib/script/ssoma-mda";
 my $cli = "blib/script/ssoma";
 my $rm = "blib/script/ssoma-rm";
-my $tmp = tempdir(CLEANUP => 1);
-use File::Temp qw/tempdir/;
-use Email::Simple;
+my $tmp = tempdir('ssoma-all-XXXXXX', CLEANUP => 1);
 my $have_ipc_run = eval {
 	require IPC::Run;
 	import IPC::Run qw/run/;
diff --git a/t/extractor.t b/t/extractor.t
index 154e666..d2c0119 100644
--- a/t/extractor.t
+++ b/t/extractor.t
@@ -9,8 +9,8 @@ use Ssoma::Git;
 use Ssoma::MDA;
 use File::Temp qw/tempdir/;
 
-my $mdadir = tempdir(CLEANUP => 1);
-my $outdir = tempdir(CLEANUP => 1);
+my $mdadir = tempdir('ssoma-extractor-mda-XXXXXX', CLEANUP => 1);
+my $outdir = tempdir('ssoma-extractor-out-XXXXXX', CLEANUP => 1);
 
 my $outgit = Ssoma::Git->new("$outdir/git");
 my $ex = Ssoma::Extractor->new($outgit);
diff --git a/t/git.t b/t/git.t
index 3af517b..1588112 100644
--- a/t/git.t
+++ b/t/git.t
@@ -7,7 +7,7 @@ use Test::More;
 use Ssoma::Git;
 use Ssoma::GitIndexInfo;
 use File::Temp qw/tempdir/;
-my $tmpdir = tempdir(CLEANUP => 1);
+my $tmpdir = tempdir('ssoma-git-XXXXXX', CLEANUP => 1);
 my $git = Ssoma::Git->new("$tmpdir/gittest");
 
 $git->init_db('-q');
diff --git a/t/mda-badheaders.t b/t/mda-badheaders.t
index d25c1e1..00d1495 100644
--- a/t/mda-badheaders.t
+++ b/t/mda-badheaders.t
@@ -10,7 +10,7 @@ use Email::Simple;
 use Digest::SHA qw/sha1_hex/;
 use File::Temp qw/tempdir/;
 
-my $tmpdir = tempdir(CLEANUP => 1);
+my $tmpdir = tempdir('ssoma-mda-badheaders-XXXXXX', CLEANUP => 1);
 my $git = Ssoma::Git->new("$tmpdir/gittest");
 $git->init_db('-q');
 my $mda = Ssoma::MDA->new($git);
diff --git a/t/mda-conflict.t b/t/mda-conflict.t
index 5d3cd6a..2f77be3 100644
--- a/t/mda-conflict.t
+++ b/t/mda-conflict.t
@@ -10,7 +10,7 @@ use Email::Simple;
 use Digest::SHA qw/sha1_hex/;
 use File::Temp qw/tempdir/;
 
-my $tmpdir = tempdir(CLEANUP => 1);
+my $tmpdir = tempdir('ssoma-mda-conflict-XXXXXX', CLEANUP => 1);
 my $git = Ssoma::Git->new("$tmpdir/gittest");
 $git->init_db('-q');
 my $mda = Ssoma::MDA->new($git);
diff --git a/t/mda-missing-mid.t b/t/mda-missing-mid.t
index b87a603..21a3540 100644
--- a/t/mda-missing-mid.t
+++ b/t/mda-missing-mid.t
@@ -8,7 +8,7 @@ use Ssoma::MDA;
 use Ssoma::Git;
 use Email::Simple;
 use File::Temp qw/tempdir/;
-my $tmpdir = tempdir(CLEANUP => 1);
+my $tmpdir = tempdir('ssoma-mda-missing-mid-XXXXXX', CLEANUP => 1);
 my $git = Ssoma::Git->new("$tmpdir/gittest");
 $git->init_db('-q');
 my $mda = Ssoma::MDA->new($git);
diff --git a/t/remover.t b/t/remover.t
index 9ddb7ff..d30f91d 100644
--- a/t/remover.t
+++ b/t/remover.t
@@ -11,7 +11,7 @@ use Email::Simple;
 use Digest::SHA qw/sha1_hex/;
 use File::Temp qw/tempdir/;
 
-my $tmpdir = tempdir(CLEANUP => 1);
+my $tmpdir = tempdir('ssoma-remover-XXXXXX', CLEANUP => 1);
 my $git_dir = "$tmpdir/gittest";
 my $git = Ssoma::Git->new($git_dir);
 $git->init_db('-q');
-- 
EW

[PATCH] copyright updates for 2016

[Eric Wong]

In the future, this is the format which allows us to use
update-copyright from gnulib:

	git ls-files | \
		UPDATE_COPYRIGHT_HOLDER='all contributors' \
		UPDATE_COPYRIGHT_USE_INTERVALS=2 \
		xargs /path/to/gnulib/build-aux/update-copyright
---
 Documentation/include.mk  | 2 +-
 Documentation/txt2pre     | 4 ++--
 INSTALL                   | 4 ++--
 Makefile.PL               | 6 +++---
 README                    | 4 ++--
 lib/Ssoma/Extractor.pm    | 4 ++--
 lib/Ssoma/Git.pm          | 4 ++--
 lib/Ssoma/GitIndexInfo.pm | 4 ++--
 lib/Ssoma/IMAP.pm         | 4 ++--
 lib/Ssoma/MDA.pm          | 4 ++--
 lib/Ssoma/Remover.pm      | 4 ++--
 ssoma                     | 4 ++--
 ssoma-mda                 | 4 ++--
 ssoma-rm                  | 4 ++--
 t/all.t                   | 4 ++--
 t/extractor.t             | 4 ++--
 t/git.t                   | 4 ++--
 t/imap.t                  | 4 ++--
 t/mda-badheaders.t        | 4 ++--
 t/mda-conflict.t          | 4 ++--
 t/mda-missing-mid.t       | 4 ++--
 t/remover.t               | 4 ++--
 22 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/Documentation/include.mk b/Documentation/include.mk
index deb3f27..7b64a19 100644
--- a/Documentation/include.mk
+++ b/Documentation/include.mk
@@ -1,5 +1,5 @@
 # Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 all::
 
 RSYNC = rsync
diff --git a/Documentation/txt2pre b/Documentation/txt2pre
index 0384a1d..aad3673 100755
--- a/Documentation/txt2pre
+++ b/Documentation/txt2pre
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Stupid script to make HTML from preformatted, utf-8 text versions,
 # only generating links for http(s).  Markdown does too much
diff --git a/INSTALL b/INSTALL
index dc85e5e..3f8702e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -46,5 +46,5 @@ convenience.
 
 Copyright
 ---------
-Copyright 2013, Eric Wong <normalperson@yhbt.net> and all contributors.
-License: AGPLv3 or later <http://www.gnu.org/licenses/agpl-3.0.txt>
+Copyright 2013-2016 all contributors <meta@public-inbox.org>
+License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
diff --git a/Makefile.PL b/Makefile.PL
index a28be51..00326fc 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Note: this may be rewritten in another language in the future,
 # so don't depend on any public Perl API
@@ -9,7 +9,7 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
 	NAME => 'ssoma',
 	VERSION => '0.1.0',
-	AUTHOR => 'Eric Wong <normalperson@yhbt.net>',
+	AUTHOR => 'Eric Wong <e@80x24.org>',
 	ABSTRACT => 'some sort of mail archiver',
 	EXE_FILES => [qw/ssoma-mda ssoma ssoma-rm/],
 	PREREQ_PM => {
diff --git a/README b/README
index 37851fb..d2be773 100644
--- a/README
+++ b/README
@@ -79,8 +79,8 @@ document describes it:
 
 Copyright
 ---------
-Copyright 2013, Eric Wong <normalperson@yhbt.net> and all contributors.
-License: AGPLv3 or later <http://www.gnu.org/licenses/agpl-3.0.txt>
+Copyright 2013-2016 all contributors <meta@public-inbox.org>
+License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by
diff --git a/lib/Ssoma/Extractor.pm b/lib/Ssoma/Extractor.pm
index 9d7bcce..afc9afd 100644
--- a/lib/Ssoma/Extractor.pm
+++ b/lib/Ssoma/Extractor.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Extracts mail to an Mbox or Maildir
 package Ssoma::Extractor;
diff --git a/lib/Ssoma/Git.pm b/lib/Ssoma/Git.pm
index 05fa5a3..70548fd 100644
--- a/lib/Ssoma/Git.pm
+++ b/lib/Ssoma/Git.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: GPLv2 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt>
 #
 # Note: some trivial code here stolen from git-svn + Perl modules
 # distributed with git.  This remains GPLv2+ so improvements may flow
diff --git a/lib/Ssoma/GitIndexInfo.pm b/lib/Ssoma/GitIndexInfo.pm
index 7f20297..30b8f6f 100644
--- a/lib/Ssoma/GitIndexInfo.pm
+++ b/lib/Ssoma/GitIndexInfo.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: GPLv2 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: GPL-2.0+ <https://www.gnu.org/licenses/gpl-2.0.txt>
 #
 # Note: some trivial code here stolen from git-svn + Perl modules
 # distributed with git.  This remains GPLv2+ so improvements may flow
diff --git a/lib/Ssoma/IMAP.pm b/lib/Ssoma/IMAP.pm
index a32a288..741a032 100644
--- a/lib/Ssoma/IMAP.pm
+++ b/lib/Ssoma/IMAP.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # IMAP delivery module, used by Ssoma::Extractor if Email::LocalDelivery
 # is not available.  Since we are dependent on git, we use the same config
diff --git a/lib/Ssoma/MDA.pm b/lib/Ssoma/MDA.pm
index 8fe4fd6..68c9520 100644
--- a/lib/Ssoma/MDA.pm
+++ b/lib/Ssoma/MDA.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Mail Delivery Agent module, delivers mail into a ssoma git repo
 package Ssoma::MDA;
diff --git a/lib/Ssoma/Remover.pm b/lib/Ssoma/Remover.pm
index 184db1a..f1582ac 100644
--- a/lib/Ssoma/Remover.pm
+++ b/lib/Ssoma/Remover.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 package Ssoma::Remover;
 use strict;
 use warnings;
diff --git a/ssoma b/ssoma
index 064349e..fbb2460 100755
--- a/ssoma
+++ b/ssoma
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # This is the normal command-line client for users
 use strict;
 use warnings;
diff --git a/ssoma-mda b/ssoma-mda
index 2d658d2..5eacf75 100755
--- a/ssoma-mda
+++ b/ssoma-mda
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # This is the command-line mail delivery agent for servers.
 # Try to keep this small as it may be invoked frequently for each message
 # delivered.
diff --git a/ssoma-rm b/ssoma-rm
index 05f2d66..06f61a1 100755
--- a/ssoma-rm
+++ b/ssoma-rm
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 # this is intended for server administrators, so it takes an absolute
 # path (however this may be run by clients, too).
 my $usage = "ssoma-rm /path/to/git/repo < /path/to/rfc2822_message";
diff --git a/t/all.t b/t/all.t
index d5680de..b0232d8 100644
--- a/t/all.t
+++ b/t/all.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
diff --git a/t/extractor.t b/t/extractor.t
index d2c0119..6a5c8f5 100644
--- a/t/extractor.t
+++ b/t/extractor.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
diff --git a/t/git.t b/t/git.t
index 1588112..43ebaf2 100644
--- a/t/git.t
+++ b/t/git.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
diff --git a/t/imap.t b/t/imap.t
index 14fc0b3..88c7d52 100644
--- a/t/imap.t
+++ b/t/imap.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
diff --git a/t/mda-badheaders.t b/t/mda-badheaders.t
index 00d1495..0ce0762 100644
--- a/t/mda-badheaders.t
+++ b/t/mda-badheaders.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
diff --git a/t/mda-conflict.t b/t/mda-conflict.t
index 2f77be3..84be907 100644
--- a/t/mda-conflict.t
+++ b/t/mda-conflict.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
diff --git a/t/mda-missing-mid.t b/t/mda-missing-mid.t
index 21a3540..815616f 100644
--- a/t/mda-missing-mid.t
+++ b/t/mda-missing-mid.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
diff --git a/t/remover.t b/t/remover.t
index d30f91d..4291013 100644
--- a/t/remover.t
+++ b/t/remover.t
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2013-2016 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-- 
EW