From 1d24e8fb76efcc4676357103ebb23b8fcda2609f Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Sun, 17 Dec 2023 14:39:35 +0000
Subject: [PATCH] community/sg3_utils: upgrade to 1.48
also, switch project & source URLs to HTTPS
---
community/sg3_utils/APKBUILD | 12 +++++-------
community/sg3_utils/unsigned-int.patch | 15 ---------------
2 files changed, 5 insertions(+), 22 deletions(-)
delete mode 100644 community/sg3_utils/unsigned-int.patch
diff --git a/community/sg3_utils/APKBUILD b/community/sg3_utils/APKBUILD
index 52fadd1a4b5c..b4c8ad5ef3ea 100644
--- a/community/sg3_utils/APKBUILD
+++ b/community/sg3_utils/APKBUILD
@@ -1,17 +1,16 @@
# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=sg3_utils
-pkgver=1.47
-pkgrel=1
+pkgver=1.48
+pkgrel=0
pkgdesc="Generic SCSI utilities"
-url="http://sg.danny.cz/sg/sg3_utils.html"
+url="https://sg.danny.cz/sg/sg3_utils.html"
arch="all"
options="!check" # No test suite.
license="BSD-2-Clause AND GPL-2.0-or-later"
makedepends="linux-headers"
subpackages="$pkgname-dev $pkgname-doc"
-source="http://sg.danny.cz/sg/p/sg3_utils-$pkgver.tgz
- unsigned-int.patch"
+source="https://sg.danny.cz/sg/p/sg3_utils-$pkgver.tgz"
build() {
./configure \
@@ -34,6 +33,5 @@ package() {
}
sha512sums="
-27e43eb1103d6fb321af106964e56b800688ee74ebc47201cda1f29703ddaa34655cb0a6ce926952fdb66e10904e32dda4ca448789e9305a02d55f5477d5d21d sg3_utils-1.47.tgz
-e288986ef0cdb6a6a07fea51bbeb02f8071eb689eecab8f91c4a6a82528bbed865e1c7b76bc4a5d8236eff1d11e09214ad1d443704b32427d849e2af0cedbb23 unsigned-int.patch
+7869e74f289d046a4786e8967492446d4a863ae7f5a4fb3b08182f758e4b63a8e2e41e8f256b1a5cb7d1c0a14cacb9df4f70f12cf0d04492ca6adf4bd3d37dde sg3_utils-1.48.tgz
"
diff --git a/community/sg3_utils/unsigned-int.patch b/community/sg3_utils/unsigned-int.patch
deleted file mode 100644
index ca6d8111f07d..000000000000
--- a/community/sg3_utils/unsigned-int.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream report: https://github.com/hreinecke/sg3_utils/issues/77
-
-diff --git a/src/sg_dd.c b/src/sg_dd.c
-index 9d05c93..7662728 100644
---- 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;
-+ unsigned int off;
-
- for (k = 0, off = 0; k < blocks; ++k, off += blk_sz, ++pos) {
- for (j = 0; j < (blk_sz - 3); j += 4)
--
GitLab