From 29cad19f0cfffc7152ae1aaa45ced06195b26599cdb1ed1cd4f726c2aeb285c5 Mon Sep 17 00:00:00 2001 From: Alexei Podvalsky Date: Thu, 16 May 2019 19:35:25 +0000 Subject: [PATCH] Accepting request 703531 from home:awissu - Update to 0.11.4: * see /usr/share/package/gnunet/ChangeLog - Drop pathes: * gnunet-fix_postgresql_include.patch * gnunet-0.10.1_libexec_conversation.patch - Create system user and groups with systemd-sysusers - Build gnurl only with protocols: HTTP HTTPS - Remove obsolete macros - Systemd files cleanup - Spec file cleanup OBS-URL: https://build.opensuse.org/request/show/703531 OBS-URL: https://build.opensuse.org/package/show/filesharing/gnunet?expand=0&rev=4 --- gnunet-0.10.1.tar.gz | 3 - gnunet-0.10.1_gnurl.patch | 1125 +--------------------- gnunet-0.10.1_libexec_conversation.patch | 12 - gnunet-0.11.4.tar.gz | 3 + gnunet-fix_postgresql_include.patch | 88 -- gnunet-tmpfile.conf | 1 - gnunet.changes | 14 + gnunet.init | 100 -- gnunet.service => gnunet.service.in | 15 +- gnunet.spec | 404 ++++---- gnunet.sysusers.in | 2 + gnunet.tmpfile.in | 3 + gnurl-7.54.0.tar.bz2 | 3 - gnurl-7.64.1.tar.gz | 3 + 14 files changed, 228 insertions(+), 1548 deletions(-) delete mode 100644 gnunet-0.10.1.tar.gz delete mode 100644 gnunet-0.10.1_libexec_conversation.patch create mode 100644 gnunet-0.11.4.tar.gz delete mode 100644 gnunet-fix_postgresql_include.patch delete mode 100644 gnunet-tmpfile.conf delete mode 100644 gnunet.init rename gnunet.service => gnunet.service.in (63%) create mode 100644 gnunet.sysusers.in create mode 100644 gnunet.tmpfile.in delete mode 100644 gnurl-7.54.0.tar.bz2 create mode 100644 gnurl-7.64.1.tar.gz diff --git a/gnunet-0.10.1.tar.gz b/gnunet-0.10.1.tar.gz deleted file mode 100644 index 8443956..0000000 --- a/gnunet-0.10.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f65cbbf9678d5b009b0a9ab2f2a29f8c956a3a23594fb404b10bbfc947fd9d13 -size 5022047 diff --git a/gnunet-0.10.1_gnurl.patch b/gnunet-0.10.1_gnurl.patch index 8a6950c..055a7b9 100644 --- a/gnunet-0.10.1_gnurl.patch +++ b/gnunet-0.10.1_gnurl.patch @@ -1,1125 +1,12 @@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/Makefile.in gnunet-0.10.1/Makefile.in ---- gnunet-0.10.1.orig/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/Makefile.in 2015-05-28 06:38:17.732420500 +0300 -@@ -297,8 +297,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/configure.ac gnunet-0.10.1/configure.ac ---- gnunet-0.10.1.orig/configure.ac 2014-04-08 10:55:04.000000000 +0300 -+++ gnunet-0.10.1/configure.ac 2015-05-28 06:39:00.516813336 +0300 -@@ -453,15 +453,9 @@ +diff -ruN gnunet-0.11.4.orig/configure.ac gnunet-0.11.4/configure.ac +--- gnunet-0.11.4.orig/configure.ac 2019-05-12 13:54:45.000000000 +0300 ++++ gnunet-0.11.4/configure.ac 2019-05-15 19:58:27.798285711 +0300 +@@ -762,7 +762,7 @@ fi # libgnurl -LIBGNURL_CHECK_CONFIG(,7.34.0,gnurl=1,gnurl=0) --if test "$gnurl" = 1 --then -- AM_CONDITIONAL(HAVE_LIBGNURL, true) -- AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) --else -- AM_CONDITIONAL(HAVE_LIBGNURL, false) --fi -- +$gnurl=yes -+AM_CONDITIONAL(HAVE_LIBGNURL, true) -+AC_DEFINE([HAVE_LIBGNURL],[1],[Have libgnurl]) - # libidn - AC_MSG_CHECKING([if Libidn can be used]) -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/contrib/Makefile.in gnunet-0.10.1/contrib/Makefile.in ---- gnunet-0.10.1.orig/contrib/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/contrib/Makefile.in 2015-05-28 06:38:17.675421309 +0300 -@@ -453,8 +453,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/doc/Makefile.in gnunet-0.10.1/doc/Makefile.in ---- gnunet-0.10.1.orig/doc/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/doc/Makefile.in 2015-05-28 06:38:17.749420259 +0300 -@@ -239,8 +239,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/doc/doxygen/Makefile.in gnunet-0.10.1/doc/doxygen/Makefile.in ---- gnunet-0.10.1.orig/doc/doxygen/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/doc/doxygen/Makefile.in 2015-05-28 06:38:17.762420074 +0300 -@@ -179,8 +179,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/doc/man/Makefile.in gnunet-0.10.1/doc/man/Makefile.in ---- gnunet-0.10.1.orig/doc/man/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/doc/man/Makefile.in 2015-05-28 06:38:17.776419875 +0300 -@@ -211,8 +211,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/m4/Makefile.in gnunet-0.10.1/m4/Makefile.in ---- gnunet-0.10.1.orig/m4/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/m4/Makefile.in 2015-05-28 06:38:17.699420968 +0300 -@@ -179,8 +179,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/m4/libgnurl.m4 gnunet-0.10.1/m4/libgnurl.m4 ---- gnunet-0.10.1.orig/m4/libgnurl.m4 2013-11-04 13:07:22.000000000 +0300 -+++ gnunet-0.10.1/m4/libgnurl.m4 2015-05-28 06:38:17.684421181 +0300 -@@ -14,7 +14,7 @@ - # Note that using --without-libgnurl does run ACTION-IF-NO. - # - # This macro #defines HAVE_LIBGNURL if a working libgnurl setup is --# found, and sets @LIBGNURL@ and @LIBGNURL_CPPFLAGS@ to the necessary -+# found, and sets $(LIBGNURL) and $(LIBGNURL_CPPFLAGS) to the necessary - # values. Other useful defines are LIBGNURL_FEATURE_xxx where xxx are - # the various features supported by libgnurl, and LIBGNURL_PROTOCOL_yyy - # where yyy are the various protocols supported by libgnurl. Both xxx -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/pkgconfig/Makefile.in gnunet-0.10.1/pkgconfig/Makefile.in ---- gnunet-0.10.1.orig/pkgconfig/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/pkgconfig/Makefile.in 2015-05-28 06:38:19.246399014 +0300 -@@ -243,8 +243,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/Makefile.in gnunet-0.10.1/src/Makefile.in ---- gnunet-0.10.1.orig/src/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/src/Makefile.in 2015-05-28 06:38:18.406410935 +0300 -@@ -250,8 +250,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/arm/Makefile.in gnunet-0.10.1/src/arm/Makefile.in ---- gnunet-0.10.1.orig/src/arm/Makefile.in 2014-04-08 13:49:19.000000000 +0300 -+++ gnunet-0.10.1/src/arm/Makefile.in 2015-05-28 06:38:18.108415164 +0300 -@@ -485,8 +485,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/ats/Makefile.in gnunet-0.10.1/src/ats/Makefile.in ---- gnunet-0.10.1.orig/src/ats/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/ats/Makefile.in 2015-05-28 06:38:18.183414099 +0300 -@@ -962,8 +962,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/ats-tests/Makefile.in gnunet-0.10.1/src/ats-tests/Makefile.in ---- gnunet-0.10.1.orig/src/ats-tests/Makefile.in 2014-04-08 13:52:42.000000000 +0300 -+++ gnunet-0.10.1/src/ats-tests/Makefile.in 2015-05-28 06:38:18.718406507 +0300 -@@ -532,8 +532,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/ats-tool/Makefile.in gnunet-0.10.1/src/ats-tool/Makefile.in ---- gnunet-0.10.1.orig/src/ats-tool/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/ats-tool/Makefile.in 2015-05-28 06:38:19.011402349 +0300 -@@ -236,8 +236,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/block/Makefile.in gnunet-0.10.1/src/block/Makefile.in ---- gnunet-0.10.1.orig/src/block/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/block/Makefile.in 2015-05-28 06:38:18.764405854 +0300 -@@ -280,8 +280,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/consensus/Makefile.in gnunet-0.10.1/src/consensus/Makefile.in ---- gnunet-0.10.1.orig/src/consensus/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/consensus/Makefile.in 2015-05-28 06:38:18.998402533 +0300 -@@ -485,8 +485,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/conversation/Makefile.in gnunet-0.10.1/src/conversation/Makefile.in ---- gnunet-0.10.1.orig/src/conversation/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/conversation/Makefile.in 2015-05-28 06:38:18.007416597 +0300 -@@ -667,8 +667,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/core/Makefile.in gnunet-0.10.1/src/core/Makefile.in ---- gnunet-0.10.1.orig/src/core/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/core/Makefile.in 2015-05-28 06:38:18.476409941 +0300 -@@ -550,8 +550,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datacache/Makefile.in gnunet-0.10.1/src/datacache/Makefile.in ---- gnunet-0.10.1.orig/src/datacache/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/datacache/Makefile.in 2015-05-28 06:38:19.055401724 +0300 -@@ -600,8 +600,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datastore/Makefile.in gnunet-0.10.1/src/datastore/Makefile.in ---- gnunet-0.10.1.orig/src/datastore/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/datastore/Makefile.in 2015-05-28 06:38:18.852404605 +0300 -@@ -750,8 +750,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/dht/Makefile.in gnunet-0.10.1/src/dht/Makefile.in ---- gnunet-0.10.1.orig/src/dht/Makefile.in 2014-04-08 13:49:20.000000000 +0300 -+++ gnunet-0.10.1/src/dht/Makefile.in 2015-05-28 06:38:19.199399681 +0300 -@@ -554,8 +554,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/dns/Makefile.in gnunet-0.10.1/src/dns/Makefile.in ---- gnunet-0.10.1.orig/src/dns/Makefile.in 2014-04-08 13:49:21.000000000 +0300 -+++ gnunet-0.10.1/src/dns/Makefile.in 2015-05-28 06:38:19.171400078 +0300 -@@ -493,8 +493,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/dv/Makefile.in gnunet-0.10.1/src/dv/Makefile.in ---- gnunet-0.10.1.orig/src/dv/Makefile.in 2014-04-08 13:49:21.000000000 +0300 -+++ gnunet-0.10.1/src/dv/Makefile.in 2015-05-28 06:38:19.106401000 +0300 -@@ -496,8 +496,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/env/Makefile.in gnunet-0.10.1/src/env/Makefile.in ---- gnunet-0.10.1.orig/src/env/Makefile.in 2014-04-08 13:49:21.000000000 +0300 -+++ gnunet-0.10.1/src/env/Makefile.in 2015-05-28 06:38:19.145400447 +0300 -@@ -441,8 +441,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/exit/Makefile.in gnunet-0.10.1/src/exit/Makefile.in ---- gnunet-0.10.1.orig/src/exit/Makefile.in 2014-04-08 13:49:21.000000000 +0300 -+++ gnunet-0.10.1/src/exit/Makefile.in 2015-05-28 06:38:19.025402150 +0300 -@@ -284,8 +284,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/experimentation/Makefile.in gnunet-0.10.1/src/experimentation/Makefile.in ---- gnunet-0.10.1.orig/src/experimentation/Makefile.in 2014-04-08 13:49:21.000000000 +0300 -+++ gnunet-0.10.1/src/experimentation/Makefile.in 2015-05-28 06:38:18.586408380 +0300 -@@ -472,8 +472,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/fragmentation/Makefile.in gnunet-0.10.1/src/fragmentation/Makefile.in ---- gnunet-0.10.1.orig/src/fragmentation/Makefile.in 2014-04-08 13:49:21.000000000 +0300 -+++ gnunet-0.10.1/src/fragmentation/Makefile.in 2015-05-28 06:38:18.904403867 +0300 -@@ -452,8 +452,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/fs/Makefile.in gnunet-0.10.1/src/fs/Makefile.in ---- gnunet-0.10.1.orig/src/fs/Makefile.in 2014-04-08 14:16:58.000000000 +0300 -+++ gnunet-0.10.1/src/fs/Makefile.in 2015-05-28 06:38:18.650407472 +0300 -@@ -838,8 +838,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/gns/Makefile.in gnunet-0.10.1/src/gns/Makefile.in ---- gnunet-0.10.1.orig/src/gns/Makefile.in 2014-04-08 13:49:21.000000000 +0300 -+++ gnunet-0.10.1/src/gns/Makefile.in 2015-05-28 06:38:18.246413205 +0300 -@@ -568,8 +568,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/gns/nss/Makefile.in gnunet-0.10.1/src/gns/nss/Makefile.in ---- gnunet-0.10.1.orig/src/gns/nss/Makefile.in 2014-04-08 13:49:21.000000000 +0300 -+++ gnunet-0.10.1/src/gns/nss/Makefile.in 2015-05-28 06:38:18.263412964 +0300 -@@ -306,8 +306,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/gnsrecord/Makefile.in gnunet-0.10.1/src/gnsrecord/Makefile.in ---- gnunet-0.10.1.orig/src/gnsrecord/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/gnsrecord/Makefile.in 2015-05-28 06:38:18.366411502 +0300 -@@ -490,8 +490,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/hello/Makefile.in gnunet-0.10.1/src/hello/Makefile.in ---- gnunet-0.10.1.orig/src/hello/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/hello/Makefile.in 2015-05-28 06:38:18.735406266 +0300 -@@ -458,8 +458,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/hostlist/Makefile.am gnunet-0.10.1/src/hostlist/Makefile.am ---- gnunet-0.10.1.orig/src/hostlist/Makefile.am 2014-04-08 13:45:36.000000000 +0300 -+++ gnunet-0.10.1/src/hostlist/Makefile.am 2015-05-28 06:38:18.211413702 +0300 -@@ -34,11 +34,11 @@ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBMHD) \ -- @LIBGNURL@ \ -+ $(LIBGNURL) \ - $(GN_LIBINTL) - - gnunet_daemon_hostlist_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - if HAVE_LIBGNURL - check_PROGRAMS = \ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/hostlist/Makefile.in gnunet-0.10.1/src/hostlist/Makefile.in ---- gnunet-0.10.1.orig/src/hostlist/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/hostlist/Makefile.in 2015-05-28 06:38:18.208413745 +0300 -@@ -490,8 +490,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -@@ -649,11 +649,11 @@ - $(top_builddir)/src/transport/libgnunettransport.la \ - $(top_builddir)/src/util/libgnunetutil.la \ - $(GN_LIBMHD) \ -- @LIBGNURL@ \ -+ $(LIBGNURL) \ - $(GN_LIBINTL) - - gnunet_daemon_hostlist_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - @ENABLE_TEST_RUN_TRUE@@HAVE_LIBGNURL_TRUE@@HAVE_MHD_TRUE@AM_TESTS_ENVIRONMENT = export GNUNET_PREFIX=$${GNUNET_PREFIX:-@libdir@};export PATH=$${GNUNET_PREFIX:-@prefix@}/bin:$$PATH; - test_gnunet_daemon_hostlist_SOURCES = \ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/identity/Makefile.in gnunet-0.10.1/src/identity/Makefile.in ---- gnunet-0.10.1.orig/src/identity/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/identity/Makefile.in 2015-05-28 06:38:18.451410296 +0300 -@@ -463,8 +463,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/include/Makefile.in gnunet-0.10.1/src/include/Makefile.in ---- gnunet-0.10.1.orig/src/include/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/include/Makefile.in 2015-05-28 06:38:18.663407287 +0300 -@@ -308,8 +308,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/integration-tests/Makefile.in gnunet-0.10.1/src/integration-tests/Makefile.in ---- gnunet-0.10.1.orig/src/integration-tests/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/integration-tests/Makefile.in 2015-05-28 06:38:19.124400745 +0300 -@@ -386,8 +386,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/mesh/Makefile.in gnunet-0.10.1/src/mesh/Makefile.in ---- gnunet-0.10.1.orig/src/mesh/Makefile.in 2014-04-08 14:16:37.000000000 +0300 -+++ gnunet-0.10.1/src/mesh/Makefile.in 2015-05-28 06:38:18.332411985 +0300 -@@ -539,8 +539,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/multicast/Makefile.in gnunet-0.10.1/src/multicast/Makefile.in ---- gnunet-0.10.1.orig/src/multicast/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/multicast/Makefile.in 2015-05-28 06:38:18.930403498 +0300 -@@ -471,8 +471,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/mysql/Makefile.in gnunet-0.10.1/src/mysql/Makefile.in ---- gnunet-0.10.1.orig/src/mysql/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/mysql/Makefile.in 2015-05-28 06:38:18.346411786 +0300 -@@ -264,8 +264,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/namecache/Makefile.in gnunet-0.10.1/src/namecache/Makefile.in ---- gnunet-0.10.1.orig/src/namecache/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/namecache/Makefile.in 2015-05-28 06:38:18.133414809 +0300 -@@ -520,8 +520,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/namestore/Makefile.in gnunet-0.10.1/src/namestore/Makefile.in ---- gnunet-0.10.1.orig/src/namestore/Makefile.in 2014-04-08 13:49:22.000000000 +0300 -+++ gnunet-0.10.1/src/namestore/Makefile.in 2015-05-28 06:38:18.300412439 +0300 -@@ -704,8 +704,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/nat/Makefile.in gnunet-0.10.1/src/nat/Makefile.in ---- gnunet-0.10.1.orig/src/nat/Makefile.in 2014-04-08 14:20:52.000000000 +0300 -+++ gnunet-0.10.1/src/nat/Makefile.in 2015-05-28 06:38:17.800419535 +0300 -@@ -499,8 +499,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/nse/Makefile.in gnunet-0.10.1/src/nse/Makefile.in ---- gnunet-0.10.1.orig/src/nse/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/nse/Makefile.in 2015-05-28 06:38:17.926417747 +0300 -@@ -490,8 +490,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/peerinfo/Makefile.in gnunet-0.10.1/src/peerinfo/Makefile.in ---- gnunet-0.10.1.orig/src/peerinfo/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/peerinfo/Makefile.in 2015-05-28 06:38:18.682407018 +0300 -@@ -516,8 +516,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/peerinfo-tool/Makefile.in gnunet-0.10.1/src/peerinfo-tool/Makefile.in ---- gnunet-0.10.1.orig/src/peerinfo-tool/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/peerinfo-tool/Makefile.in 2015-05-28 06:38:18.973402888 +0300 -@@ -442,8 +442,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/postgres/Makefile.in gnunet-0.10.1/src/postgres/Makefile.in ---- gnunet-0.10.1.orig/src/postgres/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/postgres/Makefile.in 2015-05-28 06:38:18.081415547 +0300 -@@ -263,8 +263,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/psyc/Makefile.in gnunet-0.10.1/src/psyc/Makefile.in ---- gnunet-0.10.1.orig/src/psyc/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/psyc/Makefile.in 2015-05-28 06:38:18.882404179 +0300 -@@ -459,8 +459,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/psycstore/Makefile.in gnunet-0.10.1/src/psycstore/Makefile.in ---- gnunet-0.10.1.orig/src/psycstore/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/psycstore/Makefile.in 2015-05-28 06:38:18.789405499 +0300 -@@ -482,8 +482,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/pt/Makefile.am gnunet-0.10.1/src/pt/Makefile.am ---- gnunet-0.10.1.orig/src/pt/Makefile.am 2014-04-08 13:45:35.000000000 +0300 -+++ gnunet-0.10.1/src/pt/Makefile.am 2015-05-28 06:38:18.390411162 +0300 -@@ -69,48 +69,48 @@ - - test_gns_vpn_SOURCES = \ - test_gns_vpn.c --test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gns_vpn_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/namestore/libgnunetnamestore.la \ - $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - test_gns_vpn_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - test_gnunet_vpn_4_over_SOURCES = \ - test_gnunet_vpn.c --test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - test_gnunet_vpn_4_over_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - test_gnunet_vpn_6_over_SOURCES = \ - test_gnunet_vpn.c --test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - test_gnunet_vpn_6_over_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - test_gnunet_vpn_4_to_6_SOURCES = \ - test_gnunet_vpn.c --test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - test_gnunet_vpn_4_to_6_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - test_gnunet_vpn_6_to_4_SOURCES = \ - test_gnunet_vpn.c --test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - test_gnunet_vpn_6_to_4_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/pt/Makefile.in gnunet-0.10.1/src/pt/Makefile.in ---- gnunet-0.10.1.orig/src/pt/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/pt/Makefile.in 2015-05-28 06:38:18.388411190 +0300 -@@ -500,8 +500,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -@@ -681,58 +681,58 @@ - test_gns_vpn_SOURCES = \ - test_gns_vpn.c - --test_gns_vpn_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gns_vpn_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/namestore/libgnunetnamestore.la \ - $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - - test_gns_vpn_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - test_gnunet_vpn_4_over_SOURCES = \ - test_gnunet_vpn.c - --test_gnunet_vpn_4_over_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gnunet_vpn_4_over_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - - test_gnunet_vpn_4_over_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - test_gnunet_vpn_6_over_SOURCES = \ - test_gnunet_vpn.c - --test_gnunet_vpn_6_over_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gnunet_vpn_6_over_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - - test_gnunet_vpn_6_over_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - test_gnunet_vpn_4_to_6_SOURCES = \ - test_gnunet_vpn.c - --test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gnunet_vpn_4_to_6_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - - test_gnunet_vpn_4_to_6_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - test_gnunet_vpn_6_to_4_SOURCES = \ - test_gnunet_vpn.c - --test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd @LIBGNURL@ \ -+test_gnunet_vpn_6_to_4_LDADD = -lmicrohttpd $(LIBGNURL) \ - $(top_builddir)/src/vpn/libgnunetvpn.la \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - - test_gnunet_vpn_6_to_4_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - all: all-am - -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/regex/Makefile.in gnunet-0.10.1/src/regex/Makefile.in ---- gnunet-0.10.1.orig/src/regex/Makefile.in 2014-04-08 14:20:54.000000000 +0300 -+++ gnunet-0.10.1/src/regex/Makefile.in 2015-05-28 06:38:19.230399241 +0300 -@@ -562,8 +562,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/revocation/Makefile.in gnunet-0.10.1/src/revocation/Makefile.in ---- gnunet-0.10.1.orig/src/revocation/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/revocation/Makefile.in 2015-05-28 06:38:18.559408763 +0300 -@@ -475,8 +475,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/scalarproduct/Makefile.in gnunet-0.10.1/src/scalarproduct/Makefile.in ---- gnunet-0.10.1.orig/src/scalarproduct/Makefile.in 2014-04-08 13:49:23.000000000 +0300 -+++ gnunet-0.10.1/src/scalarproduct/Makefile.in 2015-05-28 06:38:17.971417108 +0300 -@@ -288,8 +288,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/secretsharing/Makefile.in gnunet-0.10.1/src/secretsharing/Makefile.in ---- gnunet-0.10.1.orig/src/secretsharing/Makefile.in 2014-04-08 13:49:24.000000000 +0300 -+++ gnunet-0.10.1/src/secretsharing/Makefile.in 2015-05-28 06:38:17.952417378 +0300 -@@ -476,8 +476,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/set/Makefile.in gnunet-0.10.1/src/set/Makefile.in ---- gnunet-0.10.1.orig/src/set/Makefile.in 2014-04-08 13:49:24.000000000 +0300 -+++ gnunet-0.10.1/src/set/Makefile.in 2015-05-28 06:38:18.611408025 +0300 -@@ -492,8 +492,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/statistics/Makefile.in gnunet-0.10.1/src/statistics/Makefile.in ---- gnunet-0.10.1.orig/src/statistics/Makefile.in 2014-04-08 14:20:51.000000000 +0300 -+++ gnunet-0.10.1/src/statistics/Makefile.in 2015-05-28 06:38:18.500409601 +0300 -@@ -495,8 +495,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/template/Makefile.in gnunet-0.10.1/src/template/Makefile.in ---- gnunet-0.10.1.orig/src/template/Makefile.in 2014-04-08 13:49:24.000000000 +0300 -+++ gnunet-0.10.1/src/template/Makefile.in 2015-05-28 06:38:18.815405130 +0300 -@@ -457,8 +457,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/testbed/Makefile.in gnunet-0.10.1/src/testbed/Makefile.in ---- gnunet-0.10.1.orig/src/testbed/Makefile.in 2014-04-08 13:49:24.000000000 +0300 -+++ gnunet-0.10.1/src/testbed/Makefile.in 2015-05-28 06:38:18.539409047 +0300 -@@ -826,8 +826,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/testing/Makefile.in gnunet-0.10.1/src/testing/Makefile.in ---- gnunet-0.10.1.orig/src/testing/Makefile.in 2014-04-08 13:49:24.000000000 +0300 -+++ gnunet-0.10.1/src/testing/Makefile.in 2015-05-28 06:38:18.432410566 +0300 -@@ -510,8 +510,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/topology/Makefile.in gnunet-0.10.1/src/topology/Makefile.in ---- gnunet-0.10.1.orig/src/topology/Makefile.in 2014-04-08 13:49:24.000000000 +0300 -+++ gnunet-0.10.1/src/topology/Makefile.in 2015-05-28 06:38:18.952403186 +0300 -@@ -471,8 +471,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/transport/Makefile.am gnunet-0.10.1/src/transport/Makefile.am ---- gnunet-0.10.1.orig/src/transport/Makefile.am 2014-04-08 14:13:31.000000000 +0300 -+++ gnunet-0.10.1/src/transport/Makefile.am 2015-05-28 06:38:17.898418144 +0300 -@@ -319,7 +319,7 @@ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ -- @LIBGNURL@ \ -+ $(LIBGNURL) \ - $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/util/libgnunetutil.la - libgnunet_plugin_transport_http_client_la_LDFLAGS = \ -@@ -327,7 +327,7 @@ - libgnunet_plugin_transport_http_client_la_CFLAGS = \ - $(CFLAGS) - libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - - libgnunet_plugin_transport_http_server_la_SOURCES = \ -@@ -350,7 +350,7 @@ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ -- @LIBGNURL@ \ -+ $(LIBGNURL) \ - $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/util/libgnunetutil.la - libgnunet_plugin_transport_https_client_la_LDFLAGS = \ -@@ -358,7 +358,7 @@ - libgnunet_plugin_transport_https_client_la_CFLAGS = \ - $(CFLAGS) -DBUILD_HTTPS - libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - - libgnunet_plugin_transport_https_server_la_SOURCES = \ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/transport/Makefile.in gnunet-0.10.1/src/transport/Makefile.in ---- gnunet-0.10.1.orig/src/transport/Makefile.in 2014-04-08 14:16:08.000000000 +0300 -+++ gnunet-0.10.1/src/transport/Makefile.in 2015-05-28 06:38:17.880418399 +0300 -@@ -1677,8 +1677,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -@@ -2096,7 +2096,7 @@ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ -- @LIBGNURL@ \ -+ $(LIBGNURL) \ - $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/util/libgnunetutil.la - -@@ -2107,7 +2107,7 @@ - $(CFLAGS) - - libgnunet_plugin_transport_http_client_la_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - libgnunet_plugin_transport_http_server_la_SOURCES = \ - plugin_transport_http_server.c plugin_transport_http_common.c -@@ -2133,7 +2133,7 @@ - $(top_builddir)/src/hello/libgnunethello.la \ - $(top_builddir)/src/statistics/libgnunetstatistics.la \ - $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \ -- @LIBGNURL@ \ -+ $(LIBGNURL) \ - $(top_builddir)/src/nat/libgnunetnat.la \ - $(top_builddir)/src/util/libgnunetutil.la - -@@ -2144,7 +2144,7 @@ - $(CFLAGS) -DBUILD_HTTPS - - libgnunet_plugin_transport_https_client_la_CPPFLAGS = \ -- @LIBGNURL_CPPFLAGS@ $(AM_CPPFLAGS) -+ $(LIBGNURL_CPPFLAGS) $(AM_CPPFLAGS) - - libgnunet_plugin_transport_https_server_la_SOURCES = \ - plugin_transport_http_server.c plugin_transport_http_common.c -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/tun/Makefile.in gnunet-0.10.1/src/tun/Makefile.in ---- gnunet-0.10.1.orig/src/tun/Makefile.in 2014-04-08 13:49:25.000000000 +0300 -+++ gnunet-0.10.1/src/tun/Makefile.in 2015-05-28 06:38:19.078401398 +0300 -@@ -452,8 +452,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/util/Makefile.in gnunet-0.10.1/src/util/Makefile.in ---- gnunet-0.10.1.orig/src/util/Makefile.in 2014-04-08 14:15:39.000000000 +0300 -+++ gnunet-0.10.1/src/util/Makefile.in 2015-05-28 06:38:18.070415703 +0300 -@@ -867,8 +867,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/vpn/Makefile.in gnunet-0.10.1/src/vpn/Makefile.in ---- gnunet-0.10.1.orig/src/vpn/Makefile.in 2014-04-08 13:49:25.000000000 +0300 -+++ gnunet-0.10.1/src/vpn/Makefile.in 2015-05-28 06:38:18.749406067 +0300 -@@ -303,8 +303,8 @@ - LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ - LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ - LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ --LIBGNURL = @LIBGNURL@ --LIBGNURL_CPPFLAGS = @LIBGNURL_CPPFLAGS@ -+LIBGNURL = $(LIBGNURL) -+LIBGNURL_CPPFLAGS = $(LIBGNURL_CPPFLAGS) - LIBICONV = @LIBICONV@ - LIBINTL = @LIBINTL@ - LIBOBJS = @LIBOBJS@ + SAVE_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$LIBGNURL_CPPFLAGS $LIBCURL_CPPFLAGS $CPPFLAGS" diff --git a/gnunet-0.10.1_libexec_conversation.patch b/gnunet-0.10.1_libexec_conversation.patch deleted file mode 100644 index 8dd37b2..0000000 --- a/gnunet-0.10.1_libexec_conversation.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/conversation/Makefile.am gnunet-0.10.1/src/conversation/Makefile.am ---- gnunet-0.10.1.orig/src/conversation/Makefile.am 2014-04-08 13:45:35.000000000 +0300 -+++ gnunet-0.10.1/src/conversation/Makefile.am 2015-05-30 08:58:19.517389961 +0300 -@@ -18,7 +18,7 @@ - - pkgcfgdir= $(prefix)/share/gnunet/config.d/ - --libexecdir= $(prefix)/lib/gnunet/libexec/ -+libexecdir= $(pkglibdir)/libexec/ - - plugin_LTLIBRARIES = \ - libgnunet_plugin_gnsrecord_conversation.la diff --git a/gnunet-0.11.4.tar.gz b/gnunet-0.11.4.tar.gz new file mode 100644 index 0000000..7a3bba1 --- /dev/null +++ b/gnunet-0.11.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7afeb638bd8b5a33c6b8dab24b90c5d7467439adc79794ff33218e9180f8b01b +size 7597015 diff --git a/gnunet-fix_postgresql_include.patch b/gnunet-fix_postgresql_include.patch deleted file mode 100644 index 279a6c5..0000000 --- a/gnunet-fix_postgresql_include.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/configure.ac gnunet-0.10.1/configure.ac ---- gnunet-0.10.1.orig/configure.ac 2014-04-08 10:55:04.000000000 +0300 -+++ gnunet-0.10.1/configure.ac 2015-05-26 02:40:20.535635974 +0300 -@@ -661,13 +661,13 @@ - no) - ;; - yes) -- AC_CHECK_HEADERS(postgresql/libpq-fe.h, -+ AC_CHECK_HEADERS(pgsql/libpq-fe.h, - postgres=true) - ;; - *) - LDFLAGS="-L$with_postgres/lib $LDFLAGS" - CPPFLAGS="-I$with_postgres/include $CPPFLAGS" -- AC_CHECK_HEADERS(postgresql/libpq-fe.h, -+ AC_CHECK_HEADERS(pgsql/libpq-fe.h, - EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH" - POSTGRES_LDFLAGS="-L$with_postgres/lib" - POSTGRES_CPPFLAGS="-I$with_postgres/include" -@@ -678,7 +678,7 @@ - esac - ], - [AC_MSG_RESULT([--with-postgres not specified]) -- AC_CHECK_HEADERS(postgresql/libpq-fe.h, postgres=true)]) -+ AC_CHECK_HEADERS(pgsql/libpq-fe.h, postgres=true)]) - AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue) - AC_SUBST(POSTGRES_CPPFLAGS) - AC_SUBST(POSTGRES_LDFLAGS) -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/gnunet_config.h gnunet-0.10.1/gnunet_config.h ---- gnunet-0.10.1.orig/gnunet_config.h 2014-04-08 13:49:39.000000000 +0300 -+++ gnunet-0.10.1/gnunet_config.h 2015-05-26 02:40:21.175626284 +0300 -@@ -315,7 +315,7 @@ - /* Have libopus library */ - #define HAVE_OPUS 1 - --/* Define to 1 if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #define HAVE_POSTGRESQL_LIBPQ_FE_H 1 - - /* Have libpulse(audio) library */ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/gnunet_config.h.in gnunet-0.10.1/gnunet_config.h.in ---- gnunet-0.10.1.orig/gnunet_config.h.in 2014-04-08 13:49:18.000000000 +0300 -+++ gnunet-0.10.1/gnunet_config.h.in 2015-05-26 02:40:20.586635202 +0300 -@@ -314,7 +314,7 @@ - /* Have libopus library */ - #undef HAVE_OPUS - --/* Define to 1 if you have the header file. */ -+/* Define to 1 if you have the header file. */ - #undef HAVE_POSTGRESQL_LIBPQ_FE_H - - /* Have libpulse(audio) library */ -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datacache/plugin_datacache_postgres.c gnunet-0.10.1/src/datacache/plugin_datacache_postgres.c ---- gnunet-0.10.1.orig/src/datacache/plugin_datacache_postgres.c 2013-12-20 12:43:38.000000000 +0300 -+++ gnunet-0.10.1/src/datacache/plugin_datacache_postgres.c 2015-05-26 02:40:20.570635444 +0300 -@@ -27,7 +27,7 @@ - #include "gnunet_util_lib.h" - #include "gnunet_postgres_lib.h" - #include "gnunet_datacache_plugin.h" --#include -+#include - - #define LOG(kind,...) GNUNET_log_from (kind, "datacache-postgres", __VA_ARGS__) - -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datastore/plugin_datastore_postgres.c gnunet-0.10.1/src/datastore/plugin_datastore_postgres.c ---- gnunet-0.10.1.orig/src/datastore/plugin_datastore_postgres.c 2013-12-20 12:43:38.000000000 +0300 -+++ gnunet-0.10.1/src/datastore/plugin_datastore_postgres.c 2015-05-26 02:40:20.560635596 +0300 -@@ -27,7 +27,7 @@ - #include "platform.h" - #include "gnunet_datastore_plugin.h" - #include "gnunet_postgres_lib.h" --#include -+#include - - - /** -diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/include/gnunet_postgres_lib.h gnunet-0.10.1/src/include/gnunet_postgres_lib.h ---- gnunet-0.10.1.orig/src/include/gnunet_postgres_lib.h 2013-10-11 16:38:11.000000000 +0300 -+++ gnunet-0.10.1/src/include/gnunet_postgres_lib.h 2015-05-26 02:40:20.539635914 +0300 -@@ -26,7 +26,7 @@ - #define GNUNET_POSTGRES_LIB_H - - #include "gnunet_util_lib.h" --#include -+#include - - #ifdef __cplusplus - extern "C" diff --git a/gnunet-tmpfile.conf b/gnunet-tmpfile.conf deleted file mode 100644 index e120f30..0000000 --- a/gnunet-tmpfile.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/gnunet/ 0750 gnunet gnunet - \ No newline at end of file diff --git a/gnunet.changes b/gnunet.changes index dd1da86..ab2f1e2 100644 --- a/gnunet.changes +++ b/gnunet.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed May 15 16:48:43 UTC 2019 - Alexei Podvalsky + +- Update to 0.11.4: + * see /usr/share/package/gnunet/ChangeLog +- Drop pathes: + * gnunet-fix_postgresql_include.patch + * gnunet-0.10.1_libexec_conversation.patch +- Create system user and groups with systemd-sysusers +- Build gnurl only with protocols: HTTP HTTPS +- Remove obsolete macros +- Systemd files cleanup +- Spec file cleanup + ------------------------------------------------------------------- Fri Aug 24 21:07:06 UTC 2018 - avvissu@yandex.by diff --git a/gnunet.init b/gnunet.init deleted file mode 100644 index a45f354..0000000 --- a/gnunet.init +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh -# -# openSUSE system startup script for GNUnet -# Copyright (C) 2010 Pascal Bleser -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or (at -# your option) any later version. -# -# This library 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, -# USA. -# -### BEGIN INIT INFO -# Provides: gnunetd -# Required-Start: $syslog $remote_fs $network -# Should-Start: $time ypbind smtp -# Required-Stop: $syslog $remote_fs $network -# Should-Stop: ypbind smtp -# Default-Start: 3 5 -# Default-Stop: 0 1 2 6 -# Short-Description: GNUnet daemon -# Description: Start GNUnet daemon -### END INIT INFO - -SN="gnunet" - -# Check for missing binaries (stale symlinks should not happen) -# Note: Special treatment of stop for LSB conformance -GNUNET_BIN=/usr/bin/gnunet-arm -test -x "$GNUNET_BIN" || { echo "$GNUNET_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -GNUNET_SERVICE_BIN=/usr/bin/gnunet-service-arm -test -x "$GNUNET_BIN" || { echo "$GNUNET_BIN not installed"; - if [ "$1" = "stop" ]; then exit 0; - else exit 5; fi; } - -GNUNET_LOG_LEVEL="INFO" - -. /etc/rc.status -rc_reset - -case "$1" in - start) - echo -n "Starting $SN " - /bin/su - gnunet "$GNUNET_BIN" --loglevel="$GNUNET_LOG_LEVEL" --start - rc_status -v - ;; - stop) - echo -n "Shutting down $SN " - /bin/su - gnunet "$GNUNET_BIN" --loglevel="$GNUNET_LOG_LEVEL" --end - rc_status -v - ;; - try-restart|condrestart) - if test "$1" = "condrestart"; then - echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" - fi - $0 status - if test $? = 0; then - $0 restart - else - rc_reset # Not running is not a failure. - fi - rc_status - ;; - restart) - $0 stop - $0 start - rc_status - ;; - force-reload) - echo -n "Reload service $SN " - /sbin/killproc -HUP "$GNUNET_SERVICE_BIN" - rc_status -v - ;; - reload) - echo -n "Reload service $SN " - /sbin/killproc -HUP "$GNUNET_SERVICE_BIN" - rc_status -v - ;; - status) - echo -n "Checking for service $SN " - /sbin/checkproc "$GNUNET_SERVICE_BIN" - rc_status -v - ;; - *) - echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}" - exit 1 - ;; -esac -rc_exit diff --git a/gnunet.service b/gnunet.service.in similarity index 63% rename from gnunet.service rename to gnunet.service.in index e4a621b..8192faf 100644 --- a/gnunet.service +++ b/gnunet.service.in @@ -1,7 +1,8 @@ [Unit] Description=GNUnet Description=Security focused Peer-to-Peer Framework -Description=Configuration files: /etc/gnunet.conf /usr/share/gnunet/config.d /var/log/gnunet/gnunet.log +Description=Configuration files: /etc/gnunet.conf /usr/share/gnunet/config.d +Description=Log files: /var/log/gnunet/gnunet.log After=syslog.target remote-fs.target network.target Wants=time-sync.target ypbind.service sendmail.service Before=time-sync.target ypbind.service sendmail.service @@ -11,17 +12,7 @@ Type=forking ExecStart=@LIBDIR@/gnunet/libexec/gnunet-service-arm -l /var/log/gnunet/gnunet.log -d TimeoutStartSec=5s WorkingDirectory=/var/run/gnunet -User=gnunet - -#[Service] -#Type=forking -#PermissionsStartOnly=true -#ExecStart=/usr/bin/gnunet-arm -c /etc/gnunet.conf -s -#ExecStop=/usr/bin/gnunet-arm -c /etc/gnunet.conf -e -#TimeoutStartSec=5s -#WorkingDirectory=/var/run/gnunet -#User=gnunet -#Group=gnunet +User=@USER@ [Install] WantedBy=multi-user.target diff --git a/gnunet.spec b/gnunet.spec index d62cf72..fe033ab 100644 --- a/gnunet.spec +++ b/gnunet.spec @@ -1,7 +1,7 @@ # # spec file for package gnunet # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -13,76 +13,60 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.links2linux.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define gnurl gnurl-7.54.0 -%define user gnunet -%define grpnet gnunet -%define grpdns gnunetdns - +%define gnurl gnurl-7.64.1 +%define _USER_ gnunet +%define _GROUP_ gnunet +%define _OTHERGROUP_ gnunetdns Name: gnunet -Version: 0.10.1 +Version: 0.11.4 Release: 0 Summary: Security focused Peer-to-Peer Framework -License: GPL-3.0 +License: GPL-3.0-only Group: Productivity/Networking/File-Sharing -Url: http://gnunet.org +URL: http://gnunet.org Source0: ftp://ftp.gnu.org/gnu/gnunet/%{name}-%{version}.tar.gz -Source1: https://gnunet.org/sites/default/files/%{gnurl}.tar.bz2 -Source2: gnunet.init -Source3: gnunet.service -Source4: gnunet-tmpfile.conf -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch1: gnunet-fix_postgresql_include.patch -# PATCH-FIX-OPENSUSE gnurl.patch avvissu@yandex.ru -- Do not check build dependence (build here) -Patch2: gnunet-0.10.1_gnurl.patch -# PATCH-FIX-UPSTREAM libexec_conversation.patch avvissu@yandex.ru -- Change path to libexecdir -Patch3: gnunet-0.10.1_libexec_conversation.patch +Source1: ftp://ftp.gnu.org/gnu/gnunet/%{gnurl}.tar.gz +Source2: gnunet.service.in +Source3: gnunet.sysusers.in +Source4: gnunet.tmpfile.in +Patch0: gnunet-0.10.1_gnurl.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: libtool BuildRequires: gcc -BuildRequires: make BuildRequires: glibc-devel BuildRequires: glpk-devel >= 4.45 +BuildRequires: guile-devel >= 2.0 BuildRequires: libadns-devel BuildRequires: libesmtp-devel BuildRequires: libgcrypt-devel >= 1.6 BuildRequires: libmysqlclient-devel >= 5.1 +BuildRequires: libtool BuildRequires: libunistring-devel +BuildRequires: make +BuildRequires: pkgconfig BuildRequires: postgresql-devel >= 8.3 BuildRequires: pkgconfig(gnutls) >= 3.2.12 -BuildRequires: pkgconfig(guile-2.0) BuildRequires: pkgconfig(libcares) -# Use gnurl instead of curl [bugs.archlinux.org#38820] -#BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libextractor) >= 0.6.1 -BuildRequires: pkgconfig(libidn) >= 1.0 +BuildRequires: pkgconfig(libidn2) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(sqlite3) >= 3.8 -# This fork of libcurl, which is only for GNUnet -# Conflict with curl -#BuildRequires: pkgconfig(libgnurl) -###########Recommends########### -BuildRequires: pkgconfig(libpulse) >= 2.0 -BuildRequires: pkgconfig(openssl) >= 1.0 -BuildRequires: pkgconfig(opus) >= 1.0.1 -BuildRequires: pkgconfig(ogg) >= 1.3.0 -#BuildRequires: gettext -%if 0%{?suse_version} > 1140 -%{!?_tmpfilesdir:%global _tmpfilesdir %{_libexecdir}/tmpfiles.d} -BuildRequires: systemd -%{?systemd_requires} -%endif - +Recommends: gnunet-plugins Provides: gnunetd = %{version} Provides: GNUnet = %{version} Provides: GNUnetd = %{version} -Recommends: gnunet-plugins -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%{?systemd_requires} +# SECTION +BuildRequires: pkgconfig(libpulse) >= 2.0 +BuildRequires: pkgconfig(ogg) >= 1.3.0 +BuildRequires: pkgconfig(openssl) >= 1.0 +BuildRequires: pkgconfig(opus) >= 1.0.1 +# /SECTION %description GNUnet is peer-to-peer framework focusing on security. The first and primary @@ -96,10 +80,7 @@ Summary: Security focused Peer-to-Peer Framework Group: Development/Libraries/C and C++ Requires: lib%{name} = %{version} Requires: libgcrypt-devel >= 1.6 -Requires: pkgconfig(libpulse) >= 2.0 -Requires: pkgconfig(ogg) >= 1.3.0 -Requires: pkgconfig(openssl) >= 1.0 -Requires: pkgconfig(opus) >= 1.0.1 +Requires: pkgconfig(gnutls) >= 3.2.12 %description devel GNUnet is peer-to-peer framework focusing on security. The first and primary @@ -166,16 +147,46 @@ by a worldwide group of independent free software developers. %prep %setup -q -b1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch0 -p1 + +for _file in %{SOURCE2} %{SOURCE3} %{SOURCE4}; do + sed -e 's/@USER@/%{_USER_}/' \ + -e 's/@GROUP@/%{_GROUP_}/' \ + -e 's/@OTHERGROUP@/%{_OTHERGROUP_}/' \ + -e 's|@LIBDIR@|%{_libdir}|' \ + < $_file > ${_file##*/} +done %build # Build gnurl pushd %{_builddir}/%{gnurl} autoreconf -fiv %configure \ - --enable-shared=no + --without-ssl \ + --without-libpsl \ + --without-librtmp \ + --without-libmetalink \ + --disable-ftp \ + --disable-file \ + --disable-ldap \ + --disable-rtsp \ + --disable-dict \ + --disable-telnet \ + --disable-dict \ + --disable-telnet \ + --disable-tftp \ + --disable-pop3 \ + --disable-imap \ + --disable-smb \ + --disable-smtp \ + --disable-gopher \ + --disable-ntlm-wb \ + --enable-hidden-symbols \ + --enable-threaded-resolver \ + --enable-shared=no \ + --with-random=/dev/urandom \ + --with-ca-bundle=%{_sysconfdir}/ssl/certs/ca-certificates.crt + make %{?_smp_mflags} popd # Build gnunet @@ -183,7 +194,6 @@ export CPPFLAGS="-I%{_builddir}/%{gnurl}/include" export LIBS="-L%{_builddir}/%{gnurl}/lib/.libs/ -lgnurl" autoreconf -fiv %configure \ - --with-nssdir=%{_libdir} \ --with-gnunetdns=%{grpdns} make %{?_smp_mflags} V=1 \ @@ -193,22 +203,19 @@ make %{?_smp_mflags} V=1 \ make DESTDIR=%{buildroot} install \ pkgcfgdir="%{_sysconfdir}/gnunet" -# install service file -%if 0%{?suse_version} > 1140 -install -d %{buildroot}/%{_sbindir} -install -Dm 644 "%{SOURCE3}" %{buildroot}%{_unitdir}/%{name}.service -sed -i 's|@LIBDIR@|%{_libdir}|' %{buildroot}%{_unitdir}/%{name}.service -ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} -install -Dm 644 "%{SOURCE4}" %{buildroot}%{_tmpfilesdir}/%{name}.conf -%else -install -D -m0755 "%{SOURCE2}" "%{buildroot}%{_initddir}/%{name}" -install -d "%{buildroot}%{_sbindir}" -ln -s "../..%{_initddir}/%{name}" "%{buildroot}%{_sbindir}/rc%{name}" -%endif +# install systemd files +install -d %{buildroot}%{_sbindir} +ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} +install -Dm 0644 %{name}.service.in %{buildroot}%{_unitdir}/%{name}.service +install -Dm 0644 %{name}.tmpfile.in %{buildroot}%{_tmpfilesdir}/%{name}.conf +install -Dm 0644 %{name}.sysusers.in %{buildroot}%{_sysusersdir}/%{name}.conf # use a symbolic link instead of patch ln -s %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config.d +# set a default configuration file +sed -ri '/DEFAULTCONFIG/s/^ +?# +?//' $(grep -rl 'DEFAULTCONFIG\ \?=') + # create a default configuration cat< "%{buildroot}%{_sysconfdir}/%{name}.conf" [path] @@ -221,11 +228,6 @@ SYSTEM_ONLY = YES USER_ONLY = NO EOF -# link libraries -for f in $(find %{buildroot} -name \*nss_gns*.so.[0-9]); do -s="${f%s*}"; l="$(echo $f|sed 's|%{buildroot}||')" -ln -s $l ${s}so; done - # get rid of static libraries find %{buildroot} -type f -name "*.la" -delete -print @@ -234,210 +236,192 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %find_lang %{name} %pre -if ! %{_bindir}/id %{user} &>/dev/null; then -%{_sbindir}/groupadd -r %{grpnet} -%{_sbindir}/useradd -r -g %{user} -c "GNUnet daemon" -d \ -%{_localstatedir}/lib/%{name} %{grpnet}; fi -if test ! -d %{_localstatedir}/log/%{name}; then -install -d -m0750 -o%{user} -g%{grpnet} "%{_localstatedir}/lib/%{name}" -install -d -m0750 -o%{user} -g%{grpnet} "%{_localstatedir}/log/%{name}"; fi -if ! %{_bindir}/getent group %{grpdns} &>/dev/null; then -echo -n "Create a special secured group %{grpdns}:" -%{_sbindir}/groupadd -r %{grpdns} -echo " done"; fi -%if 0%{?suse_version} > 1140 %service_add_pre %{name}.service -%endif %post -%if 0%{?suse_version} > 1140 %service_add_post %{name}.service -systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf -%else -%fillup_and_insserv -f %{name} -%endif +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf +%sysusers_create %{_sysusersdir}/%{name}.conf +%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %preun -%if 0%{?suse_version} > 1140 %service_del_preun %{name}.service -%else -%stop_on_removal %{name} -%endif %postun -%if 0%{?suse_version} > 1140 %service_del_postun %{name}.service -%else -%restart_on_update %{name} -%insserv_cleanup -%endif -if [ $1 -eq 0 ]; then -userdel %{user} || logger "User \"%{user}\" could not be deleted." -rm -rf %{_localstatedir}/lib/%{name} -rm -rf %{_localstatedir}/log/%{name}; fi +%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info} %post -n lib%{name} -p /sbin/ldconfig - %postun -n lib%{name} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README -%{_bindir}/%{name}-arm -%{_bindir}/%{name}-ats -%{_bindir}/%{name}-auto-share -%{_bindir}/%{name}-bcd -%{_bindir}/%{name}-config -%{_bindir}/%{name}-conversation -%{_bindir}/%{name}-conversation-test -%{_bindir}/%{name}-core -%{_bindir}/%{name}-datastore -%{_bindir}/%{name}-directory -%{_bindir}/%{name}-download -%{_bindir}/%{name}-download-manager.scm -%{_bindir}/%{name}-ecc -%{_bindir}/%{name}-fs -%{_bindir}/%{name}-gns -%{_bindir}/%{name}-gns-import.sh -%{_bindir}/%{name}-gns-proxy-setup-ca -%{_bindir}/%{name}-identity -%{_bindir}/%{name}-mesh -%{_bindir}/%{name}-namecache -%{_bindir}/%{name}-namestore -%{_bindir}/%{name}-nat-server -%{_bindir}/%{name}-nse -%{_bindir}/%{name}-peerinfo -%{_bindir}/%{name}-publish -%{_bindir}/%{name}-qr -%{_bindir}/%{name}-resolver -%{_bindir}/%{name}-revocation -%{_bindir}/%{name}-scrypt -%{_bindir}/%{name}-search -%{_bindir}/%{name}-set-ibf-profiler -%{_bindir}/%{name}-set-profiler -%{_bindir}/%{name}-statistics -%{_bindir}/%{name}-template -%{_bindir}/%{name}-testbed-profiler -%{_bindir}/%{name}-testing -%{_bindir}/%{name}-transport -%{_bindir}/%{name}-transport-certificate-creation -%{_bindir}/%{name}-unindex -%{_bindir}/%{name}-uri -%{_bindir}/%{name}-vpn +%license COPYING +%doc AUTHORS ChangeLog README +%{_bindir}/gnunet-arm +%{_bindir}/gnunet-ats +%{_bindir}/gnunet-auto-share +%{_bindir}/gnunet-bcd +%{_bindir}/gnunet-bugreport +%{_bindir}/gnunet-cadet +%{_bindir}/gnunet-config +%{_bindir}/gnunet-consensus-profiler +%{_bindir}/gnunet-conversation +%{_bindir}/gnunet-conversation-test +%{_bindir}/gnunet-core +%{_bindir}/gnunet-datastore +%{_bindir}/gnunet-dht-get +%{_bindir}/gnunet-dht-monitor +%{_bindir}/gnunet-dht-put +%{_bindir}/gnunet-directory +%{_bindir}/gnunet-download +%{_bindir}/gnunet-ecc +%{_bindir}/gnunet-fs +%{_bindir}/gnunet-gns +%{_bindir}/gnunet-gns-proxy-setup-ca +%{_bindir}/gnunet-identity +%{_bindir}/gnunet-namecache +%{_bindir}/gnunet-namestore +%{_bindir}/gnunet-nat +%{_bindir}/gnunet-nat-auto +%{_bindir}/gnunet-nat-server +%{_bindir}/gnunet-nse +%{_bindir}/gnunet-peerinfo +%{_bindir}/gnunet-peerstore +%{_bindir}/gnunet-publish +%{_bindir}/gnunet-resolver +%{_bindir}/gnunet-revocation +%{_bindir}/gnunet-scalarproduct +%{_bindir}/gnunet-scrypt +%{_bindir}/gnunet-search +%{_bindir}/gnunet-secretsharing-profiler +%{_bindir}/gnunet-set-profiler +%{_bindir}/gnunet-statistics +%{_bindir}/gnunet-testbed-profiler +%{_bindir}/gnunet-testing +%{_bindir}/gnunet-transport +%{_bindir}/gnunet-transport-certificate-creation +%{_bindir}/gnunet-unindex +%{_bindir}/gnunet-uri +%{_bindir}/gnunet-vpn +%{_bindir}/gnunet-zoneimport %{_datadir}/%{name} # libexec dir %dir %{_libdir}/%{name} %dir %{_libdir}/%{name}/libexec -%{_libdir}/%{name}/libexec/%{name}-daemon-exit -%{_libdir}/%{name}/libexec/%{name}-daemon-hostlist -%{_libdir}/%{name}/libexec/%{name}-daemon-latency-logger -%{_libdir}/%{name}/libexec/%{name}-daemon-pt -%{_libdir}/%{name}/libexec/%{name}-daemon-regexprofiler -%{_libdir}/%{name}/libexec/%{name}-daemon-testbed-blacklist -%{_libdir}/%{name}/libexec/%{name}-daemon-testbed-underlay -%{_libdir}/%{name}/libexec/%{name}-daemon-topology -%{_libdir}/%{name}/libexec/%{name}-dns2gns -%{_libdir}/%{name}/libexec/%{name}-gns-proxy -%{_libdir}/%{name}/libexec/%{name}-helper-audio-playback -%{_libdir}/%{name}/libexec/%{name}-helper-audio-record -%{_libdir}/%{name}/libexec/%{name}-helper-dns -%{_libdir}/%{name}/libexec/%{name}-helper-exit -%{_libdir}/%{name}/libexec/%{name}-helper-fs-publish -%{_libdir}/%{name}/libexec/%{name}-helper-nat-client -%{_libdir}/%{name}/libexec/%{name}-helper-nat-server -%{_libdir}/%{name}/libexec/%{name}-helper-testbed -%{_libdir}/%{name}/libexec/%{name}-helper-transport-wlan -%{_libdir}/%{name}/libexec/%{name}-helper-transport-wlan-dummy -%{_libdir}/%{name}/libexec/%{name}-helper-vpn -%{_libdir}/%{name}/libexec/%{name}-namestore-fcfsd -%{_libdir}/%{name}/libexec/%{name}-service-arm -%{_libdir}/%{name}/libexec/%{name}-service-ats -%{_libdir}/%{name}/libexec/%{name}-service-core -%{_libdir}/%{name}/libexec/%{name}-service-conversation -%{_libdir}/%{name}/libexec/%{name}-service-datastore -%{_libdir}/%{name}/libexec/%{name}-service-dht -%{_libdir}/%{name}/libexec/%{name}-service-dht-xvine -%{_libdir}/%{name}/libexec/%{name}-service-dns -%{_libdir}/%{name}/libexec/%{name}-service-fs -%{_libdir}/%{name}/libexec/%{name}-service-gns -%{_libdir}/%{name}/libexec/%{name}-service-identity -%{_libdir}/%{name}/libexec/%{name}-service-mesh -%{_libdir}/%{name}/libexec/%{name}-service-namecache -%{_libdir}/%{name}/libexec/%{name}-service-namestore -%{_libdir}/%{name}/libexec/%{name}-service-nse -%{_libdir}/%{name}/libexec/%{name}-service-peerinfo -%{_libdir}/%{name}/libexec/%{name}-service-regex -%{_libdir}/%{name}/libexec/%{name}-service-resolver -%{_libdir}/%{name}/libexec/%{name}-service-revocation -%{_libdir}/%{name}/libexec/%{name}-service-set -%{_libdir}/%{name}/libexec/%{name}-service-statistics -%{_libdir}/%{name}/libexec/%{name}-service-template -%{_libdir}/%{name}/libexec/%{name}-service-testbed -%{_libdir}/%{name}/libexec/%{name}-service-testbed-logger -%{_libdir}/%{name}/libexec/%{name}-service-transport -%{_libdir}/%{name}/libexec/%{name}-service-vpn +%{_libdir}/gnunet/libexec/gnunet-communicator-unix +%{_libdir}/gnunet/libexec/gnunet-daemon-exit +%{_libdir}/gnunet/libexec/gnunet-daemon-latency-logger +%{_libdir}/gnunet/libexec/gnunet-daemon-pt +%{_libdir}/gnunet/libexec/gnunet-daemon-regexprofiler +%{_libdir}/gnunet/libexec/gnunet-daemon-testbed-blacklist +%{_libdir}/gnunet/libexec/gnunet-daemon-testbed-underlay +%{_libdir}/gnunet/libexec/gnunet-daemon-topology +%{_libdir}/gnunet/libexec/gnunet-dns2gns +%{_libdir}/gnunet/libexec/gnunet-helper-audio-playback +%{_libdir}/gnunet/libexec/gnunet-helper-audio-record +%{_libdir}/gnunet/libexec/gnunet-helper-dns +%{_libdir}/gnunet/libexec/gnunet-helper-exit +%{_libdir}/gnunet/libexec/gnunet-helper-fs-publish +%{_libdir}/gnunet/libexec/gnunet-helper-nat-client +%{_libdir}/gnunet/libexec/gnunet-helper-nat-server +%{_libdir}/gnunet/libexec/gnunet-helper-testbed +%{_libdir}/gnunet/libexec/gnunet-helper-vpn +%{_libdir}/gnunet/libexec/gnunet-namestore-fcfsd +%{_libdir}/gnunet/libexec/gnunet-service-arm +%{_libdir}/gnunet/libexec/gnunet-service-ats +%{_libdir}/gnunet/libexec/gnunet-service-ats-new +%{_libdir}/gnunet/libexec/gnunet-service-cadet +%{_libdir}/gnunet/libexec/gnunet-service-consensus +%{_libdir}/gnunet/libexec/gnunet-service-conversation +%{_libdir}/gnunet/libexec/gnunet-service-core +%{_libdir}/gnunet/libexec/gnunet-service-datastore +%{_libdir}/gnunet/libexec/gnunet-service-dht +%{_libdir}/gnunet/libexec/gnunet-service-dns +%{_libdir}/gnunet/libexec/gnunet-service-evil-consensus +%{_libdir}/gnunet/libexec/gnunet-service-fs +%{_libdir}/gnunet/libexec/gnunet-service-gns +%{_libdir}/gnunet/libexec/gnunet-service-identity +%{_libdir}/gnunet/libexec/gnunet-service-namecache +%{_libdir}/gnunet/libexec/gnunet-service-namestore +%{_libdir}/gnunet/libexec/gnunet-service-nat +%{_libdir}/gnunet/libexec/gnunet-service-nat-auto +%{_libdir}/gnunet/libexec/gnunet-service-nse +%{_libdir}/gnunet/libexec/gnunet-service-peerinfo +%{_libdir}/gnunet/libexec/gnunet-service-peerstore +%{_libdir}/gnunet/libexec/gnunet-service-regex +%{_libdir}/gnunet/libexec/gnunet-service-resolver +%{_libdir}/gnunet/libexec/gnunet-service-revocation +%{_libdir}/gnunet/libexec/gnunet-service-scalarproduct-alice +%{_libdir}/gnunet/libexec/gnunet-service-scalarproduct-bob +%{_libdir}/gnunet/libexec/gnunet-service-scalarproduct-ecc-alice +%{_libdir}/gnunet/libexec/gnunet-service-scalarproduct-ecc-bob +%{_libdir}/gnunet/libexec/gnunet-service-secretsharing +%{_libdir}/gnunet/libexec/gnunet-service-set +%{_libdir}/gnunet/libexec/gnunet-service-statistics +%{_libdir}/gnunet/libexec/gnunet-service-testbed +%{_libdir}/gnunet/libexec/gnunet-service-testbed-logger +%{_libdir}/gnunet/libexec/gnunet-service-transport +%{_libdir}/gnunet/libexec/gnunet-service-vpn +%{_libdir}/gnunet/libexec/gnunet-service-zonemaster +%{_libdir}/gnunet/libexec/gnunet-service-zonemaster-monitor +%{_libdir}/gnunet/libexec/gnunet-timeout +%{_libdir}/gnunet/libgnunet_plugin_namestore_heap.so +%{_libdir}/gnunet/libgnunet_plugin_peerstore_sqlite.so %dir %{_sysconfdir}/%{name} -%config(noreplace) %{_sysconfdir}/%{name}.conf %config %{_sysconfdir}/%{name}/*.conf +%config(noreplace) %{_sysconfdir}/%{name}.conf -%{_mandir}/man1/%{name}*.1* -%{_mandir}/man5/%{name}*.5* +%{_mandir}/man?/%{name}*.?%{ext_info} + +%{_infodir}/gnunet*%{ext_info} +%{_infodir}/images/ -%if 0%{?suse_version} > 1140 %{_sbindir}/rc%{name} %{_unitdir}/%{name}.service +%{_sysusersdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf -%else -%{_sysconfdir}/init.d/%{name} -%{_sbindir}/rc%{name} +%if 0%{?suse_version} < 1500 +%dir %{_sysusersdir} %endif %files -n lib%{name} -%defattr(-,root,root) %{_libdir}/lib%{name}*.so.* -%{_libdir}/libnss_gns*.so.* %files plugins -%defattr(-,root,root) +%dir %{_libdir}/%{name}/nss +%{_libdir}/%{name}/nss/libnss_gns.so?? +%{_libdir}/%{name}/nss/libnss_gns?.so?? %{_libdir}/%{name}/lib%{name}_plugin_ats*.so %{_libdir}/%{name}/lib%{name}_plugin_block*.so %{_libdir}/%{name}/lib%{name}_plugin_datacache_heap.so -%{_libdir}/%{name}/lib%{name}_plugin_datacache_template.so %{_libdir}/%{name}/lib%{name}_plugin_datastore_heap.so -%{_libdir}/%{name}/lib%{name}_plugin_datastore_template.so %{_libdir}/%{name}/lib%{name}_plugin_gnsrecord*.so %{_libdir}/%{name}/lib%{name}_plugin_test.so %{_libdir}/%{name}/lib%{name}_plugin_transport*.so %files mysql -%defattr(-,root,root) %{_libdir}/%{name}/lib%{name}_plugin_datastore_mysql.so %files postgresql -%defattr(-,root,root) %{_libdir}/%{name}/lib%{name}_plugin_datacache_postgres.so %{_libdir}/%{name}/lib%{name}_plugin_datastore_postgres.so %{_libdir}/%{name}/lib%{name}_plugin_namecache_postgres.so %{_libdir}/%{name}/lib%{name}_plugin_namestore_postgres.so %files sqlite -%defattr(-,root,root) %{_libdir}/%{name}/lib%{name}_plugin_datacache_sqlite.so %{_libdir}/%{name}/lib%{name}_plugin_datastore_sqlite.so %{_libdir}/%{name}/lib%{name}_plugin_namecache_sqlite.so %{_libdir}/%{name}/lib%{name}_plugin_namestore_sqlite.so %files devel -%defattr(-,root,root) %{_includedir}/%{name} %{_libdir}/pkgconfig/%{name}*.pc %{_libdir}/lib%{name}*.so -%{_libdir}/libnss_gns*.so %files lang -f %{name}.lang -%defattr(-,root,root) %changelog diff --git a/gnunet.sysusers.in b/gnunet.sysusers.in new file mode 100644 index 0000000..701f21e --- /dev/null +++ b/gnunet.sysusers.in @@ -0,0 +1,2 @@ +u @USER@ - - /var/run/gnunet +m @USER@ @OTHERGROUP@ diff --git a/gnunet.tmpfile.in b/gnunet.tmpfile.in new file mode 100644 index 0000000..10bcb45 --- /dev/null +++ b/gnunet.tmpfile.in @@ -0,0 +1,3 @@ +d /var/lib/gnunet 0750 @USER@ @GROUP@ - +d /var/log/gnunet 0750 @USER@ @GROUP@ - +d /var/run/gnunet 0750 @USER@ @GROUP@ - diff --git a/gnurl-7.54.0.tar.bz2 b/gnurl-7.54.0.tar.bz2 deleted file mode 100644 index 74f486a..0000000 --- a/gnurl-7.54.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:407d2844a72f386cdf404cb4ab79792cd68546e544a11270349676dd982183f3 -size 1887426 diff --git a/gnurl-7.64.1.tar.gz b/gnurl-7.64.1.tar.gz new file mode 100644 index 0000000..bcf4219 --- /dev/null +++ b/gnurl-7.64.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ea67d505e2576f00d8a09485e6c04396af75388c17d77087a140f05e0ca2a96 +size 3643690