Accepting request 857921 from Base:System

- update to 9.60:
  - support for ioSafe Solo with jMicron bridge, courtesy Matthias-Christian Ott.
  - decode more bits from id[69], courtesy Adrián Kálazi.
  - allow passing of custom LDFLAGS from the environment.
  - add new "static" target.
  - fix --dco-identify max sectors, courtesy of Paul Sultana.
  - get rid of leftover "unknown" variables from identify.c
  - fixed return values from get_log_page_data().

OBS-URL: https://build.opensuse.org/request/show/857921
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hdparm?expand=0&rev=74

hdparm-9.58.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f
-size 138845

hdparm-9.60.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8397739c73e44d5ab96c4aef28fa9c0147276d53a1b5657ce04c4565cf6635cc
+size 155220

hdparm-leak-fix.patch

@@ -1,16 +1,17 @@
-diff -urEbwB hdparm-9.57/hdparm.c hdparm-9.57.new/hdparm.c
---- hdparm-9.57/hdparm.c	2018-10-16 20:12:53.000000000 +0200
-+++ hdparm-9.57.new/hdparm.c	2018-10-18 10:15:54.448809739 +0200
-@@ -1197,7 +1197,7 @@
- 	struct stat stat;
+Index: hdparm-9.60/hdparm.c
+===================================================================
+--- hdparm-9.60.orig/hdparm.c
++++ hdparm-9.60/hdparm.c
+@@ -1199,7 +1199,7 @@ static int abort_if_not_full_device (int
+ 	struct stat st;
  	__u64 start_lba;
  	int i, err, shortened = 0;
 -	char *fdevname = strdup(devname);
 +	char *fdevname = strdupa(devname);
  
- 	if (0 == fstat(fd, &stat) && S_ISCHR(stat.st_mode))
+ 	if (0 == fstat(fd, &st) && S_ISCHR(st.st_mode))
  		return 0; /* skip geometry test for character (non-block) devices; eg. /dev/sg* */
-@@ -1210,7 +1210,7 @@
+@@ -1212,7 +1212,7 @@ static int abort_if_not_full_device (int
  	}
  
  	if (!shortened)

hdparm-nostrip.patch

@@ -1,6 +1,20 @@
---- ./Makefile
-+++ ./Makefile
-@@ -14 +13,0 @@ CC ?= gcc
+Index: Makefile
+===================================================================
+--- Makefile.orig
++++ Makefile
+@@ -11,7 +11,6 @@ mandir = $(manprefix)/share/man
+ oldmandir = $(manprefix)/man
+ 
+ CC ?= gcc
 -STRIP ?= strip
-@@ -31 +29,0 @@ hdparm: hdparm.h sgio.h $(OBJS)
+ 
+ CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
+ 
+@@ -30,7 +29,6 @@ static:
+ 
+ hdparm: Makefile hdparm.h sgio.h $(OBJS)
+ 	$(CC) $(LDFLAGS) -o hdparm $(OBJS)
 -	$(STRIP) hdparm
+ 
+ hdparm.o:	hdparm.h sgio.h
+ 

hdparm-wiper-warn.patch

@@ -1,8 +1,8 @@
-Index: hdparm-9.28/wiper/wiper.sh
+Index: hdparm-9.60/wiper/wiper.sh
 ===================================================================
---- hdparm-9.28.orig/wiper/wiper.sh
-+++ hdparm-9.28/wiper/wiper.sh
-@@ -41,6 +41,9 @@ function usage_error(){
+--- hdparm-9.60.orig/wiper/wiper.sh
++++ hdparm-9.60/wiper/wiper.sh
+@@ -48,6 +48,9 @@ function usage_error(){
  
  echo
  echo "${0##*/}: Linux SATA SSD TRIM utility, version $VERSION, by Mark Lord."

hdparm.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Dec 20 12:46:21 UTC 2020 - Dirk Müller <dmueller@suse.com>
+
+- update to 9.60:
+  - support for ioSafe Solo with jMicron bridge, courtesy Matthias-Christian Ott.
+  - decode more bits from id[69], courtesy Adrián Kálazi.
+  - allow passing of custom LDFLAGS from the environment.
+  - add new "static" target.
+  - fix --dco-identify max sectors, courtesy of Paul Sultana.
+  - get rid of leftover "unknown" variables from identify.c
+  - fixed return values from get_log_page_data().
+
 -------------------------------------------------------------------
 Thu Nov 26 09:41:02 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
 

hdparm.spec

@@ -17,13 +17,13 @@
 
 
 Name:           hdparm
-Version:        9.58
+Version:        9.60
 Release:        0
 Summary:        A Program to get and set hard disk parameters
 License:        SUSE-Permissive
 Group:          Hardware/Other
-URL:            http://sourceforge.net/projects/hdparm/
-Source:         http://downloads.sf.net/hdparm/%{name}-%{version}.tar.gz
+URL:            https://sourceforge.net/projects/hdparm/
+Source:         https://downloads.sourceforge.net/project/hdparm/hdparm/hdparm-%{version}.tar.gz
 Patch1:         hdparm-nostrip.patch
 Patch2:         hdparm-wiper-warn.patch
 Patch3:         hdparm-leak-fix.patch
@@ -45,7 +45,7 @@ driver and IDE drives.
 %patch4 -p1
 
 %build
-make %{?_smp_mflags} CFLAGS="%{optflags} -Wall -Wstrict-prototypes" LDFLAGS= CC="gcc"
+%make_build CFLAGS="%{optflags} -Wall -Wstrict-prototypes" LDFLAGS= CC="gcc"
 cp -p wiper/README.txt README.wiper
 
 %install