[gnunet] 03/06: BUILD: Move revocation 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 4e28833d9ecb6bbd933b770eae2b712fc0d80286
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 10:19:42 2023 +0200

    BUILD: Move revocation to service
---
 configure.ac                                       |  6 ++-
 po/POTFILES.in                                     | 10 ++---
 src/Makefile.am                                    |  1 -
 src/cli/.gitignore                                 |  2 +
 src/cli/Makefile.am                                |  1 +
 src/cli/revocation/Makefile.am                     | 52 ++++++++++++++++++++++
 src/{ => cli}/revocation/gnunet-revocation-tvg.c   |  3 +-
 src/{ => cli}/revocation/gnunet-revocation.c       |  0
 .../revocation/test_local_revocation.py.in         |  0
 src/gns/Makefile.am                                |  2 +-
 src/plugin/Makefile.am                             |  3 +-
 src/plugin/revocation/Makefile.am                  | 28 ++++++++++++
 .../revocation/plugin_block_revocation.c           |  3 +-
 src/service/Makefile.am                            |  4 +-
 src/{ => service}/revocation/.gitignore            |  0
 src/{ => service}/revocation/Makefile.am           | 48 +-------------------
 .../revocation/gnunet-service-revocation.c         |  0
 src/{ => service}/revocation/meson.build           |  0
 src/{ => service}/revocation/revocation.conf.in    |  0
 src/{ => service}/revocation/revocation.h          |  0
 src/{ => service}/revocation/revocation_api.c      |  0
 src/{ => service}/revocation/test_revocation.c     |  0
 src/{ => service}/revocation/test_revocation.conf  |  0
 .../revocation/test_revocation_testvectors.c       |  0
 24 files changed, 103 insertions(+), 60 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0cbda16e7..b89275e87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1243,6 +1243,7 @@ src/plugin/dhtu/Makefile
 src/plugin/gnsrecord/Makefile
 src/plugin/namecache/Makefile
 src/plugin/namestore/Makefile
+src/plugin/revocation/Makefile
 src/service/Makefile
 src/service/arm/Makefile
 src/service/arm/arm.conf
@@ -1275,6 +1276,8 @@ src/service/peerstore/peerstore.conf
 src/service/regex/Makefile
 src/service/regex/regex.conf
 src/service/rest/Makefile
+src/service/revocation/Makefile
+src/service/revocation/revocation.conf
 src/service/seti/Makefile
 src/service/seti/seti.conf
 src/service/setu/Makefile
@@ -1300,6 +1303,7 @@ src/cli/namestore/Makefile
 src/cli/nat/Makefile
 src/cli/nat-auto/Makefile
 src/cli/nse/Makefile
+src/cli/revocation/Makefile
 src/cli/statistics/Makefile
 src/cli/util/Makefile
 src/contrib/Makefile
@@ -1331,8 +1335,6 @@ src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
 src/pt/Makefile
-src/revocation/Makefile
-src/revocation/revocation.conf
 src/vpn/Makefile
 src/vpn/vpn.conf
 src/zonemaster/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ebc3287ba..f3b42e0dd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,6 +16,8 @@ src/cli/nat-auto/gnunet-nat-auto.c
 src/cli/nat-auto/gnunet-nat-server.c
 src/cli/nat/gnunet-nat.c
 src/cli/nse/gnunet-nse.c
+src/cli/revocation/gnunet-revocation-tvg.c
+src/cli/revocation/gnunet-revocation.c
 src/cli/statistics/gnunet-statistics.c
 src/cli/util/gnunet-base32.c
 src/cli/util/gnunet-config-diff.c
@@ -293,6 +295,7 @@ src/plugin/namestore/plugin_namestore_flat.c
 src/plugin/namestore/plugin_namestore_postgres.c
 src/plugin/namestore/plugin_namestore_sqlite.c
 src/plugin/namestore/plugin_rest_namestore.c
