diff options
author | ng0 <ng0@n0.is> | 2019-10-26 13:35:48 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-10-26 13:35:48 +0000 |
commit | 855fbf5b9db9ff680c15e6fd21382c4d7afffc84 (patch) | |
tree | 188a133d55e2f22c827bcc70dda14b0cd32f98f0 | |
parent | 6ea27c7f49a1368caae113d148b821fd22f380b7 (diff) | |
parent | 5a71ae7aa440f3aa7ca490b7c72bca7982f38348 (diff) | |
download | gnunet-855fbf5b9db9ff680c15e6fd21382c4d7afffc84.tar.gz gnunet-855fbf5b9db9ff680c15e6fd21382c4d7afffc84.zip |
Merge branch 'master' of gnunet.org:gnunet
-rw-r--r-- | contrib/packages/alpine/gnunet-gtk/APKBUILD | 4 | ||||
-rw-r--r-- | contrib/packages/alpine/gnunet/APKBUILD | 13 | ||||
-rw-r--r-- | contrib/packages/alpine/gnunet/gnunet-user-services.initd | 8 | ||||
-rw-r--r-- | contrib/packages/alpine/gnunet/gnunet.post-deinstall | 6 | ||||
-rw-r--r-- | contrib/packages/alpine/gnunet/gnunet.xsession | 10 | ||||
-rw-r--r-- | contrib/packages/alpine/gnurl/APKBUILD | 3 |
6 files changed, 14 insertions, 30 deletions
diff --git a/contrib/packages/alpine/gnunet-gtk/APKBUILD b/contrib/packages/alpine/gnunet-gtk/APKBUILD index 75ccadbf0..8c72bdb6c 100644 --- a/contrib/packages/alpine/gnunet-gtk/APKBUILD +++ b/contrib/packages/alpine/gnunet-gtk/APKBUILD | |||
@@ -6,8 +6,7 @@ pkgrel=0 | |||
6 | pkgdesc="Graphical user interface for GNUnet" | 6 | pkgdesc="Graphical user interface for GNUnet" |
7 | url="https://gnunet.org" | 7 | url="https://gnunet.org" |
8 | arch="all" | 8 | arch="all" |
9 | license="GPL-3.0" | 9 | license="GPL-3.0-only" |
10 | depends="gnunet gtk+3.0 glade" | ||
11 | makedepends="gnunet-dev gtk+3.0-dev glade-dev" | 10 | makedepends="gnunet-dev gtk+3.0-dev glade-dev" |
12 | subpackages="$pkgname-dev $pkgname-doc" | 11 | subpackages="$pkgname-dev $pkgname-doc" |
13 | source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-gtk-$pkgver.tar.gz" | 12 | source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-gtk-$pkgver.tar.gz" |
@@ -28,7 +27,6 @@ build() { | |||
28 | 27 | ||
29 | check() { | 28 | check() { |
30 | make DESTDIR="$pkgdir" check | 29 | make DESTDIR="$pkgdir" check |
31 | exit 0 | ||
32 | } | 30 | } |
33 | 31 | ||
34 | package() { | 32 | package() { |
diff --git a/contrib/packages/alpine/gnunet/APKBUILD b/contrib/packages/alpine/gnunet/APKBUILD index da2b2dec4..b21c6241e 100644 --- a/contrib/packages/alpine/gnunet/APKBUILD +++ b/contrib/packages/alpine/gnunet/APKBUILD | |||
@@ -6,10 +6,8 @@ pkgrel=0 | |||
6 | pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking" | 6 | pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking" |
7 | url="https://gnunet.org" | 7 | url="https://gnunet.org" |
8 | arch="all" | 8 | arch="all" |
9 | license="AGPL-3.0" | 9 | license="AGPL-3.0-only" |
10 | depends="libgpg-error libgcrypt nettle unbound-libs gnutls gnutls-utils gnurl | 10 | depends="gnutls-utils bash which iptables coreutils" |
11 | libgnurl libmicrohttpd openssl libunistring libidn2 nss sqlite zlib | ||
12 | miniupnpc gmp gettext bash which iptables coreutils sudo" | ||
13 | depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev | 11 | depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev |
14 | gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev | 12 | gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev |
15 | nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext" | 13 | nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext" |
@@ -42,12 +40,11 @@ build() { | |||
42 | --mandir=/usr/share/man \ | 40 | --mandir=/usr/share/man \ |
43 | --localstatedir=/var \ | 41 | --localstatedir=/var \ |
44 | --enable-logging=verbose | 42 | --enable-logging=verbose |
45 | make | 43 | make -j 1 |
46 | } | 44 | } |
47 | 45 | ||
48 | check() { | 46 | check() { |
49 | make DESTDIR="$pkgdir" check | 47 | make DESTDIR="$pkgdir" check |
50 | exit 0 | ||
51 | } | 48 | } |
52 | 49 | ||
53 | package() { | 50 | package() { |
@@ -94,5 +91,5 @@ sha512sums="1c6ea2ac7280d2edb30df627b79e017d199e93cd3970ce49f3f049abfb1dddfed541 | |||
94 | a0f55413ed2c6edd6746a751d92ddac95ba70f20eefb07330817870d749456448f44bba95d245911a00f6078e0c2ac626004e3b764be5e5e049c00626c4c5ac0 gnunet-system.conf | 91 | a0f55413ed2c6edd6746a751d92ddac95ba70f20eefb07330817870d749456448f44bba95d245911a00f6078e0c2ac626004e3b764be5e5e049c00626c4c5ac0 gnunet-system.conf |
95 | b21112ff16aee771332aa9c33f55b0c7f46fe0266053543241e3efbe25dba56482c0e11112a192eefe59f1c74d2af5d7071b6a4e1e875cfc7e9d55b5fe8a0a33 gnunet-user.conf | 92 | b21112ff16aee771332aa9c33f55b0c7f46fe0266053543241e3efbe25dba56482c0e11112a192eefe59f1c74d2af5d7071b6a4e1e875cfc7e9d55b5fe8a0a33 gnunet-user.conf |
96 | 96ab78bb48d5fb10f0b34336ad05e73b543c4362c73436ef20b3bb83dff214e997acf38a2ea493b1901bdc37c8877d83cdaebd73a0e50831e2f23413c8edda76 gnunet-system-services.initd | 93 | 96ab78bb48d5fb10f0b34336ad05e73b543c4362c73436ef20b3bb83dff214e997acf38a2ea493b1901bdc37c8877d83cdaebd73a0e50831e2f23413c8edda76 gnunet-system-services.initd |
97 | f67252e18c5fd701338653efe4cc14caae9213c1955f690cddec9fd7ad31a22680e931fbe908a1c5a78dc05094e547b2279f9a488f2ed80cc169590ad5ffa064 gnunet-user-services.initd | 94 | 3dc88aaedc3886c0795bdb4c8e259125232ba10f2bc762216c341bb3240ef0855cba968799ba121304463a65e73ed0f62dec03759a2be478ec4ac086361b49ba gnunet-user-services.initd |
98 | 839a081aca19b863f378db980e6447ad30c6c0ee72fac6e11c65e57e86886d675ebc61069e17f696b6ca868e8ce259cabf80feb90b04b23f3da3c628f7beb915 gnunet.xsession" | 95 | 4fe1ed80cbaa4c140805bde2629fdb32b97f3273281ae7277c8988b4e490605652cdb9975fc1178169426f2279597c55f6e6b75b52315a426d78a1fedbb08401 gnunet.xsession" |
diff --git a/contrib/packages/alpine/gnunet/gnunet-user-services.initd b/contrib/packages/alpine/gnunet/gnunet-user-services.initd index 6c960944e..0d7a626e7 100644 --- a/contrib/packages/alpine/gnunet/gnunet-user-services.initd +++ b/contrib/packages/alpine/gnunet/gnunet-user-services.initd | |||
@@ -16,8 +16,8 @@ start() { | |||
16 | for user in $users; do | 16 | for user in $users; do |
17 | if test -z "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 | 17 | if test -z "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 |
18 | then | 18 | then |
19 | sudo -u $user gnunet-arm \ | 19 | su $user -c "gnunet-arm \ |
20 | -c /home/$user/.config/gnunet.conf -s | 20 | -c /home/$user/.config/gnunet.conf -s" |
21 | fi | 21 | fi |
22 | done | 22 | done |
23 | } | 23 | } |
@@ -26,8 +26,8 @@ stop() { | |||
26 | for user in $users; do | 26 | for user in $users; do |
27 | if test -n "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 | 27 | if test -n "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 |
28 | then | 28 | then |
29 | sudo -u $user gnunet-arm \ | 29 | su $user -c "gnunet-arm \ |
30 | -c /home/$user/.config/gnunet.conf -e | 30 | -c /home/$user/.config/gnunet.conf -e" |
31 | fi | 31 | fi |
32 | done | 32 | done |
33 | } | 33 | } |
diff --git a/contrib/packages/alpine/gnunet/gnunet.post-deinstall b/contrib/packages/alpine/gnunet/gnunet.post-deinstall deleted file mode 100644 index ab98ab535..000000000 --- a/contrib/packages/alpine/gnunet/gnunet.post-deinstall +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | deluser --remove-home gnunet # implicitly removes group gnunet | ||
4 | delgroup gnunetdns | ||
5 | |||
6 | exit 0 | ||
diff --git a/contrib/packages/alpine/gnunet/gnunet.xsession b/contrib/packages/alpine/gnunet/gnunet.xsession index f19d6baf7..944d47a27 100644 --- a/contrib/packages/alpine/gnunet/gnunet.xsession +++ b/contrib/packages/alpine/gnunet/gnunet.xsession | |||
@@ -2,7 +2,8 @@ | |||
2 | user=$(whoami) | 2 | user=$(whoami) |
3 | gnunet_proxy=$(gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy|grep 'IMMEDIATE_START = YES') | 3 | gnunet_proxy=$(gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy|grep 'IMMEDIATE_START = YES') |
4 | 4 | ||
5 | # Enable GNS proxy for new users informed by /etc/skel. | 5 | # Enable GNS proxy for new users informed by /etc/skel (system wide |
6 | # installation decision). | ||
6 | if [ "$gnunet_proxy" ]; then | 7 | if [ "$gnunet_proxy" ]; then |
7 | 8 | ||
8 | # Calculate user specific port | 9 | # Calculate user specific port |
@@ -45,10 +46,3 @@ fi | |||
45 | 46 | ||
46 | # Create/Renew GNS certificate authority (CA) per user. | 47 | # Create/Renew GNS certificate authority (CA) per user. |
47 | gnunet-gns-proxy-setup-ca | 48 | gnunet-gns-proxy-setup-ca |
48 | |||
49 | # In case a new user was added and gnunet-user-services has not been | ||
50 | # restarted afterwards, start user services after login. | ||
51 | if test -z "`ps|grep -v grep|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 | ||
52 | then | ||
53 | gnunet-arm -c /home/$user/.config/gnunet.conf -s | ||
54 | fi | ||
diff --git a/contrib/packages/alpine/gnurl/APKBUILD b/contrib/packages/alpine/gnurl/APKBUILD index f14a9bd97..24a5ee866 100644 --- a/contrib/packages/alpine/gnurl/APKBUILD +++ b/contrib/packages/alpine/gnurl/APKBUILD | |||
@@ -7,7 +7,8 @@ pkgdesc="curl with only HTTP/HTTPS support and GnuTLS" | |||
7 | url="https://gnunet.org/en/gnurl.html" | 7 | url="https://gnunet.org/en/gnurl.html" |
8 | arch="all" | 8 | arch="all" |
9 | license="MIT" | 9 | license="MIT" |
10 | depends="ca-certificates gnutls libidn2 zlib" | 10 | #depends="ca-certificates gnutls libidn2 zlib" |
11 | depends="ca-certificates" | ||
11 | depends_dev="gnutls-dev libidn2-dev zlib-dev" | 12 | depends_dev="gnutls-dev libidn2-dev zlib-dev" |
12 | makedepends="$depends_dev autoconf automake libtool perl pkgconf python3" | 13 | makedepends="$depends_dev autoconf automake libtool perl pkgconf python3" |
13 | subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgnurl" | 14 | subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgnurl" |