Merge ~dviererbe/ubuntu/+source/unzip:merge-lp2021565-mantic into ubuntu/+source/unzip:debian/sid

[Dominik Viererbe]

[Dominik Viererbe (dviererbe)]

PPA: https://launchpad.net/~dviererbe/+archive/ubuntu/unzip-merge-lp2021565

Basic test:

Use a zip file you have lying around and unzip it e.g.
$ unzip test.zip

Package tests:

This package contains no tests.

[Steve Langasek (vorlon)]

review: Approve

[Robie Basak (racb)]

brdung asked me to mark this as Merged.

diff --git a/debian/changelog b/debian/changelog
index dfed2d7..8cf68a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+unzip (6.0-28ubuntu1) mantic; urgency=medium
+
+  * Merge from Debian unstable (LP: 2021565). Remaining changes:
+    - d/p/20-unzip60-alt-iconv-utf8.patch: Add patch from archlinux
+      which adds the -O option, allowing a charset to be specified
+      for the proper unzipping of non-Latin and non-Unicode filenames.
+
+ -- Dominik Viererbe <[e-mail]>  Tue, 30 May 2023 13:34:18 +0300
+
 unzip (6.0-28) unstable; urgency=medium
 
   * Drop debian/source/lintian-overrides, obsolete since version 6.0-18.
@@ -8,6 +17,16 @@ unzip (6.0-28) unstable; urgency=medium
 
  -- Santiago Vila <[e-mail]>  Sun, 19 Feb 2023 19:02:00 +0100
 
