diff -Nru btfs-2.11/configure.ac btfs-2.12/configure.ac --- btfs-2.11/configure.ac 2016-08-07 17:27:31.000000000 +0000 +++ btfs-2.12/configure.ac 2016-09-15 16:54:05.000000000 +0000 @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT(btfs, 2.11, johan.gunnarsson@gmail.com, btfs, https://github.com/johang/btfs) +AC_INIT(btfs, 2.12, johan.gunnarsson@gmail.com, btfs, https://github.com/johang/btfs) AC_CONFIG_SRCDIR([src/btfs.cc]) AM_INIT_AUTOMAKE diff -Nru btfs-2.11/debian/changelog btfs-2.12/debian/changelog --- btfs-2.11/debian/changelog 2016-11-01 16:04:41.000000000 +0000 +++ btfs-2.12/debian/changelog 2016-11-04 16:25:46.000000000 +0000 @@ -1,8 +1,10 @@ -btfs (2.11-1build1) zesty; urgency=high +btfs (2.12-1) unstable; urgency=medium - * No change rebuild against boost1.62. + * New upstream release + * Remove grammar patch that has been accepted upstream + * Bump compat to 10 - -- Dimitri John Ledkov Tue, 01 Nov 2016 16:04:41 +0000 + -- Jonathan Carter Fri, 04 Nov 2016 18:25:46 +0200 btfs (2.11-1) unstable; urgency=medium diff -Nru btfs-2.11/debian/compat btfs-2.12/debian/compat --- btfs-2.11/debian/compat 2016-07-30 10:23:55.000000000 +0000 +++ btfs-2.12/debian/compat 2016-11-04 16:25:46.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru btfs-2.11/debian/control btfs-2.12/debian/control --- btfs-2.11/debian/control 2016-11-01 16:04:41.000000000 +0000 +++ btfs-2.12/debian/control 2016-11-04 16:25:46.000000000 +0000 @@ -1,10 +1,8 @@ Source: btfs Section: utils Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Jonathan Carter -Build-Depends: debhelper (>= 9), - dh-autoreconf, +Maintainer: Jonathan Carter +Build-Depends: debhelper (>= 10), libcurl4-openssl-dev, libfuse-dev, libtorrent-rasterbar-dev diff -Nru btfs-2.11/debian/copyright btfs-2.12/debian/copyright --- btfs-2.11/debian/copyright 2016-07-30 10:23:55.000000000 +0000 +++ btfs-2.12/debian/copyright 2016-11-04 16:25:46.000000000 +0000 @@ -3,7 +3,7 @@ Source: https://github.com/johang/btfs Files: * -Copyright: 2015 Johan Gunnarsson +Copyright: 2016 Johan Gunnarsson License: GPL-3+ This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru btfs-2.11/debian/patches/fix-grammar-mistake btfs-2.12/debian/patches/fix-grammar-mistake --- btfs-2.11/debian/patches/fix-grammar-mistake 2016-07-30 10:23:55.000000000 +0000 +++ btfs-2.12/debian/patches/fix-grammar-mistake 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -Description: fix-grammar-mistake - Replace "allows to" with "allows one to" as suggested by lintian. - . - btfs (2.11-1) unstable; urgency=medium - . - * New upstream release -Author: Jonathan Carter - ---- - -Last-Update: 2016-09-10 - ---- btfs-2.11.orig/man/btfs.1 -+++ btfs-2.11/man/btfs.1 -@@ -8,7 +8,7 @@ btfs \- mount torrent files or magnet li - \fBmountpoint\fP - .SH DESCRIPTION - .B btfs --allows to mount any torrent file or a magnet link as a file -+allows one to mount any torrent file or a magnet link as a file - system. The contents of the files will be downloaded on-demand - as they are read by applications. - .SH OPTIONS diff -Nru btfs-2.11/debian/patches/series btfs-2.12/debian/patches/series --- btfs-2.11/debian/patches/series 2016-07-30 10:23:55.000000000 +0000 +++ btfs-2.12/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -fix-grammar-mistake diff -Nru btfs-2.11/debian/rules btfs-2.12/debian/rules --- btfs-2.11/debian/rules 2016-07-30 10:23:55.000000000 +0000 +++ btfs-2.12/debian/rules 2016-11-04 16:25:46.000000000 +0000 @@ -3,4 +3,4 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: - dh $@ --with autoreconf + dh $@ diff -Nru btfs-2.11/man/btfs.1 btfs-2.12/man/btfs.1 --- btfs-2.11/man/btfs.1 2016-08-07 17:27:31.000000000 +0000 +++ btfs-2.12/man/btfs.1 2016-09-15 16:54:05.000000000 +0000 @@ -8,7 +8,7 @@ \fBmountpoint\fP .SH DESCRIPTION .B btfs -allows to mount any torrent file or a magnet link as a file +allows one to mount any torrent file or a magnet link as a file system. The contents of the files will be downloaded on-demand as they are read by applications. .SH OPTIONS @@ -24,6 +24,18 @@ .TP \fB\-k\fR \fB\-\-keep\fR keep files after unmount +.TP +\fB\-\-min-port=\fIPORT\fR +start of listen port range +.TP +\fB\-\-max-port=\fIPORT\fR +end of listen port range +.TP +\fB\-\-max-download-rate=\fIRATE\fR +maximum download rate (in kilobytes per second) +.TP +\fB\-\-max-upload-rate=\fIRATE\fR +maximum upload rate (in kilobytes per second) .SH EXAMPLES mounting a torrent file: btfs video.torrent ~/mnt diff -Nru btfs-2.11/src/btfs.cc btfs-2.12/src/btfs.cc --- btfs-2.11/src/btfs.cc 2016-08-07 17:27:31.000000000 +0000 +++ btfs-2.12/src/btfs.cc 2016-09-15 16:54:05.000000000 +0000 @@ -69,6 +69,9 @@ pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER; pthread_cond_t signal_cond = PTHREAD_COND_INITIALIZER; +// Time used as "last modified" time +time_t time_of_mount; + static struct btfs_params params; static bool @@ -343,7 +346,9 @@ break; } +#if LIBTORRENT_VERSION_NUM < 10100 delete a; +#endif } @@ -415,6 +420,7 @@ stbuf->st_uid = getuid(); stbuf->st_gid = getgid(); + stbuf->st_mtime = time_of_mount; if (strcmp(path, "/") == 0 || is_dir(path)) { stbuf->st_mode = S_IFDIR | 0755; @@ -514,6 +520,8 @@ btfs_init(struct fuse_conn_info *conn) { pthread_mutex_lock(&lock); + time_of_mount = time(NULL); + libtorrent::add_torrent_params *p = (libtorrent::add_torrent_params *) fuse_get_context()->private_data; @@ -584,12 +592,12 @@ pack.set_int(pack.upload_rate_limit, params.max_upload_rate * 1024); pack.set_int(pack.alert_mask, alerts); - libtorrent::session session(pack, flags); + session = new libtorrent::session(pack, flags); - session.add_dht_router(std::make_pair("router.bittorrent.com", 6881)); - session.add_dht_router(std::make_pair("router.utorrent.com", 6881)); - session.add_dht_router(std::make_pair("dht.transmissionbt.com", 6881)); - session.add_torrent(*p); + session->add_dht_router(std::make_pair("router.bittorrent.com", 6881)); + session->add_dht_router(std::make_pair("router.utorrent.com", 6881)); + session->add_dht_router(std::make_pair("dht.transmissionbt.com", 6881)); + session->add_torrent(*p); #endif pthread_create(&alert_thread, NULL, alert_queue_loop, @@ -823,8 +831,8 @@ params.help = 1; if (params.version) { - // Print version printf(PACKAGE " version: " VERSION "\n"); + printf("libtorrent version: " LIBTORRENT_VERSION "\n"); // Let FUSE print more versions fuse_opt_add_arg(&args, "--version"); diff -Nru btfs-2.11/src/btfs.h btfs-2.12/src/btfs.h --- btfs-2.11/src/btfs.h 2016-08-07 17:27:31.000000000 +0000 +++ btfs-2.12/src/btfs.h 2016-09-15 16:54:05.000000000 +0000 @@ -106,11 +106,6 @@ std::string path; }; -enum { - KEY_VERSION, - KEY_HELP, -}; - struct btfs_params { int version; int help;