Mailinglist Archive: opensuse-commit (1295 mails)
| < Previous | Next > |
commit cpio
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Fri, 27 Jul 2007 01:22:53 +0200
- Message-id: <20070726232254.03D60678331@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package cpio
checked in at Fri Jul 27 01:22:53 CEST 2007.
--------
--- cpio/cpio.changes 2006-09-21 18:16:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/cpio/cpio.changes 2007-07-25 13:17:06.000000000 +0200
@@ -1,0 +2,42 @@
+Wed Jul 25 13:14:53 CEST 2007 - lmichnovic@xxxxxxx
+
+- fixed types of variables for LFS support (*lfs_correction.patch)
+
+-------------------------------------------------------------------
+Tue Jul 24 15:50:44 CEST 2007 - lmichnovic@xxxxxxx
+
+- adjusted *mt.patch to fix compression handling [#223494]
+
+-------------------------------------------------------------------
+Fri Jul 20 11:01:31 CEST 2007 - lmichnovic@xxxxxxx
+
+- 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
+
+-------------------------------------------------------------------
Old:
----
cpio-2.6-checksum.patch
cpio-2.6-chmodRaceC.patch
cpio-2.6-dirTraversal.patch
cpio-2.6-lfs.patch
cpio-2.6-mt.patch
cpio-2.6.tar.bz2
cpio-2.6-writeOutHeaderBufferOverflow.patch
cpio-lstat.patch
fix_umask.patch
open_nonblock.patch
sparse.patch
use_new_ascii_format.patch
use_sbin_rmt.patch
New:
----
cpio-2.9-lfs_correction.patch
cpio-2.9-mt.patch
cpio-2.9-no_rmt.patch
cpio-2.9-open_nonblock.patch
cpio-2.9.tar.bz2
cpio-2.9-use_new_ascii_format.patch
cpio-2.9-use_sbin_rmt.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cpio.spec ++++++
--- /var/tmp/diff_new_pack.u29248/_old 2007-07-27 01:22:35.000000000 +0200
+++ /var/tmp/diff_new_pack.u29248/_new 2007-07-27 01:22:35.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package cpio (Version 2.6)
+# spec file for package cpio (Version 2.9)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -12,25 +12,19 @@
Name: cpio
URL: http://www.gnu.org/software/cpio/cpio.html
-License: Other License(s), see package, GPL
+License: GPL v2 or later
Group: Productivity/Archiving/Compression
Autoreqprov: on
-Version: 2.6
-Release: 26
+Version: 2.9
+Release: 2
Summary: A Backup and Archiving Utility
-Source: cpio-2.6.tar.bz2
-Patch: cpio-2.6-mt.patch
-Patch1: use_new_ascii_format.patch
-Patch2: use_sbin_rmt.patch
-Patch3: fix_umask.patch
-Patch4: sparse.patch
-Patch5: cpio-lstat.patch
-Patch6: open_nonblock.patch
-Patch7: cpio-2.6-dirTraversal.patch
-Patch8: cpio-2.6-chmodRaceC.patch
-Patch9: cpio-2.6-lfs.patch
-Patch10: cpio-2.6-checksum.patch
-Patch11: cpio-2.6-writeOutHeaderBufferOverflow.patch
+Source: cpio-2.9.tar.bz2
+Patch1: cpio-2.9-no_rmt.patch
+Patch2: cpio-2.9-use_new_ascii_format.patch
+Patch3: cpio-2.9-mt.patch
+Patch4: cpio-2.9-use_sbin_rmt.patch
+Patch5: cpio-2.9-open_nonblock.patch
+Patch6: cpio-2.9-lfs_correction.patch
PreReq: %install_info_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -52,28 +46,24 @@
Authors:
--------
- David J. MacKenzie <djm@xxxxxxxxxxxxxx>
+ David J. MacKenzie <djm@xxxxxxx>
Jim Meyering <meyering@xxxxxxxxxxxxxxx>
%prep
%setup
-%patch
%patch1
%patch2
%patch3
%patch4
%patch5
%patch6
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
chmod 755 .
chmod u+w *
chmod a+r *
%build
+gettextize -f
+aclocal -I m4
autoreconf --force --install
CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \
./configure DEFAULT_RMT_DIR=/sbin \
@@ -84,11 +74,11 @@
make
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/{usr/bin,bin}
make prefix=$RPM_BUILD_ROOT/usr infodir=$RPM_BUILD_ROOT/%_infodir mandir=$RPM_BUILD_ROOT/%_mandir install
mv $RPM_BUILD_ROOT/usr/bin/cpio $RPM_BUILD_ROOT/bin
ln -sf ../../bin/cpio $RPM_BUILD_ROOT/usr/bin/cpio
+%find_lang %{name}
%post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
@@ -96,7 +86,7 @@
%postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
-%files
+%files -f %{name}.lang
%defattr(-,root,root)
/bin/cpio
/usr/bin/cpio
@@ -104,9 +94,42 @@
%doc %{_infodir}/cpio.info.gz
%doc %{_mandir}/man1/cpio.1.gz
%doc %{_mandir}/man1/mt.1.gz
-/usr/share/locale/*/LC_MESSAGES/cpio.mo
+#/usr/share/locale/*/LC_MESSAGES/cpio.mo
-%changelog -n cpio
+%changelog
+* Wed Jul 25 2007 - lmichnovic@xxxxxxx
+- fixed types of variables for LFS support (*lfs_correction.patch)
+* Tue Jul 24 2007 - lmichnovic@xxxxxxx
+- adjusted *mt.patch to fix compression handling [#223494]
+* Fri Jul 20 2007 - lmichnovic@xxxxxxx
+- 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@xxxxxxx
- fixed typo in cpio-2.6.dif; renamed to *-mt.patch
- united suffix of patches
++++++ cpio-2.9-lfs_correction.patch ++++++
--- 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)
++++++ cpio-2.6-mt.patch -> cpio-2.9-mt.patch ++++++
--- cpio/cpio-2.6-mt.patch 2006-09-21 19:24:06.000000000 +0200
+++ /mounts/work_src_done/STABLE/cpio/cpio-2.9-mt.patch 2007-07-24 15:43:06.000000000 +0200
@@ -1,11 +1,3 @@
---- 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
--- doc/mt.1
+++ doc/mt.1
@@ -76,9 +76,6 @@
@@ -90,7 +82,7 @@
exits with a status of 0 if the operation succeeded, 1 if the
--- lib/system.h
+++ lib/system.h
-@@ -473,10 +473,11 @@
+@@ -431,10 +431,11 @@
#if HAVE_LOCALE_H
# include <locale.h>
@@ -102,10 +94,10 @@
+#endif
#include <time.h>
- #if defined(HAVE_SYS_TIME_H) && defined(TIME_WITH_SYS_TIME)
+ #ifdef TIME_WITH_SYS_TIME
--- src/Makefile.am
+++ src/Makefile.am
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
INCLUDES=-I. -I.. -I$(top_srcdir)/lib
@@ -116,80 +108,24 @@
cpio_SOURCES = \
--- src/copyin.c
+++ src/copyin.c
-@@ -176,7 +176,7 @@
- #endif
- if (crc != file_hdr->c_chksum)
- {
-- error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"),
-+ error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"),
- file_hdr->c_name, crc, file_hdr->c_chksum);
- }
- }
-@@ -541,7 +541,7 @@
- if (archive_format == arf_crcascii)
- {
- if (crc != file_hdr->c_chksum)
-- error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"),
-+ error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"),
- file_hdr->c_name, crc, file_hdr->c_chksum);
- }
- tape_skip_padding (in_file_des, file_hdr->c_filesize);
-@@ -563,7 +563,7 @@
- if (archive_format == arf_crcascii)
- {
- if (crc != file_hdr->c_chksum)
-- error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"),
-+ error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"),
- file_hdr->c_name, crc, file_hdr->c_chksum);
- }
-
-@@ -825,7 +825,7 @@
+@@ -768,7 +768,7 @@
static void
- copyin_file (struct new_cpio_header* file_hdr, int in_file_des)
+ copyin_file (struct cpio_file_stat* file_hdr, int in_file_des)
{
- int existing_dir;
+ int existing_dir=0;
if (!to_stdout_option
&& try_existing_file (file_hdr, in_file_des, &existing_dir) < 0)
-@@ -897,7 +897,7 @@
- }
- tbuf[16] = '\0';
-
-- printf ("%s %3u ", mbuf, file_hdr->c_nlink);
-+ printf ("%s %3lu ", mbuf, file_hdr->c_nlink);
-
- if (numeric_uid)
- printf ("%-8u %-8u ", (unsigned int) file_hdr->c_uid,
-@@ -908,7 +908,7 @@
-
- if ((file_hdr->c_mode & CP_IFMT) == CP_IFCHR
- || (file_hdr->c_mode & CP_IFMT) == CP_IFBLK)
-- printf ("%3u, %3u ", file_hdr->c_rdev_maj,
-+ printf ("%3lu, %3lu ", file_hdr->c_rdev_maj,
- file_hdr->c_rdev_min);
- else
- printf ("%8lu ", file_hdr->c_filesize);
-@@ -1342,14 +1342,15 @@
- process_copy_in ()
- {
- char done = false; /* True if trailer reached. */
-- FILE *tty_in; /* Interactive file for rename option. */
-- FILE *tty_out; /* Interactive file for rename option. */
-- FILE *rename_in; /* Batch file for rename option. */
-+ FILE *tty_in=NULL; /* Interactive file for rename option. */
-+ FILE *tty_out=NULL; /* Interactive file for rename option. */
-+ FILE *rename_in=NULL; /* Batch file for rename option. */
- struct stat file_stat; /* Output file stat record. */
- struct new_cpio_header file_hdr; /* Output header information. */
+@@ -1355,6 +1355,7 @@
int in_file_des; /* Input file descriptor. */
char skip_file; /* Flag for use with patterns. */
int i; /* Loop index variable. */
+ int lastpattern = 0;
- /* Initialize the copy in. */
- if (pattern_file_name)
-@@ -1477,8 +1478,10 @@
+ umask (0); /* Reset umask to preserve modes of
+ created files */
+@@ -1463,8 +1464,10 @@
for (i = 0; i < num_patterns
&& skip_file == copy_matching_files; i++)
{
@@ -201,20 +137,11 @@
}
}
-@@ -1530,7 +1533,7 @@
- tape_skip_padding (in_file_des, file_hdr.c_filesize);
- if (crc != file_hdr.c_chksum)
- {
-- error (0, 0, _("%s: checksum error (0x%x, should be 0x%x)"),
-+ error (0, 0, _("%s: checksum error (0x%lx, should be 0x%lx)"),
- file_hdr.c_name, crc, file_hdr.c_chksum);
- }
- /* Debian hack: -v and -V now work with --only-verify-crc.
--- src/mt.c
+++ src/mt.c
-@@ -16,6 +16,10 @@
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+@@ -17,6 +17,10 @@
+ 02110-1301 USA
+ */
+/* Modified for the Linux SCSI tape driver by Brian Mays from code
+ written by Kai Makisara.
@@ -223,7 +150,7 @@
/* 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.
-@@ -50,6 +54,46 @@
+@@ -51,6 +55,46 @@
retension Rewind the tape, then wind it to the end of the reel,
then rewind it again.
erase Erase the tape.
@@ -270,7 +197,7 @@
David MacKenzie <djm@xxxxxxxxxxxxxx> */
-@@ -104,6 +148,45 @@
+@@ -105,6 +149,45 @@
void exit ();
#endif
@@ -316,7 +243,7 @@
char *opnames[] =
{
"eof", "weof", "fsf", "bsf", "fsr", "bsr",
-@@ -113,6 +196,8 @@
+@@ -114,6 +197,8 @@
#endif
#ifdef MTEOM
"eom",
@@ -325,7 +252,7 @@
#endif
#ifdef MTRETEN
"retension",
-@@ -127,6 +212,39 @@
+@@ -128,6 +213,39 @@
#ifdef MTSEEK
"seek",
#endif
@@ -365,7 +292,7 @@
NULL
};
-@@ -140,6 +258,8 @@
+@@ -141,6 +259,8 @@
#endif
#ifdef MTEOM
MTEOM,
@@ -374,7 +301,7 @@
#endif
#ifdef MTRETEN
MTRETEN,
-@@ -154,9 +274,69 @@
+@@ -155,9 +275,69 @@
#ifdef MTSEEK
MTSEEK,
#endif
@@ -411,9 +338,9 @@
+#ifdef MTDENS
+ MTDENS,
+#endif
-+ 0
-+};
-+
+ 0
+ };
+
+char *cbnames[] =
+{
+#ifdef MT_ST_BOOLEANS
@@ -433,9 +360,9 @@
+#ifdef MT_ST_WRITE_THRESHOLD
+ MT_ST_WRITE_THRESHOLD,
+#endif
- 0
- };
-
++ 0
++};
++
+#ifdef MT_TAPE_INFO
+ struct mt_tape_info tapes[] = MT_TAPE_INFO;
+#endif
@@ -444,7 +371,7 @@
struct option longopts[] =
{
{"file", 1, NULL, 'f'},
-@@ -199,10 +379,22 @@
+@@ -200,10 +380,22 @@
print_status (char *dev, int desc)
{
struct mtget status;
@@ -453,7 +380,7 @@
+#endif
if (rmtioctl (desc, MTIOCGET, (char*)&status) == -1)
- error (2, errno, "%s", dev);
+ error (2, errno, _("%s: rmtioctl failed"), dev);
+#ifdef MT_TAPE_INFO
+ for (mt = tapes; mt->t_type; mt++)
@@ -467,7 +394,7 @@
printf ("drive type = %d\n", (int) status.mt_type);
#if defined(hpux) || defined(__hpux)
printf ("drive status (high) = %d\n", (int) status.mt_dsreg1);
-@@ -216,8 +408,178 @@
+@@ -217,7 +409,177 @@
printf ("file number = %d\n", (int) status.mt_fileno);
printf ("block number = %d\n", (int) status.mt_blkno);
#endif
@@ -589,8 +516,8 @@
+ return 0;
+ }
+ return 1;
- }
-
++}
++
+
+int
+do_dat_compression(char *dev, int fn, int count)
@@ -602,14 +529,14 @@
+ error (2, errno, "%s", dev);
+ }
+
-+ if (count != 1) {
++ if (count != -1) {
+ if (count == 0)
+ buffer[4+2] &= 0x7f;
+ else
+ buffer[4+2] |= 0x80;
-+ if (read_mode_page(fn, 0x0f, 16, mask, 1))
-+ for (i=2; i < 16; i++)
-+ buffer[4+i] |= mask[4+i];
++/* if (read_mode_page(fn, 0x0f, 16, mask, 1))
++ for (i=3; i < 16; i++)
++ buffer[4+i] |= mask[4+i]; bug #223494 */
+ if (!write_mode_page(fn, 0x0f, 16, buffer)) {
+ error (2, errno, "%s", dev);
+ }
@@ -624,7 +551,7 @@
+ printf("Compression off.\n");
+
+ return 1;
-+}
+ }
+#endif
+
+#ifdef MTTELL
@@ -642,11 +569,10 @@
+}
+#endif
+
-+
+
void
usage (FILE *fp,int status)
- {
-@@ -277,7 +639,7 @@
+@@ -276,7 +638,7 @@
if (optind == argc)
usage (stderr, 1);
@@ -654,8 +580,8 @@
+ i = argmatch (argv[optind], opnames,NULL,0);
if (i < 0)
{
- invalid_arg ("tape operation", argv[optind], i);
-@@ -309,10 +671,29 @@
+ argmatch_invalid ("tape operation", argv[optind], i);
+@@ -308,10 +670,29 @@
#endif
}
@@ -685,8 +611,8 @@
)
tapedesc = rmtopen (tapedev, O_WRONLY, 0, rsh_command_option);
else
-@@ -321,6 +702,17 @@
- error (1, errno, "%s", tapedev);
+@@ -320,6 +701,17 @@
+ error (1, errno, _("%s: rmtopen failed"), tapedev);
check_type (tapedev, tapedesc);
+#ifdef MTDATCOMP
@@ -703,11 +629,11 @@
if (operation == MTASF)
{
perform_operation (tapedev, tapedesc, MTREW, 1);
-@@ -329,6 +721,7 @@
+@@ -328,6 +720,7 @@
perform_operation (tapedev, tapedesc, operation, count);
if (operation == MTNOP)
print_status (tapedev, tapedesc);
+ }
if (rmtclose (tapedesc) == -1)
- error (2, errno, "%s", tapedev);
+ error (2, errno, _("%s: rmtclose failed"), tapedev);
++++++ cpio-2.9-no_rmt.patch ++++++
--- 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
++++++ cpio-2.9-open_nonblock.patch ++++++
--- src/mt.c
+++ src/mt.c
@@ -694,9 +694,9 @@
|| (operation == MTDATCOMP)
#endif
)
- tapedesc = rmtopen (tapedev, O_WRONLY, 0, rsh_command_option);
+ tapedesc = rmtopen (tapedev, O_WRONLY | O_NONBLOCK, 0, rsh_command_option);
else
- tapedesc = rmtopen (tapedev, O_RDONLY, 0, rsh_command_option);
+ tapedesc = rmtopen (tapedev, O_RDONLY | O_NONBLOCK, 0, rsh_command_option);
if (tapedesc == -1)
error (1, errno, _("%s: rmtopen failed"), tapedev);
check_type (tapedev, tapedesc);
--- src/util.c
+++ src/util.c
@@ -753,14 +753,14 @@
copy_in = process_copy_in;
if (copy_function == copy_in)
- fd = rmtopen (file, O_RDONLY | O_BINARY, MODE_RW, rsh_command_option);
+ fd = rmtopen (file, O_RDONLY | O_BINARY | O_NONBLOCK, MODE_RW, rsh_command_option);
else
{
if (!append_flag)
- fd = rmtopen (file, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, MODE_RW,
+ fd = rmtopen (file, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY | O_NONBLOCK, MODE_RW,
rsh_command_option);
else
- fd = rmtopen (file, O_RDWR | O_BINARY, MODE_RW, rsh_command_option);
+ fd = rmtopen (file, O_RDWR | O_BINARY | O_NONBLOCK, MODE_RW, rsh_command_option);
}
return fd;
++++++ cpio-2.6.tar.bz2 -> cpio-2.9.tar.bz2 ++++++
++++ 151585 lines of diff (skipped)
++++++ cpio-2.9-use_new_ascii_format.patch ++++++
--- doc/cpio.info
+++ doc/cpio.info 2005/04/25 12:11:02
@@ -262,7 +262,8 @@
Set the I/O block size to BLOCK-SIZE * 512 bytes.
`-c'
- Use the old portable (ASCII) archive format.
+ Identical to "-H newc", use the new (SVR4) portable format.
+ If you wish the old portable (ASCII) archive format, use "-H odc" instead.
`-C IO-SIZE, --io-size=IO-SIZE'
Set the I/O block size to IO-SIZE bytes.
--- src/main.c
+++ src/main.c
@@ -337,6 +337,7 @@
case 'c': /* Use the old portable ASCII format. */
if (archive_format != arf_unknown)
error (0, EXIT_FAILURE, _("Archive format multiply defined"));
+#define SVR4_COMPAT
#ifdef SVR4_COMPAT
archive_format = arf_newascii; /* -H newc. */
#else
++++++ cpio-2.9-use_sbin_rmt.patch ++++++
--- lib/rtapelib.c
+++ lib/rtapelib.c 2005/04/25 12:16:06
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-/* The man page rmt(8) for /etc/rmt documents the remote mag tape protocol
+/* The man page rmt(8) for /sbin/rmt documents the remote mag tape protocol
which rdump and rrestore use. Unfortunately, the man page is *WRONG*.
The author of the routines I'm including originally wrote his code just
based on the man page, and it didn't work, so he went to the rdump source
@@ -265,7 +265,7 @@
#if WITH_REXEC
-/* Execute /etc/rmt as user USER on remote system HOST using rexec.
+/* Execute /sbin/rmt as user USER on remote system HOST using rexec.
Return a file descriptor of a bidirectional socket for stdin and
stdout. If USER is zero, use the current username.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |