r914 - trunk/unzip

archaic at linuxfromscratch.org archaic at linuxfromscratch.org
Wed Apr 13 18:03:09 PDT 2005


Author: archaic
Date: 2005-04-13 19:03:08 -0600 (Wed, 13 Apr 2005)
New Revision: 914

Added:
   trunk/unzip/unzip-5.52-dont_make_noise-1.patch
   trunk/unzip/unzip-5.52-fix_Makefile-1.patch
   trunk/unzip/unzip-5.52-fix_libz-1.patch
Log:
Copied unzip patch(es) from blfs repo.

Added: trunk/unzip/unzip-5.52-dont_make_noise-1.patch
===================================================================
--- trunk/unzip/unzip-5.52-dont_make_noise-1.patch	2005-04-14 01:02:55 UTC (rev 913)
+++ trunk/unzip/unzip-5.52-dont_make_noise-1.patch	2005-04-14 01:03:08 UTC (rev 914)
@@ -0,0 +1,42 @@
+Submitted By: Tushar Teredesai <tushar at linuxfromscratch.org>
+Date: 2003-09-22
+Initial Package Version: 5.50
+Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-August/003213.html
+Description: When unzipping files, the unzip stub prints out lot of "useful" info messages.
+These messages can cause applications such as Midnight Commander to display strange behavior.
+This patch is useful for users linking unzip to the system zlib
+(i.e. installed as per the BLFS guidelines).
+
+$LastChangedBy: randy $
+$Date: 2005-03-26 16:31:35 -0700 (Sat, 26 Mar 2005) $
+
+--- unzip-5.50/unzipstb.c.orig	2003-09-22 01:05:45.000000000 -0500
++++ unzip-5.50/unzipstb.c	2003-09-22 01:06:57.000000000 -0500
+@@ -30,27 +30,6 @@
+ 
+     pVersion = UzpVersion();
+ 
+-    printf("UnZip stub:  checking version numbers (DLL is dated %s)\n",
+-      pVersion->date);
+-    printf("   UnZip versions:    expecting %d.%d%d, using %d.%d%d%s\n",
+-      UZ_MAJORVER, UZ_MINORVER, UZ_PATCHLEVEL, pVersion->unzip.major,
+-      pVersion->unzip.minor, pVersion->unzip.patchlevel, pVersion->betalevel);
+-    printf("   ZipInfo versions:  expecting %d.%d%d, using %d.%d%d\n",
+-      ZI_MAJORVER, ZI_MINORVER, UZ_PATCHLEVEL, pVersion->zipinfo.major,
+-      pVersion->zipinfo.minor, pVersion->zipinfo.patchlevel);
+-
+-/*
+-    D2_M*VER and os2dll.* are obsolete, though retained for compatibility:
+-
+-    printf("   OS2 DLL versions:  expecting %d.%d%d, using %d.%d%d\n",
+-      D2_MAJORVER, D2_MINORVER, D2_PATCHLEVEL, pVersion->os2dll.major,
+-      pVersion->os2dll.minor, pVersion->os2dll.patchlevel);
+- */
+-
+-    if (pVersion->flag & 2)
+-        printf("   using zlib version %s\n", pVersion->zlib_version);
+-    printf("\n");
+-
+     /* call the actual UnZip routine (string-arguments version) */
+     return UzpMain(argc, argv);
+ }

Added: trunk/unzip/unzip-5.52-fix_Makefile-1.patch
===================================================================
--- trunk/unzip/unzip-5.52-fix_Makefile-1.patch	2005-04-14 01:02:55 UTC (rev 913)
+++ trunk/unzip/unzip-5.52-fix_Makefile-1.patch	2005-04-14 01:03:08 UTC (rev 914)
@@ -0,0 +1,19 @@
+Submitted By: BLFS Book <blfs-book at linuxfromscratch.org>
+Date: 2003-10-03
+Initial Package Version: 5.50
+Origin: NA
+Description: Creates a missing symlink.
+
+$LastChangedBy: randy $
+$Date: 2005-03-26 16:31:35 -0700 (Sat, 26 Mar 2005) $
+
+diff -urN unzip-5.50/unix/Makefile unzip-5.50-rcl/unix/Makefile
+--- unzip-5.50/unix/Makefile	Sat Feb 16 17:00:38 2002
++++ unzip-5.50-rcl/unix/Makefile	Sat Sep 28 14:32:44 2002
+@@ -818,6 +818,7 @@
+ 	ln -sf crc_gcc.pic.o crc32.pic.o
+ 	gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
+ 	ln -sf libunzip.so.0.4 libunzip.so.0
++	ln -sf libunzip.so.0.4 libunzip.so
+ 	gcc -c -O unzipstb.c
+ 	gcc -o unzip unzipstb.o -L. -lunzip -lz

Added: trunk/unzip/unzip-5.52-fix_libz-1.patch
===================================================================
--- trunk/unzip/unzip-5.52-fix_libz-1.patch	2005-04-14 01:02:55 UTC (rev 913)
+++ trunk/unzip/unzip-5.52-fix_libz-1.patch	2005-04-14 01:03:08 UTC (rev 914)
@@ -0,0 +1,24 @@
+Submitted By: BLFS Book <blfs-book at linuxfromscratch.org>
+Date: 2003-10-03
+Initial Package Version: 5.50
+Origin: NA
+Description: Fixes compilation against system zlib.
+
+$LastChangedBy: randy $
+$Date: 2005-03-26 16:31:35 -0700 (Sat, 26 Mar 2005) $
+
+diff -urN unzip-5.50/api.c unzip-5.50-rcl/api.c
+--- unzip-5.50/api.c	Thu Nov 22 23:43:26 2001
++++ unzip-5.50-rcl/api.c	Sat Sep 28 14:31:51 2002
+@@ -48,6 +48,11 @@
+ #endif
+ #include "unzvers.h"
+ 
++/* This is defined as zlibVersion() in zlib.h version 1.1.4 */
++#ifdef   zlib_version
++#  undef zlib_version
++#endif
++
+ #ifdef DLL      /* This source file supplies DLL-only interface code. */
+ 
+ jmp_buf dll_error_return;




More information about the patches mailing list