Enabled experimental features

3 files changed, 12 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 362a867429c0..2e818ad6a243 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnunet
 	pkgdesc = A framework for secure peer-to-peer networking
 	pkgver = 0.15.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gnunet.org
 	arch = i686
 	arch = x86_64
@@ -55,6 +55,6 @@ pkgbase = gnunet
 	sha256sums = ef221a4cbdc2270d7a1b1447e6e8a498653ec16d2f73fa57a7c6888980af4dfb
 	sha256sums = 13760ecc1523a9acd030df34e6a90edcd2971271766c8e159c9e66341a9168c4
 	sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755
-	sha256sums = 4e3f8015dcc83ea4efb913abb9eb7d8d15ba3a5834218634ee2f350b903ef77b
+	sha256sums = e6db3d48757ee4a95970cc63606e5da86a01776a2c6ffddb8a099dde8bf20f63
 
 pkgname = gnunet
diff --git a/PKGBUILD b/PKGBUILD
index d9ba6004c9f1..783f57ad39ff 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,17 +6,16 @@
 
 pkgname='gnunet'
 pkgver='0.15.2'
-pkgrel=1
+pkgrel=2
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
 license=('AGPL')
 conflicts=("${pkgname}-git" "${pkgname}-bin")
 depends=('bash' 'which' 'gnutls' 'gnurl' 'libgcrypt' 'libunistring' 'libidn2'
-	'libmicrohttpd' 'jansson' 'nss' 'libtool' 'sqlite' 'zlib' 'libsodium'
-	'openssl' 'libextractor' 'brotli' 'gettext')
-makedepends=('pkgconfig' 'libtool' 'bluez-libs' 'python' 'libpulse'
-             'opus')
+         'libmicrohttpd' 'jansson' 'nss' 'libtool' 'sqlite' 'zlib' 'libsodium'
+         'openssl' 'libextractor' 'brotli' 'gettext')
+makedepends=('pkgconfig' 'libtool' 'bluez-libs' 'python' 'libpulse' 'opus')
 optdepends=('bluez: for bluetooth transport'
             'zbar: for reading/writing GNUnet URIs from/to QR codes using gnunet-qr'
             'texlive-core: for generating GNS business cards via gnunet-bcd'
@@ -39,7 +38,7 @@ sha256sums=('23e6af170bb47aacb15d27bbe244d871dbc4d0523b1139bd2f12f4b42b65102e'
             'ef221a4cbdc2270d7a1b1447e6e8a498653ec16d2f73fa57a7c6888980af4dfb'
             '13760ecc1523a9acd030df34e6a90edcd2971271766c8e159c9e66341a9168c4'
             '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755'
-            '4e3f8015dcc83ea4efb913abb9eb7d8d15ba3a5834218634ee2f350b903ef77b')
+            'e6db3d48757ee4a95970cc63606e5da86a01776a2c6ffddb8a099dde8bf20f63')
 
 prepare() {
 
@@ -53,7 +52,7 @@ build() {
 
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	test -f Makefile || ./configure --prefix='/usr'
+	./configure --prefix='/usr' --enable-experimental
 	make
 	make -C contrib
 
@@ -75,11 +74,6 @@ package() {
 	install -dm755 "${pkgdir}/usr/lib/sysusers.d"
 	install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 
-	# The current package cannot ship `gnunet-helper-transport-wlan` and
-	# `gnunet-helper-transport-bluetooth`, as these require root privileges
-	# during the build process. If these are built, please update the
-	# "${pkgname}.tmpfiles" file accordingly
-
 	install -dm755 "${pkgdir}/usr/lib/tmpfiles.d"
 	install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 
@@ -94,7 +88,7 @@ package() {
 	{
 		echo "# /etc/${pkgname}.conf"
 		(cd "${pkgdir}" > /dev/null 2>&1 && find "usr/share/${pkgname}/config.d" -type f -name '*.conf' \
-			-printf '\n\n# The following lines have been copied from /%p\n\n' \
+			-printf '\n\n# For the default values of the the following lines please refer to\n# /%p\n\n' \
 			-exec cat '{}' ';')
 	} > "${pkgdir}/etc/${pkgname}.conf"
 
diff --git a/gnunet.tmpfiles b/gnunet.tmpfiles
index fb1970ac481b..c10be2b366ef 100644
--- a/gnunet.tmpfiles
+++ b/gnunet.tmpfiles
@@ -1,14 +1,8 @@
 d /var/lib/gnunet 0700 gnunet gnunet - -
-z /usr/lib/gnunet/libexec/gnunet-helper-vpn 4750 root root - -
-
-# The current Arch Linux package cannot ship `gnunet-helper-transport-wlan` and
-# `gnunet-helper-transport-bluetooth`, as these require root privileges during
-# the build process. If these are built, uncomment the following lines:
-#
-# z /usr/lib/gnunet/libexec/gnunet-helper-transport-wlan 4750 root root - -
-# z /usr/lib/gnunet/libexec/gnunet-helper-transport-bluetooth 4750 root root - -
-
 z /usr/lib/gnunet/gnunet-helper-dns 2750 gnunet gnunetdns - -
+z /usr/lib/gnunet/libexec/gnunet-helper-vpn 4750 root root - -
+z /usr/lib/gnunet/libexec/gnunet-helper-transport-wlan 4750 root root - -
+z /usr/lib/gnunet/libexec/gnunet-helper-transport-bluetooth 4750 root root - -
 z /usr/lib/gnunet/libexec/gnunet-helper-exit 4750 root root - -
 z /usr/lib/gnunet/libexec/gnunet-helper-nat-server 4750 root root - -
 z /usr/lib/gnunet/libexec/gnunet-helper-nat-client 4750 root root - -