CVS commit: pkgsrc/net/libtorrent-rasterbar

["Nia Alarie" <nia%netbsd.org@localhost>]

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.2 -r1.3 pkgsrc/net/libtorrent-rasterbar/Makefile \
    pkgsrc/net/libtorrent-rasterbar/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    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.

Modified files:

Index: pkgsrc/net/libtorrent-rasterbar/Makefile
diff -u pkgsrc/net/libtorrent-rasterbar/Makefile:1.2 pkgsrc/net/libtorrent-rasterbar/Makefile:1.3
--- pkgsrc/net/libtorrent-rasterbar/Makefile:1.2        Sat Jan  4 16:49:12 2020
+++ pkgsrc/net/libtorrent-rasterbar/Makefile    Fri Jan 10 11:52:05 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/01/04 16:49:12 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/01/10 11:52:05 nia Exp $
 
 DISTNAME=      libtorrent-rasterbar-1.2.3
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=arvidn/}
 GITHUB_PROJECT=        libtorrent
Index: pkgsrc/net/libtorrent-rasterbar/distinfo
diff -u pkgsrc/net/libtorrent-rasterbar/distinfo:1.2 pkgsrc/net/libtorrent-rasterbar/distinfo:1.3
--- pkgsrc/net/libtorrent-rasterbar/distinfo:1.2        Sat Jan  4 16:49:12 2020
+++ pkgsrc/net/libtorrent-rasterbar/distinfo    Fri Jan 10 11:52:05 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2020/01/04 16:49:12 nia Exp $
+$NetBSD: distinfo,v 1.3 2020/01/10 11:52:05 nia Exp $
 
 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) = 9a2582c3a4740467c60bf621ae0dedb14c507c7c
+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.2
--- 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 11:52:05 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.2 2020/01/10 11:52:05 nia 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 <malloc.h>
- #elif defined _MSC_VER
- #include <malloc.h>
-+#elif defined __NetBSD__
-+#include <malloc.h>
  #elif defined __FreeBSD__
  #include <malloc_np.h>
- #elif defined TORRENT_BSD
-@@ -85,7 +87,7 @@ public:
+-#elif defined TORRENT_BSD
+-#include <malloc/malloc.h>
+ #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<difference_type>(::malloc_usable_size(m_begin));
  #elif defined _MSC_VER
                m_size = static_cast<difference_type>(::_msize(m_begin));
+-#elif defined TORRENT_BSD
+-              m_size = static_cast<difference_type>(::malloc_size(m_begin));
+ #else
+               m_size = size;
+ #endif