* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/
@ 2018-09-13 8:18 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2018-09-13 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 0a2705096d402a6f12adcdf60e3b6f64bf90715a
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 08:17:17 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 08:18:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a270509
sys-apps/sg3_utils: Bump to version 1.44
Package-Manager: Portage-2.3.49, Repoman-2.3.10
sys-apps/sg3_utils/Manifest | 1 +
.../sg3_utils/files/sg3_utils-1.26-stdint.patch | 8 ++--
sys-apps/sg3_utils/sg3_utils-1.44.ebuild | 44 ++++++++++++++++++++++
3 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 8b9347c1576..786e00243ea 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,2 +1,3 @@
DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
DIST sg3_utils-1.43.tar.gz 1180760 BLAKE2B 20475d974f9f4c0f275499a63f921b587df76e1b8addcd5201fd5db95e100eb0b4c8c97aba7e9651ae069c43e30cd7b780643212307dec6d53e5b91cd2c653e8 SHA512 5f2eea6f61300e288ce32ca613179a944de34576fd6e596c4c3aa6cc2c0ef397cf5bfd2c148b737f678aac0c574321994525486430ea14ae8e7cb1c02184636f
+DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch b/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
index a82ab6add9a..62fb30240e1 100644
--- a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
+++ b/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
@@ -7,8 +7,8 @@ Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
For uint64_t to be available, <stdint.h> must be included:
http://www.opengroup.org/onlinepubs/009695399/basedefs/stdint.h.html
---- include/sg_cmds_basic.h 2008/06/26 23:27:40 1.1
-+++ include/sg_cmds_basic.h 2008/06/26 23:28:06
+--- a/include/sg_cmds_basic.h
++++ b/include/sg_cmds_basic.h
@@ -30,6 +30,8 @@
*
*/
@@ -18,8 +18,8 @@ http://www.opengroup.org/onlinepubs/009695399/basedefs/stdint.h.html
#ifdef __cplusplus
extern "C" {
#endif
---- include/sg_cmds_extra.h 2008/06/26 23:27:40 1.1
-+++ include/sg_cmds_extra.h 2008/06/26 23:29:02
+--- a/include/sg_cmds_extra.h
++++ b/include/sg_cmds_extra.h
@@ -30,6 +30,8 @@
*
*/
diff --git a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
new file mode 100644
index 00000000000..d98714db0ff
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="http://sg.danny.cz/sg/"
+#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
+)
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ dodoc COVERAGE doc/README examples/*.txt
+ newdoc scripts/README README.scripts
+
+ # Better fix for bug 231089; some packages look for sgutils2
+ local path lib
+ path="/usr/$(get_libdir)"
+ for lib in "${ED%/}/"${path}/libsgutils2.*; do
+ lib=${lib##*/}
+ dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+ done
+
+ find "${ED}" -name "*.la" -delete || die
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/
@ 2021-03-30 7:05 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2021-03-30 7:05 UTC (permalink / raw
To: gentoo-commits
commit: c61d54adec2c539872bd05b5c28703e61a2787a0
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 29 12:18:53 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 07:02:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61d54ad
sys-apps/sg3_utils: Removed old
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
sys-apps/sg3_utils/Manifest | 1 -
.../sg3_utils/files/sg3_utils-1.42-sysmacros.patch | 31 ---------------
sys-apps/sg3_utils/sg3_utils-1.42.ebuild | 44 ----------------------
3 files changed, 76 deletions(-)
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index fb01d7cf889..c9b155de994 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,4 +1,3 @@
-DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
DIST sg3_utils-1.46.tar.xz 1031972 BLAKE2B bf425b97247a5f5bae06a84d68066e2e2ec107a5c6d410f6d04a8879be22a07d5f5d0718674072458e654a4de3facb575522962beb2297a1fb4a7fe0df01b977 SHA512 576531da5022c5c2b3099bb28b3806a86d03594f572b8e72c5d451253e5b88761654027315749362b5037dd6108b691bd74566482b9c5078e3b1e5a2bb6e1a67
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch b/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
deleted file mode 100644
index e8440fb8c32..00000000000
--- a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 13ff34d408cf69339ce1f28756f5c7b5ad5f528b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Apr 2016 18:36:09 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor funcs
-
-These functions are not part of any official spec, and glibc has always
-kept them in sys/sysmacros.h. As glibc moves to conform to POSIX, and
-more alternative C libraries come up, we need to include this header
-explicitly to get the prototypes. Otherwise we fail to build like:
-
-sg_map26.o: In function 'nd_match_scandir_select':
-sg_map26.c:(.text+0x37b): undefined reference to 'major'
----
- include/sg_lib.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/sg_lib.h b/include/sg_lib.h
-index b3e741b..a0e483c 100644
---- a/include/sg_lib.h
-+++ b/include/sg_lib.h
-@@ -32,6 +32,7 @@
-
- #include <stdio.h>
- #include <stdint.h>
-+#include <sys/sysmacros.h>
-
- #ifdef __cplusplus
- extern "C" {
---
-2.7.4
-
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
deleted file mode 100644
index 56b30e53972..00000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib ltprune
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
- epatch "${FILESDIR}"/${PN}-1.42-sysmacros.patch #580236
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- dodoc COVERAGE doc/README examples/*.txt
- newdoc scripts/README README.scripts
-
- # Better fix for bug 231089; some packages look for sgutils2
- local path lib
- path="/usr/$(get_libdir)"
- for lib in "${ED}"${path}/libsgutils2.*; do
- lib=${lib##*/}
- dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
- done
-
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/
@ 2021-05-14 10:04 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-05-14 10:04 UTC (permalink / raw
To: gentoo-commits
commit: 013b0c0ae1596a428482f13533a0ce502af4d51d
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 10:03:42 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 10:03:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=013b0c0a
sys-apps/sg3_utils: Remove old 1.42, 1.45-r2
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-apps/sg3_utils/Manifest | 2 -
.../sg3_utils/files/sg3_utils-1.42-sysmacros.patch | 31 ---------------
sys-apps/sg3_utils/sg3_utils-1.42.ebuild | 44 ----------------------
sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild | 43 ---------------------
4 files changed, 120 deletions(-)
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 1e300284516..cfa0aafc384 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,3 +1 @@
-DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
-DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch b/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
deleted file mode 100644
index e8440fb8c32..00000000000
--- a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 13ff34d408cf69339ce1f28756f5c7b5ad5f528b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 18 Apr 2016 18:36:09 -0400
-Subject: [PATCH] include sys/sysmacros.h for major/minor funcs
-
-These functions are not part of any official spec, and glibc has always
-kept them in sys/sysmacros.h. As glibc moves to conform to POSIX, and
-more alternative C libraries come up, we need to include this header
-explicitly to get the prototypes. Otherwise we fail to build like:
-
-sg_map26.o: In function 'nd_match_scandir_select':
-sg_map26.c:(.text+0x37b): undefined reference to 'major'
----
- include/sg_lib.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/sg_lib.h b/include/sg_lib.h
-index b3e741b..a0e483c 100644
---- a/include/sg_lib.h
-+++ b/include/sg_lib.h
-@@ -32,6 +32,7 @@
-
- #include <stdio.h>
- #include <stdint.h>
-+#include <sys/sysmacros.h>
-
- #ifdef __cplusplus
- extern "C" {
---
-2.7.4
-
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
deleted file mode 100644
index 7509872c7d2..00000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch multilib ltprune
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="http://sg.danny.cz/sg/"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND=""
-PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
- epatch "${FILESDIR}"/${PN}-1.42-sysmacros.patch #580236
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- dodoc COVERAGE doc/README examples/*.txt
- newdoc scripts/README README.scripts
-
- # Better fix for bug 231089; some packages look for sgutils2
- local path lib
- path="/usr/$(get_libdir)"
- for lib in "${ED}"${path}/libsgutils2.*; do
- lib=${lib##*/}
- dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
- done
-
- prune_libtool_files
-}
diff --git a/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild b/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild
deleted file mode 100644
index 9a35e645d32..00000000000
--- a/sys-apps/sg3_utils/sg3_utils-1.45-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib
-
-DESCRIPTION="Apps for querying the sg SCSI interface"
-HOMEPAGE="http://sg.danny.cz/sg/"
-#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-devel/libtool"
-RDEPEND="!sys-apps/rescan-scsi-bus"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
-)
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- dodoc COVERAGE doc/README examples/*.txt
- newdoc scripts/README README.scripts
-
- find "${ED}" -type f -name "*.la" -delete || die
-
- # Better fix for bug 231089; some packages look for sgutils2
- local path lib
- path="/usr/$(get_libdir)"
- for lib in "${ED}/"${path}/libsgutils2{,-${PV}}.*; do
- lib=${lib##*/}
- dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
- done
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/
@ 2021-05-14 10:39 David Seifert
0 siblings, 0 replies; 7+ messages in thread
From: David Seifert @ 2021-05-14 10:39 UTC (permalink / raw
To: gentoo-commits
commit: 3aabc779aba654296ac30813fbf296aedc420340
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 10:39:06 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 10:39:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aabc779
sys-apps/sg3_utils: Restore 1.42
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-apps/sg3_utils/Manifest | 2 +
.../sg3_utils/files/sg3_utils-1.42-sysmacros.patch | 31 +++++++++++++++
sys-apps/sg3_utils/sg3_utils-1.42.ebuild | 44 ++++++++++++++++++++++
3 files changed, 77 insertions(+)
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index cfa0aafc384..1e300284516 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1 +1,3 @@
+DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
+DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch b/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
new file mode 100644
index 00000000000..e8440fb8c32
--- /dev/null
+++ b/sys-apps/sg3_utils/files/sg3_utils-1.42-sysmacros.patch
@@ -0,0 +1,31 @@
+From 13ff34d408cf69339ce1f28756f5c7b5ad5f528b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 18 Apr 2016 18:36:09 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor funcs
+
+These functions are not part of any official spec, and glibc has always
+kept them in sys/sysmacros.h. As glibc moves to conform to POSIX, and
+more alternative C libraries come up, we need to include this header
+explicitly to get the prototypes. Otherwise we fail to build like:
+
+sg_map26.o: In function 'nd_match_scandir_select':
+sg_map26.c:(.text+0x37b): undefined reference to 'major'
+---
+ include/sg_lib.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/sg_lib.h b/include/sg_lib.h
+index b3e741b..a0e483c 100644
+--- a/include/sg_lib.h
++++ b/include/sg_lib.h
+@@ -32,6 +32,7 @@
+
+ #include <stdio.h>
+ #include <stdint.h>
++#include <sys/sysmacros.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+--
+2.7.4
+
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
new file mode 100644
index 00000000000..7509872c7d2
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit epatch multilib ltprune
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="http://sg.danny.cz/sg/"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
+ epatch "${FILESDIR}"/${PN}-1.42-sysmacros.patch #580236
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ dodoc COVERAGE doc/README examples/*.txt
+ newdoc scripts/README README.scripts
+
+ # Better fix for bug 231089; some packages look for sgutils2
+ local path lib
+ path="/usr/$(get_libdir)"
+ for lib in "${ED}"${path}/libsgutils2.*; do
+ lib=${lib##*/}
+ dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+ done
+
+ prune_libtool_files
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/
@ 2021-08-16 14:04 Lars Wendler
0 siblings, 0 replies; 7+ messages in thread
From: Lars Wendler @ 2021-08-16 14:04 UTC (permalink / raw
To: gentoo-commits
commit: 216e744138b292272a62bd493f01502e93e330e5
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 14:03:08 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 14:03:08 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=216e7441
sys-apps/sg3_utils: Drop redundant patch
Thanks-to: Joshua Kinard <kumba <AT> gentoo.org>
Closes: https://bugs.gentoo.org/808594
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../sg3_utils/files/sg3_utils-1.26-stdint.patch | 31 ----------------------
sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild | 4 ---
2 files changed, 35 deletions(-)
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch b/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
deleted file mode 100644
index 62fb30240e1..00000000000
--- a/sys-apps/sg3_utils/files/sg3_utils-1.26-stdint.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Ed Catmur <ed@catmur.co.uk>
-Gentoo-Bug: 229653
-X-Gentoo-URL: http://bugs.gentoo.org/show_bug.cgi?id=229653
-X-Gentoo-URL: http://bugs.gentoo.org/attachment.cgi?id=158565&action=view
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-For uint64_t to be available, <stdint.h> must be included:
-http://www.opengroup.org/onlinepubs/009695399/basedefs/stdint.h.html
-
---- a/include/sg_cmds_basic.h
-+++ b/include/sg_cmds_basic.h
-@@ -30,6 +30,8 @@
- *
- */
-
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---- a/include/sg_cmds_extra.h
-+++ b/include/sg_cmds_extra.h
-@@ -30,6 +30,8 @@
- *
- */
-
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
index 9a35e645d32..6d84c1ba6da 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
@@ -18,10 +18,6 @@ IUSE="static-libs"
DEPEND="sys-devel/libtool"
RDEPEND="!sys-apps/rescan-scsi-bus"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
-)
-
src_configure() {
econf $(use_enable static-libs static)
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/
@ 2021-08-17 3:59 Joshua Kinard
0 siblings, 0 replies; 7+ messages in thread
From: Joshua Kinard @ 2021-08-17 3:59 UTC (permalink / raw
To: gentoo-commits
commit: 38cd2e8f37c164f42abaf9de696610d9053d27c1
Author: Joshua Kinard <kumba <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 17 03:57:24 2021 +0000
Commit: Joshua Kinard <kumba <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 03:58:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38cd2e8f
sys-apps/sg3_utils: Fix a compile issue under musl libc
Fix a compile issue under musl libc where the sg_dd utility
internally uses the reentrant functions srand48_r(3) and
mrand48_r(3), which are glibc-specific extensions. Changed
to using the portable non-reentrant versions, and sent a patch
upstream, which was acknowledged by the author for the next
release.
Closes: https://bugs.gentoo.org/808600
Signed-off-by: Joshua Kinard <kumba <AT> gentoo.org>
Package-Manager: Portage-3.0.20, Repoman-3.0.3
.../files/sg3_utils-1.46-musl-drand48-compat.patch | 99 ++++++++++++++++++++++
sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild | 7 +-
2 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch b/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch
new file mode 100644
index 00000000000..d4152c3d265
--- /dev/null
+++ b/sys-apps/sg3_utils/files/sg3_utils-1.46-musl-drand48-compat.patch
@@ -0,0 +1,99 @@
+diff -Naurp sg3_utils-1.46.orig/doc/sg_dd.8 sg3_utils-1.46/doc/sg_dd.8
+--- sg3_utils-1.46.orig/doc/sg_dd.8 2021-03-22 00:36:43.000000000 -0400
++++ sg3_utils-1.46/doc/sg_dd.8 2021-08-16 14:07:16.703526168 -0400
+@@ -394,7 +394,7 @@ random
+ this flag is only active with \fIiflag=\fR and when given replaces
+ \fIif=IFILE\fR. If both are given an error is generated. The input will
+ be a stream of pseudo random bytes. The Linux getrandom(2) system call is
+-used to create a seed and thereadter mrand48_r(3) is used to generate a
++used to create a seed and thereadter mrand48(3) is used to generate a
+ pseudo random sequence, 4 bytes at a time. The quality of the randomness
+ can be viewed with the ent(1) utility. This is not a high quality random
+ number generator, it is built for speed, not quality. One application is
+diff -Naurp sg3_utils-1.46.orig/src/sg_dd.c sg3_utils-1.46/src/sg_dd.c
+--- sg3_utils-1.46.orig/src/sg_dd.c 2021-03-27 20:58:36.000000000 -0400
++++ sg3_utils-1.46/src/sg_dd.c 2021-08-16 12:56:26.316550042 -0400
+@@ -176,7 +176,6 @@ static uint8_t * free_zeros_buff = NULL;
+ static int read_long_blk_inc = READ_LONG_DEF_BLK_INC;
+
+ static long seed;
+-static struct drand48_data drand;/* opaque, used by srand48_r and mrand48_r */
+
+ static const char * proc_allow_dio = "/proc/scsi/sg/allow_dio";
+
+@@ -2124,7 +2123,7 @@ main(int argc, char * argv[])
+ #endif
+ if (verbose > 1)
+ pr2serr("seed=%ld\n", seed);
+- srand48_r(seed, &drand);
++ srand48(seed);
+ } else if (iflag.zero) {
+ ccp = "<zero bytes>";
+ cc2p = "00";
+@@ -2401,7 +2400,7 @@ main(int argc, char * argv[])
+ for (kk = 0; kk < blocks; ++kk, bp += blk_sz) {
+ for (j = 0; j < blk_sz; j += jbump) {
+ /* mrand48 takes uniformly from [-2^31, 2^31) */
+- mrand48_r(&drand, &rn);
++ rn = mrand48();
+ *((uint32_t *)(bp + j)) = (uint32_t)rn;
+ }
+ }
+diff -Naurp sg3_utils-1.46.orig/testing/sgh_dd.cpp sg3_utils-1.46/testing/sgh_dd.cpp
+--- sg3_utils-1.46.orig/testing/sgh_dd.cpp 2021-03-28 21:27:17.000000000 -0400
++++ sg3_utils-1.46/testing/sgh_dd.cpp 2021-08-16 14:06:37.262536902 -0400
+@@ -312,7 +312,6 @@ typedef struct request_element
+ uint32_t in_mrq_q_blks;
+ uint32_t out_mrq_q_blks;
+ long seed;
+- struct drand48_data drand; /* opaque, used by srand48_r and mrand48_r */
+ pthread_t mrq_abort_thread_id;
+ Mrq_abort_info mai;
+ } Rq_elem;
+@@ -1491,7 +1490,7 @@ read_write_thread(void * v_tip)
+ #endif
+ if (vb > 1)
+ pr2serr_lk("thread=%d: seed=%ld\n", rep->id, rep->seed);
+- srand48_r(rep->seed, &rep->drand);
++ srand48(rep->seed);
+ }
+ if (clp->in_flags.same_fds || clp->out_flags.same_fds)
+ ;
+@@ -1804,7 +1803,7 @@ normal_in_rd(Rq_elem * rep, int blocks)
+ for (k = 0, bp = rep->buffp; k < blocks; ++k, bp += clp->bs) {
+ for (j = 0; j < clp->bs; j += jbump) {
+ /* mrand48 takes uniformly from [-2^31, 2^31) */
+- mrand48_r(&rep->drand, &rn);
++ rn = mrand48();
+ *((uint32_t *)(bp + j)) = (uint32_t)rn;
+ }
+ }
+diff -Naurp sg3_utils-1.46.orig/testing/sg_mrq_dd.cpp sg3_utils-1.46/testing/sg_mrq_dd.cpp
+--- sg3_utils-1.46.orig/testing/sg_mrq_dd.cpp 2021-03-28 21:27:17.000000000 -0400
++++ sg3_utils-1.46/testing/sg_mrq_dd.cpp 2021-08-16 14:06:45.842752108 -0400
+@@ -313,7 +313,6 @@ typedef struct request_element
+ int out_local_partial;
+ int in_resid_bytes;
+ long seed;
+- struct drand48_data drand; /* opaque, used by srand48_r and mrand48_r */
+ } Rq_elem;
+
+ /* Additional parameters for sg_start_io() and sg_finish_io() */
+@@ -1310,7 +1309,7 @@ read_write_thread(struct global_collecti
+ #endif
+ if (vb > 1)
+ pr2serr_lk("[%d] %s: seed=%ld\n", id, __func__, rep->seed);
+- srand48_r(rep->seed, &rep->drand);
++ srand48(rep->seed);
+ }
+
+ if (in_is_sg && clp->infp) {
+@@ -1524,7 +1523,7 @@ normal_in_rd(Rq_elem * rep, int64_t lba,
+ for (k = 0; k < blocks; ++k, bp += clp->bs) {
+ for (j = 0; j < clp->bs; j += jbump) {
+ /* mrand48 takes uniformly from [-2^31, 2^31) */
+- mrand48_r(&rep->drand, &rn);
++ rn = mrand48();
+ *((uint32_t *)(bp + j)) = (uint32_t)rn;
+ }
+ }
diff --git a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
index 6d84c1ba6da..ef1bff372bc 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI="8"
inherit multilib
@@ -18,6 +18,11 @@ IUSE="static-libs"
DEPEND="sys-devel/libtool"
RDEPEND="!sys-apps/rescan-scsi-bus"
+PATCHES=(
+ # Bug #808600
+ "${FILESDIR}"/${PN}-1.46-musl-drand48-compat.patch
+)
+
src_configure() {
econf $(use_enable static-libs static)
}
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/
@ 2022-11-18 2:20 Sam James
0 siblings, 0 replies; 7+ messages in thread
From: Sam James @ 2022-11-18 2:20 UTC (permalink / raw
To: gentoo-commits
commit: a1e9afb52621981f5e77546348f99d244ddcdb22
Author: Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Sun Nov 13 20:45:53 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 18 02:18:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e9afb5
sys-apps/sg3_utils: musl uint fix
Upstream patch for cherry pick - https://github.com/doug-gilbert/sg3_utils/commit/9e6d513fe192e53778b6dd98954e43b8e6f0c3a6.patch
This patch allows sg3_utils to work under Musl by replacing uint
with uint32_t and has been tested on amd64 and PPC.
Upstream bug: https://github.com/doug-gilbert/sg3_utils/pull/7
Closes: https://bugs.gentoo.org/828897
Thanks-to: ayuayuayu
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28259
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch | 32 +++++++++++++++++
sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild | 42 ++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch b/sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch
new file mode 100644
index 000000000000..1ce015e73a05
--- /dev/null
+++ b/sys-apps/sg3_utils/files/sg3_utils-1.47-musl.patch
@@ -0,0 +1,32 @@
+Closes: https://bugs.gentoo.org/828897
+
+From https://github.com/doug-gilbert/sg3_utils/commit/c93ad13ecd8ddfbb8bb3e4d5d5ad7f3f2c633db6.patch Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 14 Nov 2021 12:37:16 +0100
+Subject: [PATCH] src/sg_dd.c: fix musl build
+
+Fix the following build failure on musl raised since version 1.47 and
+https://github.com/doug-gilbert/sg3_utils/commit/f0195003bb0c66ba55084b2f7e0fe982f08c5675:
+
+sg_dd.c: In function 'main':
+sg_dd.c:2402:17: error: unknown type name 'uint'; did you mean 'int'?
+ 2402 | uint off;
+ | ^~~~
+ | int
+
+Fixes:
+ - http://autobuild.buildroot.org/results/9ead59ffefefe2a4e3b94a153b3d23231736d882
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+
+--- a/src/sg_dd.c
++++ b/src/sg_dd.c
+@@ -2399,7 +2399,7 @@ main(int argc, char * argv[])
+ res = blocks * blk_sz;
+ if (iflag.zero && iflag.ff && (blk_sz >= 4)) {
+ uint32_t pos = (uint32_t)skip;
+- uint off;
++ uint32_t off;
+
+ for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) {
+ for (j = 0; j < (blk_sz - 3); j += 4)
diff --git a/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
new file mode 100644
index 000000000000..b88d096ba1a7
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.47-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="https://sg.danny.cz/sg/"
+#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://sg.danny.cz/sg/p/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND="!sys-apps/rescan-scsi-bus"
+
+PATCHES=(
+ # Bug #828897
+ "${FILESDIR}"/${PN}-1.47-musl.patch
+)
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ dodoc COVERAGE doc/README examples/*.txt
+ newdoc scripts/README README.scripts
+
+ find "${ED}" -type f -name "*.la" -delete || die
+
+ # Better fix for bug 231089; some packages look for sgutils2
+ local path lib
+ path="/usr/$(get_libdir)"
+ for lib in "${ED}/"${path}/libsgutils2{,-${PV}}.*; do
+ lib=${lib##*/}
+ dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+ done
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-11-18 2:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-13 8:18 [gentoo-commits] repo/gentoo:master commit in: sys-apps/sg3_utils/, sys-apps/sg3_utils/files/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2021-03-30 7:05 Lars Wendler
2021-05-14 10:04 David Seifert
2021-05-14 10:39 David Seifert
2021-08-16 14:04 Lars Wendler
2021-08-17 3:59 Joshua Kinard
2022-11-18 2:20 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox