Received: by mail.netbsd.org (Postfix, from userid 605) id 3590B84DA7; Fri, 10 Jan 2020 15:25:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id A8F0484D9C for ; Fri, 10 Jan 2020 15:25:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id Zls3-TKLjevl for ; Fri, 10 Jan 2020 15:25:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id E57E384D43 for ; Fri, 10 Jan 2020 15:25:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id DEE95FBF4; Fri, 10 Jan 2020 15:25:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1578669938112990" MIME-Version: 1.0 Date: Fri, 10 Jan 2020 15:25:38 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2019Q4] pkgsrc/net/libtorrent-rasterbar To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20200110152538.DEE95FBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1578669938112990 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Fri Jan 10 15:25:38 UTC 2020 Modified Files: pkgsrc/net/libtorrent-rasterbar [pkgsrc-2019Q4]: Makefile PLIST distinfo pkgsrc/net/libtorrent-rasterbar/patches [pkgsrc-2019Q4]: patch-include_libtorrent_buffer.hpp Log Message: Pullup ticket #6115 - requested by nia net/libtorrent-rasterbar: NetBSD 8 build fix Revisions pulled up: - net/libtorrent-rasterbar/Makefile 1.2-1.3 - net/libtorrent-rasterbar/PLIST 1.2 - net/libtorrent-rasterbar/distinfo 1.2-1.3 - net/libtorrent-rasterbar/patches/patch-include_libtorrent_buffer.hpp 1.2 --- Module Name: pkgsrc Committed By: nia Date: Sat Jan 4 16:49:12 UTC 2020 Modified Files: pkgsrc/net/libtorrent-rasterbar: Makefile PLIST distinfo Log Message: libtorrent-rasterbar: Update to 1.2.3 Changes: fix erroneous event=completed tracker announce when checking files promote errors in parsing listen_interfaces to post listen_failed_alert fix bug in protocol encryption/obfuscation fix buffer overflow in SOCKS5 UDP logic fix issue of rapid calls to file_priority() clobbering each other clear tracker errors on success optimize setting with unlimited unchoke slots fixed restoring of trackers, comment, creation date and created-by in resume data fix handling of torrents with too large pieces fixed division by zero in anti-leech choker fixed bug in torrent_info::swap --- Module Name: pkgsrc Committed By: nia Date: Fri Jan 10 11:52:05 UTC 2020 Modified Files: pkgsrc/net/libtorrent-rasterbar: Makefile distinfo pkgsrc/net/libtorrent-rasterbar/patches: patch-include_libtorrent_buffer.hpp Log Message: libtorrent-rasterbar: Let's not peek into internal malloc properties. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.4.1 pkgsrc/net/libtorrent-rasterbar/Makefile \ pkgsrc/net/libtorrent-rasterbar/PLIST \ pkgsrc/net/libtorrent-rasterbar/distinfo cvs rdiff -u -r1.1 -r1.1.4.1 \ pkgsrc/net/libtorrent-rasterbar/patches/patch-include_libtorrent_buffer.hpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1578669938112990 Content-Disposition: inline Content-Length: 4901 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/libtorrent-rasterbar/Makefile diff -u pkgsrc/net/libtorrent-rasterbar/Makefile:1.1 pkgsrc/net/libtorrent-rasterbar/Makefile:1.1.4.1 --- pkgsrc/net/libtorrent-rasterbar/Makefile:1.1 Mon Dec 16 18:00:51 2019 +++ pkgsrc/net/libtorrent-rasterbar/Makefile Fri Jan 10 15:25:38 2020 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2019/12/16 18:00:51 nia Exp $ +# $NetBSD: Makefile,v 1.1.4.1 2020/01/10 15:25:38 bsiegert Exp $ -DISTNAME= libtorrent-rasterbar-1.2.2 +DISTNAME= libtorrent-rasterbar-1.2.3 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_GITHUB:=arvidn/} GITHUB_PROJECT= libtorrent Index: pkgsrc/net/libtorrent-rasterbar/PLIST diff -u pkgsrc/net/libtorrent-rasterbar/PLIST:1.1 pkgsrc/net/libtorrent-rasterbar/PLIST:1.1.4.1 --- pkgsrc/net/libtorrent-rasterbar/PLIST:1.1 Mon Dec 16 18:00:51 2019 +++ pkgsrc/net/libtorrent-rasterbar/PLIST Fri Jan 10 15:25:38 2020 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2019/12/16 18:00:51 nia Exp $ +@comment $NetBSD: PLIST,v 1.1.4.1 2020/01/10 15:25:38 bsiegert Exp $ include/libtorrent/ConvertUTF.h include/libtorrent/add_torrent_params.hpp include/libtorrent/address.hpp @@ -19,6 +19,7 @@ include/libtorrent/aux_/container_wrappe include/libtorrent/aux_/cppint_import_export.hpp include/libtorrent/aux_/cpuid.hpp include/libtorrent/aux_/deferred_handler.hpp +include/libtorrent/aux_/deprecated.hpp include/libtorrent/aux_/deque.hpp include/libtorrent/aux_/dev_random.hpp include/libtorrent/aux_/disable_warnings_pop.hpp Index: pkgsrc/net/libtorrent-rasterbar/distinfo diff -u pkgsrc/net/libtorrent-rasterbar/distinfo:1.1 pkgsrc/net/libtorrent-rasterbar/distinfo:1.1.4.1 --- pkgsrc/net/libtorrent-rasterbar/distinfo:1.1 Mon Dec 16 18:00:51 2019 +++ pkgsrc/net/libtorrent-rasterbar/distinfo Fri Jan 10 15:25:38 2020 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1 2019/12/16 18:00:51 nia Exp $ +$NetBSD: distinfo,v 1.1.4.1 2020/01/10 15:25:38 bsiegert Exp $ -SHA1 (libtorrent-rasterbar-1.2.2.tar.gz) = ebe0002a37a845bf08e7d91ff1c86120de2173ca -RMD160 (libtorrent-rasterbar-1.2.2.tar.gz) = 3096523905a7de4d0aaeb76d7053b0d2f3fc43dc -SHA512 (libtorrent-rasterbar-1.2.2.tar.gz) = 8ef867d253fe187336ec5919683526997298319b755bcd72eeca2c56c81462d2aed912d2eadcd560d2a8729b36798718f9a1668a83927211f49667af9bdf0a06 -Size (libtorrent-rasterbar-1.2.2.tar.gz) = 4088779 bytes -SHA1 (patch-include_libtorrent_buffer.hpp) = 9a2582c3a4740467c60bf621ae0dedb14c507c7c +SHA1 (libtorrent-rasterbar-1.2.3.tar.gz) = ca0f0e018115388db7a40aab1a9a472b43047608 +RMD160 (libtorrent-rasterbar-1.2.3.tar.gz) = 2af0385b24338e007b68a1ad510a485a04467ef5 +SHA512 (libtorrent-rasterbar-1.2.3.tar.gz) = 18cffb86c5affcde79860236440eaca492fce71f16c2ccc5e20ec0d9351fbfb6c15d97e203b61c8cf8168f86cf31459ce0b76a4b0559244f9add385434ff4ae6 +Size (libtorrent-rasterbar-1.2.3.tar.gz) = 4145859 bytes +SHA1 (patch-include_libtorrent_buffer.hpp) = 365f04a6a4b63f86288119201bfec0b9d9e67bee Index: pkgsrc/net/libtorrent-rasterbar/patches/patch-include_libtorrent_buffer.hpp diff -u pkgsrc/net/libtorrent-rasterbar/patches/patch-include_libtorrent_buffer.hpp:1.1 pkgsrc/net/libtorrent-rasterbar/patches/patch-include_libtorrent_buffer.hpp:1.1.4.1 --- pkgsrc/net/libtorrent-rasterbar/patches/patch-include_libtorrent_buffer.hpp:1.1 Mon Dec 16 18:00:51 2019 +++ pkgsrc/net/libtorrent-rasterbar/patches/patch-include_libtorrent_buffer.hpp Fri Jan 10 15:25:38 2020 @@ -1,24 +1,24 @@ -$NetBSD: patch-include_libtorrent_buffer.hpp,v 1.1 2019/12/16 18:00:51 nia Exp $ +$NetBSD: patch-include_libtorrent_buffer.hpp,v 1.1.4.1 2020/01/10 15:25:38 bsiegert Exp $ -Support NetBSD. +On second thought, let's not peek into internal malloc properties. ---- include/libtorrent/buffer.hpp.orig 2019-09-24 09:52:01.000000000 +0000 +--- include/libtorrent/buffer.hpp.orig 2019-12-19 00:51:16.000000000 +0000 +++ include/libtorrent/buffer.hpp -@@ -47,6 +47,8 @@ POSSIBILITY OF SUCH DAMAGE. +@@ -49,8 +49,6 @@ POSSIBILITY OF SUCH DAMAGE. #include - #elif defined _MSC_VER - #include -+#elif defined __NetBSD__ -+#include #elif defined __FreeBSD__ #include - #elif defined TORRENT_BSD -@@ -85,7 +87,7 @@ public: +-#elif defined TORRENT_BSD +-#include + #endif - // the actual allocation may be larger than we requested. If so, let the - // user take advantage of every single byte --#if (defined __GLIBC__ && !defined __UCLIBC__) || defined __FreeBSD__ -+#if (defined __GLIBC__ && !defined __UCLIBC__) || defined __FreeBSD__ || defined __NetBSD__ + namespace libtorrent { +@@ -89,8 +87,6 @@ public: m_size = static_cast(::malloc_usable_size(m_begin)); #elif defined _MSC_VER m_size = static_cast(::_msize(m_begin)); +-#elif defined TORRENT_BSD +- m_size = static_cast(::malloc_size(m_begin)); + #else + m_size = size; + #endif --_----------=_1578669938112990--