[gnunet] 04/06: BUILD: Move vpn 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 df59c19d712a4339f7c75c76942c1a4f86bf2e5b
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Thu Oct 19 10:26:16 2023 +0200

    BUILD: Move vpn to service
---
 configure.ac                                      |   5 +++--
 po/POTFILES.in                                    |   8 ++++----
 src/Makefile.am                                   |   1 -
 src/cli/Makefile.am                               |   1 +
 src/cli/vpn/.gitignore                            |   1 +
 src/cli/vpn/Makefile.am                           |  22 ++++++++++++++++++++++
 src/{ => cli}/vpn/gnunet-vpn.c                    |   0
 src/gns/Makefile.am                               |   2 +-
 src/pt/Makefile.am                                |  10 +++++-----
 src/service/Makefile.am                           |   3 ++-
 src/{ => service}/vpn/.gitignore                  |   0
 src/{ => service}/vpn/Makefile.am                 |  10 ----------
 src/{ => service}/vpn/gnunet-helper-vpn.c         |   0
 src/{ => service}/vpn/gnunet-service-vpn.c        |   0
 src/{ => service}/vpn/meson.build                 |   0
 src/{ => service}/vpn/tests/expected              | Bin
 src/{ => service}/vpn/tests/ping                  | Bin
 src/{ => service}/vpn/tests/test-helper-icmp.sh   |   0
 src/{ => service}/vpn/tests/test-helper-ifaddr.sh |   0
 src/{ => service}/vpn/vpn.conf.in                 |   0
 src/{ => service}/vpn/vpn.h                       |   0
 src/{ => service}/vpn/vpn_api.c                   |   0
 22 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/configure.ac b/configure.ac
index b89275e87..2d4d8cff3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1289,6 +1289,8 @@ src/service/topology/Makefile
 src/service/transport/Makefile
 src/service/transport/transport.conf
 src/service/util/Makefile
+src/service/vpn/Makefile
+src/service/vpn/vpn.conf
 src/rest-plugin/Makefile
 src/rest-plugin/identity/Makefile
 src/rest-plugin/rest/Makefile
@@ -1306,6 +1308,7 @@ src/cli/nse/Makefile
 src/cli/revocation/Makefile
 src/cli/statistics/Makefile
 src/cli/util/Makefile
+src/cli/vpn/Makefile
 src/contrib/Makefile
 src/contrib/service/Makefile
 src/contrib/service/abd/Makefile
@@ -1335,8 +1338,6 @@ src/lib/hello/Makefile
 src/include/Makefile
 src/include/gnunet_config.h
 src/pt/Makefile
-src/vpn/Makefile
-src/vpn/vpn.conf
 src/zonemaster/Makefile
 src/zonemaster/zonemaster.conf
 src/reclaim/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f3b42e0dd..9f189a096 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,6 +29,7 @@ src/cli/util/gnunet-resolver.c
 src/cli/util/gnunet-scrypt.c
 src/cli/util/gnunet-timeout.c
 src/cli/util/gnunet-uri.c
+src/cli/vpn/gnunet-vpn.c
 src/contrib/cli/template/gnunet-template.c
 src/contrib/service/abd/abd_api.c
 src/contrib/service/abd/abd_serialization.c
@@ -491,10 +492,9 @@ src/service/transport/transport_api_cmd_start_peer.c
 src/service/transport/transport_api_cmd_stop_peer.c
 src/service/transport/transport_api_traits.c
 src/service/util/gnunet-service-resolver.c
-src/vpn/gnunet-helper-vpn.c
-src/vpn/gnunet-service-vpn.c
-src/vpn/gnunet-vpn.c
-src/vpn/vpn_api.c
+src/service/vpn/gnunet-helper-vpn.c
+src/service/vpn/gnunet-service-vpn.c
+src/service/vpn/vpn_api.c
 src/zonemaster/gnunet-service-zonemaster.c
 src/fs/fs_api.h
 src/include/gnunet_json_lib.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 8bf3b72a3..f55c535bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,6 @@ SUBDIRS = \
        rest-plugin \
        cli \
        contrib \
