Bump for a new patchset, works on 2.6.18 and 2.6.19 kernels.

Fixes #142376 and #148423
Package-Manager: portage-2.1.2_rc2-r5

5 files changed, 123 insertions, 11 deletions

diff --git a/app-laptop/hdapsd/ChangeLog b/app-laptop/hdapsd/ChangeLog
index a9d418198f00..854c1d5f88d1 100644
--- a/app-laptop/hdapsd/ChangeLog
+++ b/app-laptop/hdapsd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-laptop/hdapsd
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.3 2006/06/28 08:58:14 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/ChangeLog,v 1.4 2006/12/05 11:38:55 uberlord Exp $
+
+*hdapsd-20060409-r1 (05 Dec 2006)
+
+  05 Dec 2006; Roy Marples <uberlord@gentoo.org> files/hdapsd.init,
+  +hdapsd-20060409-r1.ebuild:
+  Bump for a new patchset, works on 2.6.18 and 2.6.19 kernels.
+  Fixes #142376 and #148423
 
   28 Jun 2006; Roy Marples <uberlord@gentoo.org> hdapsd-20060409.ebuild:
   Remove syslog stuff as it was invalid for scsi/sata systems.
diff --git a/app-laptop/hdapsd/Manifest b/app-laptop/hdapsd/Manifest
index ba33cb33a5bf..dfdbf2f4e8e7 100644
--- a/app-laptop/hdapsd/Manifest
+++ b/app-laptop/hdapsd/Manifest
@@ -6,20 +6,25 @@ AUX hdapsd.conf 321 RMD160 5bb760d34bca3f5a12aeb057b78de7e2a9065bc3 SHA1 ade013d
 MD5 ef4095f13d4c1a5363c3ed2e0528bd08 files/hdapsd.conf 321
 RMD160 5bb760d34bca3f5a12aeb057b78de7e2a9065bc3 files/hdapsd.conf 321
 SHA256 22e1acf385427052a12858db005fd73d42d9f6818fb253b032cd326101df2e34 files/hdapsd.conf 321
-AUX hdapsd.init 1201 RMD160 c3034ecda4674ed3b6143b6dd7a93affe5d7ee3c SHA1 da31da30c14f66d178d32fd0f2b547a2cef3f212 SHA256 1d14fe6d0ade3651c259d4e438d5aa031aa9444086d3fbb0187dbcb7b3ce337e
-MD5 537c9631beaf73f0db48efc4a5686f48 files/hdapsd.init 1201
-RMD160 c3034ecda4674ed3b6143b6dd7a93affe5d7ee3c files/hdapsd.init 1201
-SHA256 1d14fe6d0ade3651c259d4e438d5aa031aa9444086d3fbb0187dbcb7b3ce337e files/hdapsd.init 1201
+AUX hdapsd.init 1267 RMD160 1ae521bcf38ace4904d97d64eedb4d72eaaffa23 SHA1 24bd54b9a322dcfc0c54d82093160a1965a8e118 SHA256 3555618d1613c3d60d5164b9f9e70fd7ac1ccf6f6b1f30d53aac33a901487964
+MD5 5adbdfabe13cf2add3346679d02eb2d2 files/hdapsd.init 1267
+RMD160 1ae521bcf38ace4904d97d64eedb4d72eaaffa23 files/hdapsd.init 1267
+SHA256 3555618d1613c3d60d5164b9f9e70fd7ac1ccf6f6b1f30d53aac33a901487964 files/hdapsd.init 1267
 DIST hdaps_protect-patches-1.tar.bz2 6179 RMD160 5b173034eebbbee598e01d45e5e76e2859c0a829 SHA1 7d79652ddc884b6619944a0d9ed70557e9c56779 SHA256 ab4192fa3a26497fe9fed63bfaedfebc74d288a85e7283b1bc338984be1133dd
+DIST hdaps_protect-patches-2.tar.bz2 10203 RMD160 899a109b58b7aa4949012cd447275d2f3957951e SHA1 67599f3c1a5daaa298f6f1d30168ab0f6c45f407 SHA256 59cfe2535f3d11d1fe54d3c6acb3d2471c461af7770816aeec02411566d38c4b
 DIST hdapsd-20060409.c.bz2 5253 RMD160 0b8d07a2612bd4888014913bd8810de664352bfb SHA1 df6c5bf28d4539e97bb1800a455a36cf690d4779 SHA256 e8e1788d485814cd294c33744b60265423d8971abf5ab50b037f05de2c710a21
