aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/man/gnunet-resolver.12
-rw-r--r--doc/man/gnunet-scalarproduct.12
-rw-r--r--doc/man/gnunet-vpn.12
-rw-r--r--doc/release_policy.rfc.txt2
-rw-r--r--m4/freetype2.m42
-rw-r--r--m4/glib-2.0.m424
-rw-r--r--m4/gtk-2.0.m420
-rw-r--r--m4/libxml2.m414
-rw-r--r--m4/pkg.m44
-rw-r--r--pkgconfig/gnunet_config.h.in2
-rw-r--r--pkgconfig/gnunetdatastore.pc.in2
-rwxr-xr-xsrc/abd/test_abd_own.sh3
-rw-r--r--src/arm/arm.conf.in2
-rw-r--r--src/arm/test_gnunet_arm.py.in20
-rw-r--r--src/ats/ats.conf.in48
-rw-r--r--src/ats/perf_ats_solver.conf51
-rw-r--r--src/cadet/cadet.conf.in2
-rw-r--r--src/consensus/test_consensus.conf2
-rw-r--r--src/dht/test_dht_tools.py.in18
-rw-r--r--src/gns/gnunet-gns-proxy-ca.template12
-rw-r--r--src/gns/openssl.cnf9
-rw-r--r--src/namestore/test_namestore_put_multiple.sh2
-rw-r--r--src/nat/test_nat_data.conf3
-rw-r--r--src/nat/test_nat_test_data.conf10
-rw-r--r--src/nse/nse.conf.in2
-rw-r--r--src/rps/profiler_rps.conf2
-rw-r--r--src/rps/rps.conf.in2
-rw-r--r--src/rps/test_rps.conf2
-rw-r--r--src/secretsharing/test_secretsharing.conf2
-rw-r--r--src/set/test_set.conf2
-rw-r--r--src/seti/test_seti.conf2
-rw-r--r--src/setu/test_setu.conf2
-rw-r--r--src/testbed/barriers.README.org2
-rw-r--r--src/testbed/test_testbed_api_barriers.conf.in2
-rw-r--r--src/util/util.conf2
35 files changed, 90 insertions, 190 deletions
diff --git a/doc/man/gnunet-resolver.1 b/doc/man/gnunet-resolver.1
index 71ec25b77..8dc63ff06 100644
--- a/doc/man/gnunet-resolver.1
+++ b/doc/man/gnunet-resolver.1
@@ -38,7 +38,7 @@
38.Ao Ar hostname Ac 38.Ao Ar hostname Ac
39.Sh DESCRIPTION 39.Sh DESCRIPTION
40.Nm 40.Nm
41allows you to use the build-in GNUnet stub resolver. 41allows you to use the built-in GNUnet stub resolver.
42.Bl -tag -width indent 42.Bl -tag -width indent
43.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME 43.It Fl c Ar FILENAME | Fl -config= Ns Ar FILENAME
44Use the configuration file FILENAME. 44Use the configuration file FILENAME.
diff --git a/doc/man/gnunet-scalarproduct.1 b/doc/man/gnunet-scalarproduct.1
index ff0bcb6e1..725eccba3 100644
--- a/doc/man/gnunet-scalarproduct.1
+++ b/doc/man/gnunet-scalarproduct.1
@@ -54,7 +54,7 @@ Elements to support a peer in computing a vectorproduct (Bob)
54.Pp 54.Pp
55Both requests must share the same SID, which can be an arbitrary 55Both requests must share the same SID, which can be an arbitrary
56string identifying the session. SIDs should be unique, however it is 56string identifying the session. SIDs should be unique, however it is
57sufficient to guarantee the uniqueness of the tupel element count and 57sufficient to guarantee the uniqueness of the tuple element count and
58session ID. 58session ID.
59.Pp 59.Pp
60Alice's client must supply the ASCII encoded peer ID of bob's 60Alice's client must supply the ASCII encoded peer ID of bob's
diff --git a/doc/man/gnunet-vpn.1 b/doc/man/gnunet-vpn.1
index 210476b79..7e2303f45 100644
--- a/doc/man/gnunet-vpn.1
+++ b/doc/man/gnunet-vpn.1
@@ -80,7 +80,7 @@ Use the configuration file FILENAME.
80The mapping should be established for TIME. 80The mapping should be established for TIME.
81The value given must be a number followed by a space and a time unit, for example "500 ms". 81The value given must be a number followed by a space and a time unit, for example "500 ms".
82Note that the quotes are required on the shell. 82Note that the quotes are required on the shell.
83The default vaue is 5 minutes. 83The default value is 5 minutes.
84.It Fl h | -help 84.It Fl h | -help
85Print short help on options. 85Print short help on options.
86.It Fl i Ar IP | Fl -ip Ar IP 86.It Fl i Ar IP | Fl -ip Ar IP
diff --git a/doc/release_policy.rfc.txt b/doc/release_policy.rfc.txt
index e13e72f43..e9e9eae99 100644
--- a/doc/release_policy.rfc.txt
+++ b/doc/release_policy.rfc.txt
@@ -65,7 +65,7 @@ III. Concerns (of team members)
65(if there are concerns of team members, write them down here to later 65(if there are concerns of team members, write them down here to later
66review) 66review)
67 67
68I disagree that "bugs tend to accumulate until they are not managable". 68I disagree that "bugs tend to accumulate until they are not manageable".
69The real issue is that neither writing testcases nor fixing bugs are 69The real issue is that neither writing testcases nor fixing bugs are
70fun tasks volunteers like to do. As you write yourself: you want a 70fun tasks volunteers like to do. As you write yourself: you want a
71sense of achievement, recognition, "new features". So as long as that 71sense of achievement, recognition, "new features". So as long as that
diff --git a/m4/freetype2.m4 b/m4/freetype2.m4
index 7424a32ab..f03906e9d 100644
--- a/m4/freetype2.m4
+++ b/m4/freetype2.m4
@@ -162,7 +162,7 @@ main()
162 The FreeType test program failed to run. If your system uses 162 The FreeType test program failed to run. If your system uses
163 shared libraries and they are installed outside the normal 163 shared libraries and they are installed outside the normal
164 system library path, make sure the variable LD_LIBRARY_PATH 164 system library path, make sure the variable LD_LIBRARY_PATH
165 (or whatever is appropiate for your system) is correctly set. 165 (or whatever is appropriate for your system) is correctly set.
166 ]) 166 ])
167 fi 167 fi
168 fi 168 fi
diff --git a/m4/glib-2.0.m4 b/m4/glib-2.0.m4
index 13a3ce68f..e8ac8522e 100644
--- a/m4/glib-2.0.m4
+++ b/m4/glib-2.0.m4
@@ -2,11 +2,11 @@
2# Owen Taylor 1997-2001 2# Owen Taylor 1997-2001
3 3
4dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) 4dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
5dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or 5dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or
6dnl gthread is specified in MODULES, pass to pkg-config 6dnl gthread is specified in MODULES, pass to pkg-config
7dnl 7dnl
8AC_DEFUN([AM_PATH_GLIB_2_0], 8AC_DEFUN([AM_PATH_GLIB_2_0],
9[dnl 9[dnl
10dnl Get the cflags and libraries from pkg-config 10dnl Get the cflags and libraries from pkg-config
11dnl 11dnl
12AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], 12AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program],
@@ -16,13 +16,13 @@ AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run
16 for module in . $4 16 for module in . $4
17 do 17 do
18 case "$module" in 18 case "$module" in
19 gmodule) 19 gmodule)
20 pkg_config_args="$pkg_config_args gmodule-2.0" 20 pkg_config_args="$pkg_config_args gmodule-2.0"
21 ;; 21 ;;
22 gobject) 22 gobject)
23 pkg_config_args="$pkg_config_args gobject-2.0" 23 pkg_config_args="$pkg_config_args gobject-2.0"
24 ;; 24 ;;
25 gthread) 25 gthread)
26 pkg_config_args="$pkg_config_args gthread-2.0" 26 pkg_config_args="$pkg_config_args gthread-2.0"
27 ;; 27 ;;
28 esac 28 esac
@@ -89,7 +89,7 @@ dnl
89#include <stdio.h> 89#include <stdio.h>
90#include <stdlib.h> 90#include <stdlib.h>
91 91
92int 92int
93main () 93main ()
94{ 94{
95 int major, minor, micro; 95 int major, minor, micro;
@@ -108,17 +108,17 @@ main ()
108 (glib_minor_version != $glib_config_minor_version) || 108 (glib_minor_version != $glib_config_minor_version) ||
109 (glib_micro_version != $glib_config_micro_version)) 109 (glib_micro_version != $glib_config_micro_version))
110 { 110 {
111 printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", 111 printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n",
112 $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, 112 $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version,
113 glib_major_version, glib_minor_version, glib_micro_version); 113 glib_major_version, glib_minor_version, glib_micro_version);
114 printf ("*** was found! If pkg-config was correct, then it is best\n"); 114 printf ("*** was found! If pkg-config was correct, then it is best\n");
115 printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); 115 printf ("*** to remove the old version of GLib. You may also be able to fix the error\n");
116 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); 116 printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
117 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); 117 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
118 printf("*** required on your system.\n"); 118 printf("*** required on your system.\n");
119 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); 119 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
120 printf("*** to point to the correct configuration files\n"); 120 printf("*** to point to the correct configuration files\n");
121 } 121 }
122 else if ((glib_major_version != GLIB_MAJOR_VERSION) || 122 else if ((glib_major_version != GLIB_MAJOR_VERSION) ||
123 (glib_minor_version != GLIB_MINOR_VERSION) || 123 (glib_minor_version != GLIB_MINOR_VERSION) ||
124 (glib_micro_version != GLIB_MICRO_VERSION)) 124 (glib_micro_version != GLIB_MICRO_VERSION))
@@ -149,7 +149,7 @@ main ()
149 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 149 printf("*** being found. The easiest way to fix this is to remove the old version\n");
150 printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); 150 printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n");
151 printf("*** correct copy of pkg-config. (In this case, you will have to\n"); 151 printf("*** correct copy of pkg-config. (In this case, you will have to\n");
152 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 152 printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
153 printf("*** so that the correct libraries are found at run-time))\n"); 153 printf("*** so that the correct libraries are found at run-time))\n");
154 } 154 }
155 } 155 }
@@ -162,7 +162,7 @@ main ()
162 fi 162 fi
163 if test "x$no_glib" = x ; then 163 if test "x$no_glib" = x ; then
164 AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) 164 AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version))
165 ifelse([$2], , :, [$2]) 165 ifelse([$2], , :, [$2])
166 else 166 else
167 AC_MSG_RESULT(no) 167 AC_MSG_RESULT(no)
168 if test "$PKG_CONFIG" = "no" ; then 168 if test "$PKG_CONFIG" = "no" ; then
@@ -191,7 +191,7 @@ main ()
191 echo "*** If you have an old version installed, it is best to remove it, although" 191 echo "*** If you have an old version installed, it is best to remove it, although"
192 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], 192 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
193 [ echo "*** The test program failed to compile or link. See the file config.log for the" 193 [ echo "*** The test program failed to compile or link. See the file config.log for the"
194 echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) 194 echo "*** exact error that occurred. This usually means GLIB is incorrectly installed."])
195 CFLAGS="$ac_save_CFLAGS" 195 CFLAGS="$ac_save_CFLAGS"
196 LIBS="$ac_save_LIBS" 196 LIBS="$ac_save_LIBS"
197 fi 197 fi
diff --git a/m4/gtk-2.0.m4 b/m4/gtk-2.0.m4
index 3deba01be..a1059264e 100644
--- a/m4/gtk-2.0.m4
+++ b/m4/gtk-2.0.m4
@@ -2,11 +2,11 @@
2# Owen Taylor 1997-2001 2# Owen Taylor 1997-2001
3 3
4dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) 4dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
5dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 5dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
6dnl pass to pkg-config 6dnl pass to pkg-config
7dnl 7dnl
8AC_DEFUN([AM_PATH_GTK_2_0], 8AC_DEFUN([AM_PATH_GTK_2_0],
9[dnl 9[dnl
10dnl Get the cflags and libraries from pkg-config 10dnl Get the cflags and libraries from pkg-config
11dnl 11dnl
12AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], 12AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
@@ -16,7 +16,7 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run
16 for module in . $4 16 for module in . $4
17 do 17 do
18 case "$module" in 18 case "$module" in
19 gthread) 19 gthread)
20 pkg_config_args="$pkg_config_args gthread-2.0" 20 pkg_config_args="$pkg_config_args gthread-2.0"
21 ;; 21 ;;
22 esac 22 esac
@@ -79,7 +79,7 @@ dnl
79#include <stdio.h> 79#include <stdio.h>
80#include <stdlib.h> 80#include <stdlib.h>
81 81
82int 82int
83main () 83main ()
84{ 84{
85 int major, minor, micro; 85 int major, minor, micro;
@@ -98,17 +98,17 @@ main ()
98 (gtk_minor_version != $gtk_config_minor_version) || 98 (gtk_minor_version != $gtk_config_minor_version) ||
99 (gtk_micro_version != $gtk_config_micro_version)) 99 (gtk_micro_version != $gtk_config_micro_version))
100 { 100 {
101 printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 101 printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
102 $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, 102 $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
103 gtk_major_version, gtk_minor_version, gtk_micro_version); 103 gtk_major_version, gtk_minor_version, gtk_micro_version);
104 printf ("*** was found! If pkg-config was correct, then it is best\n"); 104 printf ("*** was found! If pkg-config was correct, then it is best\n");
105 printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); 105 printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
106 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); 106 printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
107 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); 107 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
108 printf("*** required on your system.\n"); 108 printf("*** required on your system.\n");
109 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); 109 printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
110 printf("*** to point to the correct configuration files\n"); 110 printf("*** to point to the correct configuration files\n");
111 } 111 }
112 else if ((gtk_major_version != GTK_MAJOR_VERSION) || 112 else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
113 (gtk_minor_version != GTK_MINOR_VERSION) || 113 (gtk_minor_version != GTK_MINOR_VERSION) ||
114 (gtk_micro_version != GTK_MICRO_VERSION)) 114 (gtk_micro_version != GTK_MICRO_VERSION))
@@ -139,7 +139,7 @@ main ()
139 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 139 printf("*** being found. The easiest way to fix this is to remove the old version\n");
140 printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); 140 printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
141 printf("*** correct copy of pkg-config. (In this case, you will have to\n"); 141 printf("*** correct copy of pkg-config. (In this case, you will have to\n");
142 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 142 printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
143 printf("*** so that the correct libraries are found at run-time))\n"); 143 printf("*** so that the correct libraries are found at run-time))\n");
144 } 144 }
145 } 145 }
@@ -152,7 +152,7 @@ main ()
152 fi 152 fi
153 if test "x$no_gtk" = x ; then 153 if test "x$no_gtk" = x ; then
154 AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) 154 AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
155 ifelse([$2], , :, [$2]) 155 ifelse([$2], , :, [$2])
156 else 156 else
157 AC_MSG_RESULT(no) 157 AC_MSG_RESULT(no)
158 if test "$PKG_CONFIG" = "no" ; then 158 if test "$PKG_CONFIG" = "no" ; then
@@ -181,7 +181,7 @@ main ()
181 echo "*** If you have an old version installed, it is best to remove it, although" 181 echo "*** If you have an old version installed, it is best to remove it, although"
182 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], 182 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
183 [ echo "*** The test program failed to compile or link. See the file config.log for the" 183 [ echo "*** The test program failed to compile or link. See the file config.log for the"
184 echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) 184 echo "*** exact error that occurred. This usually means GTK+ is incorrectly installed."])
185 CFLAGS="$ac_save_CFLAGS" 185 CFLAGS="$ac_save_CFLAGS"
186 LIBS="$ac_save_LIBS" 186 LIBS="$ac_save_LIBS"
187 fi 187 fi
diff --git a/m4/libxml2.m4 b/m4/libxml2.m4
index 68cd8242f..2865b54f8 100644
--- a/m4/libxml2.m4
+++ b/m4/libxml2.m4
@@ -9,7 +9,7 @@
9dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) 9dnl AM_PATH_XML2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
10dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS 10dnl Test for XML, and define XML_CPPFLAGS and XML_LIBS
11dnl 11dnl
12AC_DEFUN([AM_PATH_XML2],[ 12AC_DEFUN([AM_PATH_XML2],[
13AC_ARG_WITH(xml-prefix, 13AC_ARG_WITH(xml-prefix,
14 [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)], 14 [ --with-xml-prefix=PFX Prefix where libxml is installed (optional)],
15 xml_config_prefix="$withval", xml_config_prefix="") 15 xml_config_prefix="$withval", xml_config_prefix="")
@@ -64,7 +64,7 @@ dnl
64#include <string.h> 64#include <string.h>
65#include <libxml/xmlversion.h> 65#include <libxml/xmlversion.h>
66 66
67int 67int
68main() 68main()
69{ 69{
70 int xml_major_version, xml_minor_version, xml_micro_version; 70 int xml_major_version, xml_minor_version, xml_micro_version;
@@ -100,9 +100,9 @@ main()
100 printf("*** xml2-config (version %d.%d.%d)\n", 100 printf("*** xml2-config (version %d.%d.%d)\n",
101 $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version); 101 $xml_config_major_version, $xml_config_minor_version, $xml_config_micro_version);
102 return 1; 102 return 1;
103 } 103 }
104/* Compare the headers to the library to make sure we match */ 104/* Compare the headers to the library to make sure we match */
105 /* Less than ideal -- doesn't provide us with return value feedback, 105 /* Less than ideal -- doesn't provide us with return value feedback,
106 * only exits if there's a serious mismatch between header and library. 106 * only exits if there's a serious mismatch between header and library.
107 */ 107 */
108 LIBXML_TEST_VERSION; 108 LIBXML_TEST_VERSION;
@@ -128,7 +128,7 @@ main()
128 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 128 printf("*** being found. The easiest way to fix this is to remove the old version\n");
129 printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n"); 129 printf("*** of LIBXML, but you can also set the XML2_CONFIG environment to point to the\n");
130 printf("*** correct copy of xml2-config. (In this case, you will have to\n"); 130 printf("*** correct copy of xml2-config. (In this case, you will have to\n");
131 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 131 printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
132 printf("*** so that the correct libraries are found at run-time))\n"); 132 printf("*** so that the correct libraries are found at run-time))\n");
133 } 133 }
134 return 1; 134 return 1;
@@ -141,7 +141,7 @@ main()
141 141
142 if test "x$no_xml" = x ; then 142 if test "x$no_xml" = x ; then
143 AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version)) 143 AC_MSG_RESULT(yes (version $xml_config_major_version.$xml_config_minor_version.$xml_config_micro_version))
144 ifelse([$2], , :, [$2]) 144 ifelse([$2], , :, [$2])
145 else 145 else
146 AC_MSG_RESULT(no) 146 AC_MSG_RESULT(no)
147 if test "$XML2_CONFIG" = "no" ; then 147 if test "$XML2_CONFIG" = "no" ; then
@@ -170,7 +170,7 @@ main()
170 echo "*** If you have an old version installed, it is best to remove it, although" 170 echo "*** If you have an old version installed, it is best to remove it, although"
171 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], 171 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
172 [ echo "*** The test program failed to compile or link. See the file config.log for the" 172 [ echo "*** The test program failed to compile or link. See the file config.log for the"
173 echo "*** exact error that occured. This usually means LIBXML was incorrectly installed" 173 echo "*** exact error that occurred. This usually means LIBXML was incorrectly installed"
174 echo "*** or that you have moved LIBXML since it was installed. In the latter case, you" 174 echo "*** or that you have moved LIBXML since it was installed. In the latter case, you"
175 echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ]) 175 echo "*** may want to edit the xml2-config script: $XML2_CONFIG" ])
176 CPPFLAGS="$ac_save_CPPFLAGS" 176 CPPFLAGS="$ac_save_CPPFLAGS"
diff --git a/m4/pkg.m4 b/m4/pkg.m4
index 4688002e4..bba798444 100644
--- a/m4/pkg.m4
+++ b/m4/pkg.m4
@@ -86,7 +86,7 @@ dnl Check to see whether a particular set of modules exists. Similar to
86dnl PKG_CHECK_MODULES(), but does not set variables or print errors. 86dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
87dnl 87dnl
88dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) 88dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
89dnl only at the first occurence in configure.ac, so if the first place 89dnl only at the first occurrence in configure.ac, so if the first place
90dnl it's called might be skipped (such as if it is within an "if", you 90dnl it's called might be skipped (such as if it is within an "if", you
91dnl have to call PKG_CHECK_EXISTS manually 91dnl have to call PKG_CHECK_EXISTS manually
92AC_DEFUN([PKG_CHECK_EXISTS], 92AC_DEFUN([PKG_CHECK_EXISTS],
@@ -156,7 +156,7 @@ if test $pkg_failed = yes; then
156 _PKG_SHORT_ERRORS_SUPPORTED 156 _PKG_SHORT_ERRORS_SUPPORTED
157 if test $_pkg_short_errors_supported = yes; then 157 if test $_pkg_short_errors_supported = yes; then
158 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` 158 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
159 else 159 else
160 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` 160 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
161 fi 161 fi
162 # Put the nasty error message in config.log where it belongs 162 # Put the nasty error message in config.log where it belongs
diff --git a/pkgconfig/gnunet_config.h.in b/pkgconfig/gnunet_config.h.in
index 9ffb6a2e2..7e6150f27 100644
--- a/pkgconfig/gnunet_config.h.in
+++ b/pkgconfig/gnunet_config.h.in
@@ -730,7 +730,7 @@
730/* Define for large files, on AIX-style hosts. */ 730/* Define for large files, on AIX-style hosts. */
731#undef _LARGE_FILES 731#undef _LARGE_FILES
732 732
733/* Need with solaris or errno doesnt work */ 733/* Need with solaris or errno doesn't work */
734#undef _REENTRANT 734#undef _REENTRANT
735 735
736/* This is a Windows system */ 736/* This is a Windows system */
diff --git a/pkgconfig/gnunetdatastore.pc.in b/pkgconfig/gnunetdatastore.pc.in
index 249426a0d..69ff505f5 100644
--- a/pkgconfig/gnunetdatastore.pc.in
+++ b/pkgconfig/gnunetdatastore.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
4includedir=@includedir@ 4includedir=@includedir@
5 5
6Name: GNUnet datastore 6Name: GNUnet datastore
7Description: Management API for the datastore for persistant storage to disk 7Description: Management API for the datastore for persistent storage to disk
8URL: http://gnunet.org 8URL: http://gnunet.org
9Version: @VERSION@ 9Version: @VERSION@
10Requires: 10Requires:
diff --git a/src/abd/test_abd_own.sh b/src/abd/test_abd_own.sh
index f4780ea90..3fc210284 100755
--- a/src/abd/test_abd_own.sh
+++ b/src/abd/test_abd_own.sh
@@ -58,7 +58,7 @@ END_ATTR="end"
58 58
59gnunet-identity -d 59gnunet-identity -d
60 60
61# FORWARD, subject side stored (different constallations) 61# FORWARD, subject side stored (different constellations)
62SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=a --attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"` 62SIGNED=`$DO_TIMEOUT gnunet-abd --signSubjectSide --ego=a --attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"`
63gnunet-abd --createSubjectSide --ego=a --import="$SIGNED" 63gnunet-abd --createSubjectSide --ego=a --import="$SIGNED"
64gnunet-namestore -D -z a 64gnunet-namestore -D -z a
@@ -137,4 +137,3 @@ else
137 echo "FAIL: Failed to verify credential." 137 echo "FAIL: Failed to verify credential."
138 exit 1 138 exit 1
139fi 139fi
140
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 383d578d5..8015e0e15 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -33,7 +33,7 @@ OPTIONS = -l $GNUNET_CACHE_HOME/gnunet-%Y-%m-%d.log
33# If set to YES, ARM will only start services that are marked as 33# If set to YES, ARM will only start services that are marked as
34# per-user services (and we'll expect a system user to run ARM to 34# per-user services (and we'll expect a system user to run ARM to
35# provide system-level services). Per-user services enable 35# provide system-level services). Per-user services enable
36# better personalization and priviledge separation and in particular 36# better personalization and privilege separation and in particular
37# ensures that personal data is stored under $HOME, which might 37# ensures that personal data is stored under $HOME, which might
38# be important in a multi-user system (or if $HOME is encrypted 38# be important in a multi-user system (or if $HOME is encrypted
39# and /var/ is not). 39# and /var/ is not).
diff --git a/src/arm/test_gnunet_arm.py.in b/src/arm/test_gnunet_arm.py.in
index e657d4a3f..2b30b6b97 100644
--- a/src/arm/test_gnunet_arm.py.in
+++ b/src/arm/test_gnunet_arm.py.in
@@ -53,7 +53,7 @@ def fail(result):
53 sys.exit(1) 53 sys.exit(1)
54 54
55 55
56def end_arm_failer(command, rc, stdo, stde, normal): 56def end_arm_failure(command, rc, stdo, stde, normal):
57 if normal: 57 if normal:
58 if rc != 0: 58 if rc != 0:
59 fail( 59 fail(
@@ -69,7 +69,7 @@ def end_arm_failer(command, rc, stdo, stde, normal):
69 ) 69 )
70 70
71 71
72def print_only_failer(command, rc, stdo, stde, normal): 72def print_only_failure(command, rc, stdo, stde, normal):
73 if normal: 73 if normal:
74 if rc != 0: 74 if rc != 0:
75 print( 75 print(
@@ -87,12 +87,12 @@ def print_only_failer(command, rc, stdo, stde, normal):
87 sys.exit(1) 87 sys.exit(1)
88 88
89 89
90def r_something(to_run, extra_args, failer=None, normal=True, **kw): 90def r_something(to_run, extra_args, failure=None, normal=True, **kw):
91 rc, stdo, stde = sub_run( 91 rc, stdo, stde = sub_run(
92 to_run + extra_args, nofail=True, want_stde=True, **kw 92 to_run + extra_args, nofail=True, want_stde=True, **kw
93 ) 93 )
94 if failer is not None: 94 if failure is not None:
95 failer(to_run + extra_args, rc, stdo, stde, normal) 95 failure(to_run + extra_args, rc, stdo, stde, normal)
96 return (rc, stdo, stde) 96 return (rc, stdo, stde)
97 97
98 98
@@ -103,26 +103,26 @@ def r_arm(extra_args, **kw):
103cleanup() 103cleanup()
104 104
105print("TEST: Bad argument checking...", end='') 105print("TEST: Bad argument checking...", end='')
106r_arm(['-x'], normal=False, failer=print_only_failer) 106r_arm(['-x'], normal=False, failure=print_only_failure)
107print("PASS") 107print("PASS")
108 108
109print("TEST: Start ARM...", end='') 109print("TEST: Start ARM...", end='')
110r_arm(['-s'], failer=print_only_failer) 110r_arm(['-s'], failure=print_only_failure)
111time.sleep(1) 111time.sleep(1)
112print("PASS") 112print("PASS")
113 113
114print("TEST: Start another service...", end='') 114print("TEST: Start another service...", end='')
115r_arm(['-i', 'resolver'], failer=end_arm_failer) 115r_arm(['-i', 'resolver'], failure=end_arm_failure)
116time.sleep(1) 116time.sleep(1)
117print("PASS") 117print("PASS")
118 118
119print("TEST: Stop a service...", end='') 119print("TEST: Stop a service...", end='')
120r_arm(['-k', 'resolver'], failer=end_arm_failer) 120r_arm(['-k', 'resolver'], failure=end_arm_failure)
121time.sleep(1) 121time.sleep(1)
122print("PASS") 122print("PASS")
123 123
124print("TEST: Stop ARM...", end='') 124print("TEST: Stop ARM...", end='')
125r_arm(['-e'], failer=print_only_failer) 125r_arm(['-e'], failure=print_only_failure)
126time.sleep(1) 126time.sleep(1)
127print("PASS") 127print("PASS")
128 128
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index 7691f98c0..4abddd99c 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -37,54 +37,8 @@ BLUETOOTH_QUOTA_OUT = 10 MiB
37# Proportional specific settings 37# Proportional specific settings
38# How proportional to preferences is bandwidth distribution in a network 38# How proportional to preferences is bandwidth distribution in a network
39# 1.0: Fair with respect to addresses without preferences 39# 1.0: Fair with respect to addresses without preferences
40# > 1.0: The bigger, the more respect is payed to preferences 40# > 1.0: The bigger, the more respect is paid to preferences
41PROP_PROPORTIONALITY_FACTOR = 2.00 41PROP_PROPORTIONALITY_FACTOR = 2.00
42# Should we stick to existing connections are prefer to switch? 42# Should we stick to existing connections are prefer to switch?
43# [1.0...2.0], lower value prefers to switch, bigger value is more tolerant 43# [1.0...2.0], lower value prefers to switch, bigger value is more tolerant
44PROP_STABILITY_FACTOR = 1.25 44PROP_STABILITY_FACTOR = 1.25
45
46# MLP specific settings
47# MLP defaults
48
49# Maximum duration for a solution process (both LP and MILP)
50# MLP_MAX_DURATION = 3 s
51# Maximum numbero of iterations for a solution process (only LP)
52# MLP_MAX_ITERATIONS =
53# Tolerated MIP Gap [0.0 .. 1.0], default 0.025
54MLP_MAX_MIP_GAP = 0.025
55# Tolerated LP/MIP Gap [0.0 .. 1.0], default 0.025
56MLP_MAX_LP_MIP_GAP = 0.025
57
58
59# Maximum number of iterations for a solution process
60# MLP_MAX_ITERATIONS = 1024
61# MLP_COEFFICIENT_D = 1.0
62# MLP_COEFFICIENT_U = 1.0
63# MLP_COEFFICIENT_R = 1.0
64# MLP_MIN_BANDWIDTH = 1024
65# MLP_MIN_CONNECTIONS = 4
66
67# MLP Log settings
68# Dump all problems to disk
69# MLP_DUMP_PROBLEM_ALL = YES
70# Dump all solution to disk
71# MLP_DUMP_SOLUTION_ALL = YES
72# Print GLPK output
73# MLP_GLPK_VERBOSE = YES
74
75# Dump all problems to disk
76MLP_DUMP_PROBLEM_ON_FAIL = YES
77# Dump all solution to disk
78MLP_DUMP_SOLUTION_ON_FAIL = YES
79
80# RIL specifc settings
81RIL_STEP_TIME_MIN = 500 ms
82RIL_STEP_TIME_MAX = 1000 ms
83
84# SARSA or Q-LEARNING
85RIL_ALGORITHM = Q-LEARNING
86RIL_DISCOUNT_BETA = 0.7
87RIL_GRADIENT_STEP_SIZE = 0.3
88RIL_TRACE_DECAY = 0.2
89RIL_EXPLORE_RATIO = 0.1
90RIL_GLOBAL_REWARD_SHARE = 1
diff --git a/src/ats/perf_ats_solver.conf b/src/ats/perf_ats_solver.conf
index 00657d895..a535891df 100644
--- a/src/ats/perf_ats_solver.conf
+++ b/src/ats/perf_ats_solver.conf
@@ -21,57 +21,8 @@ BLUETOOTH_QUOTA_OUT = 10000000
21# Proportional specific settings 21# Proportional specific settings
22# How proportional to preferences is bandwidth distribution in a network 22# How proportional to preferences is bandwidth distribution in a network
23# 1: Fair with respect to addresses without preferences 23# 1: Fair with respect to addresses without preferences
24# > 10: The bigger, the more respect is payed to preferences 24# > 10: The bigger, the more respect is paid to preferences
25PROP_PROPORTIONALITY_FACTOR = 2.00 25PROP_PROPORTIONALITY_FACTOR = 2.00
26# Should we stick to existing connections are prefer to switch? 26# Should we stick to existing connections are prefer to switch?
27# [10...200], lower value prefers to switch, bigger value is more tolerant 27# [10...200], lower value prefers to switch, bigger value is more tolerant
28PROP_STABILITY_FACTOR = 1.25 28PROP_STABILITY_FACTOR = 1.25
29
30# MLP specific settings
31# MLP defaults
32
33# Maximum duration for a solution process
34# MLP_MAX_DURATION = 30 s
35
36# Maximum number of iterations for a solution process
37# MLP_MAX_ITERATIONS = 1024
38# Tolerated MIP Gap [0.0 .. 1.0], default 0.025
39MLP_MAX_MIP_GAP = 0.025
40# Tolerated LP/MIP Gap [0.0 .. 1.0], default 0.025
41MLP_MAX_LP_MIP_GAP = 0.025
42
43# MLP_COEFFICIENT_D = 1.0
44# MLP_COEFFICIENT_U = 1.0
45# MLP_COEFFICIENT_R = 1.0
46MLP_MIN_BANDWIDTH = 10
47# MLP_MIN_CONNECTIONS = 4
48# MLP_DBG_FEASIBILITY_ONLY = YES
49MLP_DBG_AUTOSCALE_PROBLEM = YES
50# MLP_DBG_INTOPT_PRESOLVE = YES
51# Print GLPK output
52# MLP_DBG_GLPK_VERBOSE = YES
53
54#MLP_DBG_OPTIMIZE_UTILITY = NO
55#MLP_DBG_OPTIMIZE_QUALITY = NO
56#MLP_DBG_OPTIMIZE_RELATIVITY = NO
57#DLP_DBG_OPTIMIZE_DIVERSITY = NO
58
59MLP_LOG_FORMAT = CPLEX
60
61# MLP Log settings
62# Dump all problems to disk
63# MLP_DUMP_PROBLEM_ALL = YES
64# Dump all solution to disk
65# MLP_DUMP_SOLUTION_ALL = YES
66
67# RIL specifc settings
68RIL_STEP_TIME_MIN = 1 ms
69RIL_STEP_TIME_MAX = 10 ms
70
71RIL_ALGORITHM = Q
72RIL_DISCOUNT_BETA = 0.7
73RIL_GRADIENT_STEP_SIZE = 0.3
74RIL_TRACE_DECAY = 0.2
75RIL_EXPLORE_RATIO = 0.1
76RIL_GLOBAL_REWARD_SHARE = 1
77
diff --git a/src/cadet/cadet.conf.in b/src/cadet/cadet.conf.in
index d1ddcb96f..8f700951c 100644
--- a/src/cadet/cadet.conf.in
+++ b/src/cadet/cadet.conf.in
@@ -19,7 +19,7 @@ REFRESH_CONNECTION_TIME = 5 min
19# Percentage of packets CADET is artificially dropping. Used for testing only! 19# Percentage of packets CADET is artificially dropping. Used for testing only!
20# DROP_PERCENT = 20# DROP_PERCENT =
21 21
22# How frequently do we usually anounce our presence in the DHT? 22# How frequently do we usually announce our presence in the DHT?
23ID_ANNOUNCE_TIME = 1 h 23ID_ANNOUNCE_TIME = 1 h
24 24
25# FIXME: document 25# FIXME: document
diff --git a/src/consensus/test_consensus.conf b/src/consensus/test_consensus.conf
index 4f17fa359..67b366405 100644
--- a/src/consensus/test_consensus.conf
+++ b/src/consensus/test_consensus.conf
@@ -63,7 +63,7 @@ START_ON_DEMAND = NO
63START_ON_DEMAND = NO 63START_ON_DEMAND = NO
64 64
65[nat] 65[nat]
66# Use addresses from the local network interfaces (inluding loopback, but also others) 66# Use addresses from the local network interfaces (including loopback, but also others)
67USE_LOCALADDR = YES 67USE_LOCALADDR = YES
68 68
69# Disable IPv6 support 69# Disable IPv6 support
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 20739c45f..84e297081 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -72,10 +72,10 @@ def fail(result):
72 cleanup(1) 72 cleanup(1)
73 73
74 74
75def r_something(to_run, extra_args, failer=None, normal=True, **kw): 75def r_something(to_run, extra_args, failure=None, normal=True, **kw):
76 rc, stdo, stde = sub_run(to_run + extra_args, nofail=True, **kw) 76 rc, stdo, stde = sub_run(to_run + extra_args, nofail=True, **kw)
77 if failer is not None: 77 if failure is not None:
78 failer(to_run + extra_args, rc, stdo, stde, normal) 78 failure(to_run + extra_args, rc, stdo, stde, normal)
79 return (rc, stdo, stde) 79 return (rc, stdo, stde)
80 80
81 81
@@ -91,7 +91,7 @@ def r_put(extra_args, **kw):
91 return r_something(run_put, extra_args, **kw) 91 return r_something(run_put, extra_args, **kw)
92 92
93 93
94def end_arm_failer(command, rc, stdo, stde, normal): 94def end_arm_failure(command, rc, stdo, stde, normal):
95 if normal: 95 if normal:
96 if rc != 0: 96 if rc != 0:
97 fail( 97 fail(
@@ -107,7 +107,7 @@ def end_arm_failer(command, rc, stdo, stde, normal):
107 ) 107 )
108 108
109 109
110def print_only_failer(command, rc, stdo, stde, normal): 110def print_only_failure(command, rc, stdo, stde, normal):
111 if normal: 111 if normal:
112 if rc != 0: 112 if rc != 0:
113 print( 113 print(
@@ -126,19 +126,19 @@ def print_only_failer(command, rc, stdo, stde, normal):
126 126
127 127
128print("TEST: Starting ARM...", end='') 128print("TEST: Starting ARM...", end='')
129r_arm(['-s'], failer=end_arm_failer, want_stdo=False, want_stde=False) 129r_arm(['-s'], failure=end_arm_failure, want_stdo=False, want_stde=False)
130print("PASS") 130print("PASS")
131time.sleep(1) 131time.sleep(1)
132 132
133print("TEST: Testing put...", end='') 133print("TEST: Testing put...", end='')
134r_put(['-k', 'testkey', '-d', 'testdata', '-t', '8'], failer=end_arm_failer) 134r_put(['-k', 'testkey', '-d', 'testdata', '-t', '8'], failure=end_arm_failure)
135print("PASS") 135print("PASS")
136time.sleep(1) 136time.sleep(1)
137 137
138print("TEST: Testing get...", end='') 138print("TEST: Testing get...", end='')
139rc, stdo, stde = r_get(['-k', 'testkey', '-T', '50 ms', '-t', '8'], 139rc, stdo, stde = r_get(['-k', 'testkey', '-T', '50 ms', '-t', '8'],
140 want_stdo=True, 140 want_stdo=True,
141 failer=end_arm_failer) 141 failure=end_arm_failure)
142stdo = stdo.decode('utf-8').replace('\r', '').splitlines() 142stdo = stdo.decode('utf-8').replace('\r', '').splitlines()
143expect = "Result 0, type 8:\ntestdata".splitlines() 143expect = "Result 0, type 8:\ntestdata".splitlines()
144if len(stdo) != 2 or len(expect 144if len(stdo) != 2 or len(expect
@@ -146,4 +146,4 @@ if len(stdo) != 2 or len(expect
146 fail("output `{}' differs from expected `{}'".format(stdo, expect)) 146 fail("output `{}' differs from expected `{}'".format(stdo, expect))
147print("PASS") 147print("PASS")
148 148
149r_arm(['-e', '-d'], failer=print_only_failer) 149r_arm(['-e', '-d'], failure=print_only_failure)
diff --git a/src/gns/gnunet-gns-proxy-ca.template b/src/gns/gnunet-gns-proxy-ca.template
index 541e3a355..b1a0d16fd 100644
--- a/src/gns/gnunet-gns-proxy-ca.template
+++ b/src/gns/gnunet-gns-proxy-ca.template
@@ -41,10 +41,10 @@ cn = "GNS Proxy CA"
41# An alternative way to set the certificate's distinguished name directly 41# An alternative way to set the certificate's distinguished name directly
42# is with the "dn" option. The attribute names allowed are: 42# is with the "dn" option. The attribute names allowed are:
43# C (country), street, O (organization), OU (unit), title, CN (common name), 43# C (country), street, O (organization), OU (unit), title, CN (common name),
44# L (locality), ST (state), placeOfBirth, gender, countryOfCitizenship, 44# L (locality), ST (state), placeOfBirth, gender, countryOfCitizenship,
45# countryOfResidence, serialNumber, telephoneNumber, surName, initials, 45# countryOfResidence, serialNumber, telephoneNumber, surName, initials,
46# generationQualifier, givenName, pseudonym, dnQualifier, postalCode, name, 46# generationQualifier, givenName, pseudonym, dnQualifier, postalCode, name,
47# businessCategory, DC, UID, jurisdictionOfIncorporationLocalityName, 47# businessCategory, DC, UID, jurisdictionOfIncorporationLocalityName,
48# jurisdictionOfIncorporationStateOrProvinceName, 48# jurisdictionOfIncorporationStateOrProvinceName,
49# jurisdictionOfIncorporationCountryName, XmppAddr, and numeric OIDs. 49# jurisdictionOfIncorporationCountryName, XmppAddr, and numeric OIDs.
50 50
@@ -59,7 +59,7 @@ cn = "GNS Proxy CA"
59# Use -1 if there is no expiration date. 59# Use -1 if there is no expiration date.
60expiration_days = 3650 60expiration_days = 3650
61 61
62# Alternatively you may set concrete dates and time. The GNU date string 62# Alternatively you may set concrete dates and time. The GNU date string
63# formats are accepted. See: 63# formats are accepted. See:
64# https://www.gnu.org/software/tar/manual/html_node/Date-input-formats.html 64# https://www.gnu.org/software/tar/manual/html_node/Date-input-formats.html
65 65
@@ -226,7 +226,7 @@ tls_www_server
226#honor_crq_ext = 2.5.29.17 226#honor_crq_ext = 2.5.29.17
227#honor_crq_ext = 2.5.29.15 227#honor_crq_ext = 2.5.29.15
228 228
229# Path length contraint. Sets the maximum number of 229# Path length constraint. Sets the maximum number of
230# certificates that can be used to certify this certificate. 230# certificates that can be used to certify this certificate.
231# (i.e. the certificate chain length) 231# (i.e. the certificate chain length)
232#path_len = -1 232#path_len = -1
diff --git a/src/gns/openssl.cnf b/src/gns/openssl.cnf
index 503460f9f..a2561b9b2 100644
--- a/src/gns/openssl.cnf
+++ b/src/gns/openssl.cnf
@@ -15,7 +15,7 @@ oid_section = new_oids
15# To use this configuration file with the "-extfile" option of the 15# To use this configuration file with the "-extfile" option of the
16# "openssl x509" utility, name here the section containing the 16# "openssl x509" utility, name here the section containing the
17# X.509v3 extensions to use: 17# X.509v3 extensions to use:
18# extensions = 18# extensions =
19# (Alternatively, use a configuration file that has only 19# (Alternatively, use a configuration file that has only
20# X.509v3 extensions in its main [= default] section.) 20# X.509v3 extensions in its main [= default] section.)
21 21
@@ -46,7 +46,7 @@ crl = $dir/crl.pem # The current CRL
46private_key = $dir/private/cakey.pem# The private key 46private_key = $dir/private/cakey.pem# The private key
47RANDFILE = $dir/private/.rand # private random number file 47RANDFILE = $dir/private/.rand # private random number file
48 48
49x509_extensions = usr_cert # The extentions to add to the cert 49x509_extensions = usr_cert # The extensions to add to the cert
50 50
51# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs 51# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
52# so this is commented out by default to leave a V1 CRL. 52# so this is commented out by default to leave a V1 CRL.
@@ -89,13 +89,13 @@ default_bits = 1024
89default_keyfile = privkey.pem 89default_keyfile = privkey.pem
90distinguished_name = req_distinguished_name 90distinguished_name = req_distinguished_name
91attributes = req_attributes 91attributes = req_attributes
92x509_extensions = v3_ca # The extentions to add to the self signed cert 92x509_extensions = v3_ca # The extensions to add to the self signed cert
93 93
94# Passwords for private keys if not present they will be prompted for 94# Passwords for private keys if not present they will be prompted for
95# input_password = secret 95# input_password = secret
96# output_password = secret 96# output_password = secret
97 97
98# This sets a mask for permitted string types. There are several options. 98# This sets a mask for permitted string types. There are several options.
99# default: PrintableString, T61String, BMPString. 99# default: PrintableString, T61String, BMPString.
100# pkix : PrintableString, BMPString. 100# pkix : PrintableString, BMPString.
101# utf8only: only UTF8Strings. 101# utf8only: only UTF8Strings.
@@ -242,4 +242,3 @@ basicConstraints = CA:true
242 242
243# issuerAltName=issuer:copy 243# issuerAltName=issuer:copy
244authorityKeyIdentifier=keyid:always,issuer:always 244authorityKeyIdentifier=keyid:always,issuer:always
245
diff --git a/src/namestore/test_namestore_put_multiple.sh b/src/namestore/test_namestore_put_multiple.sh
index 81e1ad2b5..f33fb1c3a 100644
--- a/src/namestore/test_namestore_put_multiple.sh
+++ b/src/namestore/test_namestore_put_multiple.sh
@@ -15,7 +15,7 @@ if [ 0 -ne $ret ]; then
15fi 15fi
16 16
17## GNUNET part 17## GNUNET part
18# Check if identity exists and delets and readds it to get rid of entries in zone 18# Check if identity exists and deletes and readds it to get rid of entries in zone
19gnunet-identity -d | grep randomtestingid 2>&1 /dev/null 19gnunet-identity -d | grep randomtestingid 2>&1 /dev/null
20ret=$? 20ret=$?
21 21
diff --git a/src/nat/test_nat_data.conf b/src/nat/test_nat_data.conf
index cb018cecd..e139d0c05 100644
--- a/src/nat/test_nat_data.conf
+++ b/src/nat/test_nat_data.conf
@@ -14,7 +14,7 @@ PUNCHED_NAT = NO
14# Disable UPNP by default until it gets cleaner! 14# Disable UPNP by default until it gets cleaner!
15ENABLE_UPNP = YES 15ENABLE_UPNP = YES
16 16
17# Use addresses from the local network interfaces (inluding loopback, but also others) 17# Use addresses from the local network interfaces (including loopback, but also others)
18USE_LOCALADDR = YES 18USE_LOCALADDR = YES
19 19
20# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) 20# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
@@ -34,4 +34,3 @@ ENABLE_ICMP_SERVER = NO
34 34
35# Disable IPv6 support 35# Disable IPv6 support
36DISABLEV6 = NO 36DISABLEV6 = NO
37
diff --git a/src/nat/test_nat_test_data.conf b/src/nat/test_nat_test_data.conf
index 03850ec06..ca78ca9f3 100644
--- a/src/nat/test_nat_test_data.conf
+++ b/src/nat/test_nat_test_data.conf
@@ -18,14 +18,14 @@ PUNCHED_NAT = YES
18# Disable UPNP by default until it gets cleaner! 18# Disable UPNP by default until it gets cleaner!
19ENABLE_UPNP = NO 19ENABLE_UPNP = NO
20 20
21# Use addresses from the local network interfaces (inluding loopback, but also others) 21# Use addresses from the local network interfaces (including loopback, but also others)
22USE_LOCALADDR = YES 22USE_LOCALADDR = YES
23RETURN_LOCAL_ADDRESSES = YES 23RETURN_LOCAL_ADDRESSES = YES
24 24
25# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!) 25# External IP address of the NAT box (if known); IPv4 dotted-decimal ONLY at this time (should allow DynDNS!)
26# normal interface IP address for non-NATed peers; 26# normal interface IP address for non-NATed peers;
27# possibly auto-detected (using UPnP) if possible if not specified 27# possibly auto-detected (using UPnP) if possible if not specified
28# EXTERNAL_ADDRESS = 28# EXTERNAL_ADDRESS =
29 29
30# Should we use ICMP-based NAT traversal to try connect to NATed peers 30# Should we use ICMP-based NAT traversal to try connect to NATed peers
31# or, if we are behind NAT, to allow connections to us? 31# or, if we are behind NAT, to allow connections to us?
@@ -33,7 +33,7 @@ ENABLE_ICMP_CLIENT = NO
33ENABLE_ICMP_SERVER = NO 33ENABLE_ICMP_SERVER = NO
34 34
35# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY; 35# IP address of the interface connected to the NAT box; IPv4 dotted-decimal ONLY;
36# normal interface IP address for non-NATed peers; 36# normal interface IP address for non-NATed peers;
37# likely auto-detected (via interface list) if not specified (!) 37# likely auto-detected (via interface list) if not specified (!)
38INTERNAL_ADDRESS = 127.0.0.1 38INTERNAL_ADDRESS = 127.0.0.1
39 39
@@ -43,5 +43,3 @@ DISABLEV6 = YES
43 43
44[nse] 44[nse]
45START_ON_DEMAND = NO 45START_ON_DEMAND = NO
46
47
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index 6330254e9..0ac5621aa 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -11,7 +11,7 @@ UNIX_MATCH_UID = NO
11UNIX_MATCH_GID = YES 11UNIX_MATCH_GID = YES
12PROOFFILE = $GNUNET_DATA_HOME/nse/proof.dat 12PROOFFILE = $GNUNET_DATA_HOME/nse/proof.dat
13 13
14# The directory where the NSE services logs timestamps everytime 14# The directory where the NSE services logs timestamps every time
15# a size estime flooding message is received 15# a size estime flooding message is received
16# This option is only used for benchmarking, not in production. 16# This option is only used for benchmarking, not in production.
17HISTOGRAM_DIR = $GNUNET_CACHE_HOME/nse/histogram 17HISTOGRAM_DIR = $GNUNET_CACHE_HOME/nse/histogram
diff --git a/src/rps/profiler_rps.conf b/src/rps/profiler_rps.conf
index 5edd6d3ff..89e5e35f2 100644
--- a/src/rps/profiler_rps.conf
+++ b/src/rps/profiler_rps.conf
@@ -52,7 +52,7 @@ SETUP_TIMEOUT = 1 h
52WORKBITS = 0 52WORKBITS = 0
53 53
54[nat] 54[nat]
55# Use addresses from the local network interfaces (inluding loopback, but also others) 55# Use addresses from the local network interfaces (including loopback, but also others)
56USE_LOCALADDR = YES 56USE_LOCALADDR = YES
57ENABLE_UPNP = NO 57ENABLE_UPNP = NO
58 58
diff --git a/src/rps/rps.conf.in b/src/rps/rps.conf.in
index 9619c9889..8c7098747 100644
--- a/src/rps/rps.conf.in
+++ b/src/rps/rps.conf.in
@@ -27,7 +27,7 @@ FILENAME_VALID_PEERS = $GNUNET_DATA_HOME/rps/valid_peers.txt
27# So, 50 is enough for a network of size 50^3 = 125000 27# So, 50 is enough for a network of size 50^3 = 125000
28MINSIZE = 10 28MINSIZE = 10
29 29
30# The probability whith which we want a sampler element to have observed all 30# The probability with which we want a sampler element to have observed all
31# peer ids in the network at least 31# peer ids in the network at least
32DESIRED_PROBABILITY = 0.9 32DESIRED_PROBABILITY = 0.9
33 33
diff --git a/src/rps/test_rps.conf b/src/rps/test_rps.conf
index 68f3982ec..2b1101786 100644
--- a/src/rps/test_rps.conf
+++ b/src/rps/test_rps.conf
@@ -51,7 +51,7 @@ SETUP_TIMEOUT = 2 m
51WORKBITS = 0 51WORKBITS = 0
52 52
53[nat] 53[nat]
54# Use addresses from the local network interfaces (inluding loopback, but also others) 54# Use addresses from the local network interfaces (including loopback, but also others)
55USE_LOCALADDR = YES 55USE_LOCALADDR = YES
56ENABLE_UPNP = NO 56ENABLE_UPNP = NO
57 57
diff --git a/src/secretsharing/test_secretsharing.conf b/src/secretsharing/test_secretsharing.conf
index 7c8e45480..9cbe3ebb1 100644
--- a/src/secretsharing/test_secretsharing.conf
+++ b/src/secretsharing/test_secretsharing.conf
@@ -22,7 +22,7 @@ OVERLAY_TOPOLOGY = CLIQUE
22SERVERS = 22SERVERS =
23 23
24[nat] 24[nat]
25# Use addresses from the local network interfaces (inluding loopback, but also others) 25# Use addresses from the local network interfaces (including loopback, but also others)
26USE_LOCALADDR = YES 26USE_LOCALADDR = YES
27 27
28# Disable IPv6 support 28# Disable IPv6 support
diff --git a/src/set/test_set.conf b/src/set/test_set.conf
index 21fe984f8..f9b4547e9 100644
--- a/src/set/test_set.conf
+++ b/src/set/test_set.conf
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES
22NO_IO = YES 22NO_IO = YES
23 23
24[nat] 24[nat]
25# Use addresses from the local network interfaces (inluding loopback, but also others) 25# Use addresses from the local network interfaces (including loopback, but also others)
26USE_LOCALADDR = YES 26USE_LOCALADDR = YES
27 27
28# Disable IPv6 support 28# Disable IPv6 support
diff --git a/src/seti/test_seti.conf b/src/seti/test_seti.conf
index c87433419..aa4678b49 100644
--- a/src/seti/test_seti.conf
+++ b/src/seti/test_seti.conf
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES
22NO_IO = YES 22NO_IO = YES
23 23
24[nat] 24[nat]
25# Use addresses from the local network interfaces (inluding loopback, but also others) 25# Use addresses from the local network interfaces (including loopback, but also others)
26USE_LOCALADDR = YES 26USE_LOCALADDR = YES
27 27
28# Disable IPv6 support 28# Disable IPv6 support
diff --git a/src/setu/test_setu.conf b/src/setu/test_setu.conf
index 4eaf3f0c0..6d132fc1f 100644
--- a/src/setu/test_setu.conf
+++ b/src/setu/test_setu.conf
@@ -22,7 +22,7 @@ USE_LOCALADDR = YES
22NO_IO = YES 22NO_IO = YES
23 23
24[nat] 24[nat]
25# Use addresses from the local network interfaces (inluding loopback, but also others) 25# Use addresses from the local network interfaces (including loopback, but also others)
26USE_LOCALADDR = YES 26USE_LOCALADDR = YES
27 27
28# Disable IPv6 support 28# Disable IPv6 support
diff --git a/src/testbed/barriers.README.org b/src/testbed/barriers.README.org
index 40488a0cc..159e1c355 100644
--- a/src/testbed/barriers.README.org
+++ b/src/testbed/barriers.README.org
@@ -11,7 +11,7 @@ the barrier. A barrier which is reached is deemed as crossed after all the
11peers waiting on it are notified. 11peers waiting on it are notified.
12 12
13The barriers API provides the following functions: 13The barriers API provides the following functions:
141) GNUNET_TESTBED_barrier_init(): function to initialse a barrier in the 141) GNUNET_TESTBED_barrier_init(): function to initialise a barrier in the
15 experiment 15 experiment
162) GNUNET_TESTBED_barrier_cancel(): function to cancel a barrier which has been 162) GNUNET_TESTBED_barrier_cancel(): function to cancel a barrier which has been
17 initialised before 17 initialised before
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index ac0c9c400..2e9c0038d 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -12,7 +12,7 @@ PORT = 12366
12[test-barriers] 12[test-barriers]
13START_ON_DEMAND = NO 13START_ON_DEMAND = NO
14PORT = 12114 14PORT = 12114
15BINARY = /will/be/overwriten/in/test_testbed_api_barriers/ 15BINARY = /will/be/overwritten/in/test_testbed_api_barriers/
16IMMEDIATE_START = YES 16IMMEDIATE_START = YES
17 17
18[fs] 18[fs]
diff --git a/src/util/util.conf b/src/util/util.conf
index d8613f653..4f0860a49 100644
--- a/src/util/util.conf
+++ b/src/util/util.conf
@@ -14,7 +14,7 @@ GNUNET_HOME = ${GNUNET_TEST_HOME:-${HOME:-${USERPROFILE}}}
14# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html 14# http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
15# for how these should be used. 15# for how these should be used.
16 16
17# Persistant data storage 17# Persistent data storage
18GNUNET_DATA_HOME = ${XDG_DATA_HOME:-$GNUNET_HOME/.local/share}/gnunet/ 18GNUNET_DATA_HOME = ${XDG_DATA_HOME:-$GNUNET_HOME/.local/share}/gnunet/
19 19
20# Configuration files 20# Configuration files
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 18:49:47 +0000