Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package tgt for openSUSE:Factory checked in
at 2023-01-02 15:47:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tgt (Old)
and /work/SRC/openSUSE:Factory/.tgt.new.1563 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tgt"
Mon Jan 2 15:47:24 2023 rev:41 rq:1046187 version:1.0.85
Changes:
--------
--- /work/SRC/openSUSE:Factory/tgt/tgt.changes 2022-12-04 14:58:37.376363105
+0100
+++ /work/SRC/openSUSE:Factory/.tgt.new.1563/tgt.changes 2023-01-02
15:47:25.524489636 +0100
@@ -1,0 +2,22 @@
+Mon Jan 2 13:28:45 UTC 2023 - Dirk Müller <dmuel...@suse.com>
+
+- update to 1.0.85:
+ * remove duplicate includes
+ * Fix blank documentation line in service file
+
+-------------------------------------------------------------------
+Fri Dec 23 20:01:34 UTC 2022 - Lee Duncan <ldun...@suse.com>
+
+- Some cleanup (bsc#1206639):
+ * removed patch setup-tgt-conf-d.patch, since it's upstream,
+ and having it caused duplicated include of user config
+ * renamed setup-tgt-conf-d.patch to
+ tgt-install-examples-in-documentation-dir.patch, to better
+ reflect what it does (since it no longer sets up tgt.conf.d)
+ * removed the sytemd source file we have, since we get
+ tgtd.service from upstream now (with a patch)
+ * added patch tgt-systemd-service-update.patch, to ensure
+ SUSE-specific changes are in the service file
+ * dropped tgt-include-sys-macros-for-major.patch (obsolete)
+
+-------------------------------------------------------------------
Old:
----
setup-tgt-conf-d.patch
tgt-include-sys-macros-for-major.patch
tgtd.service
v1.0.84.tar.gz
New:
----
tgt-install-examples-in-documentation-dir.patch
tgt-systemd-service-update.patch
v1.0.85.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tgt.spec ++++++
--- /var/tmp/diff_new_pack.nkhz4d/_old 2023-01-02 15:47:26.064492717 +0100
+++ /var/tmp/diff_new_pack.nkhz4d/_new 2023-01-02 15:47:26.068492740 +0100
@@ -1,7 +1,7 @@
#
# spec file for package tgt
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,29 +20,34 @@
%if ! %{defined _fillupdir}
%define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
+#Compat macro for make_build macro (needed in SLE12-SP5)
+%if ! %{defined make_build}
+ %define make_build %{__make} %{?_smp_mflags}
+%endif
Name: tgt
-Version: 1.0.84
+Version: 1.0.85
Release: 0
Summary: Generic Linux target framework (tgt)
License: GPL-2.0-only
Group: System/Daemons
URL: https://github.com/fujita/tgt
Source:
https://github.com/fujita/tgt/archive/refs/tags/v%{version}.tar.gz
-Source1: %{name}d.service
-Source4: sysconfig.%{name}
+Source1: sysconfig.%{name}
Patch1: %{name}-fix-build
-Patch2: setup-tgt-conf-d.patch
-Patch3: %{name}-include-sys-macros-for-major.patch
-Patch5: harden_tgtd.service.patch
+Patch2: %{name}-install-examples-in-documentation-dir.patch
+Patch3: harden_tgtd.service.patch
+Patch4: %{name}-systemd-service-update.patch
BuildRequires: docbook-xsl-stylesheets
BuildRequires: libaio-devel
-BuildRequires: libxslt
+BuildRequires: libxslt-tools
+BuildRequires: libxslt1
BuildRequires: openssl-devel
BuildRequires: perl-Config-General
BuildRequires: systemd-rpm-macros
Requires: perl-Config-General
Requires(pre): %fillup_prereq
Obsoletes: iscsitarget
+%{?systemd_requires}
%description
Linux target framework (tgt) aims to simplify various SCSI target
@@ -57,7 +62,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch5 -p1
+%patch4 -p1
%build
%ifarch ppc ppc64 ppc64le
@@ -69,8 +74,8 @@
%install
make DESTDIR=%{buildroot} docdir=%{_docdir}/%{name} install
-install -vD -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}d.service
-install -vD %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.%{name}
+install -vDm644 scripts/tgtd.service %{buildroot}%{_unitdir}/tgtd.service
+install -vD %{S:1} %{buildroot}%{_fillupdir}/sysconfig.%{name}
ln -sf service %{buildroot}/%{_sbindir}/rc%{name}d
%pre
++++++ tgt-install-examples-in-documentation-dir.patch ++++++
>From 4711fc19b6b83d572fd6eafd64a834559cae8ce2 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Wed, 26 Feb 2014 12:50:09 +0100
Subject: Install examples in documentation directory
The examples should be installed in the documentation directory,
not the standard configuration directory.
Signed-off-by: Dirk Mueller <dmuel...@suse.com>
Acked-by: Hannes Reinecke <h...@suse.de>
---
conf/Makefile | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/conf/Makefile
+++ b/conf/Makefile
@@ -1,4 +1,5 @@
sysconfdir ?= /etc
+docdatadir ?= /usr/share/doc/packages/
EXAMPLES = targets.conf.example targets.conf.vtl.L700 targets.conf.vtl.MSL2024
@@ -11,9 +12,10 @@ install:
if [ ! -f $(DESTDIR)$(sysconfdir)/tgt/targets.conf ] ; then \
install -m 644 targets.conf $(DESTDIR)$(sysconfdir)/tgt ; \
fi
- install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/examples
+ install -d -m 755 $(DESTDIR)$(sysconfdir)/tgt/conf.d
+ install -d -m 755 $(DESTDIR)$(docdatadir)/tgt/examples
for f in $(EXAMPLES) ; do \
- install -m 644 examples/$$f
$(DESTDIR)$(sysconfdir)/tgt/examples ;\
+ install -m 644 examples/$$f
$(DESTDIR)$(docdatadir)/tgt/examples ;\
done
install -d $(DESTDIR)$(sysconfdir)/tgt/conf.d
++++++ tgt-systemd-service-update.patch ++++++
From: Lee Duncan
Date: Sat 24 Dec 2022 09:15:40 AM PST
Subject: [PATCH] tgt: systemd service update
Update our systemd service file to match what we do at SUSE.
---
Index: tgt-1.0.85/scripts/tgtd.service
===================================================================
--- tgt-1.0.85.orig/scripts/tgtd.service
+++ tgt-1.0.85/scripts/tgtd.service
@@ -20,8 +20,9 @@ RestrictRealtime=true
# end of automatic additions
Type=forking
Environment=TGTD_CONFIG=/etc/tgt/targets.conf
+EnvironmentFile=-/etc/sysconfig/tgt
-ExecStart=/usr/sbin/tgtd
+ExecStart=/usr/sbin/tgtd $TGTD_OPTS
ExecStartPost=/usr/sbin/tgtadm --op update --mode sys --name State -v offline
ExecStartPost=/usr/sbin/tgtadm --op update --mode sys --name State -v ready
ExecStartPost=/usr/sbin/tgt-admin -e -c ${TGTD_CONFIG}
++++++ v1.0.84.tar.gz -> v1.0.85.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tgt-1.0.84/Makefile new/tgt-1.0.85/Makefile
--- old/tgt-1.0.84/Makefile 2022-08-05 12:28:50.000000000 +0200
+++ new/tgt-1.0.85/Makefile 2023-01-01 03:54:42.000000000 +0100
@@ -1,4 +1,4 @@
-VERSION ?= 1.0.84
+VERSION ?= 1.0.85
CHECK_CC = cgcc
CHECK_CC_FLAGS = '$(CHECK_CC) -Wbitwise -Wno-return-void -no-compile $(ARCH)'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tgt-1.0.84/scripts/tgtd.service
new/tgt-1.0.85/scripts/tgtd.service
--- old/tgt-1.0.84/scripts/tgtd.service 2022-08-05 12:28:50.000000000 +0200
+++ new/tgt-1.0.85/scripts/tgtd.service 2023-01-01 03:54:42.000000000 +0100
@@ -1,6 +1,6 @@
[Unit]
Description=iSCSI target framework daemon
-Documentation=man: tgtd(8)
+Documentation=man:tgtd(8)
After=network.target
# On systems without virtual consoles, don't start any getty. Note
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/tgt-1.0.84/usr/bs_sg.c new/tgt-1.0.85/usr/bs_sg.c
--- old/tgt-1.0.84/usr/bs_sg.c 2022-08-05 12:28:50.000000000 +0200
+++ new/tgt-1.0.85/usr/bs_sg.c 2023-01-01 03:54:42.000000000 +0100
@@ -36,7 +36,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/epoll.h>
-#include <sys/sysmacros.h>
#include <scsi/sg.h>
#include "bsg.h" /* Copied from include/linux/bsg.h */
