commit btfs for openSUSE:Factory
Hello community, here is the log from the commit of package btfs for openSUSE:Factory checked in at 2020-09-29 19:02:55 Comparing /work/SRC/openSUSE:Factory/btfs (Old) and /work/SRC/openSUSE:Factory/.btfs.new.4249 (New) Package is "btfs" Tue Sep 29 19:02:55 2020 rev:8 rq:838338 version:2.22 Changes: --- /work/SRC/openSUSE:Factory/btfs/btfs.changes2020-08-18 15:11:04.820041396 +0200 +++ /work/SRC/openSUSE:Factory/.btfs.new.4249/btfs.changes 2020-09-29 19:03:01.873862979 +0200 @@ -1,0 +2,6 @@ +Fri Sep 11 08:49:01 UTC 2020 - Luigi Baldoni + +- Fix build with libtorrent v2. +- Spec cleanup + +--- Old: v2.22.tar.gz New: btfs-2.22.tar.gz Other differences: -- ++ btfs.spec ++ --- /var/tmp/diff_new_pack.IjpqF8/_old 2020-09-29 19:03:02.525863771 +0200 +++ /var/tmp/diff_new_pack.IjpqF8/_new 2020-09-29 19:03:02.529863776 +0200 @@ -22,7 +22,7 @@ Summary:A BitTorrent file system based on FUSE License:GPL-3.0-or-later URL:https://github.com/johang/%{name} -Source: https://github.com/johang/%{name}/archive/v%{version}.tar.gz +Source: https://github.com/johang/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake BuildRequires: c++_compiler @@ -39,10 +39,11 @@ cp work as expected. Applications like media players can also work without changes. %prep -%setup -q +%autosetup -p1 sed -i 's,env python,python,' scripts/btplay %build +export CXXFLAGS="-std=c++14" autoreconf -fi %configure %make_build
commit btfs for openSUSE:Factory
Hello community, here is the log from the commit of package btfs for openSUSE:Factory checked in at 2020-08-18 15:10:59 Comparing /work/SRC/openSUSE:Factory/btfs (Old) and /work/SRC/openSUSE:Factory/.btfs.new.3399 (New) Package is "btfs" Tue Aug 18 15:10:59 2020 rev:7 rq:827076 version:2.22 Changes: --- /work/SRC/openSUSE:Factory/btfs/btfs.changes2019-08-29 17:24:26.923298193 +0200 +++ /work/SRC/openSUSE:Factory/.btfs.new.3399/btfs.changes 2020-08-18 15:11:04.820041396 +0200 @@ -1,0 +2,11 @@ +Thu Aug 13 06:22:14 UTC 2020 - Paolo Stivanin + +- 2.22 + * bug fixes + +--- +Thu Oct 17 15:01:10 UTC 2019 - Richard Brown + +- Remove obsolete Groups tag (fate#326485) + +--- Old: v2.20.tar.gz New: v2.22.tar.gz Other differences: -- ++ btfs.spec ++ --- /var/tmp/diff_new_pack.RzGCzy/_old 2020-08-18 15:11:05.808041805 +0200 +++ /var/tmp/diff_new_pack.RzGCzy/_new 2020-08-18 15:11:05.812041806 +0200 @@ -1,7 +1,7 @@ # # spec file for package btfs # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,11 +17,10 @@ Name: btfs -Version:2.20 +Version:2.22 Release:0 Summary:A BitTorrent file system based on FUSE License:GPL-3.0-or-later -Group: Productivity/Networking/File-Sharing URL:https://github.com/johang/%{name} Source: https://github.com/johang/%{name}/archive/v%{version}.tar.gz BuildRequires: autoconf ++ v2.20.tar.gz -> v2.22.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.20/.travis.yml new/btfs-2.22/.travis.yml --- old/btfs-2.20/.travis.yml 2019-08-28 19:44:37.0 +0200 +++ new/btfs-2.22/.travis.yml 2020-08-11 00:30:26.0 +0200 @@ -2,9 +2,11 @@ matrix: include: - os: linux - env: LIBTORRENT_BRANCH=RC_1_2 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" + dist: bionic + env: LIBTORRENT_BRANCH=RC_1_2 TOOLCHAIN="CXX=g++-10 CC=gcc-10 CPP=cpp-10" - os: linux - env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" + dist: bionic + env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-10 CC=gcc-10 CPP=cpp-10" - os: osx env: LIBTORRENT_BRANCH=RC_1_2 - os: osx @@ -22,7 +24,7 @@ - libboost-all-dev - libfuse-dev - libcurl4-openssl-dev - - g++-8 + - g++-10 before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.20/configure.ac new/btfs-2.22/configure.ac --- old/btfs-2.20/configure.ac 2019-08-28 19:44:37.0 +0200 +++ new/btfs-2.22/configure.ac 2020-08-11 00:30:26.0 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT(btfs, 2.20, johan.gunnars...@gmail.com, btfs, https://github.com/johang/btfs) +AC_INIT(btfs, 2.22, johan.gunnars...@gmail.com, btfs, https://github.com/johang/btfs) AC_CONFIG_SRCDIR([src/btfs.cc]) AM_INIT_AUTOMAKE @@ -22,4 +22,7 @@ # Check for unportable pthread_setname_np() AC_CHECK_LIB(pthread, pthread_setname_np) +# Check if -latomic is needed. +AC_SEARCH_LIBS(__atomic_load, atomic) + AC_OUTPUT(Makefile src/Makefile scripts/Makefile man/Makefile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.20/src/btfs.cc new/btfs-2.22/src/btfs.cc --- old/btfs-2.20/src/btfs.cc 2019-08-28 19:44:37.0 +0200 +++ new/btfs-2.22/src/btfs.cc 2020-08-11 00:30:26.0 +0200 @@ -533,6 +533,9 @@ static int btfs_statfs(const char *path, struct statvfs *stbuf) { + if (!handle.is_valid()) + return -ENOENT; + libtorrent::torrent_status st = handle.status(); if (!st.has_metadata) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.20/src/btfsstat.cc new/btfs-2.22/src/btfsstat.cc --- old/btfs-2.20/src/btfsstat.cc 2019-08-28 19:44:37.0 +0200 +++ new/btfs-2.22/src/btfsstat.cc 2020-08-11 00:30:26.0 +0200 @@ -71,8 +71,13 @@ } } else if (S_ISREG(s.st_mode)) { // Download progress for this file (in percent) - long progress = lround((100.0 * 512.0 * (double) s.st_blocks) / - (double) s.st_size); + long progress; + + if (s.st_si
commit btfs for openSUSE:Factory
Hello community, here is the log from the commit of package btfs for openSUSE:Factory checked in at 2019-08-29 17:24:25 Comparing /work/SRC/openSUSE:Factory/btfs (Old) and /work/SRC/openSUSE:Factory/.btfs.new.7948 (New) Package is "btfs" Thu Aug 29 17:24:25 2019 rev:6 rq:726824 version:2.20 Changes: --- /work/SRC/openSUSE:Factory/btfs/btfs.changes2019-04-15 11:52:57.962574920 +0200 +++ /work/SRC/openSUSE:Factory/.btfs.new.7948/btfs.changes 2019-08-29 17:24:26.923298193 +0200 @@ -1,0 +2,6 @@ +Wed Aug 28 19:04:07 UTC 2019 - Martin Herkt <9+suse@cirno.systems> + +- 2.20 + * btplay: Change shebang to python3 + +--- Old: v2.19.tar.gz New: v2.20.tar.gz Other differences: -- ++ btfs.spec ++ --- /var/tmp/diff_new_pack.UImRoN/_old 2019-08-29 17:24:27.655298071 +0200 +++ /var/tmp/diff_new_pack.UImRoN/_new 2019-08-29 17:24:27.659298070 +0200 @@ -17,7 +17,7 @@ Name: btfs -Version:2.19 +Version:2.20 Release:0 Summary:A BitTorrent file system based on FUSE License:GPL-3.0-or-later ++ v2.19.tar.gz -> v2.20.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.19/.travis.yml new/btfs-2.20/.travis.yml --- old/btfs-2.19/.travis.yml 2019-03-21 21:29:07.0 +0100 +++ new/btfs-2.20/.travis.yml 2019-08-28 19:44:37.0 +0200 @@ -2,22 +2,13 @@ matrix: include: - os: linux - env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" + env: LIBTORRENT_BRANCH=RC_1_2 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" - os: linux env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" -- os: linux - env: LIBTORRENT_BRANCH=RC_1_0 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" - os: osx - env: LIBTORRENT_BRANCH=master + env: LIBTORRENT_BRANCH=RC_1_2 - os: osx env: LIBTORRENT_BRANCH=RC_1_1 -- os: osx - env: LIBTORRENT_BRANCH=RC_1_0 - allow_failures: -- os: linux - env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" -- os: osx - env: LIBTORRENT_BRANCH=master env: global: - MAKEFLAGS=-j2 @@ -26,11 +17,9 @@ addons: apt: sources: - - boost-latest - ubuntu-toolchain-r-test packages: - - libboost1.55-all-dev - - libboost1.55-tools-dev + - libboost-all-dev - libfuse-dev - libcurl4-openssl-dev - g++-8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.19/configure.ac new/btfs-2.20/configure.ac --- old/btfs-2.19/configure.ac 2019-03-21 21:29:07.0 +0100 +++ new/btfs-2.20/configure.ac 2019-08-28 19:44:37.0 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT(btfs, 2.18, johan.gunnars...@gmail.com, btfs, https://github.com/johang/btfs) +AC_INIT(btfs, 2.20, johan.gunnars...@gmail.com, btfs, https://github.com/johang/btfs) AC_CONFIG_SRCDIR([src/btfs.cc]) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.19/scripts/btplay new/btfs-2.20/scripts/btplay --- old/btfs-2.19/scripts/btplay2019-03-21 21:29:07.0 +0100 +++ new/btfs-2.20/scripts/btplay2019-08-28 19:44:37.0 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2015 Johan Gunnarsson # # This file is part of BTFS.
commit btfs for openSUSE:Factory
Hello community, here is the log from the commit of package btfs for openSUSE:Factory checked in at 2019-04-15 11:52:52 Comparing /work/SRC/openSUSE:Factory/btfs (Old) and /work/SRC/openSUSE:Factory/.btfs.new.17052 (New) Package is "btfs" Mon Apr 15 11:52:52 2019 rev:5 rq:694069 version:2.19 Changes: --- /work/SRC/openSUSE:Factory/btfs/btfs.changes2017-11-27 22:19:06.245125671 +0100 +++ /work/SRC/openSUSE:Factory/.btfs.new.17052/btfs.changes 2019-04-15 11:52:57.962574920 +0200 @@ -1,0 +2,7 @@ +Sun Apr 14 16:27:17 UTC 2019 - Martin Herkt <9+suse@cirno.systems> + +- Modernize spec file +- 2.19 + * Add option to set data directory + +--- Old: _service v2.18.tar.gz New: v2.19.tar.gz Other differences: -- ++ btfs.spec ++ --- /var/tmp/diff_new_pack.Hi8b2y/_old 2019-04-15 11:52:59.898576302 +0200 +++ /var/tmp/diff_new_pack.Hi8b2y/_new 2019-04-15 11:52:59.898576302 +0200 @@ -1,7 +1,7 @@ # # spec file for package btfs # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: btfs -Version:2.18 +Version:2.19 Release:0 Summary:A BitTorrent file system based on FUSE -License:GPL-3.0 +License:GPL-3.0-or-later Group: Productivity/Networking/File-Sharing -Url:https://github.com/johang/%{name} +URL:https://github.com/johang/%{name} Source: https://github.com/johang/%{name}/archive/v%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake -BuildRequires: gcc +BuildRequires: c++_compiler BuildRequires: libboost_system-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(fuse) @@ -41,19 +41,20 @@ %prep %setup -q +sed -i 's,env python,python,' scripts/btplay %build autoreconf -fi %configure -make %{?_smp_mflags} V=1 +%make_build %install %make_install V=1 %files -%defattr(-,root,root) -%doc LICENSE README.md -%{_mandir}/man1/%{name}.1%{ext_man} +%doc README.md +%license LICENSE +%{_mandir}/man1/%{name}.1%{?ext_man} %{_bindir}/btfs %{_bindir}/btplay %{_bindir}/btfsstat ++ v2.18.tar.gz -> v2.19.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.18/.travis.yml new/btfs-2.19/.travis.yml --- old/btfs-2.18/.travis.yml 2017-11-25 12:40:12.0 +0100 +++ new/btfs-2.19/.travis.yml 2019-03-21 21:29:07.0 +0100 @@ -2,11 +2,11 @@ matrix: include: - os: linux - env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7" + env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" - os: linux - env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7" + env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" - os: linux - env: LIBTORRENT_BRANCH=RC_1_0 TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7" + env: LIBTORRENT_BRANCH=RC_1_0 TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" - os: osx env: LIBTORRENT_BRANCH=master - os: osx @@ -15,7 +15,7 @@ env: LIBTORRENT_BRANCH=RC_1_0 allow_failures: - os: linux - env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7" + env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-8 CC=gcc-8 CPP=cpp-8" - os: osx env: LIBTORRENT_BRANCH=master env: @@ -33,7 +33,7 @@ - libboost1.55-tools-dev - libfuse-dev - libcurl4-openssl-dev - - g++-7 + - g++-8 before_install: - if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.18/README.md new/btfs-2.19/README.md --- old/btfs-2.18/README.md 2017-11-25 12:40:12.0 +0100 +++ new/btfs-2.19/README.md 2019-03-21 21:29:07.0 +0100 @@ -17,19 +17,19 @@ ## Installing on Debian/Ubuntu -$ sudo apt-get install btfs +# apt-get install btfs ## Installing on Arch Linux -$ sudo pacman -S btfs +# pacman -S btfs ## Installing on Gentoo # emerge -av btfs -## Installing on OS X +## Installing on macOS -BTFS has a formula in the [`homebrew/homebrew-core`](https://
commit btfs for openSUSE:Factory
Hello community, here is the log from the commit of package btfs for openSUSE:Factory checked in at 2017-11-27 22:19:06 Comparing /work/SRC/openSUSE:Factory/btfs (Old) and /work/SRC/openSUSE:Factory/.btfs.new (New) Package is "btfs" Mon Nov 27 22:19:06 2017 rev:4 rq:546040 version:2.18 Changes: --- /work/SRC/openSUSE:Factory/btfs/btfs.changes2017-09-12 19:54:19.336126341 +0200 +++ /work/SRC/openSUSE:Factory/.btfs.new/btfs.changes 2017-11-27 22:19:06.245125671 +0100 @@ -1,0 +2,11 @@ +Mon Nov 27 14:19:04 UTC 2017 - 9@cirno.systems + +- 2.18 + * Force DHT announce when bootstrap completes + * Don't set file priority to 0 at start + * Fix delete-on-unmount + * Remove unneeded debug prints + * Fix a potential null pointer deref + * Silence warning on libtorrent 1.2 + +--- Old: v2.17.tar.gz New: v2.18.tar.gz Other differences: -- ++ btfs.spec ++ --- /var/tmp/diff_new_pack.XEAZvQ/_old 2017-11-27 22:19:06.781106218 +0100 +++ /var/tmp/diff_new_pack.XEAZvQ/_new 2017-11-27 22:19:06.781106218 +0100 @@ -17,7 +17,7 @@ Name: btfs -Version:2.17 +Version:2.18 Release:0 Summary:A BitTorrent file system based on FUSE License:GPL-3.0 ++ v2.17.tar.gz -> v2.18.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.17/src/btfs.cc new/btfs-2.18/src/btfs.cc --- old/btfs-2.17/src/btfs.cc 2017-09-10 20:35:47.0 +0200 +++ new/btfs-2.18/src/btfs.cc 2017-11-25 12:40:12.0 +0100 @@ -99,15 +99,9 @@ cursor = tail; - int pl = ti->piece_length(); - - for (int b = 0; b < 16 * pl; b += pl) { + for (int i = 0; i < 16; i++) { handle.piece_priority(tail++, 7); } - - for (int o = (tail - piece) * pl; o < size + pl - 1; o += pl) { - handle.piece_priority(tail++, 1); - } } static void @@ -211,9 +205,6 @@ handle.pause(); for (int i = 0; i < ti->num_files(); ++i) { - // Initially, don't download anything - handle.file_priority(i, 0); - std::string parent(""); #if LIBTORRENT_VERSION_NUM < 10100 @@ -222,6 +213,9 @@ char *p = strdup(ti->files().file_path(i).c_str()); #endif + if (!p) + continue; + for (char *x = strtok(p, "/"); x; x = strtok(NULL, "/")) { if (strlen(x) <= 0) continue; @@ -250,7 +244,8 @@ static void handle_read_piece_alert(libtorrent::read_piece_alert *a, Log *log) { - printf("%s: piece %d size %d\n", __func__, a->piece, a->size); + printf("%s: piece %d size %d\n", __func__, static_cast(a->piece), + a->size); pthread_mutex_lock(&lock); @@ -274,7 +269,7 @@ static void handle_piece_finished_alert(libtorrent::piece_finished_alert *a, Log *log) { - printf("%s: %d\n", __func__, a->piece_index); + printf("%s: %d\n", __func__, static_cast(a->piece_index)); pthread_mutex_lock(&lock); @@ -290,8 +285,6 @@ static void handle_torrent_added_alert(libtorrent::torrent_added_alert *a, Log *log) { - //printf("%s()\n", __func__); - pthread_mutex_lock(&lock); handle = a->handle; @@ -305,8 +298,6 @@ static void handle_metadata_received_alert(libtorrent::metadata_received_alert *a, Log *log) { - //printf("%s\n", __func__); - pthread_mutex_lock(&lock); handle = a->handle; @@ -338,14 +329,18 @@ handle_torrent_added_alert( (libtorrent::torrent_added_alert *) a, log); break; + case libtorrent::dht_bootstrap_alert::alert_type: + *log << a->message() << std::endl; + // Force DHT announce because libtorrent won't by itself + handle.force_dht_announce(); + break; + case libtorrent::dht_announce_alert::alert_type: + case libtorrent::dht_reply_alert::alert_type: case libtorrent::metadata_failed_alert::alert_type: case libtorrent::tracker_announce_alert::alert_type: case libtorrent::tracker_reply_alert::alert_type: case libtorrent::tracker_warning_alert::alert_type: case libtorrent::tracker_error_alert::alert_type: - case libtorrent::dht_bootstrap_alert::alert_type: - case libtorrent::dht_announce_alert::alert_type: - case libtorrent::dht_reply_alert::alert_type: case libtorrent::lsd_peer_alert::alert_type: *log << a->message() << std::endl;
commit btfs for openSUSE:Factory
Hello community, here is the log from the commit of package btfs for openSUSE:Factory checked in at 2017-09-12 19:54:18 Comparing /work/SRC/openSUSE:Factory/btfs (Old) and /work/SRC/openSUSE:Factory/.btfs.new (New) Package is "btfs" Tue Sep 12 19:54:18 2017 rev:3 rq:522946 version:2.17 Changes: --- /work/SRC/openSUSE:Factory/btfs/btfs.changes2017-08-24 18:56:31.886507354 +0200 +++ /work/SRC/openSUSE:Factory/.btfs.new/btfs.changes 2017-09-12 19:54:19.336126341 +0200 @@ -1,0 +2,13 @@ +Mon Sep 11 05:08:25 UTC 2017 - 9@cirno.systems + +- 2.17 + * Adjust to libtorrent 1.2 API changes ++ Session flags changed type. ++ Remove flags changed type. + * Silence warning about deprecated flags in libtorrent 1.2 + * Tweak configure.ac + * Handle read_piece_alert errors ++ Fixes segfault, upstream bug #42 + * Set request timeout + +--- Old: v2.16.tar.gz New: v2.17.tar.gz Other differences: -- ++ btfs.spec ++ --- /var/tmp/diff_new_pack.NU0Ep7/_old 2017-09-12 19:54:21.795780498 +0200 +++ /var/tmp/diff_new_pack.NU0Ep7/_new 2017-09-12 19:54:21.799779937 +0200 @@ -17,7 +17,7 @@ Name: btfs -Version:2.16 +Version:2.17 Release:0 Summary:A BitTorrent file system based on FUSE License:GPL-3.0 ++ v2.16.tar.gz -> v2.17.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.16/configure.ac new/btfs-2.17/configure.ac --- old/btfs-2.16/configure.ac 2017-08-23 18:12:29.0 +0200 +++ new/btfs-2.17/configure.ac 2017-09-10 20:35:47.0 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT(btfs, 2.16, johan.gunnars...@gmail.com, btfs, https://github.com/johang/btfs) +AC_INIT(btfs, 2.17, johan.gunnars...@gmail.com, btfs, https://github.com/johang/btfs) AC_CONFIG_SRCDIR([src/btfs.cc]) AM_INIT_AUTOMAKE @@ -7,10 +7,6 @@ # Checks for programs. AC_PROG_CXX -AC_CONFIG_FILES([ - man/Makefile -]) - # Checks for libraries. PKG_CHECK_MODULES(FUSE, fuse >= 2.8.0) PKG_CHECK_MODULES(LIBTORRENT, libtorrent-rasterbar >= 1.0.0) @@ -21,9 +17,9 @@ AC_TYPE_SIZE_T # Checks for library functions. -AC_CHECK_FUNCS([memset mkdir realpath strdup]) +AC_CHECK_FUNCS([memset memcpy strcmp mkdir strdup realpath getxattr dirname basename]) # Check for unportable pthread_setname_np() AC_CHECK_LIB(pthread, pthread_setname_np) -AC_OUTPUT(Makefile src/Makefile scripts/Makefile) +AC_OUTPUT(Makefile src/Makefile scripts/Makefile man/Makefile) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.16/src/btfs.cc new/btfs-2.17/src/btfs.cc --- old/btfs-2.16/src/btfs.cc 2017-08-23 18:12:29.0 +0200 +++ new/btfs-2.17/src/btfs.cc 2017-09-10 20:35:47.0 +0200 @@ -140,6 +140,13 @@ } } +void Read::fail(int piece) { + for (parts_iter i = parts.begin(); i != parts.end(); ++i) { + if (i->part.piece == piece && !i->filled) + failed = true; + } +} + void Read::copy(int piece, char *buffer, int size) { for (parts_iter i = parts.begin(); i != parts.end(); ++i) { if (i->part.piece == piece && !i->filled) @@ -184,11 +191,14 @@ // Move sliding window to first piece to serve this request jump(parts.front().part.piece, size()); - while (!finished()) + while (!finished() && !failed) // Wait for any piece to downloaded pthread_cond_wait(&signal_cond, &lock); - return size(); + if (failed) + return -EIO; + else + return size(); } static void @@ -244,8 +254,16 @@ pthread_mutex_lock(&lock); - for (reads_iter i = reads.begin(); i != reads.end(); ++i) { - (*i)->copy(a->piece, a->buffer.get(), a->size); + if (a->ec) { + *log << a->message() << std::endl; + + for (reads_iter i = reads.begin(); i != reads.end(); ++i) { + (*i)->fail(a->piece); + } + } else { + for (reads_iter i = reads.begin(); i != reads.end(); ++i) { + (*i)->copy(a->piece, a->buffer.get(), a->size); + } } pthread_mutex_unlock(&lock); @@ -549,7 +567,11 @@ libtorrent::add_torrent_params *p = (libtorrent::add_torrent_params *) fuse_get_context()->private_data; +#if LIBTORRENT_VERSION_NUM < 10200 int flags = +#else + libtorrent::session_flags_t flags = +#endif libtorrent::session::add_default_plugins | libtorrent::s
commit btfs for openSUSE:Factory
Hello community, here is the log from the commit of package btfs for openSUSE:Factory checked in at 2017-08-24 18:56:03 Comparing /work/SRC/openSUSE:Factory/btfs (Old) and /work/SRC/openSUSE:Factory/.btfs.new (New) Package is "btfs" Thu Aug 24 18:56:03 2017 rev:2 rq:518425 version:2.16 Changes: --- /work/SRC/openSUSE:Factory/btfs/btfs.changes2017-08-18 15:02:50.111407307 +0200 +++ /work/SRC/openSUSE:Factory/.btfs.new/btfs.changes 2017-08-24 18:56:31.886507354 +0200 @@ -1,0 +2,8 @@ +Wed Aug 23 17:09:41 UTC 2017 - 9@cirno.systems + +- 2.16 + * Implement listxattr and getxattr + * Return IS_BTFS xattr on all files and directories + * Add btfsstat program + +--- Old: v2.15.tar.gz New: v2.16.tar.gz Other differences: -- ++ btfs.spec ++ --- /var/tmp/diff_new_pack.oAP4NL/_old 2017-08-24 18:56:32.586408802 +0200 +++ /var/tmp/diff_new_pack.oAP4NL/_new 2017-08-24 18:56:32.586408802 +0200 @@ -17,7 +17,7 @@ Name: btfs -Version:2.15 +Version:2.16 Release:0 Summary:A BitTorrent file system based on FUSE License:GPL-3.0 @@ -27,11 +27,11 @@ BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc +BuildRequires: libboost_system-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libtorrent-rasterbar) > 0.16 -BuildRequires: libboost_system-devel %description With BTFS, you can mount any .torrent file or magnet link and then use it as @@ -56,5 +56,6 @@ %{_mandir}/man1/%{name}.1%{ext_man} %{_bindir}/btfs %{_bindir}/btplay +%{_bindir}/btfsstat %changelog ++ v2.15.tar.gz -> v2.16.tar.gz ++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.15/.gitignore new/btfs-2.16/.gitignore --- old/btfs-2.15/.gitignore2017-08-04 09:12:07.0 +0200 +++ new/btfs-2.16/.gitignore2017-08-23 18:12:29.0 +0200 @@ -1,5 +1,6 @@ *.o btfs +btfsstat # generated files Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.15/.travis.yml new/btfs-2.16/.travis.yml --- old/btfs-2.15/.travis.yml 2017-08-04 09:12:07.0 +0200 +++ new/btfs-2.16/.travis.yml 2017-08-23 18:12:29.0 +0200 @@ -2,22 +2,22 @@ matrix: include: - os: linux - env: LIBTORRENT_BRANCH=master BUILDENV="CXX=g++-7 CC=gcc-7 CPP=cpp-7 CXXFLAGS=-fpermissive" + env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7" - os: linux - env: LIBTORRENT_BRANCH=RC_1_1 BUILDENV="CXX=g++-7 CC=gcc-7 CPP=cpp-7 CXXFLAGS=-fpermissive" + env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7" - os: linux - env: LIBTORRENT_BRANCH=RC_1_0 BUILDENV="CXX=g++-7 CC=gcc-7 CPP=cpp-7 CXXFLAGS=-fpermissive" + env: LIBTORRENT_BRANCH=RC_1_0 TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7" - os: osx - env: LIBTORRENT_BRANCH=master BUILDENV="CXXFLAGS=-std=c++11" + env: LIBTORRENT_BRANCH=master - os: osx - env: LIBTORRENT_BRANCH=RC_1_1 BUILDENV="CXXFLAGS=-std=c++11" + env: LIBTORRENT_BRANCH=RC_1_1 - os: osx - env: LIBTORRENT_BRANCH=RC_1_0 BUILDENV="CXXFLAGS=-std=c++11" + env: LIBTORRENT_BRANCH=RC_1_0 allow_failures: - os: linux - env: LIBTORRENT_BRANCH=master BUILDENV="CXX=g++-7 CC=gcc-7 CPP=cpp-7 CXXFLAGS=-fpermissive" + env: LIBTORRENT_BRANCH=master TOOLCHAIN="CXX=g++-7 CC=gcc-7 CPP=cpp-7" - os: osx - env: LIBTORRENT_BRANCH=master BUILDENV="CXXFLAGS=-std=c++11" + env: LIBTORRENT_BRANCH=master env: global: - MAKEFLAGS=-j2 @@ -41,8 +41,8 @@ brew install curl; fi install: - - env $BUILDENV ./scripts/build-libtorrent $LIBTORRENT_BRANCH /tmp + - env $TOOLCHAIN CXXFLAGS="-fpermissive -w -std=c++11" ./scripts/build-libtorrent $LIBTORRENT_BRANCH /tmp before_script: - autoreconf -i script: - - env $BUILDENV ./configure && make && make test + - env $TOOLCHAIN ./configure && make && make test diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/btfs-2.15/configure.ac new/btfs-2.16/configure.ac --- old/btfs-2.15/configure.ac 2017-08-04 09:12:07.0 +0200 +++ new/btfs-2.16/configure.ac 2017-08-23 18:12:29.0 +0200 @@ -1,5 +1,5 @@ AC_PREREQ([2.69]) -AC_INIT(btfs, 2.15, johan.gunnars...@gmail.com, btfs, https://github.com/johang/btfs) +AC_INIT(btfs, 2.16, johan.gunnars...@gmail.com, btfs, https://github.com/johang/btfs) AC_CONFIG_SRCDIR([src/btfs.cc]) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclud