Browse Source

upgrading package: sharutils 4.2.1 -> 4.3.77

Ralf S. Engelschall 21 years ago
parent
commit
709c38d7d8
2 changed files with 3 additions and 61 deletions
  1. 0 56
      sharutils/sharutils.patch
  2. 3 5
      sharutils/sharutils.spec

+ 0 - 56
sharutils/sharutils.patch

@@ -1,56 +0,0 @@
-http://www.securityfocus.com/archive/1/359639
-GNU Sharutils buffer overflow vulnerability
-
-http://marc.theaimsgroup.com/?l=bugtraq&m=108164583423126
-http://marc.theaimsgroup.com/?l=bugtraq&m=108164583423126&q=p3
-GNU Sharutils buffer overflow vulnerability - improved patch
-
---- src/shar.orig.c	2004-04-07 16:18:23.000000000 +0100
-+++ src/shar.c	2004-04-07 16:39:04.000000000 +0100
-@@ -212,10 +212,10 @@
- static long first_file_position;
- 
- /* Base for output filename.  FIXME: No fix limit in GNU... */
--static char output_base_name[50];
-+static char output_base_name[512];
- 
- /* Actual output filename.  FIXME: No fix limit in GNU... */
--static char output_filename[50];
-+static char output_filename[512];
- 
- static char *submitter_address = NULL;
- 
-@@ -1905,9 +1905,29 @@
- 	break;
- 
-       case 'o':
--	strcpy (output_base_name, optarg);
--	if (!strchr (output_base_name, '%'))
--	  strcat (output_base_name, ".%02d");
-+	/*
-+	 * Note: the magic '6' below is exactly sizeof(".%02d").
-+	 * Don't forget to increase size of output_filename[] appropriately
-+	 * when you increase field width from 2 up to something greater than 4.
-+	 */
-+	{
-+		register int i = 0;
-+		register char *str = optarg;
-+
-+		while (i < sizeof(output_base_name) - 6) {
-+			register char c;
-+
-+			output_base_name[i++] = (c = *str++);
-+			if (c == '%')
-+				if (i < sizeof(output_base_name) - 6)
-+					output_base_name[i++] = c;
-+				else {
-+					i--;
-+					break;
-+				}
-+		}
-+		strcpy (output_base_name + i, ".%02d");
-+	}
- 	part_number = 0;
- 	open_output ();
- 	break;
-

+ 3 - 5
sharutils/sharutils.spec

@@ -33,12 +33,11 @@ Distribution: OpenPKG
 Class:        BASE
 Group:        Archiver
 License:      GPL
-Version:      4.2.1
-Release:      20040413
+Version:      4.3.77
+Release:      20040930
 
 #   list of sources
-Source0:      ftp://ftp.gnu.org/gnu/sharutils/sharutils-%{version}.tar.gz
-Patch0:       sharutils.patch
+Source0:      ftp://ftp.gnu.org/gnu/sharutils/%{version}/sharutils-%{version}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -72,7 +71,6 @@ AutoReqProv:  no
 
 %prep
     %setup -q
-    %patch
 
 %build
     CC="%{l_cc}" \