rpms/hdparm/devel hdparm-6.3-idestruct.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 hdparm.spec, 1.19, 1.20 sources, 1.11, 1.12
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Oct 25 12:42:19 UTC 2005
Author: karsten
Update of /cvs/dist/rpms/hdparm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16370
Modified Files:
.cvsignore hdparm.spec sources
Added Files:
hdparm-6.3-idestruct.patch
Log Message:
- update to hdparm-6.3
hdparm-6.3-idestruct.patch:
Makefile | 2 +-
hdparm.c | 9 +++++----
hdparm.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 54 insertions(+), 5 deletions(-)
--- NEW FILE hdparm-6.3-idestruct.patch ---
diff -urN hdparm-6.3/hdparm.c hdparm-6.3_new/hdparm.c
--- hdparm-6.3/hdparm.c 2005-10-25 12:36:19.000000000 +0200
+++ hdparm-6.3_new/hdparm.c 2005-10-25 12:32:50.000000000 +0200
@@ -982,10 +982,11 @@
#endif
int err;
const char *description;
- struct request_s {
- ide_task_request_t req __attribute__((packed));
- char data[512] __attribute__((packed));
- } request;
+ struct request_s {
+ ide_task_request_t req __attribute__((packed));
+ char data[512] __attribute__((packed));
+ } request;
+
memset(&request, 0, sizeof(request));
((task_struct_t *)(&request.req.io_ports))->command = security_command;
request.req.data_phase = TASKFILE_OUT;
diff -urN hdparm-6.3/hdparm.h hdparm-6.3_new/hdparm.h
--- hdparm-6.3/hdparm.h 2005-10-25 12:36:19.000000000 +0200
+++ hdparm-6.3_new/hdparm.h 2005-10-25 12:34:21.000000000 +0200
@@ -24,5 +24,53 @@
extern void no_xt (void);
extern void process_dev (char *devname);
+typedef unsigned char task_ioreg_t;
+
+typedef union ide_reg_valid_s {
+ unsigned all : 16;
+ struct {
+ unsigned data : 1;
+ unsigned error_feature : 1;
+ unsigned sector : 1;
+ unsigned nsector : 1;
+ unsigned lcyl : 1;
+ unsigned hcyl : 1;
+ unsigned select : 1;
+ unsigned status_command : 1;
+
+ unsigned data_hob : 1;
+ unsigned error_feature_hob : 1;
+ unsigned sector_hob : 1;
+ unsigned nsector_hob : 1;
+ unsigned lcyl_hob : 1;
+ unsigned hcyl_hob : 1;
+ unsigned select_hob : 1;
+ unsigned control_hob : 1;
+ } b;
+} ide_reg_valid_t;
+
+typedef struct ide_task_request_s {
+ task_ioreg_t io_ports[8];
+ task_ioreg_t hob_ports[8];
+ ide_reg_valid_t out_flags;
+ ide_reg_valid_t in_flags;
+ int data_phase;
+ int req_cmd;
+ unsigned long out_size;
+ unsigned long in_size;
+} ide_task_request_t;
+
+typedef struct hd_drive_task_hdr {
+ task_ioreg_t data;
+ task_ioreg_t feature;
+ task_ioreg_t sector_count;
+ task_ioreg_t sector_number;
+ task_ioreg_t low_cylinder;
+ task_ioreg_t high_cylinder;
+ task_ioreg_t device_head;
+ task_ioreg_t command;
+} task_struct_t;
+
+
#define IDE_DRIVE_TASK_OUT 3
#define __le16_to_cpus(x) do {} while (0)
diff -urN hdparm-6.3/Makefile hdparm-6.3_new/Makefile
--- hdparm-6.3/Makefile 2005-10-25 12:36:19.000000000 +0200
+++ hdparm-6.3_new/Makefile 2005-10-25 12:15:45.000000000 +0200
@@ -13,7 +13,7 @@
ifndef CC
CC = gcc
endif
-CFLAGS := -O2 -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
+CFLAGS := -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=pentium4 -fasynchronous-unwind-tables -W -Wall -Wbad-function-cast -Wcast-align -Wpointer-arith -Wcast-qual -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -fkeep-inline-functions -Wwrite-strings -Waggregate-return -Wnested-externs -Wtrigraphs $(CFLAGS)
LDFLAGS =
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hdparm/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 2 Mar 2005 10:56:37 -0000 1.10
+++ .cvsignore 25 Oct 2005 12:42:12 -0000 1.11
@@ -1 +1 @@
-hdparm-5.9.tar.gz
+hdparm-6.3.tar.gz
Index: hdparm.spec
===================================================================
RCS file: /cvs/dist/rpms/hdparm/devel/hdparm.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- hdparm.spec 8 Jun 2005 12:33:59 -0000 1.19
+++ hdparm.spec 25 Oct 2005 12:42:12 -0000 1.20
@@ -1,13 +1,15 @@
Summary: A utility for displaying and/or setting hard disk parameters.
Name: hdparm
-Version: 6.1
+Version: 6.3
Release: 1
License: BSD
Group: Applications/System
-Source: http://www.ibiblio.org/pub/Linux/system/hardware/hdparm-%{version}.tar.gz
+URL: http://hdparm.sourceforge.net/
+Source: http://hdparm.sourceforge.net/sourceforge/hdparm/hdparm-%{version}.tar.gz
Patch0: hdparm-5.8-help.patch
Patch1: hdparm-5.9-nostrip.patch
Patch2: hdparm-6.1-incl.patch
+Patch3: hdparm-6.3-idestruct.patch
Buildroot: %{_tmppath}/%{name}-%{version}-root
ExcludeArch: s390 s390x
@@ -21,6 +23,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
perl -pi -e "s/-O2/$RPM_OPT_FLAGS/g" Makefile
@@ -43,6 +46,9 @@
%{_mandir}/man8/hdparm.8*
%changelog
+* Tue Oct 25 2005 Karsten Hopp <karsten at redhat.de> 6.3-1
+- update to hdparm-6.3
+
* Wed Jun 08 2005 Karsten Hopp <karsten at redhat.de> 6.1-1
- update to 6.1 (BLKGETSIZE fixes)
- work around hdparm's usage of kernel headers, assume
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hdparm/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 8 Jun 2005 12:40:53 -0000 1.11
+++ sources 25 Oct 2005 12:42:12 -0000 1.12
@@ -1 +1 @@
-b883944bc26a480dcccae837c4ddf732 hdparm-6.1.tar.gz
+0c12672f3a09c14ad0b0882f15fc9389 hdparm-6.3.tar.gz
More information about the fedora-cvs-commits
mailing list