[gnunet] branch master updated (096384eaa -> b436b0e3e)

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a change to branch master
in repository gnunet.

    from 096384eaa build: add new submodule locations
     new 2270ce64d transport: ftbfs since libgnunet change for NT
     new b436b0e3e build: cleanup contrib a bit and separate out actual data 
needed for build

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 Makefile.am                                        |   2 +-
 configure.ac                                       |   4 ++-
 contrib/Makefile.am                                |  27 +--------------------
 .../branding/logo/gnunet-logo-dark-only-text.svg   |   0
 .../branding/logo/gnunet-logo-dark-text.svg        |   0
 {contrib => data}/branding/logo/gnunet-logo.png    | Bin
 .../logo/lynXified-amirouche-anonymous-v3.png      | Bin
 .../branding/logo/lynXified-amirouche-v3.svg       |   0
 .../branding/logo/old-gnunet-logo-big.png          | Bin
 .../branding/logo/old-gnunet-logo-color.png        | Bin
 .../branding/logo/old-gnunet-logo-regrouped.svg    |   0
 .../branding/logo/old-gnunet-logo.pdf              | Bin
 .../branding/logo/old-gnunet-logo.svg              |   0
 {contrib => data}/fcfsd/fcfsd-forbidden.html       |   0
 {contrib => data}/fcfsd/fcfsd-index.html           |   0
 {contrib => data}/fcfsd/fcfsd-notfound.html        |   0
 {contrib => data}/gns/def.tex                      |   0
 {contrib => data}/gns/gns-bcd-forbidden.html       |   0
 {contrib => data}/gns/gns-bcd-internal-error.html  |   0
 {contrib => data}/gns/gns-bcd-invalid-key.html     |   0
 {contrib => data}/gns/gns-bcd-not-found.html       |   0
 {contrib => data}/gns/gns-bcd-png.tex              |   0
 {contrib => data}/gns/gns-bcd-simple.html          |   0
 {contrib => data}/gns/gns-bcd-simple.tex           |   0
 {contrib => data}/gns/gns-bcd.html                 |   0
 {contrib => data}/gns/gns-bcd.tex                  |   0
 {contrib => data}/hellos/Makefile.am               |   0
 ...SHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0 | Bin
 {contrib => data}/hellos/meson.build               |   0
 {contrib => data}/testing_hostkeys.ecc             | Bin
 {contrib => scripts}/netjail/netjail_core.sh       |   0
 {contrib => scripts}/netjail/netjail_exec.sh       |   0
 {contrib => scripts}/netjail/netjail_start.sh      |   0
 {contrib => scripts}/netjail/netjail_stop.sh       |   0
 {contrib => scripts}/netjail/topo.sh               |   0
 {contrib => scripts}/testing-ng/block.sh           |   0
 src/transport/gnunet-communicator-quic.c           |   1 -
 37 files changed, 5 insertions(+), 29 deletions(-)
 rename {contrib => data}/branding/logo/gnunet-logo-dark-only-text.svg (100%)
 rename {contrib => data}/branding/logo/gnunet-logo-dark-text.svg (100%)
 rename {contrib => data}/branding/logo/gnunet-logo.png (100%)
 rename {contrib => data}/branding/logo/lynXified-amirouche-anonymous-v3.png 
