rpms/hddtemp/FC-6 hddtemp-0.3-beta15-sata-sense.patch, NONE, 1.1 hddtemp.spec, 1.19, 1.20
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Wed Mar 21 19:09:36 UTC 2007
- Previous message (by thread): rpms/vym/FC-6 vym-mainwindow.patch, NONE, 1.1 vym-pro.patch, NONE, 1.1 vym-tex.patch, NONE, 1.1 vym.desktop, NONE, 1.1 vym.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/hddtemp/FC-5 hddtemp-0.3-beta15-sata-sense.patch, NONE, 1.1 hddtemp-db.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 hddtemp.spec, 1.17, 1.18 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/hddtemp/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4623
Modified Files:
hddtemp.spec
Added Files:
hddtemp-0.3-beta15-sata-sense.patch
Log Message:
* Tue Jan 9 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.11.beta15
- SATA sense fix (#221100, Jens Axboe).
hddtemp-0.3-beta15-sata-sense.patch:
--- NEW FILE hddtemp-0.3-beta15-sata-sense.patch ---
http://bugme.osdl.org/show_bug.cgi?id=7581
http://lkml.org/lkml/2006/12/19/131
--- hddtemp-0.3-beta15/src/satacmds.c~ 2006-12-19 12:01:10.000000000 +0100
+++ hddtemp-0.3-beta15/src/satacmds.c 2006-12-19 12:01:27.000000000 +0100
@@ -54,7 +54,6 @@
unsigned char cdb[16];
unsigned char sense[32];
int dxfer_direction;
- int ret;
memset(cdb, 0, sizeof(cdb));
cdb[0] = ATA_16;
@@ -78,13 +77,7 @@
cdb[6] = cmd[1];
cdb[14] = cmd[0];
- ret = scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
-
- /* Verify SATA magics */
- if (sense[0] != 0x72 || sense[7] != 0x0e || sense[9] != 0x0e || sense[10] != 0x00)
- return 1;
- else
- return ret;
+ return scsi_SG_IO(device, cdb, sizeof(cdb), buffer, cmd[3] * 512, sense, sizeof(sense), dxfer_direction);
}
void sata_fixstring(unsigned char *s, int bytecount)
Index: hddtemp.spec
===================================================================
RCS file: /cvs/extras/rpms/hddtemp/FC-6/hddtemp.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- hddtemp.spec 31 Dec 2006 10:28:45 -0000 1.19
+++ hddtemp.spec 21 Mar 2007 19:09:04 -0000 1.20
@@ -2,7 +2,7 @@
Name: hddtemp
Version: 0.3
-Release: 0.10.%{beta}%{?dist}
+Release: 0.11.%{beta}%{?dist}
Summary: Hard disk temperature tool
Group: Applications/System
@@ -16,6 +16,7 @@
Source5: %{name}.consoleapp
Patch0: %{name}-db.patch
Patch1: http://ftp.debian.org/debian/pool/main/h/hddtemp/hddtemp_0.3-beta15-33.diff.gz
+Patch2: %{name}-0.3-beta15-sata-sense.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
@@ -32,6 +33,7 @@
cp -p %{SOURCE1} ./hddtemp.db
%patch0 -p0
%patch1 -p1
+%patch2 -p1
sed -i -e s/Celius/Celsius/g src/hddtemp.c po/*.po*
sed -i -e 's|/etc/hddtemp.db|/usr/share/misc/hddtemp.db|' doc/hddtemp.8
sed -e 's|__ETCDIR__|%{_sysconfdir}|g' \
@@ -93,6 +95,9 @@
%changelog
+* Tue Jan 9 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.11.beta15
+- SATA sense fix (#221100, Jens Axboe).
+
* Sun Dec 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.3-0.10.beta15
- Apply patches from Debian containing bunch of hddtemp.db updates and
guess mode improvements for drives not in the database.
- Previous message (by thread): rpms/vym/FC-6 vym-mainwindow.patch, NONE, 1.1 vym-pro.patch, NONE, 1.1 vym-tex.patch, NONE, 1.1 vym.desktop, NONE, 1.1 vym.spec, NONE, 1.1 sources, 1.1, 1.2
- Next message (by thread): rpms/hddtemp/FC-5 hddtemp-0.3-beta15-sata-sense.patch, NONE, 1.1 hddtemp-db.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 hddtemp.spec, 1.17, 1.18 sources, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list