Allow opt-out of PII in CONTRIBUTORS.txt (#2453)

* Update CONTRIBUTORS.txt

* Update generate_contributors_list.sh to allow removed emails

* Removed from mailmap too

* Remove entries instead

.mailfilter

@@ -0,0 +1,6 @@
+# This is a list of `shasum` hashed email addresses which are filtered from CONTRIBUTORS.txt, typically for privacy.
+# Lines can be generated by running `echo -n 'My Name <my@email>' | shasum | head -c 40`.
+
+38268a29b340ecfb435c5e6c5827a596acb71cc6
+886d1da6503c6de1d630beaf6acb667e4ce3e2a0
+f0c2beeae30f3012fa02257998baca1737540bda

.mailmap

@@ -31,7 +31,6 @@ Jovan Milenkovic <jovan.milenkovic@htecgroup.com> <jovanmilenkovic@live.com>
 Nathan Harris <nathan@mordil.info> <Mordil@users.noreply.github.com>
 Sergo Beruashvili <beruashvili@gmail.com> <2391557+ogres@users.noreply.github.com>
 Sergej Jaskiewicz <jaskiewiczs@icloud.com> <broadwaylamb@users.noreply.github.com>
-Andrew Bennett <andrew@nio.bennnn.net> <635596+therealbnut@users.noreply.github.com>
 Siemen Sikkema <s.h.sikkema@gmail.com> <siemensikkema@users.noreply.github.com>
 Dario Rexin <drexin@apple.com> <dario.rexin@me.com>
 Romain Pouclet <rpouclet@apple.com> <romain.pouclet@gmail.com>

CONTRIBUTORS.txt

@@ -14,13 +14,15 @@ needs to be listed here.
 - 0xflotus <0xflotus@gmail.com>
 - Adam Fowler <adamfowler71@gmail.com>
 - Adam Nemecek <adamnemecek@gmail.com>
+- Ahmad Alhashemi <ahmad@ahmadh.com>
 - Albert Aleksieiev <albert.aleksieiev@gmail.com>
 - Alex Blewitt <alblue@apple.com>
 - Alex Reilly <fabiobean2@gmail.com>
-- Andrew Bennett <andrew@nio.bennnn.net>
 - Andrew Edwards <andrewangeta@gmail.com>
 - Andrew Naylor <andrew_naylor@apple.com>
+- Andrew Trick <atrick@apple.com>
 - Andrius Aucinas <aaucinas@apple.com>
+- Anish Aggarwal <anish17122000@gmail.com>
 - Ankit Aggarwal <ankit_aggarwal@apple.com>
 - Antoine Cœur <coeur@gmx.fr>
 - Antwan van Houdt <jabwd@exurion.com>
@@ -51,7 +53,9 @@ needs to be listed here.
 - Esteban Torres <me@estebantorr.es>
 - Eugen <eugenf78@gmail.com>
 - Fabian Fett <fabianfett@apple.com>
+- Felix Schlegel <fefefe152@gmail.com>
 - Finagolfin <butta@fastem.com>
+- Florian Friedrich <ffried@me.com>
 - Frank Kair <frankkair@gmail.com>
 - Franz Busch <f.busch@apple.com>
 - Gautier Delorme <gautier.delorme@gmail.com>
@@ -62,8 +66,10 @@ needs to be listed here.
 - GuangGuang <lihansey163@163.com>
 - Guillaume Lessard <guillaume.lessard@apple.com>
 - Gwynne Raskind <gwynne@darkrainfall.org>
+- Gwynne Raskind <gwynne@vapor.codes>
 - Hailong <hailongzh@hotmail.com>
 - Heidi Puk Hermann <heidi.puk@gmail.com>
+- Helder Sérvio <41337686+heldersrvio@users.noreply.github.com>
 - Helge Heß <helge@alwaysrightinstitute.com>
 - Ian Partridge <i.partridge@uk.ibm.com>
 - Ilya Puchka <ilyapuchka@gmail.com>
@@ -97,6 +103,7 @@ needs to be listed here.
 - Liam Flynn <l.flynn@live.co.uk>
 - Ludovic Dewailly <ldewailly@apple.com>
 - Luo Xiu <luoxiustm@gmail.com>
+- Mahdi Bahrami <github@mahdibm.com>
 - Marcus Liotta <marcus@liotta.se>
 - Mario Sangiorgio <msangiorgio@apple.com>
 - Markus Jais <markusjais@googlemail.com>
@@ -104,6 +111,7 @@ needs to be listed here.
 - Marli Oshlack <marli.oshlack@apple.com>
 - Matt Eaton <agnosticdev@gmail.com>
 - Matteo Comisso <matteo.comisso@me.com>
+- Max Desiatov <m_desiatov@apple.com>
 - Max Desiatov <max@desiatov.com>
 - Max Moiseev <moiseev@apple.com>
 - Maxim Zaks <maxim.zaks@gmail.com>
@@ -114,14 +122,18 @@ needs to be listed here.
 - Norman Maurer <norman_maurer@apple.com>
 - Ole Begemann <ole@oleb.net>
 - OleG <emptystamp@gmail.com>
+- Oleksandr Zhurba <69315809+mob-connection@users.noreply.github.com>
 - Paul Schmiedmayer <paul.schmiedmayer@tum.de>
 - Peter Adams <pp_adams@apple.com>
 - Peter Tolsma <pejato@umich.edu>
 - Petro Rovenskyy <petro.rovenskyy@gmail.com>
+- Philip Brown <122590765+asdf-bro@users.noreply.github.com>
 - Portia <portia-s@users.noreply.github.com>
 - Pushkar N Kulkarni <pushkar.nk@in.ibm.com>
 - Pushparaj Zala <pr92zala@gmail.com>
 - Richard Low <ral@apple.com>
+- Rick Newton-Rogers <104022490+rnro@users.noreply.github.com>
+- Rick Newton-Rogers <rnewtonrogers@apple.com>
 - Romain Pouclet <rpouclet@apple.com>
 - Rukshani Athapathu <arukshani@users.noreply.github.com>
 - Rémi Doreau <remi.d45@gmail.com>
@@ -152,11 +164,20 @@ needs to be listed here.
 - Volodymyr Sapsai <vsapsai@users.noreply.github.com>
 - Will Lisac <will@lisac.org>
 - Wilson Ding <hello@wilsonding.com>
+- YR Chen <stevapple@icloud.com>
+- Yim Lee <yim_lee@apple.com>
 - akash-55 <61596874+akash-55@users.noreply.github.com>
+- buttaface <butta@fastem.com>
+- carolinacass <67160898+carolinacass@users.noreply.github.com>
+- dkz2 <132388278+dkz2@users.noreply.github.com>
 - fadi-botros <botros_fadi@yahoo.com>
 - jemmons <jemmons@users.noreply.github.com>
 - pokryfka <pokryfka@gmail.com>
+- ser <122270051+ser-0xff@users.noreply.github.com>
 - sun_ <sunlubo.sun@gmail.com>
+- taylorswift <kelvin13ma@gmail.com>
+- thomas-gill-0xff <115996764+thomas-gill-0xff@users.noreply.github.com>
+- toluRV <111301355+toluRV@users.noreply.github.com>
 - trungducc <gnurtduc@gmail.com>
 
 **Updating this list**

scripts/generate_contributors_list.sh

@@ -15,7 +15,20 @@
 
 set -eu
 here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-contributors=$( cd "$here"/.. && git shortlog -es | cut -f2 | sed 's/^/- /' )
+contributor_list=$( cd "$here"/.. && git shortlog -es | cut -f2 )
+filtered_hashes=$( cat "$here/../.mailfilter" | grep -E '^[a-z0-9]+$' | sort )
+
+NL=$'\n'
+
+contributors=''
+while IFS= read -r line; do
+	hashed="$(echo -n "$line" | shasum | head -c 40)"
+	found_hash=$(comm -12 <(echo "$hashed") <(echo "$filtered_hashes"))
+	if [ ! -z "$found_hash" ]; then
+		continue
+	fi
+	contributors="${contributors}- $line$NL"
+done <<< "$contributor_list"
 
 cat > "$here/../CONTRIBUTORS.txt" <<- EOF
 	For the purpose of tracking copyright, this is the list of individuals and
@@ -32,7 +45,6 @@ cat > "$here/../CONTRIBUTORS.txt" <<- EOF
 	### Contributors
 
 	$contributors
-
 	**Updating this list**
 
 	Please do not edit this file manually. It is generated using \`./scripts/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\`