pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
gnunet: update to 0.11pre66.
Module Name: pkgsrc-wip
Committed By: ng0 <ng0%n0.is@localhost>
Pushed By: ng0
Date: Mon Feb 11 18:13:44 2019 +0000
Changeset: efa32016b59e21ae6be704687237539ec9965a4b
Modified Files:
gnunet/DESCR
gnunet/Makefile
gnunet/PLIST
gnunet/distinfo
Removed Files:
gnunet/patches/patch-aa
gnunet/patches/patch-ab
gnunet/patches/patch-ac
gnunet/patches/patch-ad
gnunet/patches/patch-ae
gnunet/patches/patch-af
Log Message:
gnunet: update to 0.11pre66.
pkgsrc changes:
* Makefile: change DISTNAME, CATEGORIES, and MASTERSITE.
* Makefile: update LICENSE to agpl3.
* Makefile: Update homepage to the non-www part.
* Makefile: Declare languages used.
* Makefile: Add pkg-config to USE_TOOLS.
* Makefile: Declare all initial dependencies.
* remove patches which can not be tracked back / files no longer exist,
and already patched in the years gone by.
* reset PLIST
upstream changes (from 0.11.0pre66 release notes, leaving out the releases
before this prerelease):
Noteworthy improvements in 0.11.0pre66
Improved documentation, converting Drupal handbook
to Texinfo (thanks ng0!)
GNU Name System now can take over arbitrary TLDs, and
support for conversion from DNS zones to GNS exists
Critical bugfixes in CORE, DHT and CADET subsystems
The above is just the short list, our bugtracker lists over 350
individual issues that were resolved
(see https://gnunet.org/bugs/changelog_page.php).
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=efa32016b59e21ae6be704687237539ec9965a4b
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
gnunet/DESCR | 3 ---
gnunet/Makefile | 49 +++++++++++++++++++++++-----------
gnunet/PLIST | 70 -------------------------------------------------
gnunet/distinfo | 15 ++++-------
gnunet/patches/patch-aa | 53 -------------------------------------
gnunet/patches/patch-ab | 28 --------------------
gnunet/patches/patch-ac | 18 -------------
gnunet/patches/patch-ad | 14 ----------
gnunet/patches/patch-ae | 13 ---------
gnunet/patches/patch-af | 13 ---------
10 files changed, 38 insertions(+), 238 deletions(-)
diffs:
diff --git a/gnunet/DESCR b/gnunet/DESCR
index dc001ac7e1..14b9fd9763 100644
--- a/gnunet/DESCR
+++ b/gnunet/DESCR
@@ -6,6 +6,3 @@ file-sharing. GNUnet uses a simple, excess-based economic
model to allocate resources. Peers in GNUnet monitor each
others behavior with respect to resource usage; peers that
contribute to the network are rewarded with better service.
-
-GNUnet is part of the GNU project. Our official GNU website
-can be found at http://www.gnu.org/software/GNUnet/.
diff --git a/gnunet/Makefile b/gnunet/Makefile
index 6eb848be7a..7d11aa1b6a 100644
--- a/gnunet/Makefile
+++ b/gnunet/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.21 2012/11/25 23:32:18 othyro Exp $
+# $NetBSD$
#
-DISTNAME= GNUnet-0.6.4a
-PKGNAME= ${DISTNAME:S/GNU/gnu/}
-PKGREVISION= 1
-CATEGORIES= x11
-MASTER_SITES= http://www2.cddc.vt.edu/gnu/ftp/gnu/gnunet/
-# http://www.gnunet.org/download/
-EXTRACT_SUFX= .tar.bz2
-LICENSE= gnu-gpl-v3
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://www.gnunet.org/
+# This is a pre-release, with 0.11 release coming soon. pre66 being best for
+# testing the package.
+DISTNAME= gnunet-0.11.0pre66
+CATEGORIES= net
+MASTER_SITES= ${MASTER_SITE_GNU:=gnunet/}
+LICENSE= gnu-agpl-v3
+
+MAINTAINER= ng0%n0.is@localhost
+HOMEPAGE= https://gnunet.org/
COMMENT= Framework for secure P2P networking
MAKE_JOBS_SAFE= no
-USE_TOOLS+= gmake msgfmt
+USE_TOOLS+= gmake pkg-config msgfmt
+USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
PLIST_SRC= ${WRKDIR}/PLIST.src
USE_LIBTOOL= yes
@@ -28,8 +27,8 @@ LDFLAGS+= -lpthread -lintl
.include "options.mk"
CONFIGURE_ARGS+= --with-extractor=${BUILDLINK_PREFIX.libextractor}
-CONFIGURE_ARGS+= --without-gtk
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --with-libgcrypt-prefix=${BUILDLINK_PREFIX.libgcrypt}
post-patch:
cd ${WRKSRC} && for f in contrib/gnunet.* src/include/gnunet_util.h doc/man/*.?; do \
@@ -45,10 +44,28 @@ post-build:
${ECHO} ${f:Q} >>${PLIST_SRC}
.endfor
+.include "../../audio/libopus/buildlink3.mk"
+.include "../../databases/postgresql96-client/buildlink3.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/gmp/buildlink3.mk"
-.include "../../devel/libextractor/buildlink3.mk"
+.include "../../devel/nss/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../wip/libextractor/buildlink3.mk"
.include "../../devel/libgsf/buildlink3.mk"
-.include "../../devel/libltdl/convenience.mk"
+.include "../../devel/libidn2/buildlink3.mk"
+.include "../../devel/libltdl/buildlink3.mk"
+.include "../../lang/perl5/buildlink3.mk"
+.include "../../lang/python27/buildlink3.mk"
+.include "../../math/glpk/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../multimedia/libogg/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../textproc/libunistring/buildlink3.mk"
+.include "../../textproc/jansson/buildlink3.mk"
+.include "../../www/gnurl/buildlink3.mk"
+.include "../../www/libmicrohttpd/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/gnunet/PLIST b/gnunet/PLIST
index da65e618f2..e69de29bb2 100644
--- a/gnunet/PLIST
+++ b/gnunet/PLIST
@@ -1,70 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/18 00:46:33 jlamwww Exp $
-bin/gnunet-chat
-bin/gnunet-check
-bin/gnunet-convert
-bin/gnunet-delete
-bin/gnunet-dht-join
-bin/gnunet-dht-query
-bin/gnunet-directory
-bin/gnunet-download
-bin/gnunet-insert
-bin/gnunet-peer-info
-bin/gnunet-pseudonym
-bin/gnunet-search
-bin/gnunet-setup
-bin/gnunet-stats
-bin/gnunet-tbench
-bin/gnunet-testbed
-bin/gnunet-tracekit
-bin/gnunet-transport-check
-bin/gnunet-update
-bin/gnunetd
-include/gnunet_afs_esed2.h
-include/gnunet_core.h
-include/gnunet_dht.h
-include/gnunet_dht_datastore_memory.h
-include/gnunet_dht_lib.h
-include/gnunet_dht_service.h
-include/gnunet_rpc_service.h
-include/gnunet_transport.h
-include/gnunet_util.h
-include/platform.h
-include/winproc.h
-lib/libgnunet_afs_esed2.la
-lib/libgnunetafs_database_directory.la
-lib/libgnunetafs_protocol.la
-lib/libgnunetchat_protocol.la
-lib/libgnunetdht_api.la
-lib/libgnunetdht_datastore_memory.la
-lib/libgnunetdht_protocol.la
-lib/libgnunetrpc_protocol.la
-lib/libgnunetrpc_util.la
-lib/libgnunettbench_protocol.la
-lib/libgnunettestbed_protocol.la
-lib/libgnunettracekit_protocol.la
-lib/libgnunettransport_http.la
-lib/libgnunettransport_nat.la
-lib/libgnunettransport_smtp.la
-lib/libgnunettransport_tcp.la
-lib/libgnunettransport_udp.la
-lib/libgnunetutil.la
-man/man1/gnunet-chat.1
-man/man1/gnunet-check.1
-man/man1/gnunet-convert.1
-man/man1/gnunet-delete.1
-man/man1/gnunet-directory.1
-man/man1/gnunet-download.1
-man/man1/gnunet-gtk.1
-man/man1/gnunet-insert.1
-man/man1/gnunet-peer-info.1
-man/man1/gnunet-pseudonym.1
-man/man1/gnunet-search.1
-man/man1/gnunet-stats.1
-man/man1/gnunet-tbench.1
-man/man1/gnunet-testbed.1
-man/man1/gnunet-tracekit.1
-man/man1/gnunet-transport-check.1
-man/man1/gnunet-update.1
-man/man1/gnunetd.1
-man/man5/gnunet.conf.5
-share/locale/de/LC_MESSAGES/GNUnet.mo
diff --git a/gnunet/distinfo b/gnunet/distinfo
index bb42246b78..0024b4f8b6 100644
--- a/gnunet/distinfo
+++ b/gnunet/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.6 2008/09/22 12:16:16 thomasklausner Exp $
+$NetBSD$
-SHA1 (GNUnet-0.6.4a.tar.bz2) = f3e5f55de75f3859c2f7bc9f0cbb4896255dbbc4
-RMD160 (GNUnet-0.6.4a.tar.bz2) = d827e3a596eded29a6c0d5840e0dbf047682caf7
-Size (GNUnet-0.6.4a.tar.bz2) = 1250052 bytes
-SHA1 (patch-aa) = 3424b9929668e5783fb59f73c53514eed2013308
-SHA1 (patch-ab) = 0dd443aa888314d029af761f2a8140ddb0455de7
-SHA1 (patch-ac) = 506753f8e0bde8fded12182dade9e37d22b2da28
-SHA1 (patch-ad) = e95ec0f92dc404b8d4dab6e8d09236c6e3fd24c0
-SHA1 (patch-ae) = 6b34c9afe15bb1f54444dcb9dd2bb7b5e81c6771
-SHA1 (patch-af) = 566351d448749da2285eff9560ebad90cede3246
+SHA1 (gnunet-0.11.0pre66.tar.gz) = 356724f9e38162984bff602fea30ce524f502201
+RMD160 (gnunet-0.11.0pre66.tar.gz) = 50250a2a8a6fca16c0f72bf0b0b2bb7cd66b75d1
+SHA512 (gnunet-0.11.0pre66.tar.gz) = 914533659419ff3a64772e0933617be455390c8d0b22718dd8d6fe5b892ea9969f2fe55f3c128094f349597a19b32255e47d0c29952864557e1fc19af9465e2d
+Size (gnunet-0.11.0pre66.tar.gz) = 7487985 bytes
diff --git a/gnunet/patches/patch-aa b/gnunet/patches/patch-aa
deleted file mode 100644
index 3fe855e6cc..0000000000
--- a/gnunet/patches/patch-aa
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2004/11/06 03:35:19 tvierling Exp $
-
---- configure.orig 2004-09-25 23:24:06.000000000 -0400
-+++ configure
-@@ -24831,9 +24831,9 @@ fi
-
- fi;
-
--if test $openssl == 0
-+if test $openssl = 0
- then
--if test $gcrypt == 0
-+if test $gcrypt = 0
- then
- { { echo "$as_me:$LINENO: error: GNUnet needs libgcrypt or OpenSSL" >&5
- echo "$as_me: error: GNUnet needs libgcrypt or OpenSSL" >&2;}
-@@ -24842,9 +24842,9 @@ fi
- fi
-
- # Given the choice, the preference is libgcrypt
--if test $openssl == 1
-+if test $openssl = 1
- then
--if test $gcrypt == 1
-+if test $gcrypt = 1
- then
- openssl=0
- fi
-@@ -34315,7 +34315,7 @@ then
- fi
-
- guile=0
--if test "$enable_guile" == "yes"
-+if test "$enable_guile" = "yes"
- then
- # Extract the first word of "guile", so it can be a program name with args.
- set dummy guile; ac_word=$2
-@@ -36633,13 +36633,13 @@ fi
- { echo "$as_me:$LINENO: NOTICE: Database support is set to GDBM: $gdb, TDB: $tdb, BDB: $bdb, MySQL: $mysql" >&5
- echo "$as_me: NOTICE: Database support is set to GDBM: $gdb, TDB: $tdb, BDB: $bdb, MySQL: $mysql" >&6;}
-
--if test $openssl == 1
-+if test $openssl = 1
- then
- { echo "$as_me:$LINENO: NOTICE: Using OpenSSL for cryptographic primitives." >&5
- echo "$as_me: NOTICE: Using OpenSSL for cryptographic primitives." >&6;}
- fi
-
--if test $gcrypt == 1
-+if test $gcrypt = 1
- then
- { echo "$as_me:$LINENO: NOTICE: Using libgcrypt for cryptographic primitives." >&5
- echo "$as_me: NOTICE: Using libgcrypt for cryptographic primitives." >&6;}
diff --git a/gnunet/patches/patch-ab b/gnunet/patches/patch-ab
deleted file mode 100644
index 835826ab8d..0000000000
--- a/gnunet/patches/patch-ab
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2004/11/06 03:35:19 tvierling Exp $
-
---- src/util/semaphore.c.orig 2004-09-12 14:33:00.000000000 -0400
-+++ src/util/semaphore.c
-@@ -35,7 +35,9 @@
- #if FREEBSD
- #include <semaphore.h>
- #endif
--#if SOMEBSD
-+#if NETBSD
-+# include <pthread.h>
-+#elif SOMEBSD
- # include <pthread_np.h>
- #endif
- #if SOMEBSD || OSX
-@@ -133,10 +135,10 @@ void create_recursive_mutex_(Mutex * mut
- #if LINUX
- pthread_mutexattr_setkind_np(&attr,
- PTHREAD_MUTEX_RECURSIVE_NP);
--#elif SOMEBSD
-+#elif SOMEBSD && !NETBSD
- pthread_mutexattr_setkind_np(&attr,
- PTHREAD_MUTEX_RECURSIVE);
--#elif SOLARIS
-+#elif SOLARIS || NETBSD
- pthread_mutexattr_settype(&attr,
- PTHREAD_MUTEX_RECURSIVE);
- #elif OSX
diff --git a/gnunet/patches/patch-ac b/gnunet/patches/patch-ac
deleted file mode 100644
index 58f39c5022..0000000000
--- a/gnunet/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2004/11/06 03:35:19 tvierling Exp $
-
---- contrib/gnunet.root.orig 2004-11-05 14:22:42.000000000 -0500
-+++ contrib/gnunet.root
-@@ -457,10 +457,10 @@ DISKQUOTA = 1024
- # systems but typically uses more space and can also be slower. mysql
- # will require some additional setup of the database.
- #
--# Note that if you change the databaset type, you need to run
-+# Note that if you change the database type, you need to run
- # gnunet-convert, otherwise your databases will be
--# inconsistent (and gnunetd will refuse to work). Default is gdbm.
--DATABASETYPE = "gdbm"
-+# inconsistent (and gnunetd will refuse to work). Default is directory.
-+DATABASETYPE = "directory"
-
- # What degree of receiver anonymity is required? If set to 0, GNUnet
- # will try to download the file as fast as possible without any
diff --git a/gnunet/patches/patch-ad b/gnunet/patches/patch-ad
deleted file mode 100644
index 6d40a09969..0000000000
--- a/gnunet/patches/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2004/11/06 03:35:19 tvierling Exp $
-
---- src/transports/tcp.c.orig 2004-11-05 16:00:42.000000000 -0500
-+++ src/transports/tcp.c
-@@ -807,7 +807,8 @@ static int tcpDirectSend(TCPSession * tc
- }
- if (ret < 0) {
- if ( (errno == EAGAIN) ||
-- (errno == EWOULDBLOCK)) {
-+ (errno == EWOULDBLOCK) ||
-+ (errno == ENOTCONN) ) {
- ret = 0;
- } else {
- LOG_STRERROR(LOG_INFO, "send");
diff --git a/gnunet/patches/patch-ae b/gnunet/patches/patch-ae
deleted file mode 100644
index 3b979e70e7..0000000000
--- a/gnunet/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2008/09/22 12:16:16 thomasklausner Exp $
-
---- contrib/report.sh.orig 2004-09-22 05:41:51.000000000 +0000
-+++ contrib/report.sh
-@@ -160,7 +160,7 @@ fi
- TEST=`$WHICH dpkg 2> /dev/null`
- if test -n "$TEST"; then
- LINES=`dpkg -s libgmp3-dev | grep Version | wc -l`
-- if test "$LINES" == "1"
-+ if test "$LINES" = "1"
- then
- VERSION=`dpkg -s libgmp3-dev | grep Version | awk '{print $2}'`
- echo "GMP : libgmp3-dev-$VERSION.deb"
diff --git a/gnunet/patches/patch-af b/gnunet/patches/patch-af
deleted file mode 100644
index 47d298c79a..0000000000
--- a/gnunet/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2008/09/22 12:16:16 thomasklausner Exp $
-
---- src/util/storage.c.orig 2004-09-18 18:18:46.000000000 +0000
-+++ src/util/storage.c
-@@ -160,7 +160,7 @@ static void getSizeWithoutSymlinksRec(co
- * @return -1 on errors, otherwise the number of free blocks
- */
- long getBlocksLeftOnDrive(const char * part) {
--#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(__NetBSD__)
- struct statvfs buf;
-
- if (0 == statvfs(part, &buf)) {
Home |
Main Index |
Thread Index |
Old Index