6 files changed, 160 insertions, 0 deletions

diff --git a/contrib/packages/fedora/10-dns2gns.sh b/contrib/packages/fedora/10-dns2gns.sh
new file mode 100644
index 000000000..b652a9c0c
--- /dev/null
+++ b/contrib/packages/fedora/10-dns2gns.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+interface=$1
+status=$2
+
+do_it=$(gnunet-config -s dns2gns -o ENABLE_RESOLVECTL_NMDISPATCHER -c /etc/gnunet.conf)
+if [ $? != 0 ]; then
+  exit 1
+fi
+if [ $do_it = "NO" ]; then
+  echo "Setting DNS2GNS through resolvectl disabled."
+  exit 1
+fi
+
+case $status in
+  up)
+    if nc -u -z 127.0.0.1 5353; then
+      # Note: We add quad 9 as a fallback in case our service is down.
+      dns2gns=$(gnunet-config -s dns2gns -o BIND_TO)
+      if [ $? != 0 ]; then
+        exit 1
+      fi
+      dns2gns6=$(gnunet-config -s dns2gns -o BIND_TO6)
+      if [ $? != 0 ]; then
+        exit 1
+      fi
+      port=$(gnunet-config -s dns2gns -o PORT)
+      if [ $? != 0 ]; then
+        exit 1
+      fi
+      olddns=$(resolvectl status $interface | grep "DNS Servers" | cut -d':' -f2-)
+      if [ $? == 0 ]; then
+        #echo "Setting to $dns2gns:$port [$dns2gns6]:$port $olddns 9.9.9.9"
+        #resolvectl dns $interface $dns2gns:$port [$dns2gns6]:$port $olddns 9.9.9.9
+        echo "Setting to $dns2gns:$port [$dns2gns6]:$port"
+        resolvectl dns $interface $dns2gns:$port [$dns2gns6]:$port
+      else
+        exit 1
+      fi
+    fi
+  ;;
+  down)
+  ;;
+esac
diff --git a/contrib/packages/fedora/gnunet-system.conf b/contrib/packages/fedora/gnunet-system.conf
new file mode 100644
index 000000000..a0b99dfeb
--- /dev/null
+++ b/contrib/packages/fedora/gnunet-system.conf
@@ -0,0 +1,12 @@
+[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
+
+[dns2gns]
+ENABLE_RESOLVECTL_NMDISPATCHER = YES
diff --git a/contrib/packages/fedora/gnunet-user.service b/contrib/packages/fedora/gnunet-user.service
new file mode 100644
index 000000000..c9d3be0ad
--- /dev/null
+++ b/contrib/packages/fedora/gnunet-user.service
@@ -0,0 +1,11 @@
+# Typically to be place into /usr/lib/systemd/user/gnunet.service
+[Unit]
+Description=GNUnet user service
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/lib/gnunet/libexec/gnunet-service-arm -c ~/.config/gnunet.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/packages/fedora/gnunet.service b/contrib/packages/fedora/gnunet.service
new file mode 100644
index 000000000..daa38a046
--- /dev/null
+++ b/contrib/packages/fedora/gnunet.service
@@ -0,0 +1,14 @@
+# Typically placed into /usr/lib/systemd/system/gnunet.service
+[Unit]
+Description=GNUnet system service
+After=network.target
+
+[Service]
+Type=simple
+User=gnunet
+ExecStart=/usr/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf
+StateDirectory=gnunet
+StateDirectoryMode=0700
+
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/packages/guix/guix.README b/contrib/packages/guix/guix.README
new file mode 100644
index 000000000..1e8bd3126
--- /dev/null
+++ b/contrib/packages/guix/guix.README
@@ -0,0 +1,29 @@
+guix.scm contains Guix package definitions that can be used to
+override the ones found in Guix's GNU distribution.
+
+Guix packagers are encouraged to adopt and adjust these definitions.
+
+GNUnet developers can use this for easily setting up a development or
+test environment using Guix.
+
+When using the package definition for building a package this will
+pick up the current development code. The version of the resulting
+package is the output of 'git describe --tags'.
+
+To make guix build the development package defined here, use the
+following command:
+
+  guix build -f <gnunet.git>/contrib/guix
+
+To spawn a (development) environment with GNUnet's dependencies
+installed, run:
+
+  guix environment --load-path=<gnunet.git>/contrib/guix.scm
+
+To spawn a (test) environment with GNUnet available in this
+environment, run:
+
+  guix environment --load-path=<gnunet.git>/contrib/guix.scm --ad-hoc guix
+
+It is recommended to also pass the '--pure' option to guix, to make
+sure the environment is not polluted with existing packages.
diff --git a/contrib/packages/guix/guix.scm b/contrib/packages/guix/guix.scm
new file mode 100644
index 000000000..4376d1ef5
--- /dev/null
+++ b/contrib/packages/guix/guix.scm
@@ -0,0 +1,51 @@
+;;; guix.scm -- Guix package definition
+
+(use-modules
+  (guix git-download)
+  (guix download)
+  (guix packages)
+  (guix utils)
+  (guix gexp)
+  (gnu packages)
+  (gnu packages autotools)
+  (gnu packages gettext)
+  (gnu packages gnunet)
+  (gnu packages image)
+  (gnu packages texinfo)
+  (srfi srfi-1)
+  (ice-9 popen)
+  (ice-9 rdelim))
+
+(define %source-dir (dirname (dirname (current-filename))))
+
+(define %git-commit
+  (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ)))
+
+(define-public gnunet-git
+  (package
+    (inherit gnunet)
+    (name "gnunet")
+    (version (git-version (package-version gnunet) "HEAD" %git-commit))
+    (source (local-file %source-dir #:recursive? #t))
+    (inputs
+     `(("libjpeg" ,libjpeg)
+       ,@(package-inputs gnunet)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gnu-gettext)
+       ("libtool" ,libtool)
+       ("texinfo" ,texinfo)
+       ("which" ,(@ (gnu packages base) which))
+       ,@(package-native-inputs gnunet)))
+    (arguments
+     (substitute-keyword-arguments (package-arguments gnunet)
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (add-after 'unpack 'make-po-directory-writable
+             (lambda _
+               (for-each make-file-writable
+                         (find-files "po" "."))
+               #t))))))))
+
+gnunet-git