-  vpn \
   gns \
   zonemaster \
   $(CONVERSATION_DIR) \
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
index b06927edc..c7682bb36 100644
--- a/src/cli/Makefile.am
+++ b/src/cli/Makefile.am
@@ -11,4 +11,5 @@ SUBDIRS = \
        namecache \
        namestore \
        revocation \
+       vpn \
        cadet
diff --git a/src/cli/vpn/.gitignore b/src/cli/vpn/.gitignore
new file mode 100644
index 000000000..dbd75eb25
--- /dev/null
+++ b/src/cli/vpn/.gitignore
@@ -0,0 +1 @@
+gnunet-vpn
diff --git a/src/cli/vpn/Makefile.am b/src/cli/vpn/Makefile.am
new file mode 100644
index 000000000..0c7c459ef
--- /dev/null
+++ b/src/cli/vpn/Makefile.am
@@ -0,0 +1,22 @@
+# This Makefile.am is in the public domain
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+
+if USE_COVERAGE
+  AM_CFLAGS = --coverage -O0
+endif
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+plugindir = $(libdir)/gnunet
+
+bin_PROGRAMS = \
+  gnunet-vpn
+
+gnunet_vpn_SOURCES = \
+ gnunet-vpn.c
+gnunet_vpn_LDADD = \
+  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
+  $(top_builddir)/src/lib/util/libgnunetutil.la \
+  $(GN_LIBINTL)
diff --git a/src/vpn/gnunet-vpn.c b/src/cli/vpn/gnunet-vpn.c
similarity index 100%
rename from src/vpn/gnunet-vpn.c
rename to src/cli/vpn/gnunet-vpn.c
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index c5d81ca76..6907df0ed 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -22,7 +22,7 @@ else
   LIBIDN2=
 endif
 
-USE_VPN = $(top_builddir)/src/vpn/libgnunetvpn.la
+USE_VPN = $(top_builddir)/src/service/vpn/libgnunetvpn.la
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage -O0
diff --git a/src/pt/Makefile.am b/src/pt/Makefile.am
index 5ecaaa10c..7622f2c1a 100644
--- a/src/pt/Makefile.am
+++ b/src/pt/Makefile.am
@@ -20,7 +20,7 @@ libexec_PROGRAMS = \
 gnunet_daemon_pt_SOURCES = \
  gnunet-daemon-pt.c
 gnunet_daemon_pt_LDADD = \
-  $(top_builddir)/src/vpn/libgnunetvpn.la \
+  $(top_builddir)/src/service/vpn/libgnunetvpn.la \
   $(top_builddir)/src/service/cadet/libgnunetcadet.la \
   $(top_builddir)/src/service/dht/libgnunetdht.la \
   $(top_builddir)/src/service/dns/libgnunetdns.la \
@@ -63,7 +63,7 @@ test_gns_vpn_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ 
$(AM_CFLAGS)
 test_gnunet_vpn_4_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -71,7 +71,7 @@ test_gnunet_vpn_4_over_CFLAGS = $(MHD_CFLAGS) 
@LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_6_over_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_over_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -79,7 +79,7 @@ test_gnunet_vpn_6_over_CFLAGS = $(MHD_CFLAGS) 
@LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_4_to_6_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_4_to_6_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
@@ -87,7 +87,7 @@ test_gnunet_vpn_4_to_6_CFLAGS = $(MHD_CFLAGS) 
@LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
 test_gnunet_vpn_6_to_4_SOURCES = \
  test_gnunet_vpn.c
 test_gnunet_vpn_6_to_4_LDADD = $(MHD_LIBS) @LIBCURL@ \
- $(top_builddir)/src/vpn/libgnunetvpn.la \
+ $(top_builddir)/src/service/vpn/libgnunetvpn.la \
  $(top_builddir)/src/service/testing/libgnunettesting.la \
  $(top_builddir)/src/lib/util/libgnunetutil.la
 test_gnunet_vpn_6_to_4_CFLAGS = $(MHD_CFLAGS) @LIBCURL_CPPFLAGS@ $(AM_CFLAGS)
