11 files changed, 189 insertions, 409 deletions
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
index 2d4f5584b..204167e82 100644
--- a/contrib/scripts/Makefile.am
+++ b/contrib/scripts/Makefile.am
@@ -1,5 +1,6 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+libexecdir= $(pkglibdir)/libexec/
 SUBDIRS = gnunet-logread
@@ -21,7 +22,10 @@ noinst_SCRIPTS = \
  $(awkSCRIPTS)
 bin_SCRIPTS = \
-  gnunet-bugreport \
+  gnunet-bugreport
+# This script is not documented and its usage is quite uncommon.
+libexec_SCRIPTS = \
  gnunet-suidfix
 EXTRA_DIST = \
@@ -39,15 +43,11 @@ EXTRA_DIST = \
  find_typedefs.py \
  pydmesg \
  visualize_stats.sh \
-  changelog_delta.sh \
  debug \
  build_cscope.sh \
-  testbed_cleanup.sh \
  lint/lint-man.sh \
  lint/lint-python.sh \
  revisionary.sh \
-  netjail/netjail_core.sh \
-  netjail/netjail_setup_internet.sh \
  regression.sh \
  doc/texinfo-hacks.el \
  afferify \
@@ -72,11 +72,11 @@ CLEANFILES = \
 SUFFIXES = .py.in .py
 .py.in.py:
-        $(AWK) -v py="$(PYTHON)" -f $(top_srcdir)/bin/dosubst.awk < $< > $@
+        $(AWK) -v py="$(PYTHON)" -f $(top_srcdir)/scripts/dosubst.awk < $< > $@
        chmod +x $@
 if HAVE_AWK
 check-texinfo.awk: check-texinfo.awk.in Makefile
-        $(AWK) -v awkay="$(AWK_BINARY)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk
+        $(AWK) -v awkay="$(AWK_BINARY)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk
        chmod +x check-texinfo.awk
 endif
