pool/targetcli-fb
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 808051 from home:lee_duncan:branches:Base:System

Browse Source 
- Update to version 2.1.52:
  * version 2.1.52
  * daemon-interactive: do not allow clearing the prompt
  * daemon-interactive: show path on prompt
  * daemonized-mode: add interactive shell support
  * Use temp file objects for temporary storage area
  * Fix StringIO/BytesIO stuck issue
  * Fix targetclid daemon infinite stuck
  * targetclid.sock: change SocketMode to 0600
    (bsc#1168415 CVE-2020-10699)
  * setup.py: add the socket and service files to the data_files section
  * Use StringIO as a buffer instead of a file

OBS-URL: https://build.opensuse.org/request/show/808051
OBS-URL: https://build.opensuse.org/package/show/Base:System/targetcli-fb?expand=0&rev=40
This commit is contained in:
Lee Duncan 2020-05-21 18:50:43 +00:00 committed by Git OBS Bridge
parent ddb82c3654
commit 0623cd0a24
9 changed files with 44 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -7,7 +7,7 @@
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(\d*\.\d*\.)(\d*)</param>
<param name="versionrewrite-replacement">\1\2</param>
<param name="revision">v2.1.51</param>
<param name="revision">v2.1.52</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">

2
_servicedata
View File

@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/open-iscsi/targetcli-fb.git</param>
<param name="changesrevision">06076aba7e9e9bd4a1e84bac61e85265e8075b8e</param></service></servicedata>
<param name="changesrevision">bab9fc16236c4aceade31e95327bc7b493bb157a</param></service></servicedata>

20
fix-setup-install.patch Normal file
View File

@ -0,0 +1,20 @@
From: Lee Duncan <lduncan@suse.com>
Date: Thu May 21 11:32:02 PDT 2020
Subject: [PATCH] fix setup install patch
Fix the setup.py install script to install systemd
files in /usr/lib/systemd/system instead of /lib/systemd/system
---
diff --git a/setup.py b/setup.py
index 4518165c57a6..2ebfc04605c0 100755
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(
'scripts/targetcli',
'daemon/targetclid'
],
- data_files = [('/lib/systemd/system', ['systemd/targetclid.socket', 'systemd/targetclid.service'])],
+ data_files = [('/usr/lib/systemd/system', ['systemd/targetclid.socket', 'systemd/targetclid.service'])],
classifiers = [
"Programming Language :: Python",
"Programming Language :: Python :: 3",

3
targetcli-fb-2.1.51.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:523e75fa1cc5820baee823f89b1d514b3458fd9c5ce7b438a3af7038c2d467a5
size 33464

3
targetcli-fb-2.1.52.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b8c08842002f02aac819e41e3fd5c176f2e26a3843c8d214a43235c89a41b3e
size 34008

16
targetcli-fb.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu May 21 17:38:48 UTC 2020 - lduncan@suse.com
- Update to version 2.1.52:
* version 2.1.52
* daemon-interactive: do not allow clearing the prompt
* daemon-interactive: show path on prompt
* daemonized-mode: add interactive shell support
* Use temp file objects for temporary storage area
* Fix StringIO/BytesIO stuck issue
* Fix targetclid daemon infinite stuck
* targetclid.sock: change SocketMode to 0600
(bsc#1168415 CVE-2020-10699)
* setup.py: add the socket and service files to the data_files section
* Use StringIO as a buffer instead of a file
-------------------------------------------------------------------
Wed Feb 12 17:58:15 UTC 2020 - lduncan@suse.com

8
targetcli-fb.spec
View File

@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: targetcli-fb
Version: 2.1.51
Version: 2.1.52
Release: 0
Summary: A command shell for managing the Linux LIO kernel target
License: Apache-2.0
@ -26,8 +26,6 @@ Group: System/Management
URL: https://github.com/open-iscsi/%{name}
Source: %{name}-%{version}.tar.xz
Source1: %{name}.service
Source2: targetclid.socket
Source3: targetclid.service
BuildRequires: %{python_module configshell-fb}
BuildRequires: %{python_module devel}
BuildRequires: %{python_module pyparsing}
@ -58,6 +56,7 @@ Obsoletes: targetcli-rbd < %{version}
%{?systemd_ordering}
Patch1: Split-out-blockdev-readonly-state-detection-helper.patch
Patch2: rbd-support.patch
Patch3: fix-setup-install.patch
%python_subpackages
@ -87,6 +86,7 @@ python2-targetcli-fb and python3-targetcli-fb.
# RBD support is dependent on LIO changes present in the SLE/Leap kernel
%patch2 -p1
%endif
%patch3 -p1
%build
%python_build
@ -101,8 +101,6 @@ install -d -m755 %{buildroot}%{_sbindir}
install -D -m644 targetcli.8 %{buildroot}%{_mandir}/man8/targetcli.8
install -D -m644 targetclid.8 %{buildroot}%{_mandir}/man8/targetclid.8
install -D -m644 %{S:1} %{buildroot}%{_unitdir}/targetcli.service
install -D -m644 %{S:2} %{buildroot}%{_unitdir}/targetclid.socket
install -D -m644 %{S:3} %{buildroot}%{_unitdir}/targetclid.service
%fdupes %{buildroot}
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rctargetcli
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rctargetclid

13
targetclid.service
View File

@ -1,13 +0,0 @@
[Unit]
Description=Targetcli daemon
Documentation=man:targetclid(8)
After=network.target
[Service]
Type=simple
ExecStart=/usr/bin/targetclid
Restart=on-failure
[Install]
WantedBy=multi-user.target
Also=targetclid.socket

9
targetclid.socket
View File

@ -1,9 +0,0 @@
[Unit]
Description=targetclid socket
Documentation=man:targetclid(8)
[Socket]
ListenStream=/var/run/targetclid.sock
[Install]
WantedBy=sockets.target