From 5b9e96bf22ff20a1936ff67dce95d43017aca7014336ec7e2103182af6526df4 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Mon, 19 Oct 2009 13:03:42 +0000 Subject: [PATCH 1/7] Accepting request 22527 from home:rjschwei:branches:Archiving Copy from home:rjschwei:branches:Archiving/cpio via accept of submit request 22527 revision 2. Request was accepted with message: Thanks for patch :) OBS-URL: https://build.opensuse.org/request/show/22527 OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=10 --- cpio-2.10-mt.patch | 66 ++++++++++++---------------- cpio-2.10-use_new_ascii_format.patch | 18 +++----- cpio-2.10-use_sbin_rmt.patch | 10 ++--- cpio.changes | 5 --- cpio.spec | 2 +- 5 files changed, 39 insertions(+), 62 deletions(-) diff --git a/cpio-2.10-mt.patch b/cpio-2.10-mt.patch index 1adbf7f..a55a500 100644 --- a/cpio-2.10-mt.patch +++ b/cpio-2.10-mt.patch @@ -1,8 +1,6 @@ -Index: doc/mt.1 -=================================================================== ---- doc/mt.1.orig +--- doc/mt.1 +++ doc/mt.1 -@@ -76,9 +76,6 @@ Absolute space to file number +@@ -76,9 +76,6 @@ .IR count . Equivalent to rewind followed by fsf .IR count . @@ -12,7 +10,7 @@ Index: doc/mt.1 .IP eom Space to the end of the recorded media on the tape (for appending files onto tapes). -@@ -93,6 +90,69 @@ Rewind the tape, then wind it to the end +@@ -93,6 +90,69 @@ then rewind it again. .IP erase Erase the tape. @@ -82,11 +80,9 @@ Index: doc/mt.1 .PP .B mt exits with a status of 0 if the operation succeeded, 1 if the -Index: lib/system.h -=================================================================== ---- lib/system.h.orig +--- lib/system.h +++ lib/system.h -@@ -431,10 +431,11 @@ char *getenv (); +@@ -431,10 +431,11 @@ #if HAVE_LOCALE_H # include @@ -99,24 +95,21 @@ Index: lib/system.h #include #ifdef TIME_WITH_SYS_TIME -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig +--- src/Makefile.am +++ src/Makefile.am @@ -18,7 +18,7 @@ - INCLUDES=-I. -I.. -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib -I$(top_builddir)/lib + INCLUDES=-I. -I.. -I$(top_srcdir)/lib -bin_PROGRAMS=cpio @CPIO_MT_PROG@ +bin_PROGRAMS=cpio mt EXTRA_PROGRAMS=mt cpio_SOURCES = \ -Index: src/copyin.c -=================================================================== ---- src/copyin.c.orig + +--- src/copyin.c +++ src/copyin.c -@@ -771,7 +771,7 @@ copyin_link(struct cpio_file_stat *file_ +@@ -768,7 +768,7 @@ static void copyin_file (struct cpio_file_stat* file_hdr, int in_file_des) { @@ -125,15 +118,15 @@ Index: src/copyin.c if (!to_stdout_option && try_existing_file (file_hdr, in_file_des, &existing_dir) < 0) -@@ -1360,6 +1360,7 @@ process_copy_in () +@@ -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; - newdir_umask = umask (0); /* Reset umask to preserve modes of + umask (0); /* Reset umask to preserve modes of created files */ -@@ -1468,8 +1469,10 @@ process_copy_in () +@@ -1463,8 +1464,10 @@ for (i = 0; i < num_patterns && skip_file == copy_matching_files; i++) { @@ -145,9 +138,7 @@ Index: src/copyin.c } } -Index: src/mt.c -=================================================================== ---- src/mt.c.orig +--- src/mt.c +++ src/mt.c @@ -17,6 +17,10 @@ 02110-1301 USA @@ -160,7 +151,7 @@ Index: src/mt.c /* 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. -@@ -51,9 +55,51 @@ +@@ -51,6 +55,48 @@ retension Rewind the tape, then wind it to the end of the reel, then rewind it again. erase Erase the tape. @@ -206,13 +197,10 @@ Index: src/mt.c + is disabled. Otherwise, compression is enabled. David MacKenzie */ - -+#include + - #include ++#include - #include -@@ -105,6 +151,85 @@ int atoi (); +@@ -105,6 +151,85 @@ void exit (); #endif @@ -298,7 +286,7 @@ Index: src/mt.c char *opnames[] = { "eof", "weof", "fsf", "bsf", "fsr", "bsr", -@@ -114,6 +239,8 @@ char *opnames[] = +@@ -114,6 +197,8 @@ #endif #ifdef MTEOM "eom", @@ -307,7 +295,7 @@ Index: src/mt.c #endif #ifdef MTRETEN "retension", -@@ -128,6 +255,39 @@ char *opnames[] = +@@ -128,6 +213,39 @@ #ifdef MTSEEK "seek", #endif @@ -347,7 +335,7 @@ Index: src/mt.c NULL }; -@@ -141,6 +301,8 @@ short operations[] = +@@ -141,6 +259,8 @@ #endif #ifdef MTEOM MTEOM, @@ -356,7 +344,7 @@ Index: src/mt.c #endif #ifdef MTRETEN MTRETEN, -@@ -155,9 +317,69 @@ short operations[] = +@@ -155,9 +275,69 @@ #ifdef MTSEEK MTSEEK, #endif @@ -426,7 +414,7 @@ Index: src/mt.c struct option longopts[] = { {"file", 1, NULL, 'f'}, -@@ -200,10 +422,22 @@ void +@@ -200,10 +380,22 @@ print_status (char *dev, int desc) { struct mtget status; @@ -449,7 +437,7 @@ Index: src/mt.c printf ("drive type = %d\n", (int) status.mt_type); #if defined(hpux) || defined(__hpux) printf ("drive status (high) = %d\n", (int) status.mt_dsreg1); -@@ -217,7 +451,177 @@ print_status (char *dev, int desc) +@@ -217,7 +409,177 @@ printf ("file number = %d\n", (int) status.mt_fileno); printf ("block number = %d\n", (int) status.mt_blkno); #endif @@ -627,7 +615,7 @@ Index: src/mt.c void usage (FILE *fp,int status) -@@ -276,7 +680,7 @@ main (int argc, char **argv) +@@ -276,7 +638,7 @@ if (optind == argc) usage (stderr, 1); @@ -636,7 +624,7 @@ Index: src/mt.c if (i < 0) { argmatch_invalid ("tape operation", argv[optind], i); -@@ -308,10 +712,29 @@ main (int argc, char **argv) +@@ -308,10 +670,29 @@ #endif } @@ -666,7 +654,7 @@ Index: src/mt.c ) tapedesc = rmtopen (tapedev, O_WRONLY, 0, rsh_command_option); else -@@ -320,6 +743,17 @@ main (int argc, char **argv) +@@ -320,6 +701,17 @@ error (1, errno, _("%s: rmtopen failed"), tapedev); check_type (tapedev, tapedesc); @@ -684,7 +672,7 @@ Index: src/mt.c if (operation == MTASF) { perform_operation (tapedev, tapedesc, MTREW, 1); -@@ -328,6 +762,7 @@ main (int argc, char **argv) +@@ -328,6 +720,7 @@ perform_operation (tapedev, tapedesc, operation, count); if (operation == MTNOP) print_status (tapedev, tapedesc); diff --git a/cpio-2.10-use_new_ascii_format.patch b/cpio-2.10-use_new_ascii_format.patch index 76d9b8c..68e99dc 100644 --- a/cpio-2.10-use_new_ascii_format.patch +++ b/cpio-2.10-use_new_ascii_format.patch @@ -1,8 +1,6 @@ -Index: doc/cpio.info -=================================================================== ---- doc/cpio.info.orig -+++ doc/cpio.info -@@ -266,7 +266,8 @@ File: cpio.info, Node: Options, Prev: +--- 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' @@ -10,13 +8,11 @@ Index: doc/cpio.info + 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' -Index: src/main.c -=================================================================== ---- src/main.c.orig + `-C IO-SIZE, --io-size=IO-SIZE' + Set the I/O block size to IO-SIZE bytes. +--- src/main.c +++ src/main.c -@@ -339,6 +339,7 @@ parse_opt (int key, char *arg, struct ar +@@ -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")); diff --git a/cpio-2.10-use_sbin_rmt.patch b/cpio-2.10-use_sbin_rmt.patch index 6ee951a..552ba7b 100644 --- a/cpio-2.10-use_sbin_rmt.patch +++ b/cpio-2.10-use_sbin_rmt.patch @@ -1,17 +1,15 @@ -Index: lib/rtapelib.c -=================================================================== ---- lib/rtapelib.c.orig -+++ lib/rtapelib.c +--- 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 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 -@@ -267,7 +267,7 @@ get_status_off (int handle) +@@ -265,7 +265,7 @@ #if WITH_REXEC diff --git a/cpio.changes b/cpio.changes index a13e6c9..46043ea 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 3 19:09:11 UTC 2009 - coolo@novell.com - -- updated patches to apply with fuzz=0 - ------------------------------------------------------------------- Fri Oct 16 22:41:38 CEST 2009 - rschweikert@novell.com diff --git a/cpio.spec b/cpio.spec index 173e9a1..3b6189d 100644 --- a/cpio.spec +++ b/cpio.spec @@ -24,7 +24,7 @@ License: GPL v3 only Group: Productivity/Archiving/Compression AutoReqProv: on Version: 2.10 -Release: 4 +Release: 3 Summary: A Backup and Archiving Utility Source: %{name}-%{version}.tar.bz2 Patch2: %{name}-%{version}-use_new_ascii_format.patch From 3c13451230a49f72a637c72486938c566b5dfa6c1939e914744f3f1a5c188580 Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Wed, 4 Nov 2009 07:35:54 +0000 Subject: [PATCH 2/7] Accepting request 23674 from home:coolo:branches:openSUSE:Factory:branched Copy from home:coolo:branches:openSUSE:Factory:branched/cpio via accept of submit request 23674 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/23674 OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=11 --- cpio-2.10-mt.patch | 68 ++++++++++++++++------------ cpio-2.10-use_new_ascii_format.patch | 18 +++++--- cpio-2.10-use_sbin_rmt.patch | 10 ++-- cpio.changes | 5 ++ 4 files changed, 62 insertions(+), 39 deletions(-) diff --git a/cpio-2.10-mt.patch b/cpio-2.10-mt.patch index a55a500..1adbf7f 100644 --- a/cpio-2.10-mt.patch +++ b/cpio-2.10-mt.patch @@ -1,6 +1,8 @@ ---- doc/mt.1 +Index: doc/mt.1 +=================================================================== +--- doc/mt.1.orig +++ doc/mt.1 -@@ -76,9 +76,6 @@ +@@ -76,9 +76,6 @@ Absolute space to file number .IR count . Equivalent to rewind followed by fsf .IR count . @@ -10,7 +12,7 @@ .IP eom Space to the end of the recorded media on the tape (for appending files onto tapes). -@@ -93,6 +90,69 @@ +@@ -93,6 +90,69 @@ Rewind the tape, then wind it to the end then rewind it again. .IP erase Erase the tape. @@ -80,9 +82,11 @@ .PP .B mt exits with a status of 0 if the operation succeeded, 1 if the ---- lib/system.h +Index: lib/system.h +=================================================================== +--- lib/system.h.orig +++ lib/system.h -@@ -431,10 +431,11 @@ +@@ -431,10 +431,11 @@ char *getenv (); #if HAVE_LOCALE_H # include @@ -95,21 +99,24 @@ #include #ifdef TIME_WITH_SYS_TIME ---- src/Makefile.am +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am.orig +++ src/Makefile.am @@ -18,7 +18,7 @@ - INCLUDES=-I. -I.. -I$(top_srcdir)/lib + INCLUDES=-I. -I.. -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib -I$(top_builddir)/lib -bin_PROGRAMS=cpio @CPIO_MT_PROG@ +bin_PROGRAMS=cpio mt EXTRA_PROGRAMS=mt cpio_SOURCES = \ - ---- src/copyin.c +Index: src/copyin.c +=================================================================== +--- src/copyin.c.orig +++ src/copyin.c -@@ -768,7 +768,7 @@ +@@ -771,7 +771,7 @@ copyin_link(struct cpio_file_stat *file_ static void copyin_file (struct cpio_file_stat* file_hdr, int in_file_des) { @@ -118,15 +125,15 @@ if (!to_stdout_option && try_existing_file (file_hdr, in_file_des, &existing_dir) < 0) -@@ -1355,6 +1355,7 @@ +@@ -1360,6 +1360,7 @@ process_copy_in () int in_file_des; /* Input file descriptor. */ char skip_file; /* Flag for use with patterns. */ int i; /* Loop index variable. */ + int lastpattern = 0; - umask (0); /* Reset umask to preserve modes of + newdir_umask = umask (0); /* Reset umask to preserve modes of created files */ -@@ -1463,8 +1464,10 @@ +@@ -1468,8 +1469,10 @@ process_copy_in () for (i = 0; i < num_patterns && skip_file == copy_matching_files; i++) { @@ -138,7 +145,9 @@ } } ---- src/mt.c +Index: src/mt.c +=================================================================== +--- src/mt.c.orig +++ src/mt.c @@ -17,6 +17,10 @@ 02110-1301 USA @@ -151,7 +160,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. -@@ -51,6 +55,48 @@ +@@ -51,9 +55,51 @@ retension Rewind the tape, then wind it to the end of the reel, then rewind it again. erase Erase the tape. @@ -197,10 +206,13 @@ + is disabled. Otherwise, compression is enabled. David MacKenzie */ -+ -+#include -@@ -105,6 +151,85 @@ ++#include ++ + #include + + #include +@@ -105,6 +151,85 @@ int atoi (); void exit (); #endif @@ -286,7 +298,7 @@ char *opnames[] = { "eof", "weof", "fsf", "bsf", "fsr", "bsr", -@@ -114,6 +197,8 @@ +@@ -114,6 +239,8 @@ char *opnames[] = #endif #ifdef MTEOM "eom", @@ -295,7 +307,7 @@ #endif #ifdef MTRETEN "retension", -@@ -128,6 +213,39 @@ +@@ -128,6 +255,39 @@ char *opnames[] = #ifdef MTSEEK "seek", #endif @@ -335,7 +347,7 @@ NULL }; -@@ -141,6 +259,8 @@ +@@ -141,6 +301,8 @@ short operations[] = #endif #ifdef MTEOM MTEOM, @@ -344,7 +356,7 @@ #endif #ifdef MTRETEN MTRETEN, -@@ -155,9 +275,69 @@ +@@ -155,9 +317,69 @@ short operations[] = #ifdef MTSEEK MTSEEK, #endif @@ -414,7 +426,7 @@ struct option longopts[] = { {"file", 1, NULL, 'f'}, -@@ -200,10 +380,22 @@ +@@ -200,10 +422,22 @@ void print_status (char *dev, int desc) { struct mtget status; @@ -437,7 +449,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); -@@ -217,7 +409,177 @@ +@@ -217,7 +451,177 @@ print_status (char *dev, int desc) printf ("file number = %d\n", (int) status.mt_fileno); printf ("block number = %d\n", (int) status.mt_blkno); #endif @@ -615,7 +627,7 @@ void usage (FILE *fp,int status) -@@ -276,7 +638,7 @@ +@@ -276,7 +680,7 @@ main (int argc, char **argv) if (optind == argc) usage (stderr, 1); @@ -624,7 +636,7 @@ if (i < 0) { argmatch_invalid ("tape operation", argv[optind], i); -@@ -308,10 +670,29 @@ +@@ -308,10 +712,29 @@ main (int argc, char **argv) #endif } @@ -654,7 +666,7 @@ ) tapedesc = rmtopen (tapedev, O_WRONLY, 0, rsh_command_option); else -@@ -320,6 +701,17 @@ +@@ -320,6 +743,17 @@ main (int argc, char **argv) error (1, errno, _("%s: rmtopen failed"), tapedev); check_type (tapedev, tapedesc); @@ -672,7 +684,7 @@ if (operation == MTASF) { perform_operation (tapedev, tapedesc, MTREW, 1); -@@ -328,6 +720,7 @@ +@@ -328,6 +762,7 @@ main (int argc, char **argv) perform_operation (tapedev, tapedesc, operation, count); if (operation == MTNOP) print_status (tapedev, tapedesc); diff --git a/cpio-2.10-use_new_ascii_format.patch b/cpio-2.10-use_new_ascii_format.patch index 68e99dc..76d9b8c 100644 --- a/cpio-2.10-use_new_ascii_format.patch +++ b/cpio-2.10-use_new_ascii_format.patch @@ -1,6 +1,8 @@ ---- doc/cpio.info -+++ doc/cpio.info 2005/04/25 12:11:02 -@@ -262,7 +262,8 @@ +Index: doc/cpio.info +=================================================================== +--- doc/cpio.info.orig ++++ doc/cpio.info +@@ -266,7 +266,8 @@ File: cpio.info, Node: Options, Prev: Set the I/O block size to BLOCK-SIZE * 512 bytes. `-c' @@ -8,11 +10,13 @@ + 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 + `-C IO-SIZE' + `--io-size=IO-SIZE' +Index: src/main.c +=================================================================== +--- src/main.c.orig +++ src/main.c -@@ -337,6 +337,7 @@ +@@ -339,6 +339,7 @@ parse_opt (int key, char *arg, struct ar case 'c': /* Use the old portable ASCII format. */ if (archive_format != arf_unknown) error (0, EXIT_FAILURE, _("Archive format multiply defined")); diff --git a/cpio-2.10-use_sbin_rmt.patch b/cpio-2.10-use_sbin_rmt.patch index 552ba7b..6ee951a 100644 --- a/cpio-2.10-use_sbin_rmt.patch +++ b/cpio-2.10-use_sbin_rmt.patch @@ -1,15 +1,17 @@ ---- lib/rtapelib.c -+++ lib/rtapelib.c 2005/04/25 12:16:06 +Index: lib/rtapelib.c +=================================================================== +--- lib/rtapelib.c.orig ++++ lib/rtapelib.c @@ -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. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 @@ +@@ -267,7 +267,7 @@ get_status_off (int handle) #if WITH_REXEC diff --git a/cpio.changes b/cpio.changes index 46043ea..a13e6c9 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 3 19:09:11 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Fri Oct 16 22:41:38 CEST 2009 - rschweikert@novell.com From 067e580eb18edaa4893a98aec8c489e56f850c3ea7f1b286abce2eb713b01dab Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 16 Nov 2009 09:40:15 +0000 Subject: [PATCH 3/7] checked in OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=12 --- cpio-2.10-close_files_after_copy.patch | 24 ---------- cpio-2.10-mt.patch | 66 +++++++++++--------------- cpio-2.10-use_new_ascii_format.patch | 18 +++---- cpio-2.10-use_sbin_rmt.patch | 10 ++-- cpio.changes | 11 ----- cpio.spec | 3 -- 6 files changed, 38 insertions(+), 94 deletions(-) delete mode 100644 cpio-2.10-close_files_after_copy.patch diff --git a/cpio-2.10-close_files_after_copy.patch b/cpio-2.10-close_files_after_copy.patch deleted file mode 100644 index be033b2..0000000 --- a/cpio-2.10-close_files_after_copy.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: src/copyin.c -=================================================================== ---- src/copyin.c.orig -+++ src/copyin.c -@@ -1565,6 +1565,19 @@ process_copy_in () - if (dot_flag) - fputc ('\n', stderr); - -+ if (tty_in) -+ { -+ fclose(tty_in); -+ } -+ if (tty_out) -+ { -+ fclose(tty_out); -+ } -+ if (rename_in) -+ { -+ fclose(rename_in); -+ } -+ - if (append_flag) - return; - diff --git a/cpio-2.10-mt.patch b/cpio-2.10-mt.patch index 1adbf7f..a55a500 100644 --- a/cpio-2.10-mt.patch +++ b/cpio-2.10-mt.patch @@ -1,8 +1,6 @@ -Index: doc/mt.1 -=================================================================== ---- doc/mt.1.orig +--- doc/mt.1 +++ doc/mt.1 -@@ -76,9 +76,6 @@ Absolute space to file number +@@ -76,9 +76,6 @@ .IR count . Equivalent to rewind followed by fsf .IR count . @@ -12,7 +10,7 @@ Index: doc/mt.1 .IP eom Space to the end of the recorded media on the tape (for appending files onto tapes). -@@ -93,6 +90,69 @@ Rewind the tape, then wind it to the end +@@ -93,6 +90,69 @@ then rewind it again. .IP erase Erase the tape. @@ -82,11 +80,9 @@ Index: doc/mt.1 .PP .B mt exits with a status of 0 if the operation succeeded, 1 if the -Index: lib/system.h -=================================================================== ---- lib/system.h.orig +--- lib/system.h +++ lib/system.h -@@ -431,10 +431,11 @@ char *getenv (); +@@ -431,10 +431,11 @@ #if HAVE_LOCALE_H # include @@ -99,24 +95,21 @@ Index: lib/system.h #include #ifdef TIME_WITH_SYS_TIME -Index: src/Makefile.am -=================================================================== ---- src/Makefile.am.orig +--- src/Makefile.am +++ src/Makefile.am @@ -18,7 +18,7 @@ - INCLUDES=-I. -I.. -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib -I$(top_builddir)/lib + INCLUDES=-I. -I.. -I$(top_srcdir)/lib -bin_PROGRAMS=cpio @CPIO_MT_PROG@ +bin_PROGRAMS=cpio mt EXTRA_PROGRAMS=mt cpio_SOURCES = \ -Index: src/copyin.c -=================================================================== ---- src/copyin.c.orig + +--- src/copyin.c +++ src/copyin.c -@@ -771,7 +771,7 @@ copyin_link(struct cpio_file_stat *file_ +@@ -768,7 +768,7 @@ static void copyin_file (struct cpio_file_stat* file_hdr, int in_file_des) { @@ -125,15 +118,15 @@ Index: src/copyin.c if (!to_stdout_option && try_existing_file (file_hdr, in_file_des, &existing_dir) < 0) -@@ -1360,6 +1360,7 @@ process_copy_in () +@@ -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; - newdir_umask = umask (0); /* Reset umask to preserve modes of + umask (0); /* Reset umask to preserve modes of created files */ -@@ -1468,8 +1469,10 @@ process_copy_in () +@@ -1463,8 +1464,10 @@ for (i = 0; i < num_patterns && skip_file == copy_matching_files; i++) { @@ -145,9 +138,7 @@ Index: src/copyin.c } } -Index: src/mt.c -=================================================================== ---- src/mt.c.orig +--- src/mt.c +++ src/mt.c @@ -17,6 +17,10 @@ 02110-1301 USA @@ -160,7 +151,7 @@ Index: src/mt.c /* 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. -@@ -51,9 +55,51 @@ +@@ -51,6 +55,48 @@ retension Rewind the tape, then wind it to the end of the reel, then rewind it again. erase Erase the tape. @@ -206,13 +197,10 @@ Index: src/mt.c + is disabled. Otherwise, compression is enabled. David MacKenzie */ - -+#include + - #include ++#include - #include -@@ -105,6 +151,85 @@ int atoi (); +@@ -105,6 +151,85 @@ void exit (); #endif @@ -298,7 +286,7 @@ Index: src/mt.c char *opnames[] = { "eof", "weof", "fsf", "bsf", "fsr", "bsr", -@@ -114,6 +239,8 @@ char *opnames[] = +@@ -114,6 +197,8 @@ #endif #ifdef MTEOM "eom", @@ -307,7 +295,7 @@ Index: src/mt.c #endif #ifdef MTRETEN "retension", -@@ -128,6 +255,39 @@ char *opnames[] = +@@ -128,6 +213,39 @@ #ifdef MTSEEK "seek", #endif @@ -347,7 +335,7 @@ Index: src/mt.c NULL }; -@@ -141,6 +301,8 @@ short operations[] = +@@ -141,6 +259,8 @@ #endif #ifdef MTEOM MTEOM, @@ -356,7 +344,7 @@ Index: src/mt.c #endif #ifdef MTRETEN MTRETEN, -@@ -155,9 +317,69 @@ short operations[] = +@@ -155,9 +275,69 @@ #ifdef MTSEEK MTSEEK, #endif @@ -426,7 +414,7 @@ Index: src/mt.c struct option longopts[] = { {"file", 1, NULL, 'f'}, -@@ -200,10 +422,22 @@ void +@@ -200,10 +380,22 @@ print_status (char *dev, int desc) { struct mtget status; @@ -449,7 +437,7 @@ Index: src/mt.c printf ("drive type = %d\n", (int) status.mt_type); #if defined(hpux) || defined(__hpux) printf ("drive status (high) = %d\n", (int) status.mt_dsreg1); -@@ -217,7 +451,177 @@ print_status (char *dev, int desc) +@@ -217,7 +409,177 @@ printf ("file number = %d\n", (int) status.mt_fileno); printf ("block number = %d\n", (int) status.mt_blkno); #endif @@ -627,7 +615,7 @@ Index: src/mt.c void usage (FILE *fp,int status) -@@ -276,7 +680,7 @@ main (int argc, char **argv) +@@ -276,7 +638,7 @@ if (optind == argc) usage (stderr, 1); @@ -636,7 +624,7 @@ Index: src/mt.c if (i < 0) { argmatch_invalid ("tape operation", argv[optind], i); -@@ -308,10 +712,29 @@ main (int argc, char **argv) +@@ -308,10 +670,29 @@ #endif } @@ -666,7 +654,7 @@ Index: src/mt.c ) tapedesc = rmtopen (tapedev, O_WRONLY, 0, rsh_command_option); else -@@ -320,6 +743,17 @@ main (int argc, char **argv) +@@ -320,6 +701,17 @@ error (1, errno, _("%s: rmtopen failed"), tapedev); check_type (tapedev, tapedesc); @@ -684,7 +672,7 @@ Index: src/mt.c if (operation == MTASF) { perform_operation (tapedev, tapedesc, MTREW, 1); -@@ -328,6 +762,7 @@ main (int argc, char **argv) +@@ -328,6 +720,7 @@ perform_operation (tapedev, tapedesc, operation, count); if (operation == MTNOP) print_status (tapedev, tapedesc); diff --git a/cpio-2.10-use_new_ascii_format.patch b/cpio-2.10-use_new_ascii_format.patch index 76d9b8c..68e99dc 100644 --- a/cpio-2.10-use_new_ascii_format.patch +++ b/cpio-2.10-use_new_ascii_format.patch @@ -1,8 +1,6 @@ -Index: doc/cpio.info -=================================================================== ---- doc/cpio.info.orig -+++ doc/cpio.info -@@ -266,7 +266,8 @@ File: cpio.info, Node: Options, Prev: +--- 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' @@ -10,13 +8,11 @@ Index: doc/cpio.info + 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' -Index: src/main.c -=================================================================== ---- src/main.c.orig + `-C IO-SIZE, --io-size=IO-SIZE' + Set the I/O block size to IO-SIZE bytes. +--- src/main.c +++ src/main.c -@@ -339,6 +339,7 @@ parse_opt (int key, char *arg, struct ar +@@ -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")); diff --git a/cpio-2.10-use_sbin_rmt.patch b/cpio-2.10-use_sbin_rmt.patch index 6ee951a..552ba7b 100644 --- a/cpio-2.10-use_sbin_rmt.patch +++ b/cpio-2.10-use_sbin_rmt.patch @@ -1,17 +1,15 @@ -Index: lib/rtapelib.c -=================================================================== ---- lib/rtapelib.c.orig -+++ lib/rtapelib.c +--- 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + 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 -@@ -267,7 +267,7 @@ get_status_off (int handle) +@@ -265,7 +265,7 @@ #if WITH_REXEC diff --git a/cpio.changes b/cpio.changes index a13e6c9..a5da146 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Tue Nov 3 19:09:11 UTC 2009 - coolo@novell.com - -- updated patches to apply with fuzz=0 - -------------------------------------------------------------------- -Fri Oct 16 22:41:38 CEST 2009 - rschweikert@novell.com - -- close files after copy (bnc#543132) - (cpio-2.10-close_files_after_copy.patch) - ------------------------------------------------------------------- Mon Aug 10 16:53:33 CEST 2009 - mseben@novell.com diff --git a/cpio.spec b/cpio.spec index 3b6189d..b9d1f41 100644 --- a/cpio.spec +++ b/cpio.spec @@ -41,8 +41,6 @@ Patch17: %{name}-%{version}-dev_number.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 -#PATCH-FIX-UPSTREAM cpio-2.10-close_files_after_copy.patch -Patch20: %{name}-%{version}-close_files_after_copy.patch PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -79,7 +77,6 @@ Authors: %patch17 %patch18 %patch19 -%patch20 #chmod 755 . #chmod u+w * #chmod a+r * From a5eace992578cb97ec7e0c4793ee909ecd74844a863a4a365155345dcc46c2dc Mon Sep 17 00:00:00 2001 From: Michal Seben Date: Tue, 8 Dec 2009 10:21:50 +0000 Subject: [PATCH 4/7] Accepting request 25718 from home:jengelh:branches:Archiving Copy from home:jengelh:branches:Archiving/cpio via accept of submit request 25718 revision 2. Request was accepted with message: thanks OBS-URL: https://build.opensuse.org/request/show/25718 OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=13 --- cpio-2.10-close_files_after_copy.patch | 24 +++++++++ cpio-2.10-mt.patch | 68 +++++++++++++++----------- cpio-2.10-use_new_ascii_format.patch | 18 ++++--- cpio-2.10-use_sbin_rmt.patch | 10 ++-- cpio.changes | 16 ++++++ cpio.spec | 7 ++- 6 files changed, 102 insertions(+), 41 deletions(-) create mode 100644 cpio-2.10-close_files_after_copy.patch diff --git a/cpio-2.10-close_files_after_copy.patch b/cpio-2.10-close_files_after_copy.patch new file mode 100644 index 0000000..be033b2 --- /dev/null +++ b/cpio-2.10-close_files_after_copy.patch @@ -0,0 +1,24 @@ +Index: src/copyin.c +=================================================================== +--- src/copyin.c.orig ++++ src/copyin.c +@@ -1565,6 +1565,19 @@ process_copy_in () + if (dot_flag) + fputc ('\n', stderr); + ++ if (tty_in) ++ { ++ fclose(tty_in); ++ } ++ if (tty_out) ++ { ++ fclose(tty_out); ++ } ++ if (rename_in) ++ { ++ fclose(rename_in); ++ } ++ + if (append_flag) + return; + diff --git a/cpio-2.10-mt.patch b/cpio-2.10-mt.patch index a55a500..1adbf7f 100644 --- a/cpio-2.10-mt.patch +++ b/cpio-2.10-mt.patch @@ -1,6 +1,8 @@ ---- doc/mt.1 +Index: doc/mt.1 +=================================================================== +--- doc/mt.1.orig +++ doc/mt.1 -@@ -76,9 +76,6 @@ +@@ -76,9 +76,6 @@ Absolute space to file number .IR count . Equivalent to rewind followed by fsf .IR count . @@ -10,7 +12,7 @@ .IP eom Space to the end of the recorded media on the tape (for appending files onto tapes). -@@ -93,6 +90,69 @@ +@@ -93,6 +90,69 @@ Rewind the tape, then wind it to the end then rewind it again. .IP erase Erase the tape. @@ -80,9 +82,11 @@ .PP .B mt exits with a status of 0 if the operation succeeded, 1 if the ---- lib/system.h +Index: lib/system.h +=================================================================== +--- lib/system.h.orig +++ lib/system.h -@@ -431,10 +431,11 @@ +@@ -431,10 +431,11 @@ char *getenv (); #if HAVE_LOCALE_H # include @@ -95,21 +99,24 @@ #include #ifdef TIME_WITH_SYS_TIME ---- src/Makefile.am +Index: src/Makefile.am +=================================================================== +--- src/Makefile.am.orig +++ src/Makefile.am @@ -18,7 +18,7 @@ - INCLUDES=-I. -I.. -I$(top_srcdir)/lib + INCLUDES=-I. -I.. -I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/lib -I$(top_builddir)/lib -bin_PROGRAMS=cpio @CPIO_MT_PROG@ +bin_PROGRAMS=cpio mt EXTRA_PROGRAMS=mt cpio_SOURCES = \ - ---- src/copyin.c +Index: src/copyin.c +=================================================================== +--- src/copyin.c.orig +++ src/copyin.c -@@ -768,7 +768,7 @@ +@@ -771,7 +771,7 @@ copyin_link(struct cpio_file_stat *file_ static void copyin_file (struct cpio_file_stat* file_hdr, int in_file_des) { @@ -118,15 +125,15 @@ if (!to_stdout_option && try_existing_file (file_hdr, in_file_des, &existing_dir) < 0) -@@ -1355,6 +1355,7 @@ +@@ -1360,6 +1360,7 @@ process_copy_in () int in_file_des; /* Input file descriptor. */ char skip_file; /* Flag for use with patterns. */ int i; /* Loop index variable. */ + int lastpattern = 0; - umask (0); /* Reset umask to preserve modes of + newdir_umask = umask (0); /* Reset umask to preserve modes of created files */ -@@ -1463,8 +1464,10 @@ +@@ -1468,8 +1469,10 @@ process_copy_in () for (i = 0; i < num_patterns && skip_file == copy_matching_files; i++) { @@ -138,7 +145,9 @@ } } ---- src/mt.c +Index: src/mt.c +=================================================================== +--- src/mt.c.orig +++ src/mt.c @@ -17,6 +17,10 @@ 02110-1301 USA @@ -151,7 +160,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. -@@ -51,6 +55,48 @@ +@@ -51,9 +55,51 @@ retension Rewind the tape, then wind it to the end of the reel, then rewind it again. erase Erase the tape. @@ -197,10 +206,13 @@ + is disabled. Otherwise, compression is enabled. David MacKenzie */ -+ -+#include -@@ -105,6 +151,85 @@ ++#include ++ + #include + + #include +@@ -105,6 +151,85 @@ int atoi (); void exit (); #endif @@ -286,7 +298,7 @@ char *opnames[] = { "eof", "weof", "fsf", "bsf", "fsr", "bsr", -@@ -114,6 +197,8 @@ +@@ -114,6 +239,8 @@ char *opnames[] = #endif #ifdef MTEOM "eom", @@ -295,7 +307,7 @@ #endif #ifdef MTRETEN "retension", -@@ -128,6 +213,39 @@ +@@ -128,6 +255,39 @@ char *opnames[] = #ifdef MTSEEK "seek", #endif @@ -335,7 +347,7 @@ NULL }; -@@ -141,6 +259,8 @@ +@@ -141,6 +301,8 @@ short operations[] = #endif #ifdef MTEOM MTEOM, @@ -344,7 +356,7 @@ #endif #ifdef MTRETEN MTRETEN, -@@ -155,9 +275,69 @@ +@@ -155,9 +317,69 @@ short operations[] = #ifdef MTSEEK MTSEEK, #endif @@ -414,7 +426,7 @@ struct option longopts[] = { {"file", 1, NULL, 'f'}, -@@ -200,10 +380,22 @@ +@@ -200,10 +422,22 @@ void print_status (char *dev, int desc) { struct mtget status; @@ -437,7 +449,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); -@@ -217,7 +409,177 @@ +@@ -217,7 +451,177 @@ print_status (char *dev, int desc) printf ("file number = %d\n", (int) status.mt_fileno); printf ("block number = %d\n", (int) status.mt_blkno); #endif @@ -615,7 +627,7 @@ void usage (FILE *fp,int status) -@@ -276,7 +638,7 @@ +@@ -276,7 +680,7 @@ main (int argc, char **argv) if (optind == argc) usage (stderr, 1); @@ -624,7 +636,7 @@ if (i < 0) { argmatch_invalid ("tape operation", argv[optind], i); -@@ -308,10 +670,29 @@ +@@ -308,10 +712,29 @@ main (int argc, char **argv) #endif } @@ -654,7 +666,7 @@ ) tapedesc = rmtopen (tapedev, O_WRONLY, 0, rsh_command_option); else -@@ -320,6 +701,17 @@ +@@ -320,6 +743,17 @@ main (int argc, char **argv) error (1, errno, _("%s: rmtopen failed"), tapedev); check_type (tapedev, tapedesc); @@ -672,7 +684,7 @@ if (operation == MTASF) { perform_operation (tapedev, tapedesc, MTREW, 1); -@@ -328,6 +720,7 @@ +@@ -328,6 +762,7 @@ main (int argc, char **argv) perform_operation (tapedev, tapedesc, operation, count); if (operation == MTNOP) print_status (tapedev, tapedesc); diff --git a/cpio-2.10-use_new_ascii_format.patch b/cpio-2.10-use_new_ascii_format.patch index 68e99dc..76d9b8c 100644 --- a/cpio-2.10-use_new_ascii_format.patch +++ b/cpio-2.10-use_new_ascii_format.patch @@ -1,6 +1,8 @@ ---- doc/cpio.info -+++ doc/cpio.info 2005/04/25 12:11:02 -@@ -262,7 +262,8 @@ +Index: doc/cpio.info +=================================================================== +--- doc/cpio.info.orig ++++ doc/cpio.info +@@ -266,7 +266,8 @@ File: cpio.info, Node: Options, Prev: Set the I/O block size to BLOCK-SIZE * 512 bytes. `-c' @@ -8,11 +10,13 @@ + 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 + `-C IO-SIZE' + `--io-size=IO-SIZE' +Index: src/main.c +=================================================================== +--- src/main.c.orig +++ src/main.c -@@ -337,6 +337,7 @@ +@@ -339,6 +339,7 @@ parse_opt (int key, char *arg, struct ar case 'c': /* Use the old portable ASCII format. */ if (archive_format != arf_unknown) error (0, EXIT_FAILURE, _("Archive format multiply defined")); diff --git a/cpio-2.10-use_sbin_rmt.patch b/cpio-2.10-use_sbin_rmt.patch index 552ba7b..6ee951a 100644 --- a/cpio-2.10-use_sbin_rmt.patch +++ b/cpio-2.10-use_sbin_rmt.patch @@ -1,15 +1,17 @@ ---- lib/rtapelib.c -+++ lib/rtapelib.c 2005/04/25 12:16:06 +Index: lib/rtapelib.c +=================================================================== +--- lib/rtapelib.c.orig ++++ lib/rtapelib.c @@ -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. */ + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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 @@ +@@ -267,7 +267,7 @@ get_status_off (int handle) #if WITH_REXEC diff --git a/cpio.changes b/cpio.changes index a5da146..587ef40 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Dec 6 15:35:30 CET 2009 - jengelh + +- enable parallel building + +------------------------------------------------------------------- +Tue Nov 3 19:09:11 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Fri Oct 16 22:41:38 CEST 2009 - rschweikert@novell.com + +- close files after copy (bnc#543132) + (cpio-2.10-close_files_after_copy.patch) + ------------------------------------------------------------------- Mon Aug 10 16:53:33 CEST 2009 - mseben@novell.com diff --git a/cpio.spec b/cpio.spec index b9d1f41..3e68321 100644 --- a/cpio.spec +++ b/cpio.spec @@ -24,7 +24,7 @@ License: GPL v3 only Group: Productivity/Archiving/Compression AutoReqProv: on Version: 2.10 -Release: 3 +Release: 4 Summary: A Backup and Archiving Utility Source: %{name}-%{version}.tar.bz2 Patch2: %{name}-%{version}-use_new_ascii_format.patch @@ -41,6 +41,8 @@ Patch17: %{name}-%{version}-dev_number.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 +#PATCH-FIX-UPSTREAM cpio-2.10-close_files_after_copy.patch +Patch20: %{name}-%{version}-close_files_after_copy.patch PreReq: %install_info_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} @@ -77,6 +79,7 @@ Authors: %patch17 %patch18 %patch19 +%patch20 #chmod 755 . #chmod u+w * #chmod a+r * @@ -92,7 +95,7 @@ CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libdir=%{_libdir} -make +make %{?jobs:-j%jobs}; %install mkdir -p $RPM_BUILD_ROOT/{usr/bin,bin} From be9c6e57d032dfb04901f24a5710ce2018e3a1726fb6723d54e0cab8c2c9bbdf Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Thu, 24 Dec 2009 14:42:16 +0000 Subject: [PATCH 5/7] remove ; OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=14 --- cpio.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpio.spec b/cpio.spec index 3e68321..9f3a5be 100644 --- a/cpio.spec +++ b/cpio.spec @@ -95,7 +95,7 @@ CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libdir=%{_libdir} -make %{?jobs:-j%jobs}; +make %{?jobs:-j%jobs} %install mkdir -p $RPM_BUILD_ROOT/{usr/bin,bin} From 5ef6d7264e6ca4a86b9977b858b795679e2ce52cf3e666c0c6cdf87741e8efdd Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sat, 26 Dec 2009 10:52:50 +0000 Subject: [PATCH 6/7] checked in OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=15 --- cpio.changes | 5 ----- cpio.spec | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/cpio.changes b/cpio.changes index 587ef40..a13e6c9 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Sun Dec 6 15:35:30 CET 2009 - jengelh - -- enable parallel building - ------------------------------------------------------------------- Tue Nov 3 19:09:11 UTC 2009 - coolo@novell.com diff --git a/cpio.spec b/cpio.spec index 9f3a5be..173e9a1 100644 --- a/cpio.spec +++ b/cpio.spec @@ -95,7 +95,7 @@ CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libdir=%{_libdir} -make %{?jobs:-j%jobs} +make %install mkdir -p $RPM_BUILD_ROOT/{usr/bin,bin} From e645699a2d8cb5605618d55be8e206b04e502106b82a78bc0a4b2292d410ba03 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 26 Dec 2009 10:52:51 +0000 Subject: [PATCH 7/7] Updating link to change in openSUSE:Factory/cpio revision 22.0 OBS-URL: https://build.opensuse.org/package/show/Archiving/cpio?expand=0&rev=a66f6349d9562dd4359605714db81327 --- cpio-2.10-avoid_overflow_warning.patch | 11 ----------- cpio.changes | 9 +++++++-- cpio.spec | 6 +++--- 3 files changed, 10 insertions(+), 16 deletions(-) delete mode 100644 cpio-2.10-avoid_overflow_warning.patch diff --git a/cpio-2.10-avoid_overflow_warning.patch b/cpio-2.10-avoid_overflow_warning.patch deleted file mode 100644 index 8cf44b3..0000000 --- a/cpio-2.10-avoid_overflow_warning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tar.c -+++ src/tar.c -@@ -217,7 +217,7 @@ - char *name; - - strncpy (tar_hdr->magic, TMAGIC, TMAGLEN); -- strncpy (tar_hdr->magic + TMAGLEN, TVERSION, TVERSLEN); -+ strncpy (tar_hdr->version, TVERSION, TVERSLEN); - - name = getuser (file_hdr->c_uid); - if (name) diff --git a/cpio.changes b/cpio.changes index a13e6c9..117edc3 100644 --- a/cpio.changes +++ b/cpio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Dec 26 11:51:46 CET 2009 - jengelh@medozas.de + +- enable parallel build + ------------------------------------------------------------------- Tue Nov 3 19:09:11 UTC 2009 - coolo@novell.com @@ -334,14 +339,14 @@ Tue Sep 1 11:52:58 MEST 1998 - ro@suse.de - fixed strdup-macro problem ----------------------------------------------------------------------------- +------------------------------------------------------------------- Thu Jun 5 11:08:05 MEST 1997 - florian@suse.de - go through the list of regex in a more suitable way (from ma@suse.de) ----------------------------------------------------------------------------- +------------------------------------------------------------------- Sun Apr 13 23:04:29 MEST 1997 - florian@suse.de diff --git a/cpio.spec b/cpio.spec index 173e9a1..cc34de6 100644 --- a/cpio.spec +++ b/cpio.spec @@ -20,11 +20,11 @@ Name: cpio Url: http://www.gnu.org/software/cpio/cpio.html -License: GPL v3 only +License: GPLv3 Group: Productivity/Archiving/Compression AutoReqProv: on Version: 2.10 -Release: 4 +Release: 5 Summary: A Backup and Archiving Utility Source: %{name}-%{version}.tar.bz2 Patch2: %{name}-%{version}-use_new_ascii_format.patch @@ -95,7 +95,7 @@ CFLAGS="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE" \ --mandir=%{_mandir} \ --infodir=%{_infodir} \ --libdir=%{_libdir} -make +make %{?jobs:-j%jobs} %install mkdir -p $RPM_BUILD_ROOT/{usr/bin,bin}