From 710b0eaebeb25d7718bfb10e87f0d67adfaf8c2f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 12 Nov 2021 11:07:49 +0100 Subject: [PATCH] package/sg3_utils: bump to version 1.47 - Drop patch (already in version) and so autoreconf - Update hash of COPYING (upodate in date and author's email: https://github.com/doug-gilbert/sg3_utils/commit/f0195003bb0c66ba55084b2f7e0fe982f08c5675) - Fix the following build failure raised on musl since bump to version 1.46 in commit a00ed30780819c72174ae959bdd6f15ed961e938: sg_dd.c: At top level: sg_dd.c:179:28: error: storage size of 'drand' isn't known 179 | static struct drand48_data drand;/* opaque, used by srand48_r and mrand48_r */ | ^~~~~ https://github.com/doug-gilbert/sg3_utils/blob/r1.47/ChangeLog Fixes: - http://autobuild.buildroot.org/results/adc20fd52052daadfe1f16ee3f62c30e518cbd16 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- .../0001-support-uclinux-as-a-linux.patch | 16 ---------------- package/sg3_utils/sg3_utils.hash | 4 ++-- package/sg3_utils/sg3_utils.mk | 5 +---- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 package/sg3_utils/0001-support-uclinux-as-a-linux.patch diff --git a/package/sg3_utils/0001-support-uclinux-as-a-linux.patch b/package/sg3_utils/0001-support-uclinux-as-a-linux.patch deleted file mode 100644 index d9106cd9f8..0000000000 --- a/package/sg3_utils/0001-support-uclinux-as-a-linux.patch +++ /dev/null @@ -1,16 +0,0 @@ -Recognise uclinux as a linux - -Signed-off-by: "Yann E. MORIN" - -diff -durN sg3_utils-1.42.orig/configure.ac sg3_utils-1.42/configure.ac ---- sg3_utils-1.42.orig/configure.ac 2015-10-21 01:10:59.000000000 +0200 -+++ sg3_utils-1.42/configure.ac 2016-08-14 19:30:37.841766149 +0200 -@@ -71,7 +71,7 @@ - - # Define platform-specific symbol. - AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep 'freebsd' > /dev/null]) --AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null]) -+AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep -E '^(uc)?linux' > /dev/null]) - AM_CONDITIONAL(OS_OSF, [echo $host_os | grep '^osf' > /dev/null]) - AM_CONDITIONAL(OS_SOLARIS, [echo $host_os | grep '^solaris' > /dev/null]) - AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null]) diff --git a/package/sg3_utils/sg3_utils.hash b/package/sg3_utils/sg3_utils.hash index 39510b4dc2..ff2ef55180 100644 --- a/package/sg3_utils/sg3_utils.hash +++ b/package/sg3_utils/sg3_utils.hash @@ -1,6 +1,6 @@ # Locally calculated from download (no sig, hash) -sha256 59c268b10b93ce31a517af13e19c88f285c12b7dd065f50e36b16a7b6fa7b9a0 sg3_utils-1.46.tar.xz +sha256 ddb0cab85fedd8b0db020f3e3f02f6967a055616bf16ea9d5c7408cde41472b2 sg3_utils-1.47.tar.xz # Hash for license files -sha256 256ec2d7e4e79faabb105ed1ddf32aec11d830c3dadb955a4ab2616eb87439ba COPYING +sha256 d212debdb0a5d7754c977f6dc53bb6c88b4ace7ab784ddbccd06bb970adb1a37 COPYING sha256 8ddd1d82f2be2f5cbd5b5c3b5c2ee94a90d2ca7112958448da74dd78384fd96a BSD_LICENSE diff --git a/package/sg3_utils/sg3_utils.mk b/package/sg3_utils/sg3_utils.mk index 1983a12261..055f7befb9 100644 --- a/package/sg3_utils/sg3_utils.mk +++ b/package/sg3_utils/sg3_utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -SG3_UTILS_VERSION = 1.46 +SG3_UTILS_VERSION = 1.47 SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz SG3_UTILS_SITE = http://sg.danny.cz/sg/p SG3_UTILS_LICENSE = BSD-2-Clause (library) @@ -14,9 +14,6 @@ SG3_UTILS_LICENSE += , GPL-2.0+ (programs), BSD-2-Clause (programs) endif SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE -# Patching configure.ac/Makefile.am -SG3_UTILS_AUTORECONF = YES - # install the libsgutils2 library SG3_UTILS_INSTALL_STAGING = YES