diff --git a/src/service/Makefile.am b/src/service/Makefile.am
index 52dec5726..a8738997f 100644
--- a/src/service/Makefile.am
+++ b/src/service/Makefile.am
@@ -23,5 +23,6 @@ SUBDIRS = \
   seti \
   setu \
   regex \
-  revocation
+  revocation \
+       vpn
 
diff --git a/src/vpn/.gitignore b/src/service/vpn/.gitignore
similarity index 100%
rename from src/vpn/.gitignore
rename to src/service/vpn/.gitignore
diff --git a/src/vpn/Makefile.am b/src/service/vpn/Makefile.am
similarity index 86%
rename from src/vpn/Makefile.am
rename to src/service/vpn/Makefile.am
index 6fc1bff20..123ec77de 100644
--- a/src/vpn/Makefile.am
+++ b/src/service/vpn/Makefile.am
@@ -27,9 +27,6 @@ libexec_PROGRAMS = \
   $(VPNBIN) \
   gnunet-service-vpn
 
-bin_PROGRAMS = \
-  gnunet-vpn
-
 gnunet_helper_vpn_SOURCES = \
   gnunet-helper-vpn.c
 gnunet_helper_vpn_LDADD = \
@@ -47,13 +44,6 @@ gnunet_service_vpn_LDADD = \
 gnunet_service_vpn_CFLAGS = \
   -I$(top_srcdir)/src/exit $(CFLAGS)
 
-gnunet_vpn_SOURCES = \
- gnunet-vpn.c
-gnunet_vpn_LDADD = \
-  libgnunetvpn.la \
-  $(top_builddir)/src/lib/util/libgnunetutil.la \
-  $(GN_LIBINTL)
-
 libgnunetvpn_la_SOURCES = \
  vpn_api.c vpn.h
 libgnunetvpn_la_LIBADD = \
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/service/vpn/gnunet-helper-vpn.c
similarity index 100%
rename from src/vpn/gnunet-helper-vpn.c
rename to src/service/vpn/gnunet-helper-vpn.c
diff --git a/src/vpn/gnunet-service-vpn.c b/src/service/vpn/gnunet-service-vpn.c
similarity index 100%
rename from src/vpn/gnunet-service-vpn.c
rename to src/service/vpn/gnunet-service-vpn.c
diff --git a/src/vpn/meson.build b/src/service/vpn/meson.build
similarity index 100%
rename from src/vpn/meson.build
rename to src/service/vpn/meson.build
diff --git a/src/vpn/tests/expected b/src/service/vpn/tests/expected
similarity index 100%
rename from src/vpn/tests/expected
rename to src/service/vpn/tests/expected
diff --git a/src/vpn/tests/ping b/src/service/vpn/tests/ping
similarity index 100%
rename from src/vpn/tests/ping
rename to src/service/vpn/tests/ping
diff --git a/src/vpn/tests/test-helper-icmp.sh 
b/src/service/vpn/tests/test-helper-icmp.sh
similarity index 100%
rename from src/vpn/tests/test-helper-icmp.sh
rename to src/service/vpn/tests/test-helper-icmp.sh
diff --git a/src/vpn/tests/test-helper-ifaddr.sh 
b/src/service/vpn/tests/test-helper-ifaddr.sh
similarity index 100%
rename from src/vpn/tests/test-helper-ifaddr.sh
rename to src/service/vpn/tests/test-helper-ifaddr.sh
diff --git a/src/vpn/vpn.conf.in b/src/service/vpn/vpn.conf.in
similarity index 100%
rename from src/vpn/vpn.conf.in
rename to src/service/vpn/vpn.conf.in
diff --git a/src/vpn/vpn.h b/src/service/vpn/vpn.h
similarity index 100%
rename from src/vpn/vpn.h
rename to src/service/vpn/vpn.h
diff --git a/src/vpn/vpn_api.c b/src/service/vpn/vpn_api.c
similarity index 100%
rename from src/vpn/vpn_api.c
rename to src/service/vpn/vpn_api.c

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