rtorrent: updated to 0.9.7

0.9.7:
Bug-fix release while feature-bind is being worked on.

Fixed ip filter memory usage.
Add space to fmt str in log_gz_file_write.
Fix compilation issue with gcc v6.x and empty CXXFLAGS.
Fix BEP7 compatibility with IPv6 trackers and IPv4 peers.
Include SCGI/XMLRPC example in rtorrent.rc.
Handle SIGHUP like SIGINT.
Fix Throttle args.
Fix missing ranlib - not defined but used.
Fix no // are at start of expanded paths.
Fix ncurses header include.
Fix segfault when viewing a magnet download in the leeching view.

10 files changed, 47 insertions, 76 deletions

diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index c4916dabfa9..1f0ee25e5d3 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.69 2018/04/29 21:32:00 adam Exp $
+# $NetBSD: Makefile,v 1.70 2018/06/24 16:59:52 adam Exp $
 
-DISTNAME=	rtorrent-0.9.6
-PKGREVISION=	7
+DISTNAME=	rtorrent-0.9.7
 CATEGORIES=	net
 MASTER_SITES=	http://rtorrent.net/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://rakshasa.github.io/rtorrent/
+HOMEPAGE=	https://github.com/rakshasa/rtorrent
 COMMENT=	Ncurses based torrent client with support for sessions
 LICENSE=	gnu-gpl-v2
 
diff --git a/net/rtorrent/distinfo b/net/rtorrent/distinfo
index e8598f8c3e3..e57e0844c3b 100644
--- a/net/rtorrent/distinfo
+++ b/net/rtorrent/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.36 2015/11/04 00:35:34 agc Exp $
+$NetBSD: distinfo,v 1.37 2018/06/24 16:59:52 adam Exp $
 
-SHA1 (rtorrent-0.9.6.tar.gz) = c306a2fe1f329eec9da74522c034b249b0eb7230
-RMD160 (rtorrent-0.9.6.tar.gz) = 8ac9730ccd5544ee0f64628538a892d4f1d86081
-SHA512 (rtorrent-0.9.6.tar.gz) = 704f7b79d5bc78b817da21a6886662a5a97fde210a110c50f708bdc18e1dcf3ef5c5f4e2740261d41221cfc69c19926bf34e10057adf10601da9e6e06b2cef75
-Size (rtorrent-0.9.6.tar.gz) = 610845 bytes
-SHA1 (patch-ad) = b3b38e1d9d0887711ac54433e948bfc28112b985
-SHA1 (patch-ae) = a370881bfdd8534eb25fcbcff8d258b19797941f
-SHA1 (patch-af) = 842a01cbc75e61092b4d33fe9155a728e7c502e6
-SHA1 (patch-ag) = c0278f1d1ce7f635c5d10542026fc565dcff1927
-SHA1 (patch-src_display_window__file__list.cc) = ba005aa1a12317f190a6ec47277e7545b37f2a1c
-SHA1 (patch-src_signal__handler.cc) = a79d2dcd9a14de1e221ab94d2a14fe70b9b9ce36
+SHA1 (rtorrent-0.9.7.tar.gz) = 69d9ff5160f6fe7266b4b0f7a46045fd6370a650
+RMD160 (rtorrent-0.9.7.tar.gz) = 3eb3743d58581a59349ea4dddc23b5f36f2769f8
+SHA512 (rtorrent-0.9.7.tar.gz) = e663bd8984bcec91868beaf16d215708bdea8872338365ba6a05c9ea830b2aff045257bbc8bd0414d84009ee85852822c97bb073dfb41c21e3b0081ecaeecc00
+Size (rtorrent-0.9.7.tar.gz) = 610149 bytes
+SHA1 (patch-src_display_canvas.h) = 6b10c508158d594bcb0633c9e7f3e2885f8456d1
+SHA1 (patch-src_main.cc) = bdd4ebef64c3e137c226fdf1a1ad96c680b28add
+SHA1 (patch-src_utils_directory.cc) = b3b38e1d9d0887711ac54433e948bfc28112b985
+SHA1 (patch-src_utils_directory.h) = a370881bfdd8534eb25fcbcff8d258b19797941f
diff --git a/net/rtorrent/options.mk b/net/rtorrent/options.mk
index 653c780665e..3c2857c1df0 100644
--- a/net/rtorrent/options.mk
+++ b/net/rtorrent/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2011/07/28 23:14:46 tron Exp $
+# $NetBSD: options.mk,v 1.2 2018/06/24 16:59:52 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.rtorrent
 PKG_SUPPORTED_OPTIONS=	xmlrpc