diff --git a/contrib/scripts/changelog_delta.sh b/contrib/scripts/changelog_delta.sh
deleted file mode 100644
index f115f1ef1..000000000
--- a/contrib/scripts/changelog_delta.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-LASTHASH=$(head -n1 ChangeLog | cut -d " " -f 7 | tr -d \( | tr -d \))
-git log --invert-grep --grep="^-" --no-merges --no-color --format="%aD (%h)%n%s - %cN%n" $LASTHASH..HEAD
diff --git a/contrib/scripts/doc/warningfilter.py b/contrib/scripts/doc/warningfilter.py
new file mode 100755
index 000000000..31ac5865c
--- /dev/null
+++ b/contrib/scripts/doc/warningfilter.py
@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+"""
+Filters and processes warnings generated by Doxygen, which are
+annoyingly inconsistent and verbose, for greater readability.
+(Neo)vim commands to go to the file and linenumber listed on a 
+line, in the reports this program generates:
+    :exe "let linenumber =" split(getline("."))[1]
+    :exe "edit" fnameescape(split(getline("."))[0]) "|" linenumber
+It's easy to put a workflow together to clear up redundant doc 
+comments (which generate "multiple @param docs" warnings), using
+simple vim commands to move the cursor and close buffers, Neovim's 
+support for the Language Server Protocol or related tooling, and 
+the command shown above.
+A useful sequence, for rapidly deleting a doc comment from its last
+line, is, in normal mode, `$v%ddd`.
+For setting up LSP integration in Neovim, refer to the lsp_config
+plugin. 
+You may additionally need to generate compile_commands.json in the 
+repository root, to allow the language server to find everything. 
+This can be done using Bear (found at https://github.com/rizsotto/Bear).
+@author: willow <willow@howhill.com>
+"""
+import argparse as ap
+import re
+# Regular expression construction
+def sep_re(field, separator):
+    "Constructs regex for a list"
+    return rf"{field}(?:{separator}{field})*"
+# File names and paths
+fileclass = r"[\w-]"
+filename = rf"{fileclass}+"
+# filename = rf"(/{fileclass}+)+\.\w"
+filepath = rf"{sep_re(filename, '/')}\.(?:\w+)"
+main_match = rf"(?P<path>/{filepath}|\[generated\]):(?P<linenumber>\d+): warning:"
+# Symbols
+type_name = rf"(?:const )?(?:unsigned (?:long )?|struct |enum )?(?:\w+)(?: \*?const)? \*{{0,3}}"
+var_def = rf"{type_name}\w+(?:\[(?:\(\d+/\d+\))?\])?"
+func_params = rf"\({sep_re(var_def, ', ')}(?:,\.\.\.)?\)"
+simple_name = r"\w+"
+func_name = simple_name
+verbose_name = rf"{sep_re(simple_name, ' ')}"
+command_re = "(?:</[^>]+>|\\\w+)"
+macro_params = rf"\({sep_re(simple_name, ', ')}(?:,\.\.\.)?\)"
+matches = {
+    "not an input @file": re.compile(rf"{main_match} the name '(?P<name>{filepath}|{simple_name})' supplied as the argument in the \\file statement is not an input file"),
+    "multiple @param docs": re.compile(rf"{main_match} argument '(?P<arg_name>\w+)' from the argument list of ({func_name}) has multiple @param documentation sections"),
+    "undocumented param": re.compile(rf"{main_match} The following parameters? of ({func_name})(?:{func_params}|{macro_params}) (?:is|are) not documented:"),
+    "undocumented param (name)": re.compile(r"  parameter '([\w.]+)'"),
+    "explicit link not resolved": re.compile(rf"{main_match} explicit link request to '(\w+(?:\(\))?)' could not be resolved"),
+    "unknown command": re.compile(rf"{main_match} Found unknown command '(\\\w+)'"),
+    "missing argument": re.compile(rf"{main_match} argument '(\w+)' of command @param is not found in the argument list of ({func_name})(?:{func_params}|{macro_params})"),
+    "eof inside group": re.compile(rf"{main_match} end of file while inside a group"),
+    "eof inside comment": re.compile(rf"{main_match} Reached end of file while still inside a \(nested\) comment. Nesting level \d+ \(probable line reference: (\d+)\)"),
+    "eof inside code block": re.compile(rf"{main_match} reached end of file while inside a 'code' block!"),
+    "eof inside code block (line 2)": re.compile(rf"The command that should end the block seems to be missing!"),
+    "title mismatch": re.compile(rf"{main_match} group (?P<group_id>\w+): ignoring title \"(?P<new_title>{verbose_name})\" that does not match old title \"(?P<old_title>{verbose_name})\""),
+    "end of comment expecting command": re.compile(rf"{main_match} end of comment block while expecting command ({command_re})"),
+    "no matching tag": re.compile(rf"{main_match} found </(?P<tag>[^>]+)> tag without matching <(?P=tag)>"),
+    "documented empty return type": re.compile(rf"{main_match} documented empty return type of {func_name}"),
+    "unsupported tag": re.compile(rf"{main_match} Unsupported xml/html tag <(?P<tag>[^>]+)> found"),
+    "expected whitespace after command": re.compile(rf"{main_match} expected whitespace after \\(?P<command>\w+) command"),
+    "illegal command": re.compile(rf"{main_match} Illegal command (?P<illegal_cmd>(?:@|\\)\w+) as part of a \\(?P<command>\w+) command"),
+    "undeclared symbol": re.compile(rf"{main_match} documented symbol '(\w+)' was not declared or defined\."),
+    "nameless member": re.compile(rf"{main_match} member with no name found."),
+    "end of empty list": re.compile(rf"{main_match} End of list marker found without any preceding list items"),
+    "blank": re.compile(rf"^\s*$"),
+#    "": re.compile(rf"{main_match} "),
+}
+parser_choices = set(matches.keys()) - {"blank", 
+                                        "eof inside code block (line 2)",
+                                        "undocumented param (name)"}
+parser = ap.ArgumentParser()
+parser.add_argument("filename")
+parser.add_argument("--summary", "-s", action="store_true")
+parser.add_argument("--key", "-k", choices=parser_choices, action="append", dest="keys")
+args = parser.parse_args()
+sorted_lines = {k:[] for k in matches.keys()}
+unsorted_lines = []
+with open(args.filename, "r") as file:
+    for line in file.readlines():
+        for key, value in matches.items():
+            if match := value.match(line):
+                sorted_lines[key].append(match)
+                break
+        else:
+            unsorted_lines.append(line.strip("\n"))
+processed_lines = {k: [" ".join(g for g in match.groups())
+                       for match in matches]
+                   for k, matches in sorted_lines.items()}
+# Combining multiline warnings
+processed_lines["undocumented param"] = [
+    l1+" "+l2 for l1, l2 in zip(processed_lines["undocumented param"],
+                                processed_lines["undocumented param (name)"]) 
+]
+# Removing chaff
+del processed_lines["blank"]
+del processed_lines["eof inside code block (line 2)"]
+del processed_lines["undocumented param (name)"]
+# Preparing count dictionary and summarising the results
+counts = {k: len(v) for k, v in processed_lines.items()}
+if args.summary:
+    for k, v in counts.items():
+        print(k+":", v)
+    print("")
+if args.keys is not None:
+    for key in args.keys:
+        print(f"{key}: {counts[key]}")
+        for line in processed_lines[key]:
+            print(line)
+        print("")
diff --git a/contrib/scripts/generate-release-triplet.sh b/contrib/scripts/generate-release-triplet.sh
new file mode 100755
index 000000000..7dc890dc0
--- /dev/null
+++ b/contrib/scripts/generate-release-triplet.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+PACKAGE=$1
+VERSION=$2
+cat << EOF >> $PACKAGE-$VERSION.directive
+version: 1.2
+directory: gnunet
+filename: $PACKAGE-$VERSION.tar.gz
+symlink: $PACKAGE-$VERSION.tar.gz $PACKAGE-latest.tar.gz
+EOF
+gpg --clearsign $PACKAGE-$VERSION.directive
+gpg -b $PACKAGE-$VERSION.tar.gz
+exit
+ftp -inv ftp-upload.gnu.org <<EOF
+user anonymous
+cd incoming/ftp
+mput $PACKAGE-$VERSION.tar.gz $PACKAGE-$VERSION.tar.gz.sig $PACKAGE-$VERSION.tar.gz.directive.asc
+bye
+EOF
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am
index d0054391c..d53a8b8cf 100644
--- a/contrib/scripts/gnunet-logread/Makefile.am
+++ b/contrib/scripts/gnunet-logread/Makefile.am
@@ -4,11 +4,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 SUFFIXES = .in
 gnunet-logread: gnunet-logread.in Makefile
