10 files changed, 113 insertions, 25 deletions

diff --git a/contrib/conf/commit-msg b/contrib/conf/commit-msg
new file mode 100755
index 000000000..e57333c00
--- /dev/null
+++ b/contrib/conf/commit-msg
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+# use as .git/hooks/commit-msg
+
+COMMIT_MSG_FILE=$1
+
+exec 1>&2
+
+RET=0
+changed=$(git diff --cached --name-only)
+
+for f in $changed;
+do
+ # Only headers in include
+ if echo $f | grep \src\/include\/.\*\.h\$  > /dev/null
+ then
+   RET=1
+   # Check if it has a NEWS line
+   if cat $COMMIT_MSG_FILE | grep -i "^NEWS:\s[-,a-zA-Z][a-zA-Z]*" > /dev/null
+   then
+       RET=0
+       break
+   fi
+ fi
+done
+
+# If no NEWS line found, abort
+if [ $RET = 1 ];
+then
+  echo "Your commit includes staged changes that indicate an API change which requires a NEWS line."
+else
+  echo "Your commit does not include API changes"
+fi
+exit 0
diff --git a/contrib/conf/gnunet/gnunet-system.conf b/contrib/conf/gnunet/gnunet-system.conf
index 6f9b0f379..dc0528cf3 100644
--- a/contrib/conf/gnunet/gnunet-system.conf
+++ b/contrib/conf/gnunet/gnunet-system.conf
@@ -1,7 +1,9 @@
-# Sample configuration file to be installed in /etc/gnunet.conf
-# for a multi-user GNUnet setup.  This is then the configuration
-# for the system-wide "gnunet" user.
-[arm]
-SYSTEM_ONLY = YES
-USER_ONLY = NO
+[path]
+GNUNET_HOME = /var/lib/gnunet/
+GNUNET_DATA_HOME = /var/lib/gnunet/data/
+GNUNET_RUNTIME_DIR = /var/run/gnunet/
 
+[arm]
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
+OPTIONS = -l /var/log/gnunet.log
diff --git a/contrib/conf/gnunet/gnunet-user.conf b/contrib/conf/gnunet/gnunet-user.conf
index de95c216c..f4763e45a 100644
--- a/contrib/conf/gnunet/gnunet-user.conf
+++ b/contrib/conf/gnunet/gnunet-user.conf
@@ -3,6 +3,6 @@
 # in the $HOME directory of each normal user (and in
 # /etc/skel/).
 [arm]
-SYSTEM_ONLY = NO
-USER_ONLY = YES
+START_SYSTEM_SERVICES = NO
+START_USER_SERVICES = YES
 
diff --git a/contrib/conf/gnunet/meson.build b/contrib/conf/gnunet/meson.build
new file mode 100644
index 000000000..0419784fb
--- /dev/null
+++ b/contrib/conf/gnunet/meson.build
@@ -0,0 +1,6 @@
+configure_file(copy: true,
+               input: 'no_forcestart.conf',
+               output: 'no_forcestart.conf')
+configure_file(copy: true,
+               input: 'no_autostart_above_core.conf',
+               output: 'no_autostart_above_core.conf')
diff --git a/contrib/conf/gnunet/no_autostart_above_core.conf b/contrib/conf/gnunet/no_autostart_above_core.conf
index 478addd29..8ed4dcb60 100644
--- a/contrib/conf/gnunet/no_autostart_above_core.conf
+++ b/contrib/conf/gnunet/no_autostart_above_core.conf
@@ -74,9 +74,6 @@ START_ON_DEMAND = NO
 [social]
 START_ON_DEMAND = NO
 
-[psyc]
-START_ON_DEMAND = NO
-
 [rps]
 START_ON_DEMAND = NO
 
@@ -89,8 +86,5 @@ START_ON_DEMAND = NO
 [sensor]
 START_ON_DEMAND = NO
 
-[zonemaster-monitor]
-START_ON_DEMAND = NO
-
 [zonemaster]
 START_ON_DEMAND = NO
diff --git a/contrib/conf/gnunet/no_forcestart.conf b/contrib/conf/gnunet/no_forcestart.conf
index 2c874489e..0c4a209be 100644
--- a/contrib/conf/gnunet/no_forcestart.conf
+++ b/contrib/conf/gnunet/no_forcestart.conf
@@ -40,12 +40,6 @@ IMMEDIATE_START = NO
 [zonemaster]
 IMMEDIATE_START = NO
 
