summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.authors.aux36
-rw-r--r--.gitignore3
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS54
-rw-r--r--Misc7
-rwxr-xr-xcontrib/extract-authors.sh16
6 files changed, 85 insertions, 32 deletions
diff --git a/.authors.aux b/.authors.aux
new file mode 100644
index 0000000..b87636a
--- /dev/null
+++ b/.authors.aux
@@ -0,0 +1,36 @@
+The following people have provided helpful bug reports, suggestions or have
+otherwise provided valuable contributions to the project:
+
+ * Christoph Jaeger <email@christophjaeger.info>
+ * Dan Horák <dan@danny.cz>
+ * Dennis Gilmore <dennis@ausil.us>
+ * Doug Burks <doug.burks@gmail.com>
+ * Emmanuel Roullit <emmanuel.roullit@gmail.com>
+ * Herbert Haas <herbert@perihel.at>
+ * Jim Binder <jbinder6342@gmail.com>
+ * Markus Kötter <nepenthesdev@gmail.com>
+ * Ronald W. Henderson <rwhalb@nycap.rr.com>
+ * Scott Moeller <electronjoe@gmail.com>
+ * Sibir Chakraborty <sibir.chakraborty@gmail.com>
+ * Stefan Seering <sseerin@imn.htwk-leipzig.de>
+ * Ulrich Weber <uweber@astaro.com>
+
+Special thanks to some of our sponsors:
+
+ * Deutsche Flugsicherung GmbH
+ * ETH Zurich, Communications Systems Group
+ * Max Planck Institute for Human Cognitive and Brain Sciences
+ * Team Cymru
+
+Notes:
+
+Note that we have taken over the maintenance and further development of Herbert
+Haas' mausezahn [ˈmauzəˌtsa:n] utility after he passed away in 2011. There were
+no Git commit statistics available from the import of his project. The project
+is currently in a staging area, but will be fully integrated soon. (*)
+
+Want to join the core team? Submit enough great patches over a long time,
+implement what's on the TODO file and show an ongoing, active interest in
+supporting netsniff-ng. What's in it for you? If you ever come to Switzerland,
+you get a free beer on Daniel and you can meet some great people involved in
+this project. ;)
diff --git a/.gitignore b/.gitignore
index f369474..906d2af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,9 +5,6 @@
.\#*
.*.sw[a-z]
*.un~
-
-# Hidden files, general things
-.*
*~
# Compiled object files
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..d2b4215
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Jonn Schipp <jonschipp@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index c222857..ceafe66 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,41 +1,26 @@
-Maintainers:
+The following people, in alphabetical order, have authored
+commits in the netsniff-ng repository:
- * Tobias Klauser <tklauser@distanz.ch>
- * Daniel Borkmann <daniel@iogearbox.net>
-
-Former maintainer:
-
- * Emmanuel Roullit <emmanuel.roullit@gmail.com>
-
-Contributors:
-
- * Arch3y <arch3y@archstrike.org>
+ * arch3y <arch3y@archstrike.org>
* Baruch Siach <baruch@tkos.co.il>
* Christian Wiese <chris@opensde.org>
- * Christoph Jaeger <email@christophjaeger.info>
- * Dan Horák <dan@danny.cz>
* Daniel Borkmann <daniel@iogearbox.net>
* Daniel Roberson <daniel@planethacker.net>
- * Dennis Gilmore <dennis@ausil.us>
- * Doug Burks <doug.burks@gmail.com>
- * Emmanuel Roullit <emmanuel.roullit@gmail.com>
* Eric Dumazet <edumazet@google.com>
* Erik Bengtsson <e.bengtsson@gmail.com>
- * Herbert Haas <herbert@perihel.at>*
* Hideo Hattori <hhatto.jp@gmail.com>
* Hisao Tanabe <xtanabe@gmail.com>
* James McCoy <vega.james@gmail.com>
* Jaroslav Škarvada <jskarvad@redhat.com>
* Jesper Dangaard Brouer <brouer@redhat.com>
- * Jim Binder <jbinder6342@gmail.com>
- * Jon Schipp <jonschipp@gmail.com>
- * Kartik Mistry <kartik@debian.org>
- * Ken Wu <abawwu@gmail.com>
+ * Jia Zhouyang <jiazhouyang@nudt.edu.cn>
+ * Jonn Schipp <jonschipp@gmail.com>
+ * Kartik Mistry <kartik.mistry@gmail.com>
* Ken-ichirou MATSUZAWA <chamaken@gmail.com>
+ * Ken Wu <abawwu@gmail.com>
* Mandar Gokhale <mandarg@mandarg.com>
* Mark Latimer <mark.latimer@gmail.com>
- * Markus Amend <markus@netsniff-ng.org>
- * Markus Kötter <nepenthesdev@gmail.com>
+ * Markus Amend <markus.amend@telekom.de>
* Martin Hauke <mardnh@gmx.de>
* Matteo Croce <mcroce@redhat.com>
* Michał Purzyński <michalpurzynski1@gmail.com>
@@ -46,22 +31,33 @@ Contributors:
* Petr Machata <petrm@mellanox.com>
* Radoslav Bodo <bodik@cesnet.cz>
* Reiner Herrmann <reiner@reiner-h.de>
- * Ronald W. Henderson <rwhalb@nycap.rr.com>
- * Scott Moeller <electronjoe@gmail.com>
- * Sibir Chakraborty <sibir.chakraborty@gmail.com>
- * Stefan Seering <sseerin@imn.htwk-leipzig.de>
* Stephen Wadeley <swadeley@redhat.com>
* Teguh <info@egeektronic.com>
+ * Thomas Fleischmann <thomas.fleischmann.08@googlemail.com>
* Tillmann Karras <tilkax@gmail.com>
* Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
* Tobias Klauser <tklauser@distanz.ch>
* Tommy Beadle <tbeadle@gmail.com>
- * Ulrich Weber <uweber@astaro.com>
* Vadim Kochan <vadim4j@gmail.com>
* Whang Choi <wch0x01@gmail.com>
* wilson <wilson.wen.chn@gmail.com>
* Yousong Zhou <yszhou4tech@gmail.com>
- * Zhouyang Jia <jiazhouyang09@gmail.com>
+The following people have provided helpful bug reports, suggestions or have
+otherwise provided valuable contributions to the project:
+
+ * Christoph Jaeger <email@christophjaeger.info>
+ * Dan Horák <dan@danny.cz>
+ * Dennis Gilmore <dennis@ausil.us>
+ * Doug Burks <doug.burks@gmail.com>
+ * Emmanuel Roullit <emmanuel.roullit@gmail.com>
+ * Herbert Haas <herbert@perihel.at>
+ * Jim Binder <jbinder6342@gmail.com>
+ * Markus Kötter <nepenthesdev@gmail.com>
+ * Ronald W. Henderson <rwhalb@nycap.rr.com>
+ * Scott Moeller <electronjoe@gmail.com>
+ * Sibir Chakraborty <sibir.chakraborty@gmail.com>
+ * Stefan Seering <sseerin@imn.htwk-leipzig.de>
+ * Ulrich Weber <uweber@astaro.com>
Special thanks to some of our sponsors:
diff --git a/Misc b/Misc
index c65c26b..1bfaebd 100644
--- a/Misc
+++ b/Misc
@@ -17,6 +17,13 @@ people:
log:
$(GIT_LOG)
+authors:
+ $(Q)echo "The following people, in alphabetical order, have authored" > AUTHORS
+ $(Q)echo "commits in the netsniff-ng repository:" >> AUTHORS
+ $(Q)echo "" >> AUTHORS
+ $(Q)contrib/extract-authors.sh >> AUTHORS
+ $(Q)cat .authors.aux >> AUTHORS
+
announcement:
$(Q)echo -e " *** BLURB HERE (general bits, optional) ***\n\n---\n" > .MAIL_MSG
$(Q)echo -e "netsniff-ng $(VERSION_SHORT) ($(NAME)) has been released to the public.\n" >> .MAIL_MSG
diff --git a/contrib/extract-authors.sh b/contrib/extract-authors.sh
new file mode 100755
index 0000000..486e906
--- /dev/null
+++ b/contrib/extract-authors.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Based on
+# https://github.com/cilium/cilium/blob/master/contrib/scripts/extract_authors.sh
+
+function extract_authors() {
+ authors=$(git shortlog --summary | awk '{$1=""; print $0}' | sed -e 's/^ //')
+ IFS=$'\n'
+ for i in $authors; do
+ name=$(git log --use-mailmap --author="$i" --format="%aN" | head -1)
+ mail=$(git log --use-mailmap --author="$i" --format="%aE" | head -1)
+ printf ' * %s <%s>\n' "$name" "$mail"
+ done
+}
+
+extract_authors | uniq | sort