diff options
| -rw-r--r-- | gnunet-build/packages/gnunet/gnunet/Buildrules | 2 | ||||
| -rw-r--r-- | gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36760-all.patch (renamed from gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36696-all.patch) | 115 |
2 files changed, 60 insertions, 57 deletions
diff --git a/gnunet-build/packages/gnunet/gnunet/Buildrules b/gnunet-build/packages/gnunet/gnunet/Buildrules index c318418..1c859c1 100644 --- a/gnunet-build/packages/gnunet/gnunet/Buildrules +++ b/gnunet-build/packages/gnunet/gnunet/Buildrules @@ -1,4 +1,4 @@ -REVISION="36696" +REVISION="36760" VERSION="svn-${REVISION}" RELEASE="0" DESCRIPTION="GNUnet is a framework for secure peer-to-peer networking that does not use any centralized or otherwise trusted services." diff --git a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36696-all.patch b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36760-all.patch index 5758e1f..ac5c89d 100644 --- a/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36696-all.patch +++ b/gnunet-build/packages/gnunet/gnunet/files/gnunet-svn-36760-all.patch @@ -1,7 +1,7 @@ -Index: gnunet-svn-36696/configure.ac +Index: gnunet-svn-36761/configure.ac =================================================================== ---- gnunet-svn-36696/configure.ac (revision 36696) -+++ gnunet-svn-36696/configure.ac (working copy) +--- gnunet-svn-36761/configure.ac (revision 36761) ++++ gnunet-svn-36761/configure.ac (working copy) @@ -637,7 +637,7 @@ AC_CHECK_HEADERS(ltdl.h, AC_CHECK_LIB([ltdl], [lt_dlopenext], @@ -11,10 +11,10 @@ Index: gnunet-svn-36696/configure.ac then AC_MSG_RESULT([libltdl found]) else -Index: gnunet-svn-36696/src/Makefile.am +Index: gnunet-svn-36761/src/Makefile.am =================================================================== ---- gnunet-svn-36696/src/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/Makefile.am (working copy) +--- gnunet-svn-36761/src/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/Makefile.am (working copy) @@ -81,10 +81,8 @@ peerinfo-tool \ core \ @@ -41,10 +41,10 @@ Index: gnunet-svn-36696/src/Makefile.am $(EXP_DIR) endif -Index: gnunet-svn-36696/src/datastore/Makefile.am +Index: gnunet-svn-36761/src/datastore/Makefile.am =================================================================== ---- gnunet-svn-36696/src/datastore/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/datastore/Makefile.am (working copy) +--- gnunet-svn-36761/src/datastore/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/datastore/Makefile.am (working copy) @@ -104,7 +104,8 @@ $(SQLITE_PLUGIN) \ $(MYSQL_PLUGIN) \ @@ -69,10 +69,10 @@ Index: gnunet-svn-36696/src/datastore/Makefile.am libgnunet_plugin_datastore_mysql_la_SOURCES = \ plugin_datastore_mysql.c -Index: gnunet-svn-36696/src/dht/Makefile.am +Index: gnunet-svn-36761/src/dht/Makefile.am =================================================================== ---- gnunet-svn-36696/src/dht/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/dht/Makefile.am (working copy) +--- gnunet-svn-36761/src/dht/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/dht/Makefile.am (working copy) @@ -55,12 +55,6 @@ gnunet-service-dht-whanau endif @@ -86,10 +86,10 @@ Index: gnunet-svn-36696/src/dht/Makefile.am gnunet_service_dht_SOURCES = \ gnunet-service-dht.c gnunet-service-dht.h \ gnunet-service-dht_clients.c gnunet-service-dht_clients.h \ -Index: gnunet-svn-36696/src/dns/Makefile.am +Index: gnunet-svn-36761/src/dns/Makefile.am =================================================================== ---- gnunet-svn-36696/src/dns/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/dns/Makefile.am (working copy) +--- gnunet-svn-36761/src/dns/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/dns/Makefile.am (working copy) @@ -18,14 +18,6 @@ pkgcfg_DATA = \ dns.conf @@ -105,10 +105,10 @@ Index: gnunet-svn-36696/src/dns/Makefile.am lib_LTLIBRARIES = \ libgnunetdnsparser.la \ libgnunetdnsstub.la \ -Index: gnunet-svn-36696/src/fs/fs_api.c +Index: gnunet-svn-36761/src/fs/fs_api.c =================================================================== ---- gnunet-svn-36696/src/fs/fs_api.c (revision 36696) -+++ gnunet-svn-36696/src/fs/fs_api.c (working copy) +--- gnunet-svn-36761/src/fs/fs_api.c (revision 36761) ++++ gnunet-svn-36761/src/fs/fs_api.c (working copy) @@ -452,19 +452,22 @@ * to provide less data unless there is an error; * a value of "0" will be used at the end to allow @@ -287,10 +287,10 @@ Index: gnunet-svn-36696/src/fs/fs_api.c { GNUNET_break (0); goto cleanup; -Index: gnunet-svn-36696/src/fs/fs_api.h +Index: gnunet-svn-36761/src/fs/fs_api.h =================================================================== ---- gnunet-svn-36696/src/fs/fs_api.h (revision 36696) -+++ gnunet-svn-36696/src/fs/fs_api.h (working copy) +--- gnunet-svn-36761/src/fs/fs_api.h (revision 36761) ++++ gnunet-svn-36761/src/fs/fs_api.h (working copy) @@ -686,16 +686,17 @@ * to provide less data unless there is an error; * a value of "0" will be used at the end to allow @@ -339,10 +339,10 @@ Index: gnunet-svn-36696/src/fs/fs_api.h /** -Index: gnunet-svn-36696/src/fs/fs_download.c +Index: gnunet-svn-36761/src/fs/fs_download.c =================================================================== ---- gnunet-svn-36696/src/fs/fs_download.c (revision 36696) -+++ gnunet-svn-36696/src/fs/fs_download.c (working copy) +--- gnunet-svn-36761/src/fs/fs_download.c (revision 36761) ++++ gnunet-svn-36761/src/fs/fs_download.c (working copy) @@ -1820,33 +1820,36 @@ * @param offset identifies which block to get * @param max (maximum) number of bytes to get; returning @@ -394,10 +394,10 @@ Index: gnunet-svn-36696/src/fs/fs_download.c } -Index: gnunet-svn-36696/src/fs/fs_publish.c +Index: gnunet-svn-36761/src/fs/fs_publish.c =================================================================== ---- gnunet-svn-36696/src/fs/fs_publish.c (revision 36696) -+++ gnunet-svn-36696/src/fs/fs_publish.c (working copy) +--- gnunet-svn-36761/src/fs/fs_publish.c (revision 36761) ++++ gnunet-svn-36761/src/fs/fs_publish.c (working copy) @@ -364,24 +364,24 @@ * @param emsg location to store an error message (on error) * @return number of bytes copied to buf, 0 on error @@ -482,10 +482,10 @@ Index: gnunet-svn-36696/src/fs/fs_publish.c } GNUNET_FS_directory_builder_add (db, dirpos->chk_uri, dirpos->meta, raw_data); -Index: gnunet-svn-36696/src/fs/fs_test_lib.c +Index: gnunet-svn-36761/src/fs/fs_test_lib.c =================================================================== ---- gnunet-svn-36696/src/fs/fs_test_lib.c (revision 36696) -+++ gnunet-svn-36696/src/fs/fs_test_lib.c (working copy) +--- gnunet-svn-36761/src/fs/fs_test_lib.c (revision 36761) ++++ gnunet-svn-36761/src/fs/fs_test_lib.c (working copy) @@ -275,26 +275,23 @@ * @param cls pointer to uint32_t with publishing seed * @param offset offset to generate data for @@ -581,10 +581,10 @@ Index: gnunet-svn-36696/src/fs/fs_test_lib.c off += bsize; } GNUNET_assert (GNUNET_OK == GNUNET_DISK_file_close (fh)); -Index: gnunet-svn-36696/src/fs/fs_tree.c +Index: gnunet-svn-36761/src/fs/fs_tree.c =================================================================== ---- gnunet-svn-36696/src/fs/fs_tree.c (revision 36696) -+++ gnunet-svn-36696/src/fs/fs_tree.c (working copy) +--- gnunet-svn-36761/src/fs/fs_tree.c (revision 36761) ++++ gnunet-svn-36761/src/fs/fs_tree.c (working copy) @@ -322,59 +322,27 @@ @@ -722,10 +722,10 @@ Index: gnunet-svn-36696/src/fs/fs_tree.c te->reader = NULL; } GNUNET_assert (GNUNET_NO == te->in_next); -Index: gnunet-svn-36696/src/fs/fs_unindex.c +Index: gnunet-svn-36761/src/fs/fs_unindex.c =================================================================== ---- gnunet-svn-36696/src/fs/fs_unindex.c (revision 36696) -+++ gnunet-svn-36696/src/fs/fs_unindex.c (working copy) +--- gnunet-svn-36761/src/fs/fs_unindex.c (revision 36761) ++++ gnunet-svn-36761/src/fs/fs_unindex.c (working copy) @@ -43,32 +43,37 @@ * @param offset identifies which block to get * @param max (maximum) number of bytes to get; returning @@ -778,10 +778,10 @@ Index: gnunet-svn-36696/src/fs/fs_unindex.c } -Index: gnunet-svn-36696/src/include/gnunet_fs_service.h +Index: gnunet-svn-36761/src/include/gnunet_fs_service.h =================================================================== ---- gnunet-svn-36696/src/include/gnunet_fs_service.h (revision 36696) -+++ gnunet-svn-36696/src/include/gnunet_fs_service.h (working copy) +--- gnunet-svn-36761/src/include/gnunet_fs_service.h (revision 36761) ++++ gnunet-svn-36761/src/include/gnunet_fs_service.h (working copy) @@ -1838,6 +1838,20 @@ @@ -831,10 +831,10 @@ Index: gnunet-svn-36696/src/include/gnunet_fs_service.h /** -Index: gnunet-svn-36696/src/nat/Makefile.am +Index: gnunet-svn-36761/src/nat/Makefile.am =================================================================== ---- gnunet-svn-36696/src/nat/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/nat/Makefile.am (working copy) +--- gnunet-svn-36761/src/nat/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/nat/Makefile.am (working copy) @@ -15,24 +15,6 @@ dist_pkgcfg_DATA = \ nat.conf @@ -860,10 +860,10 @@ Index: gnunet-svn-36696/src/nat/Makefile.am bin_PROGRAMS = \ gnunet-nat-server \ gnunet-nat -Index: gnunet-svn-36696/src/peerstore/Makefile.am +Index: gnunet-svn-36761/src/peerstore/Makefile.am =================================================================== ---- gnunet-svn-36696/src/peerstore/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/peerstore/Makefile.am (working copy) +--- gnunet-svn-36761/src/peerstore/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/peerstore/Makefile.am (working copy) @@ -52,7 +52,7 @@ $(GN_LIB_LDFLAGS) @@ -892,24 +892,27 @@ Index: gnunet-svn-36696/src/peerstore/Makefile.am check_PROGRAMS = \ test_peerstore_api_store \ test_peerstore_api_iterate \ -Index: gnunet-svn-36696/src/set/Makefile.am +Index: gnunet-svn-36761/src/set/Makefile.am =================================================================== ---- gnunet-svn-36696/src/set/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/set/Makefile.am (working copy) -@@ -16,9 +16,6 @@ +--- gnunet-svn-36761/src/set/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/set/Makefile.am (working copy) +@@ -16,12 +16,6 @@ AM_CFLAGS = -fprofile-arcs -ftest-coverage endif +-bin_PROGRAMS = \ +- gnunet-set-profiler +- -noinst_PROGRAMS = \ -- gnunet-set-profiler gnunet-set-ibf-profiler +- gnunet-set-ibf-profiler - libexec_PROGRAMS = \ gnunet-service-set -Index: gnunet-svn-36696/src/transport/Makefile.am +Index: gnunet-svn-36761/src/transport/Makefile.am =================================================================== ---- gnunet-svn-36696/src/transport/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/transport/Makefile.am (working copy) +--- gnunet-svn-36761/src/transport/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/transport/Makefile.am (working copy) @@ -80,20 +80,6 @@ endif @@ -964,10 +967,10 @@ Index: gnunet-svn-36696/src/transport/Makefile.am libgnunet_plugin_transport_http_client_la_LIBADD = \ $(top_builddir)/src/hello/libgnunethello.la \ $(top_builddir)/src/statistics/libgnunetstatistics.la \ -Index: gnunet-svn-36696/src/util/Makefile.am +Index: gnunet-svn-36761/src/util/Makefile.am =================================================================== ---- gnunet-svn-36696/src/util/Makefile.am (revision 36696) -+++ gnunet-svn-36696/src/util/Makefile.am (working copy) +--- gnunet-svn-36761/src/util/Makefile.am (revision 36761) ++++ gnunet-svn-36761/src/util/Makefile.am (working copy) @@ -59,14 +59,10 @@ libgnunetutil_la_SOURCES = \ bandwidth.c \ |