packages: cpio/cpio.spec, cpio/cpio-crc-is-32-bit.patch (NEW)=?UTF-8?Q?=20?=- rel 2 - fix...

[baggins]

Author: baggins                      Date: Mon May 21 10:36:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fix 7 years old bug, http://www.mail-archive.com/bug-cpio@gnu.org/msg00068.html

---- Files affected:
packages/cpio:
   cpio.spec (1.80 -> 1.81) , cpio-crc-is-32-bit.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cpio/cpio.spec
diff -u packages/cpio/cpio.spec:1.80 packages/cpio/cpio.spec:1.81
--- packages/cpio/cpio.spec:1.80	Sat Jan 29 01:06:16 2011
+++ packages/cpio/cpio.spec	Mon May 21 12:35:59 2012
@@ -10,7 +10,7 @@
 Summary(uk.UTF-8):	Архівна програма GNU
 Name:		cpio
 Version:	2.11
-Release:	1
+Release:	2
 License:	GPL v3+
 Group:		Applications/Archiving
 Source0:	http://ftp.gnu.org/gnu/cpio/%{name}-%{version}.tar.bz2
@@ -19,6 +19,7 @@
 # Source1-md5:	027552f4053477462a09fadc162a5e65
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-ifdef.patch
+Patch2:		%{name}-crc-is-32-bit.patch
 URL:		http://www.gnu.org/software/cpio/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11.1
@@ -105,6 +106,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__gettextize}
@@ -157,6 +159,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2012/05/21 10:35:59  baggins
+- rel 2
+- fix 7 years old bug, http://www.mail-archive.com/bug-cpio@gnu.org/msg00068.html
+
 Revision 1.80  2011/01/29 00:06:16  sparky
 - dropped pre-cvs changelog
 

================================================================
Index: packages/cpio/cpio-crc-is-32-bit.patch
diff -u /dev/null packages/cpio/cpio-crc-is-32-bit.patch:1.1
--- /dev/null	Mon May 21 12:36:05 2012
+++ packages/cpio/cpio-crc-is-32-bit.patch	Mon May 21 12:35:59 2012
@@ -0,0 +1,64 @@
+> The header stores only 4 bytes for crc, so it is quite reasonable.
+
+Then I would suggest something like this, though it could be made more
+efficient.
+
+--- orig/configure.ac
++++ mod/configure.ac
+@@ -51,6 +51,9 @@
+ AC_CHECK_TYPE(gid_t, int)
+ AC_HEADER_STDC
+ AC_HEADER_DIRENT
++AC_CHECK_TYPES(uint32_t)
++AC_CHECK_SIZEOF(unsigned long)
++AC_CHECK_SIZEOF(unsigned int)
+ 
+ AC_CHECK_FUNCS([fchmod fchown])
+ # This is needed for mingw build
+--- orig/src/extern.h
++++ mod/src/extern.h
+@@ -66,7 +66,17 @@
+ extern int archive_des;
+ extern char *archive_name;
+ extern char *rsh_command_option;
++#ifdef HAVE_UINT32_T
++extern uint32_t crc;
++#else
++# if SIZEOF_UNSIGNED_LONG == 4
+ extern unsigned long crc;
++# elif SIZEOF_UNSIGNED_INT == 4
++extern unsigned int crc;
++# else
++# error Wrong size for crc
++# endif
++#endif
+ extern int delayed_seek_count;
+ #ifdef DEBUG_CPIO
+ extern int debug_flag;
+
+
+--- orig/src/global.c
++++ mod/src/global.c
+@@ -139,7 +139,17 @@
+ char *rsh_command_option = NULL;
+ 
+ /* CRC checksum.  */
++#ifdef HAVE_UINT32_T
++uint32_t crc;
++#else
++# if SIZEOF_UNSIGNED_LONG == 4
+ unsigned long crc;
++# elif SIZEOF_UNSIGNED_INT == 4
++unsigned int crc;
++# else
++# error Wrong size for crc
++# endif
++#endif
+ 
+ /* Input and output buffers.  */
+ char *input_buffer, *output_buffer;
+
+
+
+
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/cpio/cpio.spec?r1=1.80&r2=1.81