Skip to content

Commit 5747452

Browse files
committed
rTorrent: Upgrade to v0.15.4
This commit upgrades from rTorrent 0.15.3 to 0.15.4. The pin is adjusted to include a couple hotfixes to resolve software crashes. This is a cleaner solution than patch files. The rTorrent developer does not pin releases properly. As a result, we need to adjust the pin slightly to accommodate a few hotfixes. libtorrent 0.15.4 is 0a4908ab52f2332703a8ef67f636b3d46c8bd127 Include fix patch and invalid chunks software crash resolution brings it two commits forward at a0a364e2863356f51d41a27ce7620471666c5c56 The difference is rakshasa/libtorrent@0a4908a...a0a364e rTorrent 0.15.4 is 537c692f47274f970278478dab5f365954f1a0bd Include file fix and ExecFile waitpid software crash resolution brings it three commits forward at 231606afc16eef08ec1a344a7aaef7504343bb71 The difference is rakshasa/rtorrent@537c692...231606a
1 parent 222344a commit 5747452

File tree

2 files changed

+7
-55
lines changed

2 files changed

+7
-55
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,13 @@ ARG RUTORRENT_VERSION=b9b5872fb17169f3ddb76529b174a2a267a13774
1111
ARG GEOIP2_RUTORRENT_VERSION=4ff2bde530bb8eef13af84e4413cedea97eda148
1212
ARG DUMP_TORRENT_VERSION=302ac444a20442edb4aeabef65b264a85ab88ce9
1313

14-
# libtorrent v0.15.3
15-
ARG LIBTORRENT_VERSION=0cb559ea23fa67ded8aea69c93cba50ae0ab243f
16-
# rtorrent v0.15.3
17-
ARG RTORRENT_VERSION=6f8c1246dc013d1d5c39ecd66373346ac42fe746
14+
# libtorrent v0.15.4 with stability patches
15+
# https://github.com/rakshasa/libtorrent/compare/0a4908ab52f2332703a8ef67f636b3d46c8bd127...a0a364e2863356f51d41a27ce7620471666c5c56
16+
ARG LIBTORRENT_VERSION=a0a364e2863356f51d41a27ce7620471666c5c56
17+
18+
# rtorrent v0.15.4 with stability patches
19+
# https://github.com/rakshasa/rtorrent/compare/537c692f47274f970278478dab5f365954f1a0bd...231606afc16eef08ec1a344a7aaef7504343bb71
20+
ARG RTORRENT_VERSION=231606afc16eef08ec1a344a7aaef7504343bb71
1821

1922
ARG ALPINE_VERSION=3.21
2023
ARG ALPINE_S6_VERSION=${ALPINE_VERSION}-2.2.0.3
@@ -96,7 +99,6 @@ RUN apk --update --no-cache add \
9699
ncurses-dev \
97100
nghttp2-dev \
98101
openssl-dev \
99-
patch \
100102
pcre-dev \
101103
php83-dev \
102104
php83-pear \
@@ -133,8 +135,6 @@ RUN tree ${DIST_PATH}
133135

134136
WORKDIR /usr/local/src/libtorrent
135137
COPY --from=src-libtorrent /src .
136-
COPY /patches/libtorrent .
137-
RUN patch -p1 < libtorrent-0.15.3-resume-fix.patch
138138
RUN autoreconf -vfi
139139
RUN ./configure --enable-aligned
140140
RUN make -j$(nproc) CXXFLAGS="-w -O3 -flto -Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing"

patches/libtorrent/libtorrent-0.15.3-resume-fix.patch

Lines changed: 0 additions & 48 deletions
This file was deleted.

0 commit comments

Comments
 (0)