-[zonemaster-monitor]
-IMMEDIATE_START = NO
-
-[psyc]
-IMMEDIATE_START = NO
-
 [rps]
 IMMEDIATE_START = NO
 
diff --git a/contrib/conf/meson.build b/contrib/conf/meson.build
new file mode 100644
index 000000000..f0e4647df
--- /dev/null
+++ b/contrib/conf/meson.build
@@ -0,0 +1 @@
+subdir('gnunet')
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
new file mode 100755
index 000000000..a95f29430
--- /dev/null
+++ b/contrib/conf/prepare-commit-msg
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# use as .git/hooks/pre-commit
+
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+
+exec 1>&2
+
+RET=0
+changed=$(git diff --cached --name-only)
+
+for f in $changed;
+do
+ # Only headers in include
+ if echo $f | grep \src\/include\/.\*\.h\$  > /dev/null
+ then
+    RET=1
+ fi
+done
+
+# Only add custom message when there is no commit source
+# ($COMMIT_SOURCE is empty). Otherwise, keep the default message
+# proposed by Git. Possible commit source: message, template,
+# merge, squash or commit.
+if [ -z "$COMMIT_SOURCE" ];
+then
+  hint=$(cat "$COMMIT_MSG_FILE")
+  echo -e "# Our commit subject format policy is:\n# <subsystem>: <description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will automatically update/resolve issue #1234 in mantis." > "$COMMIT_MSG_FILE"
+  if [ $RET = 1 ];
+  then
+    echo -e "# Your commit includes staged changes that indicate an API change which requires a NEWS line." >> "$COMMIT_MSG_FILE"
+  fi
+  echo "$hint" >> "$COMMIT_MSG_FILE"
+fi
+exit 0
diff --git a/contrib/conf/uncrustify.cfg b/contrib/conf/uncrustify.cfg
index b02ebc4a5..af2d8e69c 100644
--- a/contrib/conf/uncrustify.cfg
+++ b/contrib/conf/uncrustify.cfg
@@ -4,7 +4,7 @@ output_tab_size = 2
 indent_columns = 2
 indent_with_tabs = 0
 indent_case_brace = 2
-indent_label=0
+indent_label=-16
 
 code_width=80
 #cmd_width=80
@@ -49,8 +49,12 @@ nl_assign_brace=remove
 
 # No extra newlines that cause noisy diffs
 nl_start_of_file=remove
+nl_after_func_proto = 2
+nl_after_func_body = 3
 # If there's no new line, it's not a text file!
 nl_end_of_file=add
+nl_max_blank_in_func = 3
+nl_max = 3
 
 sp_inside_paren = remove
 
@@ -69,6 +73,7 @@ sp_between_ptr_star = remove
 sp_before_sparen = add
 
 sp_inside_fparen = remove
+sp_inside_sparen = remove
 
 # add space before function call and decl: "foo (x)"
 sp_func_call_paren = add
@@ -76,3 +81,15 @@ sp_func_proto_paren = add
 sp_func_proto_paren_empty = add
 sp_func_def_paren = add
 sp_func_def_paren_empty = add
+
+# We'd want it for "if ( (foo) || (bar) )", but not for "if (m())",
+# so as uncrustify doesn't give exactly what we want => ignore
+sp_paren_paren = ignore
+sp_inside_paren = remove
+sp_bool = force
+
+nl_func_type_name = force
+#nl_branch_else = add
+nl_else_brace = add
+nl_elseif_brace = add
+nl_for_brace = add
diff --git a/contrib/conf/uncrustify_precommit b/contrib/conf/uncrustify_precommit
index 3a06511d1..8e0a605b3 100755
--- a/contrib/conf/uncrustify_precommit
+++ b/contrib/conf/uncrustify_precommit
@@ -28,8 +28,11 @@ done
 
 if [ $RET = 1 ];
 then
-  echo "Run"
-  echo "uncrustify --replace -c uncrustify.cfg ${crustified}"
-  echo "before committing."
+  echo "================================================================"
+  echo " Your changes are ugly!                                         "
+  echo " Uncrustify your code in your next commit.                      "
+  echo " See https://docs.gnunet.org/latest/developers/style.html#coding-style "
+  echo "================================================================"
 fi
-exit $RET
+# Do not fail
+exit 0