CVS commit: pkgsrc/net/rtorrent

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/rtorrent
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sun, 24 Jun 2018 16:59:53 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Jun 24 16:59:52 UTC 2018

Modified Files:
        pkgsrc/net/rtorrent: Makefile distinfo options.mk
Added Files:
        pkgsrc/net/rtorrent/patches: patch-src_display_canvas.h
            patch-src_main.cc patch-src_utils_directory.cc
            patch-src_utils_directory.h
Removed Files:
        pkgsrc/net/rtorrent/patches: patch-ad patch-ae patch-af patch-ag
            patch-src_display_window__file__list.cc
            patch-src_signal__handler.cc

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 pkgsrc/net/rtorrent/Makefile
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/rtorrent/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/rtorrent/options.mk
cvs rdiff -u -r1.5 -r0 pkgsrc/net/rtorrent/patches/patch-ad
cvs rdiff -u -r1.3 -r0 pkgsrc/net/rtorrent/patches/patch-ae \
    pkgsrc/net/rtorrent/patches/patch-src_display_window__file__list.cc \
    pkgsrc/net/rtorrent/patches/patch-src_signal__handler.cc
cvs rdiff -u -r1.4 -r0 pkgsrc/net/rtorrent/patches/patch-af
cvs rdiff -u -r1.6 -r0 pkgsrc/net/rtorrent/patches/patch-ag
cvs rdiff -u -r0 -r1.1 pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h \
    pkgsrc/net/rtorrent/patches/patch-src_main.cc \
    pkgsrc/net/rtorrent/patches/patch-src_utils_directory.cc \
    pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/rtorrent/Makefile
diff -u pkgsrc/net/rtorrent/Makefile:1.69 pkgsrc/net/rtorrent/Makefile:1.70
--- pkgsrc/net/rtorrent/Makefile:1.69   Sun Apr 29 21:32:00 2018
+++ pkgsrc/net/rtorrent/Makefile        Sun Jun 24 16:59:52 2018
@@ -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@localhost
-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
 

Index: pkgsrc/net/rtorrent/distinfo
diff -u pkgsrc/net/rtorrent/distinfo:1.36 pkgsrc/net/rtorrent/distinfo:1.37
--- pkgsrc/net/rtorrent/distinfo:1.36   Wed Nov  4 00:35:34 2015
+++ pkgsrc/net/rtorrent/distinfo        Sun Jun 24 16:59:52 2018
@@ -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

Index: pkgsrc/net/rtorrent/options.mk
diff -u pkgsrc/net/rtorrent/options.mk:1.1 pkgsrc/net/rtorrent/options.mk:1.2
--- pkgsrc/net/rtorrent/options.mk:1.1  Thu Jul 28 23:14:46 2011
+++ pkgsrc/net/rtorrent/options.mk      Sun Jun 24 16:59:52 2018
@@ -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

Added files:

Index: pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h
diff -u /dev/null pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h:1.1
--- /dev/null   Sun Jun 24 16:59:53 2018
+++ pkgsrc/net/rtorrent/patches/patch-src_display_canvas.h      Sun Jun 24 16:59:52 2018
@@ -0,0 +1,24 @@
+$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@localhost/msg18728.html
+
+--- 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
+ 
++#include <cstdarg>
+ #include <string>
+ #include <vector>
+ 
+@@ -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() { if (!m_isDaemon) { delwin(m_window); } }
+ 
+   void                refresh()                                               { if (!m_isDaemon) { wnoutrefresh(m_window); } }
Index: pkgsrc/net/rtorrent/patches/patch-src_main.cc
diff -u /dev/null pkgsrc/net/rtorrent/patches/patch-src_main.cc:1.1
--- /dev/null   Sun Jun 24 16:59:53 2018
+++ pkgsrc/net/rtorrent/patches/patch-src_main.cc       Sun Jun 24 16:59:52 2018
@@ -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
Index: pkgsrc/net/rtorrent/patches/patch-src_utils_directory.cc
diff -u /dev/null pkgsrc/net/rtorrent/patches/patch-src_utils_directory.cc:1.1
--- /dev/null   Sun Jun 24 16:59:53 2018
+++ pkgsrc/net/rtorrent/patches/patch-src_utils_directory.cc    Sun Jun 24 16:59:52 2018
@@ -0,0 +1,39 @@
+$NetBSD: patch-src_utils_directory.cc,v 1.1 2018/06/24 16:59:52 adam Exp $
+
+Fix build under DragonFly.
+
+--- src/utils/directory.cc.orig        2014-04-21 14:34:45.000000000 +0100
++++ src/utils/directory.cc     2014-06-15 21:07:36.000000000 +0100
+@@ -44,6 +44,10 @@
+ #include <rak/path.h>
+ #include <torrent/exceptions.h>
+ 
++#ifdef __DragonFly__
++#define d_reclen d_namlen
++#endif
++
+ #include "directory.h"
+ 
+ namespace utils {
+@@ -54,7 +58,9 @@
+   if (m_path.empty())
+     return false;
+ 
+-  DIR* d = opendir(rak::path_expand(m_path).c_str());
++  std::string path=rak::path_expand(m_path);
++
++  DIR* d = opendir(path.c_str());
+   closedir(d);
+ 
+   return d;
+@@ -65,7 +71,9 @@
+   if (m_path.empty())
+     throw torrent::input_error("Directory::update() tried to open an empty path.");
+ 
+-  DIR* d = opendir(rak::path_expand(m_path).c_str());
++  std::string path=rak::path_expand(m_path);
++
++  DIR* d = opendir(path.c_str());
+ 
+   if (d == NULL)
+     return false;
Index: pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h
diff -u /dev/null pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h:1.1
--- /dev/null   Sun Jun 24 16:59:53 2018
+++ pkgsrc/net/rtorrent/patches/patch-src_utils_directory.h     Sun Jun 24 16:59:52 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_utils_directory.h,v 1.1 2018/06/24 16:59:52 adam Exp $
+
+Fix build under Solaris and DragonFly.
+
+--- src/utils/directory.h.orig 2012-03-29 14:06:11.000000000 +0100
++++ src/utils/directory.h      2012-05-14 23:40:30.000000000 +0100
+@@ -50,7 +50,7 @@
+   // The name and types should match POSIX.
+   uint32_t            d_fileno;
+   uint32_t            d_reclen; //Not used. Messes with Solaris.
+-  uint8_t             d_type;
++  uint32_t             d_type;
+ 
+   std::string         d_name;
+ };

Prev by Date: CVS commit: pkgsrc/net/libtorrent
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/net/libtorrent
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index