This commit is contained in:
parent
d3cbca1756
commit
521b1a9bcb
8
cpio-2.10-include_fatal_c.patch
Normal file
8
cpio-2.10-include_fatal_c.patch
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
--- lib/Makefile.am.orig 2009-07-09 09:41:26.000000000 +0200
|
||||||
|
+++ lib/Makefile.am 2009-07-09 09:41:17.000000000 +0200
|
||||||
|
@@ -37,4 +37,5 @@
|
||||||
|
sysdep.c\
|
||||||
|
system.h\
|
||||||
|
error.c\
|
||||||
|
+ ../src/fatal.c \
|
||||||
|
names.c
|
@ -106,6 +106,7 @@
|
|||||||
EXTRA_PROGRAMS=mt
|
EXTRA_PROGRAMS=mt
|
||||||
|
|
||||||
cpio_SOURCES = \
|
cpio_SOURCES = \
|
||||||
|
|
||||||
--- src/copyin.c
|
--- src/copyin.c
|
||||||
+++ src/copyin.c
|
+++ src/copyin.c
|
||||||
@@ -768,7 +768,7 @@
|
@@ -768,7 +768,7 @@
|
||||||
@ -150,7 +151,7 @@
|
|||||||
|
|
||||||
/* If -f is not given, the environment variable TAPE is used;
|
/* If -f is not given, the environment variable TAPE is used;
|
||||||
if that is not set, a default device defined in sys/mtio.h is used.
|
if that is not set, a default device defined in sys/mtio.h is used.
|
||||||
@@ -51,6 +55,46 @@
|
@@ -51,6 +55,48 @@
|
||||||
retension Rewind the tape, then wind it to the end of the reel,
|
retension Rewind the tape, then wind it to the end of the reel,
|
||||||
then rewind it again.
|
then rewind it again.
|
||||||
erase Erase the tape.
|
erase Erase the tape.
|
||||||
@ -196,13 +197,13 @@
|
|||||||
+ is disabled. Otherwise, compression is enabled.
|
+ is disabled. Otherwise, compression is enabled.
|
||||||
|
|
||||||
David MacKenzie <djm@gnu.ai.mit.edu> */
|
David MacKenzie <djm@gnu.ai.mit.edu> */
|
||||||
|
+
|
||||||
|
+#include <configmake.h>
|
||||||
|
|
||||||
@@ -105,6 +149,45 @@
|
@@ -105,6 +147,43 @@
|
||||||
void exit ();
|
void exit ();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
+#include "../lib/argmatch.h"
|
|
||||||
+
|
|
||||||
+#if defined(linux) || defined(__linux)
|
+#if defined(linux) || defined(__linux)
|
||||||
+#define MTDATCOMP 1000 /* Random unused number. */
|
+#define MTDATCOMP 1000 /* Random unused number. */
|
||||||
+#define MTDENS 1001 /* Random unused number. */
|
+#define MTDENS 1001 /* Random unused number. */
|
3
cpio-2.10.tar.bz2
Normal file
3
cpio-2.10.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:def23150e4e081599ecb013736f4403617fefbb6f6e6806dc6a98129913d79d5
|
||||||
|
size 951395
|
@ -1,11 +0,0 @@
|
|||||||
--- doc/cpio.texi
|
|
||||||
+++ doc/cpio.texi
|
|
||||||
@@ -234,7 +234,7 @@ unreadable.
|
|
||||||
cpio @{-o|--create@} [-0acvABLV] [-C bytes] [-H format]
|
|
||||||
[-M message] [-O [[user@@]host:]archive] [-F [[user@@]host:]archive]
|
|
||||||
[--file=[[user@@]host:]archive] [--format=format]
|
|
||||||
-[--message=message][--null] [--reset-access-time] [--verbose]
|
|
||||||
+[--message=message] [--null] [--reset-access-time] [--verbose]
|
|
||||||
[--dot] [--append] [--block-size=blocks] [--dereference]
|
|
||||||
[--io-size=bytes] [--rsh-command=command] [--help] [--version]
|
|
||||||
< name-list [> archive]
|
|
@ -1,30 +0,0 @@
|
|||||||
--- lib/argp.h.orig 2007-09-25 11:04:18.000000000 +0200
|
|
||||||
+++ lib/argp.h 2007-09-25 11:06:24.000000000 +0200
|
|
||||||
@@ -580,7 +580,11 @@
|
|
||||||
# endif
|
|
||||||
|
|
||||||
# ifndef ARGP_EI
|
|
||||||
-# define ARGP_EI extern __inline__
|
|
||||||
+# if defined __GNUC_STDC_INLINE__
|
|
||||||
+# define ARGP_EI extern __inline__ __attribute__((__gnu_inline__))
|
|
||||||
+# else
|
|
||||||
+# define ARGP_EI extern __inline__
|
|
||||||
+# endif
|
|
||||||
# endif
|
|
||||||
|
|
||||||
ARGP_EI void
|
|
||||||
--- lib/argp-fmtstream.h.orig 2007-09-25 11:06:49.000000000 +0200
|
|
||||||
+++ lib/argp-fmtstream.h 2007-09-25 11:07:35.000000000 +0200
|
|
||||||
@@ -198,8 +198,12 @@
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef ARGP_FS_EI
|
|
||||||
+#ifdef __GNUC_STDC_INLINE__
|
|
||||||
+#define ARGP_FS_EI extern inline __attribute__((__gnu_inline__))
|
|
||||||
+#else
|
|
||||||
#define ARGP_FS_EI extern inline
|
|
||||||
#endif
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
ARGP_FS_EI size_t
|
|
||||||
__argp_fmtstream_write (argp_fmtstream_t __fs,
|
|
@ -1,98 +0,0 @@
|
|||||||
--- m4/extensions.m4
|
|
||||||
+++ m4/extensions.m4
|
|
||||||
@@ -1,14 +1,14 @@
|
|
||||||
-# serial 4 -*- Autoconf -*-
|
|
||||||
+# serial 5 -*- Autoconf -*-
|
|
||||||
# Enable extensions on systems that normally disable them.
|
|
||||||
|
|
||||||
-# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
|
|
||||||
+# Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc.
|
|
||||||
# This file is free software; the Free Software Foundation
|
|
||||||
# gives unlimited permission to copy and/or distribute it,
|
|
||||||
# with or without modifications, as long as this notice is preserved.
|
|
||||||
|
|
||||||
# This definition of AC_USE_SYSTEM_EXTENSIONS is stolen from CVS
|
|
||||||
# Autoconf. Perhaps we can remove this once we can assume Autoconf
|
|
||||||
-# 2.61 or later everywhere, but since CVS Autoconf mutates rapidly
|
|
||||||
+# 2.62 or later everywhere, but since CVS Autoconf mutates rapidly
|
|
||||||
# enough in this area it's likely we'll need to redefine
|
|
||||||
# AC_USE_SYSTEM_EXTENSIONS for quite some time.
|
|
||||||
|
|
||||||
@@ -16,39 +16,63 @@
|
|
||||||
# ------------------------
|
|
||||||
# Enable extensions on systems that normally disable them,
|
|
||||||
# typically due to standards-conformance issues.
|
|
||||||
+# Remember that #undef in AH_VERBATIM gets replaced with #define by
|
|
||||||
+# AC_DEFINE. The goal here is to define all known feature-enabling
|
|
||||||
+# macros, then, if reports of conflicts are made, disable macros that
|
|
||||||
+# cause problems on some platforms (such as __EXTENSIONS__).
|
|
||||||
AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS],
|
|
||||||
-[
|
|
||||||
- AC_BEFORE([$0], [AC_COMPILE_IFELSE])
|
|
||||||
- AC_BEFORE([$0], [AC_RUN_IFELSE])
|
|
||||||
-
|
|
||||||
- AC_REQUIRE([AC_GNU_SOURCE])
|
|
||||||
- AC_REQUIRE([AC_AIX])
|
|
||||||
- AC_REQUIRE([AC_MINIX])
|
|
||||||
+[AC_BEFORE([$0], [AC_COMPILE_IFELSE])dnl
|
|
||||||
+AC_BEFORE([$0], [AC_RUN_IFELSE])dnl
|
|
||||||
+
|
|
||||||
+ AC_CHECK_HEADER([minix/config.h], [MINIX=yes], [MINIX=])
|
|
||||||
+ if test "$MINIX" = yes; then
|
|
||||||
+ AC_DEFINE([_POSIX_SOURCE], [1],
|
|
||||||
+ [Define to 1 if you need to in order for `stat' and other
|
|
||||||
+ things to work.])
|
|
||||||
+ AC_DEFINE([_POSIX_1_SOURCE], [2],
|
|
||||||
+ [Define to 2 if the system does not provide POSIX.1 features
|
|
||||||
+ except with this defined.])
|
|
||||||
+ AC_DEFINE([_MINIX], [1],
|
|
||||||
+ [Define to 1 if on MINIX.])
|
|
||||||
+ fi
|
|
||||||
|
|
||||||
AH_VERBATIM([__EXTENSIONS__],
|
|
||||||
-[/* Enable extensions on Solaris. */
|
|
||||||
-#ifndef __EXTENSIONS__
|
|
||||||
-# undef __EXTENSIONS__
|
|
||||||
+[/* Enable extensions on AIX 3, Interix. */
|
|
||||||
+#ifndef _ALL_SOURCE
|
|
||||||
+# undef _ALL_SOURCE
|
|
||||||
#endif
|
|
||||||
+/* Enable GNU extensions on systems that have them. */
|
|
||||||
+#ifndef _GNU_SOURCE
|
|
||||||
+# undef _GNU_SOURCE
|
|
||||||
+#endif
|
|
||||||
+/* Enable threading extensions on Solaris. */
|
|
||||||
#ifndef _POSIX_PTHREAD_SEMANTICS
|
|
||||||
# undef _POSIX_PTHREAD_SEMANTICS
|
|
||||||
#endif
|
|
||||||
+/* Enable extensions on HP NonStop. */
|
|
||||||
#ifndef _TANDEM_SOURCE
|
|
||||||
# undef _TANDEM_SOURCE
|
|
||||||
-#endif])
|
|
||||||
+#endif
|
|
||||||
+/* Enable general extensions on Solaris. */
|
|
||||||
+#ifndef __EXTENSIONS__
|
|
||||||
+# undef __EXTENSIONS__
|
|
||||||
+#endif
|
|
||||||
+])
|
|
||||||
AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__],
|
|
||||||
[ac_cv_safe_to_define___extensions__],
|
|
||||||
[AC_COMPILE_IFELSE(
|
|
||||||
- [AC_LANG_PROGRAM([
|
|
||||||
+ [AC_LANG_PROGRAM([[
|
|
||||||
# define __EXTENSIONS__ 1
|
|
||||||
- AC_INCLUDES_DEFAULT])],
|
|
||||||
+ ]AC_INCLUDES_DEFAULT])],
|
|
||||||
[ac_cv_safe_to_define___extensions__=yes],
|
|
||||||
[ac_cv_safe_to_define___extensions__=no])])
|
|
||||||
test $ac_cv_safe_to_define___extensions__ = yes &&
|
|
||||||
AC_DEFINE([__EXTENSIONS__])
|
|
||||||
+ AC_DEFINE([_ALL_SOURCE])
|
|
||||||
+ AC_DEFINE([_GNU_SOURCE])
|
|
||||||
AC_DEFINE([_POSIX_PTHREAD_SEMANTICS])
|
|
||||||
AC_DEFINE([_TANDEM_SOURCE])
|
|
||||||
-])
|
|
||||||
+])# AC_USE_SYSTEM_EXTENSIONS
|
|
||||||
|
|
||||||
# gl_USE_SYSTEM_EXTENSIONS
|
|
||||||
# ------------------------
|
|
@ -1,70 +0,0 @@
|
|||||||
--- src/copyin.c
|
|
||||||
+++ src/copyin.c
|
|
||||||
@@ -108,7 +108,7 @@
|
|
||||||
header type. */
|
|
||||||
|
|
||||||
static void
|
|
||||||
-tape_skip_padding (int in_file_des, int offset)
|
|
||||||
+tape_skip_padding (int in_file_des, off_t offset)
|
|
||||||
{
|
|
||||||
int pad;
|
|
||||||
|
|
||||||
--- src/extern.h
|
|
||||||
+++ src/extern.h
|
|
||||||
@@ -166,8 +166,8 @@
|
|
||||||
void copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes);
|
|
||||||
void copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes, char *filename);
|
|
||||||
void copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes, char *filename);
|
|
||||||
-void warn_if_file_changed (char *file_name, unsigned long old_file_size,
|
|
||||||
- off_t old_file_mtime);
|
|
||||||
+void warn_if_file_changed (char *file_name, off_t old_file_size,
|
|
||||||
+ time_t old_file_mtime);
|
|
||||||
void create_all_directories (char *name);
|
|
||||||
void prepare_append (int out_file_des);
|
|
||||||
char *find_inode_file (unsigned long node_num,
|
|
||||||
--- src/util.c
|
|
||||||
+++ src/util.c
|
|
||||||
@@ -441,8 +441,8 @@
|
|
||||||
void
|
|
||||||
copy_files_tape_to_disk (int in_des, int out_des, off_t num_bytes)
|
|
||||||
{
|
|
||||||
- long size;
|
|
||||||
- long k;
|
|
||||||
+ off_t size;
|
|
||||||
+ off_t k;
|
|
||||||
|
|
||||||
while (num_bytes > 0)
|
|
||||||
{
|
|
||||||
@@ -472,8 +472,8 @@
|
|
||||||
copy_files_disk_to_tape (int in_des, int out_des, off_t num_bytes,
|
|
||||||
char *filename)
|
|
||||||
{
|
|
||||||
- long size;
|
|
||||||
- long k;
|
|
||||||
+ off_t size;
|
|
||||||
+ off_t k;
|
|
||||||
int rc;
|
|
||||||
off_t original_num_bytes;
|
|
||||||
|
|
||||||
@@ -525,8 +525,8 @@
|
|
||||||
copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes,
|
|
||||||
char *filename)
|
|
||||||
{
|
|
||||||
- long size;
|
|
||||||
- long k;
|
|
||||||
+ off_t size;
|
|
||||||
+ off_t k;
|
|
||||||
off_t original_num_bytes;
|
|
||||||
int rc;
|
|
||||||
|
|
||||||
@@ -567,8 +567,8 @@
|
|
||||||
/* Warn if file changed while it was being copied. */
|
|
||||||
|
|
||||||
void
|
|
||||||
-warn_if_file_changed (char *file_name, unsigned long old_file_size,
|
|
||||||
- off_t old_file_mtime)
|
|
||||||
+warn_if_file_changed (char *file_name, off_t old_file_size,
|
|
||||||
+ time_t old_file_mtime)
|
|
||||||
{
|
|
||||||
struct stat new_file_stat;
|
|
||||||
if ((*xstat) (file_name, &new_file_stat) < 0)
|
|
@ -1,20 +0,0 @@
|
|||||||
--- m4/intmax_t.m4 2007-11-29 15:32:01.000000000 +0100
|
|
||||||
+++ m4/intmax_t.m4 2006-09-05 20:46:08.000000000 +0200
|
|
||||||
@@ -18,7 +18,7 @@
|
|
||||||
AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
|
|
||||||
AC_REQUIRE([gl_AC_HEADER_STDINT_H])
|
|
||||||
if test $gl_cv_header_inttypes_h = no && test $gl_cv_header_stdint_h = no; then
|
|
||||||
- AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
|
|
||||||
+ AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
|
|
||||||
test $ac_cv_type_long_long = yes \
|
|
||||||
&& ac_type='long long' \
|
|
||||||
|| ac_type='long'
|
|
||||||
@@ -51,7 +51,7 @@
|
|
||||||
AC_DEFINE(HAVE_INTMAX_T, 1,
|
|
||||||
[Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
|
|
||||||
else
|
|
||||||
- AC_REQUIRE([gl_AC_TYPE_LONG_LONG])
|
|
||||||
+ AC_REQUIRE([AC_TYPE_LONG_LONG_INT])
|
|
||||||
test $ac_cv_type_long_long = yes \
|
|
||||||
&& ac_type='long long' \
|
|
||||||
|| ac_type='long'
|
|
@ -1,19 +0,0 @@
|
|||||||
--- Makefile.am
|
|
||||||
+++ Makefile.am
|
|
||||||
@@ -19,4 +19,4 @@
|
|
||||||
|
|
||||||
AUTOMAKE_OPTIONS = gnits 1.8 dist-bzip2 std-options
|
|
||||||
|
|
||||||
-SUBDIRS = doc headers lib rmt src po tests
|
|
||||||
+SUBDIRS = doc headers lib src po tests
|
|
||||||
--- Makefile.in
|
|
||||||
+++ Makefile.in
|
|
||||||
@@ -300,7 +300,7 @@
|
|
||||||
target_alias = @target_alias@
|
|
||||||
ACLOCAL_AMFLAGS = -I m4
|
|
||||||
AUTOMAKE_OPTIONS = gnits 1.8 dist-bzip2 std-options
|
|
||||||
-SUBDIRS = doc headers lib rmt src po tests
|
|
||||||
+SUBDIRS = doc headers lib src po tests
|
|
||||||
all: config.h
|
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
|
||||||
|
|
@ -1,100 +0,0 @@
|
|||||||
Patch from Sergey Poznyakoff <gray@mirddin.farlep.net> for cpio
|
|
||||||
based on patch:
|
|
||||||
2007-08-15 Dmitry V. Levin <ldv@owl.openwall.com>
|
|
||||||
|
|
||||||
Do not use alloca to avoid stack overflow with untrusted input.
|
|
||||||
|
|
||||||
* lib/paxnames.c (hash_string_insert_direct): New function.
|
|
||||||
(hash_string_insert): Use it.
|
|
||||||
(hash_string_insert_data): New function.
|
|
||||||
(safer_name_suffix): Use it instead of hash_string_insert()
|
|
||||||
and alloca().
|
|
||||||
|
|
||||||
--- lib/paxnames.c
|
|
||||||
+++ lib/paxnames.c
|
|
||||||
@@ -36,15 +36,27 @@
|
|
||||||
return strcmp (name1, name2) == 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-/* Return zero if TABLE contains a copy of STRING; otherwise, insert a
|
|
||||||
- copy of STRING to TABLE and return 1. */
|
|
||||||
-bool
|
|
||||||
-hash_string_insert (Hash_table **table, char const *string)
|
|
||||||
+/* Return zero if TABLE contains a LEN-character long prefix of STRING,
|
|
||||||
+ otherwise, insert a newly allocated copy of this prefix to TABLE and
|
|
||||||
+ return 1. If RETURN_PREFIX is not NULL, point it to the allocated
|
|
||||||
+ copy. */
|
|
||||||
+static bool
|
|
||||||
+hash_string_insert_prefix (Hash_table **table, char const *string, size_t len,
|
|
||||||
+ const char **return_prefix)
|
|
||||||
{
|
|
||||||
Hash_table *t = *table;
|
|
||||||
- char *s = xstrdup (string);
|
|
||||||
+ char *s;
|
|
||||||
char *e;
|
|
||||||
|
|
||||||
+ if (len)
|
|
||||||
+ {
|
|
||||||
+ s = xmalloc (len + 1);
|
|
||||||
+ memcpy (s, string, len);
|
|
||||||
+ s[len] = 0;
|
|
||||||
+ }
|
|
||||||
+ else
|
|
||||||
+ s = xstrdup (string);
|
|
||||||
+
|
|
||||||
if (! ((t
|
|
||||||
|| (*table = t = hash_initialize (0, 0, hash_string_hasher,
|
|
||||||
hash_string_compare, 0)))
|
|
||||||
@@ -52,7 +64,11 @@
|
|
||||||
xalloc_die ();
|
|
||||||
|
|
||||||
if (e == s)
|
|
||||||
- return 1;
|
|
||||||
+ {
|
|
||||||
+ if (return_prefix)
|
|
||||||
+ *return_prefix = s;
|
|
||||||
+ return 1;
|
|
||||||
+ }
|
|
||||||
else
|
|
||||||
{
|
|
||||||
free (s);
|
|
||||||
@@ -60,6 +76,14 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+/* Return zero if TABLE contains a copy of STRING; otherwise, insert a
|
|
||||||
+ copy of STRING to TABLE and return 1. */
|
|
||||||
+bool
|
|
||||||
+hash_string_insert (Hash_table **table, char const *string)
|
|
||||||
+{
|
|
||||||
+ return hash_string_insert_prefix (table, string, 0, NULL);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
/* Return 1 if TABLE contains STRING. */
|
|
||||||
bool
|
|
||||||
hash_string_lookup (Hash_table const *table, char const *string)
|
|
||||||
@@ -88,7 +112,8 @@
|
|
||||||
If ABSOLUTE_NAMES is 0, strip filesystem prefix from the file name. */
|
|
||||||
|
|
||||||
char *
|
|
||||||
-safer_name_suffix (char const *file_name, bool link_target, bool absolute_names)
|
|
||||||
+safer_name_suffix (char const *file_name, bool link_target,
|
|
||||||
+ bool absolute_names)
|
|
||||||
{
|
|
||||||
char const *p;
|
|
||||||
|
|
||||||
@@ -121,11 +146,9 @@
|
|
||||||
|
|
||||||
if (prefix_len)
|
|
||||||
{
|
|
||||||
- char *prefix = alloca (prefix_len + 1);
|
|
||||||
- memcpy (prefix, file_name, prefix_len);
|
|
||||||
- prefix[prefix_len] = '\0';
|
|
||||||
-
|
|
||||||
- if (hash_string_insert (&prefix_table[link_target], prefix))
|
|
||||||
+ const char *prefix;
|
|
||||||
+ if (hash_string_insert_prefix (&prefix_table[link_target], file_name,
|
|
||||||
+ prefix_len, &prefix))
|
|
||||||
{
|
|
||||||
static char const *const diagnostic[] =
|
|
||||||
{
|
|
@ -1,11 +0,0 @@
|
|||||||
--- src/copyin.c
|
|
||||||
+++ src/copyin.c
|
|
||||||
@@ -1277,7 +1277,7 @@
|
|
||||||
error (0, 0, _("warning: archive header has reverse byte-order"));
|
|
||||||
warned = 1;
|
|
||||||
}
|
|
||||||
- swab_array ((char *) &short_hdr, 13);
|
|
||||||
+ swab_array ((char *) short_hdr, 13);
|
|
||||||
}
|
|
||||||
|
|
||||||
file_hdr->c_dev_maj = major (short_hdr->c_dev);
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:bb9a5fa693a8f4ef4685eb447cea1dc5b787e37c302569928ef74df460724707
|
|
||||||
size 758195
|
|
16
cpio.changes
16
cpio.changes
@ -1,3 +1,19 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jun 22 16:48:28 CEST 2009 - mseben@suse.cz
|
||||||
|
|
||||||
|
- updated to version 2.10
|
||||||
|
* Ensure record headers are properly packed (fix builds on ARM).
|
||||||
|
* Fix exit codes to reliably indicate success or failure of the operation.
|
||||||
|
* Fix large file support.
|
||||||
|
* Support MinGW builds.
|
||||||
|
* Minor bugfixes.
|
||||||
|
- deprecated : lfs_correction.patch,paxlib-owl-alloca.patch,
|
||||||
|
gcc4_3.patch,segfault_in_copyin.patch,doc_typo.patch,
|
||||||
|
m4_macro.patch,gnulib.patch, no_rmt.patch
|
||||||
|
- added include_fatal_c.patch : fix undefined ref in mt build
|
||||||
|
- configure stage : removed useless DEFAULT_RMT_DIR=/sbin, added
|
||||||
|
--with-rmt="%{_sysconfdir}/rmt" and --enable-mt
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Aug 4 12:02:01 CEST 2008 - lmichnovic@suse.cz
|
Mon Aug 4 12:02:01 CEST 2008 - lmichnovic@suse.cz
|
||||||
|
|
||||||
|
210
cpio.spec
210
cpio.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package cpio (Version 2.9)
|
# spec file for package cpio (Version 2.10)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -23,33 +23,27 @@ Url: http://www.gnu.org/software/cpio/cpio.html
|
|||||||
License: GPL v3 only
|
License: GPL v3 only
|
||||||
Group: Productivity/Archiving/Compression
|
Group: Productivity/Archiving/Compression
|
||||||
AutoReqProv: on
|
AutoReqProv: on
|
||||||
Version: 2.9
|
Version: 2.10
|
||||||
Release: 91
|
Release: 1
|
||||||
Summary: A Backup and Archiving Utility
|
Summary: A Backup and Archiving Utility
|
||||||
Source: cpio-2.9.tar.bz2
|
Source: %{name}-%{version}.tar.bz2
|
||||||
Patch1: cpio-2.9-no_rmt.patch
|
Patch2: %{name}-%{version}-use_new_ascii_format.patch
|
||||||
Patch2: cpio-2.9-use_new_ascii_format.patch
|
Patch3: %{name}-%{version}-mt.patch
|
||||||
Patch3: cpio-2.9-mt.patch
|
Patch4: %{name}-%{version}-use_sbin_rmt.patch
|
||||||
Patch4: cpio-2.9-use_sbin_rmt.patch
|
Patch5: %{name}-%{version}-open_nonblock.patch
|
||||||
Patch5: cpio-2.9-open_nonblock.patch
|
Patch7: %{name}-%{version}-chmodRaceC.patch
|
||||||
Patch6: cpio-2.9-lfs_correction.patch
|
|
||||||
Patch7: cpio-2.9-chmodRaceC.patch
|
|
||||||
Patch8: cpio-2.9-paxlib-owl-alloca.patch
|
|
||||||
Patch9: cpio-2.9-gcc4_3.patch
|
|
||||||
Patch10: cpio-2.9-segfault_in_copyin.patch
|
|
||||||
Patch11: cpio-2.9-avoid_overflow_warning.patch
|
|
||||||
Patch12: cpio-2.9-doc_typo.patch
|
|
||||||
Patch13: cpio-2.9-m4_macro.patch
|
|
||||||
#patch dir_perm reverts some things which were added by patch #7 chmodRaceC
|
#patch dir_perm reverts some things which were added by patch #7 chmodRaceC
|
||||||
Patch14: cpio-2.9-dir_perm.patch
|
Patch14: %{name}-%{version}-dir_perm.patch
|
||||||
Patch15: cpio-2.9-eof_tape_handling.patch
|
Patch15: %{name}-%{version}-eof_tape_handling.patch
|
||||||
Patch16: cpio-2.9-gnulib.patch
|
|
||||||
# make posibble to have device nodes with major number > 127
|
# make posibble to have device nodes with major number > 127
|
||||||
# Red Hat Bugzilla #450109
|
# Red Hat Bugzilla #450109
|
||||||
Patch17: cpio-2.9-dev_number.patch
|
Patch17: %{name}-%{version}-dev_number.patch
|
||||||
Patch18: cpio-2.9-default_tape_dev.patch
|
Patch18: %{name}-%{version}-default_tape_dev.patch
|
||||||
|
#PATCH-FIX-UPSTREAM include_fatal_c.patch fix undefined ref in mt build
|
||||||
|
Patch19: %{name}-%{version}-include_fatal_c.patch
|
||||||
PreReq: %install_info_prereq
|
PreReq: %install_info_prereq
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
BuildRequires: rmt
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -74,33 +68,27 @@ Authors:
|
|||||||
%lang_package
|
%lang_package
|
||||||
%prep
|
%prep
|
||||||
%setup
|
%setup
|
||||||
%patch1
|
|
||||||
%patch2
|
%patch2
|
||||||
%patch3
|
%patch3
|
||||||
%patch4
|
%patch4
|
||||||
%patch5
|
%patch5
|
||||||
%patch6
|
|
||||||
%patch7
|
%patch7
|
||||||
%patch8
|
|
||||||
%patch9
|
|
||||||
%patch10
|
|
||||||
%patch11
|
|
||||||
%patch12
|
|
||||||
%patch13
|
|
||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%patch15
|
%patch15
|
||||||
%patch16
|
|
||||||
%patch17
|
%patch17
|
||||||
%patch18
|
%patch18
|
||||||
chmod 755 .
|
%patch19
|
||||||
chmod u+w *
|
#chmod 755 .
|
||||||
chmod a+r *
|
#chmod u+w *
|
||||||
|
#chmod a+r *
|
||||||
|
|
||||||
%build
|
%build
|
||||||
gettextize -f
|
gettextize -f
|
||||||
autoreconf --force --install
|
autoreconf --force --install
|
||||||
CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \
|
CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \
|
||||||
./configure DEFAULT_RMT_DIR=/sbin \
|
./configure \
|
||||||
|
--with-rmt="%{_sysconfdir}/rmt" \
|
||||||
|
--enable-mt \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--mandir=%{_mandir} \
|
--mandir=%{_mandir} \
|
||||||
--infodir=%{_infodir} \
|
--infodir=%{_infodir} \
|
||||||
@ -136,155 +124,3 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%files lang -f %{name}.lang
|
%files lang -f %{name}.lang
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Aug 04 2008 lmichnovic@suse.cz
|
|
||||||
- changed default tape device for 'mt' command to /dev/nst0
|
|
||||||
/dev/tape is not symlink any more but directory handled by udev
|
|
||||||
(*default_tape_dev.patch) [bnc#355241]
|
|
||||||
* Fri Aug 01 2008 cthiel@suse.de
|
|
||||||
- specfile cleanup
|
|
||||||
* Fri Jul 18 2008 lmichnovic@suse.cz
|
|
||||||
- make possible device nodes with major number > 127 [rhb#450109]
|
|
||||||
(*dev_number.patch)
|
|
||||||
* Fri Jun 27 2008 schwab@suse.de
|
|
||||||
- Fix gnulib macro.
|
|
||||||
* Fri Apr 11 2008 lmichnovic@suse.cz
|
|
||||||
- adjusted eof-handling.patch to check for 'end-of-file' and
|
|
||||||
'end-of-data' marker when detecting reel change. [bnc#371077]
|
|
||||||
* Fri Apr 04 2008 lmichnovic@suse.cz
|
|
||||||
- adjusted cpio-2.9-dir_perm.patch acording Red Hat patch to fix
|
|
||||||
correct dir permissions after extraction in pass-through mode.
|
|
||||||
- fix for two tapes handling (eof_tape_handling.patch) [bnc#371077]
|
|
||||||
* Thu Mar 13 2008 lmichnovic@suse.cz
|
|
||||||
- lang subpackage split off
|
|
||||||
* Thu Mar 13 2008 lmichnovic@suse.cz
|
|
||||||
- applying upstream patch cpio-2.9-dir_perm.patch which fixes
|
|
||||||
incorrect directory permissions after archive extraction
|
|
||||||
* Thu Nov 29 2007 lmichnovic@suse.cz
|
|
||||||
- removed unused m4 macro gl_LONG_LONG (*m4_macro.patch)
|
|
||||||
* Wed Nov 07 2007 lmichnovic@suse.cz
|
|
||||||
- upstream fix of typo in documantation (*doc_typo.patch)
|
|
||||||
* Tue Oct 23 2007 lmichnovic@suse.cz
|
|
||||||
- rewrote code which uses overflow to copy string in structure and
|
|
||||||
gcc was complaining about it (*avoid_overflow_warning.patch)
|
|
||||||
* Mon Oct 01 2007 lmichnovic@suse.cz
|
|
||||||
- Fixed typo in copin.c causing segfault [#329744]
|
|
||||||
(*segfault_in_copyin.patch)
|
|
||||||
* Tue Sep 25 2007 lmichnovic@suse.cz
|
|
||||||
- fix for compiling with new gcc 4.3 (*gcc4_3.patch)
|
|
||||||
* Mon Aug 20 2007 lmichnovic@suse.cz
|
|
||||||
- fixed typo in paxlib-owl-alloca.patch [#301416]
|
|
||||||
* Fri Aug 17 2007 lmichnovic@suse.cz
|
|
||||||
- upstream fix: use of alloca can cause stack overflow
|
|
||||||
(paxlib-owl-alloca.patch)
|
|
||||||
* Tue Aug 14 2007 lmichnovic@suse.cz
|
|
||||||
- CAN-2005-1111 is not fixed completely in 2.9 (chmodRaceC.patch)
|
|
||||||
based on fedora patch
|
|
||||||
* Wed Jul 25 2007 lmichnovic@suse.cz
|
|
||||||
- fixed types of variables for LFS support (*lfs_correction.patch)
|
|
||||||
* Tue Jul 24 2007 lmichnovic@suse.cz
|
|
||||||
- adjusted *mt.patch to fix compression handling [#223494]
|
|
||||||
* Fri Jul 20 2007 lmichnovic@suse.cz
|
|
||||||
- update to version 2.9
|
|
||||||
- obsoletes *lstat.patch
|
|
||||||
* Licensed under the GPLv3.
|
|
||||||
* Bugfixes: Honor umask when creating intermediate directories,
|
|
||||||
not specified in the archive (debian bug #430053). (This bug
|
|
||||||
is only in version 2.8)
|
|
||||||
* 2.8:
|
|
||||||
* Option --owner can be used in copy-out mode, allowing
|
|
||||||
to uniformly override the ownership of the files being added
|
|
||||||
to the archive.
|
|
||||||
* Bugfixes:
|
|
||||||
- Symlinks were handled incorrectly in copy-out mode. (This
|
|
||||||
bug was only in version 2.7)
|
|
||||||
- Fix handling of large files. {obsoletes lfs.patch}
|
|
||||||
o Fix setting the file permissions in copy-out mode.
|
|
||||||
o Fix CAN-2005-1111 {obsoletes chmodRaceC.patch}
|
|
||||||
* 2.7:
|
|
||||||
* Improved error checking and diagnostics
|
|
||||||
* Fixed CAN-1999-1572 {obsoletes writeOutHeaderBufferOverflow.patch}
|
|
||||||
* Allow to use --sparse in both copy-in and copy-pass.
|
|
||||||
* Fix bug that eventually caused copying out the same
|
|
||||||
hard-linked file several times to archive.
|
|
||||||
* Fix several LFS-related issues. {obsoletes lfs.patch}
|
|
||||||
* Fix Debian bug #335580.
|
|
||||||
- obsoletes *dirTraversal.patch implemented with option
|
|
||||||
--no-absolute-pathnames; option --absolute-pathnames is still possible
|
|
||||||
- obsoletes *checksum.patch, fix_umask.patch, sparse.patch
|
|
||||||
- using lang macro
|
|
||||||
* Thu Sep 21 2006 lmichnovic@suse.cz
|
|
||||||
- fixed typo in cpio-2.6.dif; renamed to *-mt.patch
|
|
||||||
- united suffix of patches
|
|
||||||
* Tue Sep 19 2006 schwab@suse.de
|
|
||||||
- Fix missing newline after mt status.
|
|
||||||
* Mon Jul 24 2006 rguenther@suse.de
|
|
||||||
- remove useless build-dependency on rsh.
|
|
||||||
* Wed Jan 25 2006 mls@suse.de
|
|
||||||
- converted neededforbuild to BuildRequires
|
|
||||||
* Tue Dec 06 2005 fehr@suse.de
|
|
||||||
- add cpio-2.6-chmodRaceC.patch and cpio-2.6-dirTraversal.patch to
|
|
||||||
fix bug #80226
|
|
||||||
- add cpio-2.6-writeOutHeaderBufferOverflow.patch to fix #133454
|
|
||||||
- add cpio-2.6-checksum.patch fix wrong checksum on 64bit archs
|
|
||||||
- add cpio-2.6-lfs.patch to support large files on 32bit archs
|
|
||||||
* Wed Aug 10 2005 fehr@suse.de
|
|
||||||
- fix call to setlocale to make multibyte characters work (#98902)
|
|
||||||
* Thu Jun 30 2005 fehr@suse.de
|
|
||||||
- open with O_NONBLOCK option (#94449)
|
|
||||||
* Wed May 04 2005 ro@suse.de
|
|
||||||
- properly detect lstat in configure
|
|
||||||
* Wed Apr 27 2005 snwint@suse.de
|
|
||||||
- fix '--sparse' option check
|
|
||||||
* Mon Apr 25 2005 fehr@suse.de
|
|
||||||
- update to cpio 2.6
|
|
||||||
* Mon Jan 24 2005 fehr@suse.de
|
|
||||||
- fix problem with cpio not respecting umask (#50054)
|
|
||||||
* Mon Jan 19 2004 ro@suse.de
|
|
||||||
- fix build as user
|
|
||||||
* Sun Jan 11 2004 adrian@suse.de
|
|
||||||
- add %%defattr
|
|
||||||
* Thu Apr 24 2003 ro@suse.de
|
|
||||||
- fix install_info --delete call and move from preun to postun
|
|
||||||
* Tue Apr 15 2003 coolo@suse.de
|
|
||||||
- use BuildRoot
|
|
||||||
* Fri Feb 07 2003 fehr@suse.de
|
|
||||||
- Use %%install_info macro
|
|
||||||
* Tue Sep 17 2002 ro@suse.de
|
|
||||||
- removed bogus self-provides
|
|
||||||
* Tue Aug 13 2002 mfabian@suse.de
|
|
||||||
- add cpio-2.5-i18n-0.1.patch received from
|
|
||||||
"Mitsuru Chinen" <CHINEN@jp.ibm.com>
|
|
||||||
The patch just adds a setlocale (LC_ALL, "").
|
|
||||||
* Sun Jul 28 2002 kukuk@suse.de
|
|
||||||
- remove unused tetex from neededforbuild
|
|
||||||
* Fri Jul 05 2002 fehr@suse.de
|
|
||||||
- update to new version 2.5
|
|
||||||
* Mon Dec 03 2001 fehr@suse.de
|
|
||||||
- make the -c switch comatible to SVR4 (and compatible to RedHat)
|
|
||||||
- fix the man page accordingly
|
|
||||||
- add rsh to #needfobuild to allow remote file access again (#12543)
|
|
||||||
* Sun Dec 03 2000 schwab@suse.de
|
|
||||||
- Fix a few bugs and typos.
|
|
||||||
* Tue Nov 28 2000 fehr@suse.de
|
|
||||||
- add compile options for LFS
|
|
||||||
* Mon Apr 17 2000 fehr@suse.de
|
|
||||||
- move cpio binary to /bin for compatibility with RedHat
|
|
||||||
* Fri Feb 25 2000 kukuk@suse.de
|
|
||||||
- remove Makefile.Linux
|
|
||||||
- use _infodir/_mandir
|
|
||||||
* Mon Sep 13 1999 bs@suse.de
|
|
||||||
- ran old prepare_spec on spec file to switch to new prepare_spec.
|
|
||||||
* Thu Sep 02 1999 fehr@suse.de
|
|
||||||
- Fix patch for broken header (cast to short instead of int)
|
|
||||||
* Wed Aug 04 1999 kukuk@suse.de
|
|
||||||
- Add patch for broken header in oldascii format
|
|
||||||
* Tue Sep 22 1998 ro@suse.de
|
|
||||||
- define _GNU_SOURCE for glibc where including getopt
|
|
||||||
* Tue Sep 01 1998 ro@suse.de
|
|
||||||
- fixed strdup-macro problem
|
|
||||||
* Thu Jun 05 1997 florian@suse.de
|
|
||||||
- go through the list of regex in a more suitable way (from ma@suse.de)
|
|
||||||
* Sun Apr 13 1997 florian@suse.de
|
|
||||||
- update to new version 2.4.2
|
|
||||||
- add Linux patches from RedHat
|
|
||||||
- add patches from gnu.utils.bugs
|
|
||||||
|
Loading…
Reference in New Issue
Block a user