rpms/deltarpm/devel deltarpm-3.4-prelink-bugfix.patch,1.1,1.2

[Jonathan Dieter (jdieter)]

Author: jdieter

Update of /cvs/extras/rpms/deltarpm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1746

Modified Files:
	deltarpm-3.4-prelink-bugfix.patch 
Log Message:
Fix some typos in patch


deltarpm-3.4-prelink-bugfix.patch:

Index: deltarpm-3.4-prelink-bugfix.patch
===================================================================
RCS file: /cvs/extras/rpms/deltarpm/devel/deltarpm-3.4-prelink-bugfix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deltarpm-3.4-prelink-bugfix.patch	11 Jul 2007 14:46:11 -0000	1.1
+++ deltarpm-3.4-prelink-bugfix.patch	11 Jul 2007 14:51:13 -0000	1.2
@@ -1,6 +1,6 @@
-diff -ur deltarpm-3.4-b/applydeltarpm.c deltarpm-3.4/applydeltarpm.c
---- deltarpm-3.4-b/applydeltarpm.c	2007-06-11 13:31:36.000000000 +0300
-+++ deltarpm-3.4/applydeltarpm.c	2007-06-11 13:40:29.000000000 +0300
+diff -ur deltarpm-3.4a/applydeltarpm.c deltarpm-3.4b/applydeltarpm.c
+--- deltarpm-3.4a/applydeltarpm.c	2007-03-06 15:35:16.000000000 +0200
++++ deltarpm-3.4b/applydeltarpm.c	2007-07-11 17:36:59.000000000 +0300
 @@ -394,10 +394,7 @@
  	    {
  	      if (fd != -1)
@@ -34,19 +34,30 @@
    rpmMD5Final(md5, &ctx);
    if (memcmp(md5, hmd5, 16))
      {
-Only in deltarpm-3.4-b: applydeltarpm.c.orig
-diff -ur deltarpm-3.4-b/prelink.c deltarpm-3.4/prelink.c
---- deltarpm-3.4-b/prelink.c	2005-06-06 15:41:07.000000000 +0300
-+++ deltarpm-3.4/prelink.c	2007-06-11 13:38:30.000000000 +0300
-@@ -125,6 +125,7 @@
-   int status;
+diff -ur deltarpm-3.4a/prelink.c deltarpm-3.4b/prelink.c
+--- deltarpm-3.4a/prelink.c	2005-06-06 15:41:07.000000000 +0300
++++ deltarpm-3.4b/prelink.c	2007-07-11 17:42:49.000000000 +0300
+@@ -7,6 +7,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/wait.h>
++#include <fcntl.h>
+ 
+ static inline int
+ elf16(unsigned char *buf, int le)
+@@ -122,9 +123,10 @@
+ prelinked_open(char *name)
+ {
+   pid_t pid;
+-  int status;
++  int fd, status;
    int p[2];
    struct stat stb;
 +  char template[21];
  
    if (stat("/usr/sbin/prelink", &stb))
      {
-@@ -132,49 +133,33 @@
+@@ -132,49 +134,33 @@
        fprintf(stderr, "prelink not installed, cannot undo prelinking");
        exit(1);
      }
@@ -111,9 +122,9 @@
 -	prelink_pid = (pid_t)-1;
 -    }
 -}
-diff -ur deltarpm-3.4-b/prelink.h deltarpm-3.4/prelink.h
---- deltarpm-3.4-b/prelink.h	2005-06-02 20:01:07.000000000 +0300
-+++ deltarpm-3.4/prelink.h	2007-06-11 13:38:42.000000000 +0300
+diff -ur deltarpm-3.4a/prelink.h deltarpm-3.4b/prelink.h
+--- deltarpm-3.4a/prelink.h	2005-06-02 20:01:07.000000000 +0300
++++ deltarpm-3.4b/prelink.h	2007-07-11 17:36:59.000000000 +0300
 @@ -1,3 +1,2 @@
  extern int is_prelinked(int fd, unsigned char *buf, int l);
  extern int prelinked_open(char *name);