Accepting request 984398 from filesharing

- Backport fix which resolves a crashing issue on startup on openSUSE.
  https://github.com/rakshasa/rtorrent/pull/1169
  + 0001-utils-lockfile-avoid-stack-overflow-for-lockfile-buf.patch

OBS-URL: https://build.opensuse.org/request/show/984398
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rtorrent?expand=0&rev=11

0001-utils-lockfile-avoid-stack-overflow-for-lockfile-buf.patch

@@ -0,0 +1,28 @@
+From 954bfb70f24578ef33b1f77cf1a3d64fc2f2f595 Mon Sep 17 00:00:00 2001
+From: Aleksa Sarai <cyphar@cyphar.com>
+Date: Mon, 20 Jun 2022 19:09:57 +1000
+Subject: [PATCH] utils: lockfile: avoid stack overflow for lockfile buffer
+References: https://github.com/rakshasa/rtorrent/pull/1169
+
+Signed-off-by: Aleksa Sarai <cyphar@cyphar.com>
+---
+ src/utils/lockfile.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/utils/lockfile.cc b/src/utils/lockfile.cc
+index 7d11d8c9970f..fac5cb23e26f 100644
+--- a/src/utils/lockfile.cc
++++ b/src/utils/lockfile.cc
+@@ -98,7 +98,8 @@ Lockfile::try_lock() {
+   int pos = ::gethostname(buf, 255);
+ 
+   if (pos == 0) {
+-    ::snprintf(buf + std::strlen(buf), 255, ":+%i\n", ::getpid());
++    ssize_t len = std::strlen(buf);
++    ::snprintf(buf + len, 255 - len, ":+%i\n", ::getpid());
+     int __UNUSED result = ::write(fd, buf, std::strlen(buf));
+   }
+ 
+-- 
+2.36.1
+

rtorrent.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jun 21 00:28:35 UTC 2022 - Aleksa Sarai <asarai@suse.com>
+
+- Backport fix which resolves a crashing issue on startup on openSUSE.
+  https://github.com/rakshasa/rtorrent/pull/1169
+  + 0001-utils-lockfile-avoid-stack-overflow-for-lockfile-buf.patch
+
 -------------------------------------------------------------------
 Tue Nov 16 12:09:53 UTC 2021 - Johannes Segitz <jsegitz@suse.com>
 
@@ -51,7 +58,7 @@ Wed Jul 24 17:52:33 UTC 2019 - hiwatari.seiji@gmail.com
 	* Fix no // are at start of expanded paths. (pyroscope)
 	* Fix ncurses header include. (theirix)
 	* Fix segfault when viewing a magnet download in the leeching view. (slingamn)
-    
+
 - Remove rtorrent-vim package because it was made for the old (now discouraged) config syntax
 	* See: https://github.com/rakshasa/rtorrent/wiki/CONFIG-Template
 

rtorrent.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package rtorrent
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,6 +29,7 @@ Source2:        rtorrent.desktop
 # This manpage copied from the 0.9.2 tarball as it was missing in later versions
 Source3:        rtorrent.1
 Source4:        rtorrent.service
+Patch1:         0001-utils-lockfile-avoid-stack-overflow-for-lockfile-buf.patch
 BuildRequires:  automake
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -47,7 +48,7 @@ background using screen. It supports fast-resume and session
 management.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 # It's full of type pun violations