[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] branch master updated (81f6aa39f -> 53e1d7b86)
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] branch master updated (81f6aa39f -> 53e1d7b86) |
Date: |
Sat, 09 Mar 2019 13:13:21 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a change to branch master
in repository gnunet.
from 81f6aa39f newline
new 5f7119d93 bashism
new 53e1d7b86 README
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README | 55 ++++++++++++++++---------
src/credential/test_credential_collect.sh | 4 +-
src/credential/test_credential_collect_rest.sh | 13 +++---
src/credential/test_credential_issue.sh | 4 +-
src/credential/test_credential_issue_rest.sh | 4 +-
src/credential/test_credential_verify.sh | 5 ++-
src/credential/test_credential_verify_and.sh | 5 ++-
src/credential/test_credential_verify_rest.sh | 5 ++-
src/credential/test_credential_verify_simple.sh | 4 +-
9 files changed, 60 insertions(+), 39 deletions(-)
diff --git a/README b/README
index 54e80a524..60d2983ef 100644
--- a/README
+++ b/README
@@ -34,16 +34,19 @@ These are the direct dependencies for running GNUnet:
- libmicrohttpd >= 0.9.42
- libgcrypt >= 1.6
-- libgnurl >= 7.35.0 (recommended, available from
https://gnunet.org/en/gnurl.html)
+- libgnurl >= 7.35.0 (recommended, available from
+ https://gnunet.org/en/gnurl.html)
- libcurl >= 7.35.0 (alternative to libgnurl)
- libunistring >= 0.9.2
-- gnutls >= 3.2.12 (highly recommended a gnutls linked
against libunbound)
+- gnutls >= 3.2.12 (highly recommended a gnutls
+ linked against libunbound)
- libidn:
- libidn2 (prefered)
or
- libidn >= 1.0
- libextractor >= 0.6.1 (highly recommended)
-- openssl >= 1.0 (binary, used to generate X.509 certificate
+- openssl >= 1.0 (binary, used to generate
+ X.509 certificate
for gnunet-gns-proxy-setup-ca)
- nss (certutil binary, for
gnunet-gns-proxy-setup-ca)
@@ -56,37 +59,50 @@ These are the direct dependencies for running GNUnet:
- make[*3]
- which (contrib/apparmor(?), gnunet-bugreport,
tests (dns, gns, namestore,
- scalarproduct) and possibly more)
+ scalarproduct) and possibly more)
- gettext
- zlib
-
+- Posix shell (for some scripts)
+- Bash (for some scripts)
These are the dependencies for GNUnet's testsuite:
-- Bash (optional (?[*4]), for some tests)
+- Posix Shell (for some tests)
+- Bash (for some tests[*4])
- python >= 3.7 (only python 3.7 is supported)
- python-future >= 3.7 (only python 3.7 is supported)
-- which
+- base tools
+ - mostly:
+ - which,
+ - bc,
+ - curl
+ - sed
These are the optional dependencies:
+- Bash (for Docker and Vagrant)
- libopus >= 1.0.1 (for experimental conversation tool)
- libpulse >= 2.0 (for experimental conversation tool)
- libogg >= 1.3.0 (for experimental conversation tool)
-- libnss (certtool binary (for convenient
installation of GNS proxy))
-- python2.7 = 2.7 (for gnunet-qr, only python 2.7 supported)
+- libnss (certtool binary (for convenient
+ installation of GNS proxy))
+- python2.7 = 2.7 (for gnunet-qr, only python 2.7
+ supported)
- python-zbar >= 0.10 (for gnunet-qr, not optional)
- TeX Live >= 2012 (for gnunet-bcd[*])
- texi2mdoc (for automatic mdoc generation [*2])
- libglpk >= 4.45 (for experimental code)
- perl5 (for some utilities)
-- guile 1.6.4 (or later up to 1.8?, for
gnunet-download-manager)
+- guile 1.6.4 (or later up to 1.8?, for
+ gnunet-download-manager)
- bluez (for bluetooth support)
- miniupnpc
-- libpbc >= 0.5.14 (for Attribute-Based Encryption and
Identity Provider functionality)
-- libgabe (for Attribute-Based Encryption and
Identity Provider functionality,
- from https://github.com/schanzen/libgabe)
+- libpbc >= 0.5.14 (for Attribute-Based Encryption and
+ Identity Provider functionality)
+- libgabe (for Attribute-Based Encryption and
+ Identity Provider functionality, from
+ https://github.com/schanzen/libgabe)
Recommended autotools for compiling the Git version are:
@@ -116,16 +132,17 @@ Recommended autotools for compiling the Git version are:
fix in.
[*4] We are commited to portable tools and solutions
- where possible. While the shellscripts work with
- NetBSD's sh, there's no warranty some bashisms
- are leftover.
+ where possible. New scripts should be Posix SH
+ compatible, current and older scripts are
+ in the process of being rewritten to comply
+ with this requirement.
Requirements
============
GNUnet's directed acyclic graph (DAG) will require around 0.74 GiB
-Diskspace, with GNUNet itself taking around 9.2 MiB reported by the
-build on GNU Guix.
+Diskspace, with GNUNet itself taking around 8 - 9.2 MiB reported by
+the build on GNU Guix.
How to install?
===============
@@ -465,7 +482,7 @@ Further Reading
GNUnet or projects around GNUnet.
There are currently 2 ways to get them:
- * Using git:
+ * Using git (NOTE: 1.1 GiB as of 2019-03-09):
git clone https://git.gnunet.org/bibliography.git
* Using Drupal:
https://old.gnunet.org/bibliography
diff --git a/src/credential/test_credential_collect.sh
b/src/credential/test_credential_collect.sh
index 6c713063f..0ae063eda 100755
--- a/src/credential/test_credential_collect.sh
+++ b/src/credential/test_credential_collect.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS
-o GNUNET_HOME -f`
# (3) PKEY3.user -> PKEY4
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
TEST_ATTR="test"
TEST_ATTR2="test2"
diff --git a/src/credential/test_credential_collect_rest.sh
b/src/credential/test_credential_collect_rest.sh
index 0b31f85bc..fe59d9399 100755
--- a/src/credential/test_credential_collect_rest.sh
+++ b/src/credential/test_credential_collect_rest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
@@ -22,7 +22,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS
-o GNUNET_HOME -f`
# (5) GNUnet.developer -> Alice
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
gnunet-arm -s -c test_credential_lookup.conf
gnunet-identity -C service -c test_credential_lookup.conf
gnunet-identity -C alice -c test_credential_lookup.conf
@@ -82,9 +82,10 @@ gnunet-arm -e -c test_credential_lookup.conf
echo "Done"
if [ "$RES_CRED" != "Failed." ]
then
- echo -e "${RES_CRED}"
- exit 0
+ # TODO: replace echo -e bashism.
+ echo -e "${RES_CRED}"
+ exit 0
else
- echo "FAIL: Failed to verify credential $RES_CRED."
- exit 1
+ echo "FAIL: Failed to verify credential $RES_CRED."
+ exit 1
fi
diff --git a/src/credential/test_credential_issue.sh
b/src/credential/test_credential_issue.sh
index 158d91c5b..f06de5d42 100755
--- a/src/credential/test_credential_issue.sh
+++ b/src/credential/test_credential_issue.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS
-o GNUNET_HOME -f`
# (3) PKEY3.user -> PKEY4
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
TEST_ATTR="test"
gnunet-arm -s -c test_credential_lookup.conf
diff --git a/src/credential/test_credential_issue_rest.sh
b/src/credential/test_credential_issue_rest.sh
index 15cd55083..c518c08ec 100755
--- a/src/credential/test_credential_issue_rest.sh
+++ b/src/credential/test_credential_issue_rest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
@@ -20,7 +20,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS
-o GNUNET_HOME -f`
# (3) PKEY3.user -> PKEY4
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
TEST_ATTR="test"
gnunet-arm -s -c test_credential_lookup.conf
diff --git a/src/credential/test_credential_verify.sh
b/src/credential/test_credential_verify.sh
index d042bcfe6..49d4d4afb 100755
--- a/src/credential/test_credential_verify.sh
+++ b/src/credential/test_credential_verify.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
@@ -22,7 +22,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS
-o GNUNET_HOME -f`
# (5) GNUnet.developer -> Alice
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
gnunet-arm -s -c test_credential_lookup.conf
gnunet-identity -C service -c test_credential_lookup.conf
gnunet-identity -C alice -c test_credential_lookup.conf
@@ -73,6 +73,7 @@ gnunet-arm -e -c test_credential_lookup.conf
if [ "$RES_CRED" != "Failed." ]
then
+ # TODO: replace echo -e bashism
echo -e "${RES_CRED}"
exit 0
else
diff --git a/src/credential/test_credential_verify_and.sh
b/src/credential/test_credential_verify_and.sh
index 9d5c1962e..7e8dc1392 100755
--- a/src/credential/test_credential_verify_and.sh
+++ b/src/credential/test_credential_verify_and.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
@@ -22,7 +22,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS
-o GNUNET_HOME -f`
# (5) GNUnet.developer -> Alice
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
gnunet-arm -s -c test_credential_lookup.conf
gnunet-identity -C service -c test_credential_lookup.conf
gnunet-identity -C alice -c test_credential_lookup.conf
@@ -73,6 +73,7 @@ gnunet-arm -e -c test_credential_lookup.conf
if [ "$RES_CRED" != "Failed." ]
then
+ # TODO: echo -e bashism
echo -e "${RES_CRED}"
exit 0
else
diff --git a/src/credential/test_credential_verify_rest.sh
b/src/credential/test_credential_verify_rest.sh
index 6133ea25e..99db5da8a 100755
--- a/src/credential/test_credential_verify_rest.sh
+++ b/src/credential/test_credential_verify_rest.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
@@ -22,7 +22,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS
-o GNUNET_HOME -f`
# (5) GNUnet.developer -> Alice
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
gnunet-arm -s -c test_credential_lookup.conf
gnunet-identity -C service -c test_credential_lookup.conf
gnunet-identity -C alice -c test_credential_lookup.conf
@@ -79,6 +79,7 @@ gnunet-arm -e -c test_credential_lookup.conf
if [ "$RES_CRED" != "Failed." ]
then
+ # TODO: replace echo -e bashism
echo -e "${RES_CRED}"
exit 0
else
diff --git a/src/credential/test_credential_verify_simple.sh
b/src/credential/test_credential_verify_simple.sh
index bcb3f9877..41afb47b0 100755
--- a/src/credential/test_credential_verify_simple.sh
+++ b/src/credential/test_credential_verify_simple.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
trap "gnunet-arm -e -c test_credential_lookup.conf" SIGINT
LOCATION=$(which gnunet-config)
@@ -18,7 +18,7 @@ rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS
-o GNUNET_HOME -f`
# (3) Isser.user -> Subject
-which timeout &> /dev/null && DO_TIMEOUT="timeout 30"
+which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 30"
gnunet-arm -s -c test_credential_lookup.conf
gnunet-identity -C testissuer -c test_credential_lookup.conf
gnunet-identity -C testsubject -c test_credential_lookup.conf
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnunet] branch master updated (81f6aa39f -> 53e1d7b86),
gnunet <=