From 53b97373298d0425dd4e7af13b92a846c7fbdfef Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Oct 22 2012 11:05:42 +0000 Subject: Note that cpio uses Sum32 checksum only (FIPS) --- diff --git a/cpio-2.11-crc-fips-nit.patch b/cpio-2.11-crc-fips-nit.patch new file mode 100644 index 0000000..56efa35 --- /dev/null +++ b/cpio-2.11-crc-fips-nit.patch @@ -0,0 +1,13 @@ +diff --git a/src/main.c b/src/main.c +index 38fb3eb..9b9bf74 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -151,7 +151,7 @@ static struct argp_option options[] = { + {"pattern-file", 'E', N_("FILE"), 0, + N_("Read additional patterns specifying filenames to extract or list from FILE"), 210}, + {"only-verify-crc", ONLY_VERIFY_CRC_OPTION, 0, 0, +- N_("When reading a CRC format archive, only verify the CRC's of each file in the archive, don't actually extract the files"), 210}, ++ N_("When reading a CRC format archive, only verify the checksum of each file in the archive, don't actually extract the files"), 210}, + {"rename", 'r', 0, 0, + N_("Interactively rename files"), GRID+1 }, + {"rename-batch-file", RENAME_BATCH_FILE_OPTION, N_("FILE"), OPTION_HIDDEN, diff --git a/cpio.1 b/cpio.1 index 3eceb97..e6be6be 100644 --- a/cpio.1 +++ b/cpio.1 @@ -153,7 +153,7 @@ The new (\s-1SVR4\s0) portable format, which supports file systems having more than 65536 i\-nodes. .TP `crc' -The new (\s-1SVR4\s0) portable format with a checksum added. +The new (\s-1SVR4\s0) portable format with a checksum (Sum32) added. .TP `tar' The old tar format. @@ -230,8 +230,8 @@ if you have permission to do so (typically an entry in that user's `\fB~/.rhosts\fR' file). .TP `\fB\-\-only\-verify\-crc\fR' -Verify the \s-1CRC\s0's of each file in the archive, when reading a \s-1CRC\s0 -format archive. Don't actually extract the files. +Verify the \s-1Sum32 checksum\s0's of each file in the archive, when reading a +\s-1crc\s0 format archive. Don't actually extract the files. .TP `\fB\-p, \-\-pass\-through\fR' Run in copy-pass mode. see \*(lqCopy\-pass mode\*(rq. diff --git a/cpio.spec b/cpio.spec index 5995855..72b9f7d 100644 --- a/cpio.spec +++ b/cpio.spec @@ -23,6 +23,9 @@ Patch5: cpio-2.10-patternnamesigsegv.patch Patch6: cpio-2.11-stdio.in.patch # fix bad file name splitting while creating ustar archive (#866467) Patch7: cpio-2.10-longnames-split.patch +# cpio does Sum32 checksum, not CRC +Patch8: cpio-2.11-crc-fips-nit.patch + Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Provides: bundled(gnulib) @@ -52,6 +55,7 @@ Install cpio if you need a program to manage file archives. %patch5 -p1 -b .patternsegv %patch6 -p1 -b .gnulib %patch7 -p1 -b .longnames +%patch8 -p1 -b .sum32-fips autoheader