diff options
Diffstat (limited to 'contrib/packages')
-rw-r--r-- | contrib/packages/arch/gnunet-git/.SRCINFO | 6 | ||||
-rw-r--r-- | contrib/packages/arch/gnunet-git/PKGBUILD | 4 | ||||
-rw-r--r-- | contrib/packages/arch/gnunet/.SRCINFO | 10 | ||||
-rw-r--r-- | contrib/packages/arch/gnunet/PKGBUILD | 6 | ||||
-rw-r--r-- | contrib/packages/fedora/10-dns2gns.sh | 43 | ||||
-rw-r--r-- | contrib/packages/fedora/gnunet-system.conf | 12 | ||||
-rw-r--r-- | contrib/packages/fedora/gnunet-user.service | 11 | ||||
-rw-r--r-- | contrib/packages/fedora/gnunet.service | 14 | ||||
-rw-r--r-- | contrib/packages/guix/guix.README | 29 | ||||
-rw-r--r-- | contrib/packages/guix/guix.scm | 51 |
10 files changed, 173 insertions, 13 deletions
diff --git a/contrib/packages/arch/gnunet-git/.SRCINFO b/contrib/packages/arch/gnunet-git/.SRCINFO index 82a649530..682e69576 100644 --- a/contrib/packages/arch/gnunet-git/.SRCINFO +++ b/contrib/packages/arch/gnunet-git/.SRCINFO | |||
@@ -1,8 +1,8 @@ | |||
1 | # Generated by makepkg 6.0.1 | 1 | # Generated by makepkg 6.0.1 |
2 | # Fri Aug 5 01:36:05 UTC 2022 | 2 | # Mon Sep 26 21:21:28 UTC 2022 |
3 | pkgbase = gnunet-git | 3 | pkgbase = gnunet-git |
4 | pkgdesc = A framework for secure peer-to-peer networking | 4 | pkgdesc = A framework for secure peer-to-peer networking |
5 | pkgver = 0.17.2.r20.g0780c69e9 | 5 | pkgver = 0.17.6.r4.g7bf2f8f59 |
6 | pkgrel = 1 | 6 | pkgrel = 1 |
7 | url = http://gnunet.org | 7 | url = http://gnunet.org |
8 | install = gnunet.install | 8 | install = gnunet.install |
@@ -23,10 +23,10 @@ pkgbase = gnunet-git | |||
23 | makedepends = recutils | 23 | makedepends = recutils |
24 | depends = brotli | 24 | depends = brotli |
25 | depends = gettext | 25 | depends = gettext |
26 | depends = gnurl | ||
27 | depends = gnutls | 26 | depends = gnutls |
28 | depends = iptables | 27 | depends = iptables |
29 | depends = jansson | 28 | depends = jansson |
29 | depends = libcurl-gnutls | ||
30 | depends = libextractor | 30 | depends = libextractor |
31 | depends = libgcrypt | 31 | depends = libgcrypt |
32 | depends = libidn2 | 32 | depends = libidn2 |
diff --git a/contrib/packages/arch/gnunet-git/PKGBUILD b/contrib/packages/arch/gnunet-git/PKGBUILD index c0fed77e5..17d7e057f 100644 --- a/contrib/packages/arch/gnunet-git/PKGBUILD +++ b/contrib/packages/arch/gnunet-git/PKGBUILD | |||
@@ -6,7 +6,7 @@ | |||
6 | 6 | ||
7 | _appname='gnunet' | 7 | _appname='gnunet' |
8 | pkgname="${_appname}-git" | 8 | pkgname="${_appname}-git" |
9 | pkgver=0.17.2.r20.g0780c69e9 | 9 | pkgver=0.17.6.r4.g7bf2f8f59 |
10 | pkgrel=1 | 10 | pkgrel=1 |
11 | pkgdesc='A framework for secure peer-to-peer networking' | 11 | pkgdesc='A framework for secure peer-to-peer networking' |
12 | arch=('i686' 'x86_64') | 12 | arch=('i686' 'x86_64') |
@@ -14,7 +14,7 @@ url="http://${_appname}.org" | |||
14 | license=('AGPL') | 14 | license=('AGPL') |
15 | conflicts=("${_appname}" "${_appname}-bin") | 15 | conflicts=("${_appname}" "${_appname}-bin") |
16 | provides=("${_appname}") | 16 | provides=("${_appname}") |
17 | depends=('brotli' 'gettext' 'gnurl' 'gnutls' 'iptables' 'jansson' | 17 | depends=('brotli' 'gettext' 'gnutls' 'iptables' 'jansson' 'libcurl-gnutls' |
18 | 'libextractor' 'libgcrypt' 'libidn2' 'libmicrohttpd' 'libsodium' | 18 | 'libextractor' 'libgcrypt' 'libidn2' 'libmicrohttpd' 'libsodium' |
19 | 'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which' | 19 | 'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which' |
20 | 'zlib') | 20 | 'zlib') |
diff --git a/contrib/packages/arch/gnunet/.SRCINFO b/contrib/packages/arch/gnunet/.SRCINFO index deb93d6ad..19df8d63f 100644 --- a/contrib/packages/arch/gnunet/.SRCINFO +++ b/contrib/packages/arch/gnunet/.SRCINFO | |||
@@ -1,6 +1,6 @@ | |||
1 | pkgbase = gnunet | 1 | pkgbase = gnunet |
2 | pkgdesc = A framework for secure peer-to-peer networking | 2 | pkgdesc = A framework for secure peer-to-peer networking |
3 | pkgver = 0.17.3 | 3 | pkgver = 0.17.6 |
4 | pkgrel = 1 | 4 | pkgrel = 1 |
5 | url = http://gnunet.org | 5 | url = http://gnunet.org |
6 | install = gnunet.install | 6 | install = gnunet.install |
@@ -18,10 +18,10 @@ pkgbase = gnunet | |||
18 | makedepends = python-sphinx_rtd_theme | 18 | makedepends = python-sphinx_rtd_theme |
19 | depends = brotli | 19 | depends = brotli |
20 | depends = gettext | 20 | depends = gettext |
21 | depends = gnurl | ||
22 | depends = gnutls | 21 | depends = gnutls |
23 | depends = iptables | 22 | depends = iptables |
24 | depends = jansson | 23 | depends = jansson |
24 | depends = libcurl-gnutls | ||
25 | depends = libextractor | 25 | depends = libextractor |
26 | depends = libgcrypt | 26 | depends = libgcrypt |
27 | depends = libidn2 | 27 | depends = libidn2 |
@@ -52,15 +52,15 @@ pkgbase = gnunet | |||
52 | conflicts = gnunet-git | 52 | conflicts = gnunet-git |
53 | conflicts = gnunet-bin | 53 | conflicts = gnunet-bin |
54 | backup = etc/gnunet.conf | 54 | backup = etc/gnunet.conf |
55 | source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.3.tar.gz | 55 | source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.6.tar.gz |
56 | source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.3.tar.gz.sig | 56 | source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.6.tar.gz.sig |
57 | source = gnunet-system.service | 57 | source = gnunet-system.service |
58 | source = gnunet.sysusers | 58 | source = gnunet.sysusers |
59 | source = gnunet.tmpfiles | 59 | source = gnunet.tmpfiles |
60 | source = gnunet-user.conf | 60 | source = gnunet-user.conf |
61 | source = gnunet-user.service | 61 | source = gnunet-user.service |
62 | validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A | 62 | validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A |
63 | sha256sums = 74c767b8d0c34f60ddfa4e77a1657365d34c484b5ffaeb3796e3f520a9d50c9e | 63 | sha256sums = 249358ef3b10ce99810781fedaec526a6eab943c120e4bba096aedf91c1afc40 |
64 | sha256sums = SKIP | 64 | sha256sums = SKIP |
65 | sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262 | 65 | sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262 |
66 | sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755 | 66 | sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755 |
diff --git a/contrib/packages/arch/gnunet/PKGBUILD b/contrib/packages/arch/gnunet/PKGBUILD index d04989715..1cef4dcec 100644 --- a/contrib/packages/arch/gnunet/PKGBUILD +++ b/contrib/packages/arch/gnunet/PKGBUILD | |||
@@ -5,14 +5,14 @@ | |||
5 | # Contributor: wahnby <wahnby AT yahoo DOT fr> | 5 | # Contributor: wahnby <wahnby AT yahoo DOT fr> |
6 | 6 | ||
7 | pkgname='gnunet' | 7 | pkgname='gnunet' |
8 | pkgver='0.17.3' | 8 | pkgver='0.17.6' |
9 | pkgrel=1 | 9 | pkgrel=1 |
10 | pkgdesc='A framework for secure peer-to-peer networking' | 10 | pkgdesc='A framework for secure peer-to-peer networking' |
11 | arch=('i686' 'x86_64') | 11 | arch=('i686' 'x86_64') |
12 | url="http://${pkgname}.org" | 12 | url="http://${pkgname}.org" |
13 | license=('AGPL') | 13 | license=('AGPL') |
14 | conflicts=("${pkgname}-git" "${pkgname}-bin") | 14 | conflicts=("${pkgname}-git" "${pkgname}-bin") |
15 | depends=('brotli' 'gettext' 'gnurl' 'gnutls' 'iptables' 'jansson' | 15 | depends=('brotli' 'gettext' 'gnutls' 'iptables' 'jansson' 'libcurl-gnutls' |
16 | 'libextractor' 'libgcrypt' 'libidn2' 'libmicrohttpd' 'libsodium' | 16 | 'libextractor' 'libgcrypt' 'libidn2' 'libmicrohttpd' 'libsodium' |
17 | 'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which' | 17 | 'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which' |
18 | 'zlib') | 18 | 'zlib') |
@@ -41,7 +41,7 @@ source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} | |||
41 | "${pkgname}-user.service") | 41 | "${pkgname}-user.service") |
42 | install="${pkgname}.install" | 42 | install="${pkgname}.install" |
43 | validpgpkeys=('3D11063C10F98D14BD24D1470B0998EF86F59B6A') | 43 | validpgpkeys=('3D11063C10F98D14BD24D1470B0998EF86F59B6A') |
44 | sha256sums=('74c767b8d0c34f60ddfa4e77a1657365d34c484b5ffaeb3796e3f520a9d50c9e' | 44 | sha256sums=('249358ef3b10ce99810781fedaec526a6eab943c120e4bba096aedf91c1afc40' |
45 | 'SKIP' | 45 | 'SKIP' |
46 | '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262' | 46 | '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262' |
47 | '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755' | 47 | '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755' |
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 @@ | |||
1 | #!/bin/bash | ||
2 | interface=$1 | ||
3 | status=$2 | ||
4 | |||
5 | do_it=$(gnunet-config -s dns2gns -o ENABLE_RESOLVECTL_NMDISPATCHER -c /etc/gnunet.conf) | ||
6 | if [ $? != 0 ]; then | ||
7 | exit 1 | ||
8 | fi | ||
9 | if [ $do_it = "NO" ]; then | ||
10 | echo "Setting DNS2GNS through resolvectl disabled." | ||
11 | exit 1 | ||
12 | fi | ||
13 | |||
14 | case $status in | ||
15 | up) | ||
16 | if nc -u -z 127.0.0.1 5353; then | ||
17 | # Note: We add quad 9 as a fallback in case our service is down. | ||
18 | dns2gns=$(gnunet-config -s dns2gns -o BIND_TO) | ||
19 | if [ $? != 0 ]; then | ||
20 | exit 1 | ||
21 | fi | ||
22 | dns2gns6=$(gnunet-config -s dns2gns -o BIND_TO6) | ||
23 | if [ $? != 0 ]; then | ||
24 | exit 1 | ||
25 | fi | ||
26 | port=$(gnunet-config -s dns2gns -o PORT) | ||
27 | if [ $? != 0 ]; then | ||
28 | exit 1 | ||
29 | fi | ||
30 | olddns=$(resolvectl status $interface | grep "DNS Servers" | cut -d':' -f2-) | ||
31 | if [ $? == 0 ]; then | ||
32 | #echo "Setting to $dns2gns:$port [$dns2gns6]:$port $olddns 9.9.9.9" | ||
33 | #resolvectl dns $interface $dns2gns:$port [$dns2gns6]:$port $olddns 9.9.9.9 | ||
34 | echo "Setting to $dns2gns:$port [$dns2gns6]:$port" | ||
35 | resolvectl dns $interface $dns2gns:$port [$dns2gns6]:$port | ||
36 | else | ||
37 | exit 1 | ||
38 | fi | ||
39 | fi | ||
40 | ;; | ||
41 | down) | ||
42 | ;; | ||
43 | 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 @@ | |||
1 | [path] | ||
2 | GNUNET_HOME = /var/lib/gnunet/ | ||
3 | GNUNET_DATA_HOME = /var/lib/gnunet/data/ | ||
4 | GNUNET_RUNTIME_DIR = /var/run/gnunet/ | ||
5 | |||
6 | [arm] | ||
7 | START_SYSTEM_SERVICES = YES | ||
8 | START_USER_SERVICES = NO | ||
9 | OPTIONS = -l /var/log/gnunet.log | ||
10 | |||
11 | [dns2gns] | ||
12 | 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 @@ | |||
1 | # Typically to be place into /usr/lib/systemd/user/gnunet.service | ||
2 | [Unit] | ||
3 | Description=GNUnet user service | ||
4 | After=network.target | ||
5 | |||
6 | [Service] | ||
7 | Type=simple | ||
8 | ExecStart=/usr/lib/gnunet/libexec/gnunet-service-arm -c ~/.config/gnunet.conf | ||
9 | |||
10 | [Install] | ||
11 | 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 @@ | |||
1 | # Typically placed into /usr/lib/systemd/system/gnunet.service | ||
2 | [Unit] | ||
3 | Description=GNUnet system service | ||
4 | After=network.target | ||
5 | |||
6 | [Service] | ||
7 | Type=simple | ||
8 | User=gnunet | ||
9 | ExecStart=/usr/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf | ||
10 | StateDirectory=gnunet | ||
11 | StateDirectoryMode=0700 | ||
12 | |||
13 | [Install] | ||
14 | 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 @@ | |||
1 | guix.scm contains Guix package definitions that can be used to | ||
2 | override the ones found in Guix's GNU distribution. | ||
3 | |||
4 | Guix packagers are encouraged to adopt and adjust these definitions. | ||
5 | |||
6 | GNUnet developers can use this for easily setting up a development or | ||
7 | test environment using Guix. | ||
8 | |||
9 | When using the package definition for building a package this will | ||
10 | pick up the current development code. The version of the resulting | ||
11 | package is the output of 'git describe --tags'. | ||
12 | |||
13 | To make guix build the development package defined here, use the | ||
14 | following command: | ||
15 | |||
16 | guix build -f <gnunet.git>/contrib/guix | ||
17 | |||
18 | To spawn a (development) environment with GNUnet's dependencies | ||
19 | installed, run: | ||
20 | |||
21 | guix environment --load-path=<gnunet.git>/contrib/guix.scm | ||
22 | |||
23 | To spawn a (test) environment with GNUnet available in this | ||
24 | environment, run: | ||
25 | |||
26 | guix environment --load-path=<gnunet.git>/contrib/guix.scm --ad-hoc guix | ||
27 | |||
28 | It is recommended to also pass the '--pure' option to guix, to make | ||
29 | 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 @@ | |||
1 | ;;; guix.scm -- Guix package definition | ||
2 | |||
3 | (use-modules | ||
4 | (guix git-download) | ||
5 | (guix download) | ||
6 | (guix packages) | ||
7 | (guix utils) | ||
8 | (guix gexp) | ||
9 | (gnu packages) | ||
10 | (gnu packages autotools) | ||
11 | (gnu packages gettext) | ||
12 | (gnu packages gnunet) | ||
13 | (gnu packages image) | ||
14 | (gnu packages texinfo) | ||
15 | (srfi srfi-1) | ||
16 | (ice-9 popen) | ||
17 | (ice-9 rdelim)) | ||
18 | |||
19 | (define %source-dir (dirname (dirname (current-filename)))) | ||
20 | |||
21 | (define %git-commit | ||
22 | (read-string (open-pipe "git show HEAD | head -1 | cut -d ' ' -f 2" OPEN_READ))) | ||
23 | |||
24 | (define-public gnunet-git | ||
25 | (package | ||
26 | (inherit gnunet) | ||
27 | (name "gnunet") | ||
28 | (version (git-version (package-version gnunet) "HEAD" %git-commit)) | ||
29 | (source (local-file %source-dir #:recursive? #t)) | ||
30 | (inputs | ||
31 | `(("libjpeg" ,libjpeg) | ||
32 | ,@(package-inputs gnunet))) | ||
33 | (native-inputs | ||
34 | `(("autoconf" ,autoconf) | ||
35 | ("automake" ,automake) | ||
36 | ("gettext" ,gnu-gettext) | ||
37 | ("libtool" ,libtool) | ||
38 | ("texinfo" ,texinfo) | ||
39 | ("which" ,(@ (gnu packages base) which)) | ||
40 | ,@(package-native-inputs gnunet))) | ||
41 | (arguments | ||
42 | (substitute-keyword-arguments (package-arguments gnunet) | ||
43 | ((#:phases phases) | ||
44 | `(modify-phases ,phases | ||
45 | (add-after 'unpack 'make-po-directory-writable | ||
46 | (lambda _ | ||
47 | (for-each make-file-writable | ||
48 | (find-files "po" ".")) | ||
49 | #t)))))))) | ||
50 | |||
51 | gnunet-git | ||