diff options
-rw-r--r-- | configure.ac | 23 | ||||
-rw-r--r-- | src/fs/Makefile.am | 5 | ||||
-rw-r--r-- | src/gns/Makefile.am | 26 | ||||
-rw-r--r-- | src/gns/gnunet-gns-proxy-setup-ca.in | 2 |
4 files changed, 12 insertions, 44 deletions
diff --git a/configure.ac b/configure.ac index b3caee676..8b93d8d6c 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -377,10 +377,6 @@ AC_ARG_ENABLE(gcc-hardening, | |||
377 | LDFLAGS="$LDFLAGS -pie" | 377 | LDFLAGS="$LDFLAGS -pie" |
378 | fi]) | 378 | fi]) |
379 | 379 | ||
380 | # gnunet-gns-proxy-setup-ca requires openssl and certutil (nss) | ||
381 | AC_CHECK_PROG(have_openssl, [openssl], [yes], [no]) | ||
382 | AC_CHECK_PROG(have_certutil, [certutil], [yes], [no]) | ||
383 | |||
384 | # Linker hardening options | 380 | # Linker hardening options |
385 | # Currently these options are ELF specific - you can't use this with MacOSX | 381 | # Currently these options are ELF specific - you can't use this with MacOSX |
386 | AC_ARG_ENABLE(linker-hardening, | 382 | AC_ARG_ENABLE(linker-hardening, |
@@ -1304,6 +1300,8 @@ AC_SUBST(LIBPREFIX) | |||
1304 | AC_SUBST(DLLDIR) | 1300 | AC_SUBST(DLLDIR) |
1305 | AC_SUBST(EXT_LIB_PATH) | 1301 | AC_SUBST(EXT_LIB_PATH) |
1306 | 1302 | ||
1303 | DATAROOTDIR=$datarootdir | ||
1304 | AC_SUBST(DATAROOTDIR) | ||
1307 | 1305 | ||
1308 | # test for sudo | 1306 | # test for sudo |
1309 | AC_MSG_CHECKING(for sudo) | 1307 | AC_MSG_CHECKING(for sudo) |
@@ -1443,23 +1441,6 @@ AC_MSG_RESULT($enable_test_run) | |||
1443 | AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"]) | 1441 | AM_CONDITIONAL([ENABLE_TEST_RUN], [test "x$enable_tests_run" = "xyes"]) |
1444 | 1442 | ||
1445 | 1443 | ||
1446 | # should monkey be used when running (certain) services? | ||
1447 | AC_MSG_CHECKING(whether to run with monkey) | ||
1448 | AC_ARG_ENABLE([monkey], | ||
1449 | [AS_HELP_STRING([--enable-monkey], [enable running with monkey])], | ||
1450 | [enable_monkey=${enableval}], | ||
1451 | [enable_monkey=no]) | ||
1452 | AC_MSG_RESULT($enable_monkey) | ||
1453 | AM_CONDITIONAL([ENABLE_MONKEY], [test "x$enable_monkey" = "xyes"]) | ||
1454 | if test "x$enable_monkey" = "xyes" | ||
1455 | then | ||
1456 | MONKEYPREFIX="pathologist -d $(eval echo ${datarootdir}/gnunet/gnunet.sqlite) -p 30 --" | ||
1457 | else | ||
1458 | MONKEYPREFIX="" | ||
1459 | fi | ||
1460 | AC_SUBST(MONKEYPREFIX) | ||
1461 | |||
1462 | |||
1463 | AC_MSG_CHECKING([whether to compile in benchmarks (currently for http and crypto)]) | 1444 | AC_MSG_CHECKING([whether to compile in benchmarks (currently for http and crypto)]) |
1464 | AC_ARG_ENABLE([benchmark], | 1445 | AC_ARG_ENABLE([benchmark], |
1465 | [AS_HELP_STRING([--enable-benchmark], [enable benchmarking])], | 1446 | [AS_HELP_STRING([--enable-benchmark], [enable benchmarking])], |
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am index 33260a794..d452bbf3c 100644 --- a/src/fs/Makefile.am +++ b/src/fs/Makefile.am | |||
@@ -282,11 +282,6 @@ check_SCRIPTS += \ | |||
282 | endif | 282 | endif |
283 | endif | 283 | endif |
284 | 284 | ||
285 | if ENABLE_MONKEY | ||
286 | MONKEY = @MONKEYPREFIX@ | ||
287 | AM_LDFLAGS = -no-install | ||
288 | endif | ||
289 | |||
290 | 285 | ||
291 | if ENABLE_TEST_RUN | 286 | if ENABLE_TEST_RUN |
292 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; $(MONKEY) | 287 | AM_TESTS_ENVIRONMENT=export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH;unset XDG_DATA_HOME;unset XDG_CONFIG_HOME; $(MONKEY) |
diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am index 991c40ae3..434d50f34 100644 --- a/src/gns/Makefile.am +++ b/src/gns/Makefile.am | |||
@@ -14,7 +14,8 @@ EXTRA_DIST = \ | |||
14 | test_gns_simple_lookup.conf \ | 14 | test_gns_simple_lookup.conf \ |
15 | gns-helper-service-w32.conf \ | 15 | gns-helper-service-w32.conf \ |
16 | w32nsp.def \ | 16 | w32nsp.def \ |
17 | gnunet-gns-proxy-setup-ca \ | 17 | openssl.cnf \ |
18 | gnunet-gns-proxy-setup-ca.in \ | ||
18 | zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \ | 19 | zonefiles/J7POEUT41A8PBFS7KVVDRF88GBOU4HK8PSU5QKVLVE3R9T91E99G.zkey \ |
19 | zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \ | 20 | zonefiles/OEFL7A4VEF1B40QLEMTG5D8G1CN6EN16QUSG5R2DT71GRJN34LSG.zkey \ |
20 | zonefiles/test_zonekey \ | 21 | zonefiles/test_zonekey \ |
@@ -80,7 +81,7 @@ noinst_PROGRAMS = \ | |||
80 | gnunet-gns-benchmark | 81 | gnunet-gns-benchmark |
81 | 82 | ||
82 | pkgdata_DATA = \ | 83 | pkgdata_DATA = \ |
83 | openssl.cnf | 84 | openssl.cnf |
84 | 85 | ||
85 | if HAVE_MHD | 86 | if HAVE_MHD |
86 | if LINUX | 87 | if LINUX |
@@ -93,25 +94,16 @@ plugin_LTLIBRARIES = \ | |||
93 | libgnunet_plugin_gnsrecord_gns.la | 94 | libgnunet_plugin_gnsrecord_gns.la |
94 | 95 | ||
95 | 96 | ||
96 | if HAVE_OPENSSL | 97 | bin_SCRIPTS = \ |
97 | xOPENSSL=$(shell which openssl) | 98 | gnunet-gns-proxy-setup-ca |
98 | do_subst_openssl = $(SED) -e 's,[@]OPENSSLBIN[@],${xOPENSSL},g' | ||
99 | endif | ||
100 | |||
101 | if HAVE_CERTUTIL | ||
102 | xCERTUTIL=$(shell which certutil) | ||
103 | do_subst_certutil = $(SED) -e 's,[@]CERTUTILBIN[@],${xCERTUTIL},g' | ||
104 | endif | ||
105 | 99 | ||
106 | xPFX=$(pkgdatadir)/openssl.cnf | 100 | # See: https://www.gnu.org/software/automake/manual/html_node/Scripts.html#Scripts |
107 | do_subst = $(SED) -e 's,[@]PREFIX[@],${xPFX},g' | 101 | do_subst = sed -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' |
108 | 102 | ||
109 | gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in | 103 | gnunet-gns-proxy-setup-ca: gnunet-gns-proxy-setup-ca.in Makefile |
110 | $(do_subst) < $(top_srcdir)/src/gns/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca | 104 | $(do_subst) < $(srcdir)/gnunet-gns-proxy-setup-ca.in > gnunet-gns-proxy-setup-ca |
111 | chmod +x gnunet-gns-proxy-setup-ca | 105 | chmod +x gnunet-gns-proxy-setup-ca |
112 | 106 | ||
113 | bin_SCRIPTS = gnunet-gns-proxy-setup-ca | ||
114 | |||
115 | libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ | 107 | libgnunet_plugin_gnsrecord_gns_la_SOURCES = \ |
116 | plugin_gnsrecord_gns.c | 108 | plugin_gnsrecord_gns.c |
117 | libgnunet_plugin_gnsrecord_gns_la_LIBADD = \ | 109 | libgnunet_plugin_gnsrecord_gns_la_LIBADD = \ |
diff --git a/src/gns/gnunet-gns-proxy-setup-ca.in b/src/gns/gnunet-gns-proxy-setup-ca.in index 55a60e544..0a6fab18a 100644 --- a/src/gns/gnunet-gns-proxy-setup-ca.in +++ b/src/gns/gnunet-gns-proxy-setup-ca.in | |||
@@ -3,7 +3,7 @@ | |||
3 | # and install it (for both GNUnet and your browser). | 3 | # and install it (for both GNUnet and your browser). |
4 | # | 4 | # |
5 | 5 | ||
6 | OPENSSLCFG=@PREFIX@ | 6 | OPENSSLCFG=@pkgdatadir@/openssl.cnf |
7 | if ! which openssl > /dev/null | 7 | if ! which openssl > /dev/null |
8 | then | 8 | then |
9 | echo "'openssl' command not found. Please install it." | 9 | echo "'openssl' command not found. Please install it." |