+src/plugin/revocation/plugin_block_revocation.c
 src/pt/gnunet-daemon-pt.c
 src/reclaim/did_core.c
 src/reclaim/did_helper.c
@@ -317,11 +320,6 @@ src/reclaim/reclaim_credential.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
-src/revocation/gnunet-revocation-tvg.c
-src/revocation/gnunet-revocation.c
-src/revocation/gnunet-service-revocation.c
-src/revocation/plugin_block_revocation.c
-src/revocation/revocation_api.c
 src/service/arm/arm_api.c
 src/service/arm/arm_monitor_api.c
 src/service/arm/gnunet-service-arm.c
@@ -430,6 +428,8 @@ 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/revocation/gnunet-service-revocation.c
+src/service/revocation/revocation_api.c
 src/service/seti/gnunet-service-seti.c
 src/service/seti/gnunet-seti-profiler.c
 src/service/seti/plugin_block_seti_test.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 2bae1947e..8bf3b72a3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  revocation \
   vpn \
   gns \
   zonemaster \
diff --git a/src/cli/.gitignore b/src/cli/.gitignore
new file mode 100644
index 000000000..cedad92f1
--- /dev/null
+++ b/src/cli/.gitignore
@@ -0,0 +1,2 @@
+gnunet-revocation
+gnunet-revocation-tvg
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index 78ff8b07b..b06927edc 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -10,4 +10,5 @@ SUBDIRS = \
        dht \
        namecache \
        namestore \
+       revocation \
        cadet
diff --git a/src/cli/revocation/Makefile.am b/src/cli/revocation/Makefile.am
new file mode 100644
index 000000000..e4d6a6f35
--- /dev/null
+++ b/src/cli/revocation/Makefile.am
@@ -0,0 +1,52 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+bin_PROGRAMS = \
+ gnunet-revocation
+
+gnunet_revocation_SOURCES = \
+ gnunet-revocation.c
+gnunet_revocation_LDADD = \
+  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+gnunet_revocation_tvg_SOURCES = \
+ gnunet-revocation-tvg.c
+gnunet_revocation_tvg_LDADD = \
+  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
+
+noinst_PROGRAMS = \
+ gnunet-revocation-tvg
+
+check_SCRIPTS = \
+ #test_local_revocation.py
+
+if ENABLE_TEST_RUN
+ AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
+ TESTS = \
+ $(check_SCRIPTS) \
+ $(check_PROGRAMS)
+endif
+
+test_local_revocation.py: test_local_revocation.py.in Makefile
+       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/test_local_revocation.py.in > test_local_revocation.py
+       chmod +x test_local_revocation.py
+
+EXTRA_DIST = test_revocation.conf \
+       test_local_revocation.py.in
diff --git a/src/revocation/gnunet-revocation-tvg.c 
b/src/cli/revocation/gnunet-revocation-tvg.c
similarity index 98%
rename from src/revocation/gnunet-revocation-tvg.c
rename to src/cli/revocation/gnunet-revocation-tvg.c
index b59b7ba62..7d354ed74 100644
--- a/src/revocation/gnunet-revocation-tvg.c
+++ b/src/cli/revocation/gnunet-revocation-tvg.c
@@ -28,7 +28,8 @@
 #include "gnunet_signatures.h"
 #include "gnunet_revocation_service.h"
 #include "gnunet_testing_lib.h"
-#include "revocation.h"
+// FIXME try to avoid this include somehow
+#include "../../service/revocation/revocation.h"
 #include <inttypes.h>
 
 #define TEST_EPOCHS 2
diff --git a/src/revocation/gnunet-revocation.c 
b/src/cli/revocation/gnunet-revocation.c
similarity index 100%
rename from src/revocation/gnunet-revocation.c
rename to src/cli/revocation/gnunet-revocation.c
diff --git a/src/revocation/test_local_revocation.py.in 
b/src/cli/revocation/test_local_revocation.py.in
similarity index 100%
rename from src/revocation/test_local_revocation.py.in
rename to src/cli/revocation/test_local_revocation.py.in
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 08d85c903..c5d81ca76 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -200,7 +200,7 @@ gnunet_service_gns_LDADD = \
   -lm \
   $(top_builddir)/src/lib/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/revocation/libgnunetrevocation.la \
