diff --git a/.gitignore b/.gitignore index d90fb9b..09d27d4 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ hdparm-9.27.tar.gz +/hdparm-9.33.tar.gz diff --git a/hdparm-9.27-timeout-536731.patch b/hdparm-9.27-timeout-536731.patch deleted file mode 100644 index a38dced..0000000 --- a/hdparm-9.27-timeout-536731.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up hdparm-9.27/hdparm.c.sec_timeout hdparm-9.27/hdparm.c ---- hdparm-9.27/hdparm.c.sec_timeout 2009-12-11 12:48:43.000000000 +0100 -+++ hdparm-9.27/hdparm.c 2009-12-11 12:47:48.000000000 +0100 -@@ -137,7 +137,7 @@ static int please_destroy_my_drive = 0; - - const int timeout_12secs = 12; - const int timeout_5mins = (5 * 60); --const int timeout_2hrs = (2 * 60 * 60); -+const int timeout_12hrs = (12 * 60 * 60); - - static int open_flags = O_RDONLY|O_NONBLOCK; - -@@ -767,7 +767,7 @@ do_set_security (int fd) - err = errno; - perror("ERASE_PREPARE"); - } else { -- if ((do_taskfile_cmd(fd, r, timeout_2hrs))) { -+ if ((do_taskfile_cmd(fd, r, timeout_12hrs))) { - err = errno; - perror("SECURITY_ERASE"); - } diff --git a/hdparm.spec b/hdparm.spec index 585fa67..375c09f 100644 --- a/hdparm.spec +++ b/hdparm.spec @@ -1,12 +1,11 @@ Summary: A utility for displaying and/or setting hard disk parameters Name: hdparm -Version: 9.27 +Version: 9.33 Release: 1%{?dist} License: BSD Group: Applications/System URL: http://sourceforge.net/projects/hdparm/ Source: http://download.sourceforge.net/hdparm/hdparm-%{version}.tar.gz -Patch0: hdparm-9.27-timeout-536731.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: s390 s390x @@ -17,7 +16,6 @@ performance and to spin down hard drives for power conservation. %prep %setup -q -%patch0 -p1 %build CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags} STRIP=/bin/true LDFLAGS= @@ -39,6 +37,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/hdparm.8* %changelog +* Thu Oct 07 2010 Karsten Hopp 9.33-1 +- update to hdparm-9.33 (#592896) + * Fri Dec 11 2009 Karsten Hopp 9.27-1 - update to 9.27 - enhance security-erase timeout to 12h (#536731) diff --git a/sources b/sources index 9a612d4..bb79493 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e652dabb6c9233fb8a23ef60a17a1829 hdparm-9.27.tar.gz +08a908589eda69191f9f40cc98afe433 hdparm-9.33.tar.gz