From 1661823ee263622937bf427b261e216c25bedab134d1b2f304b6dc40d24be606 Mon Sep 17 00:00:00 2001 From: Duncan Mac-Vicar Date: Tue, 25 Aug 2015 11:37:43 +0000 Subject: [PATCH] Accepting request 313701 from home:awissu OBS-URL: https://build.opensuse.org/request/show/313701 OBS-URL: https://build.opensuse.org/package/show/filesharing/gnunet?expand=0&rev=1 --- .gitattributes | 23 + .gitignore | 1 + gnunet-0.10.1.tar.gz | 3 + gnunet-0.10.1_gnurl.patch | 1125 ++++++++++++++++++++++ gnunet-0.10.1_libexec_conversation.patch | 12 + gnunet-fix_postgresql_include.patch | 88 ++ gnunet-tmpfile.conf | 1 + gnunet.changes | 56 ++ gnunet.init | 100 ++ gnunet.service | 27 + gnunet.spec | 443 +++++++++ gnurl-7.40.0.tar.bz2 | 3 + 12 files changed, 1882 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 gnunet-0.10.1.tar.gz create mode 100644 gnunet-0.10.1_gnurl.patch create mode 100644 gnunet-0.10.1_libexec_conversation.patch create mode 100644 gnunet-fix_postgresql_include.patch create mode 100644 gnunet-tmpfile.conf create mode 100644 gnunet.changes create mode 100644 gnunet.init create mode 100644 gnunet.service create mode 100644 gnunet.spec create mode 100644 gnurl-7.40.0.tar.bz2 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/gnunet-0.10.1.tar.gz b/gnunet-0.10.1.tar.gz new file mode 100644 index 0000000..8443956 --- /dev/null +++ b/gnunet-0.10.1.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..8a6950c --- /dev/null +++ b/gnunet-0.10.1_gnurl.patch @@ -0,0 +1,1125 @@ +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 @@ + 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@ diff --git a/gnunet-0.10.1_libexec_conversation.patch b/gnunet-0.10.1_libexec_conversation.patch new file mode 100644 index 0000000..8dd37b2 --- /dev/null +++ b/gnunet-0.10.1_libexec_conversation.patch @@ -0,0 +1,12 @@ +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-fix_postgresql_include.patch b/gnunet-fix_postgresql_include.patch new file mode 100644 index 0000000..279a6c5 --- /dev/null +++ b/gnunet-fix_postgresql_include.patch @@ -0,0 +1,88 @@ +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 new file mode 100644 index 0000000..e120f30 --- /dev/null +++ b/gnunet-tmpfile.conf @@ -0,0 +1 @@ +d /var/run/gnunet/ 0750 gnunet gnunet - \ No newline at end of file diff --git a/gnunet.changes b/gnunet.changes new file mode 100644 index 0000000..a100ac2 --- /dev/null +++ b/gnunet.changes @@ -0,0 +1,56 @@ +------------------------------------------------------------------- +Tue Jun 23 16:01:01 UTC 2015 - avvissu@yandex.ru + +- Update to 0.10.1 +- Remove patches: + * use a symbolic link instead of gnunet-etc_for_config.patch +- Add patches: + * gnunet-0.10.1_gnurl.patch + * gnunet-0.10.1_libexec_conversation.patch +- Install a native systemd service file: + * gnunet.service + * gnunet-tmpfile.conf +- Use pkgconfig in package names +- Add recommended packages to build with optional packages +- Use gnurl instead of curl +- Add src package gnurl: build here +- Add packages: libgnunet, plugins, lang +- Create a new default configuration (/etc/gnunet.conf) +- Create a symbolic links for libnss_gns*.so +- Create a special secured group (gnunetdns) +- Create a log file (/var/log/gnunet) +- Use a detailed list of files +- Spec file cleanup + +------------------------------------------------------------------- +Thu Dec 19 23:45:39 UTC 2013 - sleep_walker@suse.cz + +- bump to 0.9.5a +- patches refreshed +- simplify the spec + +------------------------------------------------------------------- +Thu Mar 01 06:13:45 UTC 2012 - pascal.bleser@opensuse.org + +- update to 0.9.2: too many changes to list, details are in ChangeLog + +------------------------------------------------------------------- +Thu Dec 1 06:35:16 UTC 2011 - pascal.bleser@opensuse.org + +- update to 0.9.0: + * major change of the architecture and a rewrite of most of the system + * improvements: +- a new multi-process architecture +- a new VPN subsystem, a new setup tool (including automated correctness + tests for the configuration), support for non-anonymous mesh routing, data + transport over HTTPS and WLAN, peer discovery in the LAN via broadcast + (IPv4) and multicast (IPv6), improved connectivity via NAT traversal, an + event-driven execution model providing significant performance + improvements, and power publishing for file sharing to improve content + replication. + +------------------------------------------------------------------- +Tue Mar 1 07:09:49 UTC 2011 - pascal.bleser@opensuse.org + +- 0.8.1b, moved to new packman infrastructure + diff --git a/gnunet.init b/gnunet.init new file mode 100644 index 0000000..a45f354 --- /dev/null +++ b/gnunet.init @@ -0,0 +1,100 @@ +#!/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 new file mode 100644 index 0000000..e4a621b --- /dev/null +++ b/gnunet.service @@ -0,0 +1,27 @@ +[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 +After=syslog.target remote-fs.target network.target +Wants=time-sync.target ypbind.service sendmail.service +Before=time-sync.target ypbind.service sendmail.service + +[Service] +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 + +[Install] +WantedBy=multi-user.target diff --git a/gnunet.spec b/gnunet.spec new file mode 100644 index 0000000..ac6226f --- /dev/null +++ b/gnunet.spec @@ -0,0 +1,443 @@ +# +# spec file for package gnunet +# +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2012 Pascal Bleser +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# 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/ +# + + +%define gnurl gnurl-7.40.0 +%define user gnunet +%define grpnet gnunet +%define grpdns gnunetdns + +Name: gnunet +Version: 0.10.1 +Release: 0 +Summary: Security focused Peer-to-Peer Framework +License: GPL-3.0 +Group: Productivity/Networking/File-Sharing +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: %{name}.init +Source3: %{name}.service +Source4: %{name}-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 +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: libtool +BuildRequires: gcc +BuildRequires: make +BuildRequires: glibc-devel +BuildRequires: glpk-devel >= 4.45 +BuildRequires: libadns-devel +BuildRequires: libesmtp-devel +BuildRequires: libgcrypt-devel >= 1.6 +BuildRequires: libmysqlclient-devel >= 5.1 +BuildRequires: libunistring-devel +BuildRequires: perl(GMP) +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(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 + +Provides: gnunetd = %{version} +Provides: GNUnet = %{version} +Provides: GNUnetd = %{version} +Recommends: gnunet-plugins +BuildRoot: %{_tmppath}/%{name}-%{version}-build + +%description +GNUnet is peer-to-peer framework focusing on security. The first and primary +application for GNUnet is anonymous file-sharing. GNUnet is currently developed +by a worldwide group of independent free software developers. + +GNUnet is a part of the GNU project (http://www.gnu.org/). + +%package devel +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 + +%description devel +GNUnet is peer-to-peer framework focusing on security. The first and primary +application for GNUnet is anonymous file-sharing. GNUnet is currently developed +by a worldwide group of independent free software developers. + +This package contains header files and libraries needed to develop +application that use %{name}. + +%package -n lib%{name} +Summary: GNUnet libraries +Group: System/Libraries + +%description -n lib%{name} +GNUnet is peer-to-peer framework focusing on security. The first and primary +application for GNUnet is anonymous file-sharing. GNUnet is currently developed +by a worldwide group of independent free software developers. + +This package contains lib%{name} shared library. + +%package plugins +Summary: GNUnet plugins +Group: Productivity/Networking/File-Sharing +Requires: %{name} = %{version} + +%description plugins +GNUnet is peer-to-peer framework focusing on security. The first and primary +application for GNUnet is anonymous file-sharing. GNUnet is currently developed +by a worldwide group of independent free software developers. + +This package contains plugins for GNUnet services. + +%package mysql +Summary: MySQL Storage Backend for %{name} +Group: Productivity/Networking/Other +Requires: %{name} = %{version} + +%description mysql +GNUnet is peer-to-peer framework focusing on security. The first and primary +application for GNUnet is anonymous file-sharing. GNUnet is currently developed +by a worldwide group of independent free software developers. + +%package postgresql +Summary: PostgreSQL Storage Backend for %{name} +Group: Productivity/Networking/Other +Requires: %{name} = %{version} + +%description postgresql +GNUnet is peer-to-peer framework focusing on security. The first and primary +application for GNUnet is anonymous file-sharing. GNUnet is currently developed +by a worldwide group of independent free software developers. + +%package sqlite +Summary: SQLite Storage Backend for %{name} +Group: Productivity/Networking/Other +Requires: %{name} = %{version} + +%description sqlite +GNUnet is peer-to-peer framework focusing on security. The first and primary +application for GNUnet is anonymous file-sharing. GNUnet is currently developed +by a worldwide group of independent free software developers. + +%lang_package + +%prep +%setup -q -b1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +%build +# Build gnurl +pushd %{_builddir}/%{gnurl} +%configure \ + --enable-shared=no +make %{?_smp_mflags} +popd +# Build gnunet +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 \ + pkgcfgdir="%{_sysconfdir}/gnunet" + +%install +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 + +# use a symbolic link instead of patch +ln -s %{_sysconfdir}/%{name} %{buildroot}%{_datadir}/%{name}/config.d + +# create a default configuration +cat< "%{buildroot}%{_sysconfdir}/%{name}.conf" +[path] +GNUNET_HOME = %{_localstatedir}/lib/%{name} +GNUNET_DATA_HOME = %{_localstatedir}/lib/%{name}/data/ +GNUNET_RUNTIME_DIR = %{_localstatedir}/run/%{name}/ +#DEFAULTCONFIG = %{_sysconfdir}/%{name}.conf +[arm] +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 + +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 + +%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 + +%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 + +%{_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 + +%dir %{_sysconfdir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}.conf +%config %{_sysconfdir}/%{name}/*.conf + +%{_mandir}/man1/%{name}*.1* +%{_mandir}/man5/%{name}*.5* + +%if 0%{?suse_version} > 1140 +%{_sbindir}/rc%{name} +%{_unitdir}/%{name}.service +%{_tmpfilesdir}/%{name}.conf +%else +%{_sysconfdir}/init.d/%{name} +%{_sbindir}/rc%{name} +%endif + +%files -n lib%{name} +%defattr(-,root,root) +%{_libdir}/lib%{name}*.so.* +%{_libdir}/libnss_gns*.so.* + +%files plugins +%defattr(-,root,root) +%{_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/gnurl-7.40.0.tar.bz2 b/gnurl-7.40.0.tar.bz2 new file mode 100644 index 0000000..d54094c --- /dev/null +++ b/gnurl-7.40.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a77086b57776cf50cf283156742fb07ba5fcd5d563fa60744049c9e169d24fc1 +size 3278465