From 81dcc18abfdec917fa79c5dbbc24af4a82d69724 Mon Sep 17 00:00:00 2001 From: Peter Vrabec Date: Thu, 23 Mar 2006 10:11:39 +0000 Subject: [PATCH] init struct file_hdr fix (#186339) --- cpio-2.6-initHeaderStruct.patch | 11 +++++++++++ cpio.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 cpio-2.6-initHeaderStruct.patch diff --git a/cpio-2.6-initHeaderStruct.patch b/cpio-2.6-initHeaderStruct.patch new file mode 100644 index 0000000..8a97fb6 --- /dev/null +++ b/cpio-2.6-initHeaderStruct.patch @@ -0,0 +1,11 @@ +--- cpio-2.6/src/copyin.c.initHeaderStruct 2006-03-23 10:59:31.000000000 +0100 ++++ cpio-2.6/src/copyin.c 2006-03-23 10:59:55.000000000 +0100 +@@ -1407,7 +1407,7 @@ + FILE *tty_out = NULL; /* Interactive file for rename option. */ + FILE *rename_in = NULL; /* Batch file for rename option. */ + struct stat file_stat; /* Output file stat record. */ +- struct new_cpio_header file_hdr; /* Output header information. */ ++ struct new_cpio_header file_hdr = {0}; /* Output header information. */ + int in_file_des; /* Input file descriptor. */ + char skip_file; /* Flag for use with patterns. */ + int i; /* Loop index variable. */ diff --git a/cpio.spec b/cpio.spec index b4a523c..7272efd 100644 --- a/cpio.spec +++ b/cpio.spec @@ -6,7 +6,7 @@ Summary: A GNU archiving program. Name: cpio Version: 2.6 -Release: 13 +Release: 14 License: GPL Group: Applications/Archiving URL: http://www.gnu.org/software/cpio/ @@ -21,6 +21,8 @@ Patch19: cpio-2.6-dirTraversal.patch Patch20: cpio-2.6-warnings.patch Patch21: cpio-2.6-checksum.patch Patch22: cpio-2.6-writeOutHeaderBufferOverflow.patch +Patch23: cpio-2.6-initHeaderStruct.patch + %ifnos linux Prereq: /sbin/rmt %endif @@ -54,6 +56,7 @@ Install cpio if you need a program to manage file archives. %patch20 -p1 -b .warnings %patch21 -p1 -b .checksum %patch22 -p1 -b .bufferOverflow +%patch23 -p1 -b .initHeaderStruct autoheader %build @@ -103,6 +106,9 @@ fi %{_infodir}/*.info* %changelog +* Thu Mar 23 2006 Peter Vrabec 2.6-14 +- init struct file_hdr (#186339) + * Wed Mar 15 2006 Peter Vrabec 2.6-13 - merge toAsciiError.patch with writeOutHeaderBufferOverflow.patch - merge largeFileGrew.patch with lfs.patch