+unzip (6.0-27ubuntu1) kinetic; urgency=medium
+
+  * Merge from Debian unstable (LP: #198740)
+    Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Heinrich Schuchardt <[e-mail]>  Tue, 23 Aug 2022 14:51:42 +0200
+
 unzip (6.0-27) unstable; urgency=medium
 
   * Apply upstream patch for CVE-2022-0529 and CVE-2022-0530.
@@ -17,6 +36,27 @@ unzip (6.0-27) unstable; urgency=medium
 
  -- Santiago Vila <[e-mail]>  Tue, 02 Aug 2022 19:05:00 +0200
 
+unzip (6.0-26ubuntu3) jammy; urgency=high
+
+  * No change rebuild for ppc64el baseline bump.
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 25 Mar 2022 10:59:33 +0100
+
+unzip (6.0-26ubuntu2) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:25:55 +0200
+
+unzip (6.0-26ubuntu1) hirsute; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Steve Langasek <[e-mail]>  Fri, 29 Jan 2021 12:10:20 -0800
+
 unzip (6.0-26) unstable; urgency=medium
 
   * Two more patches from Mark Adler for CVE-2019-13232. Closes: #963996.
@@ -28,6 +68,15 @@ unzip (6.0-26) unstable; urgency=medium
 
  -- Santiago Vila <[e-mail]>  Sun, 10 Jan 2021 15:34:00 +0100
 
+unzip (6.0-25ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Steve Langasek <[e-mail]>  Thu, 15 Aug 2019 23:39:12 -0700
+
 unzip (6.0-25) unstable; urgency=medium
 
   * Apply one more patch by Mark Adler:
@@ -37,6 +86,15 @@ unzip (6.0-25) unstable; urgency=medium
 
  -- Santiago Vila <[e-mail]>  Sat, 27 Jul 2019 18:01:36 +0200
 
+unzip (6.0-24ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Steve Langasek <[e-mail]>  Mon, 15 Jul 2019 22:02:02 -0700
+
 unzip (6.0-24) unstable; urgency=medium
 
   * Apply two patches by Mark Adler:
@@ -46,6 +104,15 @@ unzip (6.0-24) unstable; urgency=medium
 
  -- Santiago Vila <[e-mail]>  Thu, 11 Jul 2019 18:03:34 +0200
 
+unzip (6.0-23ubuntu1) eoan; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Steve Langasek <[e-mail]>  Tue, 28 May 2019 23:05:51 -0700
+
 unzip (6.0-23) unstable; urgency=medium
 
   * Fix lame code in fileio.c which parsed 64-bit values incorrectly.
@@ -53,6 +120,15 @@ unzip (6.0-23) unstable; urgency=medium
 
  -- Santiago Vila <[e-mail]>  Wed, 29 May 2019 00:24:08 +0200
 
+unzip (6.0-22ubuntu1) disco; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Steve Langasek <[e-mail]>  Mon, 11 Feb 2019 11:32:00 -0800
+
 unzip (6.0-22) unstable; urgency=medium
 
   * Fix buffer overflow in password protected ZIP archives. Closes: #889838.
@@ -61,6 +137,15 @@ unzip (6.0-22) unstable; urgency=medium
 
  -- Santiago Vila <[e-mail]>  Sat, 09 Feb 2019 18:12:00 +0100
 
+unzip (6.0-21ubuntu1) artful; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Steve Langasek <[e-mail]>  Thu, 27 Apr 2017 22:23:23 -0700
+
 unzip (6.0-21) unstable; urgency=medium
 
   * Rename all debian/patches/* to have .patch ending.
@@ -78,6 +163,22 @@ unzip (6.0-21) unstable; urgency=medium
 
  -- Santiago Vila <[e-mail]>  Sun, 11 Dec 2016 21:03:30 +0100
 
+unzip (6.0-20ubuntu2) artful; urgency=medium
+
+  * No-change rebuild to pick up -fPIE compiler default in static
+    libraries
+
+ -- Steve Langasek <[e-mail]>  Fri, 21 Apr 2017 20:58:49 +0000
+
+unzip (6.0-20ubuntu1) xenial; urgency=medium
+
+  * Resynchronise with Debian. Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Marc Deslauriers <[e-mail]>  Fri, 20 Nov 2015 09:16:18 -0500
+
 unzip (6.0-20) unstable; urgency=high
 
   * Update debian/patches/16-fix-integer-underflow-csiz-decrypted to fix
@@ -86,6 +187,22 @@ unzip (6.0-20) unstable; urgency=high
 
  -- Santiago Vila <[e-mail]>  Mon, 09 Nov 2015 22:15:32 +0100
 
+unzip (6.0-19ubuntu2) xenial; urgency=medium
+
+  * debian/patches/16-fix-integer-underflow-csiz-decrypted: updated to fix
+    regression in handling 0-byte files (LP: #1513293)
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 09 Nov 2015 08:51:17 -0600
+
+unzip (6.0-19ubuntu1) xenial; urgency=medium
+
+  * Resynchronise with Debian. Remaining changes:
+    - Add patch from archlinux which adds the -O option, allowing a charset
+      to be specified for the proper unzipping of non-Latin and non-Unicode
+      filenames.
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 23 Oct 2015 15:58:43 +0200
+
 unzip (6.0-19) unstable; urgency=medium
 
   * Fix infinite loop when extracting password-protected archive.
@@ -521,3 +638,4 @@ unzip (5.12-12) non-free; urgency=low
   * initial release (used 2 to avoid confusion with old unzip)
 
  -- Carl Streeter <[e-mail]>  Tue, 5 Sep 1995 00:00:00 +0000
+
diff --git a/debian/control b/debian/control
index fed3df4..ec0c8ba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: unzip
 Section: utils
 Priority: optional
-Maintainer: Santiago Vila <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Santiago Vila <[e-mail]>
 Standards-Version: 4.6.2
 Build-Depends: debhelper-compat (= 13), libbz2-dev
 Homepage: https://infozip.sourceforge.net/UnZip.html
diff --git a/debian/patches/20-unzip60-alt-iconv-utf8.patch b/debian/patches/20-unzip60-alt-iconv-utf8.patch
new file mode 100644
index 0000000..b9e3777
--- /dev/null
+++ b/debian/patches/20-unzip60-alt-iconv-utf8.patch
@@ -0,0 +1,398 @@
+From: Giovanni Scafora <giovanni.archlinux.org>
+Subject: unzip files encoded with non-latin, non-unicode file names
+Last-Update: 2015-02-11
+
+Updated 2015-02-11 by Marc Deslauriers <[e-mail]>
+to fix buffer overflow in charset_to_intern()
+
+Index: unzip-6.0/unix/unix.c
+===================================================================
+--- unzip-6.0.orig/unix/unix.c	2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unix/unix.c	2015-02-11 09:18:04.902081319 -0500
+@@ -30,6 +30,9 @@
+ #define UNZIP_INTERNAL
+ #include "unzip.h"
+ 
++#include <iconv.h>
++#include <langinfo.h>
++
+ #ifdef SCO_XENIX
+ #  define SYSNDIR
+ #else  /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */
+@@ -1874,3 +1877,102 @@
+     }
+ }
+ #endif /* QLZIP */
++
++
++typedef struct {
++    char *local_charset;
++    char *archive_charset;
++} CHARSET_MAP;
++
++/* A mapping of local <-> archive charsets used by default to convert filenames
++ * of DOS/Windows Zip archives. Currently very basic. */
++static CHARSET_MAP dos_charset_map[] = {
++    { "ANSI_X3.4-1968", "CP850" },
++    { "ISO-8859-1", "CP850" },
++    { "CP1252", "CP850" },
++    { "UTF-8", "CP866" },
++    { "KOI8-R", "CP866" },
++    { "KOI8-U", "CP866" },
++    { "ISO-8859-5", "CP866" }
++};
++
++char OEM_CP[MAX_CP_NAME] = "";
++char ISO_CP[MAX_CP_NAME] = "";
++
++/* Try to guess the default value of OEM_CP based on the current locale.
++ * ISO_CP is left alone for now. */
++void init_conversion_charsets()
++{
++    const char *local_charset;
++    int i;
++
++    /* Make a guess only if OEM_CP not already set. */ 
++    if(*OEM_CP == '\0') {
++    	local_charset = nl_langinfo(CODESET);
++    	for(i = 0; i < sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++)
++    		if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) {
++    			strncpy(OEM_CP, dos_charset_map[i].archive_charset,
++    					sizeof(OEM_CP));
++    			break;
++    		}
++    }
++}
++
++/* Convert a string from one encoding to the current locale using iconv().
++ * Be as non-intrusive as possible. If error is encountered during covertion
++ * just leave the string intact. */
++static void charset_to_intern(char *string, char *from_charset)
++{
++    iconv_t cd;
++    char *s,*d, *buf;
++    size_t slen, dlen, buflen;
++    const char *local_charset;
++
++    if(*from_charset == '\0')
++    	return;
++
++    buf = NULL;
++    local_charset = nl_langinfo(CODESET);
++
++    if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1)
++        return;
++
++    slen = strlen(string);
++    s = string;
++
++    /*  Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ
++     *  as this function also gets called with G.outbuf in fileio.c
++     */
++    buflen = FILNAMSIZ;
++    if (OUTBUFSIZ + 1 < FILNAMSIZ)
++    {
++        buflen = OUTBUFSIZ + 1;
++    }
++
++    d = buf = malloc(buflen);
++    if(!d)
++    	goto cleanup;
++
++    bzero(buf,buflen);
++    dlen = buflen - 1;
++
++    if(iconv(cd, &s, &slen, &d, &dlen) == (size_t)-1)
++    	goto cleanup;
++    strncpy(string, buf, buflen);
++
++    cleanup:
++    free(buf);
++    iconv_close(cd);
++}
++
++/* Convert a string from OEM_CP to the current locale charset. */
++inline void oem_intern(char *string)
++{
++    charset_to_intern(string, OEM_CP);
++}
++
++/* Convert a string from ISO_CP to the current locale charset. */
++inline void iso_intern(char *string)
++{
++    charset_to_intern(string, ISO_CP);
++}
+Index: unzip-6.0/unix/unxcfg.h
+===================================================================
+--- unzip-6.0.orig/unix/unxcfg.h	2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unix/unxcfg.h	2015-02-11 08:46:43.671324260 -0500
+@@ -228,4 +228,30 @@
+ /* wild_dir, dirname, wildname, matchname[], dirnamelen, have_dirname, */
+ /*    and notfirstcall are used by do_wild().                          */
+ 
++
++#define MAX_CP_NAME 25 
++   
++#ifdef SETLOCALE
++#  undef SETLOCALE
++#endif
++#define SETLOCALE(category, locale) setlocale(category, locale)
++#include <locale.h>
++   
++#ifdef _ISO_INTERN
++#  undef _ISO_INTERN
++#endif
++#define _ISO_INTERN(str1) iso_intern(str1)
++
++#ifdef _OEM_INTERN
++#  undef _OEM_INTERN
++#endif
++#ifndef IZ_OEM2ISO_ARRAY
++#  define IZ_OEM2ISO_ARRAY
++#endif
++#define _OEM_INTERN(str1) oem_intern(str1)
++
++void iso_intern(char *);
++void oem_intern(char *);
++void init_conversion_charsets(void);
++   
+ #endif /* !__unxcfg_h */
+Index: unzip-6.0/unzip.c
+===================================================================
+--- unzip-6.0.orig/unzip.c	2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unzip.c	2015-02-11 08:46:43.675324290 -0500
+@@ -327,11 +327,21 @@
+   -2  just filenames but allow -h/-t/-z  -l  long Unix \"ls -l\" format\n\
+                                          -v  verbose, multi-page format\n";
+ 
++#ifndef UNIX
+ static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
+   -h  print header line       -t  print totals for listed files or for all\n\
+   -z  print zipfile comment   -T  print file times in sortable decimal format\
+ \n  -C  be case-insensitive   %s\
+   -x  exclude filenames that follow from listing\n";
++#else /* UNIX */
++static ZCONST char Far ZipInfoUsageLine3[] = "miscellaneous options:\n\
++  -h  print header line       -t  print totals for listed files or for all\n\
++  -z  print zipfile comment  %c-T%c print file times in sortable decimal format\
++\n %c-C%c be case-insensitive   %s\
++  -x  exclude filenames that follow from listing\n\
++  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
++  -I CHARSET  specify a character encoding for UNIX and other archives\n";
++#endif /* !UNIX */
+ #ifdef MORE
+    static ZCONST char Far ZipInfoUsageLine4[] =
+      "  -M  page output through built-in \"more\"\n";
+@@ -664,6 +674,17 @@
+   -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
+   -C  match filenames case-insensitively     -L  make (some) names \
+ lowercase\n %-42s  -V  retain VMS version numbers\n%s";
++#elif (defined UNIX)
++static ZCONST char Far UnzipUsageLine4[] = "\
++modifiers:\n\
++  -n  never overwrite existing files         -q  quiet mode (-qq => quieter)\n\
++  -o  overwrite files WITHOUT prompting      -a  auto-convert any text files\n\
++  -j  junk paths (do not make directories)   -aa treat ALL files as text\n\
++  -U  use escapes for all non-ASCII Unicode  -UU ignore any Unicode fields\n\
++  -C  match filenames case-insensitively     -L  make (some) names \
++lowercase\n %-42s  -V  retain VMS version numbers\n%s\
++  -O CHARSET  specify a character encoding for DOS, Windows and OS/2 archives\n\
++  -I CHARSET  specify a character encoding for UNIX and other archives\n\n";
+ #else /* !VMS */
+ static ZCONST char Far UnzipUsageLine4[] = "\
+ modifiers:\n\
+@@ -802,6 +823,10 @@
+ #endif /* UNICODE_SUPPORT */
+ 
+ 
++#ifdef UNIX
++    init_conversion_charsets();
++#endif
++
+ #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__))
+     extern void DebugMalloc(void);
+ 
+@@ -1335,6 +1360,11 @@
+     argc = *pargc;
+     argv = *pargv;
+ 
++#ifdef UNIX
++    extern char OEM_CP[MAX_CP_NAME];
++    extern char ISO_CP[MAX_CP_NAME];
++#endif
++    
+     while (++argv, (--argc > 0 && *argv != NULL && **argv == '-')) {
+         s = *argv + 1;
+         while ((c = *s++) != 0) {    /* "!= 0":  prevent Turbo C warning */
+@@ -1516,6 +1546,35 @@
+                     }
+                     break;
+ #endif  /* MACOS */
++#ifdef UNIX
++    			case ('I'):
++                    if (negative) {
++                        Info(slide, 0x401, ((char *)slide,
++                          "error:  encodings can't be negated"));
++                        return(PK_PARAM);
++    				} else {
++    					if(*s) { /* Handle the -Icharset case */
++    						/* Assume that charsets can't start with a dash to spot arguments misuse */
++    						if(*s == '-') { 
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						strncpy(ISO_CP, s, sizeof(ISO_CP));
++    					} else { /* -I charset */
++    						++argv;
++    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						s = *argv;
++    						strncpy(ISO_CP, s, sizeof(ISO_CP));
++    					}
++    					while(*(++s)); /* No params straight after charset name */
++    				}
++    				break;
++#endif /* ?UNIX */
+                 case ('j'):    /* junk pathnames/directory structure */
+                     if (negative)
+                         uO.jflag = FALSE, negative = 0;
+@@ -1591,6 +1650,35 @@
+                     } else
+                         ++uO.overwrite_all;
+                     break;
++#ifdef UNIX
++    			case ('O'):
++                    if (negative) {
++                        Info(slide, 0x401, ((char *)slide,
++                          "error:  encodings can't be negated"));
++                        return(PK_PARAM);
++    				} else {
++    					if(*s) { /* Handle the -Ocharset case */
++    						/* Assume that charsets can't start with a dash to spot arguments misuse */
++    						if(*s == '-') { 
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						strncpy(OEM_CP, s, sizeof(OEM_CP));
++    					} else { /* -O charset */
++    						++argv;
++    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -O argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						s = *argv;
++    						strncpy(OEM_CP, s, sizeof(OEM_CP));
++    					}
++    					while(*(++s)); /* No params straight after charset name */
++    				}
++    				break;
++#endif /* ?UNIX */
+                 case ('p'):    /* pipes:  extract to stdout, no messages */
+                     if (negative) {
+                         uO.cflag = FALSE;
+Index: unzip-6.0/unzpriv.h
+===================================================================
+--- unzip-6.0.orig/unzpriv.h	2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/unzpriv.h	2015-02-11 08:46:43.675324290 -0500
+@@ -3008,7 +3008,7 @@
+          !(((islochdr) || (isuxatt)) && \
+            ((hostver) == 25 || (hostver) == 26 || (hostver) == 40))) || \
+         (hostnum) == FS_HPFS_ || \
+-        ((hostnum) == FS_NTFS_ && (hostver) == 50)) { \
++        ((hostnum) == FS_NTFS_ /* && (hostver) == 50 */ )) { \
+         _OEM_INTERN((string)); \
+     } else { \
+         _ISO_INTERN((string)); \
+Index: unzip-6.0/zipinfo.c
+===================================================================
+--- unzip-6.0.orig/zipinfo.c	2015-02-11 08:46:43.675324290 -0500
++++ unzip-6.0/zipinfo.c	2015-02-11 08:46:43.675324290 -0500
+@@ -457,6 +457,10 @@
+     int    tflag_slm=TRUE, tflag_2v=FALSE;
+     int    explicit_h=FALSE, explicit_t=FALSE;
+ 
++#ifdef UNIX
++    extern char OEM_CP[MAX_CP_NAME];
++    extern char ISO_CP[MAX_CP_NAME];
++#endif
+ 
+ #ifdef MACOS
+     uO.lflag = LFLAG;         /* reset default on each call */
+@@ -501,6 +505,35 @@
+                             uO.lflag = 0;
+                     }
+                     break;
++#ifdef UNIX
++    			case ('I'):
++                    if (negative) {
++                        Info(slide, 0x401, ((char *)slide,
++                          "error:  encodings can't be negated"));
++                        return(PK_PARAM);
++    				} else {
++    					if(*s) { /* Handle the -Icharset case */
++    						/* Assume that charsets can't start with a dash to spot arguments misuse */
++    						if(*s == '-') { 
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						strncpy(ISO_CP, s, sizeof(ISO_CP));
++    					} else { /* -I charset */
++    						++argv;
++    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						s = *argv;
++    						strncpy(ISO_CP, s, sizeof(ISO_CP));
++    					}
++    					while(*(++s)); /* No params straight after charset name */
++    				}
++    				break;
++#endif /* ?UNIX */
+                 case 'l':      /* longer form of "ls -l" type listing */
+                     if (negative)
+                         uO.lflag = -2, negative = 0;
+@@ -521,6 +554,35 @@
+                         G.M_flag = TRUE;
+                     break;
+ #endif
++#ifdef UNIX
++    			case ('O'):
++                    if (negative) {
++                        Info(slide, 0x401, ((char *)slide,
++                          "error:  encodings can't be negated"));
++                        return(PK_PARAM);
++    				} else {
++    					if(*s) { /* Handle the -Ocharset case */
++    						/* Assume that charsets can't start with a dash to spot arguments misuse */
++    						if(*s == '-') { 
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -I argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						strncpy(OEM_CP, s, sizeof(OEM_CP));
++    					} else { /* -O charset */
++    						++argv;
++    						if(!(--argc > 0 && *argv != NULL && **argv != '-')) {
++    	                        Info(slide, 0x401, ((char *)slide,
++        		                  "error:  a valid character encoding should follow the -O argument"));
++    	                        return(PK_PARAM); 
++    						}
++    						s = *argv;
++    						strncpy(OEM_CP, s, sizeof(OEM_CP));
++    					}
++    					while(*(++s)); /* No params straight after charset name */
++    				}
++    				break;
++#endif /* ?UNIX */
+                 case 's':      /* default:  shorter "ls -l" type listing */
+                     if (negative)
+                         uO.lflag = -2, negative = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 9683abb..f437c5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,6 +17,7 @@
 17-restore-unix-timestamps-accurately.patch
 18-cve-2014-9913-unzip-buffer-overflow.patch
 19-cve-2016-9844-zipinfo-buffer-overflow.patch
+20-unzip60-alt-iconv-utf8.patch
 20-cve-2018-1000035-unzip-buffer-overflow.patch
 21-fix-warning-messages-on-big-files.patch
 22-cve-2019-13232-fix-bug-in-undefer-input.patch