rpms/unix2dos/devel unix2dos-2.2-mode.patch, 1.1, 1.2 unix2dos-2.2-tmppath.patch, 1.2, 1.3 unix2dos.spec, 1.29, 1.30
Tim Waugh
twaugh at fedoraproject.org
Mon Sep 8 09:15:52 UTC 2008
Author: twaugh
Update of /cvs/pkgs/rpms/unix2dos/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10537
Modified Files:
unix2dos-2.2-mode.patch unix2dos-2.2-tmppath.patch
unix2dos.spec
Log Message:
* Mon Sep 8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
- Removed patch fuzz.
unix2dos-2.2-mode.patch:
Index: unix2dos-2.2-mode.patch
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos-2.2-mode.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unix2dos-2.2-mode.patch 11 Oct 2004 13:26:12 -0000 1.1
+++ unix2dos-2.2-mode.patch 8 Sep 2008 09:15:22 -0000 1.2
@@ -1,6 +1,7 @@
---- unix2dos-2.2/unix2dos.c.mode 2004-10-11 14:20:07.194483616 +0100
-+++ unix2dos-2.2/unix2dos.c 2004-10-11 14:20:30.752966221 +0100
-@@ -292,11 +292,14 @@
+diff -up unix2dos-2.2/unix2dos.c.mode unix2dos-2.2/unix2dos.c
+--- unix2dos-2.2/unix2dos.c.mode 2008-09-08 10:13:39.000000000 +0100
++++ unix2dos-2.2/unix2dos.c 2008-09-08 10:13:39.000000000 +0100
+@@ -292,11 +292,14 @@ int ConvertUnixToDosOldFile(char* ipInFN
char TempPath[16];
struct stat StatBuf;
struct utimbuf UTimeBuf;
@@ -16,7 +17,7 @@
strcpy (TempPath, "./u2dtmpXXXXXX");
if((fd=mkstemp (TempPath)) < 0) {
-@@ -304,6 +307,9 @@
+@@ -304,6 +307,9 @@ int ConvertUnixToDosOldFile(char* ipInFN
RetVal = -1;
}
@@ -25,4 +26,4 @@
+
#ifdef DEBUG
fprintf(stderr, "unix2dos: using %s as temp file\n", TempPath);
- #endif
+ #endif DEBUG
unix2dos-2.2-tmppath.patch:
Index: unix2dos-2.2-tmppath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos-2.2-tmppath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unix2dos-2.2-tmppath.patch 13 Apr 2005 11:22:54 -0000 1.2
+++ unix2dos-2.2-tmppath.patch 8 Sep 2008 09:15:22 -0000 1.3
@@ -1,5 +1,6 @@
---- unix2dos-2.2/unix2dos.c.tmppath 2004-10-20 16:10:06.941343976 +0200
-+++ unix2dos-2.2/unix2dos.c 2004-10-20 16:17:52.199613968 +0200
+diff -up unix2dos-2.2/unix2dos.c.tmppath unix2dos-2.2/unix2dos.c
+--- unix2dos-2.2/unix2dos.c.tmppath 2008-09-08 10:14:30.000000000 +0100
++++ unix2dos-2.2/unix2dos.c 2008-09-08 10:14:30.000000000 +0100
@@ -57,7 +57,10 @@
#ifdef __MSDOS__
@@ -11,7 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-@@ -195,6 +198,40 @@
+@@ -195,6 +198,40 @@ int ConvertUnixToDos(FILE* ipInF, FILE*
}
@@ -52,7 +53,7 @@
/* convert file ipInFN to DOS format text and write to file ipOutFN
* RetVal: 0 if success
* -1 otherwise
-@@ -204,7 +241,7 @@
+@@ -204,7 +241,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
int RetVal = 0;
FILE *InF = NULL;
FILE *TempF = NULL;
@@ -61,7 +62,8 @@
struct stat StatBuf;
struct utimbuf UTimeBuf;
int fd;
-@@ -214,7 +251,6 @@
+@@ -213,8 +250,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
+ if ((ipFlag->KeepDate) && stat(ipInFN, &StatBuf))
RetVal = -1;
- strcpy (TempPath, "./u2dtmpXXXXXX");
@@ -70,7 +72,7 @@
perror("Can't open output temp file");
RetVal = -1;
}
-@@ -231,6 +267,7 @@
+@@ -231,6 +267,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
if ((!RetVal) && (InF) && ((TempF=OpenOutFile(fd)) == NULL))
{
fclose (InF);
@@ -78,7 +80,7 @@
RetVal = -1;
}
-@@ -265,9 +302,6 @@
+@@ -265,9 +302,6 @@ int ConvertUnixToDosNewFile(char *ipInFN
/* can rename temp file to out file? */
if (!RetVal)
{
@@ -88,7 +90,7 @@
if ((rename(TempPath, ipOutFN) == -1) && (!ipFlag->Quiet))
{
fprintf(stderr, "unix2dos: problems renaming '%s' to '%s'\n", TempPath, ipOutFN);
-@@ -275,6 +309,7 @@
+@@ -275,6 +309,7 @@ int ConvertUnixToDosNewFile(char *ipInFN
RetVal = -1;
}
}
@@ -96,7 +98,7 @@
return RetVal;
}
-@@ -289,7 +324,7 @@
+@@ -289,7 +324,7 @@ int ConvertUnixToDosOldFile(char* ipInFN
int RetVal = 0;
FILE *InF = NULL;
FILE *TempF = NULL;
@@ -105,7 +107,7 @@
struct stat StatBuf;
struct utimbuf UTimeBuf;
mode_t mode = S_IRUSR | S_IWUSR;
-@@ -301,8 +336,7 @@
+@@ -301,8 +336,7 @@ int ConvertUnixToDosOldFile(char* ipInFN
else
mode = StatBuf.st_mode;
@@ -115,7 +117,7 @@
perror("Can't open output temp file");
RetVal = -1;
}
-@@ -322,6 +356,7 @@
+@@ -322,6 +356,7 @@ int ConvertUnixToDosOldFile(char* ipInFN
if ((!RetVal) && (InF) && ((TempF=OpenOutFile(fd)) == NULL))
{
fclose (InF);
@@ -123,7 +125,7 @@
RetVal = -1;
}
-@@ -349,10 +384,6 @@
+@@ -349,10 +384,6 @@ int ConvertUnixToDosOldFile(char* ipInFN
RetVal = -1;
}
@@ -134,7 +136,7 @@
/* any error? */
if ((RetVal) && (unlink(TempPath)))
RetVal = -1;
-@@ -367,6 +398,7 @@
+@@ -367,6 +398,7 @@ int ConvertUnixToDosOldFile(char* ipInFN
}
RetVal = -1;
}
Index: unix2dos.spec
===================================================================
RCS file: /cvs/pkgs/rpms/unix2dos/devel/unix2dos.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- unix2dos.spec 8 Sep 2008 08:57:00 -0000 1.29
+++ unix2dos.spec 8 Sep 2008 09:15:22 -0000 1.30
@@ -47,6 +47,7 @@
%changelog
* Mon Sep 8 2008 Tim Waugh <twaugh at redhat.com> 2.2-31
+- Removed patch fuzz.
- Preserve file modes (bug #437469).
- Fixed grammar in man page (bug #460731).
- Explicitly apply patch0.
More information about the fedora-extras-commits
mailing list