-        $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-logread.in > gnunet-logread
+        $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet-logread.in > gnunet-logread
        chmod +x gnunet-logread
 gnunet-logread-ipc-sdedit: gnunet-logread-ipc-sdedit.in Makefile
-        $(AWK) -v prl="$(PERL)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit
+        $(AWK) -v prl="$(PERL)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit
        chmod +x gnunet-logread-ipc-sdedit
 CLEANFILES=     \
diff --git a/contrib/scripts/meson.build b/contrib/scripts/meson.build
new file mode 100644
index 000000000..d56ba2b76
--- /dev/null
+++ b/contrib/scripts/meson.build
@@ -0,0 +1,4 @@
+install_data('gnunet-bugreport',
+             install_dir: get_option('bindir'))
+install_data('gnunet-suidfix',
+             install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/contrib/scripts/netjail/netjail_core.sh b/contrib/scripts/netjail/netjail_core.sh
deleted file mode 100755
index d53315052..000000000
--- a/contrib/scripts/netjail/netjail_core.sh
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/bin/sh
-# 
-JAILOR=${SUDO_USER:?must run in sudo}
-PREFIX=${PPID:?must run from a parent process}
-# running with `sudo` is required to be
-# able running the actual commands as the
-# original user.
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export RESULT=
-export NAMESPACE_NUM=0
-export INTERFACE_NUM=0
-netjail_next_namespace() {
-        local NUM=$NAMESPACE_NUM
-        NAMESPACE_NUM=$(($NAMESPACE_NUM + 1))
-        RESULT=$NUM
-}
-netjail_next_interface() {
-        local NUM=$INTERFACE_NUM
-        INTERFACE_NUM=$(($INTERFACE_NUM + 1))
-        RESULT=$NUM
-}
-netjail_opt() {
-        local OPT=$1
-        shift 1
-        INDEX=1
-        while [ $# -gt 0 ]; do
-                if [ "$1" = "$OPT" ]; then
-                        RESULT=$INDEX
-                        return
-                fi
-                INDEX=$(($INDEX + 1))
-                shift 1
-        done
-        RESULT=0
-}
-netjail_opts() {
-        local OPT=$1
-        local DEF=$2
-        shift 2
-        
-        while [ $# -gt 0 ]; do
-                if [ "$1" = "$OPT" ]; then
-                        printf "$2"
-                        return
-                fi
-                shift 1
-        done
-        
-        RESULT="$DEF"
-}
-netjail_check() {
-        local NODE_COUNT=$1
-        local FD_COUNT=$(($(ls /proc/self/fd | wc -w) - 4))
-        # quit if `$FD_COUNT < ($LOCAL_M * $GLOBAL_N * 2)`:
-        # the script also requires `sudo -C ($FD_COUNT + 4)`
-        # so you need 'Defaults closefrom_override' in the
-        # sudoers file.
-        if [ $FD_COUNT -lt $(($NODE_COUNT * 2)) ]; then
-                echo "File descriptors do not match requirements!" >&2
-                exit 1
-        fi
-}
-netjail_check_bin() {
-        local PROGRAM=$1
-        local MATCH=$(ls $(echo $PATH | tr ":" "\n") | grep "^$PROGRAM\$" | tr "\n" " " | awk '{ print $1 }')
-        # quit if the required binary $PROGRAM can not be
-        # found in the used $PATH.
-        if [ "$MATCH" != "$PROGRAM" ]; then
-                echo "Required binary not found: $PROGRAM" >&2
-                exit 1
-        fi
-}
-netjail_bridge() {
-        netjail_next_interface
-        local NUM=$RESULT
-        local BRIDGE=$(printf "%06x-%08x" $PREFIX $NUM)
-        ip link add $BRIDGE type bridge
-        ip link set dev $BRIDGE up
-        
-        RESULT=$BRIDGE
-}
-netjail_bridge_clear() {
-        local BRIDGE=$1
-        ip link delete $BRIDGE
-}
-netjail_node() {
-        netjail_next_namespace
-        local NUM=$RESULT
-        local NODE=$(printf "%06x-%08x" $PREFIX $NUM)
-        ip netns add $NODE
-        
-        RESULT=$NODE
-}
-netjail_node_clear() {
-        local NODE=$1
-        ip netns delete $NODE
-}
-netjail_node_link_bridge() {
-        local NODE=$1
-        local BRIDGE=$2
-        local ADDRESS=$3
-        local MASK=$4
-        
-        netjail_next_interface
-        local NUM_IF=$RESULT
-        netjail_next_interface
-        local NUM_BR=$RESULT
-        
-        local LINK_IF=$(printf "%06x-%08x" $PREFIX $NUM_IF)
-        local LINK_BR=$(printf "%06x-%08x" $PREFIX $NUM_BR)
-        ip link add $LINK_IF type veth peer name $LINK_BR
-        ip link set $LINK_IF netns $NODE
-        ip link set $LINK_BR master $BRIDGE
-        ip -n $NODE addr add "$ADDRESS/$MASK" dev $LINK_IF
-        ip -n $NODE link set $LINK_IF up
-        ip -n $NODE link set up dev lo
-        ip link set $LINK_BR up
-        
-        RESULT=$LINK_BR
-}
-netjail_node_unlink_bridge() {
-        local LINK_BR=$1
-        ip link delete $LINK_BR
-}
-netjail_node_add_nat() {
-        local NODE=$1
-        local ADDRESS=$2
-        local MASK=$3
-        ip netns exec $NODE iptables -t nat -A POSTROUTING -s "$ADDRESS/$MASK" -j MASQUERADE
-}
-netjail_node_add_default() {
-        local NODE=$1
-        local ADDRESS=$2
-        ip -n $NODE route add default via $ADDRESS
-}
-netjail_node_exec() {
-        local NODE=$1
-        local FD_IN=$2
-        local FD_OUT=$3
-        shift 3
-        ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN
-}
-netjail_kill() {
-        local PID=$1
-        local MATCH=$(ps --pid $PID | awk "{ if ( \$1 == $PID ) { print \$1 } }" | wc -l)
-        if [ $MATCH -gt 0 ]; then
-                kill -n 19 $PID
-                for CHILD in $(ps -o pid,ppid -ax | awk "{ if ( \$2 == $PID ) { print \$1 } }"); do
-                        netjail_kill $CHILD
-                done
-                kill $PID
-        fi
-}
-netjail_killall() {
-        if [ $# -gt 0 ]; then
-                local PIDS=$1
-                for PID in $PIDS; do
-                        netjail_kill $PID
-                done
-        fi
-}
-netjail_waitall() {
-        if [ $# -gt 0 ]; then
-                local PIDS=$1
-                for PID in $PIDS; do
-                        wait $PID
-                done
-        fi
-}
diff --git a/contrib/scripts/netjail/netjail_setup_internet.sh b/contrib/scripts/netjail/netjail_setup_internet.sh
deleted file mode 100755
index ea820f38c..000000000
--- a/contrib/scripts/netjail/netjail_setup_internet.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/bash
-. "./netjail_core.sh"
-set -eu
-set -x
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-PREFIX=$PPID
-LOCAL_M=$1
-GLOBAL_N=$2
-shift 2
-netjail_check $(($LOCAL_M * $GLOBAL_N))
-# Starts optionally an amount of nodes without NAT starting with "92.68.151.1"
-netjail_opt '--known' $@
-KNOWN=$RESULT
-netjail_opts '--known' 0 $@
-KNOWN_NUM=$RESULT
-# Starts optionally 'stunserver' on "92.68.150.254":
-netjail_opt '--stun' $@
-STUN=$RESULT
-if [ $KNOWN -gt 0 ]; then
-        shift 2
-        KNOWN=$KNOWN_NUM
-        
-        netjail_check $(($LOCAL_M * $GLOBAL_N + $KNOWN))
-fi
-if [ $STUN -gt 0 ]; then
-        netjail_check_bin stunserver
-        
-        shift 1
-fi
-netjail_check_bin $1
-LOCAL_GROUP="192.168.15"
-GLOBAL_GROUP="92.68.150"
-KNOWN_GROUP="92.68.151"
-CLEANUP=0
-echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/16, stun: $STUN]"
-netjail_bridge
-NETWORK_NET=$RESULT
-for X in $(seq $KNOWN); do
-        netjail_node
-        KNOWN_NODES[$X]=$RESULT
-        netjail_node_link_bridge ${KNOWN_NODES[$X]} $NETWORK_NET "$KNOWN_GROUP.$X" 16
-        KNOWN_LINKS[$X]=$RESULT
-done
-declare -A NODES
-declare -A NODE_LINKS
-for N in $(seq $GLOBAL_N); do
-        netjail_node
-        ROUTERS[$N]=$RESULT
-        netjail_node_link_bridge ${ROUTERS[$N]} $NETWORK_NET "$GLOBAL_GROUP.$N" 16
-        NETWORK_LINKS[$N]=$RESULT
-        netjail_bridge
-        ROUTER_NETS[$N]=$RESULT
-        
-        for M in $(seq $LOCAL_M); do
-                netjail_node
-                NODES[$N,$M]=$RESULT
-                netjail_node_link_bridge ${NODES[$N,$M]} ${ROUTER_NETS[$N]} "$LOCAL_GROUP.$M" 24
-                NODE_LINKS[$N,$M]=$RESULT
-        done
-        ROUTER_ADDR="$LOCAL_GROUP.$(($LOCAL_M+1))"
-        netjail_node_link_bridge ${ROUTERS[$N]} ${ROUTER_NETS[$N]} $ROUTER_ADDR 24
-        ROUTER_LINKS[$N]=$RESULT
-        
-        netjail_node_add_nat ${ROUTERS[$N]} $ROUTER_ADDR 24
-        
-        for M in $(seq $LOCAL_M); do
-                netjail_node_add_default ${NODES[$N,$M]} $ROUTER_ADDR
-        done
-done
-WAITING=""
-KILLING=""
-if [ $STUN -gt 0 ]; then
-        netjail_node
-        STUN_NODE=$RESULT
-        netjail_node_link_bridge $STUN_NODE $NETWORK_NET "$GLOBAL_GROUP.254" 16
-        STUN_LINK=$RESULT
-        netjail_node_exec $STUN_NODE 0 1 stunserver &
-        KILLING="$!"
-fi
-for X in $(seq $KNOWN); do
-        INDEX=$(($X - 1))
-        FD_X=$(($INDEX * 2 + 3 + 0))
-        FD_Y=$(($INDEX * 2 + 3 + 1))
-        netjail_node_exec ${KNOWN_NODES[$X]} $FD_X $FD_Y $@ &
-        WAITING="$! $WAITING"
-done
-for N in $(seq $GLOBAL_N); do
-        for M in $(seq $LOCAL_M); do
-                INDEX=$(($LOCAL_M * ($N - 1) + $M - 1 + $KNOWN))
-                
-                FD_X=$(($INDEX * 2 + 3 + 0))
-                FD_Y=$(($INDEX * 2 + 3 + 1))
-                netjail_node_exec ${NODES[$N,$M]} $FD_X $FD_Y $@ &
-                WAITING="$! $WAITING"
-        done
-done
-cleanup() {
-        if [ $STUN -gt 0 ]; then
-                netjail_node_unlink_bridge $STUN_LINK
-                netjail_node_clear $STUN_NODE
-        fi
-        for X in $(seq $KNOWN); do
-                netjail_node_unlink_bridge ${KNOWN_LINKS[$X]}
-                netjail_node_clear ${KNOWN_NODES[$X]}
-        done
-        for N in $(seq $GLOBAL_N); do
-                for M in $(seq $LOCAL_M); do
-                        netjail_node_unlink_bridge ${NODE_LINKS[$N,$M]}
-                        netjail_node_clear ${NODES[$N,$M]}
-                done
-                netjail_node_unlink_bridge ${ROUTER_LINKS[$N]}
-                netjail_bridge_clear ${ROUTER_NETS[$N]}
-                netjail_node_unlink_bridge ${NETWORK_LINKS[$N]}
-                netjail_node_clear ${ROUTERS[$N]}
-        done
-        netjail_bridge_clear $NETWORK_NET
-}
-trapped_cleanup() {
-        netjail_killall $WAITING
-        netjail_killall $KILLING
-        cleanup
-}
-trap 'trapped_cleanup' ERR
-netjail_waitall $WAITING
-netjail_killall $KILLING
-wait
-cleanup
-echo "Done"
diff --git a/contrib/scripts/news_delta.sh b/contrib/scripts/news_delta.sh
new file mode 100755
index 000000000..20fb98649
--- /dev/null
+++ b/contrib/scripts/news_delta.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+OLDVERSION=$1
+git --no-pager log --grep="^NEWS: " -i --no-merges --no-color --format="%s%n%b" $1..HEAD | grep -i "^NEWS:\s[a-zA-Z][a-zA-Z]*" | sed 's/NEWS:/  -/i'
+echo ""
diff --git a/contrib/scripts/testbed_cleanup.sh b/contrib/scripts/testbed_cleanup.sh
deleted file mode 100755
index ee0200d44..000000000
--- a/contrib/scripts/testbed_cleanup.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-###################################################################################
-# Script to clean a previous run of testbed which has crashed. This scripts kills #
-# the peers and cleans the temporary files created for those peers                #
-#                                                                                 #
-# Author: Sree Harsha Totakura                                                    #
-###################################################################################
-for host in `cut -d : -f 1 < infiniband_cluster.hosts | cut -d @ -f 2`
-do
-    echo "ssh --> $host"
-    ssh $host 'pkill -SIGKILL gnunet; rm -rf /tmp/gnunet-pipe*; rm -rf /tmp/testbed*'
-done
diff --git a/contrib/scripts/update_news.sh b/contrib/scripts/update_news.sh
new file mode 100755
index 000000000..014ac8bd7
--- /dev/null
+++ b/contrib/scripts/update_news.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+NEW_VERSION=$1
+if [ -z $NEW_VERSION ]; then
+    NEW_VERSION="Unreleased"
+fi
+DELTA_SH="contrib/scripts/news_delta.sh"
+LASTVER=$(head -n1 NEWS | tr -d :)
+echo "$NEW_VERSION:" > NEWS.delta || exit 1
+$DELTA_SH $LASTVER >> NEWS.delta || exit 1
+cp NEWS NEWS.bak || exit 1
+cat NEWS.delta > NEWS || exit 1
+cat NEWS.bak >> NEWS || exit 1
+rm NEWS.bak NEWS.delta