CVS commit: pkgsrc/net/libtorrent

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Dec 22 22:28:15 UTC 2019

Modified Files:
        pkgsrc/net/libtorrent: distinfo
        pkgsrc/net/libtorrent/patches: patch-src_torrent_poll__kqueue.cc

Log Message:
Fix kqueue use on newer NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/net/libtorrent/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc

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/distinfo
diff -u pkgsrc/net/libtorrent/distinfo:1.39 pkgsrc/net/libtorrent/distinfo:1.40
--- pkgsrc/net/libtorrent/distinfo:1.39 Tue Jul 30 09:19:59 2019
+++ pkgsrc/net/libtorrent/distinfo      Sun Dec 22 22:28:15 2019
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.39 2019/07/30 09:19:59 nia Exp $
+$NetBSD: distinfo,v 1.40 2019/12/22 22:28:15 joerg Exp $
 
 SHA1 (libtorrent-0.13.8.tar.gz) = e63277da94cec33c0200dd39799984b8f21dd7f2
 RMD160 (libtorrent-0.13.8.tar.gz) = f2e3c6038650b8207e397584f5dcc8bf31e2f721
 SHA512 (libtorrent-0.13.8.tar.gz) = 417177df5b27cd8c6a6317063b0846da2690de4633836466728605c2edad2de407d29d321cc481b8d1352dd0ff6dd89f4566a830424a8cf986f2fddb04704da4
 Size (libtorrent-0.13.8.tar.gz) = 834027 bytes
 SHA1 (patch-config.h.in) = 7ea6ef87727756afe3882aad769a48488fc22c86
-SHA1 (patch-configure) = 6c91606fc317d2d77c5b34d2b47d22a66a2f22c3
 SHA1 (patch-src_Makefile.am) = d965bdfd967a71d14ebcad6b32564a1c0908739d
 SHA1 (patch-src_Makefile.in) = 05f55223073fb57cc11fbb307708ba262899d85f
 SHA1 (patch-src_data_chunk__list.cpp) = 92a5f36d7ae993667123051b39e6033c73169f4e
-SHA1 (patch-src_torrent_poll__kqueue.cc) = 1f98ec93dcaaa587351de9b239712504aef6374b
-SHA1 (patch-src_utils_diffie__hellman.cc) = 65c7e6e305d23504b6c0d07d9e78b8483676d8ee
+SHA1 (patch-src_torrent_poll__kqueue.cc) = 9e5191d9a9802d46a7c7da20e2ec4c3ce9f45a11

Index: pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc
diff -u pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc:1.2 pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc:1.3
--- pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc:1.2 Sun Jun 24 16:57:58 2018
+++ pkgsrc/net/libtorrent/patches/patch-src_torrent_poll__kqueue.cc     Sun Dec 22 22:28:15 2019
@@ -1,15 +1,18 @@
-$NetBSD: patch-src_torrent_poll__kqueue.cc,v 1.2 2018/06/24 16:57:58 adam Exp $
+$NetBSD: patch-src_torrent_poll__kqueue.cc,v 1.3 2019/12/22 22:28:15 joerg Exp $
 
 Add a cast so that this builds with the c++ in 8.0.
 https://github.com/rakshasa/libtorrent/issues/159
 
---- src/torrent/poll_kqueue.cc.orig    2018-06-07 04:24:45.000000000 +0000
+--- src/torrent/poll_kqueue.cc.orig    2019-07-19 11:44:08.000000000 +0000
 +++ src/torrent/poll_kqueue.cc
-@@ -69,6 +69,12 @@ namespace torrent {
+@@ -69,6 +69,15 @@ namespace torrent {
  
  #ifdef USE_KQUEUE
  
 +#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
++#if defined(__NetBSD__) && (__NetBSD_Version__ - 0 < 999001500)
 +#define LIBEV_UDATA(a) ((intptr_t)(a))
 +#else
 +#define LIBEV_UDATA(a) (a)
@@ -18,7 +21,7 @@ https://github.com/rakshasa/libtorrent/i
  inline uint32_t
  PollKQueue::event_mask(Event* e) {
    assert(e->file_descriptor() != -1);
-@@ -111,7 +117,7 @@ PollKQueue::modify(Event* event, unsigne
+@@ -111,7 +120,7 @@ PollKQueue::modify(Event* event, unsigne
    struct kevent* itr = m_changes + (m_changedEvents++);
  
    assert(event == m_table[event->file_descriptor()].second);
@@ -27,7 +30,7 @@ https://github.com/rakshasa/libtorrent/i
  }
  
  PollKQueue*
-@@ -314,11 +320,11 @@ PollKQueue::close(Event* event) {
+@@ -314,11 +323,11 @@ PollKQueue::close(Event* event) {
  
    // Shouldn't be needed anymore.
    for (struct kevent *itr = m_events, *last = m_events + m_waitingEvents; itr != last; ++itr)
@@ -41,7 +44,7 @@ https://github.com/rakshasa/libtorrent/i
  }
  
  void
-@@ -340,11 +346,11 @@ PollKQueue::closed(Event* event) {
+@@ -340,11 +349,11 @@ PollKQueue::closed(Event* event) {
  
    // Shouldn't be needed anymore.
    for (struct kevent *itr = m_events, *last = m_events + m_waitingEvents; itr != last; ++itr)