+  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
   $(top_builddir)/src/service/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/lib/util/libgnunetutil.la \
   $(top_builddir)/src/service/dns/libgnunetdns.la \
diff --git a/src/plugin/Makefile.am b/src/plugin/Makefile.am
index 62036f206..01a48de85 100644
--- a/src/plugin/Makefile.am
+++ b/src/plugin/Makefile.am
@@ -3,4 +3,5 @@ SUBDIRS = \
        gnsrecord \
        dhtu \
        namecache \
-       namestore
+       namestore \
+       revocation
diff --git a/src/plugin/revocation/Makefile.am 
b/src/plugin/revocation/Makefile.am
new file mode 100644
index 000000000..db6df02c9
--- /dev/null
+++ b/src/plugin/revocation/Makefile.am
@@ -0,0 +1,28 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include
+
+plugindir = $(libdir)/gnunet
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+  XLIB = -lgcov
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugin_LTLIBRARIES = \
+  libgnunet_plugin_block_revocation.la
+
+libgnunet_plugin_block_revocation_la_SOURCES = \
+  plugin_block_revocation.c
+libgnunet_plugin_block_revocation_la_LIBADD = \
+  $(top_builddir)/src/service/revocation/libgnunetrevocation.la \
+  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/lib/block/libgnunetblock.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la  \
+  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
+  $(LTLIBINTL)
+libgnunet_plugin_block_revocation_la_LDFLAGS = \
+ $(GN_PLUGIN_LDFLAGS)
diff --git a/src/revocation/plugin_block_revocation.c 
b/src/plugin/revocation/plugin_block_revocation.c
similarity index 98%
rename from src/revocation/plugin_block_revocation.c
rename to src/plugin/revocation/plugin_block_revocation.c
index 9686f23ff..4c5991507 100644
--- a/src/revocation/plugin_block_revocation.c
+++ b/src/plugin/revocation/plugin_block_revocation.c
@@ -28,7 +28,8 @@
 #include "gnunet_signatures.h"
 #include "gnunet_block_plugin.h"
 #include "gnunet_block_group_lib.h"
-#include "revocation.h"
+// FIXME try to avoid this include somehow
+#include "../../service/revocation/revocation.h"
 #include "gnunet_revocation_service.h"
 
 #define DEBUG_REVOCATION GNUNET_EXTRA_LOGGING
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index e39b28ae9..52dec5726 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -22,4 +22,6 @@ SUBDIRS = \
        cadet \
   seti \
   setu \
-  regex
+  regex \
+  revocation
+
diff --git a/src/revocation/.gitignore b/src/service/revocation/.gitignore
similarity index 100%
rename from src/revocation/.gitignore
rename to src/service/revocation/.gitignore
diff --git a/src/revocation/Makefile.am b/src/service/revocation/Makefile.am
similarity index 57%
rename from src/revocation/Makefile.am
rename to src/service/revocation/Makefile.am
index 3ab6887dd..726c75ab6 100644
--- a/src/revocation/Makefile.am
+++ b/src/service/revocation/Makefile.am
@@ -15,41 +15,6 @@ libexecdir= $(pkglibdir)/libexec/
 pkgcfg_DATA = \
   revocation.conf
 