@@ -7,6 +7,6 @@ PKG_SUGGESTED_OPTIONS=	xmlrpc
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mxmlrpc)
-CONFIGURE_ARGS+=       --with-xmlrpc-c=${PREFIX:Q}/bin/xmlrpc-c-config
+CONFIGURE_ARGS+=       --with-xmlrpc-c=${PREFIX}/bin/xmlrpc-c-config
 .  include "../../textproc/xmlrpc-c/buildlink3.mk"
 .endif
diff --git a/net/rtorrent/patches/patch-ag b/net/rtorrent/patches/patch-ag
deleted file mode 100644
index c7ebb32e8d0..00000000000
--- a/net/rtorrent/patches/patch-ag
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2014/06/15 22:44:15 tron Exp $
-
-Fix handling of command line options.
-
-http://libtorrent.rakshasa.no/ticket/2657
-
---- src/main.cc.orig	2012-03-20 15:09:58.000000000 +0000
-+++ src/main.cc
-@@ -843,14 +851,14 @@ main(int argc, char** argv) {
-     }
- #endif
- 
--    int firstArg = parse_options(control, argc, argv);
--
-     if (OptionParser::has_flag('n', argc, argv)) {
-       lt_log_print(torrent::LOG_WARN, "Ignoring ~/.rtorrent.rc.");
-     } else {
-       rpc::parse_command_single(rpc::make_target(), "try_import = ~/.rtorrent.rc");
-     }
- 
-+    int firstArg = parse_options(control, argc, argv);
-+
-     control->initialize();
- 
-     // Load session torrents and perform scheduled tasks to ensure
diff --git a/net/rtorrent/patches/patch-af b/net/rtorrent/patches/patch-src_display_canvas.h
index 9c5b439bbab..ab5736bb229 100644
--- a/net/rtorrent/patches/patch-af
+++ b/net/rtorrent/patches/patch-src_display_canvas.h
@@ -1,11 +1,10 @@
-$NetBSD: patch-af,v 1.4 2011/08/01 13:12:38 wiz Exp $
-
-Make this work with "ncurses" 5.8. Patch taken from here.
+$NetBSD: patch-src_display_canvas.h,v 1.1 2018/06/24 16:59:52 adam Exp $
 
+Make this work with "ncurses" 5.8. Patch taken from:
 http://www.mail-archive.com/arch-general@archlinux.org/msg18728.html
 
---- src/display/canvas.h.orig	2011-04-07 13:36:10.000000000 +0100
-+++ src/display/canvas.h	2011-07-30 16:40:10.000000000 +0100
+--- src/display/canvas.h.orig	2018-06-07 04:25:27.000000000 +0000
++++ src/display/canvas.h
 @@ -37,6 +37,7 @@
  #ifndef RTORRENT_DISPLAY_CANVAS_H
  #define RTORRENT_DISPLAY_CANVAS_H
@@ -14,12 +13,12 @@ http://www.mail-archive.com/arch-general@archlinux.org/msg18728.html
  #include <string>
  #include <vector>
  
