pool/zip
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zip?expand=0&rev=1

Browse Source
This commit is contained in:
OBS User unknown 2007-01-15 23:45:55 +00:00 committed by Git OBS Bridge
commit f9324a5420
11 changed files with 521 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.gitattributes vendored Normal file
View File

@ -0,0 +1,23 @@
## Default LFS
*.7z filter=lfs diff=lfs merge=lfs -text
*.bsp filter=lfs diff=lfs merge=lfs -text
*.bz2 filter=lfs diff=lfs merge=lfs -text
*.gem filter=lfs diff=lfs merge=lfs -text
*.gz filter=lfs diff=lfs merge=lfs -text
*.jar filter=lfs diff=lfs merge=lfs -text
*.lz filter=lfs diff=lfs merge=lfs -text
*.lzma filter=lfs diff=lfs merge=lfs -text
*.obscpio filter=lfs diff=lfs merge=lfs -text
*.oxt filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.rpm filter=lfs diff=lfs merge=lfs -text
*.tbz filter=lfs diff=lfs merge=lfs -text
*.tbz2 filter=lfs diff=lfs merge=lfs -text
*.tgz filter=lfs diff=lfs merge=lfs -text
*.ttf filter=lfs diff=lfs merge=lfs -text
*.txz filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text
*.xz filter=lfs diff=lfs merge=lfs -text
*.zip filter=lfs diff=lfs merge=lfs -text
*.zst filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.osc

0
ready Normal file
View File

211
zip-2.3-iso8859_2.patch Normal file
View File

