[gentoo-commits] repo/gentoo:master commit in: sys-block/tgt/files/, sys-block/tgt/

[Sam James]

commit: db5fe2a0dd4dd1f6bb1761110922b645451a4cf8
Author: Forza <68693597+Forza-tng  users  noreply  github 
 com>
AuthorDate: Tue Oct 17 06:40:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct 17 09:17:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db5fe2a0

sys-block/tgt: Update tgtd.initd-new

Add missing `${tgtd_opts}` which was missing in previous commit.

Closes: https://bugs.gentoo.org/915140
Signed-off-by: Forza <68693597+Forza-tng  users.noreply.github.com>
Closes: https://github.com/gentoo/gentoo/pull/33368
Signed-off-by: Sam James  gentoo.org>

 sys-block/tgt/files/tgtd.initd-new   | 2 +-
 sys-block/tgt/{tgt-1.0.87-r1.ebuild => tgt-1.0.87-r2.ebuild} | 0
 sys-block/tgt/{tgt-1.0.88.ebuild => tgt-1.0.88-r1.ebuild}| 0
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-block/tgt/files/tgtd.initd-new 
b/sys-block/tgt/files/tgtd.initd-new
index 7941f1a7e974..962ed7bd3a2a 100644
--- a/sys-block/tgt/files/tgtd.initd-new
+++ b/sys-block/tgt/files/tgtd.initd-new
@@ -9,7 +9,7 @@
 
 pidfile="/var/run/${RC_SVCNAME}.pid"
 command="/usr/sbin/tgtd"
-command_args_background="--pid-file ${pidfile}"
+command_args_background="--pid-file ${pidfile} ${tgtd_opts}"
 extra_commands="forcedstop"
 extra_started_commands="forcedreload reload"
 

diff --git a/sys-block/tgt/tgt-1.0.87-r1.ebuild 
b/sys-block/tgt/tgt-1.0.87-r2.ebuild
similarity index 100%
rename from sys-block/tgt/tgt-1.0.87-r1.ebuild
rename to sys-block/tgt/tgt-1.0.87-r2.ebuild

diff --git a/sys-block/tgt/tgt-1.0.88.ebuild 
b/sys-block/tgt/tgt-1.0.88-r1.ebuild
similarity index 100%
rename from sys-block/tgt/tgt-1.0.88.ebuild
rename to sys-block/tgt/tgt-1.0.88-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: sys-block/tgt/files/, sys-block/tgt/

[Mike Frysinger]

commit: d19be01596dc1d8590b47a5da70f636da7cbdcea
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sun Nov 27 23:50:07 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sun Nov 27 23:50:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19be015

sys-block/tgt: fix build w/newer glibc #580594

 sys-block/tgt/files/tgt-1.0.69-sysmacros.patch | 38 ++
 sys-block/tgt/tgt-1.0.69.ebuild|  2 ++
 2 files changed, 40 insertions(+)

diff --git a/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch 
b/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch
new file mode 100644
index ..0b28f02
--- /dev/null
+++ b/sys-block/tgt/files/tgt-1.0.69-sysmacros.patch
@@ -0,0 +1,38 @@
+https://bugs.gentoo.org/580594
+https://github.com/fujita/tgt/pull/25
+
+From b092c6fe330a2eacf4b1d4eb093fad8e2fbcaed9 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Sun, 27 Nov 2016 18:47:24 -0500
+Subject: [PATCH] fix build w/newer glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Building with newer glibc versions fails like so:
+bs_sg.c: In function ‘chk_sg_device’:
+bs_sg.c:354:6: error: implicit declaration of function ‘major’ 
[-Werror=implicit-function-declaration]
+  if (major(st.st_rdev) == SCSI_GENERIC_MAJOR)
+
+This is because glibc is dropping the implicit sys/sysmacros.h include
+from sys/types.h and making the few projects that need it include it
+explicitly.
+---
+ usr/bs_sg.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/usr/bs_sg.c b/usr/bs_sg.c
+index 66f4a3b22a18..fb544056f258 100644
+--- a/usr/bs_sg.c
 b/usr/bs_sg.c
+@@ -32,6 +32,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.11.0.rc2
+

diff --git a/sys-block/tgt/tgt-1.0.69.ebuild b/sys-block/tgt/tgt-1.0.69.ebuild
index 916d0f7..8a0ff08 100644
--- a/sys-block/tgt/tgt-1.0.69.ebuild
+++ b/sys-block/tgt/tgt-1.0.69.ebuild
@@ -37,6 +37,8 @@ pkg_setup() {
 }
 
 src_prepare() {
+   epatch "${FILESDIR}"/${P}-sysmacros.patch #580594
+
sed -i -e 's:\($(CC)\) $^:\1 $(LDFLAGS) $^:' usr/Makefile || die
 
# make sure xml docs are generated before trying to install them