[gnunet] 05/06: BUILD: Move regex/dns to service

[gnunet]

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

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

commit 7f72b05249f6ac663cee7a033f3cac5d9400ede7
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 09:03:33 2023 +0200

    BUILD: Move regex/dns to service
---
 configure.ac                                       |   8 ++--
 po/POTFILES.in                                     |  42 ++++++++++-----------
 src/Makefile.am                                    |   2 -
 src/exit/Makefile.am                               |   2 +-
 src/gns/Makefile.am                                |   2 +-
 src/pt/Makefile.am                                 |   2 +-
 src/service/Makefile.am                            |   2 +
 src/{ => service}/dns/.gitignore                   |   0
 src/{ => service}/dns/Makefile.am                  |   0
 src/{ => service}/dns/dns.conf.in                  |   0
 src/{ => service}/dns/dns.h                        |   0
 src/{ => service}/dns/dns_api.c                    |   0
 src/{ => service}/dns/gnunet-dns-monitor.c         |   0
 src/{ => service}/dns/gnunet-dns-redirector.c      |   0
 src/{ => service}/dns/gnunet-helper-dns.c          |   0
 src/{ => service}/dns/gnunet-service-dns.c         |   0
 src/{ => service}/dns/gnunet-zonewalk.c            |   0
 src/{ => service}/dns/meson.build                  |   0
 src/{ => service}/dns/plugin_block_dns.c           |   0
 src/{ => service}/dns/test_gnunet_dns.sh           |   0
 src/{ => service}/regex/.gitignore                 |   0
 src/{ => service}/regex/Makefile.am                |   0
 .../regex/gnunet-daemon-regexprofiler.c            |   0
 src/{ => service}/regex/gnunet-regex-profiler.c    |   0
 .../regex/gnunet-regex-simulation-profiler.c       |   0
 src/{ => service}/regex/gnunet-service-regex.c     |   0
 src/{ => service}/regex/meson.build                |   0
 src/{ => service}/regex/perf-data.tar.gz           | Bin
 src/{ => service}/regex/perf-regex.c               |   0
 src/{ => service}/regex/plugin_block_regex.c       |   0
 src/{ => service}/regex/regex.conf.in              |   0
 src/{ => service}/regex/regex_api_announce.c       |   0
 src/{ => service}/regex/regex_api_search.c         |   0
 src/{ => service}/regex/regex_block_lib.c          |   0
 src/{ => service}/regex/regex_block_lib.h          |   0
 src/{ => service}/regex/regex_internal.c           |   0
 src/{ => service}/regex/regex_internal.h           |   0
 src/{ => service}/regex/regex_internal_dht.c       |   0
 src/{ => service}/regex/regex_internal_lib.h       |   0
 src/{ => service}/regex/regex_ipc.h                |   0
 .../regex/regex_simulation_profiler_test.conf      |   0
 src/{ => service}/regex/regex_test_graph.c         |   0
 src/{ => service}/regex/regex_test_lib.c           |   0
 src/{ => service}/regex/regex_test_lib.h           |   0
 src/{ => service}/regex/regex_test_random.c        |   0
 src/{ => service}/regex/test_regex_api.c           |   0
 src/{ => service}/regex/test_regex_api_data.conf   |   0
 src/{ => service}/regex/test_regex_eval_api.c      |   0
 src/{ => service}/regex/test_regex_graph_api.c     |   0
 src/{ => service}/regex/test_regex_integration.c   |   0
 src/{ => service}/regex/test_regex_iterate_api.c   |   0
 src/{ => service}/regex/test_regex_proofs.c        |   0
 src/vpn/Makefile.am                                |   2 +-
 53 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/configure.ac b/configure.ac
index 98ae7939c..bb3868651 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1253,6 +1253,8 @@ src/service/datastore/Makefile
 src/service/datastore/datastore.conf
 src/service/dht/Makefile
 src/service/dht/dht.conf
+src/service/dns/Makefile
+src/service/dns/dns.conf
 src/service/hostlist/Makefile
 src/service/identity/Makefile
 src/service/identity/identity.conf
