[GNUnet-SVN] [gnunet] branch master updated (64e37887e -> fed9e8bfb)

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a change to branch master
in repository gnunet.

    from 64e37887e use more proper way to parse cli options
     new 67669ed0c configure: Add initial upnpc code
     new 8fd70ea22 check in guix packages for dvn
     new 4559466ac check in guix packages for dvn
     new fed9e8bfb Merge branch 'master' of gnunet.org:gnunet

The 4 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:
 .gitignore                                         |  1 -
 configure.ac                                       | 21 ++++++++++++-
 .../packages/guix/guix-env-gillmann.scm            | 35 ++++++++++------------
 .../packages/guix/guix-env-py2.scm                 | 22 +++++++-------
 4 files changed, 47 insertions(+), 32 deletions(-)
 copy guix-env.scm => contrib/packages/guix/guix-env-gillmann.scm (78%)
 copy guix-env.scm => contrib/packages/guix/guix-env-py2.scm (87%)

diff --git a/.gitignore b/.gitignore
index 46dc14a98..0959a9597 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,6 @@ INSTALL
 confdefs.h
 confdefs.c
 confdefs.err
-guix-env-gillmann.scm
 src/namestore/test_namestore_api_zone_to_name
 src/credential/gnunet-credential
 src/credential/gnunet-service-credential
diff --git a/configure.ac b/configure.ac
index fc44dcf5a..c8e316416 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,10 +213,19 @@ else
 AC_MSG_WARN([warning: 'iptables' not found.])
 fi
 
-
 AC_CHECK_PROG(VAR_IFCONFIG_BINARY, ifconfig, true, false)
 AC_MSG_WARN([warning: 'ifconfig' not found.])
 
