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

* Update CONTRIBUTORS.txt
* Update contributors script to allow removal of PII

Author: therealbnut

.mailfilter

@@ -0,0 +1,7 @@
+# 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`.
+
+03a39e53ca4764a094b9f6e548e8d1ce0d941d7b
+38268a29b340ecfb435c5e6c5827a596acb71cc6
+43b012c0b4e67962522a02e12d07cb5d5c5ba036
+886d1da6503c6de1d630beaf6acb667e4ce3e2a0

.mailmap

@@ -2,8 +2,6 @@ Alex Blewitt <[email protected]> <[email protected]>
 Alex Blewitt <[email protected]> <[email protected]>
 Alex Hoppen <[email protected]> <[email protected]>
 Alex Hoppen <[email protected]> <[email protected]>
-Andrew Bennett <[email protected]> <[email protected]>
-Andrew Bennett <[email protected]> <[email protected]>
 Ankit Aggarwal <[email protected]> <[email protected]>
 Ankit Aggarwal <[email protected]> <[email protected]>
 Ankit Aggarwal <[email protected]> <[email protected]>
@@ -103,7 +101,5 @@ Tim Gymnich <[email protected]> <[email protected]>
 Tom Doron <[email protected]> <[email protected]>
 Valeriy Van <[email protected]> <[email protected]>
 Valeriy Van <[email protected]> <[email protected]>
-therealbnut <[email protected]> <[email protected]>
-therealbnut <[email protected]> <[email protected]>
 buttaface <[email protected]> <[email protected]>
 buttaface <[email protected]> <[email protected]>

CONTRIBUTORS.txt

@@ -19,16 +19,21 @@ needs to be listed here.
 - Adam Cox <[email protected]>
 - Adam Thayer <[email protected]>
 - Adam Yanalunas <[email protected]>
+- Ahmad Yasser <[email protected]>
 - Alastair Houghton <[email protected]>
+- Alejandro Alonso <[email protected]>
+- Aleksei Sapitskii <[email protected]>
 - Aleksey Mashanov <[email protected]>
 - Aleph Retamal <[email protected]>
 - Alex Blewitt <[email protected]>
 - Alex Hoppen <[email protected]>
+- Alex Lorenz <[email protected]>
 - Alex Migicovsky <[email protected]>
+- Alexander Sandberg <[email protected]>
+- Alexey Ivashko <[email protected]>
 - Alexis Laferrière <[email protected]>
 - Anders Bertelrud <[email protected]>
 - Andreas Koslowski <[email protected]>
-- Andrew Bennett <[email protected]>
 - Andrew Carter <[email protected]>
 - Andrew Clark <[email protected]>
 - Angelo Villegas <[email protected]>
@@ -47,8 +52,10 @@ needs to be listed here.
 - Arthur Ariel Sabintsev <[email protected]>
 - Atul Sowani <[email protected]>
 - Aura Lily Vulcano <[email protected]>
+- Austin <[email protected]>
 - BJ Homer <[email protected]>
 - Bastian Rinsche <[email protected]>
+- Ben Barham <[email protected]>
 - Ben Chatelain <[email protected]>
 - Ben Cohen <[email protected]>
 - Ben Kennedy <[email protected]>
@@ -65,6 +72,7 @@ needs to be listed here.
 - Bob Wilson <[email protected]>
 - Boris Bielik <[email protected]>
 - Boris Buegling <[email protected]>
+- BossJue <[email protected]>
 - Bouke Haarsma <[email protected]>
 - Braden Scothern <[email protected]>
 - Brandon Titus <[email protected]>
@@ -78,25 +86,33 @@ needs to be listed here.
 - Chris Zielinski <[email protected]>
 - Christian Rishøj <[email protected]>
 - Christopher Goulet <[email protected]>
+- Clay Ellis <[email protected]>
 - Colin Cornaby <[email protected]>
+- Connor Wakamo <[email protected]>
 - Conrad Kramer <[email protected]>
 - Cory Benfield <[email protected]>
 - Dadoum <[email protected]>
 - Damiaan Dufaux <[email protected]>
 - Dan Liew <[email protected]>
+- Dan Mendoza <[email protected]>
 - Dan Zheng <[email protected]>
 - Daniel Duan <[email protected]>
 - Daniel Dunbar <[email protected]>
 - Daniel Firsht <[email protected]>
+- Daniel Rodríguez Troitiño <[email protected]>
+- Danny Mösch <[email protected]>
 - Dario Rexin <[email protected]>
 - Dave Abrahams <[email protected]>
+- Dave Weston <[email protected]>
 - David Bryson <[email protected]>
 - David Farler <[email protected]>
 - David Hart <[email protected]>
 - David M. Bryson <[email protected]>
