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

gnunet: update to SVN r38096

Browse source 
Wrap around dhtcache vs. datacache confusion which prevented
the datacache service from starting.
While at it, sanetize default package selection.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2016-09-30 13:52:13 +02:00
parent ce46b633e2
commit e32b189944
5 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
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:=38014 PKG_SOURCE_VERSION:=38096
PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION) PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
PKG_RELEASE:=1 PKG_RELEASE:=1
@ -143,7 +143,7 @@ define Package/gnunet/install
done ) done )
( for lib in arm ats block cadet core datacache dht \ ( for lib in arm ats block cadet core datacache dht \
dns dnsparser dnsstub fragmentation friends hello identity nat nse \ dns dnsparser fragmentation friends hello identity nat nse \
peerinfo regexblock regex revocation scalarproduct set \ peerinfo regexblock regex revocation scalarproduct set \
statistics transport util; do \ statistics transport util; do \
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnunet$$$$lib.so* $(1)/usr/lib/ ; \ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgnunet$$$$lib.so* $(1)/usr/lib/ ; \
@ -300,6 +300,10 @@ DEPENDS_gns-pgsql:=+gnunet-pgsql +gnunet-gns
PLUGIN_gns-pgsql:=namecache_postgres namestore_postgres PLUGIN_gns-pgsql:=namecache_postgres namestore_postgres
CONFLICTS_gns-pgsql:=gnunet-gns-sqlite gnunet-gns-flat CONFLICTS_gns-pgsql:=gnunet-gns-sqlite gnunet-gns-flat
DEPENDS_social-pgsql:=+gnunet-pgsql +gnunet-social
PLUGIN_social-pgsql:=psycstore_postgres
CONFLICTS_social-pgsql:=gnunet-social-sqlite gnunet-social-mysql
DEPENDS_sqlite:=+libsqlite3 DEPENDS_sqlite:=+libsqlite3
DEPENDS_gns-sqlite:=+gnunet-sqlite +gnunet-gns DEPENDS_gns-sqlite:=+gnunet-sqlite +gnunet-gns
@ -326,7 +330,7 @@ BIN_utils:=gns-proxy-setup-ca transport-certificate-creation scrypt
DEPENDS_vpn:=+kmod-tun +iptables +firewall DEPENDS_vpn:=+kmod-tun +iptables +firewall
BIN_vpn:=vpn BIN_vpn:=vpn
LIB_vpn:=tun vpn LIB_vpn:=dnsstub tun vpn
LIBEXEC_vpn:=daemon-exit daemon-pt helper-exit helper-vpn service-vpn LIBEXEC_vpn:=daemon-exit daemon-pt helper-exit helper-vpn service-vpn
CONF_vpn:=exit pt vpn CONF_vpn:=exit pt vpn
@ -378,19 +382,19 @@ $(eval $(call PostInstFixSUIDPerms,gnunet-vpn))
$(eval $(call BuildPackage,gnunet)) $(eval $(call BuildPackage,gnunet))
$(eval $(call BuildComponent,conversation,conversation component,)) $(eval $(call BuildComponent,conversation,conversation component,))
$(eval $(call BuildComponent,datastore,data storage components,)) $(eval $(call BuildComponent,datastore,data storage components,))
$(eval $(call BuildComponent,dv,distance-vector routing component,)) $(eval $(call BuildComponent,dv,distance-vector routing component,y))
$(eval $(call BuildComponent,experiments,experimental components,)) $(eval $(call BuildComponent,experiments,experimental components,))
$(eval $(call BuildComponent,fs,file-sharing components,)) $(eval $(call BuildComponent,fs,file-sharing components,))
$(eval $(call BuildComponent,gns,name resolution components,y)) $(eval $(call BuildComponent,gns,name resolution components,y))
$(eval $(call BuildComponent,gns-proxy,gns-proxy component,)) $(eval $(call BuildComponent,gns-proxy,gns-proxy component,))
$(eval $(call BuildComponent,hostlist,HTTP bootstrap hostlist client and server,)) $(eval $(call BuildComponent,hostlist,HTTP bootstrap hostlist client and server,y))
$(eval $(call BuildComponent,peerstore,peerstore local persistency component,)) $(eval $(call BuildComponent,peerstore,peerstore local persistency component,))
$(eval $(call BuildComponent,rest,REST interface,)) $(eval $(call BuildComponent,rest,REST interface,))
$(eval $(call BuildComponent,rps,RPS routing component,)) $(eval $(call BuildComponent,rps,RPS routing component,y))
$(eval $(call BuildComponent,social,social components,)) $(eval $(call BuildComponent,social,social components,))
$(eval $(call BuildComponent,namestore-fcfsd,first-come-first-serve registration server,)) $(eval $(call BuildComponent,namestore-fcfsd,first-come-first-serve registration server,))
$(eval $(call BuildComponent,fs-heap,heap-based filesharing plugins,)) $(eval $(call BuildComponent,fs-heap,heap-based filesharing plugins,))
$(eval $(call BuildComponent,gns-flat,flat storage GNS plugins,)) $(eval $(call BuildComponent,gns-flat,flat storage GNS plugins,y))
$(eval $(call BuildComponent,peerstore-flat,flat storage peerstore plugin,)) $(eval $(call BuildComponent,peerstore-flat,flat storage peerstore plugin,))
$(eval $(call BuildComponent,mysql,mySQL datastore backend,)) $(eval $(call BuildComponent,mysql,mySQL datastore backend,))
$(eval $(call BuildComponent,fs-mysql,mySQL filesharing plugins,)) $(eval $(call BuildComponent,fs-mysql,mySQL filesharing plugins,))
@ -398,6 +402,7 @@ $(eval $(call BuildComponent,social-mysql,mySQL social plugins,))
$(eval $(call BuildComponent,pgsql,PostgreSQL storage backends,)) $(eval $(call BuildComponent,pgsql,PostgreSQL storage backends,))
$(eval $(call BuildComponent,fs-pgsql,PostgreSQL filesharing plugins,)) $(eval $(call BuildComponent,fs-pgsql,PostgreSQL filesharing plugins,))
$(eval $(call BuildComponent,gns-pgsql,PostgreSQL GNS plugins,)) $(eval $(call BuildComponent,gns-pgsql,PostgreSQL GNS plugins,))
$(eval $(call BuildComponent,social-pgsql,PostgreSQL social plugins,))
$(eval $(call BuildComponent,sqlite,libsqlite3 storage backends,)) $(eval $(call BuildComponent,sqlite,libsqlite3 storage backends,))
$(eval $(call BuildComponent,fs-sqlite,libsqlite3 filesharing plugins,)) $(eval $(call BuildComponent,fs-sqlite,libsqlite3 filesharing plugins,))
$(eval $(call BuildComponent,gns-sqlite,libsqlite3 gns plugins,)) $(eval $(call BuildComponent,gns-sqlite,libsqlite3 gns plugins,))
@ -406,6 +411,6 @@ $(eval $(call BuildComponent,social-sqlite,libsqlite3 social plugins,))
$(eval $(call BuildComponent,transport-bluetooth,bluetooth transport,)) $(eval $(call BuildComponent,transport-bluetooth,bluetooth transport,))
$(eval $(call BuildComponent,transport-http_client,HTTP/HTTPS client transport,y)) $(eval $(call BuildComponent,transport-http_client,HTTP/HTTPS client transport,y))
$(eval $(call BuildComponent,transport-http_server,HTTP/HTTPS server transport,)) $(eval $(call BuildComponent,transport-http_server,HTTP/HTTPS server transport,))
$(eval $(call BuildComponent,transport-wlan,WLAN transport,)) $(eval $(call BuildComponent,transport-wlan,WLAN transport,y))
$(eval $(call BuildComponent,utils,administration utililties,)) $(eval $(call BuildComponent,utils,administration utililties,))
$(eval $(call BuildComponent,vpn,vpn components,y)) $(eval $(call BuildComponent,vpn,vpn components,y))

4
net/gnunet/files/gnunet-fs-heap.defaults
View file

@ -1,10 +1,10 @@
#!/bin/sh #!/bin/sh
uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config
uci -q get gnunet.datacache || uci set gnunet.datacache=gnunet-config uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
uci -q batch <<EOF uci -q batch <<EOF
set gnunet.datastore.DATABASE=heap set gnunet.datastore.DATABASE=heap
set gnunet.datacache.DATABASE=heap set gnunet.dhtcache.DATABASE=heap
commit gnunet commit gnunet
EOF EOF

4
net/gnunet/files/gnunet-fs-pgsql.defaults
View file

@ -1,10 +1,10 @@
#!/bin/sh #!/bin/sh
uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config
uci -q get gnunet.datacache || uci set gnunet.datacache=gnunet-config uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
uci -q batch <<EOF uci -q batch <<EOF
set gnunet.datastore.DATABASE=postgres set gnunet.datastore.DATABASE=postgres
set gnunet.datacache.DATABASE=postgres set gnunet.dhtcache.DATABASE=postgres
commit gnunet commit gnunet
EOF EOF

4
net/gnunet/files/gnunet-fs-sqlite.defaults
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config uci -q get gnunet.datastore || uci set gnunet.datastore=gnunet-config
uci -q get gnunet.datacache || uci set gnunet.datacache=gnunet-config uci -q get gnunet.dhtcache || uci set gnunet.dhtcache=gnunet-config
uci -q batch <<EOF uci -q batch <<EOF
del gnunet.datastore_sqlite del gnunet.datastore_sqlite
@ -11,6 +11,6 @@ uci -q batch <<EOF
del gnunet.datacache_sqlite del gnunet.datacache_sqlite
set gnunet.datacache_sqlite=gnunet-config set gnunet.datacache_sqlite=gnunet-config
set gnunet.datacache_sqlite.FILENAME=/var/run/gnunet/datacache.sqlite set gnunet.datacache_sqlite.FILENAME=/var/run/gnunet/datacache.sqlite
set gnunet.datacache.DATABASE=sqlite set gnunet.dhtcache.DATABASE=sqlite
commit gnunet commit gnunet
EOF EOF

8
net/gnunet/files/gnunet-social-pgsql.defaults Normal file
View file

@ -0,0 +1,8 @@
#!/bin/sh
uci -q get gnunet.psycstore || uci set gnunet.psycstore=gnunet-config
uci -q batch <<EOF
set gnunet.psycstore.DATABASE=postgres
commit gnunet
EOF