[CVS] OpenPKG: openpkg-src/cpio/ cpio.patch cpio.spec
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 20-Jun-2009 17:46:21
Branch: HEAD Handle: 2009062016461800
Modified files:
openpkg-src/cpiocpio.patch cpio.spec
Log:
upgrading package: cpio 2.9 -> 2.10
Summary:
RevisionChanges Path
1.10+15 -27 openpkg-src/cpio/cpio.patch
1.42+2 -2 openpkg-src/cpio/cpio.spec
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
$ cvs diff -u -r1.9 -r1.10 cpio.patch
--- openpkg-src/cpio/cpio.patch 30 Jun 2007 07:49:00 - 1.9
+++ openpkg-src/cpio/cpio.patch 20 Jun 2009 15:46:18 - 1.10
@@ -1,19 +1,7 @@
-Index: lib/argp-help.c
lib/argp-help.c.orig 2007-06-28 19:18:55 +0200
-+++ lib/argp-help.c 2007-06-30 09:44:04 +0200
-@@ -570,7 +570,7 @@
- return val;
- }
-
--static inline int
-+static int
- __attribute__ ((always_inline))
- hol_entry_long_iterate (const struct hol_entry *entry,
- int (*func)(const struct argp_option *opt,
Index: lib/rtapelib.c
lib/rtapelib.c.orig 2007-06-27 15:49:45 +0200
-+++ lib/rtapelib.c 2007-06-30 09:44:04 +0200
-@@ -625,7 +625,7 @@
+--- lib/rtapelib.c.orig 2009-03-19 12:47:19 +0100
lib/rtapelib.c 2009-06-20 17:36:22 +0200
+@@ -628,7 +628,7 @@
{
char command_buffer[COMMAND_BUFFER_SIZE];
char operand_buffer[UINTMAX_STRSIZE_BOUND];
@@ -22,7 +10,7 @@
char *p = operand_buffer + sizeof operand_buffer;
*--p = 0;
-@@ -667,9 +667,9 @@
+@@ -670,9 +670,9 @@
{
char command_buffer[COMMAND_BUFFER_SIZE];
char operand_buffer[UINTMAX_STRSIZE_BOUND];
@@ -36,8 +24,8 @@
*--p = 0;
Index: lib/system.h
lib/system.h.orig2007-06-27 15:49:45 +0200
-+++ lib/system.h 2007-06-30 09:44:04 +0200
+--- lib/system.h.orig2009-06-20 10:29:22 +0200
lib/system.h 2009-06-20 17:36:22 +0200
@@ -425,7 +425,7 @@
#include
@@ -48,13 +36,13 @@
/* Prototypes for external functions. */
Index: src/userspec.c
src/userspec.c.orig 2007-06-27 16:00:13 +0200
-+++ src/userspec.c 2007-06-30 09:44:04 +0200
-@@ -22,6 +22,7 @@
+--- src/userspec.c.orig 2009-02-14 19:15:50 +0100
src/userspec.c 2009-06-20 17:41:54 +0200
+@@ -20,7 +20,6 @@
+ /* Written by David MacKenzie . */
+
#include
-
- #ifdef __GNUC__
-+#undef alloca
- #define alloca __builtin_alloca
- #else
- #ifdef HAVE_ALLOCA_H
+-#include
+ #include
+ #include
+ #include
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
$ cvs diff -u -r1.41 -r1.42 cpio.spec
--- openpkg-src/cpio/cpio.spec18 Apr 2009 13:09:24 - 1.41
+++ openpkg-src/cpio/cpio.spec20 Jun 2009 15:46:18 - 1.42
@@ -31,8 +31,8 @@
Class:BASE
Group:Archiver
License: GPL
-Version: 2.9
-Release: 20080101
+Version: 2.10
+Release: 20090620
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cpio/ cpio.patch cpio.spec
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: 30-Jun-2007 09:49:00
Branch: HEAD Handle: 200706300849
Modified files:
openpkg-src/cpiocpio.patch cpio.spec
Log:
upgrading package: cpio 2.8 -> 2.9
Summary:
RevisionChanges Path
1.9 +8 -17 openpkg-src/cpio/cpio.patch
1.39+2 -2 openpkg-src/cpio/cpio.spec
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
$ cvs diff -u -r1.8 -r1.9 cpio.patch
--- openpkg-src/cpio/cpio.patch 8 Jun 2007 16:59:32 - 1.8
+++ openpkg-src/cpio/cpio.patch 30 Jun 2007 07:49:00 - 1.9
@@ -1,6 +1,6 @@
Index: lib/argp-help.c
lib/argp-help.c.orig 2007-05-11 15:15:30 +0200
-+++ lib/argp-help.c 2007-06-08 18:56:21 +0200
+--- lib/argp-help.c.orig 2007-06-28 19:18:55 +0200
lib/argp-help.c 2007-06-30 09:44:04 +0200
@@ -570,7 +570,7 @@
return val;
}
@@ -10,18 +10,9 @@
__attribute__ ((always_inline))
hol_entry_long_iterate (const struct hol_entry *entry,
int (*func)(const struct argp_option *opt,
-@@ -595,7 +595,7 @@
- }
-
- /* Iterator that returns true for the first short option. */
--static inline int
-+static int
- until_short (const struct argp_option *opt, const struct argp_option *real,
- const char *domain, void *cookie)
- {
Index: lib/rtapelib.c
lib/rtapelib.c.orig 2006-12-05 08:39:38 +0100
-+++ lib/rtapelib.c 2007-06-08 18:56:21 +0200
+--- lib/rtapelib.c.orig 2007-06-27 15:49:45 +0200
lib/rtapelib.c 2007-06-30 09:44:04 +0200
@@ -625,7 +625,7 @@
{
char command_buffer[COMMAND_BUFFER_SIZE];
@@ -45,8 +36,8 @@
*--p = 0;
Index: lib/system.h
lib/system.h.orig2006-09-08 18:57:52 +0200
-+++ lib/system.h 2007-06-08 18:56:21 +0200
+--- lib/system.h.orig2007-06-27 15:49:45 +0200
lib/system.h 2007-06-30 09:44:04 +0200
@@ -425,7 +425,7 @@
#include
@@ -57,8 +48,8 @@
/* Prototypes for external functions. */
Index: src/userspec.c
src/userspec.c.orig 2007-05-18 12:02:31 +0200
-+++ src/userspec.c 2007-06-08 18:56:21 +0200
+--- src/userspec.c.orig 2007-06-27 16:00:13 +0200
src/userspec.c 2007-06-30 09:44:04 +0200
@@ -22,6 +22,7 @@
#include
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
$ cvs diff -u -r1.38 -r1.39 cpio.spec
--- openpkg-src/cpio/cpio.spec8 Jun 2007 16:59:32 - 1.38
+++ openpkg-src/cpio/cpio.spec30 Jun 2007 07:49:00 - 1.39
@@ -32,8 +32,8 @@
Class:BASE
Group:Archiver
License: GPL
-Version: 2.8
-Release: 20070608
+Version: 2.9
+Release: 20070630
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cpio/ cpio.patch cpio.spec
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: 08-Jun-2007 18:59:33
Branch: HEAD Handle: 2007060817593200
Modified files:
openpkg-src/cpiocpio.patch cpio.spec
Log:
upgrading package: cpio 2.7 -> 2.8
Summary:
RevisionChanges Path
1.8 +9 -26 openpkg-src/cpio/cpio.patch
1.38+2 -2 openpkg-src/cpio/cpio.spec
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
$ cvs diff -u -r1.7 -r1.8 cpio.patch
--- openpkg-src/cpio/cpio.patch 17 May 2007 17:57:15 - 1.7
+++ openpkg-src/cpio/cpio.patch 8 Jun 2007 16:59:32 - 1.8
@@ -1,7 +1,7 @@
Index: lib/argp-help.c
lib/argp-help.c.orig 2006-09-12 10:59:04 +0200
-+++ lib/argp-help.c 2006-10-24 13:29:40 +0200
-@@ -567,7 +567,7 @@
+--- lib/argp-help.c.orig 2007-05-11 15:15:30 +0200
lib/argp-help.c 2007-06-08 18:56:21 +0200
+@@ -570,7 +570,7 @@
return val;
}
@@ -10,7 +10,7 @@
__attribute__ ((always_inline))
hol_entry_long_iterate (const struct hol_entry *entry,
int (*func)(const struct argp_option *opt,
-@@ -592,7 +592,7 @@
+@@ -595,7 +595,7 @@
}
/* Iterator that returns true for the first short option. */
@@ -20,8 +20,8 @@
const char *domain, void *cookie)
{
Index: lib/rtapelib.c
lib/rtapelib.c.orig 2006-02-20 10:46:01 +0100
-+++ lib/rtapelib.c 2006-10-24 13:18:23 +0200
+--- lib/rtapelib.c.orig 2006-12-05 08:39:38 +0100
lib/rtapelib.c 2007-06-08 18:56:21 +0200
@@ -625,7 +625,7 @@
{
char command_buffer[COMMAND_BUFFER_SIZE];
@@ -46,7 +46,7 @@
*--p = 0;
Index: lib/system.h
--- lib/system.h.orig2006-09-08 18:57:52 +0200
-+++ lib/system.h 2006-10-24 13:18:23 +0200
lib/system.h 2007-06-08 18:56:21 +0200
@@ -425,7 +425,7 @@
#include
@@ -57,8 +57,8 @@
/* Prototypes for external functions. */
Index: src/userspec.c
src/userspec.c.orig 2005-05-19 11:25:58 +0200
-+++ src/userspec.c 2006-10-24 13:18:23 +0200
+--- src/userspec.c.orig 2007-05-18 12:02:31 +0200
src/userspec.c 2007-06-08 18:56:21 +0200
@@ -22,6 +22,7 @@
#include
@@ -67,20 +67,3 @@
#define alloca __builtin_alloca
#else
#ifdef HAVE_ALLOCA_H
-
--
-
-http://savannah.gnu.org/bugs/index.php?18094
-http://savannah.gnu.org/file/cvs-diff.log?file_id=11044
-
-Index: src/copyout.c
src/copyout.c27 Sep 2006 09:28:50 - 1.19
-+++ src/copyout.c24 Oct 2006 10:47:38 -
-@@ -806,6 +806,7 @@ process_copy_out ()
- free (link_name);
- continue;
- }
-+link_name[link_size] = 0;
- cpio_safer_name_suffix (link_name, false,
- !no_abs_paths_flag, true);
- link_size = strlen (link_name);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
$ cvs diff -u -r1.37 -r1.38 cpio.spec
--- openpkg-src/cpio/cpio.spec17 May 2007 17:57:15 - 1.37
+++ openpkg-src/cpio/cpio.spec8 Jun 2007 16:59:32 - 1.38
@@ -32,8 +32,8 @@
Class:BASE
Group:Archiver
License: GPL
-Version: 2.7
-Release: 20070517
+Version: 2.8
+Release: 20070608
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cpio/ cpio.patch cpio.spec
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: 17-May-2007 19:57:16
Branch: HEAD Handle: 2007051718571500
Modified files:
openpkg-src/cpiocpio.patch cpio.spec
Log:
fix symlink creation by correctly terminating a buffer (patch comes
from vendor CVS)
Summary:
RevisionChanges Path
1.7 +17 -0 openpkg-src/cpio/cpio.patch
1.37+1 -1 openpkg-src/cpio/cpio.spec
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
$ cvs diff -u -r1.6 -r1.7 cpio.patch
--- openpkg-src/cpio/cpio.patch 24 Oct 2006 11:31:24 - 1.6
+++ openpkg-src/cpio/cpio.patch 17 May 2007 17:57:15 - 1.7
@@ -67,3 +67,20 @@
#define alloca __builtin_alloca
#else
#ifdef HAVE_ALLOCA_H
+
+-
+
+http://savannah.gnu.org/bugs/index.php?18094
+http://savannah.gnu.org/file/cvs-diff.log?file_id=11044
+
+Index: src/copyout.c
+--- src/copyout.c27 Sep 2006 09:28:50 - 1.19
src/copyout.c24 Oct 2006 10:47:38 -
+@@ -806,6 +806,7 @@ process_copy_out ()
+ free (link_name);
+ continue;
+ }
++link_name[link_size] = 0;
+ cpio_safer_name_suffix (link_name, false,
+ !no_abs_paths_flag, true);
+ link_size = strlen (link_name);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
$ cvs diff -u -r1.36 -r1.37 cpio.spec
--- openpkg-src/cpio/cpio.spec1 Jan 2007 17:37:08 - 1.36
+++ openpkg-src/cpio/cpio.spec17 May 2007 17:57:15 - 1.37
@@ -33,7 +33,7 @@
Group:Archiver
License: GPL
Version: 2.7
-Release: 20061024
+Release: 20070517
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
@@ .
__
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cpio/ cpio.patch cpio.spec
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: 24-Oct-2006 13:31:24
Branch: HEAD Handle: 2006102412312400
Modified files:
openpkg-src/cpiocpio.patch cpio.spec
Log:
fix building under FreeBSD/amd64 where inline causes trouble
Summary:
RevisionChanges Path
1.6 +24 -3 openpkg-src/cpio/cpio.patch
1.35+1 -1 openpkg-src/cpio/cpio.spec
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
$ cvs diff -u -r1.5 -r1.6 cpio.patch
--- openpkg-src/cpio/cpio.patch 22 Oct 2006 09:30:54 - 1.5
+++ openpkg-src/cpio/cpio.patch 24 Oct 2006 11:31:24 - 1.6
@@ -1,6 +1,27 @@
+Index: lib/argp-help.c
+--- lib/argp-help.c.orig 2006-09-12 10:59:04 +0200
lib/argp-help.c 2006-10-24 13:29:40 +0200
+@@ -567,7 +567,7 @@
+ return val;
+ }
+
+-static inline int
++static int
+ __attribute__ ((always_inline))
+ hol_entry_long_iterate (const struct hol_entry *entry,
+ int (*func)(const struct argp_option *opt,
+@@ -592,7 +592,7 @@
+ }
+
+ /* Iterator that returns true for the first short option. */
+-static inline int
++static int
+ until_short (const struct argp_option *opt, const struct argp_option *real,
+ const char *domain, void *cookie)
+ {
Index: lib/rtapelib.c
--- lib/rtapelib.c.orig 2006-02-20 10:46:01 +0100
-+++ lib/rtapelib.c 2006-10-22 11:09:19 +0200
lib/rtapelib.c 2006-10-24 13:18:23 +0200
@@ -625,7 +625,7 @@
{
char command_buffer[COMMAND_BUFFER_SIZE];
@@ -25,7 +46,7 @@
*--p = 0;
Index: lib/system.h
--- lib/system.h.orig2006-09-08 18:57:52 +0200
-+++ lib/system.h 2006-10-22 11:09:58 +0200
lib/system.h 2006-10-24 13:18:23 +0200
@@ -425,7 +425,7 @@
#include
@@ -37,7 +58,7 @@
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
src/userspec.c 2006-10-24 13:18:23 +0200
@@ -22,6 +22,7 @@
#include
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
$ cvs diff -u -r1.34 -r1.35 cpio.spec
--- openpkg-src/cpio/cpio.spec22 Oct 2006 09:58:24 - 1.34
+++ openpkg-src/cpio/cpio.spec24 Oct 2006 11:31:24 - 1.35
@@ -33,7 +33,7 @@
Group:Archiver
License: GPL
Version: 2.7
-Release: 20061022
+Release: 20061024
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cpio/ cpio.patch cpio.spec
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/cpiocpio.patch cpio.spec
Log:
upgrading package: cpio 2.6 -> 2.7
Summary:
RevisionChanges 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 - 1.4
+++ openpkg-src/cpio/cpio.patch 22 Oct 2006 09:30:54 - 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
-
- #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.orig2004-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.orig2006-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
+
+-#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
+
+ #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.spec13 Oct 2006 17:27:20 - 1.32
+++ openpkg-src/cpio/cpio.spec22 Oct 2006 09:30:55 - 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 Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cpio/ cpio.patch cpio.spec
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/cpiocpio.patch cpio.spec
Log:
make portable to older systems (like FreeBSD 4)
Summary:
RevisionChanges 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 - 1.3
+++ openpkg-src/cpio/cpio.patch 6 Feb 2005 11:43:25 - 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.orig2004-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.spec1 Jan 2005 10:48:22 - 1.27
+++ openpkg-src/cpio/cpio.spec6 Feb 2005 11:43:25 - 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 Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/cpio/ cpio.patch cpio.spec
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: 20-Dec-2004 20:08:04
Branch: HEAD Handle: 2004122019080400
Added files:
openpkg-src/cpiocpio.patch
Modified files:
openpkg-src/cpiocpio.spec
Log:
upgrading package: cpio 2.5 -> 2.6
Summary:
RevisionChanges Path
1.3 +38 -0 openpkg-src/cpio/cpio.patch
1.26+13 -10 openpkg-src/cpio/cpio.spec
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.patch
$ cvs diff -u -r0 -r1.3 cpio.patch
--- /dev/null 2004-12-20 20:08:04 +0100
+++ cpio.patch2004-12-20 20:08:04 +0100
@@ -0,0 +1,38 @@
+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
+
+ #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);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/cpio/cpio.spec
$ cvs diff -u -r1.25 -r1.26 cpio.spec
--- openpkg-src/cpio/cpio.spec7 Feb 2004 17:54:08 - 1.25
+++ openpkg-src/cpio/cpio.spec20 Dec 2004 19:08:04 - 1.26
@@ -33,11 +33,12 @@
Class:BASE
Group:Archiver
License: GPL
-Version: 2.5
-Release: 20040207
+Version: 2.6
+Release: 20041220
# list of sources
Source0: ftp://ftp.gnu.org/pub/gnu/cpio/cpio-%{version}.tar.gz
+Patch0: cpio.patch
# build information
Prefix: %{l_prefix}
@@ -62,22 +63,24 @@
%prep
%setup -q
+%patch -p0
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
./configure \
---prefix=%{l_prefix}
-%{l_make} %{l_mflags -O} cpio cpio.info
+--prefix=%{l_prefix} \
+--libexecdir=%{l_prefix}/libexec/cpio
+%{l_make} %{l_mflags -O}
%install
rm -rf $RPM_BUILD_ROOT
-%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
-%{l_shtool} install -c -s -m 755 cpio $RPM_BUILD_ROOT%{l_prefix}/bin/
-%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man1
-%{l_shtool} install -c -m 644 cpio.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
-%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/info
-%{l_shtool} install -c -m 644 cpio.info $RPM_BUILD_ROOT%{l_prefix}/info/
+%{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/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
+strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
%files -f files
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
