From 6b5179e3c95b14671985d343a13a9af2c875c83361c3415134635ccaf1151ad8 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sun, 6 May 2007 15:18:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unzip?expand=0&rev=2 --- unzip-no_file_name_translation.patch | 96 ++++++++++++++++++++++++++++ unzip.changes | 7 ++ unzip.spec | 44 +++++++------ unzip552.tar.bz2 | 3 + unzip552.tar.gz | 3 - 5 files changed, 131 insertions(+), 22 deletions(-) create mode 100644 unzip-no_file_name_translation.patch create mode 100644 unzip552.tar.bz2 delete mode 100644 unzip552.tar.gz diff --git a/unzip-no_file_name_translation.patch b/unzip-no_file_name_translation.patch new file mode 100644 index 0000000..45aec25 --- /dev/null +++ b/unzip-no_file_name_translation.patch @@ -0,0 +1,96 @@ +--- man/zipinfo.1-dist 2007-04-25 12:18:27.000000000 +0200 ++++ man/zipinfo.1 2007-04-25 12:19:43.000000000 +0200 +@@ -114,7 +114,10 @@ + .TP + .B \-s + list zipfile info in short Unix ``\fCls \-l\fR'' format. This is the default +-behavior; see below. ++behavior; see \fB\-m option below. ++.TP ++.B \-S ++suppress the conversion of file name encodings. + .TP + .B \-m + list zipfile info in medium Unix ``\fCls \-l\fR'' format. Identical to the +--- man/unzip.1-dist 2007-04-25 12:04:20.000000000 +0200 ++++ man/unzip.1 2007-04-25 12:19:54.000000000 +0200 +@@ -25,7 +25,7 @@ + unzip \- list, test and extract compressed files in a ZIP archive + .PD + .SH SYNOPSIS +-\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCKLMOVX$/:\fP]] ++\fBunzip\fP [\fB\-Z\fP] [\fB\-cflptTuvz\fP[\fBabjnoqsCKLMOSVX$/:\fP]] + \fIfile\fP[\fI.zip\fP] [\fIfile(s)\fP\ .\|.\|.] + [\fB\-x\fP\ \fIxfile(s)\fP\ .\|.\|.] [\fB\-d\fP\ \fIexdir\fP] + .PD +@@ -371,6 +371,11 @@ + spaces in filenames. Conversion of spaces to underscores can eliminate the + awkwardness in some cases. + .TP ++.B \-S ++suppress the conversion of file name encodings. This is useful when an ++archive contains file names with non-latin letters. You have to convert ++the file names appropriately to your native encoding manually afterwards. ++.TP + .B \-U + (obsolete; to be removed in a future release) leave filenames uppercase if + created under MS-DOS, VMS, etc. See \fB\-L\fP above. +--- unzpriv.h-dist 2007-04-25 11:55:59.000000000 +0200 ++++ unzpriv.h 2007-04-25 12:12:22.000000000 +0200 +@@ -2577,6 +2577,7 @@ char *GetLoadPath OF((__GPRO)); + */ + #ifndef Ext_ASCII_TO_Native + # define Ext_ASCII_TO_Native(string, hostnum, hostver, isuxatt, islochdr) \ ++ if (uO.no_conv_enc == FALSE) { \ + if (((hostnum) == FS_FAT_ && \ + !(((islochdr) || (isuxatt)) && \ + ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \ +@@ -2585,7 +2586,7 @@ char *GetLoadPath OF((__GPRO)); + _OEM_INTERN((string)); \ + } else { \ + _ISO_INTERN((string)); \ +- } ++ }} + #endif + + +--- zipinfo.c-dist 2007-04-25 12:17:17.000000000 +0200 ++++ zipinfo.c 2007-04-25 12:18:09.000000000 +0200 +@@ -517,6 +517,12 @@ int zi_opts(__G__ pargc, pargv) + else + uO.lflag = 3; + break; ++ case 'S': /* suppress encoding conversion */ ++ if (negative) ++ uO.no_conv_enc = FALSE, negative = 0; ++ else ++ uO.no_conv_enc = TRUE; ++ break; + case 't': /* totals line */ + if (negative) + tflag_2v = tflag_slm = FALSE, negative = 0; +--- unzip.c-dist 2007-04-25 11:58:44.000000000 +0200 ++++ unzip.c 2007-04-25 12:12:35.000000000 +0200 +@@ -1416,6 +1416,12 @@ int uz_opts(__G__ pargc, pargv) + uO.sflag = TRUE; + break; + #endif /* DOS_FLX_NLM_OS2_W32 */ ++ case ('S'): /* suppress file name encoding conversions */ ++ if (negative) ++ uO.no_conv_enc = FALSE, negative = 0; ++ else ++ uO.no_conv_enc = TRUE; ++ break; + case ('t'): + if (negative) + uO.tflag = FALSE, negative = 0; +--- unzip.h-dist 2007-04-25 11:59:03.000000000 +0200 ++++ unzip.h 2007-04-25 12:12:11.000000000 +0200 +@@ -478,6 +478,7 @@ typedef struct _UzpOpts { + #if (defined(MSDOS) || defined(FLEXOS) || defined(OS2) || defined(WIN32)) + int sflag; /* -s: convert spaces in filenames to underscores */ + #endif ++ int no_conv_enc; /* -S: suppress encoding conversion */ + #if (defined(NLM)) + int sflag; /* -s: convert spaces in filenames to underscores */ + #endif diff --git a/unzip.changes b/unzip.changes index e86ef16..6bac8f0 100644 --- a/unzip.changes +++ b/unzip.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu May 3 15:25:39 CEST 2007 - pth@suse.de + +- Add patch from Takashi Iwai that adds a new option (-S) to + unzip and infozip that disables file name translation (#267901). +- Recompress tarball with bzip2 + ------------------------------------------------------------------- Fri Jan 27 02:30:41 CET 2006 - mls@suse.de diff --git a/unzip.spec b/unzip.spec index 15e4b5e..7d6a736 100644 --- a/unzip.spec +++ b/unzip.spec @@ -1,31 +1,32 @@ # # spec file for package unzip (Version 5.52) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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 +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild -Name: unzip -License: Other License(s), see package, BSD -Group: Productivity/Archiving/Compression -Provides: crunzip -Obsoletes: crunzip -Autoreqprov: on -Version: 5.52 -Release: 5 -Summary: A program to unpack compressed files -Source: ftp://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz -URL: http://www.info-zip.org/ -Patch: unzip.dif -Patch1: unzip-iso8859_2.patch -Patch3: unzip-optflags.patch -Patch4: unzip-5.52-filename_too_long.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Name: unzip +License: BSD License and BSD-like +Group: Productivity/Archiving/Compression +Provides: crunzip +Obsoletes: crunzip +Autoreqprov: on +Version: 5.52 +Release: 49 +Summary: A program to unpack compressed files +Source: unzip552.tar.bz2 +URL: http://www.info-zip.org/ +Patch: unzip.dif +Patch1: unzip-iso8859_2.patch +Patch3: unzip-optflags.patch +Patch4: unzip-5.52-filename_too_long.patch +Patch5: unzip-no_file_name_translation.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description UnZip is an extraction utility for archives compressed in .zip format @@ -46,6 +47,7 @@ Authors: %patch1 -p1 %patch3 %patch4 +%patch5 %build %ifarch %ix86 @@ -81,7 +83,11 @@ done %{_bindir}/zipinfo %{_bindir}/zipgrep -%changelog -n unzip +%changelog +* Thu May 03 2007 - pth@suse.de +- Add patch from Takashi Iwai that adds a new option (-S) to + unzip and infozip that disables file name translation (#267901). +- Recompress tarball with bzip2 * Fri Jan 27 2006 - mls@suse.de - converted neededforbuild to BuildRequires * Thu Jan 26 2006 - pth@suse.de diff --git a/unzip552.tar.bz2 b/unzip552.tar.bz2 new file mode 100644 index 0000000..ba96633 --- /dev/null +++ b/unzip552.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67ac960892936d07286da931f66e02fdd472192cef3d48fd88ba0046c2ea04a4 +size 864023 diff --git a/unzip552.tar.gz b/unzip552.tar.gz deleted file mode 100644 index 540a2c6..0000000 --- a/unzip552.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9 -size 1140291