rpms/microcode_ctl/F-7 microcode_ctl.patch,1.6,1.7

[Jon Masters (jcm)]

Author: jcm

Update of /cvs/pkgs/rpms/microcode_ctl/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32283

Modified Files:
	microcode_ctl.patch 
Log Message:
...and fix patch.


microcode_ctl.patch:

Index: microcode_ctl.patch
===================================================================
RCS file: /cvs/pkgs/rpms/microcode_ctl/F-7/microcode_ctl.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- microcode_ctl.patch	27 Jan 2006 21:20:55 -0000	1.6
+++ microcode_ctl.patch	28 Jun 2007 15:33:16 -0000	1.7
@@ -1,6 +1,7 @@
---- microcode_ctl-1.13/Makefile~	Mon Jun 11 16:57:42 2001
-+++ microcode_ctl-1.13/Makefile	Tue Jan  8 20:20:58 2002
-@@ -20,7 +20,7 @@
+diff -urNp microcode_ctl-1.17_orig/Makefile microcode_ctl-1.17/Makefile
+--- microcode_ctl-1.17_orig/Makefile	2007-04-26 06:59:44.000000000 -0400
++++ microcode_ctl-1.17/Makefile	2007-06-28 11:32:01.000000000 -0400
+@@ -20,7 +20,7 @@ DESTDIR		=
  PREFIX		= /usr/local
  
  INSDIR		= $(PREFIX)/sbin
@@ -9,21 +10,32 @@
  MICDIR		= /etc
  
  RCFILE		= microcode_ctl.start
-@@ -45,7 +45,7 @@
+@@ -44,8 +44,8 @@ install:
+ 			$(DESTDIR)$(MANDIR) $(DESTDIR)$(RCFILETO) \
  			$(DESTDIR)$(RCLINKTO)
  
 -	$(INS) -s -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR)
-+	$(INS) -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR)
 -	$(INS) -m 644 $(MICROCODE) $(DESTDIR)$(MICDIR)/microcode.dat
++	$(INS) -m 755 $(PROGRAM) $(DESTDIR)$(INSDIR)
 +	$(INS) -m 644 $(MICROCODE) $(DESTDIR)/etc/firmware/microcode.dat
  
  	$(INS) -m 644 $(MANPAGE) $(DESTDIR)$(MANDIR)
  	gzip -9f $(DESTDIR)$(MANDIR)/$(MANPAGE)
---- microcode_ctl-1.13/microcode_ctl.c.org	2003-05-28 19:56:22.000000000 +0200
-+++ microcode_ctl-1.13/microcode_ctl.c	2003-05-28 19:57:01.000000000 +0200
-@@ -95,11 +95,13 @@
+diff -urNp microcode_ctl-1.17_orig/microcode_ctl.c microcode_ctl-1.17/microcode_ctl.c
+--- microcode_ctl-1.17_orig/microcode_ctl.c	2006-06-28 10:51:31.000000000 -0400
++++ microcode_ctl-1.17/microcode_ctl.c	2007-06-28 11:32:01.000000000 -0400
+@@ -25,7 +25,7 @@ int print_error_messages=1;
+ #define MAX_MICROCODE	2000000
+ 
+ #define MICROCODE_DEVICE_DEFAULT	"/dev/cpu/microcode"
+-#define MICROCODE_FILE_DEFAULT		"/etc/microcode.dat"
++#define MICROCODE_FILE_DEFAULT		"/etc/firmware/microcode.dat"
+ 
+ static void usage(void)
  {
- 	FILE *fd;
+@@ -52,11 +52,13 @@ static int do_update(char *device, char 
+ {
+ 	FILE *fp;
  	char line_buffer[BUFFER_SIZE];
 -	int microcode[MAX_MICROCODE];
 +	int *microcode;
@@ -34,9 +46,9 @@
 +	microcode=malloc(sizeof(int)* MAX_MICROCODE);
 +	if (!microcode) return ENOMEM;
  
- 	if( (fd=fopen(filename, "r")) == NULL){
+ 	if( (fp=fopen(filename, "r")) == NULL){
  		if(print_error_messages)
-@@ -146,7 +146,7 @@
+@@ -101,7 +103,7 @@ static int do_update(char *device, char 
  		return errno;
  	}
  
@@ -45,15 +57,3 @@
  		if(print_error_messages)
  			fprintf(stderr, "%s: error writing to '%s' errno=%d (%s)\n"
  					"%s: there may be messages from the driver in your system log.\n",
-
---- microcode_ctl-1.13/microcode_ctl.c~	2005-01-21 17:42:53.000000000 -0500
-+++ microcode_ctl-1.13/microcode_ctl.c	2005-01-21 17:43:03.000000000 -0500
-@@ -25,7 +25,7 @@ int print_error_messages=1;
- #define MAX_MICROCODE	2000000
- 
- #define MICROCODE_DEVICE_DEFAULT	"/dev/cpu/microcode"
--#define MICROCODE_FILE_DEFAULT		"/etc/microcode.dat"
-+#define MICROCODE_FILE_DEFAULT		"/etc/firmware/microcode.dat"
- 
- static void usage(void)
- {