@ -0,0 +1,211 @@
--- ebcdic.h
+++ ebcdic.h
@@ -254,6 +254,25 @@
0xD0, 0xA4, 0x95, 0xA2, 0x93, 0xE4, 0x94, 0xF6, /* F0 - F7 */
0x9B, 0x97, 0xA3, 0x96, 0x81, 0xEC, 0xE7, 0x98 /* F8 - FF */
};
+
+ZCONST uch Far iso2oem_2[] = {
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+ 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F,
+ 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+ 0x98, 0x99, 0x9A, 0x9B, 0x9C, 0x9D, 0x9E, 0x9F,
+ 0x20, 0xA4, 0xF4, 0x9D, 0xCF, 0x95, 0x97, 0xF5,
+ 0xF9, 0xE6, 0xB8, 0x9B, 0x8D, 0x2D, 0xA6, 0xBD,
+ 0x20, 0xA5, 0xF2, 0x88, 0xEF, 0x96, 0x98, 0xF3,
+ 0xF7, 0xE7, 0xAD, 0x9C, 0xAB, 0xF1, 0xA7, 0xBE,
+ 0xE8, 0xB5, 0xB6, 0xC6, 0x8E, 0x91, 0x8F, 0x80,
+ 0xAC, 0x90, 0xA8, 0xD3, 0xB7, 0xD6, 0xD7, 0xD2,
+ 0xD1, 0xE3, 0xD5, 0xE0, 0xE2, 0x8A, 0x99, 0x9E,
+ 0xFC, 0xDE, 0xE9, 0xEB, 0x9A, 0xED, 0xDD, 0xE1,
+ 0xEA, 0xA0, 0x83, 0xC7, 0x84, 0x92, 0x86, 0x87,
+ 0x9F, 0x82, 0xA9, 0x89, 0xD8, 0xA1, 0x8C, 0xD4,
+ 0xD0, 0xE4, 0xE5, 0xA2, 0x93, 0x8B, 0x94, 0xF6,
+ 0xFD, 0x85, 0xA3, 0xFB, 0x81, 0xEC, 0xEE, 0xFA
+};
#endif /* IZ_ISO2OEM_ARRAY */
#ifdef IZ_OEM2ISO_ARRAY
@@ -274,6 +293,25 @@
0xDE, 0xDA, 0xDB, 0xD9, 0xFD, 0xDD, 0xAF, 0xB4, /* E8 - EF */
0xAD, 0xB1, 0x3D, 0xBE, 0xB6, 0xA7, 0xF7, 0xB8, /* F0 - F7 */
0xB0, 0xA8, 0xB7, 0xB9, 0xB3, 0xB2, 0xA6, 0xA0 /* F8 - FF */
+};
+
+ZCONST uch Far oem2iso_2[] = {
+ 0xC7, 0xFC, 0xE9, 0xE2, 0xE4, 0xF9, 0xE6, 0xE7,
+ 0xB3, 0xEB, 0xD5, 0xF5, 0xEE, 0xAC, 0xC4, 0xC6,
+ 0xC9, 0xC5, 0xE5, 0xF4, 0xF6, 0xA5, 0xB5, 0xA6,
+ 0xB6, 0xD6, 0xDC, 0xAB, 0xBB, 0xA3, 0xD7, 0xE8,
+ 0xE1, 0xED, 0xF3, 0xFA, 0xA1, 0xB1, 0xAE, 0xBE,
+ 0xCA, 0xEA, 0xAA, 0xBC, 0xC8, 0xBA, 0x3C, 0x3E,
+ 0xB0, 0xB1, 0xB2, 0xB3, 0xB4, 0xC1, 0xC2, 0xCC,
+ 0xAA, 0xB9, 0xBA, 0xBB, 0xBC, 0xAF, 0xBF, 0xBF,
+ 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC3, 0xE3,
+ 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xA4,
+ 0xF0, 0xD0, 0xCF, 0xCB, 0xEF, 0xD2, 0xCD, 0xCE,
+ 0xEC, 0xD9, 0xDA, 0xDB, 0xDC, 0xDE, 0xD9, 0xDF,
+ 0xD3, 0xDF, 0xD4, 0xD1, 0xF1, 0xF2, 0xA9, 0xB9,
+ 0xC0, 0xDA, 0xE0, 0xDB, 0xFD, 0xDD, 0xFE, 0xB4,
+ 0xF0, 0xBD, 0xB2, 0xB7, 0xA2, 0xA7, 0xF7, 0xB8,
+ 0xF8, 0xA8, 0xFF, 0xFB, 0xD8, 0xF8, 0xFE, 0xFF
};
#endif /* IZ_OEM2ISO_ARRAY */
--- globals.c
+++ globals.c
@@ -30,6 +30,8 @@
int scanimage = 1; /* 1=scan through image files */
#endif
int method = BEST; /* one of BEST, DEFLATE (only), or STORE (only) */
+int winify = 0; /* 1=file names will be converted from IBM PC CP 850 to ISO8859-1 */
+int iso8859_2 = 0; /* 1=ISO8859-2 will be used instead of ISO8859-1 */
int dosify = 0; /* 1=make new entries look like MSDOS */
int verbose = 0; /* 1=report oddities in zip file structure */
int fix = 0; /* 1=fix the zip file */
--- man/zip.1
+++ man/zip.1
@@ -14,7 +14,7 @@
zip, zipcloak, zipnote, zipsplit \- package and compress (archive) files
.SH SYNOPSIS
.B zip
-.RB [ \-aABcdDeEfFghjklLmoqrRSTuvVwXyz!@$ ]
+.RB [ \-aABcdDeEfFghjkKlLmoOqrRSTuvVwXyz!@$ ]
.RB [ \-b\ path ]
.RB [ \-n\ suffixes ]
.RB [ \-t\ mmddyyyy ]
@@ -514,7 +514,15 @@
store only the MSDOS attribute (just the user write attribute from UNIX),
and mark the entry as made under MSDOS (even though it was not);
for compatibility with PKUNZIP under MSDOS which cannot handle certain
-names such as those with two dots.
+names such as those with two dots. Conversion from ISO8859-1 to
+IBM PC CP 852 is used. See also
+.B \-O
+.TP
+.B \-K
+Attempt to convert the names and paths to conform to MS Windows. Behaviour
+similar to
+.B \-k
+but long names are used.
.TP
.B \-l
Translate the Unix end-of-line character LF into the
@@ -628,6 +636,11 @@
.I foo.zip
to the latest time of the entries in
.IR foo.zip .
+.TP
+.B \-O
+File names will be converted from ISO8859-2 instead of from ISO8859-1. See
+.B \-k
+for details.
.TP
.IP \fB\-P\fP\ \fIpassword\fP
use \fIpassword\fP to encrypt zipfile entries (if any). \fBTHIS IS
--- unix/Makefile
+++ unix/Makefile
@@ -45,7 +45,7 @@
# CFLAGS flags for C compile
# LFLAGS1 flags after output file spec, before obj file list
# LFLAGS2 flags after obj file list (libraries, etc)
-CFLAGS = -O2 -I. -DUNIX $(LOCAL_ZIP)
+CFLAGS = -O2 -I. -DUNIX -DIZ_ISO2OEM_ARRAY $(LOCAL_ZIP)
LFLAGS1 =
LFLAGS2 = -s
--- unix/unix.c
+++ unix/unix.c
@@ -246,8 +246,13 @@
if (isdir == 42) return n; /* avoid warning on unused variable */
- if (dosify)
+ if ((dosify) && (!winify))
msname(n);
+
+#ifdef IZ_ISO2OEM_ARRAY
+ if (dosify)
+ str_iso_to_oem(n, n);
+#endif
#ifdef EBCDIC
strtoasc(n, n); /* here because msname() needs native coding */
--- util.c
+++ util.c
@@ -383,7 +383,10 @@
char *dst;
{
char *dest_start = dst;
- while (*dst++ = (char)iso2oem[(uch)(*src++)]);
+ if (!iso8859_2)
+ while (*src) { *dst++ = (*src & 0x80) ? iso2oem[*src++ & 0x7f] : *src++; }
+ else
+ while (*src) { *dst++ = (*src & 0x80) ? iso2oem_2[*src++ & 0x7f] : *src++; }
return dest_start;
}
#endif
@@ -394,7 +397,10 @@
char *dst;
{
char *dest_start = dst;
- while (*dst++ = (char)oem2iso[(uch)(*src++)]);
+ if (!iso8859_2)
+ while (*src) { *dst++ = (*src & 0x80) ? oem2iso[*src++ & 0x7f] : *src++; }
+ else
+ while (*src) { *dst++ = (*src & 0x80) ? oem2iso_2[*src++ & 0x7f] : *src++; }
return dest_start;
}
#endif
--- zip.c
+++ zip.c
@@ -933,6 +933,8 @@
dispose = 0; /* 1=remove files after put in zip file */
pathput = 1; /* 1=store path with name */
method = BEST; /* one of BEST, DEFLATE (only), or STORE (only) */
+ winify = 0; /* 1=file names will be converted from IBM PC CP 850 to ISO8859-1 */
+ iso8859_2 = 0; /* 1=ISO8859-2 will be used instead of ISO8859-1 */
dosify = 0; /* 1=make new entries look like MSDOS */
verbose = 0; /* 1=report oddities in zip file structure */
fix = 0; /* 1=fix the zip file */
@@ -1190,6 +1192,8 @@
junk_sfx = 1; break;
case 'k': /* Make entries using DOS names (k for Katz) */
dosify = 1; break;
+ case 'K': /* file names will be converted from IBM PC CP 850 to ISO8859-1 */
+ winify = dosify = 1; break;
case 'l': /* Translate end-of-line */
translate_eol++; break;
#ifndef WINDLL
@@ -1208,6 +1212,8 @@
#endif
case 'o': /* Set zip file time to time of latest file in it */
latest = 1; break;
+ case 'O': /* ISO8859-2 will be used instead of ISO8859-1 */
+ iso8859_2 = 1; break;
case 'p': /* Store path with name */
break; /* (do nothing as annoyance avoidance) */
case 'P': /* password for encryption */
--- zip.h
+++ zip.h
@@ -236,9 +236,11 @@
#endif /* EBCDIC */
#ifdef IZ_ISO2OEM_ARRAY /* ISO 8859-1 (Win CP 1252) --> OEM CP 850 */
extern ZCONST uch Far iso2oem[128];
+extern ZCONST uch Far iso2oem_2[128];
#endif
#ifdef IZ_OEM2ISO_ARRAY /* OEM CP 850 --> ISO 8859-1 (Win CP 1252) */
extern ZCONST uch Far oem2iso[128];
+extern ZCONST uch Far oem2iso_2[128];
#endif
extern char errbuf[FNMAX+81]; /* Handy place to build error messages */
extern int recurse; /* Recurse into directories encountered */
@@ -254,6 +256,8 @@
#define DEFLATE 8 /* Deflation method*/
extern int method; /* Restriction on compression method */
+extern int winify; /* file names will be converted from IBM PC CP 850 to ISO8859-1 */
+extern int iso8859_2; /* ISO8859-2 will be used instead of ISO8859-1 */
extern int dosify; /* Make new entries look like MSDOS */
extern char *special; /* Don't compress special suffixes */
extern int verbose; /* Report oddities in zip file structure */

