From afa422ca47165cbd9b1926d7956b223e7299ac0117cba1b2707f18b3a0d77911 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 21 Sep 2009 14:24:59 +0000
Subject: [PATCH] Accepting request 20515 from home:garloff

Copy from home:garloff/hdparm via accept of submit request 20515 revision 5.

OBS-URL: https://build.opensuse.org/request/show/20515
OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=10
---
 hdparm-9.22.tar.bz2 |  3 ---
 hdparm-9.27.tar.bz2 |  3 +++
 hdparm.changes      | 26 ++++++++++++++++++++++++++
 hdparm.spec         | 13 +++++++++----
 wiper-warn.diff     | 16 ++++++++++++++++
 5 files changed, 54 insertions(+), 7 deletions(-)
 delete mode 100644 hdparm-9.22.tar.bz2
 create mode 100644 hdparm-9.27.tar.bz2
 create mode 100644 wiper-warn.diff

diff --git a/hdparm-9.22.tar.bz2 b/hdparm-9.22.tar.bz2
deleted file mode 100644
index 6d0ea1b..0000000
--- a/hdparm-9.22.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3a6a3c3996dd7a6584fbb2b84dd7b6338b21f60a045f2373959ea850ff79ccc2
-size 94717
diff --git a/hdparm-9.27.tar.bz2 b/hdparm-9.27.tar.bz2
new file mode 100644
index 0000000..c80a952
--- /dev/null
+++ b/hdparm-9.27.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dde7862d5b2be79fe1013cf29a511f929225d8712e87de765e57b8555d48afa2
+size 97138
diff --git a/hdparm.changes b/hdparm.changes
index b2f907a..755bc75 100644
--- a/hdparm.changes
+++ b/hdparm.changes
@@ -3,6 +3,32 @@ Wed Sep 16 17:12:55 CEST 2009 - mseben@novell.com
 
 - added leak-fix.patch [bnc#538942]
 
+-------------------------------------------------------------------
+Tue Sep 15 14:26:55 CEST 2009 - garloff@suse.de
+
+- Install wiper.sh and its README; display appropriate warnings
+- Update to hdparm-9.27:
+  * Update wiper.sh to 2.3
+  * Fix interaction with old IDE drivers
+- Update to hdparm-9.26:
+  * Update wiper.sh to 2.2
+  * Fix handling of model names with spaces in hdparm -i
+  * bugfix for --security-erase-enhanced
+  * set _FILE_OFFSET_BITS in geom.c
+  * added reporting for "Deterministic read ZEROs after TRIM" feature
+- Update to hdparm-9.25:
+  * slightly tidier output from --trim-* commands
+  * restrict --trim-sector-ranges-stdin to limit from 
+    /sys/block/sd?/queue/max_sectors_kb
+  * updated wiper.sh to use --trim-sector-ranges-stdin
+- Update to hdparm-9.24:
+  * fixed malloc() bug in --trim-sector-ranges
+- Update to hdparm-9.23:
+  * minor cosmetic changes in fibmap.c
+  * added --trim-sector-ranges-stdin for wiper.sh-2.0
+  * tightened up excess-args checking on a number of flags
+  * added name to version line
+
 -------------------------------------------------------------------
 Wed Aug 12 14:10:47 CEST 2009 - mseben@suse.cz
 
diff --git a/hdparm.spec b/hdparm.spec
index c200a10..9db32eb 100644
--- a/hdparm.spec
+++ b/hdparm.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package hdparm (Version 9.22)
+# spec file for package hdparm (Version 9.27)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -24,14 +24,15 @@ Group:          Hardware/Other
 PreReq:         %insserv_prereq %fillup_prereq coreutils
 Provides:       base:/sbin/hdparm
 AutoReqProv:    on
-Version:        9.22
+Version:        9.27
 Release:        1
 Summary:        A Program to Get and Set Hard Disk Parameters
 Source:         %{name}-%{version}.tar.bz2
 Source1:        56-idedma.rules
 Source2:        sysconfig.ide
 Source3:        udev.idedma.sh
-Patch1:         %{name}-%{version}-nostrip.patch
+Patch1:         %{name}-9.22-nostrip.patch
+Patch2:         wiper-warn.diff
 Url:            http://sourceforge.net/projects/hdparm/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -48,9 +49,11 @@ Authors:
 %prep
 %setup -q
 %patch1
+%patch2 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS -Wall -Wstrict-prototypes" LDFLAGS=
+cp -p wiper-2.3/README.txt README.wiper
 
 %install
 mkdir -p $RPM_BUILD_ROOT/sbin
@@ -65,6 +68,7 @@ install -m 755 %{S:3} $RPM_BUILD_ROOT/lib/udev/idedma.sh
 install -d $RPM_BUILD_ROOT/usr/lib/hdparm
 install -m 755 contrib/idectl $RPM_BUILD_ROOT/usr/lib/hdparm
 install -m 755 contrib/ultrabayd $RPM_BUILD_ROOT/usr/lib/hdparm
+install -m 755 wiper-2.3/wiper.sh $RPM_BUILD_ROOT/sbin
 
 %post
 if [ -f etc/sysconfig/hardware ] ; then
@@ -97,9 +101,10 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc Changelog README.acoustic contrib/README.contrib
+%doc Changelog README.acoustic contrib/README.contrib README.wiper
 %doc %{_mandir}/man8/hdparm.8.gz
 /sbin/hdparm
+/sbin/wiper.sh
 %dir /lib/udev
 /lib/udev/idedma.sh
 %dir /lib/udev/rules.d
diff --git a/wiper-warn.diff b/wiper-warn.diff
new file mode 100644
index 0000000..7473578
--- /dev/null
+++ b/wiper-warn.diff
@@ -0,0 +1,16 @@
+Index: hdparm-9.27/wiper-2.3/wiper.sh
+===================================================================
+--- hdparm-9.27.orig/wiper-2.3/wiper.sh
++++ hdparm-9.27/wiper-2.3/wiper.sh
+@@ -42,8 +42,11 @@ function find_prog(){
+ }
+ 
+ echo
+ echo "${0##*/}: Linux SATA SSD TRIM utility, version $VERSION, by Mark Lord."
++echo "${0##*/}: This tool is DANGEROUS! Please read and understand"
++echo "${0##*/}: /usr/share/doc/packages/hdparm/README.wiper"
++echo "${0##*/}: before going any further."
+ 
+ ## Ensure we have most of the necessary utilities available before trying to proceed:
+ ##
+ hash -r  ## Refresh bash's cached PATH entries