rpms/ncompress
7
0
Fork 0
Code Issues Pull Requests Releases Activity

auto-import changelog data from ncompress-4.2.4-28.src.rpm

Browse Source 
Wed Feb 27 2002 Trond Eivind Glomsrd <teg@redhat.com> 4.2.4-28
- Rebuild
Wed Jan 09 2002 Tim Powers <timp@redhat.com>
- automated rebuild
Mon Nov 26 2001 Trond Eivind Glomsrd <teg@redhat.com> 4.2.4-26
- Rebuild, to fix problem with broken man page (#56654)
Wed Nov 21 2001 Trond Eivind Glomsrd <teg@redhat.com> 4.2.4-25
- Exit, don't segfault, when given too long filenames
This commit is contained in:
cvsdist 2004-09-09 09:01:41 +00:00
parent a2d59083bf
commit 9740fe37a0
2 changed files with 115 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
ncompress-4.2.4-filenamelen.patch Normal file
View File

@ -0,0 +1,98 @@
--- ncompress-4.2.4/compress42.c.filenamelen Wed Nov 21 12:19:38 2001
+++ ncompress-4.2.4/compress42.c Wed Nov 21 12:20:03 2001
@@ -140,6 +140,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
+#include <string.h>
#ifdef DIRENT
# include <dirent.h>
@@ -213,7 +214,7 @@
# define OBUFSIZ BUFSIZ /* Default output buffer size */
#endif
-#define MAXPATHLEN 1024 /* MAXPATHLEN - maximum length of a pathname we allow */
+#define MAXPATHLEN PATH_MAX /* MAXPATHLEN - maximum length of a pathname we allow */
#define SIZE_INNER_LOOP 256 /* Size of the inter (fast) compress loop */
/* Defines for third byte of header */
@@ -641,13 +642,11 @@
} ;
#endif
-void main ARGS((int,char **));
void Usage ARGS((void));
void comprexx ARGS((char **));
void compdir ARGS((char *));
void compress ARGS((int,int));
void decompress ARGS((int,int));
-char *rindex ARGS((char *,int));
void read_error ARGS((void));
void write_error ARGS((void));
void abort_compress ARGS((void));
@@ -694,13 +693,15 @@
* deterministic, and can be done on the fly. Thus, the decompression
* procedure needs no input table, but tracks the way the table was built.
*/
-void
+int
main(argc, argv)
REG1 int argc;
REG2 char *argv[];
{
REG3 char **filelist;
REG4 char **fileptr;
+ int i;
+
if (fgnd_flag = (signal(SIGINT, SIG_IGN) != SIG_IGN))
signal(SIGINT, (SIG_TYPE)abort_compress);
@@ -714,7 +715,14 @@
nomagic = 1; /* Original didn't have a magic number */
#endif
- filelist = fileptr = (char **)malloc(argc*sizeof(char *));
+ for(i=0;i<argc;i++){
+ if(strlen(argv[i])>(MAXPATHLEN-1)){
+ fprintf(stderr,"Filename too long\n");
+ exit(1);
+ }
+ }
+
+ filelist = fileptr = (char **)malloc(argc*sizeof(char *));
*filelist = NULL;
if((progname = rindex(argv[0], '/')) != 0)
@@ -853,8 +861,9 @@
else
decompress(0, 1);
}
-
+
exit((exit_code== -1) ? 1:exit_code);
+ return 0;
}
void
@@ -1801,20 +1810,6 @@
write_error();
}
-char *
-rindex(s, c) /* For those who don't have it in libc.a */
- REG1 char *s;
- REG2 int c;
- {
- char *p;
-
- for (p = NULL; *s; s++)
- if (*s == (char)c)
- p = s;
-
- return(p);
- }
-
void
read_error()
{

19
ncompress.spec
View File

@ -1,12 +1,14 @@
Summary: Fast compression and decompression utilities.
Name: ncompress
Version: 4.2.4
Release: 24
Release: 28
License: distributable
Group: Applications/File
Source: ftp://metalab.unc.edu/pub/Linux/utils/compress/ncompress-4.2.4.tar.Z
Patch0: ncompress-4.2.4-make.patch
Patch1: ncompress-4.2.4-lfs.patch
Patch2: ncompress-4.2.4-filenamelen.patch
BuildRequires: gcc glibc-devel fileutils
BuildRoot: %{_tmppath}/%{name}-%{version}-root
%description
@ -24,10 +26,11 @@ which are compatible with the original UNIX compress utility.
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1 -b .filenamelen
%build
%ifarch i386 i486 i586 i686
%ifarch i386 i486 i586 i686 athlon
make "RPM_OPT_FLAGS=$RPM_OPT_FLAGS -D_GNU_SOURCE" ENDIAN=4321
%endif
@ -61,6 +64,18 @@ rm -rf $RPM_BUILD_ROOT
%doc LZW.INFO README
%changelog
* Wed Feb 27 2002 Trond Eivind Glomsrød <teg@redhat.com> 4.2.4-28
- Rebuild
* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
- automated rebuild
* Mon Nov 26 2001 Trond Eivind Glomsrød <teg@redhat.com> 4.2.4-26
- Rebuild, to fix problem with broken man page (#56654)
* Wed Nov 21 2001 Trond Eivind Glomsrød <teg@redhat.com> 4.2.4-25
- Exit, don't segfault, when given too long filenames
* Sat Jun 09 2001 Florian La Roche <Florian.LaRoche@redhat.de>
- s390x change