@@ -1264,6 +1266,8 @@ src/service/nse/Makefile
 src/service/nse/nse.conf
 src/service/peerstore/Makefile
 src/service/peerstore/peerstore.conf
+src/service/regex/Makefile
+src/service/regex/regex.conf
 src/service/rest/Makefile
 src/service/statistics/Makefile
 src/service/statistics/statistics.conf
@@ -1299,8 +1303,6 @@ src/consensus/Makefile
 src/consensus/consensus.conf
 src/conversation/Makefile
 src/conversation/conversation.conf
-src/dns/Makefile
-src/dns/dns.conf
 src/exit/Makefile
 src/fs/Makefile
 src/fs/fs.conf
@@ -1315,8 +1317,6 @@ src/namecache/namecache.conf
 src/namestore/Makefile
 src/namestore/namestore.conf
 src/pt/Makefile
-src/regex/Makefile
-src/regex/regex.conf
 src/revocation/Makefile
 src/revocation/revocation.conf
 src/secretsharing/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 474504fc0..9086d5edc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -62,13 +62,6 @@ src/conversation/gnunet_gst_test.c
 src/conversation/microphone.c
 src/conversation/plugin_gnsrecord_conversation.c
 src/conversation/speaker.c
-src/dns/dns_api.c
-src/dns/gnunet-dns-monitor.c
-src/dns/gnunet-dns-redirector.c
-src/dns/gnunet-helper-dns.c
-src/dns/gnunet-service-dns.c
-src/dns/gnunet-zonewalk.c
-src/dns/plugin_block_dns.c
 src/exit/gnunet-daemon-exit.c
 src/exit/gnunet-helper-exit.c
 src/fs/fs_api.c
@@ -307,20 +300,6 @@ src/reclaim/plugin_rest_reclaim.c
 src/reclaim/reclaim_api.c
 src/reclaim/reclaim_attribute.c
 src/reclaim/reclaim_credential.c
-src/regex/gnunet-daemon-regexprofiler.c
-src/regex/gnunet-regex-profiler.c
-src/regex/gnunet-regex-simulation-profiler.c
-src/regex/gnunet-service-regex.c
-src/regex/perf-regex.c
-src/regex/plugin_block_regex.c
-src/regex/regex_api_announce.c
-src/regex/regex_api_search.c
-src/regex/regex_block_lib.c
-src/regex/regex_internal.c
-src/regex/regex_internal_dht.c
-src/regex/regex_test_graph.c
-src/regex/regex_test_lib.c
-src/regex/regex_test_random.c
 src/rest-plugin/identity/plugin_rest_identity.c
 src/rest-plugin/rest/plugin_rest_config.c
 src/rest-plugin/rest/plugin_rest_copying.c
@@ -388,6 +367,13 @@ src/service/dht/gnunet-service-dht_neighbours.c
 src/service/dht/gnunet-service-dht_routing.c
 src/service/dht/gnunet_dht_profiler.c
 src/service/dht/plugin_block_dht.c
+src/service/dns/dns_api.c
+src/service/dns/gnunet-dns-monitor.c
+src/service/dns/gnunet-dns-redirector.c
+src/service/dns/gnunet-helper-dns.c
+src/service/dns/gnunet-service-dns.c
+src/service/dns/gnunet-zonewalk.c
+src/service/dns/plugin_block_dns.c
 src/service/hostlist/gnunet-daemon-hostlist.c
 src/service/hostlist/gnunet-daemon-hostlist_client.c
 src/service/hostlist/gnunet-daemon-hostlist_server.c
@@ -418,6 +404,20 @@ src/service/peerstore/peerstore_api.c
 src/service/peerstore/peerstore_common.c
 src/service/peerstore/plugin_peerstore_flat.c
 src/service/peerstore/plugin_peerstore_sqlite.c
+src/service/regex/gnunet-daemon-regexprofiler.c
+src/service/regex/gnunet-regex-profiler.c
+src/service/regex/gnunet-regex-simulation-profiler.c
+src/service/regex/gnunet-service-regex.c
+src/service/regex/perf-regex.c
+src/service/regex/plugin_block_regex.c
+src/service/regex/regex_api_announce.c
+src/service/regex/regex_api_search.c
+src/service/regex/regex_block_lib.c
+src/service/regex/regex_internal.c
+src/service/regex/regex_internal_dht.c
+src/service/regex/regex_test_graph.c
+src/service/regex/regex_test_lib.c
+src/service/regex/regex_test_random.c
 src/service/rest/gnunet-rest-server.c
 src/service/rest/rest.c
 src/service/statistics/gnunet-service-statistics.c