17
zip-2.3-nonexec-stack.patch Normal file
View File

@ -0,0 +1,17 @@
--- crc_i386.S 1999-10-09 16:10:26.000000000 -0400
+++ crc_i386.S 2003-10-24 16:15:52.000000000 -0400
@@ -230,3 +230,6 @@
#endif /* i386 || _i386 || _I386 || __i386 */
#endif /* !USE_ZLIB */
+
+.section .note.GNU-stack, "", @progbits
+.previous
--- match.S 1999-07-27 17:18:14.000000000 -0400
+++ match.S 2003-10-24 16:15:38.000000000 -0400
@@ -405,3 +405,5 @@
#endif /* i386 || _I386 || _i386 || __i386 */
#endif /* !USE_ZLIB */
+.section .note.GNU-stack, "", @progbits
+.previous

11
zip-2.3-optflags.patch Normal file
View File

@ -0,0 +1,11 @@
--- zip-2.3/unix/Makefile.xx 2005-04-25 16:35:51.708054850 +0200
+++ zip-2.3/unix/Makefile 2005-04-25 16:36:07.535061437 +0200
@@ -157,7 +157,7 @@
eval $(MAKE) zips `cat flags`
generic_gcc:
- $(MAKE) generic CC=gcc CPP="gcc -E"
+ $(MAKE) generic CPP="gcc -E"
# AT&T 6300 PLUS (don't know yet how to allocate 64K bytes):
att6300nodir:

