[SM-Commit] GIT changes to master grimoire by Remko van der Vossen (6344452d4fc4eaf370b2dd920aa9c9319d4a8ecb)

Remko van der Vossen scm at sourcemage.org
Thu May 31 12:35:53 EDT 2007


GIT changes to master grimoire by Remko van der Vossen <wich at stack.nl>:

 archive/cpio/PRE_BUILD                           |    9 -
 archive/cpio/patches/2.6-isnumber.patch          |   34 ---
 archive/cpio/patches/2.6-lstat.patch             |   28 ---
 archive/cpio/patches/2.6-rili-big-files.patch    |   80 ---------
 archive/cpio/patches/2.6-umask.patch             |   38 ----
 archive/cpio/patches/cpio-2.6-chmodRaceC.patch   |  125 --------------
 archive/cpio/patches/cpio-2.6-dirTraversal.patch |  199 -----------------------
 archive/cpio/patches/cpio-2.6-gcc4-tests.patch   |   13 -
 8 files changed, 526 deletions(-)

New commits:
commit 6344452d4fc4eaf370b2dd920aa9c9319d4a8ecb
Author: Remko van der Vossen <wich at stack.nl>
Commit: Remko van der Vossen <wich at stack.nl>

    Patches were applied upstream.

diff --git a/archive/cpio/PRE_BUILD b/archive/cpio/PRE_BUILD
deleted file mode 100755
index d25efb3..0000000
--- a/archive/cpio/PRE_BUILD
+++ /dev/null
@@ -1,9 +0,0 @@
-default_pre_build &&
-cd ${SOURCE_DIRECTORY} &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/2.6-isnumber.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/2.6-lstat.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/patches/2.6-rili-big-files.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/patches/2.6-umask.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/cpio-2.6-chmodRaceC.patch &&
-patch -p1 < ${SCRIPT_DIRECTORY}/patches/cpio-2.6-dirTraversal.patch &&
-patch -p0 < ${SCRIPT_DIRECTORY}/patches/cpio-2.6-gcc4-tests.patch
diff --git a/archive/cpio/patches/2.6-isnumber.patch b/archive/cpio/patches/2.6-isnumber.patch
deleted file mode 100644
index f3d6186..0000000
--- a/archive/cpio/patches/2.6-isnumber.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-On systems which define a macro 'isnumber()', cpio goes kaboom!
-OS X is on example of where this happens.
-http://bugs.gentoo.org/show_bug.cgi?id=74929
-
-diff -uNr cpio-2.5.90.orig/src/userspec.c cpio-2.5.90/src/userspec.c
---- cpio-2.5.90.orig/src/userspec.c	Wed Dec 29 13:51:30 2004
-+++ cpio-2.5.90/src/userspec.c	Wed Dec 29 13:52:13 2004
-@@ -72,7 +72,7 @@
-    otherwise return 0. */
- 
- static int
--isnumber (const char *str)
-+cpio_isnumber (const char *str)
- {
-   for (; *str; str++)
-     if (!isdigit (*str))
-@@ -136,7 +136,7 @@
-       if (pwd == NULL)
- 	{
- 
--	  if (!isnumber (u))
-+	  if (!cpio_isnumber (u))
- 	    error_msg = _("invalid user");
- 	  else
- 	    {
-@@ -182,7 +182,7 @@
-       grp = getgrnam (g);
-       if (grp == NULL)
- 	{
--	  if (!isnumber (g))
-+	  if (!cpio_isnumber (g))
- 	    error_msg = _("invalid group");
- 	  else
- 	    *gid = atoi (g);
diff --git a/archive/cpio/patches/2.6-lstat.patch b/archive/cpio/patches/2.6-lstat.patch
deleted file mode 100644
index e9478d6..0000000
--- a/archive/cpio/patches/2.6-lstat.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-cpio is acting as if always invoked with -L (copy the file that a symlink 
-points to, rather the symlink itself)
-reason: missing check for lstat function in configure script
-see: http://lists.gnu.org/archive/html/bug-cpio/2005-01/msg00003.html
-     http://bugs.gentoo.org/show_bug.cgi?id=80246
-
---- cpio-2.6-orig/config.h.in
-+++ cpio-2.6/config.h.in
-@@ -310,6 +310,9 @@
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
- 
-+/* Define to 1 if you have the `lstat' function. */
-+#undef HAVE_LSTAT
-+
- /* Define to 1 if you have the <utime.h> header file. */
- #undef HAVE_UTIME_H
- 
---- cpio-2.6-orig/configure
-+++ cpio-2.6/configure
-@@ -1321,6 +1321,7 @@
- gl_func_list="$gl_func_list iswprint"
- gl_func_list="$gl_func_list mbsinit"
- gl_header_list="$gl_header_list unistd.h"
-+gl_func_list="$gl_func_list lstat"
- 
- 
- 
diff --git a/archive/cpio/patches/2.6-rili-big-files.patch b/archive/cpio/patches/2.6-rili-big-files.patch
deleted file mode 100644
index 281e8e8..0000000
--- a/archive/cpio/patches/2.6-rili-big-files.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-cpio normally can't cope with huge files on 32bit systems (2gig), 
-so why don't we fix that eh ?
-http://bugs.gentoo.org/show_bug.cgi?id=68520
-
-Index: src/extern.h
-===================================================================
-RCS file: /cvsroot/cpio/cpio/src/extern.h,v
-retrieving revision 1.3
-diff -u -r1.3 extern.h
---- src/extern.h	8 Sep 2004 11:41:40 -0000	1.3
-+++ src/extern.h	17 Dec 2004 19:34:41 -0000
-@@ -165,9 +165,9 @@
- void tape_buffered_read P_((char *in_buf, int in_des, long num_bytes));
- int tape_buffered_peek P_((char *peek_buf, int in_des, int num_bytes));
- void tape_toss_input P_((int in_des, long num_bytes));
--void copy_files_tape_to_disk P_((int in_des, int out_des, long num_bytes));
--void copy_files_disk_to_tape P_((int in_des, int out_des, long num_bytes, char *filename));
--void copy_files_disk_to_disk P_((int in_des, int out_des, long num_bytes, char *filename));
-+void copy_files_tape_to_disk P_((int in_des, int out_des, off_t num_bytes));
-+void copy_files_disk_to_tape P_((int in_des, int out_des, off_t num_bytes, char *filename));
-+void copy_files_disk_to_disk P_((int in_des, int out_des, off_t num_bytes, char *filename));
- void warn_if_file_changed P_((char *file_name, unsigned long old_file_size,
-                               unsigned long old_file_mtime));
- void create_all_directories P_((char *name));
-Index: src/util.c
-===================================================================
-RCS file: /cvsroot/cpio/cpio/src/util.c,v
-retrieving revision 1.6
-diff -u -r1.6 util.c
---- src/util.c	8 Sep 2004 11:45:38 -0000	1.6
-+++ src/util.c	17 Dec 2004 19:34:42 -0000
-@@ -428,10 +428,10 @@
-    NUM_BYTES is the number of bytes to copy.  */
- 
- void
--copy_files_tape_to_disk (int in_des, int out_des, long num_bytes)
-+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)
-     {
-@@ -458,13 +458,13 @@
-    NUM_BYTES is the number of bytes to copy.  */
- 
- void
--copy_files_disk_to_tape (int in_des, int out_des, long num_bytes,
-+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;
--  long original_num_bytes;
-+  off_t original_num_bytes;
- 
-   original_num_bytes = num_bytes;
- 
-@@ -505,12 +505,12 @@
-    NUM_BYTES is the number of bytes to copy.  */
- 
- void
--copy_files_disk_to_disk (int in_des, int out_des, long num_bytes,
-+copy_files_disk_to_disk (int in_des, int out_des, off_t num_bytes,
- 			 char *filename)
- {
--  long size;
--  long k;
--  long original_num_bytes;
-+  off_t size;
-+  off_t k;
-+  off_t original_num_bytes;
-   int rc;
- 
-   original_num_bytes = num_bytes;
diff --git a/archive/cpio/patches/2.6-umask.patch b/archive/cpio/patches/2.6-umask.patch
deleted file mode 100644
index 585e549..0000000
--- a/archive/cpio/patches/2.6-umask.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Fix for a wicked old bug (we're talking 1999 here ... that's like 
-6 years ago ... we should party like it's 1999, but eh, you know).  
-It seems FreeBSD peeps fixed it in their tree and neglected to tell 
-the GNU peeps that this issue existed.  Not like it matters, who 
-the hell uses cpio anymore anyways ;).  Enough rambling:
-
-cpio -O ignores the current umask when creating output files.  
-The output file is being created with mode 0666.
-
-FreeBSD PR:       http://www.freebsd.org/cgi/query-pr.cgi?pr=bin/1391
-CAN-1999-1572:    http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-1999-1572
-FreeBSD CVS Diff: http://www.freebsd.org/cgi/cvsweb.cgi/src/contrib/cpio/main.c.diff?r1=1.1&r2=1.2
-Gentoo Bug:       http://bugs.gentoo.org/show_bug.cgi?id=79844
-GNU Bug:          http://savannah.gnu.org/patch/index.php?func=detailitem&item_id=3690
-
-Index: src/main.c
-===================================================================
-RCS file: /cvsroot/cpio/cpio/src/main.c,v
-retrieving revision 1.7
-diff -u -r1.7 main.c
---- src/main.c	23 Nov 2004 02:05:27 -0000	1.7
-+++ src/main.c	29 Jan 2005 04:37:18 -0000
-@@ -740,7 +740,6 @@
-   textdomain (PACKAGE);
- 
-   program_name = argv[0];
--  umask (0);
- 
- #ifdef __TURBOC__
-   _fmode = O_BINARY;		/* Put stdin and stdout in binary mode.  */
-@@ -751,6 +750,7 @@
- #endif
- 
-   process_args (argc, argv);
-+  umask (0);
- 
-   initialize_buffers ();
- 
diff --git a/archive/cpio/patches/cpio-2.6-chmodRaceC.patch b/archive/cpio/patches/cpio-2.6-chmodRaceC.patch
deleted file mode 100644
index 6d9dd1f..0000000
--- a/archive/cpio/patches/cpio-2.6-chmodRaceC.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-Ripped from Fedora.
-
-http://bugs.gentoo.org/90619
-
---- cpio-2.6/src/copyin.c.chmodRaceC	2005-04-25 13:19:34.079310381 +0200
-+++ cpio-2.6/src/copyin.c	2005-04-25 14:09:32.514889697 +0200
-@@ -389,19 +389,26 @@
- 	  continue;
- 	}
- 
--      if (close (out_file_des) < 0)
--	error (0, errno, "%s", d->header.c_name);
--
-+      /*
-+       *  Avoid race condition.
-+       *  Set chown and chmod before closing the file desc.
-+       *  pvrabec at redhat.com
-+       */
-+       
-       /* File is now copied; set attributes.  */
-       if (!no_chown_flag)
--	if ((chown (d->header.c_name,
-+	if ((fchown (out_file_des,
- 		    set_owner_flag ? set_owner : d->header.c_uid,
- 	       set_group_flag ? set_group : d->header.c_gid) < 0)
- 	    && errno != EPERM)
- 	  error (0, errno, "%s", d->header.c_name);
-       /* chown may have turned off some permissions we wanted. */
--      if (chmod (d->header.c_name, (int) d->header.c_mode) < 0)
-+      if (fchmod (out_file_des, (int) d->header.c_mode) < 0)
-+	error (0, errno, "%s", d->header.c_name);
-+
-+      if (close (out_file_des) < 0)
- 	error (0, errno, "%s", d->header.c_name);
-+
-       if (retain_time_flag)
- 	{
- 	  times.actime = times.modtime = d->header.c_mtime;
-@@ -557,6 +564,25 @@
-       write (out_file_des, "", 1);
-       delayed_seek_count = 0;
-     }
-+    
-+  /*
-+   *  Avoid race condition.
-+   *  Set chown and chmod before closing the file desc.
-+   *  pvrabec at redhat.com
-+   */
-+   
-+  /* File is now copied; set attributes.  */
-+  if (!no_chown_flag)
-+    if ((fchown (out_file_des,
-+		set_owner_flag ? set_owner : file_hdr->c_uid,
-+	   set_group_flag ? set_group : file_hdr->c_gid) < 0)
-+	&& errno != EPERM)
-+      error (0, errno, "%s", file_hdr->c_name);
-+  
-+  /* chown may have turned off some permissions we wanted. */
-+  if (fchmod (out_file_des, (int) file_hdr->c_mode) < 0)
-+    error (0, errno, "%s", file_hdr->c_name);
-+     
-   if (close (out_file_des) < 0)
-     error (0, errno, "%s", file_hdr->c_name);
- 
-@@ -567,18 +593,6 @@
- 	       file_hdr->c_name, crc, file_hdr->c_chksum);
-     }
- 
--  /* File is now copied; set attributes.  */
--  if (!no_chown_flag)
--    if ((chown (file_hdr->c_name,
--		set_owner_flag ? set_owner : file_hdr->c_uid,
--	   set_group_flag ? set_group : file_hdr->c_gid) < 0)
--	&& errno != EPERM)
--      error (0, errno, "%s", file_hdr->c_name);
--  
--  /* chown may have turned off some permissions we wanted. */
--  if (chmod (file_hdr->c_name, (int) file_hdr->c_mode) < 0)
--    error (0, errno, "%s", file_hdr->c_name);
--  
-   if (retain_time_flag)
-     {
-       struct utimbuf times;		/* For setting file times.  */
-@@ -589,7 +603,7 @@
-       if (utime (file_hdr->c_name, &times) < 0)
- 	error (0, errno, "%s", file_hdr->c_name);
-     }
--  
-+    
-   tape_skip_padding (in_file_des, file_hdr->c_filesize);
-   if (file_hdr->c_nlink > 1
-       && (archive_format == arf_newascii || archive_format == arf_crcascii) )
---- cpio-2.6/src/copypass.c.chmodRaceC	2004-09-06 14:09:04.000000000 +0200
-+++ cpio-2.6/src/copypass.c	2005-04-25 14:09:38.135076926 +0200
-@@ -181,19 +181,25 @@
- 		}
- 	      if (close (in_file_des) < 0)
- 		error (0, errno, "%s", input_name.ds_string);
--	      if (close (out_file_des) < 0)
--		error (0, errno, "%s", output_name.ds_string);
--
-+	      /*
-+	       *  Avoid race condition.
-+	       *  Set chown and chmod before closing the file desc.
-+	       *  pvrabec at redhat.com
-+	       */
- 	      /* Set the attributes of the new file.  */
- 	      if (!no_chown_flag)
--		if ((chown (output_name.ds_string,
-+		if ((fchown (out_file_des,
- 			    set_owner_flag ? set_owner : in_file_stat.st_uid,
- 		      set_group_flag ? set_group : in_file_stat.st_gid) < 0)
- 		    && errno != EPERM)
- 		  error (0, errno, "%s", output_name.ds_string);
- 	      /* chown may have turned off some permissions we wanted. */
--	      if (chmod (output_name.ds_string, in_file_stat.st_mode) < 0)
-+	      if (fchmod (out_file_des, in_file_stat.st_mode) < 0)
-+		error (0, errno, "%s", output_name.ds_string);
-+		
-+	      if (close (out_file_des) < 0)
- 		error (0, errno, "%s", output_name.ds_string);
-+
- 	      if (reset_time_flag)
- 		{
- 		  times.actime = in_file_stat.st_atime;
diff --git a/archive/cpio/patches/cpio-2.6-dirTraversal.patch b/archive/cpio/patches/cpio-2.6-dirTraversal.patch
deleted file mode 100644
index c1b75d7..0000000
--- a/archive/cpio/patches/cpio-2.6-dirTraversal.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-* Tue May 17 2005 Peter Vrabec <pvrabec at redhat.com> 2.6-7
-- fix #156314 (CAN-2005-1229) cpio directory traversal issue
-
-http://bugs.gentoo.org/show_bug.cgi?id=90619
-http://www.securityfocus.com/archive/1/396429/2005-04-18/2005-04-24/0
-
---- cpio-2.6/doc/cpio.1
-+++ cpio-2.6/doc/cpio.1
-@@ -20,7 +20,7 @@
- [\-\-unconditional] [\-\-verbose] [\-\-block-size=blocks] [\-\-swap-halfwords]
- [\-\-io-size=bytes] [\-\-pattern-file=file] [\-\-format=format]
- [\-\-owner=[user][:.][group]] [\-\-no-preserve-owner] [\-\-message=message]
--[\-\-force\-local] [\-\-no\-absolute\-filenames] [\-\-sparse]
-+[\-\-force\-local] [\-\-absolute\-filenames] [\-\-sparse]
- [\-\-only\-verify\-crc] [\-\-quiet] [\-\-rsh-command=command] [\-\-help]
- [\-\-version] [pattern...] [< archive]
- 
---- cpio-2.6/doc/cpio.info
-+++ cpio-2.6/doc/cpio.info
-@@ -203,7 +203,7 @@
-      [--swap-halfwords] [--io-size=bytes] [--pattern-file=file]
-      [--format=format] [--owner=[user][:.][group]]
-      [--no-preserve-owner] [--message=message] [--help] [--version]
--     [-no-absolute-filenames] [--sparse] [-only-verify-crc] [-quiet]
-+     [--absolute-filenames] [--sparse] [-only-verify-crc] [-quiet]
-      [--rsh-command=command] [pattern...] [< archive]
- 
- 
-@@ -359,9 +359,9 @@
-      Show numeric UID and GID instead of translating them into names
-      when using the `--verbose option'.
- 
--`--no-absolute-filenames'
--     Create all files relative to the current directory in copy-in
--     mode, even if they have an absolute file name in the archive.
-+`--absolute-filenames'
-+     Do not strip leading file name components that contain ".." 
-+     and leading slashes from file names in copy-in mode
- 
- `--no-preserve-owner'
-      Do not change the ownership of the files; leave them owned by the
---- cpio-2.6/src/main.c
-+++ cpio-2.6/src/main.c
-@@ -41,6 +41,7 @@
- 
- enum cpio_options {
-   NO_ABSOLUTE_FILENAMES_OPTION=256,  
-+  ABSOLUTE_FILENAMES_OPTION,  
-   NO_PRESERVE_OWNER_OPTION,      
-   ONLY_VERIFY_CRC_OPTION,        
-   RENAME_BATCH_FILE_OPTION,      
-@@ -134,6 +135,8 @@
-    N_("In copy-in mode, read additional patterns specifying filenames to extract or list from FILE"), 210},
-   {"no-absolute-filenames", NO_ABSOLUTE_FILENAMES_OPTION, 0, 0,
-    N_("Create all files relative to the current directory"), 210},
-+  {"absolute-filenames", ABSOLUTE_FILENAMES_OPTION, 0, 0,
-+   N_("do not strip leading file name components that contain \"..\" and leading slashes from file names"), 210},
-   {"only-verify-crc", ONLY_VERIFY_CRC_OPTION, 0, 0,
-    N_("When reading a CRC format archive in copy-in mode, only verify the CRC's of each file in the archive, don't actually extract the files"), 210},
-   {"rename", 'r', 0, 0,
-@@ -393,7 +396,11 @@
-       break;
- 
-     case NO_ABSOLUTE_FILENAMES_OPTION:		/* --no-absolute-filenames */
--      no_abs_paths_flag = true;
-+      abs_paths_flag = false;
-+      break;
-+	
-+    case ABSOLUTE_FILENAMES_OPTION:		/* --absolute-filenames */
-+      abs_paths_flag = true;
-       break;
- 	
-     case NO_PRESERVE_OWNER_OPTION:		/* --no-preserve-owner */
-@@ -632,7 +639,7 @@
- 		      _("--append is used but no archive file name is given (use -F or -O options")));
- 
-       CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--create");
--      CHECK_USAGE(no_abs_paths_flag, "--no-absolute-pathnames", "--create");
-+      CHECK_USAGE(abs_paths_flag, "--absolute-pathnames", "--create");
-       CHECK_USAGE(input_archive_name, "-I", "--create");
-       if (archive_name && output_archive_name)
- 	USAGE_ERROR ((0, 0, _("Both -O and -F are used in copy-out mode")));
-@@ -659,7 +666,7 @@
-       CHECK_USAGE(rename_flag, "--rename", "--pass-through");
-       CHECK_USAGE(append_flag, "--append", "--pass-through");
-       CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--pass-through");
--      CHECK_USAGE(no_abs_paths_flag, "--no-absolute-pathnames",
-+      CHECK_USAGE(abs_paths_flag, "--absolute-pathnames",
- 		  "--pass-through");
-       CHECK_USAGE(to_stdout_option, "--to-stdout", "--pass-through");
-       
---- cpio-2.6/src/copyin.c
-+++ cpio-2.6/src/copyin.c
-@@ -25,6 +25,7 @@
- #include "dstring.h"
- #include "extern.h"
- #include "defer.h"
-+#include "dirname.h"
- #include <rmt.h>
- #ifndef	FNM_PATHNAME
- #include <fnmatch.h>
-@@ -1349,6 +1350,53 @@
-     }
- }
- 
-+/* Return a safer suffix of FILE_NAME, or "." if it has no safer
-+   suffix.  Check for fully specified file names and other atrocities.  */
-+
-+static const char *
-+safer_name_suffix (char const *file_name)
-+{
-+  char const *p;
-+
-+  /* Skip file system prefixes, leading file name components that contain
-+     "..", and leading slashes.  */
-+
-+  size_t prefix_len = FILE_SYSTEM_PREFIX_LEN (file_name);
-+
-+  for (p = file_name + prefix_len; *p;)
-+    {
-+      if (p[0] == '.' && p[1] == '.' && (ISSLASH (p[2]) || !p[2]))
-+	prefix_len = p + 2 - file_name;
-+
-+      do
-+	{
-+	  char c = *p++;
-+	  if (ISSLASH (c))
-+	    break;
-+	}
-+      while (*p);
-+    }
-+
-+  for (p = file_name + prefix_len; ISSLASH (*p); p++)
-+    continue;
-+  prefix_len = p - file_name;
-+
-+  if (prefix_len)
-+    {
-+      char *prefix = alloca (prefix_len + 1);
-+      memcpy (prefix, file_name, prefix_len);
-+      prefix[prefix_len] = '\0';
-+
-+
-+      error (0, 0, _("Removing leading `%s' from member names"), prefix);
-+    }
-+
-+  if (!*p)
-+    p = ".";
-+
-+  return p;
-+}
-+
- /* Read the collection from standard input and create files
-    in the file system.  */
- 
-@@ -1459,18 +1507,11 @@
- 
-       /* Do we have to ignore absolute paths, and if so, does the filename
-          have an absolute path?  */
--      if (no_abs_paths_flag && file_hdr.c_name && file_hdr.c_name [0] == '/')
-+      if (!abs_paths_flag && file_hdr.c_name && file_hdr.c_name [0])
- 	{
--	  char *p;
-+	  const char *p = safer_name_suffix (file_hdr.c_name);
- 
--	  p = file_hdr.c_name;
--	  while (*p == '/')
--	    ++p;
--	  if (*p == '\0')
--	    {
--	      strcpy (file_hdr.c_name, ".");
--	    }
--	  else
-+	  if (p != file_hdr.c_name)
- 	    {
-               /* Debian hack: file_hrd.c_name is sometimes set to
-                  point to static memory by code in tar.c.  This
---- cpio-2.6/src/extern.h
-+++ cpio-2.6/src/extern.h
-@@ -46,7 +46,7 @@
- extern int sparse_flag;
- extern int quiet_flag;
- extern int only_verify_crc_flag;
--extern int no_abs_paths_flag;
-+extern int abs_paths_flag;
- extern unsigned int warn_option;
- 
- /* Values for warn_option */
---- cpio-2.6/src/global.c
-+++ cpio-2.6/src/global.c
-@@ -100,7 +100,7 @@
- int only_verify_crc_flag = false;
- 
- /* If true, don't use any absolute paths, prefix them by `./'.  */
--int no_abs_paths_flag = false;
-+int abs_paths_flag = false;
- 
- #ifdef DEBUG_CPIO
- /* If true, print debugging information.  */
diff --git a/archive/cpio/patches/cpio-2.6-gcc4-tests.patch b/archive/cpio/patches/cpio-2.6-gcc4-tests.patch
deleted file mode 100644
index 554478a..0000000
--- a/archive/cpio/patches/cpio-2.6-gcc4-tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Rip out small change from upstream to fix building with GCC4.
-
-http://bugs.gentoo.org/show_bug.cgi?id=89123
-
---- tests/genfile.c
-+++ tests/genfile.c
-@@ -62,3 +69,3 @@
- 
--static const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
--static const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
-+const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
-+const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
- static char doc[] = N_("genfile generates data files for GNU paxutils test suite");



More information about the SM-Commit mailing list