commit zoo for openSUSE:Factory

27 Nov 2009

Hello community,

here is the log from the commit of package zoo for openSUSE:Factory
checked in at Fri Nov 27 16:07:52 CET 2009.



--------

--- zoo/zoo.changes	2009-08-13 22:37:15.000000000 +0200
+++ /mounts/work_src_done/STABLE/zoo/zoo.changes	2009-11-24 19:59:38.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 24 18:59:06 UTC 2009 - crrodriguez@opensuse.org
+
+- refresh patches with fuzz=0 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ zoo.spec ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:01.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:01.000000000 +0100
@@ -23,7 +23,7 @@
 Group:          Productivity/Archiving/Compression
 AutoReqProv:    on
 Version:        2.10
-Release:        1000
+Release:        1001
 Summary:        Pack Program
 Source:         zoo.tar.gz
 Patch0:         zoo.patch
@@ -56,13 +56,13 @@
 %prep
 %setup -q -n zoo
 %patch0
-%patch1 -p1
-%patch2 -p1
+%patch1
+%patch2
 %patch3
 %patch4
 %patch5
 %patch6
-%patch7 -p1
+%patch7
 %patch8
 
 %build

++++++ zoo-2.10-CAN-2005-2349.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:01.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:01.000000000 +0100
@@ -1,6 +1,8 @@
---- portable.c
-+++ portable.c
-@@ -364,6 +364,31 @@
+Index: portable.c
+===================================================================
+--- portable.c.orig	1991-07-11 21:07:34.000000000 +0200
++++ portable.c	2009-11-24 19:46:08.992658000 +0100
+@@ -364,6 +364,31 @@ ZOOFILE zoo_file;
        show_dir(direntry);
     }
  #endif

++++++ zoo-2.10-security-infinite_loop.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:02.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:02.000000000 +0100
@@ -1,27 +1,28 @@
-diff -u zoo/zooext.c zoo-patched/zooext.c
---- zoo/zooext.c        1991-07-11 15:08:00.000000000 -0400
-+++ zoo-patched/zooext.c        2007-03-16 16:45:28.000000000 -0500
-@@ -89,6 +89,7 @@
+Index: zooext.c
+===================================================================
+--- zooext.c.orig	1991-07-11 21:08:00.000000000 +0200
++++ zooext.c	2009-11-24 19:46:09.928625000 +0100
+@@ -89,6 +89,7 @@ int alloc_size;
  #endif
  struct direntry direntry;                 /* directory entry */
  int first_dir = 1;								/* first dir entry seen? */
 +unsigned long zoo_pointer = 0;                     /* Track our position in the file */
-
+ 
  static char extract_ver[] = "Zoo %d.%d is needed to extract %s.\n";
  static char no_space[] = "Insufficient disk space to extract %s.\n";
-@@ -169,6 +170,9 @@
-                exit_status = 1;
+@@ -169,6 +170,9 @@ if (fiz_ofs != 0L) {                /* i
+ 		exit_status = 1;
     }
     zooseek (zoo_file, zoo_header.zoo_start, 0); /* seek to where data begins */
 +
 +   /* Begin tracking our position in the file */
 +   zoo_pointer = zoo_header.zoo_start;
  }
-
+ 
  #ifndef PORTABLE
-@@ -597,6 +601,12 @@
+@@ -597,6 +601,12 @@ bit 23==0 and bit 22==1. */
     } /* end if */
-
+ 
  loop_again:
 +
 +   /* Make sure we are not seeking to already processed data */
@@ -31,29 +32,30 @@
 +
     zooseek (zoo_file, next_ptr, 0); /* ..seek to next dir entry */
  } /* end while */
-
-diff -u zoo/zoolist.c zoo-patched/zoolist.c
---- zoo/zoolist.c       1991-07-11 15:08:04.000000000 -0400
-+++ zoo-patched/zoolist.c       2007-03-16 16:45:20.000000000 -0500
-@@ -92,6 +92,7 @@
+ 
+Index: zoolist.c
+===================================================================
+--- zoolist.c.orig	1991-07-11 21:08:04.000000000 +0200
++++ zoolist.c	2009-11-24 19:46:09.933625000 +0100
+@@ -92,6 +92,7 @@ int genson = 1;					/* enable/disable ge
  int show_mode = 0;				/* show file protection */
  #endif
  int first_dir = 1;				/* if first direntry -- to adjust dat_ofs */
 +unsigned long zoo_pointer = 0;         /* Track our position in the file */
