Removed `$conflicts` variable; used `gnunet.tmpfiles` for managing permissions; removed `gnunet.install` file

4 files changed, 9 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 464ea610fb5a..84837117c42a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = gnunet
 	pkgdesc = A framework for secure peer-to-peer networking
 	pkgver = 0.15.0
-	pkgrel = 6
+	pkgrel = 7
 	url = http://gnunet.org
-	install = gnunet.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -40,8 +39,6 @@ pkgbase = gnunet
 	optdepends = pbc: for Attribute-Based Encryption (experimental)
 	optdepends = libgabe: for Attribute-Based Encryption (experimental)
 	optdepends = libpabc: for re:claimID zero-knowledge privacy credentials
-	conflicts = gnunet-git
-	conflicts = gnunet-bin
 	options = !makeflags
 	backup = etc/gnunet.conf
 	source = http://ftpmirror.gnu.org/gnunet/gnunet-0.15.0.tar.gz
@@ -56,7 +53,7 @@ pkgbase = gnunet
 	sha256sums = SKIP
 	sha256sums = 577a6fd803d7f2a00380a200778dc0515efb26011e5b8ea4888554e7216a9042
 	sha256sums = 65daa9fb07bdc8b8a11ca06f320b94ce6cfcc9681c6693ac655ca54881645a39
-	sha256sums = 4832e45c02ad768a713ca7f2a04b58794e268a49130b5b8ab6b91917e3d4f945
+	sha256sums = aa82707160c57e77ab3c426d16177283eb8d0bc018c04dcba3db689e6bea835f
 	sha256sums = 434d2389264ffdb524147679d5b8a27a568521be4945fb08455c8fcdb8dac0ae
 
 pkgname = gnunet
diff --git a/PKGBUILD b/PKGBUILD
index b9243c97a7c3..35c37f078f1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,12 +6,11 @@
 
 pkgname='gnunet'
 pkgver='0.15.0'
-pkgrel=6
+pkgrel=7
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
 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' 'gettext')
@@ -33,14 +32,13 @@ source=("http://ftpmirror.gnu.org/gnunet/${pkgname}-${pkgver}.tar.gz"{,.sig}
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
         "${pkgname}.conf")
-install="${pkgname}.install"
 validpgpkeys=('19647543F7861D3BF4E64FF7BF60708B48426C7E'
               '3D11063C10F98D14BD24D1470B0998EF86F59B6A')
 sha256sums=('cca23d6fb40890a5eb2ccae4b8f7e74c8e4e84d3fca2f419d775cb4a58dd9a67'
             'SKIP'
             '577a6fd803d7f2a00380a200778dc0515efb26011e5b8ea4888554e7216a9042'
             '65daa9fb07bdc8b8a11ca06f320b94ce6cfcc9681c6693ac655ca54881645a39'
-            '4832e45c02ad768a713ca7f2a04b58794e268a49130b5b8ab6b91917e3d4f945'
+            'aa82707160c57e77ab3c426d16177283eb8d0bc018c04dcba3db689e6bea835f'
             '434d2389264ffdb524147679d5b8a27a568521be4945fb08455c8fcdb8dac0ae')
 
 prepare() {
diff --git a/gnunet.install b/gnunet.install
deleted file mode 100644
index feb95762e093..000000000000
--- a/gnunet.install
+++ /dev/null
@@ -1,40 +0,0 @@
-_gnunet_setuid() {
-	getent group gnunetdns > /dev/null || groupadd -r gnunetdns
-	getent passwd gnunet > /dev/null || useradd -r -U -l -d /var/lib/gnunet -s /bin/sh -c "GNUnet" gnunet
-	local GNUNETDNS_GROUP="$(getent group gnunetdns | cut -d: -f3)"
-	chown root:root /usr/lib/gnunet/libexec/gnunet-helper-vpn
-	chmod u+s /usr/lib/gnunet/libexec/gnunet-helper-vpn
-	# chown root:root /usr/lib/gnunet/libexec/gnunet-helper-transport-wlan
-	# chmod u+s /usr/lib/gnunet/libexec/gnunet-helper-transport-wlan
-	# chown root:root /usr/lib/gnunet/libexec/gnunet-helper-transport-bluetooth
-	# chmod u+s /usr/lib/gnunet/libexec/gnunet-helper-transport-bluetooth
-	chown root /usr/lib/gnunet/libexec/gnunet-helper-dns
-	chgrp "${GNUNETDNS_GROUP}" /usr/lib/gnunet/libexec/gnunet-helper-dns
-	chmod 4750 /usr/lib/gnunet/libexec/gnunet-helper-dns
-	chgrp "${GNUNETDNS_GROUP}" /usr/lib/gnunet/libexec/gnunet-helper-dns
-	chown gnunet:"${GNUNETDNS_GROUP}" /usr/lib/gnunet/libexec/gnunet-helper-dns
-	chmod 2750 /usr/lib/gnunet/libexec/gnunet-helper-dns
-	chown root:root /usr/lib/gnunet/libexec/gnunet-helper-exit
-	chmod u+s /usr/lib/gnunet/libexec/gnunet-helper-exit
-	chown root:root /usr/lib/gnunet/libexec/gnunet-helper-nat-server
-	chown root:root /usr/lib/gnunet/libexec/gnunet-helper-nat-client
-	chmod u+s /usr/lib/gnunet/libexec/gnunet-helper-nat-server
-	chmod u+s /usr/lib/gnunet/libexec/gnunet-helper-nat-client
-}
-
-post_install() {
-	echo '  -> Setting `setuid` permissions...'
-	_gnunet_setuid
-}
-
-post_upgrade() {
-	echo '  -> Updating `setuid` permissions...'
-	_gnunet_setuid
-}
-
-post_remove() {
-	getent passwd gnunet > /dev/null && userdel gnunet
-	getent group gnunet > /dev/null && groupdel gnunet
-	getent group gnunetdns > /dev/null && groupdel gnunetdns
-}
-
diff --git a/gnunet.tmpfiles b/gnunet.tmpfiles
index 981e940f256b..b7d7cc396402 100644
--- a/gnunet.tmpfiles
+++ b/gnunet.tmpfiles
@@ -1 +1,5 @@
-Z /var/lib/gnunet - gnunet gnunet - -
+Z /var/lib/gnunet 0700 gnunet gnunet - -
+z /usr/lib/gnunet/gnunet-helper-dns 2750 gnunet gnunetdns - -
+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 - -