OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Feb-2005 12:43:26
Branch: HEAD Handle: 2005020611432500
Modified files:
openpkg-src/cpio cpio.patch cpio.spec
Log:
make portable to older systems (like FreeBSD 4)
Summary:
Revision Changes Path
1.4 +37 -0 openpkg-src/cpio/cpio.patch
1.28 +1 -1 openpkg-src/cpio/cpio.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 cpio.patch
--- openpkg-src/cpio/cpio.patch 20 Dec 2004 19:08:04 -0000 1.3
+++ openpkg-src/cpio/cpio.patch 6 Feb 2005 11:43:25 -0000 1.4
@@ -36,3 +36,40 @@
error_msg = _("invalid group");
else
*gid = atoi (g);
+Index: lib/rtapelib.c
+--- lib/rtapelib.c.orig 2004-09-06 15:49:42 +0200
++++ lib/rtapelib.c 2005-02-06 12:40:08 +0100
+@@ -625,7 +625,7 @@
+ {
+ char command_buffer[COMMAND_BUFFER_SIZE];
+ char operand_buffer[UINTMAX_STRSIZE_BOUND];
+- uintmax_t u = offset < 0 ? - (uintmax_t) offset : (uintmax_t) offset;
++ unsigned long u = offset < 0 ? - (unsigned long) offset : (unsigned long)
offset;
+ char *p = operand_buffer + sizeof operand_buffer;
+
+ *--p = 0;
+@@ -667,9 +667,9 @@
+ {
+ char command_buffer[COMMAND_BUFFER_SIZE];
+ char operand_buffer[UINTMAX_STRSIZE_BOUND];
+- uintmax_t u = (((struct mtop *) argument)->mt_count < 0
+- ? - (uintmax_t) ((struct mtop *) argument)->mt_count
+- : (uintmax_t) ((struct mtop *) argument)->mt_count);
++ unsigned long u = (((struct mtop *) argument)->mt_count < 0
++ ? - (unsigned long) ((struct mtop *) argument)->mt_count
++ : (unsigned long) ((struct mtop *) argument)->mt_count);
+ char *p = operand_buffer + sizeof operand_buffer;
+
+ *--p = 0;
+Index: lib/system.h
+--- lib/system.h.orig 2004-09-06 15:49:42 +0200
++++ lib/system.h 2005-02-06 12:39:48 +0100
+@@ -467,7 +467,7 @@
+ ((sizeof (t) * CHAR_BIT - TYPE_SIGNED (t)) * 302 / 1000 \
+ + 1 + TYPE_SIGNED (t))
+
+-#define UINTMAX_STRSIZE_BOUND (INT_STRLEN_BOUND (uintmax_t) + 1)
++#define UINTMAX_STRSIZE_BOUND (INT_STRLEN_BOUND (unsigned long) + 1)
+
+ /* Prototypes for external functions. */
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
============================================================================
$ cvs diff -u -r1.27 -r1.28 cpio.spec
--- openpkg-src/cpio/cpio.spec 1 Jan 2005 10:48:22 -0000 1.27
+++ openpkg-src/cpio/cpio.spec 6 Feb 2005 11:43:25 -0000 1.28
@@ -34,7 +34,7 @@
Group: Archiver
License: GPL
Version: 2.6
-Release: 20041220
+Release: 20050206
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
