Dependencies and configuration

3 files changed, 25 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a9a3a6dc2b3..6719ad0cfbe8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = gnunet
 	pkgdesc = A framework for secure peer-to-peer networking
 	pkgver = 0.15.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://gnunet.org
 	install = gnunet.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = gettext
 	makedepends = pkgconfig
 	makedepends = libtool
 	makedepends = bluez-libs
@@ -31,6 +30,7 @@ pkgbase = gnunet
 	depends = openssl
 	depends = libextractor
 	depends = brotli
+	depends = gettext
 	optdepends = bluez: for bluetooth transport
 	optdepends = libzbar: for reading/writing GNUnet URIs from/to QR codes using gnunet-qr
 	optdepends = texlive-core: for generating GNS business cards via gnunet-bcd
@@ -43,13 +43,13 @@ pkgbase = gnunet
 	conflicts = gnunet-git
 	conflicts = gnunet-bin
 	options = !makeflags
-	backup = etc/gnunetd.conf
+	backup = etc/gnunet.conf
 	source = http://ftpmirror.gnu.org/gnunet/gnunet-0.15.0.tar.gz
 	source = http://ftpmirror.gnu.org/gnunet/gnunet-0.15.0.tar.gz.sig
 	source = gnunet.service
 	source = gnunet.sysusers
 	source = gnunet.tmpfiles
-	source = gnunetd.conf
+	source = gnunet.conf
 	validpgpkeys = 19647543F7861D3BF4E64FF7BF60708B48426C7E
 	validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A
 	sha256sums = cca23d6fb40890a5eb2ccae4b8f7e74c8e4e84d3fca2f419d775cb4a58dd9a67
@@ -57,6 +57,6 @@ pkgbase = gnunet
 	sha256sums = 2fb156b5bda51ef7c0659ca19113e7c8cd651637ffb379264e2b61f65be367d1
 	sha256sums = 65daa9fb07bdc8b8a11ca06f320b94ce6cfcc9681c6693ac655ca54881645a39
 	sha256sums = 4832e45c02ad768a713ca7f2a04b58794e268a49130b5b8ab6b91917e3d4f945
-	sha256sums = 582c617cfcb0b28e28c8ab42925307f79cf147f3231a9782c46893383c31b19e
+	sha256sums = 6453b443ff660e5dd1bdcb6afcd4fc781ca128263faeda9cb50101911a0779d2
 
 pkgname = gnunet
diff --git a/PKGBUILD b/PKGBUILD
index d010c6e570e4..d14c6e39536f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname='gnunet'
 pkgver='0.15.0'
-pkgrel=3
+pkgrel=4
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
@@ -14,8 +14,8 @@ license=('GPL')
 conflicts=("${pkgname}-git" "${pkgname}-bin")
 depends=('bash' 'which' 'gnutls' 'gnurl' 'libgcrypt' 'libunistring' 'libidn2'
 	'libmicrohttpd' 'jansson' 'nss' 'libtool' 'sqlite' 'zlib' 'libsodium'
-	'openssl' 'libextractor' 'brotli')
-makedepends=('gettext' 'pkgconfig' 'libtool' 'bluez-libs' 'python' 'libpulse'
+	'openssl' 'libextractor' 'brotli' 'gettext')
+makedepends=('pkgconfig' 'libtool' 'bluez-libs' 'python' 'libpulse'
              'opus')
 optdepends=('bluez: for bluetooth transport'
             'libzbar: for reading/writing GNUnet URIs from/to QR codes using gnunet-qr'
@@ -26,13 +26,13 @@ optdepends=('bluez: for bluetooth transport'
             'pbc: for Attribute-Based Encryption (experimental)'
             'libgabe: for Attribute-Based Encryption (experimental)'
             'libpabc: for re:claimID zero-knowledge privacy credentials')
-backup=('etc/gnunetd.conf')
+backup=("etc/${pkgname}.conf")
 options=('!makeflags')
 source=("http://ftpmirror.gnu.org/gnunet/${pkgname}-${pkgver}.tar.gz"{,.sig}
         "${pkgname}.service"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        'gnunetd.conf')
+        "${pkgname}.conf")
 install="${pkgname}.install"
 validpgpkeys=('19647543F7861D3BF4E64FF7BF60708B48426C7E'
               '3D11063C10F98D14BD24D1470B0998EF86F59B6A')
@@ -41,7 +41,7 @@ sha256sums=('cca23d6fb40890a5eb2ccae4b8f7e74c8e4e84d3fca2f419d775cb4a58dd9a67'
             '2fb156b5bda51ef7c0659ca19113e7c8cd651637ffb379264e2b61f65be367d1'
             '65daa9fb07bdc8b8a11ca06f320b94ce6cfcc9681c6693ac655ca54881645a39'
             '4832e45c02ad768a713ca7f2a04b58794e268a49130b5b8ab6b91917e3d4f945'
-            '582c617cfcb0b28e28c8ab42925307f79cf147f3231a9782c46893383c31b19e')
+            '6453b443ff660e5dd1bdcb6afcd4fc781ca128263faeda9cb50101911a0779d2')
 
 prepare() {
 
@@ -72,7 +72,7 @@ package() {
 	# rm -rf "${pkgdir}/usr/include/libltdl" "${pkgdir}"/usr/lib/libltdl.* "${pkgdir}/usr/include/ltdl.h"
 
 	install -dm755 "${pkgdir}/etc"
-	install -Dm644 "${srcdir}/gnunetd.conf" "${pkgdir}/etc/gnunetd.conf"
+	install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/etc/${pkgname}.conf"
 
 	install -dm755 "${pkgdir}/usr/lib/systemd/system"
 	install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
diff --git a/gnunetd.conf b/gnunet.conf
index bb419343320d..91823edb23b6 100644
--- a/gnunetd.conf
+++ b/gnunet.conf
@@ -1,10 +1,18 @@
 [PATHS]
-SERVICEHOME = ~/.gnunet/
-# SERVICEHOME = /var/lib/gnunet/
 # DEFAULTCONFIG = /etc/gnunet.conf
 # If 'DEFAULTCONFIG' is not defined, the current
 # configuration file is assumed to be the default,
 # which is what we want by default...
+SERVICEHOME = /var/lib/gnunet/
+# SERVICEHOME = ~/.gnunet/
+LIBEXECDIR = /usr/lib/gnunet/libexec/
+DOCDIR = /usr/share/doc/gnunet/
+ICONDIR = /usr/share/icons/
+LOCALEDIR = /usr/share/locale/
+PREFIX = /usr/
+BINDIR = /usr/bin/
+LIBDIR = /usr/lib/gnunet/
+DATADIR = /usr/share/gnunet/
 
 [gnunetd]
 HOSTKEY = $SERVICEHOME/.hostkey
@@ -27,6 +35,8 @@ HOME = $SERVICEHOME
 [nat]
 # Are we behind NAT?
 BEHIND_NAT = NO
+ENABLE_UPNP = YES
+DISABLEV6 = YES
 
 # Is the NAT hole-punched?
 PUNCHED_NAT = NO
@@ -127,7 +137,7 @@ CONFIG = $DEFAULTCONFIG
 BINARY = gnunet-service-arm
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist
+DEFAULTSERVICES = topology hostlist fs
 UNIXPATH = /tmp/gnunet-service-arm.sock
 UNIX_MATCH_UID = YES
 UNIX_MATCH_GID = YES