OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Oct-2006 11:30:56
Branch: HEAD Handle: 2006102210305401
Modified files:
openpkg-src/cpio cpio.patch cpio.spec
Log:
upgrading package: cpio 2.6 -> 2.7
Summary:
Revision Changes Path
1.5 +20 -47 openpkg-src/cpio/cpio.patch
1.33 +4 -3 openpkg-src/cpio/cpio.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 cpio.patch
--- openpkg-src/cpio/cpio.patch 6 Feb 2005 11:43:25 -0000 1.4
+++ openpkg-src/cpio/cpio.patch 22 Oct 2006 09:30:54 -0000 1.5
@@ -1,44 +1,6 @@
-Index: src/userspec.c
---- src/userspec.c.orig 2004-09-06 14:23:06 +0200
-+++ src/userspec.c 2004-12-20 19:58:04 +0100
-@@ -20,6 +20,7 @@
- #include <system.h>
-
- #ifdef __GNUC__
-+#undef alloca
- #define alloca __builtin_alloca
- #else
- #ifdef HAVE_ALLOCA_H
-@@ -72,7 +73,7 @@
- otherwise return 0. */
-
- static int
--isnumber (const char *str)
-+my_isnumber (const char *str)
- {
- for (; *str; str++)
- if (!isdigit (*str))
-@@ -136,7 +137,7 @@
- if (pwd == NULL)
- {
-
-- if (!isnumber (u))
-+ if (!my_isnumber (u))
- error_msg = _("invalid user");
- else
- {
-@@ -182,7 +183,7 @@
- grp = getgrnam (g);
- if (grp == NULL)
- {
-- if (!isnumber (g))
-+ if (!my_isnumber (g))
- 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
+--- lib/rtapelib.c.orig 2006-02-20 10:46:01 +0100
++++ lib/rtapelib.c 2006-10-22 11:09:19 +0200
@@ -625,7 +625,7 @@
{
char command_buffer[COMMAND_BUFFER_SIZE];
@@ -62,14 +24,25 @@
*--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))
+--- lib/system.h.orig 2006-09-08 18:57:52 +0200
++++ lib/system.h 2006-10-22 11:09:58 +0200
+@@ -425,7 +425,7 @@
--#define UINTMAX_STRSIZE_BOUND (INT_STRLEN_BOUND (uintmax_t) + 1)
-+#define UINTMAX_STRSIZE_BOUND (INT_STRLEN_BOUND (unsigned long) + 1)
+ #include <intprops.h>
+
+-#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (uintmax_t)
++#define UINTMAX_STRSIZE_BOUND INT_BUFSIZE_BOUND (unsigned long)
/* Prototypes for external functions. */
+Index: src/userspec.c
+--- src/userspec.c.orig 2005-05-19 11:25:58 +0200
++++ src/userspec.c 2006-10-22 11:09:19 +0200
+@@ -22,6 +22,7 @@
+ #include <system.h>
+
+ #ifdef __GNUC__
++#undef alloca
+ #define alloca __builtin_alloca
+ #else
+ #ifdef HAVE_ALLOCA_H
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 cpio.spec
--- openpkg-src/cpio/cpio.spec 13 Oct 2006 17:27:20 -0000 1.32
+++ openpkg-src/cpio/cpio.spec 22 Oct 2006 09:30:55 -0000 1.33
@@ -32,8 +32,8 @@
Class: BASE
Group: Archiver
License: GPL
-Version: 2.6
-Release: 20061013
+Version: 2.7
+Release: 20061022
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
@@ -69,13 +69,14 @@
CFLAGS="%{l_cflags -O}" \
./configure \
--prefix=%{l_prefix} \
+ --datarootdir=%{l_prefix} \
--libexecdir=%{l_prefix}/libexec/cpio
%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/locale
rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
mv $RPM_BUILD_ROOT%{l_prefix}/man/man1/mt.1 \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/rmt.1
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
