hdparm fix for new prereleases of glibc 2.3.3

4 files changed, 50 insertions, 11 deletions

diff --git a/sys-apps/hdparm/ChangeLog b/sys-apps/hdparm/ChangeLog
index b3fa0f41c595..012d7a27ff33 100644
--- a/sys-apps/hdparm/ChangeLog
+++ b/sys-apps/hdparm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hdparm
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.32 2004/01/09 19:50:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/ChangeLog,v 1.33 2004/02/09 02:08:47 brad_mssw Exp $
+
+  08 Feb 2004; Brad House <brad_mssw@gentoo.org> hdparm-5.4.ebuild,
+  files/hdparm-5.4-readahead_rename.patch:
+  Patch provided by James Noble in Bug #40908 to work around glibc
+  2.3.3_pre20040117+ versions which define readahead internally in bits/fcntl.h
 
   09 Jan 2004; Aron Griffis <agriffis@gentoo.org> hdparm-5.4.ebuild:
   stable on alpha
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 407cdd9516f6..39537bce9653 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,13 +1,14 @@
+MD5 66fdafca139592ab257d0082e75b4377 ChangeLog 4120
+MD5 e584aac79d5e0707320d814fec4968e4 hdparm-5.2-r3.ebuild 854
 MD5 de345e6967f324a0fe927bfd2684e935 hdparm-5.3-r1.ebuild 807
-MD5 79addcfcff37bea2f39b6aef5050139f files/hdparm-new-init 2137
-MD5 300982c72dc0f865d5ad6c542e3b6c4c files/digest-hdparm-5.4 61
-MD5 5ad61cfc6a0abd8ceb1f62f96df56cf5 files/hdparm-init 387
-MD5 e5329109e5d4913db5d99dea05ea7cb7 files/hdparm-conf.d 526
+MD5 4070c0febd8673c35c11d8d7793af6c6 hdparm-5.3-r2.ebuild 1077
+MD5 36fe0f027a1aeea037b4a7ef4b4e5b86 hdparm-5.4.ebuild 1120
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 550ca4c2cb3569de0c9a31035e6962a4 files/digest-hdparm-5.2-r3 61
 MD5 a6bccb876455636b364c093460cbb994 files/digest-hdparm-5.3-r1 61
 MD5 a6bccb876455636b364c093460cbb994 files/digest-hdparm-5.3-r2 61
-MD5 4acc547d1f199ce424fb2229395e1058 hdparm-5.4.ebuild 1071
-MD5 e584aac79d5e0707320d814fec4968e4 hdparm-5.2-r3.ebuild 854
-MD5 4070c0febd8673c35c11d8d7793af6c6 hdparm-5.3-r2.ebuild 1077
-MD5 13314590be3f6dfffbf272bd7de2804d ChangeLog 3860
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 300982c72dc0f865d5ad6c542e3b6c4c files/digest-hdparm-5.4 61
+MD5 e5329109e5d4913db5d99dea05ea7cb7 files/hdparm-conf.d 526
+MD5 5ad61cfc6a0abd8ceb1f62f96df56cf5 files/hdparm-init 387
+MD5 79addcfcff37bea2f39b6aef5050139f files/hdparm-new-init 2137
+MD5 58b06c855068c6d95b0f665c201d6051 files/hdparm-5.4-readahead_rename.patch 1254
diff --git a/sys-apps/hdparm/files/hdparm-5.4-readahead_rename.patch b/sys-apps/hdparm/files/hdparm-5.4-readahead_rename.patch
new file mode 100644
index 000000000000..8474cdd46791
--- /dev/null
+++ b/sys-apps/hdparm/files/hdparm-5.4-readahead_rename.patch
@@ -0,0 +1,32 @@
+diff -Naur hdparm-5.4-orig/hdparm.c hdparm-5.4/hdparm.c
+--- hdparm-5.4-orig/hdparm.c	2003-04-18 20:29:38.000000000 +0000
++++ hdparm-5.4/hdparm.c	2004-02-09 00:47:01.190595128 +0000
+@@ -52,7 +52,7 @@
+ static int flagcount = 0, do_flush = 0, is_scsi_hd = 0, is_xt_hd = 0;
+ static int do_ctimings, do_timings = 0;
+ 
+-static unsigned long set_readahead= 0, get_readahead= 0, readahead= 0;     
++static unsigned long set_readahead= 0, get_readahead= 0, doreadahead= 0;
+ static unsigned long set_readonly = 0, get_readonly = 0, readonly = 0;
+ static unsigned long set_unmask   = 0, get_unmask   = 0, unmask   = 0;     
+ static unsigned long set_mult     = 0, get_mult     = 0, mult     = 0;     
+@@ -785,8 +785,8 @@
+ 
+ 	if (set_readahead) {
+ 		if (get_readahead)
+-			printf(" setting fs readahead to %ld\n", readahead);
+-		if (ioctl(fd, BLKRASET, readahead)) 
++			printf(" setting fs readahead to %ld\n", doreadahead);
++		if (ioctl(fd, BLKRASET, doreadahead)) 
+ 			perror(" BLKRASET failed");
+ 	}
+ #ifdef HDIO_UNREGISTER_HWIF
+@@ -1830,7 +1830,7 @@
+ 					case 'a':
+ 						get_readahead = noisy;
+ 						noisy = 1;
+-						GET_NUMBER(set_readahead,readahead);
++						GET_NUMBER(set_readahead,doreadahead);
+ 						break;
+ 					case 'B':
+ 						get_apmmode = noisy;
diff --git a/sys-apps/hdparm/hdparm-5.4.ebuild b/sys-apps/hdparm/hdparm-5.4.ebuild
index 1060a8d2dab5..2d167a411f86 100644
--- a/sys-apps/hdparm/hdparm-5.4.ebuild
+++ b/sys-apps/hdparm/hdparm-5.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.4.ebuild,v 1.10 2004/01/09 19:50:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hdparm/hdparm-5.4.ebuild,v 1.11 2004/02/09 02:08:47 brad_mssw Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Utility to change hard drive performance parameters"
@@ -19,6 +19,7 @@ src_compile() {
 	einfo "that you etc-update.  The script is much more configurable"
 	einfo "for details please see /etc/conf.d/hdparm"
 	einfo ""
+	epatch ${FILESDIR}/${P}-readahead_rename.patch
 	emake || die "compile error"
 }