gnunet: packaging fixes

* include gnunet-service-zonemaster-monitor in gnunet-gns package
 * rename namestore-heap back to namestore-flat

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

net/gnunet/Makefile

@@ -260,7 +260,7 @@ USERID_gns:=:gnunetdns=452
 BIN_gns:=gns gns-import.sh namecache namestore resolver zoneimport 
 LIB_gns:=gns gnsrecord namecache namestore
 PLUGIN_gns:=block_dns block_gns gnsrecord_conversation gnsrecord_dns gnsrecord_gns
-LIBEXEC_gns:=dns2gns helper-dns service-dns service-gns service-namecache service-namestore service-resolver service-zonemaster
+LIBEXEC_gns:=dns2gns helper-dns service-dns service-gns service-namecache service-namestore service-resolver service-zonemaster service-zonemaster-monitor
 CONF_gns:=dns gns namecache namestore resolver zonemaster
 FILE_MODES_gns:=/usr/lib/gnunet/libexec/gnunet-helper-dns:root:gnunetdns:4750 /usr/lib/gnunet/libexec/gnunet-service-dns:gnunet:gnunetdns:2750
 

net/gnunet/files/gnunet-gns-flat.defaults

@@ -4,9 +4,9 @@ uci -q get gnunet.namestore || uci set gnunet.namestore=gnunet-config
 uci -q get gnunet.namecache || uci set gnunet.namecache=gnunet-config
 
 uci -q batch <<EOF
-	del gnunet.namestore_heap
-	set gnunet.namestore_heap=gnunet-config
-	set gnunet.namestore_heap.FILENAME=/etc/gnunet/namestore.flat
+	del gnunet.namestore_flat
+	set gnunet.namestore_flat=gnunet-config
+	set gnunet.namestore_flat.FILENAME=/etc/gnunet/namestore.flat
 	set gnunet.namestore.DATABASE=flat
 	del gnunet.namecache_flat
 	set gnunet.namecache_flat=gnunet-config