+- David Nadoba <[email protected]>
 - David Ungar <[email protected]>
 - Denis Morozov <[email protected]>
 - Derik Ramirez <[email protected]>
+- Diggory Laycock <[email protected]>
 - Dima Hutsuliak <[email protected]>
 - Ding Ye <[email protected]>
 - Dmitri Gribenko <[email protected]>
@@ -108,6 +124,7 @@ needs to be listed here.
 - Edan Lichtenstein <[email protected]>
 - Edward Huynh <[email protected]>
 - Edward Valentini <[email protected]>
+- Egor Zhdan <[email protected]>
 - Egor Zhdan <[email protected]>
 - Eli Geller <[email protected]>
 - Ellie Shin <[email protected]>
@@ -117,12 +134,16 @@ needs to be listed here.
 - Erik Eckstein <[email protected]>
 - Erwin Mazariegos <[email protected]>
 - Etan1 <[email protected]>
+- Euan Harris <[email protected]>
 - Eugene Tulushev <[email protected]>
+- Evan Wilde <[email protected]>
 - Example Example <[email protected]>
+- Fabian Cañas <[email protected]>
 - Federico Bucchi <[email protected]>
 - Federico Zanetello <[email protected]>
 - Florian Friedrich <[email protected]>
 - Florian Reinhart <[email protected]>
+- Franz Busch <[email protected]>
 - Gaushik M.R <[email protected]>
 - Gavin Eadie <[email protected]>
 - George <unknown>
@@ -140,6 +161,8 @@ needs to be listed here.
 - Ilya Kulakov <[email protected]>
 - Ismael Vilas Boas <[email protected]>
 - Itai Ferber <[email protected]>
+- Iulian Onofrei <[email protected]>
+- IxhenHasaniQM <[email protected]>
 - J. Cheyo Jimenez <[email protected]>
 - J.D. Healy <[email protected]>
 - JP Simard <[email protected]>
@@ -169,8 +192,10 @@ needs to be listed here.
 - John Holdsworth <[email protected]>
 - John McCall <[email protected]>
 - Jonas Schwartz <[email protected]>
+- Jonathan Grynspan <[email protected]>
 - Jordan Rose <[email protected]>
 - Jose Marcelino <[email protected]>
+- Joseph Heck <[email protected]>
 - Josh Parnham <[email protected]>
 - Joshua Emmons <[email protected]>
 - Joshua Peek <[email protected]>
@@ -190,28 +215,35 @@ needs to be listed here.
 - Kohki Miki <[email protected]>
 - Kostiantyn Koval <[email protected]>
 - Kyle <[email protected]>
+- Kyle <[email protected]>
 - Kyle Jessup <[email protected]>
 - Kyle Rokita <[email protected]>
 - Lei Zhang <[email protected]>
 - Lev Walkin <[email protected]>
 - Lily Vulcano <[email protected]>
 - Ling Wang <[email protected]>
+- Liu Liu <[email protected]>
 - Lukas Stabe <[email protected]>
 - Luke Lau <[email protected]>
 - MIZUNO Hiroki <[email protected]>
 - Marcin Iwanicki <[email protected]>
 - Marcin Krzyzanowski <[email protected]>
+- Marco Eidinger <[email protected]>
+- Marin Todorov <[email protected]>
 - Mark Brownsword <[email protected]>
 - Mark Lacey <[email protected]>
 - Martin Waitz <[email protected]>
 - Matt Diephouse <[email protected]>
+- Matt Seaman <[email protected]>
 - Matthew Seaman <[email protected]>
 - Matthias Bartelmeß <[email protected]>
 - Mattt Thompson <[email protected]>
+- Max Desiatov <[email protected]>
 - Max Desiatov <[email protected]>
 - Max Howell <[email protected]>
 - Max Liberman <[email protected]>
 - Max Moiseev <[email protected]>
+- Max Obermeier <[email protected]>
 - Michael Gottesman <[email protected]>
 - Michael Henson <[email protected]>
 - Michael Ilseman <[email protected]>
@@ -229,14 +261,17 @@ needs to be listed here.
 - Nate Cook <[email protected]>
 - Nathan Hawes <[email protected]>
 - Nathan Lanza <[email protected]>
+- Natik Gadzhi <[email protected]>
 - Neil Jones <[email protected]>
 - Nicholas Maccharoli <[email protected]>
+- Nick Cooke <[email protected]>
 - Nikola Lajic <[email protected]>
 - Noah Gilmore <[email protected]>
 - NobodyNada <[email protected]>
 - Norio Nomura <[email protected]>
 - Noé Froidevaux <[email protected]>
 - Oliver Chick <[email protected]>