-bin_PROGRAMS = \
- gnunet-revocation
-
-plugin_LTLIBRARIES = \
-  libgnunet_plugin_block_revocation.la
-
-libgnunet_plugin_block_revocation_la_SOURCES = \
-  plugin_block_revocation.c
-libgnunet_plugin_block_revocation_la_LIBADD = \
-  libgnunetrevocation.la \
-  $(top_builddir)/src/lib/block/libgnunetblockgroup.la \
-  $(top_builddir)/src/lib/block/libgnunetblock.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la  \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la  \
-  $(LTLIBINTL)
-libgnunet_plugin_block_revocation_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
-
-gnunet_revocation_SOURCES = \
- gnunet-revocation.c
-gnunet_revocation_LDADD = \
-  libgnunetrevocation.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
-gnunet_revocation_tvg_SOURCES = \
- gnunet-revocation-tvg.c
-gnunet_revocation_tvg_LDADD = \
-  libgnunetrevocation.la \
-  $(top_builddir)/src/service/identity/libgnunetidentity.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
 test_revocation_lsd0001testvectors_SOURCES = \
  test_revocation_testvectors.c
 test_revocation_lsd0001testvectors_LDADD = \
@@ -74,9 +39,6 @@ libgnunetrevocation_la_LDFLAGS = \
 libexec_PROGRAMS = \
  gnunet-service-revocation
 
-noinst_PROGRAMS = \
- gnunet-revocation-tvg
-
 gnunet_service_revocation_SOURCES = \
  gnunet-service-revocation.c
 gnunet_service_revocation_LDADD = \
@@ -102,9 +64,6 @@ check_PROGRAMS = \
  #test_revocation \
  #test_revocation_lsd0001testvectors
 
-check_SCRIPTS = \
- #test_local_revocation.py
-
 if ENABLE_TEST_RUN
  AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export 
PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
  TESTS = \
@@ -112,9 +71,4 @@ if ENABLE_TEST_RUN
  $(check_PROGRAMS)
 endif
 
-test_local_revocation.py: test_local_revocation.py.in Makefile
-       $(AWK) -v bdir="$(bindir)" -v py="$(PYTHON)" -v awkay="$(AWK_BINARY)" 
-v pfx="$(prefix)" -v prl="$(PERL)" -v sysconfdirectory="$(sysconfdir)" -v 
pkgdatadirectory="$(pkgdatadir)" -f $(top_srcdir)/bin/dosubst.awk < 
$(srcdir)/test_local_revocation.py.in > test_local_revocation.py
-       chmod +x test_local_revocation.py
-
-EXTRA_DIST = test_revocation.conf \
-       test_local_revocation.py.in
+EXTRA_DIST = test_revocation.conf
diff --git a/src/revocation/gnunet-service-revocation.c 
b/src/service/revocation/gnunet-service-revocation.c
similarity index 100%
rename from src/revocation/gnunet-service-revocation.c
rename to src/service/revocation/gnunet-service-revocation.c
diff --git a/src/revocation/meson.build b/src/service/revocation/meson.build
similarity index 100%
rename from src/revocation/meson.build
rename to src/service/revocation/meson.build
diff --git a/src/revocation/revocation.conf.in 
b/src/service/revocation/revocation.conf.in
similarity index 100%
rename from src/revocation/revocation.conf.in
rename to src/service/revocation/revocation.conf.in
diff --git a/src/revocation/revocation.h b/src/service/revocation/revocation.h
similarity index 100%
rename from src/revocation/revocation.h
rename to src/service/revocation/revocation.h
diff --git a/src/revocation/revocation_api.c 
b/src/service/revocation/revocation_api.c
similarity index 100%
rename from src/revocation/revocation_api.c
rename to src/service/revocation/revocation_api.c
diff --git a/src/revocation/test_revocation.c 
b/src/service/revocation/test_revocation.c
similarity index 100%
rename from src/revocation/test_revocation.c
rename to src/service/revocation/test_revocation.c
diff --git a/src/revocation/test_revocation.conf 
b/src/service/revocation/test_revocation.conf
similarity index 100%
rename from src/revocation/test_revocation.conf
rename to src/service/revocation/test_revocation.conf
diff --git a/src/revocation/test_revocation_testvectors.c 
b/src/service/revocation/test_revocation_testvectors.c
similarity index 100%
rename from src/revocation/test_revocation_testvectors.c
rename to src/service/revocation/test_revocation_testvectors.c

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