diff --git a/src/Makefile.am b/src/Makefile.am
index da3cd2d5f..16eafc57b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,6 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  regex \
-  dns \
   namecache \
   namestore \
   set \
diff --git a/src/exit/Makefile.am b/src/exit/Makefile.am
index 65ea493dc..524fe19fa 100644
--- a/src/exit/Makefile.am
+++ b/src/exit/Makefile.am
@@ -34,5 +34,5 @@ gnunet_daemon_exit_LDADD = \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+  $(top_builddir)/src/service/regex/libgnunetregex.la \
   $(GN_LIBINTL)
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index c42e5e6d4..4a84f914f 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -203,7 +203,7 @@ gnunet_service_gns_LDADD = \
   $(top_builddir)/src/revocation/libgnunetrevocation.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
+  $(top_builddir)/src/service/dns/libgnunetdns.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
   $(top_builddir)/src/namecache/libgnunetnamecache.la \
   $(LIBIDN) $(LIBIDN2) \
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 659ede7f8..567cbb6d7 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -23,7 +23,7 @@ gnunet_daemon_pt_LDADD = \
   $(top_builddir)/src/vpn/libgnunetvpn.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
-  $(top_builddir)/src/dns/libgnunetdns.la \
+  $(top_builddir)/src/service/dns/libgnunetdns.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(GN_LIBINTL)
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 6b4fa3264..45b24a4a2 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -11,9 +11,11 @@ SUBDIRS = \
        nse \
   hostlist \
   topology \
+  dns \
        identity \
        rest \
        datacache \
        datastore \
        dht \
+  regex \
        cadet