+- Oliver Epper <[email protected]>
 - Orta <[email protected]>
 - Ostap Taran <[email protected]>
 - Owen Voorhees <[email protected]>
@@ -256,12 +291,14 @@ needs to be listed here.
 - Quinn McHenry <[email protected]>
 - Rahul Malik <[email protected]>
 - Randy Becker <[email protected]>
+- Rauhul Varma <[email protected]>
 - Renzo Crisóstomo <[email protected]>
 - Rich Ellis <[email protected]>
 - Rick Ballard <[email protected]>
 - Rintaro Ishizaki <[email protected]>
 - Ritwik Gupta <[email protected]>
 - Robert Widmann <[email protected]>
+- Romain Pouclet <[email protected]>
 - Roman Levenstein <[email protected]>
 - Ron Baker <[email protected]>
 - Ron Olson <[email protected]>
@@ -270,10 +307,12 @@ needs to be listed here.
 - Ryan Lovelett <[email protected]>
 - Ryan Wilson <[email protected]>
 - Ryosuke Hayashi <[email protected]>
+- Saleem Abdulrasool <[email protected]>
 - Saleem Abdulrasool <[email protected]>
 - Samuel Giddins <[email protected]>
 - Sebastian Grail <[email protected]>
 - Sergio Campamá <[email protected]>
+- Sheikh Bayazid <[email protected]>
 - Slava Pestov <[email protected]>
 - Stan Stadelman <[email protected]>
 - Stephen Brown <[email protected]>
@@ -296,6 +335,7 @@ needs to be listed here.
 - Tim Condon <[email protected]>
 - Tim Gymnich <[email protected]>
 - Tobias Landsberg <[email protected]>
+- Tokuriku <[email protected]>
 - Tom Doron <[email protected]>
 - Tomasz Bąk <[email protected]>
 - Tomoya Kose <[email protected]>
@@ -322,21 +362,26 @@ needs to be listed here.
 - Wojtek Czekalski <[email protected]>
 - Wowbagger & his liquid lunch <[email protected]>
 - Xavier Matos <[email protected]>
+- Xiaodi Wu <[email protected]>
 - Xiaodi Wu <[email protected]>
 - Xing He <[email protected]>
 - YOCKOW <[email protected]>
+- YOUNG MO SONG <[email protected]>
 - YR Chen <[email protected]>
 - Yan Li <[email protected]>
 - Yannick Heinrich <[email protected]>
 - Yim Lee <[email protected]>
 - Yonas Kolb <[email protected]>
+- Yoshimasa Niwa <[email protected]>
 - Yu Ao <[email protected]>
 - Yu Su <[email protected]>
 - YuAo <[email protected]>
 - Yuta Koshizawa <[email protected]>
 - Yuta Saito <[email protected]>
+- Zsolt Kiraly <[email protected]>
 - adamnemecek <[email protected]>
 - aemino <[email protected]>
+- akashhansda <[email protected]>
 - aniket sharma <[email protected]>
 - badim <[email protected]>
 - buttaface <[email protected]>
@@ -354,8 +399,10 @@ needs to be listed here.
 - hotchemi <[email protected]>
 - jhonnybillm <[email protected]>
 - jp_pancake <[email protected]>
+- k-kohey <[email protected]>
 - linqingmo <[email protected]>
 - naru <[email protected]>
+- nate-chandler <[email protected]>
 - nathan spindel <[email protected]>
 - nonsensery <[email protected]>
 - onevcat <[email protected]>
@@ -369,7 +416,6 @@ needs to be listed here.
 - swiftix <[email protected]>
 - t_hayashi <[email protected]>
 - thecb4 <[email protected]>
-- therealbnut <[email protected]>
 - twobitunicorn <[email protected]>
 - uhooi <[email protected]>
 - yonihemi <[email protected]>
@@ -378,6 +424,7 @@ needs to be listed here.
 - ✪ vi4m Marcin Kliks <[email protected]>
 - 冀卓疌 <[email protected]>
 
+
 **Updating this list**
 
 Please do not edit this file manually. It is generated using `./Utilities/generate_contributors_list.sh`. If a name is misspelled or appearing multiple times: add an entry in `./.mailmap`

Utilities/generate_contributors_list.sh

@@ -13,7 +13,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
@@ -30,7 +43,6 @@ cat > "$here/../CONTRIBUTORS.txt" <<- EOF
 	### Contributors
 
 	$contributors
-
 	**Updating this list**
 
 	Please do not edit this file manually. It is generated using \`./Utilities/generate_contributors_list.sh\`. If a name is misspelled or appearing multiple times: add an entry in \`./.mailmap\`