+EBUILD hdapsd-20060409-r1.ebuild 2336 RMD160 c3fcfe132c4c5b69a5761d26ae0b91f10883547c SHA1 594154454ea49ea87991935f06071b1a9f2efe11 SHA256 f88b4844e6849e57187baef04d779988ed648fcf2e095b530623b4b36e9d0d2d
+MD5 db4730d9b8becbfd491ee0ac626c54d7 hdapsd-20060409-r1.ebuild 2336
+RMD160 c3fcfe132c4c5b69a5761d26ae0b91f10883547c hdapsd-20060409-r1.ebuild 2336
+SHA256 f88b4844e6849e57187baef04d779988ed648fcf2e095b530623b4b36e9d0d2d hdapsd-20060409-r1.ebuild 2336
 EBUILD hdapsd-20060409.ebuild 2330 RMD160 99ac1351d0106fe33ad23dd0f39be41e1730229f SHA1 dc27fab3a6c54bda1449f569723f3e300e6e90ea SHA256 a019f3bfbf9f5ae1e06061bede2ee9cb99ddef1dbbc3efe05f08484cfacea668
 MD5 5dbb372adc59a22fdb38f7eb48e15b8b hdapsd-20060409.ebuild 2330
 RMD160 99ac1351d0106fe33ad23dd0f39be41e1730229f hdapsd-20060409.ebuild 2330
 SHA256 a019f3bfbf9f5ae1e06061bede2ee9cb99ddef1dbbc3efe05f08484cfacea668 hdapsd-20060409.ebuild 2330
-MISC ChangeLog 875 RMD160 a2cb1a0cb0235ff7ba0d61f67019ead214c9223c SHA1 2b37bf0a8b1d4ea3bcbc63d7a68070c4670322eb SHA256 765adcde564b5ce59ff08819c1878077ad781abbf7f982dacc3dad6c33e528a0
-MD5 9c47e6a6072307563bfc28760a4da959 ChangeLog 875
-RMD160 a2cb1a0cb0235ff7ba0d61f67019ead214c9223c ChangeLog 875
-SHA256 765adcde564b5ce59ff08819c1878077ad781abbf7f982dacc3dad6c33e528a0 ChangeLog 875
+MISC ChangeLog 1100 RMD160 25895f4c0ca44406dfae3647f294ce3a4a5e474c SHA1 08ba464bb22fd8b041a5568eb427bc1eb18662b3 SHA256 26e8f93ab0b66ea65482a1cec24d1b1cc27a0c761df595bc0654239135078f37
+MD5 46a2ed244db447bf48a35aca8e3a027a ChangeLog 1100
+RMD160 25895f4c0ca44406dfae3647f294ce3a4a5e474c ChangeLog 1100
+SHA256 26e8f93ab0b66ea65482a1cec24d1b1cc27a0c761df595bc0654239135078f37 ChangeLog 1100
 MISC metadata.xml 356 RMD160 140232e3535cb4f3eecb376611b3419519b4b260 SHA1 2563060180594d039fa175a73a8437bc13af5660 SHA256 29a57a39b3a1fdf3091c4012b4161c27b043da505743cf665860527545a9a1fa
 MD5 29203234d07d55e82b92c297ab988473 metadata.xml 356
 RMD160 140232e3535cb4f3eecb376611b3419519b4b260 metadata.xml 356
@@ -27,3 +32,6 @@ SHA256 29a57a39b3a1fdf3091c4012b4161c27b043da505743cf665860527545a9a1fa metadata
 MD5 c92320b8f991d8345345eceafb29d0a9 files/digest-hdapsd-20060409 506
 RMD160 11a06bc2bcb655211ed3fe74d7a8675d98bc0a5b files/digest-hdapsd-20060409 506
 SHA256 816c22ded32067fbf9e200c293b5294d64a128d73eada333aaa68198e8455e09 files/digest-hdapsd-20060409 506
