From: xrs Date: Sat, 12 Oct 2019 12:36:13 +0000 (+0200) Subject: fixed formatting and policy issues X-Git-Tag: v0.11.7~63 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a7b9cfe5b351c3c356e81e13b3110c10795ae13;p=oweals%2Fgnunet.git fixed formatting and policy issues --- 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 @@ # Contributor: xrs # Maintainer: xrs -pkgname="gnunet-gtk" -pkgver="0.11.5" +pkgname=gnunet-gtk +pkgver=0.11.5 pkgrel=0 pkgdesc="Graphical user interface for GNUnet" url="https://gnunet.org" @@ -9,14 +9,11 @@ arch="all" license="GPL-3.0" depends="gnunet gtk+3.0 glade" makedepends="gnunet-dev gtk+3.0-dev glade-dev" -install="" subpackages="$pkgname-dev $pkgname-doc" -source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/$pkgname-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" -options="!check" # The GNUnet project lacks a good CI at the moment. +source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-gtk-$pkgver.tar.gz" +options="!check" # The GNUnet project lacks a good CI at the moment. build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -24,14 +21,14 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --disable-fs-app \ - --disable-conversation-app + --disable-fs-app \ + --disable-conversation-app make } check() { make DESTDIR="$pkgdir" check - exit 0 + exit 0 } package() { 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 @@ # Contributor: xrs # Maintainer: xrs -pkgname="gnunet" -pkgver="0.11.6" +pkgname=gnunet +pkgver=0.11.6 pkgrel=0 pkgdesc="A framework for secure and privacy enhancing peer-to-peer networking" url="https://gnunet.org" arch="all" license="AGPL-3.0" -depends="libgpg-error libgcrypt nettle unbound-libs gnutls gnutls-utils gnurl - libgnurl libmicrohttpd openssl libunistring libidn2 nss sqlite zlib - miniupnpc gmp gettext bash which iptables coreutils sudo" -depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev - gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev - nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext" -makedepends="$depends_dev autoconf automake libtool gettext-dev python3 - texlive texinfo" -install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall - $pkgname.post-deinstall" +depends="libgpg-error libgcrypt nettle unbound-libs gnutls gnutls-utils gnurl + libgnurl libmicrohttpd openssl libunistring libidn2 nss sqlite zlib + miniupnpc gmp gettext bash which iptables coreutils sudo" +depends_dev="libgpg-error-dev libgcrypt-dev nettle-dev unbound-dev gnutls-dev + gnurl-dev libmicrohttpd-dev openssl-dev libunistring-dev libidn2-dev + nss-dev sqlite-dev zlib-dev miniupnpc-dev gmp-dev gettext" +makedepends="$depends_dev autoconf automake libtool gettext-dev python3 + texlive texinfo" +install="$pkgname.pre-install $pkgname.post-install $pkgname.pre-deinstall" pkgusers="gnunet" pkggroups="gnunet gnunetdns" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -builddir="$srcdir/$pkgname-$pkgver" -options="!check suid" # No check because The GNUnet project lacks a good CI at the moment. -source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/$pkgname-$pkgver.tar.gz - gnunet-system.conf - gnunet-user.conf +options="!check suid" # No check because The GNUnet project lacks a good CI at the moment. +source="https://mirrors.ocf.berkeley.edu/gnu/gnunet/gnunet-$pkgver.tar.gz + gnunet-system.conf + gnunet-user.conf gnunet-system-services.initd - gnunet-user-services.initd - gnunet.xsession + gnunet-user-services.initd + gnunet.xsession " prepare() { - cd "$builddir" - default_prepare - autoreconf -if # FIXME: See https://bugs.gnunet.org/view.php?id=5902 + default_prepare + autoreconf -if # FIXME: See https://bugs.gnunet.org/view.php?id=5902 } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -45,58 +41,58 @@ build() { --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ - --enable-logging=verbose + --enable-logging=verbose make } check() { make DESTDIR="$pkgdir" check - exit 0 + exit 0 } package() { make DESTDIR="$pkgdir" install - libexecdir=$pkgdir/usr/lib/gnunet/libexec/ - # Limit access to critical gnunet-helper-dns to group "gnunetdns" - chgrp gnunetdns $libexecdir/gnunet-helper-dns - chgrp gnunetdns $libexecdir/gnunet-service-dns - # Limit access to certain SUID binaries by group "gnunet" - chgrp gnunet $libexecdir/gnunet-helper-exit - chgrp gnunet $libexecdir/gnunet-helper-vpn - chgrp gnunet $libexecdir/gnunet-helper-nat-client - chgrp gnunet $libexecdir/gnunet-helper-nat-server - chmod u+s $libexecdir/gnunet-helper-exit - chmod u+s $libexecdir/gnunet-helper-vpn - chmod 2750 $libexecdir/gnunet-helper-dns - chmod 2700 $libexecdir/gnunet-service-dns - chmod u+s $libexecdir/gnunet-helper-nat-client - chmod u+s $libexecdir/gnunet-helper-nat-server + libexecdir=$pkgdir/usr/lib/gnunet/libexec/ + # Limit access to critical gnunet-helper-dns to group "gnunetdns" + chgrp gnunetdns $libexecdir/gnunet-helper-dns + chgrp gnunetdns $libexecdir/gnunet-service-dns + # Limit access to certain SUID binaries by group "gnunet" + chgrp gnunet $libexecdir/gnunet-helper-exit + chgrp gnunet $libexecdir/gnunet-helper-vpn + chgrp gnunet $libexecdir/gnunet-helper-nat-client + chgrp gnunet $libexecdir/gnunet-helper-nat-server + chmod u+s $libexecdir/gnunet-helper-exit + chmod u+s $libexecdir/gnunet-helper-vpn + chmod 2750 $libexecdir/gnunet-helper-dns + chmod 2700 $libexecdir/gnunet-service-dns + chmod u+s $libexecdir/gnunet-helper-nat-client + chmod u+s $libexecdir/gnunet-helper-nat-server - install -m644 -D $srcdir/$pkgname-user.conf \ - $pkgdir/etc/skel/.config/$pkgname.conf - install -m644 -D $srcdir/$pkgname-system.conf \ - $pkgdir/etc/$pkgname.conf + install -m644 -D $srcdir/$pkgname-user.conf \ + $pkgdir/etc/skel/.config/$pkgname.conf + install -m644 -D $srcdir/$pkgname-system.conf \ + $pkgdir/etc/$pkgname.conf install -m755 -D $srcdir/$pkgname-system-services.initd \ - $pkgdir/etc/init.d/$pkgname-system-services + $pkgdir/etc/init.d/$pkgname-system-services install -m755 -D $srcdir/$pkgname-user-services.initd \ - $pkgdir/etc/init.d/$pkgname-user-services - install -m755 -D $srcdir/$pkgname.xsession \ - $pkgdir/etc/X11/xinit/xinitrc.d/80-$pkgname-user-services + $pkgdir/etc/init.d/$pkgname-user-services + install -m755 -D $srcdir/$pkgname.xsession \ + $pkgdir/etc/X11/xinit/xinitrc.d/80-$pkgname-user-services } dev() { - default_dev + default_dev - # dev() will move gnunet-config from $pkg to $pkg-dev, but it's an - # intended part of $pkg. - install -m755 -D $builddir/src/util/.libs/gnunet-config \ - $pkgdir/usr/bin/gnunet-config + # dev() will move gnunet-config from $pkg to $pkg-dev, but it's an + # intended part of $pkg. + install -m755 -D $builddir/src/util/.libs/gnunet-config \ + $pkgdir/usr/bin/gnunet-config } sha512sums="1c6ea2ac7280d2edb30df627b79e017d199e93cd3970ce49f3f049abfb1dddfed541118e55766c422edf4a80e140c4eb2cfc681e0d4a1384e39811d024df9278 gnunet-0.11.6.tar.gz a0f55413ed2c6edd6746a751d92ddac95ba70f20eefb07330817870d749456448f44bba95d245911a00f6078e0c2ac626004e3b764be5e5e049c00626c4c5ac0 gnunet-system.conf b21112ff16aee771332aa9c33f55b0c7f46fe0266053543241e3efbe25dba56482c0e11112a192eefe59f1c74d2af5d7071b6a4e1e875cfc7e9d55b5fe8a0a33 gnunet-user.conf -ae7be0ecb8dfb9c4741706d5fe7a0ea2f87c88ddab549c80917a637b009922dfe3ad3ae6d8706c7a82b671da4e9f56f2208050ff7945c38100ca979438946413 gnunet-system-services.initd -5936adcca52a3e199f2cea4faf40a53a0280d453e189921db88c3f5d9b8502ac51ed2b926ade4e2fdb844bfc897ad1216ddba8060ac0d0a0d6648837509dfa35 gnunet-user-services.initd -0fe33317f99d0193a6eab9ce9bf9a3868a7021153f0e782839c086d5032ae164c40498fe7737a2c63ec11cb245132f86bda3f79fdcdf43c7497439b3aeac2bc7 gnunet.xsession" +96ab78bb48d5fb10f0b34336ad05e73b543c4362c73436ef20b3bb83dff214e997acf38a2ea493b1901bdc37c8877d83cdaebd73a0e50831e2f23413c8edda76 gnunet-system-services.initd +f67252e18c5fd701338653efe4cc14caae9213c1955f690cddec9fd7ad31a22680e931fbe908a1c5a78dc05094e547b2279f9a488f2ed80cc169590ad5ffa064 gnunet-user-services.initd +839a081aca19b863f378db980e6447ad30c6c0ee72fac6e11c65e57e86886d675ebc61069e17f696b6ca868e8ce259cabf80feb90b04b23f3da3c628f7beb915 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" depend() { need net - before gnunet-user-services + before gnunet-user-services } 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() { } start() { - for user in $users; do - if test -z "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 - then - sudo -u $user gnunet-arm \ - -c /home/$user/.config/gnunet.conf -s - fi - done + for user in $users; do + if test -z "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 + then + sudo -u $user gnunet-arm \ + -c /home/$user/.config/gnunet.conf -s + fi + done } stop() { - for user in $users; do - if test -n "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 - then - sudo -u $user gnunet-arm \ - -c /home/$user/.config/gnunet.conf -e - fi - done + for user in $users; do + if test -n "`ps|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 + then + sudo -u $user gnunet-arm \ + -c /home/$user/.config/gnunet.conf -e + fi + done } 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 ) ;; esac -rc-update add gnunet-system-services -rc-update add gnunet-user-services -rc-service gnunet-user-services start # starts system services - exit 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 @@ #!/bin/sh -# Stop and disable GNUnet system services. -rc-service gnunet-system-services stop # stops user services -rc-update del gnunet-system-services -rc-update del gnunet-user-services - # Remove proxy settings from browser. users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` for user in $users; do - gnunet_proxy=`grep -i "gns-proxy" /home/$user/.config/gnunet.conf` - if [ "$gnunet_proxy" ]; then - for ffprofile in /home/"$user"/.mozilla/firefox/*.*/; do - # Reset proxy preferences - js=$ffprofile/user.js - if [ -f $js ]; then - sed -i '/Preferences for using the GNU Name System/d' $js - sed -i '/network.proxy.socks/d' $js - sed -i '/network.proxy.socks_port/d' $js - sed -i '/network.proxy.socks_remote_dns/d' $js - sed -i '/network.proxy.type/d' $js - fi - done + gnunet_proxy=`grep -i "gns-proxy" /home/$user/.config/gnunet.conf` + if [ "$gnunet_proxy" ]; then + for ffprofile in /home/"$user"/.mozilla/firefox/*.*/; do + # Reset proxy preferences + js=$ffprofile/user.js + if [ -f $js ]; then + sed -i '/Preferences for using the GNU Name System/d' $js + sed -i '/network.proxy.socks/d' $js + sed -i '/network.proxy.socks_port/d' $js + sed -i '/network.proxy.socks_remote_dns/d' $js + sed -i '/network.proxy.type/d' $js + fi + done - # Chromium - profile=/home/$user/.profile - if [ -f $profile ]; then - sed -i '/CHROMIUM_USER_FLAGS/d' $profile - fi - fi + # Chromium + profile=/home/$user/.profile + if [ -f $profile ]; then + sed -i '/CHROMIUM_USER_FLAGS/d' $profile + fi + fi done exit 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 # Add system user/group gnunet for system services adduser -S -h "/var/lib/gnunet" -s /bin/sh \ - -G gnunet -g gnunet gnunet 2>/dev/null + -G gnunet -g gnunet gnunet 2>/dev/null # add users on host system to group "gnunet" users=`awk -F ':' '$3>=1000 && $3<2000 {print $1}' /etc/passwd` for user in $users; do - adduser $user gnunet 2>/dev/null + adduser $user gnunet 2>/dev/null done exit 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 @@ #!/bin/sh -user=`whoami` -gnunet_proxy=`gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy|grep 'IMMEDIATE_START = YES'` +user=$(whoami) +gnunet_proxy=$(gnunet-config -c /etc/skel/.config/gnunet.conf -s gns-proxy|grep 'IMMEDIATE_START = YES') # Enable GNS proxy for new users informed by /etc/skel. if [ "$gnunet_proxy" ]; then - # Calculate user specific port - port=$((8000+$(id -u $user))) + # Calculate user specific port + port=$((8000+$(id -u $user))) - gnunet-config -c /home/$user/.config/gnunet.conf \ - --rewrite \ - --section=gns-proxy \ - --option=OPTIONS \ - --value="-p $port" + gnunet-config -c /home/$user/.config/gnunet.conf \ + --rewrite \ + --section=gns-proxy \ + --option=OPTIONS \ + --value="-p $port" - # Firefox - if [ ! -d ~/.mozilla/firefox/*.default ];then - timeout 3s firefox --headless # dirty: create profile if not existent - fi - for ffprofile in ~/.mozilla/firefox/*.*/; do - js=$ffprofile/user.js - if [ -f $js ]; then - sed -i '/Preferences for using the GNU Name System/d' $js - sed -i '/network.proxy.socks/d' $js - sed -i '/network.proxy.socks_port/d' $js - sed -i '/network.proxy.socks_remote_dns/d' $js - sed -i '/network.proxy.type/d' $js - fi - echo "// Preferences for using the GNU Name System" >> $js - echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> $js - echo "user_pref(\"network.proxy.socks_port\", $port);" >> $js - echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> $js - echo "user_pref(\"network.proxy.type\", 1);" >> $js - done + # Firefox + if [ ! -d ~/.mozilla/firefox/*.default ];then + timeout 3s firefox --headless # dirty: create profile if not existent + fi + for ffprofile in ~/.mozilla/firefox/*.*/; do + js=$ffprofile/user.js + if [ -f $js ]; then + sed -i '/Preferences for using the GNU Name System/d' $js + sed -i '/network.proxy.socks/d' $js + sed -i '/network.proxy.socks_port/d' $js + sed -i '/network.proxy.socks_remote_dns/d' $js + sed -i '/network.proxy.type/d' $js + fi + echo "// Preferences for using the GNU Name System" >> $js + echo "user_pref(\"network.proxy.socks\", \"localhost\");" >> $js + echo "user_pref(\"network.proxy.socks_port\", $port);" >> $js + echo "user_pref(\"network.proxy.socks_remote_dns\", true);" >> $js + echo "user_pref(\"network.proxy.type\", 1);" >> $js + done - # Chromium - profile=/home/$user/.profile - if [ -f $profile ]; then - sed -i '/CHROMIUM_USER_FLAGS/d' $profile - fi - echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \ - >> $profile + # Chromium + profile=/home/$user/.profile + if [ -f $profile ]; then + sed -i '/CHROMIUM_USER_FLAGS/d' $profile + fi + echo "export CHROMIUM_USER_FLAGS=--proxy-server=socks5://localhost:$port" \ + >> $profile fi # Create/Renew GNS certificate authority (CA) per user. @@ -50,5 +50,5 @@ gnunet-gns-proxy-setup-ca # restarted afterwards, start user services after login. if test -z "`ps|grep -v grep|grep $user|grep gnunet-service-arm`" > /dev/null 2>&1 then - gnunet-arm -c /home/$user/.config/gnunet.conf -s + gnunet-arm -c /home/$user/.config/gnunet.conf -s fi 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 pkgrel=0 pkgdesc="curl with only HTTP/HTTPS support and GnuTLS" url="https://gnunet.org/en/gnurl.html" -giturl="git://git.taler.net/gnurl.git" arch="all" license="MIT" depends="ca-certificates gnutls libidn2 zlib" depends_dev="gnutls-dev libidn2-dev zlib-dev" makedepends="$depends_dev autoconf automake libtool perl pkgconf python3" subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libgnurl" -source="https://ftp.gnu.org/gnu/gnunet/$pkgname-$pkgver.tar.gz" -builddir="$srcdir/$pkgname-$pkgver" +source="https://ftp.gnu.org/gnu/gnunet/gnurl-$pkgver.tar.gz" prepare() { default_prepare - cd "$builddir" autoreconf -vfi } build() { - cd "$builddir" - - ./configure \ + ./configure \ --build=$CBUILD \ --host=$CHOST \ - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \ --prefix=/usr \ + --disable-static \ --enable-ipv6 \ --with-gnutls \ - --with-libidn2 \ + --with-libidn2 \ --without-libpsl \ --without-libssh2 \ --without-libmetalink \ - --without-winidn \ - --without-librtmp \ - --without-nghttp2 \ - --without-nss \ - --without-cyassl \ - --without-polarssl \ - --without-ssl \ - --without-winssl \ - --without-darwinssl \ - --disable-sspi \ - --disable-ntlm-wb \ - --disable-ldap \ - --disable-rtsp \ - --disable-dict \ - --disable-telnet \ - --disable-tftp \ - --disable-pop3 \ - --disable-imap \ - --disable-smtp \ - --disable-gopher \ - --disable-file \ - --disable-ftp \ - --disable-smb \ - --disable-ares - make + --without-winidn \ + --without-librtmp \ + --without-nghttp2 \ + --without-nss \ + --without-cyassl \ + --without-polarssl \ + --without-ssl \ + --without-winssl \ + --without-darwinssl \ + --disable-sspi \ + --disable-ntlm-wb \ + --disable-ldap \ + --disable-rtsp \ + --disable-dict \ + --disable-telnet \ + --disable-tftp \ + --disable-pop3 \ + --disable-imap \ + --disable-smtp \ + --disable-gopher \ + --disable-file \ + --disable-ftp \ + --disable-smb \ + --disable-ares + make } check() { - cd "$builddir" make -C tests nonflaky-test } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install - #install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING + make DESTDIR="$pkgdir" install } libgnurl() {