(100%)
 rename {contrib => data}/branding/logo/lynXified-amirouche-v3.svg (100%)
 rename {contrib => data}/branding/logo/old-gnunet-logo-big.png (100%)
 rename {contrib => data}/branding/logo/old-gnunet-logo-color.png (100%)
 rename {contrib => data}/branding/logo/old-gnunet-logo-regrouped.svg (100%)
 rename {contrib => data}/branding/logo/old-gnunet-logo.pdf (100%)
 rename {contrib => data}/branding/logo/old-gnunet-logo.svg (100%)
 rename {contrib => data}/fcfsd/fcfsd-forbidden.html (100%)
 rename {contrib => data}/fcfsd/fcfsd-index.html (100%)
 rename {contrib => data}/fcfsd/fcfsd-notfound.html (100%)
 rename {contrib => data}/gns/def.tex (100%)
 rename {contrib => data}/gns/gns-bcd-forbidden.html (100%)
 rename {contrib => data}/gns/gns-bcd-internal-error.html (100%)
 rename {contrib => data}/gns/gns-bcd-invalid-key.html (100%)
 rename {contrib => data}/gns/gns-bcd-not-found.html (100%)
 rename {contrib => data}/gns/gns-bcd-png.tex (100%)
 rename {contrib => data}/gns/gns-bcd-simple.html (100%)
 rename {contrib => data}/gns/gns-bcd-simple.tex (100%)
 rename {contrib => data}/gns/gns-bcd.html (100%)
 rename {contrib => data}/gns/gns-bcd.tex (100%)
 rename {contrib => data}/hellos/Makefile.am (100%)
 rename {contrib => 
data}/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0 (100%)
 rename {contrib => data}/hellos/meson.build (100%)
 rename {contrib => data}/testing_hostkeys.ecc (100%)
 rename {contrib => scripts}/netjail/netjail_core.sh (100%)
 rename {contrib => scripts}/netjail/netjail_exec.sh (100%)
 rename {contrib => scripts}/netjail/netjail_start.sh (100%)
 rename {contrib => scripts}/netjail/netjail_stop.sh (100%)
 rename {contrib => scripts}/netjail/topo.sh (100%)
 rename {contrib => scripts}/testing-ng/block.sh (100%)

diff --git a/Makefile.am b/Makefile.am
index 35e4ef83c..66c9532f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,7 +13,7 @@ if DOCUMENTATION
   SUBDIRS += doc
 endif
 
-SUBDIRS += contrib
+SUBDIRS += contrib data scripts
 
 EXTRA_DIST = \
  ABOUT-NLS \