-@@ -48,7 +49,7 @@
+@@ -48,7 +49,7 @@ class Canvas {
  public:
    typedef std::vector<Attributes> attributes_list;
  
 -  Canvas(int x = 0, int y = 0, int width = 0, int height = 0);
 +  Canvas(int x = 0, int y = 0, int width = 1, int height = 1);
-   ~Canvas() { delwin(m_window); }
+   ~Canvas() { if (!m_isDaemon) { delwin(m_window); } }
  
-   void                refresh()                                               { wnoutrefresh(m_window); }
+   void                refresh()                                               { if (!m_isDaemon) { wnoutrefresh(m_window); } }
diff --git a/net/rtorrent/patches/patch-src_display_window__file__list.cc b/net/rtorrent/patches/patch-src_display_window__file__list.cc
deleted file mode 100644
index b4aa470054b..00000000000
--- a/net/rtorrent/patches/patch-src_display_window__file__list.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_display_window__file__list.cc,v 1.3 2013/09/18 16:33:08 joerg Exp $
-
---- src/display/window_file_list.cc.orig	2012-02-14 03:32:01.000000000 +0000
-+++ src/display/window_file_list.cc
-@@ -36,6 +36,7 @@
- 
- #include "config.h"
- 
-+#include <locale>
- #include <stdio.h>
- #include <torrent/path.h>
- #include <torrent/data/file.h>
diff --git a/net/rtorrent/patches/patch-src_main.cc b/net/rtorrent/patches/patch-src_main.cc
new file mode 100644
index 00000000000..0d38e70eae3
--- /dev/null
+++ b/net/rtorrent/patches/patch-src_main.cc
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_main.cc,v 1.1 2018/06/24 16:59:52 adam Exp $
+
+Fix handling of command line options.
+
+--- src/main.cc.orig	2018-06-07 04:25:26.000000000 +0000
++++ src/main.cc
+@@ -441,8 +441,6 @@ main(int argc, char** argv) {
+     }
+ #endif
+ 
+-    int firstArg = parse_options(argc, argv);
+-
+     if (OptionParser::has_flag('n', argc, argv)) {
+       lt_log_print(torrent::LOG_WARN, "Ignoring rtorrent.rc.");
+     } else {
+@@ -459,6 +457,8 @@ main(int argc, char** argv) {
+       }
+     }
+ 
++    int firstArg = parse_options(argc, argv);
++
+     control->initialize();
+ 
+     // Load session torrents and perform scheduled tasks to ensure
diff --git a/net/rtorrent/patches/patch-src_signal__handler.cc b/net/rtorrent/patches/patch-src_signal__handler.cc
deleted file mode 100644
index 02dca545ad9..00000000000
--- a/net/rtorrent/patches/patch-src_signal__handler.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_signal__handler.cc,v 1.3 2013/09/18 16:33:09 joerg Exp $
-
---- src/signal_handler.cc.orig	2012-03-29 13:06:11.000000000 +0000
-+++ src/signal_handler.cc
-@@ -38,6 +38,7 @@
- 
- #include <signal.h>
- #include <stdexcept>
-+#include <string>
- #include "rak/error_number.h"
- #include "signal_handler.h"
- 
diff --git a/net/rtorrent/patches/patch-ad b/net/rtorrent/patches/patch-src_utils_directory.cc
index dec98177771..b9b44bef6f5 100644
--- a/net/rtorrent/patches/patch-ad
+++ b/net/rtorrent/patches/patch-src_utils_directory.cc
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.5 2014/06/15 22:44:15 tron Exp $
+$NetBSD: patch-src_utils_directory.cc,v 1.1 2018/06/24 16:59:52 adam Exp $
 
 Fix build under DragonFly.
 
diff --git a/net/rtorrent/patches/patch-ae b/net/rtorrent/patches/patch-src_utils_directory.h
index f85a9f851b2..77913986b52 100644
--- a/net/rtorrent/patches/patch-ae
+++ b/net/rtorrent/patches/patch-src_utils_directory.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.3 2012/05/16 17:42:37 tron Exp $
+$NetBSD: patch-src_utils_directory.h,v 1.1 2018/06/24 16:59:52 adam Exp $
 
 Fix build under Solaris and DragonFly.