aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/alpine/gnunet-gtk/APKBUILD17
-rw-r--r--contrib/alpine/gnunet/APKBUILD108
-rw-r--r--contrib/alpine/gnunet/gnunet-system-services.initd2
-rw-r--r--contrib/alpine/gnunet/gnunet-user-services.initd28
-rw-r--r--contrib/alpine/gnunet/gnunet.post-install4
-rw-r--r--contrib/alpine/gnunet/gnunet.pre-deinstall43
-rw-r--r--contrib/alpine/gnunet/gnunet.pre-install4
-rw-r--r--contrib/alpine/gnunet/gnunet.xsession72
-rw-r--r--contrib/alpine/gnurl/APKBUILD69
9 files changed, 162 insertions, 185 deletions
diff --git a/contrib/alpine/gnunet-gtk/APKBUILD b/contrib/alpine/gnunet-gtk/APKBUILD
index 71b12b237..75ccadbf0 100644
--- a/contrib/alpine/gnunet-gtk/APKBUILD
+++ b/contrib/alpine/gnunet-gtk/APKBUILD
@@ -1,7 +1,7 @@
1# Contributor: xrs <xrs@mail36.net> 1# Contributor: xrs <xrs@mail36.net>
2# Maintainer: xrs <xrs@mail36.net> 2# Maintainer: xrs <xrs@mail36.net>
3pkgname="gnunet-gtk" 3pkgname=gnunet-gtk
4pkgver="0.11.5" 4pkgver=0.11.5
5pkgrel=0 5pkgrel=0
6pkgdesc="Graphical user interface for GNUnet" 6pkgdesc="Graphical user interface for GNUnet"
7url="https://gnunet.org" 7url="https://gnunet.org"
@@ -9,14 +9,11 @@ arch="all"
9license="GPL-3.0" 9license="GPL-3.0"
10depends="gnunet gtk+3.0 glade" 10depends="gnunet gtk+3.0 glade"
11makedepends="gnunet-dev gtk+3.0-dev glade-dev" 11makedepends="gnunet-dev gtk+3.0-dev glade-dev"
12install=""
13subpackages="$pkgname-dev $pkgname-doc" 12subpackages="$pkgname-dev $pkgname-doc"
14source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/$pkgname-$pkgver.tar.gz" 13source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-gtk-$pkgver.tar.gz"
15builddir="$srcdir/$pkgname-$pkgver" 14options="!check" # The GNUnet project lacks a good CI at the moment.
16options="!check" # The GNUnet project lacks a good CI at the moment.
17 15
18build() { 16build() {
19 cd "$builddir"
20 ./configure \ 17 ./configure \
21 --build=$CBUILD \ 18 --build=$CBUILD \
22 --host=$CHOST \ 19 --host=$CHOST \
@@ -24,14 +21,14 @@ build() {
24 --sysconfdir=/etc \ 21 --sysconfdir=/etc \
25 --mandir=/usr/share/man \ 22 --mandir=/usr/share/man \
26 --localstatedir=/var \ 23 --localstatedir=/var \
27 --disable-fs-app \ 24 --disable-fs-app \
28 --disable-conversation-app 25 --disable-conversation-app
29 make 26 make
30} 27}
31 28
32check() { 29check() {
33 make DESTDIR="$pkgdir" check 30 make DESTDIR="$pkgdir" check
34 exit 0 31 exit 0
35} 32}
36 33
37package() { 34package() {
diff --git a/contrib/alpine/gnunet/APKBUILD b/contrib/alpine/gnunet/APKBUILD
index c68e03d67..da2b2dec4 100644
--- a/contrib/alpine/gnunet/APKBUILD
+++ b/contrib/alpine/gnunet/APKBUILD
@@ -1,43 +1,39 @@
1# Contributor: xrs <xrs@mail36.net> 1# Contributor: xrs <xrs@mail36.net>
2# Maintainer: xrs <xrs@mail36.net> 2# Maintainer: xrs <xrs@mail36.net>
3pkgname="gnunet" 3pkgname=gnunet
4pkgver="0.11.6" 4pkgver=0.11.6
5pkgrel=0 5pkgrel=0
6pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking" 6pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking"
7url="https://gnunet.org" 7url="https://gnunet.org"
8arch="all" 8arch="all"
9license="AGPL-3.0" 9license="AGPL-3.0"
10depends="libgpg-error libgcrypt nettle unbound-libs gnutls gnutls-utils gnurl 10depends="libgpg-error libgcrypt nettle unbound-libs gnutls gnutls-utils gnurl
11 libgnurl libmicrohttpd openssl libunistring libidn2 nss sqlite zlib 11 libgnurl libmicrohttpd openssl libunistring libidn2 nss sqlite zlib
12 miniupnpc gmp gettext bash which iptables coreutils sudo" 12 miniupnpc gmp gettext bash which iptables coreutils sudo"
13depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev 13depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev
14 gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev 14 gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev
15 nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext" 15 nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext"
16makedepends="$depends_dev autoconf automake libtool gettext-dev python3 16makedepends="$depends_dev autoconf automake libtool gettext-dev python3
17 texlive texinfo" 17 texlive texinfo"
18install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall 18install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall"
19 $pkgname.post-deinstall"
20pkgusers="gnunet" 19pkgusers="gnunet"
21pkggroups="gnunet gnunetdns" 20pkggroups="gnunet gnunetdns"
22subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" 21subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
23builddir="$srcdir/$pkgname-$pkgver" 22options="!check suid" # No check because The GNUnet project lacks a good CI at the moment.
24options="!check suid" # No check because The GNUnet project lacks a good CI at the moment. 23source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-$pkgver.tar.gz
25source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/$pkgname-$pkgver.tar.gz 24 gnunet-system.conf
26 gnunet-system.conf 25 gnunet-user.conf
27 gnunet-user.conf
28 gnunet-system-services.initd 26 gnunet-system-services.initd
29 gnunet-user-services.initd 27 gnunet-user-services.initd
30 gnunet.xsession 28 gnunet.xsession
31 " 29 "
32 30
33prepare() { 31prepare() {
34 cd "$builddir" 32 default_prepare
35 default_prepare 33 autoreconf -if # FIXME: See https://bugs.gnunet.org/view.php?id=5902
36 autoreconf -if # FIXME: See https://bugs.gnunet.org/view.php?id=5902
37} 34}
38 35
39build() { 36build() {
40 cd "$builddir"
41 ./configure \ 37 ./configure \
42 --build=$CBUILD \ 38 --build=$CBUILD \
43 --host=$CHOST \ 39 --host=$CHOST \
@@ -45,58 +41,58 @@ build() {
45 --sysconfdir=/etc \ 41 --sysconfdir=/etc \
46 --mandir=/usr/share/man \ 42 --mandir=/usr/share/man \
47 --localstatedir=/var \ 43 --localstatedir=/var \
48 --enable-logging=verbose 44 --enable-logging=verbose
49 make 45 make
50} 46}
51 47
52check() { 48check() {
53 make DESTDIR="$pkgdir" check 49 make DESTDIR="$pkgdir" check
54 exit 0 50 exit 0
55} 51}
56 52
57package() { 53package() {
58 make DESTDIR="$pkgdir" install 54 make DESTDIR="$pkgdir" install
59 55
60 libexecdir=$pkgdir/usr/lib/gnunet/libexec/ 56 libexecdir=$pkgdir/usr/lib/gnunet/libexec/
61 # Limit access to critical gnunet-helper-dns to group "gnunetdns" 57 # Limit access to critical gnunet-helper-dns to group "gnunetdns"
62 chgrp gnunetdns $libexecdir/gnunet-helper-dns 58 chgrp gnunetdns $libexecdir/gnunet-helper-dns
63 chgrp gnunetdns $libexecdir/gnunet-service-dns 59 chgrp gnunetdns $libexecdir/gnunet-service-dns
64 # Limit access to certain SUID binaries by group "gnunet" 60 # Limit access to certain SUID binaries by group "gnunet"
65 chgrp gnunet $libexecdir/gnunet-helper-exit 61 chgrp gnunet $libexecdir/gnunet-helper-exit
66 chgrp gnunet $libexecdir/gnunet-helper-vpn 62 chgrp gnunet $libexecdir/gnunet-helper-vpn
67 chgrp gnunet $libexecdir/gnunet-helper-nat-client 63 chgrp gnunet $libexecdir/gnunet-helper-nat-client
68 chgrp gnunet $libexecdir/gnunet-helper-nat-server 64 chgrp gnunet $libexecdir/gnunet-helper-nat-server
69 chmod u+s $libexecdir/gnunet-helper-exit 65 chmod u+s $libexecdir/gnunet-helper-exit
70 chmod u+s $libexecdir/gnunet-helper-vpn 66 chmod u+s $libexecdir/gnunet-helper-vpn
71 chmod 2750 $libexecdir/gnunet-helper-dns 67 chmod 2750 $libexecdir/gnunet-helper-dns
72 chmod 2700 $libexecdir/gnunet-service-dns 68 chmod 2700 $libexecdir/gnunet-service-dns
73 chmod u+s $libexecdir/gnunet-helper-nat-client 69 chmod u+s $libexecdir/gnunet-helper-nat-client
74 chmod u+s $libexecdir/gnunet-helper-nat-server 70 chmod u+s $libexecdir/gnunet-helper-nat-server
75 71
76 install -m644 -D $srcdir/$pkgname-user.conf \ 72 install -m644 -D $srcdir/$pkgname-user.conf \
77 $pkgdir/etc/skel/.config/$pkgname.conf 73 $pkgdir/etc/skel/.config/$pkgname.conf
78 install -m644 -D $srcdir/$pkgname-system.conf \ 74 install -m644 -D $srcdir/$pkgname-system.conf \
79 $pkgdir/etc/$pkgname.conf 75 $pkgdir/etc/$pkgname.conf
80 install -m755 -D $srcdir/$pkgname-system-services.initd \ 76 install -m755 -D $srcdir/$pkgname-system-services.initd \
81 $pkgdir/etc/init.d/$pkgname-system-services 77 $pkgdir/etc/init.d/$pkgname-system-services
82 install -m755 -D $srcdir/$pkgname-user-services.initd \ 78 install -m755 -D $srcdir/$pkgname-user-services.initd \
83 $pkgdir/etc/init.d/$pkgname-user-services 79 $pkgdir/etc/init.d/$pkgname-user-services
84 install -m755 -D $srcdir/$pkgname.xsession \ 80 install -m755 -D $srcdir/$pkgname.xsession \
85 $pkgdir/etc/X11/xinit/xinitrc.d/80-$pkgname-user-services 81 $pkgdir/etc/X11/xinit/xinitrc.d/80-$pkgname-user-services
86} 82}
87 83
88dev() { 84dev() {
89 default_dev 85 default_dev
90 86
91 # dev() will move gnunet-config from $pkg to $pkg-dev, but it's an 87 # dev() will move gnunet-config from $pkg to $pkg-dev, but it's an
92 # intended part of $pkg. 88 # intended part of $pkg.
93 install -m755 -D $builddir/src/util/.libs/gnunet-config \ 89 install -m755 -D $builddir/src/util/.libs/gnunet-config \
94 $pkgdir/usr/bin/gnunet-config 90 $pkgdir/usr/bin/gnunet-config
95} 91}
96 92
97sha512sums="1c6ea2ac7280d2edb30df627b79e017d199e93cd3970ce49f3f049abfb1dddfed541118e55766c422edf4a80e140c4eb2cfc681e0d4a1384e39811d024df9278 gnunet-0.11.6.tar.gz 93sha512sums="1c6ea2ac7280d2edb30df627b79e017d199e93cd3970ce49f3f049abfb1dddfed541118e55766c422edf4a80e140c4eb2cfc681e0d4a1384e39811d024df9278 gnunet-0.11.6.tar.gz
98a0f55413ed2c6edd6746a751d92ddac95ba70f20eefb07330817870d749456448f44bba95d245911a00f6078e0c2ac626004e3b764be5e5e049c00626c4c5ac0 gnunet-system.conf 94a0f55413ed2c6edd6746a751d92ddac95ba70f20eefb07330817870d749456448f44bba95d245911a00f6078e0c2ac626004e3b764be5e5e049c00626c4c5ac0 gnunet-system.conf
99b21112ff16aee771332aa9c33f55b0c7f46fe0266053543241e3efbe25dba56482c0e11112a192eefe59f1c74d2af5d7071b6a4e1e875cfc7e9d55b5fe8a0a33 gnunet-user.conf 95b21112ff16aee771332aa9c33f55b0c7f46fe0266053543241e3efbe25dba56482c0e11112a192eefe59f1c74d2af5d7071b6a4e1e875cfc7e9d55b5fe8a0a33 gnunet-user.conf
100ae7be0ecb8dfb9c4741706d5fe7a0ea2f87c88ddab549c80917a637b009922dfe3ad3ae6d8706c7a82b671da4e9f56f2208050ff7945c38100ca979438946413 gnunet-system-services.initd 9696ab78bb48d5fb10f0b34336ad05e73b543c4362c73436ef20b3bb83dff214e997acf38a2ea493b1901bdc37c8877d83cdaebd73a0e50831e2f23413c8edda76 gnunet-system-services.initd
1015936adcca52a3e199f2cea4faf40a53a0280d453e189921db88c3f5d9b8502ac51ed2b926ade4e2fdb844bfc897ad1216ddba8060ac0d0a0d6648837509dfa35 gnunet-user-services.initd 97f67252e18c5fd701338653efe4cc14caae9213c1955f690cddec9fd7ad31a22680e931fbe908a1c5a78dc05094e547b2279f9a488f2ed80cc169590ad5ffa064 gnunet-user-services.initd
1020fe33317f99d0193a6eab9ce9bf9a3868a7021153f0e782839c086d5032ae164c40498fe7737a2c63ec11cb245132f86bda3f79fdcdf43c7497439b3aeac2bc7 gnunet.xsession" 98839a081aca19b863f378db980e6447ad30c6c0ee72fac6e11c65e57e86886d675ebc61069e17f696b6ca868e8ce259cabf80feb90b04b23f3da3c628f7beb915 gnunet.xsession"
diff --git a/contrib/alpine/gnunet/gnunet-system-services.initd b/contrib/alpine/gnunet/gnunet-system-services.initd
index 2dc603b2d..19248d23e 100644
--- a/contrib/alpine/gnunet/gnunet-system-services.initd
+++ b/contrib/alpine/gnunet/gnunet-system-services.initd
@@ -12,5 +12,5 @@ pidfile="/run/${SVCNAME}.pid"
12 12
13depend() { 13depend() {
14 need net 14 need net
15 before gnunet-user-services 15 before gnunet-user-services
16} 16}
diff --git a/contrib/alpine/gnunet/gnunet-user-services.initd b/contrib/alpine/gnunet/gnunet-user-services.initd
index 915ff203e..6c960944e 100644
--- a/contrib/alpine/gnunet/gnunet-user-services.initd
+++ b/contrib/alpine/gnunet/gnunet-user-services.initd
@@ -13,21 +13,21 @@ depend() {
13} 13}
14 14
15start() { 15start() {
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 sudo -u $user 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}
24 24
25stop() { 25stop() {
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 sudo -u $user 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/alpine/gnunet/gnunet.post-install b/contrib/alpine/gnunet/gnunet.post-install
index 926f8fdb1..f7c19b26f 100644
--- a/contrib/alpine/gnunet/gnunet.post-install
+++ b/contrib/alpine/gnunet/gnunet.post-install
@@ -37,8 +37,4 @@ y|Y )
37 ;; 37 ;;
38esac 38esac
39 39
40rc-update add gnunet-system-services
41rc-update add gnunet-user-services
42rc-service gnunet-user-services start # starts system services
43
44exit 0 40exit 0
diff --git a/contrib/alpine/gnunet/gnunet.pre-deinstall b/contrib/alpine/gnunet/gnunet.pre-deinstall
index 8bb8737f8..3334c6d67 100644
--- a/contrib/alpine/gnunet/gnunet.pre-deinstall
+++ b/contrib/alpine/gnunet/gnunet.pre-deinstall
@@ -1,33 +1,28 @@
1#!/bin/sh 1#!/bin/sh
2 2
3# Stop and disable GNUnet system services.
4rc-service gnunet-system-services stop # stops user services
5rc-update del gnunet-system-services
6rc-update del gnunet-user-services
7
8# Remove proxy settings from browser. 3# Remove proxy settings from browser.
9users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` 4users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd`
10for user in $users; do 5for user in $users; do
11 gnunet_proxy=`grep -i "gns-proxy" /home/$user/.config/gnunet.conf` 6 gnunet_proxy=`grep -i "gns-proxy" /home/$user/.config/gnunet.conf`
12 if [ "$gnunet_proxy" ]; then 7 if [ "$gnunet_proxy" ]; then
13 for ffprofile in /home/"$user"/.mozilla/firefox/*.*/; do 8 for ffprofile in /home/"$user"/.mozilla/firefox/*.*/; do
14 # Reset proxy preferences 9 # Reset proxy preferences
15 js=$ffprofile/user.js 10 js=$ffprofile/user.js
16 if [ -f $js ]; then 11 if [ -f $js ]; then
17 sed -i '/Preferences for using the GNU Name System/d' $js 12 sed -i '/Preferences for using the GNU Name System/d' $js
18 sed -i '/network.proxy.socks/d' $js 13 sed -i '/network.proxy.socks/d' $js
19 sed -i '/network.proxy.socks_port/d' $js 14 sed -i '/network.proxy.socks_port/d' $js
20 sed -i '/network.proxy.socks_remote_dns/d' $js 15 sed -i '/network.proxy.socks_remote_dns/d' $js
21 sed -i '/network.proxy.type/d' $js 16 sed -i '/network.proxy.type/d' $js
22 fi 17 fi
23 done 18 done
24 19
25 # Chromium 20 # Chromium
26 profile=/home/$user/.profile 21 profile=/home/$user/.profile
27 if [ -f $profile ]; then 22 if [ -f $profile ]; then
28 sed -i '/CHROMIUM_USER_FLAGS/d' $profile 23 sed -i '/CHROMIUM_USER_FLAGS/d' $profile
29 fi 24 fi
30 fi 25 fi
31done 26done
32 27
33exit 0 28exit 0
diff --git a/contrib/alpine/gnunet/gnunet.pre-install b/contrib/alpine/gnunet/gnunet.pre-install
index 7166279f9..bbb629cb1 100644
--- a/contrib/alpine/gnunet/gnunet.pre-install
+++ b/contrib/alpine/gnunet/gnunet.pre-install
@@ -6,12 +6,12 @@ addgroup -S gnunet 2>/dev/null
6 6
7# Add system user/group gnunet for system services 7# Add system user/group gnunet for system services
8adduser -S -h "/var/lib/gnunet" -s /bin/sh \ 8adduser -S -h "/var/lib/gnunet" -s /bin/sh \
9 -G gnunet -g gnunet gnunet 2>/dev/null 9 -G gnunet -g gnunet gnunet 2>/dev/null
10 10
11# add users on host system to group "gnunet" 11# add users on host system to group "gnunet"
12users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` 12users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd`
13for user in $users; do 13for user in $users; do
14 adduser $user gnunet 2>/dev/null 14 adduser $user gnunet 2>/dev/null
15done 15done
16 16
17exit 0 17exit 0
diff --git a/contrib/alpine/gnunet/gnunet.xsession b/contrib/alpine/gnunet/gnunet.xsession
index 2d2bb392a..f19d6baf7 100644
--- a/contrib/alpine/gnunet/gnunet.xsession
+++ b/contrib/alpine/gnunet/gnunet.xsession
@@ -1,46 +1,46 @@
1#!/bin/sh 1#!/bin/sh
2user=`whoami` 2user=$(whoami)
3gnunet_proxy=`gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy|grep 'IMMEDIATE_START = YES'` 3gnunet_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.
6if [ "$gnunet_proxy" ]; then 6if [ "$gnunet_proxy" ]; then
7 7
8 # Calculate user specific port 8 # Calculate user specific port
9 port=$((8000+$(id -u $user))) 9 port=$((8000+$(id -u $user)))
10 10
11 gnunet-config -c /home/$user/.config/gnunet.conf \ 11 gnunet-config -c /home/$user/.config/gnunet.conf \
12 --rewrite \ 12 --rewrite \
13 --section=gns-proxy \ 13 --section=gns-proxy \
14 --option=OPTIONS \ 14 --option=OPTIONS \
15 --value="-p $port" 15 --value="-p $port"
16 16
17 # Firefox 17 # Firefox
18 if [ ! -d ~/.mozilla/firefox/*.default ];then 18 if [ ! -d ~/.mozilla/firefox/*.default ];then
19 timeout 3s firefox --headless # dirty: create profile if not existent 19 timeout 3s firefox --headless # dirty: create profile if not existent
20 fi 20 fi
21 for ffprofile in ~/.mozilla/firefox/*.*/; do 21 for ffprofile in ~/.mozilla/firefox/*.*/; do
22 js=$ffprofile/user.js 22 js=$ffprofile/user.js
23 if [ -f $js ]; then 23 if [ -f $js ]; then
24 sed -i '/Preferences for using the GNU Name System/d' $js 24 sed -i '/Preferences for using the GNU Name System/d' $js
25 sed -i '/network.proxy.socks/d' $js 25 sed -i '/network.proxy.socks/d' $js
26 sed -i '/network.proxy.socks_port/d' $js 26 sed -i '/network.proxy.socks_port/d' $js
27 sed -i '/network.proxy.socks_remote_dns/d' $js 27 sed -i '/network.proxy.socks_remote_dns/d' $js
28 sed -i '/network.proxy.type/d' $js 28 sed -i '/network.proxy.type/d' $js
29 fi 29 fi
30 echo "// Preferences for using the GNU Name System" >> $js 30 echo "// Preferences for using the GNU Name System" >> $js
31 echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> $js 31 echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> $js
32 echo "user_pref(\"network.proxy.socks_port\", $port);" >> $js 32 echo "user_pref(\"network.proxy.socks_port\", $port);" >> $js
33 echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> $js 33 echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> $js
34 echo "user_pref(\"network.proxy.type\", 1);" >> $js 34 echo "user_pref(\"network.proxy.type\", 1);" >> $js
35 done 35 done
36 36
37 # Chromium 37 # Chromium
38 profile=/home/$user/.profile 38 profile=/home/$user/.profile
39 if [ -f $profile ]; then 39 if [ -f $profile ]; then
40 sed -i '/CHROMIUM_USER_FLAGS/d' $profile 40 sed -i '/CHROMIUM_USER_FLAGS/d' $profile
41 fi 41 fi
42 echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \ 42 echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \
43 >> $profile 43 >> $profile
44fi 44fi
45 45
46# Create/Renew GNS certificate authority (CA) per user. 46# Create/Renew GNS certificate authority (CA) per user.
@@ -50,5 +50,5 @@ gnunet-gns-proxy-setup-ca
50# restarted afterwards, start user services after login. 50# restarted afterwards, start user services after login.
51if test -z "`ps|grep -v grep|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 51if test -z "`ps|grep -v grep|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1
52then 52then
53 gnunet-arm -c /home/$user/.config/gnunet.conf -s 53 gnunet-arm -c /home/$user/.config/gnunet.conf -s
54fi 54fi
diff --git a/contrib/alpine/gnurl/APKBUILD b/contrib/alpine/gnurl/APKBUILD
index f8ff73a91..f14a9bd97 100644
--- a/contrib/alpine/gnurl/APKBUILD
+++ b/contrib/alpine/gnurl/APKBUILD
@@ -5,72 +5,65 @@ pkgver=7.65.3
5pkgrel=0 5pkgrel=0
6pkgdesc="curl with only HTTP/HTTPS support and GnuTLS" 6pkgdesc="curl with only HTTP/HTTPS support and GnuTLS"
7url="https://gnunet.org/en/gnurl.html" 7url="https://gnunet.org/en/gnurl.html"
8giturl="git://git.taler.net/gnurl.git"
9arch="all" 8arch="all"
10license="MIT" 9license="MIT"
11depends="ca-certificates gnutls libidn2 zlib" 10depends="ca-certificates gnutls libidn2 zlib"
12depends_dev="gnutls-dev libidn2-dev zlib-dev" 11depends_dev="gnutls-dev libidn2-dev zlib-dev"
13makedepends="$depends_dev autoconf automake libtool perl pkgconf python3" 12makedepends="$depends_dev autoconf automake libtool perl pkgconf python3"
14subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgnurl" 13subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgnurl"
15source="https://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz" 14source="https://ftp.gnu.org/gnu/gnunet/gnurl-$pkgver.tar.gz"
16builddir="$srcdir/$pkgname-$pkgver"
17 15
18prepare() { 16prepare() {
19 default_prepare 17 default_prepare
20 cd "$builddir"
21 autoreconf -vfi 18 autoreconf -vfi
22} 19}
23 20
24build() { 21build() {
25 cd "$builddir" 22 ./configure \
26
27 ./configure \
28 --build=$CBUILD \ 23 --build=$CBUILD \
29 --host=$CHOST \ 24 --host=$CHOST \
30 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ 25 --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
31 --prefix=/usr \ 26 --prefix=/usr \
27 --disable-static \
32 --enable-ipv6 \ 28 --enable-ipv6 \
33 --with-gnutls \ 29 --with-gnutls \
34 --with-libidn2 \ 30 --with-libidn2 \
35 --without-libpsl \ 31 --without-libpsl \
36 --without-libssh2 \ 32 --without-libssh2 \
37 --without-libmetalink \ 33 --without-libmetalink \
38 --without-winidn \ 34 --without-winidn \
39 --without-librtmp \ 35 --without-librtmp \
40 --without-nghttp2 \ 36 --without-nghttp2 \
41 --without-nss \ 37 --without-nss \
42 --without-cyassl \ 38 --without-cyassl \
43 --without-polarssl \ 39 --without-polarssl \
44 --without-ssl \ 40 --without-ssl \
45 --without-winssl \ 41 --without-winssl \
46 --without-darwinssl \ 42 --without-darwinssl \
47 --disable-sspi \ 43 --disable-sspi \
48 --disable-ntlm-wb \ 44 --disable-ntlm-wb \
49 --disable-ldap \ 45 --disable-ldap \
50 --disable-rtsp \ 46 --disable-rtsp \
51 --disable-dict \ 47 --disable-dict \
52 --disable-telnet \ 48 --disable-telnet \
53 --disable-tftp \ 49 --disable-tftp \
54 --disable-pop3 \ 50 --disable-pop3 \
55 --disable-imap \ 51 --disable-imap \
56 --disable-smtp \ 52 --disable-smtp \
57 --disable-gopher \ 53 --disable-gopher \
58 --disable-file \ 54 --disable-file \
59 --disable-ftp \ 55 --disable-ftp \
60 --disable-smb \ 56 --disable-smb \
61 --disable-ares 57 --disable-ares
62 make 58 make
63} 59}
64 60
65check() { 61check() {
66 cd "$builddir"
67 make -C tests nonflaky-test 62 make -C tests nonflaky-test
68} 63}
69 64
70package() { 65package() {
71 cd "$builddir" 66 make DESTDIR="$pkgdir" install
72 make DESTDIR="$pkgdir" install
73 #install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
74} 67}
75 68
76libgnurl() { 69libgnurl() {