diff --git a/configure.ac b/configure.ac
index b6d78c259..05e902399 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1214,7 +1214,9 @@ AC_CONFIG_FILES([
 Makefile
 bin/Makefile
 contrib/Makefile
-contrib/hellos/Makefile
+data/Makefile
+data/hellos/Makefile
+scripts/Makefile
 contrib/services/Makefile
 contrib/services/openrc/Makefile
 contrib/services/systemd/Makefile
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 13fdcdd60..4683f0791 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,35 +1,10 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 
-SUBDIRS = scripts hellos services
+SUBDIRS = scripts services
 
 include Makefile.inc
 
-dist_pkgdata_DATA = \
-  gns/def.tex \
-  gns/gns-bcd.html \
-  gns/gns-bcd.tex \
-  gns/gns-bcd-forbidden.html \
-  gns/gns-bcd-internal-error.html \
-  gns/gns-bcd-invalid-key.html \
-  gns/gns-bcd-not-found.html \
-  gns/gns-bcd-png.tex \
-  gns/gns-bcd-simple.html \
-  gns/gns-bcd-simple.tex \
-  fcfsd/fcfsd-index.html \
-  fcfsd/fcfsd-forbidden.html \
-  fcfsd/fcfsd-notfound.html \
-  branding/logo/gnunet-logo.png \
-  branding/logo/gnunet-logo-dark-text.svg \
-  branding/logo/gnunet-logo-dark-only-text.svg \
-  testing_hostkeys.ecc \
-  netjail/netjail_core.sh \
-  netjail/netjail_exec.sh \
-  netjail/netjail_start.sh \
-  netjail/netjail_stop.sh \
-  netjail/topo.sh \
-  testing-ng/block.sh
-
 INITD_FILES = \
   services/systemd/gnunet-user.service \
   services/systemd/sysusers-gnunet.conf \
diff --git a/contrib/branding/logo/gnunet-logo-dark-only-text.svg 
b/data/branding/logo/gnunet-logo-dark-only-text.svg
similarity index 100%
rename from contrib/branding/logo/gnunet-logo-dark-only-text.svg
rename to data/branding/logo/gnunet-logo-dark-only-text.svg
diff --git a/contrib/branding/logo/gnunet-logo-dark-text.svg 
b/data/branding/logo/gnunet-logo-dark-text.svg
similarity index 100%
rename from contrib/branding/logo/gnunet-logo-dark-text.svg
rename to data/branding/logo/gnunet-logo-dark-text.svg
diff --git a/contrib/branding/logo/gnunet-logo.png 
b/data/branding/logo/gnunet-logo.png
similarity index 100%
rename from contrib/branding/logo/gnunet-logo.png
rename to data/branding/logo/gnunet-logo.png
diff --git a/contrib/branding/logo/lynXified-amirouche-anonymous-v3.png 
b/data/branding/logo/lynXified-amirouche-anonymous-v3.png
similarity index 100%
rename from contrib/branding/logo/lynXified-amirouche-anonymous-v3.png
rename to data/branding/logo/lynXified-amirouche-anonymous-v3.png
diff --git a/contrib/branding/logo/lynXified-amirouche-v3.svg 
b/data/branding/logo/lynXified-amirouche-v3.svg
similarity index 100%
rename from contrib/branding/logo/lynXified-amirouche-v3.svg
rename to data/branding/logo/lynXified-amirouche-v3.svg
diff --git a/contrib/branding/logo/old-gnunet-logo-big.png 
b/data/branding/logo/old-gnunet-logo-big.png
similarity index 100%
rename from contrib/branding/logo/old-gnunet-logo-big.png
rename to data/branding/logo/old-gnunet-logo-big.png
diff --git a/contrib/branding/logo/old-gnunet-logo-color.png 
b/data/branding/logo/old-gnunet-logo-color.png
similarity index 100%
rename from contrib/branding/logo/old-gnunet-logo-color.png
rename to data/branding/logo/old-gnunet-logo-color.png
diff --git a/contrib/branding/logo/old-gnunet-logo-regrouped.svg 
b/data/branding/logo/old-gnunet-logo-regrouped.svg
similarity index 100%
rename from contrib/branding/logo/old-gnunet-logo-regrouped.svg
rename to data/branding/logo/old-gnunet-logo-regrouped.svg
diff --git a/contrib/branding/logo/old-gnunet-logo.pdf 
b/data/branding/logo/old-gnunet-logo.pdf
similarity index 100%
rename from contrib/branding/logo/old-gnunet-logo.pdf
rename to data/branding/logo/old-gnunet-logo.pdf
diff --git a/contrib/branding/logo/old-gnunet-logo.svg 
b/data/branding/logo/old-gnunet-logo.svg
similarity index 100%
rename from contrib/branding/logo/old-gnunet-logo.svg
rename to data/branding/logo/old-gnunet-logo.svg
diff --git a/contrib/fcfsd/fcfsd-forbidden.html 
b/data/fcfsd/fcfsd-forbidden.html
similarity index 100%
rename from contrib/fcfsd/fcfsd-forbidden.html
rename to data/fcfsd/fcfsd-forbidden.html
diff --git a/contrib/fcfsd/fcfsd-index.html b/data/fcfsd/fcfsd-index.html
similarity index 100%
rename from contrib/fcfsd/fcfsd-index.html
rename to data/fcfsd/fcfsd-index.html
diff --git a/contrib/fcfsd/fcfsd-notfound.html b/data/fcfsd/fcfsd-notfound.html
similarity index 100%
rename from contrib/fcfsd/fcfsd-notfound.html
rename to data/fcfsd/fcfsd-notfound.html
diff --git a/contrib/gns/def.tex b/data/gns/def.tex
similarity index 100%
rename from contrib/gns/def.tex
rename to data/gns/def.tex
diff --git a/contrib/gns/gns-bcd-forbidden.html 
b/data/gns/gns-bcd-forbidden.html
similarity index 100%
rename from contrib/gns/gns-bcd-forbidden.html
rename to data/gns/gns-bcd-forbidden.html
diff --git a/contrib/gns/gns-bcd-internal-error.html 
b/data/gns/gns-bcd-internal-error.html
similarity index 100%
rename from contrib/gns/gns-bcd-internal-error.html
rename to data/gns/gns-bcd-internal-error.html
diff --git a/contrib/gns/gns-bcd-invalid-key.html 
b/data/gns/gns-bcd-invalid-key.html
similarity index 100%
rename from contrib/gns/gns-bcd-invalid-key.html
rename to data/gns/gns-bcd-invalid-key.html
diff --git a/contrib/gns/gns-bcd-not-found.html 
b/data/gns/gns-bcd-not-found.html
similarity index 100%
rename from contrib/gns/gns-bcd-not-found.html
rename to data/gns/gns-bcd-not-found.html
diff --git a/contrib/gns/gns-bcd-png.tex b/data/gns/gns-bcd-png.tex
similarity index 100%
rename from contrib/gns/gns-bcd-png.tex
rename to data/gns/gns-bcd-png.tex
diff --git a/contrib/gns/gns-bcd-simple.html b/data/gns/gns-bcd-simple.html
similarity index 100%
rename from contrib/gns/gns-bcd-simple.html
rename to data/gns/gns-bcd-simple.html
diff --git a/contrib/gns/gns-bcd-simple.tex b/data/gns/gns-bcd-simple.tex
similarity index 100%
rename from contrib/gns/gns-bcd-simple.tex
rename to data/gns/gns-bcd-simple.tex
diff --git a/contrib/gns/gns-bcd.html b/data/gns/gns-bcd.html
similarity index 100%
rename from contrib/gns/gns-bcd.html
rename to data/gns/gns-bcd.html
diff --git a/contrib/gns/gns-bcd.tex b/data/gns/gns-bcd.tex
similarity index 100%
rename from contrib/gns/gns-bcd.tex
rename to data/gns/gns-bcd.tex
diff --git a/contrib/hellos/Makefile.am b/data/hellos/Makefile.am
similarity index 100%
rename from contrib/hellos/Makefile.am
rename to data/hellos/Makefile.am
diff --git 
a/contrib/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0 
b/data/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
similarity index 100%
rename from contrib/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
rename to data/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
diff --git a/contrib/hellos/meson.build b/data/hellos/meson.build
similarity index 100%
rename from contrib/hellos/meson.build
rename to data/hellos/meson.build
diff --git a/contrib/testing_hostkeys.ecc b/data/testing_hostkeys.ecc
similarity index 100%
rename from contrib/testing_hostkeys.ecc
rename to data/testing_hostkeys.ecc
diff --git a/contrib/netjail/netjail_core.sh b/scripts/netjail/netjail_core.sh
similarity index 100%
rename from contrib/netjail/netjail_core.sh
rename to scripts/netjail/netjail_core.sh
diff --git a/contrib/netjail/netjail_exec.sh b/scripts/netjail/netjail_exec.sh
similarity index 100%
rename from contrib/netjail/netjail_exec.sh
rename to scripts/netjail/netjail_exec.sh
diff --git a/contrib/netjail/netjail_start.sh b/scripts/netjail/netjail_start.sh
similarity index 100%
rename from contrib/netjail/netjail_start.sh
rename to scripts/netjail/netjail_start.sh
diff --git a/contrib/netjail/netjail_stop.sh b/scripts/netjail/netjail_stop.sh
similarity index 100%
rename from contrib/netjail/netjail_stop.sh
rename to scripts/netjail/netjail_stop.sh
diff --git a/contrib/netjail/topo.sh b/scripts/netjail/topo.sh
similarity index 100%
rename from contrib/netjail/topo.sh
rename to scripts/netjail/topo.sh
diff --git a/contrib/testing-ng/block.sh b/scripts/testing-ng/block.sh
similarity index 100%
rename from contrib/testing-ng/block.sh
rename to scripts/testing-ng/block.sh
diff --git a/src/transport/gnunet-communicator-quic.c 
b/src/transport/gnunet-communicator-quic.c
index 1225a3817..0a7e511eb 100644
--- a/src/transport/gnunet-communicator-quic.c
+++ b/src/transport/gnunet-communicator-quic.c
@@ -45,7 +45,6 @@
 #include "gnunet_statistics_service.h"
 #include "gnunet_transport_application_service.h"
 #include "gnunet_transport_communication_service.h"
-#include "gnunet_nt_lib.h"
 #include "gnunet_nat_service.h"
 #include "stdint.h"
 #include "inttypes.h"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.