Hello community,
here is the log from the commit of package btfs for openSUSE:Factory checked in
at 2020-11-23 15:46:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btfs (Old)
and /work/SRC/openSUSE:Factory/.btfs.new.5913 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btfs"
Mon Nov 23 15:46:30 2020 rev:9 rq:849914 version:2.23
Changes:
--------
--- /work/SRC/openSUSE:Factory/btfs/btfs.changes 2020-09-29
19:03:01.873862979 +0200
+++ /work/SRC/openSUSE:Factory/.btfs.new.5913/btfs.changes 2020-11-23
18:38:31.600624583 +0100
@@ -1,0 +2,6 @@
+Sun Nov 22 03:30:47 UTC 2020 - Mia Herkt <m...@0x0.st>
+
+- 2.23
+ * Add --utp-only flag to disable TCP
+
+-------------------------------------------------------------------
Old:
----
btfs-2.22.tar.gz
New:
----
btfs-2.23.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ btfs.spec ++++++
--- /var/tmp/diff_new_pack.iXTmk1/_old 2020-11-23 18:38:32.352625360 +0100
+++ /var/tmp/diff_new_pack.iXTmk1/_new 2020-11-23 18:38:32.356625364 +0100
@@ -17,7 +17,7 @@
Name: btfs
-Version: 2.22
+Version: 2.23
Release: 0
Summary: A BitTorrent file system based on FUSE
License: GPL-3.0-or-later
++++++ btfs-2.22.tar.gz -> btfs-2.23.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.22/.travis.yml new/btfs-2.23/.travis.yml
--- old/btfs-2.22/.travis.yml 2020-08-11 00:30:26.000000000 +0200
+++ new/btfs-2.23/.travis.yml 2020-11-15 19:00:02.000000000 +0100
@@ -2,14 +2,13 @@
matrix:
include:
- os: linux
- dist: bionic
- env: LIBTORRENT_BRANCH=RC_1_2 TOOLCHAIN="CXX=g++-10 CC=gcc-10 CPP=cpp-10"
+ dist: focal
+ env: LIBTORRENT_BRANCH=RC_2_0
- os: linux
- dist: bionic
- env: LIBTORRENT_BRANCH=RC_1_1 TOOLCHAIN="CXX=g++-10 CC=gcc-10 CPP=cpp-10"
- - os: osx
+ dist: focal
env: LIBTORRENT_BRANCH=RC_1_2
- - os: osx
+ - os: linux
+ dist: focal
env: LIBTORRENT_BRANCH=RC_1_1
env:
global:
@@ -18,22 +17,11 @@
- LD_LIBRARY_PATH=/tmp/lib
addons:
apt:
- sources:
- - ubuntu-toolchain-r-test
packages:
- libboost-all-dev
- libfuse-dev
- libcurl4-openssl-dev
- - g++-10
-before_install:
- - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
- brew update;
- brew install Caskroom/cask/osxfuse;
- brew install curl;
- fi
install:
- - env $TOOLCHAIN CXXFLAGS="-fpermissive -w -std=c++11"
./scripts/build-libtorrent $LIBTORRENT_BRANCH /tmp
-before_script:
- - autoreconf -i
+ - env CXXFLAGS="-fpermissive -w" ./scripts/build-libtorrent
$LIBTORRENT_BRANCH /tmp
script:
- - env $TOOLCHAIN ./configure && make && make test
+ - autoreconf -i && ./configure && make && make test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.22/configure.ac new/btfs-2.23/configure.ac
--- old/btfs-2.22/configure.ac 2020-08-11 00:30:26.000000000 +0200
+++ new/btfs-2.23/configure.ac 2020-11-15 19:00:02.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.69])
-AC_INIT(btfs, 2.22, johan.gunnars...@gmail.com, btfs,
https://github.com/johang/btfs)
+AC_INIT(btfs, 2.23, 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.22/man/btfs.1 new/btfs-2.23/man/btfs.1
--- old/btfs-2.22/man/btfs.1 2020-08-11 00:30:26.000000000 +0200
+++ new/btfs-2.23/man/btfs.1 2020-11-15 19:00:02.000000000 +0100
@@ -25,6 +25,9 @@
\fB\-k\fR \fB\-\-keep\fR
keep files after unmount
.TP
+\fB\-\-utp\-only\fR
+do not use TCP
+.TP
\fB\-\-data-directory=\fIDIRECTORY\fR
directory in which to put btfs download data. default is $HOME/btfs, or
/tmp/btfs if unavailable
.TP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.22/scripts/build-libtorrent
new/btfs-2.23/scripts/build-libtorrent
--- old/btfs-2.22/scripts/build-libtorrent 2020-08-11 00:30:26.000000000
+0200
+++ new/btfs-2.23/scripts/build-libtorrent 2020-11-15 19:00:02.000000000
+0100
@@ -16,9 +16,10 @@
# You should have received a copy of the GNU General Public License
# along with BTFS. If not, see <http://www.gnu.org/licenses/>.
-git clone -b "${1:-master}" https://github.com/arvidn/libtorrent.git &&
+git clone --recurse-submodules -b "${1:-master}"
https://github.com/arvidn/libtorrent.git &&
cd libtorrent &&
-./autotool.sh &&
-./configure --prefix="${2:-/tmp}" --disable-encryption &&
+mkdir build &&
+cd build &&
+cmake -DCMAKE_INSTALL_PREFIX="${2:-/tmp}" -G "Unix Makefiles" .. &&
make &&
make install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.22/src/Makefile.am
new/btfs-2.23/src/Makefile.am
--- old/btfs-2.22/src/Makefile.am 2020-08-11 00:30:26.000000000 +0200
+++ new/btfs-2.23/src/Makefile.am 2020-11-15 19:00:02.000000000 +0100
@@ -1,4 +1,4 @@
-EXTRACXXFLAGS = -std=c++11 \
+EXTRACXXFLAGS = -std=c++14 \
-Wall \
-Wextra \
-Wconversion \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.22/src/btfs.cc new/btfs-2.23/src/btfs.cc
--- old/btfs-2.22/src/btfs.cc 2020-08-11 00:30:26.000000000 +0200
+++ new/btfs-2.23/src/btfs.cc 2020-11-15 19:00:02.000000000 +0100
@@ -604,6 +604,8 @@
se.strict_end_game_mode = false;
se.announce_to_all_trackers = true;
se.announce_to_all_tiers = true;
+ se.enable_incoming_tcp = !params.utp_only;
+ se.enable_outgoing_tcp = !params.utp_only;
se.download_rate_limit = params.max_download_rate * 1024;
se.upload_rate_limit = params.max_upload_rate * 1024;
@@ -643,6 +645,8 @@
pack.set_bool(pack.strict_end_game_mode, false);
pack.set_bool(pack.announce_to_all_trackers, true);
pack.set_bool(pack.announce_to_all_tiers, true);
+ pack.set_bool(pack.enable_incoming_tcp, !params.utp_only);
+ pack.set_bool(pack.enable_outgoing_tcp, !params.utp_only);
pack.set_int(pack.download_rate_limit, params.max_download_rate * 1024);
pack.set_int(pack.upload_rate_limit, params.max_upload_rate * 1024);
pack.set_int(pack.alert_mask, alerts);
@@ -920,6 +924,7 @@
BTFS_OPT("--browse-only", browse_only, 1),
BTFS_OPT("-k", keep, 1),
BTFS_OPT("--keep", keep, 1),
+ BTFS_OPT("--utp-only", utp_only, 1),
BTFS_OPT("--data-directory=%s", data_directory, 4),
BTFS_OPT("--min-port=%lu", min_port, 4),
BTFS_OPT("--max-port=%lu", max_port, 4),
@@ -956,6 +961,7 @@
printf(" --help-fuse print all fuse options\n");
printf(" --browse-only -b download metadata only\n");
printf(" --keep -k keep files after unmount\n");
+ printf(" --utp-only do not use TCP\n");
printf(" --data-directory=dir directory in which to put btfs
data\n");
printf(" --min-port=N start of listen port range\n");
printf(" --max-port=N end of listen port range\n");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btfs-2.22/src/btfs.h new/btfs-2.23/src/btfs.h
--- old/btfs-2.22/src/btfs.h 2020-08-11 00:30:26.000000000 +0200
+++ new/btfs-2.23/src/btfs.h 2020-11-15 19:00:02.000000000 +0100
@@ -123,6 +123,7 @@
int help_fuse;
int browse_only;
int keep;
+ int utp_only;
char *data_directory;
int min_port;
int max_port;
_______________________________________________
openSUSE Commits mailing list -- commit@lists.opensuse.org
To unsubscribe, email commit-le...@lists.opensuse.org
List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette
List Archives:
https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
