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

gnunet: update source and improve packaging

Browse source 
* push gnurl, gnutls and libmicrohttpd dependencies down to modules
 * use standard UID/GID for gnunet (958/958)
 * use GID adjecent (452) to dnsmasq (453) for gnunetdns to allow
   using the owner match with a range of GIDs (452-452)
 * package new gnunet-social pub/sub CLI tool

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2016-05-07 19:10:24 +01:00
parent ae125fcba0
commit 23b39e94db
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
net/gnunet/Makefile
View file

@ -8,9 +8,9 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gnunet PKG_NAME:=gnunet
PKG_SOURCE_VERSION:=37051 PKG_SOURCE_VERSION:=37146
PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION) PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
PKG_RELEASE:=4 PKG_RELEASE:=1
# ToDo: # ToDo:
# - break-out {peer,name,data}store for each backend # - break-out {peer,name,data}store for each backend
@ -25,7 +25,7 @@ PKG_LICENSE:=GPL-3.0
PKG_LICENSE_FILES:=COPYING PKG_LICENSE_FILES:=COPYING
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org> PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
PKG_BUILD_PARALLEL:=1 # PKG_BUILD_PARALLEL:=1
PKG_FIXUP:=gettext-version PKG_FIXUP:=gettext-version
PKG_INSTALL:=1 PKG_INSTALL:=1
@ -59,10 +59,9 @@ endef
define Package/gnunet define Package/gnunet
$(call Package/gnunet/Default) $(call Package/gnunet/Default)
TITLE+= - a peer-to-peer framework focusing on security TITLE+= - a peer-to-peer framework focusing on security
DEPENDS:=+ca-certificates +libgcrypt +libgpg-error +libgnurl \ DEPENDS:=+libgcrypt +libgpg-error +libidn +libltdl +libunistring +librt +zlib \
+libgnutls +libidn +libltdl +libunistring +librt \ $(ICONV_DEPENDS) $(INTL_DEPENDS)
$(ICONV_DEPENDS) $(INTL_DEPENDS) USERID:=gnunet=958:gnunet=958
USERID:=gnunet=400:gnunet=400
MENU:=1 MENU:=1
endef endef
@ -201,11 +200,11 @@ PLUGIN_conversation:=gnsrecord_conversation
LIBEXEC_conversation:=helper-audio-playback helper-audio-record service-conversation LIBEXEC_conversation:=helper-audio-playback helper-audio-record service-conversation
CONF_conversation:=conversation CONF_conversation:=conversation
DEPENDS_hostlist:=+libmicrohttpd DEPENDS_hostlist:=+libmicrohttpd +libgnurl +ca-certificates
LIBEXEC_hostlist:=daemon-hostlist LIBEXEC_hostlist:=daemon-hostlist
CONF_hostlist:=hostlist CONF_hostlist:=hostlist
DEPENDS_transport-http_client:=+libgnurl DEPENDS_transport-http_client:=+libgnurl +ca-certificates
PLUGIN_transport-http_client:=transport_http_client transport_https_client PLUGIN_transport-http_client:=transport_http_client transport_https_client
DEPENDS_transport-http_server:=+libmicrohttpd DEPENDS_transport-http_server:=+libmicrohttpd
@ -232,7 +231,7 @@ LIBEXEC_fs:=helper-fs-publish service-fs
CONF_fs:=fs CONF_fs:=fs
DEPENDS_gns:=+gnunet-vpn +iptables-mod-extra DEPENDS_gns:=+gnunet-vpn +iptables-mod-extra
USERID_gns:=gnunet=400:gnunetdns=401 USERID_gns:=gnunet=958:gnunetdns=452
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
@ -242,7 +241,7 @@ CONF_gns:=dns gns namecache namestore resolver
DEPENDS_namestore-fcfsd:=+gnunet-gns +libmicrohttpd DEPENDS_namestore-fcfsd:=+gnunet-gns +libmicrohttpd
LIBEXEC_namestore-fcfsd:=namestore-fcfsd LIBEXEC_namestore-fcfsd:=namestore-fcfsd
DEPENDS_gns-proxy:=+gnunet-gns +libmicrohttpd DEPENDS_gns-proxy:=+gnunet-gns +libgnurl +libmicrohttpd
LIBEXEC_gns-proxy:=gns-proxy LIBEXEC_gns-proxy:=gns-proxy
DEPENDS_datastore:=+gnunet-gns +libsqlite3 DEPENDS_datastore:=+gnunet-gns +libsqlite3
@ -269,7 +268,7 @@ LIB_pgsql:=postgres pq
PLUGIN_pgsql:=datacache_postgres datastore_postgres namecache_postgres namestore_postgres PLUGIN_pgsql:=datacache_postgres datastore_postgres namecache_postgres namestore_postgres
DEPENDS_rest:=+gnunet-gns +gnunet-social +libmicrohttpd +jansson DEPENDS_rest:=+gnunet-gns +gnunet-social +libmicrohttpd +jansson
LIB_rest:=rest LIB_rest:=rest json jsonapi jsonapiutils
PLUGIN_rest:=rest_gns rest_identity rest_identity_provider rest_namestore PLUGIN_rest:=rest_gns rest_identity rest_identity_provider rest_namestore
LIBEXEC_rest:=rest-server LIBEXEC_rest:=rest-server
CONF_rest:=rest CONF_rest:=rest
@ -280,7 +279,7 @@ LIBEXEC_rps:=service-rps
CONF_rps:=rps CONF_rps:=rps
DEPENDS_social:=+gnunet-sqlite +libmicrohttpd +jansson DEPENDS_social:=+gnunet-sqlite +libmicrohttpd +jansson
BIN_social:=identity-token multicast BIN_social:=identity-token multicast social
LIB_social:=consensus identityprovider multicast psyc psycstore psycutil secretsharing social LIB_social:=consensus identityprovider multicast psyc psycstore psycutil secretsharing social
PLUGIN_social:=psycstore_sqlite PLUGIN_social:=psycstore_sqlite
LIBEXEC_social:=service-consensus service-evil-consensus service-identity-provider service-multicast service-psyc service-psycstore service-secretsharing service-social LIBEXEC_social:=service-consensus service-evil-consensus service-identity-provider service-multicast service-psyc service-psycstore service-secretsharing service-social
@ -313,7 +312,8 @@ del network.gndnsrl
commit network commit network
del firewall.gnunetdns del firewall.gnunetdns
del firewall.gndnsinc del firewall.gndnsrl
del firewall.gndnsrl2
commit firewall commit firewall
EOF EOF
endef endef

2
net/gnunet/files/gnunet-gns.defaults
View file

@ -33,7 +33,7 @@ set firewall.gndnsrl=rule
set firewall.gndnsrl.name='Mark-local-DNS-for-GNUnet' set firewall.gndnsrl.name='Mark-local-DNS-for-GNUnet'
set firewall.gndnsrl.proto='udp' set firewall.gndnsrl.proto='udp'
set firewall.gndnsrl.dest_port='53' set firewall.gndnsrl.dest_port='53'
set firewall.gndnsrl.extra='-m owner ! --gid-owner gnunetdns' set firewall.gndnsrl.extra='-m owner ! --gid-owner 452-453'
set firewall.gndnsrl.target='MARK' set firewall.gndnsrl.target='MARK'
set firewall.gndnsrl.set_mark='136708149' set firewall.gndnsrl.set_mark='136708149'