-
+ 
  while (*option) {
     switch (*option) {
-@@ -211,6 +212,9 @@
-                show_acmt (&zoo_header, zoo_file, 0);           /* show archive comment */
-        }
-
+@@ -211,6 +212,9 @@ if (fiz_ofs != 0L) {                /* i
+ 		show_acmt (&zoo_header, zoo_file, 0);		/* show archive comment */
+ 	}
+ 
 +   /* Begin tracking our position in the file */
 +   zoo_pointer = zoo_header.zoo_start;
 +
     /* Seek to the beginning of the first directory entry */
     if (zooseek (zoo_file, zoo_header.zoo_start, 0) != 0) {
        ercount++;
-@@ -437,6 +441,11 @@
+@@ -437,6 +441,11 @@ if (fiz_ofs != 0L) {                /* i
           if (verb_list && !fast)
              show_comment (&direntry, zoo_file, 0, (char *) NULL);
        } /* end if (lots of conditions) */

++++++ zoo-2.10-tempfile.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:02.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:02.000000000 +0100
@@ -1,6 +1,8 @@
---- zoo/zoopack.c.tempfile	Thu Jul 11 21:08:04 1991
-+++ zoo/zoopack.c	Fri Jan 18 13:34:56 2002
-@@ -171,8 +171,19 @@
+Index: zoopack.c
+===================================================================
+--- zoopack.c.orig	1991-07-11 21:08:04.000000000 +0200
++++ zoopack.c	2009-11-24 19:46:08.530710000 +0100
+@@ -171,8 +171,19 @@ if (!curr_dir) {
  } else {
     strcpy (temp_file, xes);
  }

++++++ zoo-fclose.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:02.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:02.000000000 +0100
@@ -1,6 +1,8 @@
---- bilf.c.orig	2009-08-13 22:32:15.000000000 +0200
-+++ bilf.c	2009-08-13 22:32:24.000000000 +0200
-@@ -99,7 +99,7 @@
+Index: bilf.c
+===================================================================
+--- bilf.c.orig	1991-07-11 21:06:26.000000000 +0200
++++ bilf.c	2009-11-24 19:46:10.176536000 +0100
+@@ -99,7 +99,7 @@ char *outname, *inname;
     while ((count = fread (buffer, 1, sizeof (buffer), infile)) > 0)
        count = fwrite (buffer, 1, count, outfile);
  

++++++ zoo-gcc.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:02.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:02.000000000 +0100
@@ -1,19 +1,21 @@
-diff -uNr zoo.orig/makefile zoo/makefile
---- zoo.orig/makefile	1992-07-27 06:01:40.000000000 +0200
-+++ zoo/makefile	2002-11-25 16:41:06.000000000 +0100
-@@ -21,7 +21,7 @@
- CC = cc
+Index: makefile
+===================================================================
+--- makefile.orig	2009-11-24 19:46:08.143710000 +0100
++++ makefile	2009-11-24 19:46:08.754711000 +0100
+@@ -21,7 +21,7 @@ MAKE = make	      # needed for some syst
+ CC = gcc
  CFLAGS =
  MODEL =
 -EXTRA = -DBIG_MEM -DNDEBUG
 +EXTRA = -DBIG_MEM -DNDEBUG -DANSI_PROTO
  LINTFLAGS = -DLINT
  OPTIM = -O
- DESTDIR = /usr/local/bin
-diff -uNr zoo.orig/options.h zoo/options.h
---- zoo.orig/options.h	1991-07-11 21:07:32.000000000 +0200
-+++ zoo/options.h	2002-11-25 16:41:30.000000000 +0100
-@@ -104,7 +104,7 @@
+ DESTDIR = /usr/bin
+Index: options.h
+===================================================================
+--- options.h.orig	2009-11-24 19:46:08.151711000 +0100
++++ options.h	2009-11-24 19:46:08.758710000 +0100
+@@ -104,7 +104,7 @@ For documentation about this file, see o
  #define GETTZ
  #define FATTR
  #define T_SIGNAL	int

++++++ zoo.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:02.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:02.000000000 +0100
@@ -1,6 +1,8 @@
---- basename.c
-+++ basename.c
-@@ -18,7 +18,7 @@
+Index: basename.c
+===================================================================
+--- basename.c.orig	1991-07-11 21:06:24.000000000 +0200
++++ basename.c	2009-11-24 19:46:08.134708000 +0100
+@@ -18,7 +18,7 @@ Copyright (C) 1986, 1987 Rahul Dhesi --
  
  /* This function strips device/directory information from
  a pathname and returns just the plain filename */
@@ -9,8 +11,10 @@
  char *pathname;
  char fname[];
  {
---- makefile
-+++ makefile
+Index: makefile
+===================================================================
+--- makefile.orig	1992-07-27 06:01:40.000000000 +0200
++++ makefile	2009-11-24 19:46:08.143710000 +0100
 @@ -18,13 +18,13 @@
  
  MAKE = make	      # needed for some systems e.g. older BSD
@@ -27,7 +31,7 @@
  
  #List of all object files created for Zoo
  ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \
-@@ -107,10 +107,10 @@
+@@ -107,10 +107,10 @@ bsdansi:
  convex:
  	$(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3 -DANSI_HDRS" $(TARGETS)
  
@@ -40,9 +44,11 @@
  	$(TARGETS)
  
  # linux as above, static linked
---- options.h
-+++ options.h
-@@ -89,7 +89,7 @@
+Index: options.h
+===================================================================
+--- options.h.orig	1991-07-11 21:07:32.000000000 +0200
++++ options.h	2009-11-24 19:46:08.151711000 +0100
+@@ -89,7 +89,7 @@ For documentation about this file, see o
  /***********************************************************************/
  
  #ifdef BSD4_3
@@ -51,9 +57,11 @@
  #define FILTER
  #define IO_MACROS
  #define EXISTS(f)		(access(f, 00) == 0)
---- various.h
-+++ various.h
-@@ -26,6 +26,7 @@
+Index: various.h
+===================================================================
+--- various.h.orig	1991-07-11 21:07:38.000000000 +0200
++++ various.h	2009-11-24 19:46:08.157708000 +0100
+@@ -26,6 +26,7 @@ the predefined type FILE.
  #ifdef ANSI_HDRS /* if not defined in stdio.h */
  # include <string.h>
  # include <stdlib.h>
@@ -61,9 +69,11 @@
  #else
  FILE *fdopen PARMS ((int, char *));
  FILE *fopen PARMS ((char *, char *));
---- zooadd.c
-+++ zooadd.c
-@@ -132,7 +132,7 @@
+Index: zooadd.c
+===================================================================
+--- zooadd.c.orig	1991-07-11 21:07:56.000000000 +0200
++++ zooadd.c	2009-11-24 19:46:08.172712000 +0100
+@@ -132,7 +132,7 @@ if (exists (zoo_path)) {
  
  if (zoo_file == NOFILE)
     prterror ('f', could_not_open, zoo_path);
@@ -72,7 +82,7 @@
  rootname (zoo_path, zoo_bak);       /* name without extension */
  strcat (zoo_bak, BACKUP_EXT);       /* name of backup of this archive */
  
-@@ -222,7 +222,7 @@
+@@ -222,7 +222,7 @@ while (1) {
  		break;
  	}
  
@@ -81,9 +91,11 @@
  
     this_file = zooopen(this_path, Z_READ);
     if (this_file == NOFILE) {
---- zoofns.h
-+++ zoofns.h
-@@ -85,7 +85,7 @@
+Index: zoofns.h
+===================================================================
+--- zoofns.h.orig	1991-07-11 21:08:00.000000000 +0200
++++ zoofns.h	2009-11-24 19:46:08.185709000 +0100
+@@ -85,7 +85,7 @@ void addbfcrc PARMS ((char *, int));
  void addfname PARMS ((char *, long, unsigned int, unsigned int, 
  							unsigned, unsigned));
  void add_version PARMS ((char *, struct direntry *));

++++++ zoo-return.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:02.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:02.000000000 +0100
@@ -1,6 +1,8 @@
---- ar.h
-+++ ar.h
-@@ -116,7 +116,9 @@
+Index: ar.h
+===================================================================
+--- ar.h.orig	1992-07-27 03:35:14.000000000 +0200
++++ ar.h	2009-11-24 19:46:09.214621000 +0100
+@@ -116,7 +116,9 @@ int make_tree
    void move_left();
  #else
  # define MOVE_LEFT memmove
@@ -10,17 +12,21 @@
  #endif
  
  #if 0
---- bsd.c
-+++ bsd.c
-@@ -104,4 +104,5 @@
+Index: bsd.c
+===================================================================
+--- bsd.c.orig	1991-07-11 21:06:26.000000000 +0200
++++ bsd.c	2009-11-24 19:46:09.223621000 +0100
+@@ -104,4 +104,5 @@ int zootrunc(f) FILE *f;
  	seekpos = lseek(fd, 0L, SEEK_CUR);
  	if (seekpos >= 0)
  		return ftruncate(fd, seekpos);
 +	return 0;
  }
---- mstime.i
-+++ mstime.i
-@@ -12,6 +12,7 @@
+Index: mstime.i
+===================================================================
+--- mstime.i.orig	1991-07-11 21:07:28.000000000 +0200
++++ mstime.i	2009-11-24 19:46:09.230621000 +0100
+@@ -12,6 +12,7 @@ static char mstimeid[]="@(#) mstime.i 2.
  Function mstime() converts time in seconds since January 1 of BASEYEAR
  to MS-DOS format date and time.
  */
@@ -28,9 +34,11 @@
  mstime(longtime, date, time)
  long longtime;       /* input:  seconds since Jan 1, BASEYEAR   */
  int *date, *time;    /* output: MS-DOS format date and time */
---- nixtime.i
-+++ nixtime.i
-@@ -36,6 +36,7 @@
+Index: nixtime.i
+===================================================================
+--- nixtime.i.orig	1991-07-11 21:07:30.000000000 +0200
++++ nixtime.i	2009-11-24 19:46:09.245621000 +0100
+@@ -36,6 +36,7 @@ unsigned *date, *time;
           (tm->tm_hour << 11);
     }
  
@@ -38,9 +46,11 @@
  }
  
  /*****************
---- options.h
-+++ options.h
-@@ -157,11 +157,13 @@
+Index: options.h
+===================================================================
+--- options.h.orig	2009-11-24 19:46:08.758710000 +0100
++++ options.h	2009-11-24 19:46:09.249623000 +0100
+@@ -157,11 +157,13 @@ For documentation about this file, see o
  #define GETTZ
  #define FATTR
  #define T_SIGNAL	void

++++++ zoo-security_parse.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:02.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:02.000000000 +0100
@@ -1,6 +1,8 @@
---- parse.c
-+++ parse.c
-@@ -39,7 +39,7 @@
+Index: parse.c
+===================================================================
+--- parse.c.orig	1991-07-11 21:07:34.000000000 +0200
++++ parse.c	2009-11-24 19:46:09.705623000 +0100
+@@ -39,7 +39,7 @@ char *fname;
     char *namep;                   /* points to relevant part of tempname */
  
     char *p;

++++++ zoo-security_pathsize.patch ++++++
--- /var/tmp/diff_new_pack.zs3frb/_old	2009-11-27 16:07:02.000000000 +0100
+++ /var/tmp/diff_new_pack.zs3frb/_new	2009-11-27 16:07:02.000000000 +0100
@@ -1,6 +1,8 @@
---- misc.c
-+++ misc.c
-@@ -135,11 +135,17 @@
+Index: misc.c
+===================================================================
+--- misc.c.orig	1991-07-11 21:07:26.000000000 +0200
++++ misc.c	2009-11-24 19:46:09.525623000 +0100
+@@ -135,11 +135,17 @@ if available, else the short filename is
  char *fullpath (direntry)
  struct direntry *direntry;
  {


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)