gnunet: update to 0.11.8

Allows to remove local patch again.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index a05eea01bfb6c223d3e9e0c0dab508b2c905ffe8..c08cf2eae7f3bbc40b8f6b405c9bf7de2888839f 100644 (file)
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -2,11 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gnunet
 
-PKG_VERSION:=0.11.7
+PKG_VERSION:=0.11.8
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GNU/gnunet
-PKG_HASH:=13ffe47232f12e8f5ae2172651b123c816446c879d20c7acc72479872045eee5
+PKG_HASH:=d21f1b7a5e0c3e1ddf062c87a302db9abb43574bb7bf8c9e8f233b5d0e6675fe
 
 PKG_LICENSE:=AGPL-3.0
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/gnunet/patches/001-include-pq-h-in-dist.patch b/net/gnunet/patches/001-include-pq-h-in-dist.patch
deleted file mode 100644 (file)
index fffc091..0000000
--- a/net/gnunet/patches/001-include-pq-h-in-dist.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: gnunet-0.11.7/src/pq/pq.h
-===================================================================
---- /dev/null
-+++ gnunet-0.11.7/src/pq/pq.h
-@@ -0,0 +1,57 @@
-+/*
-+   This file is part of GNUnet
-+   Copyright (C) 2017, 2019 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 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.
-+
-+   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/>.
-+
-+     SPDX-License-Identifier: AGPL3.0-or-later
-+ */
-+/**
-+ * @file pq/pq.h
-+ * @brief shared internal data structures of libgnunetpq
-+ * @author Christian Grothoff
-+ */
-+#ifndef PQ_H
-+#define PQ_H
-+
-+#include "gnunet_util_lib.h"
-+#include "gnunet_pq_lib.h"
-+
-+/**
-+ * Handle to Postgres database.
-+ */
-+struct GNUNET_PQ_Context
-+{
-+  /**
-+   * Actual connection.
-+   */
-+  PGconn *conn;
-+
-+  /**
-+   * Statements to execute upon connection.
-+   */
-+  struct GNUNET_PQ_ExecuteStatement *es;
-+
-+  /**
-+   * Prepared statements.
-+   */
-+  struct GNUNET_PQ_PreparedStatement *ps;
-+
-+  /**
-+   * Configuration to use to connect to the DB.
-+   */
-+  char *config_str;
-+};
-+
-+#endif
-Index: gnunet-0.11.7/src/pq/Makefile.am
-===================================================================
---- gnunet-0.11.7.orig/src/pq/Makefile.am
-+++ gnunet-0.11.7/src/pq/Makefile.am
-@@ -11,6 +11,7 @@ endif
- 
- libgnunetpq_la_SOURCES = \
-   pq.c \
-+  pq.h \
-   pq_connect.c \
-   pq_eval.c \
-   pq_exec.c \
-Index: gnunet-0.11.7/src/pq/Makefile.in
-===================================================================
---- gnunet-0.11.7.orig/src/pq/Makefile.in
-+++ gnunet-0.11.7/src/pq/Makefile.in
-@@ -641,6 +641,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/includ
- @HAVE_POSTGRESQL_TRUE@lib_LTLIBRARIES = libgnunetpq.la
- libgnunetpq_la_SOURCES = \
-   pq.c \
-+  pq.h \
-   pq_connect.c \
-   pq_eval.c \
-   pq_exec.c \