+MD5 ef4ce6b815df724ce87709167198b9a3 files/digest-hdapsd-20060409-r1 509
+RMD160 8ada6c6bd17fff3a7f229fe9f7aa93e563fb01dc files/digest-hdapsd-20060409-r1 509
+SHA256 b2db6a2e79197bc563e8ea76089cbf6a238bee5eaa90cefe3990e0abd4db4b7f files/digest-hdapsd-20060409-r1 509
diff --git a/app-laptop/hdapsd/files/digest-hdapsd-20060409-r1 b/app-laptop/hdapsd/files/digest-hdapsd-20060409-r1
new file mode 100644
index 000000000000..1b290cfaa92c
--- /dev/null
+++ b/app-laptop/hdapsd/files/digest-hdapsd-20060409-r1
@@ -0,0 +1,6 @@
+MD5 b7503b856a64783b8920a7c8d48eb3a3 hdaps_protect-patches-2.tar.bz2 10203
+RMD160 899a109b58b7aa4949012cd447275d2f3957951e hdaps_protect-patches-2.tar.bz2 10203
+SHA256 59cfe2535f3d11d1fe54d3c6acb3d2471c461af7770816aeec02411566d38c4b hdaps_protect-patches-2.tar.bz2 10203
+MD5 ef8bf36c67e2aee8914be178012b3861 hdapsd-20060409.c.bz2 5253
+RMD160 0b8d07a2612bd4888014913bd8810de664352bfb hdapsd-20060409.c.bz2 5253
+SHA256 e8e1788d485814cd294c33744b60265423d8971abf5ab50b037f05de2c710a21 hdapsd-20060409.c.bz2 5253
diff --git a/app-laptop/hdapsd/files/hdapsd.init b/app-laptop/hdapsd/files/hdapsd.init
index 00609c1cfac9..a4134908fbca 100644
--- a/app-laptop/hdapsd/files/hdapsd.init
+++ b/app-laptop/hdapsd/files/hdapsd.init
@@ -34,7 +34,7 @@ checkconfig() {
 start() {
     checkconfig || return 1
 
-    ebegin "Starting hdapsd"
+    ebegin "Starting Hard Drive Active Protection System daemon"
     start-stop-daemon --start --exec /usr/sbin/hdapsd \
 	--pidfile /var/run/hdapsd.pid \
 	-- -b -p -d "${DISK}" -s "${THRESHOLD}" ${OPTIONS}
@@ -42,7 +42,7 @@ start() {
 }
 	
 stop() {
-    ebegin "Stopping hdaps daemon"
+    ebegin "Stopping Hard Drive Active Protection System daemon"
     start-stop-daemon --stop --exec /usr/sbin/hdapsd \
 	--pidfile /var/run/hdapsd.pid
     eend $?
diff --git a/app-laptop/hdapsd/hdapsd-20060409-r1.ebuild b/app-laptop/hdapsd/hdapsd-20060409-r1.ebuild
new file mode 100644
index 000000000000..dddcc53c662f
--- /dev/null
+++ b/app-laptop/hdapsd/hdapsd-20060409-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/hdapsd/hdapsd-20060409-r1.ebuild,v 1.1 2006/12/05 11:38:55 uberlord Exp $
+
+inherit eutils linux-info
+
+PROTECT_VER="2"
+
+DESCRIPTION="IBM ThinkPad Harddrive Active Protection disk head parking daemon"
+HOMEPAGE="http://hdaps.sourceforge.net/"
+SRC_URI="mirror://gentoo/${P}.c.bz2
+	mirror://gentoo/hdaps_protect-patches-${PROTECT_VER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+
+IUSE=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+CONFIG_CHECK="SENSORS_HDAPS"
+ERROR_NET_RADIO="${P} requires support for HDAPS (CONFIG_SENSORS_HDAPS)"
+
+src_compile() {
+	cd "${WORKDIR}"
+	gcc ${CFLAGS} "${P}".c -o hdapsd || die "failed to compile"
+}
+
+src_install() {
+	dosbin "${WORKDIR}"/hdapsd
+	newconfd "${FILESDIR}"/hdapsd.conf hdapsd
+	newinitd "${FILESDIR}"/hdapsd.init hdapsd
+
+	# Install our kernel patches
+	dodoc *.patch "${FILESDIR}"/hdaps-Z60m.patch
+}
+
+# Yes, this sucks as the source location may change, kernel sources may not be
+# installed, but we try our best anyway
+kernel_patched() {
+	get_version
+
+	if grep -qs "blk_protect_register" "${KERNEL_DIR}"/block/ll_rw_blk.c ; then
+		einfo "Your kernel has already been patched for blk_freeze"
+		return 0
+	fi
+
+	return 1
+}
+
+pkg_config() {
+	kernel_patched && return 0
+
+	local docdir="${ROOT}/usr/share/doc/${PF}/"
+	local p="hdaps_protect-${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}.patch.gz"
+
+	# We need to find our FILESDIR as it's now lost
+	if [[ ! -e ${docdir}/${p} ]] ; then
+		eerror "We don't have a patch for kernel ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} yet"
+		return 1
+	fi
+
+	if [[ ! -d ${KERNEL_DIR} ]] ; then
+		eerror "Kernel sources not found!"
+		return 1
+	fi
+
+	cd "${KERNEL_DIR}"
+	epatch "${docdir}/${p}"
+
+	# This is just a nice to have for me as I use a Z60m myself
+	if ! grep -q "Z60m" "${KERNEL_DIR}"/drivers/hwmon/hdaps.c ; then
+		epatch "${docdir}"/hdaps-Z60m.patch.gz
+	fi
+
+	echo
+	einfo "Now you should rebuild your kernel, its modules"
+	einfo "and then install them."
+}
+
+pkg_postinst(){
+	[[ -n $(ls "${ROOT}"/sys/block/*/queue/protect 2>/dev/null) ]] && return 0
+
+	if ! kernel_patched ; then
+		ewarn "Your kernel has NOT been patched for blk_freeze"
+		einfo "The ebuild can attempt to patch your kernel like so"
+		einfo "   emerge --config =${PF}"
+	fi
+}