From 4fc5cbeae0e5f52dba24aa5a74a40a24aa94d03b24096ac001d55404e59d6def Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Tue, 23 Oct 2018 07:14:51 +0000
Subject: [PATCH] Accepting request 642808 from
 home:jubalh:branches:Base:System

- Update to 9.57:
  * Added --set-sector-size flag, used to change logical sector
    size for drives which support multiple sector sizes.
  * Also updated various bits of hdparm to better cope with
    non-512 byte sectors.
  * Various other minor fixes/enhancements.
- Update hdparm-leak-fix.patch

OBS-URL: https://build.opensuse.org/request/show/642808
OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=88
---
 hdparm-9.56.tar.gz    |  3 ---
 hdparm-9.57.tar.gz    |  3 +++
 hdparm-leak-fix.patch | 15 ++++++++-------
 hdparm.changes        | 11 +++++++++++
 hdparm.spec           |  4 ++--
 5 files changed, 24 insertions(+), 12 deletions(-)
 delete mode 100644 hdparm-9.56.tar.gz
 create mode 100644 hdparm-9.57.tar.gz

diff --git a/hdparm-9.56.tar.gz b/hdparm-9.56.tar.gz
deleted file mode 100644
index d407dd5..0000000
--- a/hdparm-9.56.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6ff9ed695f1017396eec4101f990f114b7b0e0a04c5aa6369c0394053d16e4da
-size 137213
diff --git a/hdparm-9.57.tar.gz b/hdparm-9.57.tar.gz
new file mode 100644
index 0000000..9514324
--- /dev/null
+++ b/hdparm-9.57.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d568db955a5428797f0b1677ef7cc8bab7756c6e7ff39f6c4a2b2c3640fe870
+size 138791
diff --git a/hdparm-leak-fix.patch b/hdparm-leak-fix.patch
index 59c6ea8..41ad717 100644
--- a/hdparm-leak-fix.patch
+++ b/hdparm-leak-fix.patch
@@ -1,15 +1,16 @@
---- hdparm.c.old	2009-08-02 22:08:56.000000000 +0200
-+++ hdparm.c	2009-09-17 09:57:44.000000000 +0200
-@@ -880,7 +880,7 @@
- {
+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;
  	__u64 start_lba;
  	int i, err, shortened = 0;
 -	char *fdevname = strdup(devname);
 +	char *fdevname = strdupa(devname);
  
- 	err = get_dev_geometry(fd, NULL, NULL, NULL, &start_lba, NULL);
- 	if (err)
-@@ -891,7 +891,7 @@
+ 	if (0 == fstat(fd, &stat) && S_ISCHR(stat.st_mode))
+ 		return 0; /* skip geometry test for character (non-block) devices; eg. /dev/sg* */
+@@ -1210,7 +1210,7 @@
  	}
  
  	if (!shortened)
diff --git a/hdparm.changes b/hdparm.changes
index 508e671..b2389c2 100644
--- a/hdparm.changes
+++ b/hdparm.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Oct 18 08:16:40 UTC 2018 - mvetter@suse.com
+
+- Update to 9.57:
+  * Added --set-sector-size flag, used to change logical sector
+    size for drives which support multiple sector sizes.
+  * Also updated various bits of hdparm to better cope with
+    non-512 byte sectors.
+  * Various other minor fixes/enhancements.
+- Update hdparm-leak-fix.patch
+
 -------------------------------------------------------------------
 Fri Apr 20 14:20:48 UTC 2018 - kstreitova@suse.com
 
diff --git a/hdparm.spec b/hdparm.spec
index ceed57c..1d03831 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -17,7 +17,7 @@
 
 
 Name:           hdparm
-Version:        9.56
+Version:        9.57
 Release:        0
 Summary:        A Program to get and set hard disk parameters
 License:        SUSE-Permissive
@@ -41,7 +41,7 @@ driver and IDE drives.
 %setup -q
 %patch1
 %patch2 -p1
-%patch3
+%patch3 -p1
 %patch4 -p1
 
 %build