21
zip-2.3-tempfile.patch Normal file
View File

@ -0,0 +1,21 @@
--- zip-2.31/fileio.c
+++ zip-2.31/fileio.c
@@ -860,7 +860,18 @@
}
#else
strcat(t, "ziXXXXXX"); /* must use lowercase for Linux dos file system */
+#ifdef NO_MKSTEMP
return mktemp(t);
+#else
+ {
+ int fd;
+
+ if ((fd = mkstemp(t)) < 0)
+ return NULL;
+ close(fd);
+ }
+ return t;
+#endif
#endif /* NO_MKTEMP */
#endif /* TANDEM */
#endif /* CMS_MVS */

11
zip-2.31-install.patch Normal file
View File

@ -0,0 +1,11 @@
--- unix/Makefile
+++ unix/Makefile
@@ -24,6 +24,8 @@
EXE =
# probably can change this to 'install' if you have it
+INSTALL = cp
+# probably can change this to 'install' if you have it
INSTALL_PROGRAM = cp
# probably can change this to 'install -d' if you have it
# XXX NextStep 3.3 and Openstep 4.x don't know about -p !

103
zip.changes Normal file
View File

@ -0,0 +1,103 @@
-------------------------------------------------------------------
Wed Jan 25 21:43:46 CET 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
-------------------------------------------------------------------
Thu Dec 15 11:31:34 CET 2005 - pth@suse.de
- Compile with (limited) large file support. This will support
single files exceeding 2 GB as long as the archive stays below
that theshold.
-------------------------------------------------------------------
Mon Oct 31 15:05:10 CET 2005 - dmueller@suse.de
- build with non-executable stack
-------------------------------------------------------------------
Mon Jul 18 11:57:48 CEST 2005 - rommel@suse.de
- update to version 2.31 (has the crypto stuff previously in zip-2.3.patch,
obsoletes zip-longpath.patch, a few more fixes)
-------------------------------------------------------------------
Mon Apr 25 16:39:07 CEST 2005 - meissner@suse.de
- correctly use RPM_OPT_FLAGS.
-------------------------------------------------------------------
Thu Dec 2 13:16:56 CET 2004 - rommel@suse.de
- reworked zip-longpath.patch, missing free's after malloc
-------------------------------------------------------------------
Thu Nov 11 11:58:24 CET 2004 - rommel@suse.de
- added zip-longpath.patch (Bugzilla #47932)
-------------------------------------------------------------------
Fri Jan 9 16:01:10 CET 2004 - adrian@suse.de
- build as user
-------------------------------------------------------------------
Wed Sep 18 01:33:03 CEST 2002 - ro@suse.de
- removed bogus self-provides
-------------------------------------------------------------------
Thu Jan 24 13:57:45 CET 2002 - grimmer@suse.de
- added zip-2.3-iso8859_2.patch to fix coding conversion
between Microsoft and Linux file names
(originally from http://www.axis.cz/linux/zip_unzip.php3,
enhanced to support both ISO8859-1 and ISO8859-2 by Petr Mladek
<pmladek@suse.cz>)
-------------------------------------------------------------------
Wed Jan 23 13:46:59 CET 2002 - okir@suse.de
- Fixed tempfile race
-------------------------------------------------------------------
Mon Jun 18 13:39:45 CEST 2001 - schwab@suse.de
- Fix cpp directives inside macro call.
-------------------------------------------------------------------
Thu Dec 14 12:29:19 CET 2000 - grimmer@suse.de
- added encryption patch
- bzipped sources
- now Provides and Obsoletes crzip
-------------------------------------------------------------------
Wed Mar 1 15:21:14 CET 2000 - schwab@suse.de
- /usr/man -> /usr/share/man
-------------------------------------------------------------------
Fri Dec 17 16:22:34 MET 1999 - grimmer@suse.de
- Update to 2.3
- Spec file cleanups
-------------------------------------------------------------------
Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
-------------------------------------------------------------------
Mon Feb 22 16:33:10 MET 1999 - grimmer@suse.de
- New version (2.2)
- specfile updates
- added french PAC-info
----------------------------------------------------------------------------
Thu Feb 6 11:56:09 CET 1997 - rj@suse.de
- Version 2.01:
- ownerships changed
- some cosmetic changes

120
zip.spec Normal file
View File

@ -0,0 +1,120 @@
#
# spec file for package zip (Version 2.31)
#
# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments via http://bugs.opensuse.org
#
# norootforbuild
Name: zip
License: BSD, Other License(s), see package
Group: Productivity/Archiving/Compression
Provides: crzip
Obsoletes: crzip
Autoreqprov: on
Version: 2.31
Release: 4
Summary: File compression program
URL: http://www.freesoftware.com/pub/infozip/
Source: ftp://ftp.info-zip.org/pub/infozip/src/zip231.tar.gz
Patch: zip-2.31-install.patch
Patch1: zip-2.3-tempfile.patch
Patch2: zip-2.3-iso8859_2.patch
Patch3: zip-2.3-nonexec-stack.patch
Patch4: zip-2.3-optflags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Zip is a compression and file packaging utility. It is compatible with
PKZIP(tm) 2.04g (Phil Katz ZIP) for MS-DOS systems.
Authors:
--------
Info-ZIP <zip-bugs@lists.wku.edu>
%prep
%setup -q
%patch
%patch1 -p1
%patch2
%patch3
%patch4 -p1
%build
make -f unix/Makefile prefix=/usr CC="gcc $RPM_OPT_FLAGS -DLARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" generic_gcc
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/usr/bin
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
make install -f unix/Makefile BINDIR=$RPM_BUILD_ROOT/usr/bin MANDIR=$RPM_BUILD_ROOT%{_mandir}/man1
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc BUGS CHANGES INSTALL LICENSE MANUAL README TODO WHATSNEW WHERE
%doc %{_mandir}/man1/zip.1.gz
/usr/bin/zip
/usr/bin/zipcloak
/usr/bin/zipnote
/usr/bin/zipsplit
%changelog -n zip
* Wed Jan 25 2006 - mls@suse.de
- converted neededforbuild to BuildRequires
* Thu Dec 15 2005 - pth@suse.de
- Compile with (limited) large file support. This will support
single files exceeding 2 GB as long as the archive stays below
that theshold.
* Mon Oct 31 2005 - dmueller@suse.de
- build with non-executable stack
* Mon Jul 18 2005 - rommel@suse.de
- update to version 2.31 (has the crypto stuff previously in zip-2.3.patch,
obsoletes zip-longpath.patch, a few more fixes)
* Mon Apr 25 2005 - meissner@suse.de
- correctly use RPM_OPT_FLAGS.
* Thu Dec 02 2004 - rommel@suse.de
- reworked zip-longpath.patch, missing free's after malloc
* Thu Nov 11 2004 - rommel@suse.de
- added zip-longpath.patch (Bugzilla #47932)
* Fri Jan 09 2004 - adrian@suse.de
- build as user
* Wed Sep 18 2002 - ro@suse.de
- removed bogus self-provides
* Thu Jan 24 2002 - grimmer@suse.de
- added zip-2.3-iso8859_2.patch to fix coding conversion
between Microsoft and Linux file names
(originally from http://www.axis.cz/linux/zip_unzip.php3,
enhanced to support both ISO8859-1 and ISO8859-2 by Petr Mladek
<pmladek@suse.cz>)
* Wed Jan 23 2002 - okir@suse.de
- Fixed tempfile race
* Mon Jun 18 2001 - schwab@suse.de
- Fix cpp directives inside macro call.
* Thu Dec 14 2000 - grimmer@suse.de
- added encryption patch
- bzipped sources
- now Provides and Obsoletes crzip
* Wed Mar 01 2000 - schwab@suse.de
- /usr/man -> /usr/share/man
* Fri Dec 17 1999 - grimmer@suse.de
- Update to 2.3
- Spec file cleanups
* Mon Sep 13 1999 - bs@suse.de
- ran old prepare_spec on spec file to switch to new prepare_spec.
* Mon Feb 22 1999 - grimmer@suse.de
- New version (2.2)
- specfile updates
- added french PAC-info
* Thu Feb 06 1997 - rj@suse.de
- Version 2.01:
- ownerships changed
- some cosmetic changes

3
zip231.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2d21c0ed60346bcaa47ff0c3369219602dca1733b83ec503e9e8108dc119f719
size 781641