Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnunet: update to revision 37051 plus some small fixes

Browse source 
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2016-04-15 11:55:37 +02:00
parent ee50351b7f
commit d768d36d8f
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/gnunet/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gnunet PKG_NAME:=gnunet
PKG_SOURCE_VERSION:=36986 PKG_SOURCE_VERSION:=37051
PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION) PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -216,7 +216,7 @@ LIBEXEC_fs:=helper-fs-publish service-fs
CONF_fs:=fs CONF_fs:=fs
DEPENDS_gns:=+gnunet-vpn DEPENDS_gns:=+gnunet-vpn
USERID_gns:=gnunetdns=401:gnunetdns=401 USERID_gns:=gnunet=400:gnunetdns=401
BIN_gns:=gns gns-import.sh namecache namestore resolver BIN_gns:=gns gns-import.sh namecache namestore resolver
LIB_gns:=gns gnsrecord namecache namestore LIB_gns:=gns gnsrecord namecache namestore
PLUGIN_gns:=block_dns block_gns gnsrecord_dns gnsrecord_gns PLUGIN_gns:=block_dns block_gns gnsrecord_dns gnsrecord_gns

15
net/gnunet/files/gnunet.init
View file

@ -8,15 +8,15 @@ USE_PROCD=1
PROG=/usr/lib/gnunet/libexec/gnunet-service-arm PROG=/usr/lib/gnunet/libexec/gnunet-service-arm
GNUNET_HOME=/var/run/gnunet GNUNET_HOME=/var/run/gnunet
LOGFILE=$GNUNET_HOME/gnunet.log # LOGFILE=$GNUNET_HOME/gnunet.log
CONFIGFILE=$GNUNET_HOME/gnunet.conf CONFIGFILE=$GNUNET_HOME/gnunet.conf
SUID_ROOT_HELPERS="exit nat-server nat-client transport-bluetooth transport-wlan vpn" SUID_ROOT_HELPERS="exit nat-server nat-client transport-bluetooth transport-wlan vpn"
chmodown_execbin() { chmodown_execbin() {
execname=/usr/lib/gnunet/libexec/gnunet-$1 execname=/usr/lib/gnunet/libexec/gnunet-$1
if [ -x $execname ]; then if [ -x $execname ]; then
chmod $2 $execname
[ "$3" ] && chown $3 $execname [ "$3" ] && chown $3 $execname
chmod $2 $execname
fi fi
} }
@ -26,7 +26,7 @@ fix_libexec_permissions() {
chmodown_execbin helper-$helper u+s chmodown_execbin helper-$helper u+s
done done
chmodown_execbin helper-dns 4750 root:gnunetdns chmodown_execbin helper-dns 4750 root:gnunetdns
chmodown_execbin service-dns 2750 root:gnunetdns chmodown_execbin service-dns 2750 gnunet:gnunetdns
touch /usr/share/gnunet/.permfix touch /usr/share/gnunet/.permfix
} }
@ -38,7 +38,7 @@ prepare_config() {
chmod 0750 $GNUNET_HOME chmod 0750 $GNUNET_HOME
fi fi
touch $CONFIGFILE touch $CONFIGFILE
chown root:gnunet $CONFIGFILE chown gnunet:gnunet $CONFIGFILE
chmod 0640 $CONFIGFILE chmod 0640 $CONFIGFILE
gnunet-config -c $CONFIGFILE -s PATHS -o GNUNET_HOME -V $GNUNET_HOME gnunet-config -c $CONFIGFILE -s PATHS -o GNUNET_HOME -V $GNUNET_HOME
@ -66,6 +66,10 @@ prepare_config() {
done done
gnunet-config -c $CONFIGFILE -s transport -o PLUGINS -V "$transport_plugins" gnunet-config -c $CONFIGFILE -s transport -o PLUGINS -V "$transport_plugins"
# do not touch sysctl, iptables and routing
gnunet-config -c $CONFIGFILE -s dns -o SKIP_ROUTING_SETUP -V YES
gnunet-config -c $CONFIGFILE -s exit -o EXIT_IFNAME -V ''
# apply config from UCI # apply config from UCI
_gnunet_section="" _gnunet_section=""
config_cb() config_cb()
@ -95,7 +99,8 @@ start_service() {
procd_open_instance procd_open_instance
procd_set_param user gnunet procd_set_param user gnunet
procd_set_param command $PROG -c $CONFIGFILE -l $LOGFILE procd_set_param command $PROG -c $CONFIGFILE
[ "$LOGFILE" ] && procd_append_param command -l $LOGFILE
procd_set_param respawn procd_set_param respawn
procd_close_instance procd_close_instance
} }