Remove SATA sense checks so that hddtemp works with 2.6.20+ kernels (bug #165453).

Package-Manager: portage-2.1.2-r9

5 files changed, 114 insertions, 8 deletions

diff --git a/app-admin/hddtemp/ChangeLog b/app-admin/hddtemp/ChangeLog
index d1bbfc91825b..66c3f6444b79 100644
--- a/app-admin/hddtemp/ChangeLog
+++ b/app-admin/hddtemp/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/hddtemp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.49 2007/02/10 13:33:33 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/ChangeLog,v 1.50 2007/02/10 13:42:59 spock Exp $
+
+*hddtemp-0.3_beta15-r1 (10 Feb 2007)
+
+  10 Feb 2007; Michał Januszewski <spock@gentoo.org>
+  +files/hddtemp-0.3_beta15-satacmds.patch, +hddtemp-0.3_beta15-r1.ebuild:
+  Remove SATA sense checks so that hddtemp works with 2.6.20+ kernels (bug
+  #165453).
 
   10 Feb 2007; Michał Januszewski <spock@gentoo.org>
   -files/hddtemp-0.3_beta14-sizeofdsk.patch, -hddtemp-0.3_beta14.ebuild,
diff --git a/app-admin/hddtemp/Manifest b/app-admin/hddtemp/Manifest
index ed05898affe0..a31075eada70 100644
--- a/app-admin/hddtemp/Manifest
+++ b/app-admin/hddtemp/Manifest
@@ -9,6 +9,10 @@ AUX hddtemp-0.3_beta15-byteswap.patch 1037 RMD160 969720123d9d100ae83f6d9f3b48d2
 MD5 bed032d7702ec78e736362ce4a9d5796 files/hddtemp-0.3_beta15-byteswap.patch 1037
 RMD160 969720123d9d100ae83f6d9f3b48d2c4cd2b58b5 files/hddtemp-0.3_beta15-byteswap.patch 1037
 SHA256 85eeaff97c96d2f77a93caa3270ee598f756c4eb0da6753e5ee8602fa1a5bdec files/hddtemp-0.3_beta15-byteswap.patch 1037
+AUX hddtemp-0.3_beta15-satacmds.patch 986 RMD160 445eb1a1c77738b0d62595a15955708c93310b16 SHA1 c81c89d0c8770aae5f667b5416e22c75518d122b SHA256 f3ae8ebd08d598cf9292d08e5fe07f54f894da7a90f02dcc9c46bb8d37afde56
+MD5 e817c43d60b715e6097b624f42bba2fe files/hddtemp-0.3_beta15-satacmds.patch 986
+RMD160 445eb1a1c77738b0d62595a15955708c93310b16 files/hddtemp-0.3_beta15-satacmds.patch 986
+SHA256 f3ae8ebd08d598cf9292d08e5fe07f54f894da7a90f02dcc9c46bb8d37afde56 files/hddtemp-0.3_beta15-satacmds.patch 986
 AUX hddtemp-conf.d 410 RMD160 0562571d46330a562768cfa6f0f071339ebd09a8 SHA1 3a642df90eb05bbd4524b622c58ce35b5f4dd4e8 SHA256 4b7b6793edbe54669965bf49dac95b273f128481aabe4b2b9e6c263f0e0a9ff5
 MD5 a4981932b07890d6292e068fb4ee8264 files/hddtemp-conf.d 410
 RMD160 0562571d46330a562768cfa6f0f071339ebd09a8 files/hddtemp-conf.d 410
@@ -27,14 +31,18 @@ EBUILD hddtemp-0.3_beta13.ebuild 1276 RMD160 55968d7a3d39dbd7dcd02defb182f192a3d
 MD5 18f827ae137a300c155ee91af047824d hddtemp-0.3_beta13.ebuild 1276
 RMD160 55968d7a3d39dbd7dcd02defb182f192a3d629d3 hddtemp-0.3_beta13.ebuild 1276
 SHA256 9ff2ce6073a2239a2f615c24243750d187c83e901ad9292b72e5650d0f306472 hddtemp-0.3_beta13.ebuild 1276
+EBUILD hddtemp-0.3_beta15-r1.ebuild 1395 RMD160 ddf32781aaea48033d385ef17b10d6bc83a23b6f SHA1 da47c8e8e1692cf45bb1f55bd4153b34ed52297f SHA256 8911807818d25f59b979bfd46cff78b2350edbf040d2e8b669385e36982ca73b
+MD5 b696d2fe713c34e52be8ba8b9225e017 hddtemp-0.3_beta15-r1.ebuild 1395
+RMD160 ddf32781aaea48033d385ef17b10d6bc83a23b6f hddtemp-0.3_beta15-r1.ebuild 1395
+SHA256 8911807818d25f59b979bfd46cff78b2350edbf040d2e8b669385e36982ca73b hddtemp-0.3_beta15-r1.ebuild 1395
 EBUILD hddtemp-0.3_beta15.ebuild 1354 RMD160 7caa67dee0bba04a735a32cf48ab6d239ff5ca59 SHA1 a5c0b51cdc6c1bdbd40f762c2ba3d236db0b183c SHA256 4a73f9306d42245a9bd7a69f69cc7cd98c0463b715e8d69cb9ee59afd1394425
 MD5 731c6612dde81f724596d31aeabb12d7 hddtemp-0.3_beta15.ebuild 1354
 RMD160 7caa67dee0bba04a735a32cf48ab6d239ff5ca59 hddtemp-0.3_beta15.ebuild 1354
 SHA256 4a73f9306d42245a9bd7a69f69cc7cd98c0463b715e8d69cb9ee59afd1394425 hddtemp-0.3_beta15.ebuild 1354
-MISC ChangeLog 8583 RMD160 9a472b6f3bfb79d112b66acc3bbebf9a7f65c51c SHA1 41a5cb785059e81492befd37898fa5aad2f44e16 SHA256 666c77734ea0f2621c436612375196fac22a45b7b316ccf7561612dbc679a5e4
-MD5 89f034e0993122008e4c888f11e0f5eb ChangeLog 8583
-RMD160 9a472b6f3bfb79d112b66acc3bbebf9a7f65c51c ChangeLog 8583
-SHA256 666c77734ea0f2621c436612375196fac22a45b7b316ccf7561612dbc679a5e4 ChangeLog 8583
+MISC ChangeLog 8838 RMD160 d2e8721566b7f8496d3eb28541b916920adb5951 SHA1 cb0b1e9cb10b9ab6ab0690961174086ac0757f8a SHA256 d3bb43e0e9775428ff5a9a33c059da05286125536e51f2c7ee5d29ccceef130e
+MD5 317a78616ec2a5dd2987e0c981307d03 ChangeLog 8838
+RMD160 d2e8721566b7f8496d3eb28541b916920adb5951 ChangeLog 8838
+SHA256 d3bb43e0e9775428ff5a9a33c059da05286125536e51f2c7ee5d29ccceef130e ChangeLog 8838
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 MD5 87131e5c56922624f8a0c7fe61cd28da metadata.xml 220
 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 metadata.xml 220
@@ -45,10 +53,13 @@ SHA256 1e305b86cb334e8e53020e873989f9f2c8a4b8c1383b8c4537b38bc95dd0d954 files/di
 MD5 f39545c75ab43d19430ab8abfe9ea3b9 files/digest-hddtemp-0.3_beta15 259
 RMD160 0c7e37e16231df916c483eb49074bb7529f400ec files/digest-hddtemp-0.3_beta15 259
 SHA256 f1e970e75b2db44f6ea4fabf3af2526ecbac353e200074709cb6c7bdf241b131 files/digest-hddtemp-0.3_beta15 259
+MD5 f39545c75ab43d19430ab8abfe9ea3b9 files/digest-hddtemp-0.3_beta15-r1 259
+RMD160 0c7e37e16231df916c483eb49074bb7529f400ec files/digest-hddtemp-0.3_beta15-r1 259
+SHA256 f1e970e75b2db44f6ea4fabf3af2526ecbac353e200074709cb6c7bdf241b131 files/digest-hddtemp-0.3_beta15-r1 259
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFzcm2chej4aZK9/cRAsUGAKCC1x1U9fGD07txtCa3BFRq24B0oACgiEGk
-wIozVuzJVUNq56S4xcdu/Rs=
-=JXsW
+iD8DBQFFzcvmchej4aZK9/cRAgGNAJ96GVuLRfg8Z2b4QEq8pvQRx9X9hwCfZgjq
+Vu1cpUYrrJPKDcilNiPlC2o=
+=Tibg
 -----END PGP SIGNATURE-----
diff --git a/app-admin/hddtemp/files/digest-hddtemp-0.3_beta15-r1 b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta15-r1
new file mode 100644
index 000000000000..e041ddf87393
--- /dev/null
+++ b/app-admin/hddtemp/files/digest-hddtemp-0.3_beta15-r1
@@ -0,0 +1,3 @@
+MD5 8b829339e1ae9df701684ec239021bb8 hddtemp-0.3-beta15.tar.bz2 256372
+RMD160 82b6affbbb14d23b5a8f3fecf3fff7acc0bd9def hddtemp-0.3-beta15.tar.bz2 256372
+SHA256 618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b hddtemp-0.3-beta15.tar.bz2 256372
diff --git a/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
new file mode 100644
index 000000000000..d67e0681f33f
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-0.3_beta15-satacmds.patch
@@ -0,0 +1,26 @@
+diff -Naurp hddtemp-0.3-beta15-orig/src/satacmds.c hddtemp-0.3-beta15/src/satacmds.c
+--- hddtemp-0.3-beta15-orig/src/satacmds.c	2007-02-10 14:25:15.000000000 +0100
++++ hddtemp-0.3-beta15/src/satacmds.c	2007-02-10 14:26:53.000000000 +0100
+@@ -54,7 +54,6 @@ int sata_pass_thru(int device, unsigned 
+   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 @@ int sata_pass_thru(int device, unsigned 
+     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)
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r1.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r1.ebuild
new file mode 100644
index 000000000000..8af3f52c6493
--- /dev/null
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r1.ebuild,v 1.1 2007/02/10 13:42:59 spock Exp $
+
+inherit eutils
+
+MY_P=${P/_beta/-beta}
+
+DESCRIPTION="A simple utility to read the temperature of SMART capable hard drives"
+HOMEPAGE="http://www.guzu.net/linux/hddtemp.php"
+SRC_URI="http://www.guzu.net/files/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="nls"
+
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-satacmds.patch
+	epatch ${FILESDIR}/${P}-byteswap.patch
+}
+
+src_compile() {
+	local myconf
+
+	myconf="--with-db-path=/usr/share/hddtemp/hddtemp.db"
+	# disabling nls breaks compiling
+	use nls || myconf="--disable-nls ${myconf}"
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README TODO ChangeLog
+
+	insinto /usr/share/hddtemp
+	doins ${FILESDIR}/hddtemp.db
+
+	newconfd ${FILESDIR}/hddtemp-conf.d hddtemp
+	newinitd ${FILESDIR}/hddtemp-init hddtemp
+}
+
+pkg_postinst() {
+	einfo "In order to update your hddtemp database, run:"
+	einfo "  emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	cd ${ROOT}/usr/share/hddtemp
+
+	einfo "Trying to download the latest hddtemp.db file"
+	wget http://www.guzu.net/linux/hddtemp.db -O hddtemp.db
+}