+# miniupnpc / upnpc binary is a soft runtime requirement
+AC_PATH_TARGET_TOOL(VAR_UPNPC_BINARY, upnpc, false)
+
+if test x"$VAR_UPNPC_BINARY" != x"false"
+then
+AC_DEFINE_UNQUOTED([UPNPC], "$VAR_UPNPC_BINARY", [Path to upnpc binary])
+else
+AC_MSG_WARN([warning: 'upnpc' binary not found.])
+fi
+
 AC_CHECK_MEMBER(struct tm.tm_gmtoff,
   [AC_DEFINE(HAVE_TM_GMTOFF, 1,
      [Define if struct tm has the tm_gmtoff member.])],
@@ -1811,6 +1820,10 @@ then
   AC_MSG_NOTICE([WARNING: jansson library not found.  json support will not be 
compiled.])
 fi
 
+#
+# FIXME: `some modules' -> be more specific which exact modules.
+#
+
 # warn user if iptables is not found
 if test "$VAR_IPTABLES_BINARY" = "false"
 then
@@ -1823,6 +1836,12 @@ then
 AC_MSG_NOTICE([WARNING: ifconfig not found. some modules may not have full 
functionality.])
 fi
 
+# warn user if upnpc binary is not found
+if test "$VAR_UPNPC_BINARY" = "false"
+then
+AC_MSG_NOTICE([WARNING: upnpc binary not found. some modules may not have full 
functionality.])
+fi
+
 #gnutls
 if test x$gnutls != xtrue
 then
diff --git a/guix-env.scm b/contrib/packages/guix/guix-env-gillmann.scm
similarity index 78%
copy from guix-env.scm
copy to contrib/packages/guix/guix-env-gillmann.scm
index 588f389c5..4b977c1bb 100644
--- a/guix-env.scm
+++ b/contrib/packages/guix/guix-env-gillmann.scm
@@ -1,18 +1,20 @@
 ;;; This file is part of GNUnet.
 ;;; Copyright (C) 2016, 2017, 2018 GNUnet e.V.
 ;;;
-;;; GNUnet is free software: you can redistribute it and/or modify it
-;;; under the terms of the GNU Affero General Public License as published
-;;; by the Free Software Foundation, either version 3 of the License,
-;;; or (at your option) any later version.
+;;; GNUnet is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation; either version 3, or (at your
+;;; option) any later version.
 ;;;
 ;;; GNUnet is distributed in the hope that it will be useful, but
 ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Affero General Public License for more details.
+;;; General Public License for more details.
 ;;;
-;;; You should have received a copy of the GNU Affero General Public License
-;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNUnet; see the file COPYING.  If not, write to the
+;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;; Boston, MA 02110-1301, USA.
 
 (use-modules
  (ice-9 popen)
@@ -85,6 +87,7 @@
          ("gstreamer" ,gstreamer)
          ("gst-plugins-base" ,gst-plugins-base)
          ("gnutls/dane" ,gnutls/dane)
+         ("iptables" ,iptables)
          ("libextractor" ,libextractor)
          ("libgcrypt" ,libgcrypt)
          ("libidn" ,libidn)
@@ -96,11 +99,10 @@
          ("pulseaudio" ,pulseaudio)
          ("sqlite" ,sqlite)
          ("postgresql" ,postgresql)
-         ("mysql" ,mariadb)
+         ("mariadb" ,mariadb)
          ("zlib" ,zlib)
          ("perl" ,perl)
          ("python-2" ,python-2) ; tests and gnunet-qr
-         ("python2-future" ,python2-future)
          ("jansson" ,jansson)
          ("nss" ,nss)
          ("glib" ,glib "bin")
@@ -123,8 +125,8 @@
       (arguments
        `(;#:configure-flags
          ;;(list (string-append "--with-nssdir=" %output "/lib")
-               ;;"--enable-gcc-hardening"
-               ;;"--enable-linker-hardening"
+         ;;"--enable-gcc-hardening"
+         ;;"--enable-linker-hardening"
                ;;;;"--enable-documentation-only")
                ;;;"--enable-logging=verbose"
                ;;;"CFLAGS=-ggdb -O0")
@@ -138,19 +140,12 @@
                #t))
            (add-after 'patch-bin-sh 'bootstrap
              (lambda _
-               (invoke "sh" "bootstrap")))
+               (zero? (system* "sh" "bootstrap"))))
            ;;(add-before 'build 'chdir
            ;; (lambda _
            ;;  (chdir "doc/documentation")))
            (delete 'check)
            ;; XXX: https://gnunet.org/bugs/view.php?id=4619
-           (add-after 'install 'set-path-for-check
-             (lambda* (#:key outputs #:allow-other-keys)
-               (let* ((out (assoc-ref outputs "out"))
-                      (bin (string-append out "/bin"))
-                      (lib (string-append out "/lib")))
-                 (setenv "GNUNET_PREFIX" lib)
-                 (setenv "PATH" (string-append (getenv "PATH") ":" bin))
-                 (invoke "make" "check"))))))))))
+           ))))))
 
 gnunet-dev-env
diff --git a/guix-env.scm b/contrib/packages/guix/guix-env-py2.scm
similarity index 87%
copy from guix-env.scm
copy to contrib/packages/guix/guix-env-py2.scm
index 588f389c5..6085f96a9 100644
--- a/guix-env.scm
+++ b/contrib/packages/guix/guix-env-py2.scm
@@ -1,18 +1,20 @@
 ;;; This file is part of GNUnet.
 ;;; Copyright (C) 2016, 2017, 2018 GNUnet e.V.
 ;;;
-;;; GNUnet is free software: you can redistribute it and/or modify it
-;;; under the terms of the GNU Affero General Public License as published
-;;; by the Free Software Foundation, either version 3 of the License,
-;;; or (at your option) any later version.
+;;; GNUnet is free software; you can redistribute it and/or modify
+;;; it under the terms of the GNU General Public License as published
+;;; by the Free Software Foundation; either version 3, or (at your
+;;; option) any later version.
 ;;;
 ;;; GNUnet is distributed in the hope that it will be useful, but
 ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; Affero General Public License for more details.
+;;; General Public License for more details.
 ;;;
-;;; You should have received a copy of the GNU Affero General Public License
-;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNUnet; see the file COPYING.  If not, write to the
+;;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;;; Boston, MA 02110-1301, USA.
 
 (use-modules
  (ice-9 popen)
@@ -96,7 +98,7 @@
          ("pulseaudio" ,pulseaudio)
          ("sqlite" ,sqlite)
          ("postgresql" ,postgresql)
-         ("mysql" ,mariadb)
+         ("mysql" ,mysql)
          ("zlib" ,zlib)
          ("perl" ,perl)
          ("python-2" ,python-2) ; tests and gnunet-qr
@@ -138,7 +140,7 @@
                #t))
            (add-after 'patch-bin-sh 'bootstrap
              (lambda _
-               (invoke "sh" "bootstrap")))
+               (zero? (system* "sh" "bootstrap"))))
            ;;(add-before 'build 'chdir
            ;; (lambda _
            ;;  (chdir "doc/documentation")))
@@ -151,6 +153,6 @@
                       (lib (string-append out "/lib")))
                  (setenv "GNUNET_PREFIX" lib)
                  (setenv "PATH" (string-append (getenv "PATH") ":" bin))
-                 (invoke "make" "check"))))))))))
+                 (zero? (system* "make" "check")))))))))))
 
 gnunet-dev-env

-- 
To stop receiving notification emails like this one, please contact
address@hidden