diff --git a/src/dns/.gitignore b/src/service/dns/.gitignore
similarity index 100%
rename from src/dns/.gitignore
rename to src/service/dns/.gitignore
diff --git a/src/dns/Makefile.am b/src/service/dns/Makefile.am
similarity index 100%
rename from src/dns/Makefile.am
rename to src/service/dns/Makefile.am
diff --git a/src/dns/dns.conf.in b/src/service/dns/dns.conf.in
similarity index 100%
rename from src/dns/dns.conf.in
rename to src/service/dns/dns.conf.in
diff --git a/src/dns/dns.h b/src/service/dns/dns.h
similarity index 100%
rename from src/dns/dns.h
rename to src/service/dns/dns.h
diff --git a/src/dns/dns_api.c b/src/service/dns/dns_api.c
similarity index 100%
rename from src/dns/dns_api.c
rename to src/service/dns/dns_api.c
diff --git a/src/dns/gnunet-dns-monitor.c b/src/service/dns/gnunet-dns-monitor.c
similarity index 100%
rename from src/dns/gnunet-dns-monitor.c
rename to src/service/dns/gnunet-dns-monitor.c
diff --git a/src/dns/gnunet-dns-redirector.c 
b/src/service/dns/gnunet-dns-redirector.c
similarity index 100%
rename from src/dns/gnunet-dns-redirector.c
rename to src/service/dns/gnunet-dns-redirector.c
diff --git a/src/dns/gnunet-helper-dns.c b/src/service/dns/gnunet-helper-dns.c
similarity index 100%
rename from src/dns/gnunet-helper-dns.c
rename to src/service/dns/gnunet-helper-dns.c
diff --git a/src/dns/gnunet-service-dns.c b/src/service/dns/gnunet-service-dns.c
similarity index 100%
rename from src/dns/gnunet-service-dns.c
rename to src/service/dns/gnunet-service-dns.c
diff --git a/src/dns/gnunet-zonewalk.c b/src/service/dns/gnunet-zonewalk.c
similarity index 100%
rename from src/dns/gnunet-zonewalk.c
rename to src/service/dns/gnunet-zonewalk.c
diff --git a/src/dns/meson.build b/src/service/dns/meson.build
similarity index 100%
rename from src/dns/meson.build
rename to src/service/dns/meson.build
diff --git a/src/dns/plugin_block_dns.c b/src/service/dns/plugin_block_dns.c
similarity index 100%
rename from src/dns/plugin_block_dns.c
rename to src/service/dns/plugin_block_dns.c
diff --git a/src/dns/test_gnunet_dns.sh b/src/service/dns/test_gnunet_dns.sh
similarity index 100%
rename from src/dns/test_gnunet_dns.sh
rename to src/service/dns/test_gnunet_dns.sh
diff --git a/src/regex/.gitignore b/src/service/regex/.gitignore
similarity index 100%
rename from src/regex/.gitignore
rename to src/service/regex/.gitignore
diff --git a/src/regex/Makefile.am b/src/service/regex/Makefile.am
similarity index 100%
rename from src/regex/Makefile.am
rename to src/service/regex/Makefile.am
diff --git a/src/regex/gnunet-daemon-regexprofiler.c 
b/src/service/regex/gnunet-daemon-regexprofiler.c
similarity index 100%
rename from src/regex/gnunet-daemon-regexprofiler.c
rename to src/service/regex/gnunet-daemon-regexprofiler.c
diff --git a/src/regex/gnunet-regex-profiler.c 
b/src/service/regex/gnunet-regex-profiler.c
similarity index 100%
rename from src/regex/gnunet-regex-profiler.c
rename to src/service/regex/gnunet-regex-profiler.c
diff --git a/src/regex/gnunet-regex-simulation-profiler.c 
b/src/service/regex/gnunet-regex-simulation-profiler.c
similarity index 100%
rename from src/regex/gnunet-regex-simulation-profiler.c
rename to src/service/regex/gnunet-regex-simulation-profiler.c
diff --git a/src/regex/gnunet-service-regex.c 
b/src/service/regex/gnunet-service-regex.c
similarity index 100%
rename from src/regex/gnunet-service-regex.c
rename to src/service/regex/gnunet-service-regex.c
diff --git a/src/regex/meson.build b/src/service/regex/meson.build
similarity index 100%
rename from src/regex/meson.build
rename to src/service/regex/meson.build
diff --git a/src/regex/perf-data.tar.gz b/src/service/regex/perf-data.tar.gz
similarity index 100%
rename from src/regex/perf-data.tar.gz
rename to src/service/regex/perf-data.tar.gz
diff --git a/src/regex/perf-regex.c b/src/service/regex/perf-regex.c
similarity index 100%
rename from src/regex/perf-regex.c
rename to src/service/regex/perf-regex.c
diff --git a/src/regex/plugin_block_regex.c 
b/src/service/regex/plugin_block_regex.c
similarity index 100%
rename from src/regex/plugin_block_regex.c
rename to src/service/regex/plugin_block_regex.c
diff --git a/src/regex/regex.conf.in b/src/service/regex/regex.conf.in
similarity index 100%
rename from src/regex/regex.conf.in
rename to src/service/regex/regex.conf.in
diff --git a/src/regex/regex_api_announce.c 
b/src/service/regex/regex_api_announce.c
similarity index 100%
rename from src/regex/regex_api_announce.c
rename to src/service/regex/regex_api_announce.c
diff --git a/src/regex/regex_api_search.c b/src/service/regex/regex_api_search.c
similarity index 100%
rename from src/regex/regex_api_search.c
rename to src/service/regex/regex_api_search.c
diff --git a/src/regex/regex_block_lib.c b/src/service/regex/regex_block_lib.c
similarity index 100%
rename from src/regex/regex_block_lib.c
rename to src/service/regex/regex_block_lib.c
diff --git a/src/regex/regex_block_lib.h b/src/service/regex/regex_block_lib.h
similarity index 100%
rename from src/regex/regex_block_lib.h
rename to src/service/regex/regex_block_lib.h
diff --git a/src/regex/regex_internal.c b/src/service/regex/regex_internal.c
similarity index 100%
rename from src/regex/regex_internal.c
rename to src/service/regex/regex_internal.c
diff --git a/src/regex/regex_internal.h b/src/service/regex/regex_internal.h
similarity index 100%
rename from src/regex/regex_internal.h
rename to src/service/regex/regex_internal.h
diff --git a/src/regex/regex_internal_dht.c 
b/src/service/regex/regex_internal_dht.c
similarity index 100%
rename from src/regex/regex_internal_dht.c
rename to src/service/regex/regex_internal_dht.c
diff --git a/src/regex/regex_internal_lib.h 
b/src/service/regex/regex_internal_lib.h
similarity index 100%
rename from src/regex/regex_internal_lib.h
rename to src/service/regex/regex_internal_lib.h
diff --git a/src/regex/regex_ipc.h b/src/service/regex/regex_ipc.h
similarity index 100%
rename from src/regex/regex_ipc.h
rename to src/service/regex/regex_ipc.h
diff --git a/src/regex/regex_simulation_profiler_test.conf 
b/src/service/regex/regex_simulation_profiler_test.conf
similarity index 100%
rename from src/regex/regex_simulation_profiler_test.conf
rename to src/service/regex/regex_simulation_profiler_test.conf
diff --git a/src/regex/regex_test_graph.c b/src/service/regex/regex_test_graph.c
similarity index 100%
rename from src/regex/regex_test_graph.c
rename to src/service/regex/regex_test_graph.c
diff --git a/src/regex/regex_test_lib.c b/src/service/regex/regex_test_lib.c
similarity index 100%
rename from src/regex/regex_test_lib.c
rename to src/service/regex/regex_test_lib.c
diff --git a/src/regex/regex_test_lib.h b/src/service/regex/regex_test_lib.h
similarity index 100%
rename from src/regex/regex_test_lib.h
rename to src/service/regex/regex_test_lib.h
diff --git a/src/regex/regex_test_random.c 
b/src/service/regex/regex_test_random.c
similarity index 100%
rename from src/regex/regex_test_random.c
rename to src/service/regex/regex_test_random.c
diff --git a/src/regex/test_regex_api.c b/src/service/regex/test_regex_api.c
similarity index 100%
rename from src/regex/test_regex_api.c
rename to src/service/regex/test_regex_api.c
diff --git a/src/regex/test_regex_api_data.conf 
b/src/service/regex/test_regex_api_data.conf
similarity index 100%
rename from src/regex/test_regex_api_data.conf
rename to src/service/regex/test_regex_api_data.conf
diff --git a/src/regex/test_regex_eval_api.c 
b/src/service/regex/test_regex_eval_api.c
similarity index 100%
rename from src/regex/test_regex_eval_api.c
rename to src/service/regex/test_regex_eval_api.c
diff --git a/src/regex/test_regex_graph_api.c 
b/src/service/regex/test_regex_graph_api.c
similarity index 100%
rename from src/regex/test_regex_graph_api.c
rename to src/service/regex/test_regex_graph_api.c
diff --git a/src/regex/test_regex_integration.c 
b/src/service/regex/test_regex_integration.c
similarity index 100%
rename from src/regex/test_regex_integration.c
rename to src/service/regex/test_regex_integration.c
diff --git a/src/regex/test_regex_iterate_api.c 
b/src/service/regex/test_regex_iterate_api.c
similarity index 100%
rename from src/regex/test_regex_iterate_api.c
rename to src/service/regex/test_regex_iterate_api.c
diff --git a/src/regex/test_regex_proofs.c 
b/src/service/regex/test_regex_proofs.c
similarity index 100%
rename from src/regex/test_regex_proofs.c
rename to src/service/regex/test_regex_proofs.c
diff --git a/src/vpn/Makefile.am b/src/vpn/Makefile.am
index 2f465731c..6fc1bff20 100644
--- a/src/vpn/Makefile.am
+++ b/src/vpn/Makefile.am
@@ -42,7 +42,7 @@ gnunet_service_vpn_LDADD = \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
-  $(top_builddir)/src/regex/libgnunetregex.la \
+  $(top_builddir)/src/service/regex/libgnunetregex.la \
   $(GN_LIBINTL)
 gnunet_service_vpn_CFLAGS = \
   -I$(top_srcdir)/src/exit $(CFLAGS)

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