Merge lp:~nobuto/ubuntu/vivid/unzip/fallback-encoding into lp:ubuntu/vivid/unzip

[Nobuto Murata]

This branch adds default charsets handling for Windows archives in CJKV+th locale, inspired by Ubuntu Kylin way.

As a result of bug #580961, two options have been added as Ubuntu patch.
> -O CHARSET specify a character encoding for DOS, Windows and OS/2 archives
> -I CHARSET specify a character encoding for UNIX and other archives

Then Ubuntu Kylin added default encoding as environment variables for their distribution.
http://bazaar.launchpad.net/~ubuntukylin-members/ubuntukylin-default-settings/trunk/revision/171

Now as Ubuntu, we can go further by a better way:
 - per user settings by their locales instead of global settings
 - don't interfere in other locales by locale guard

I only add "-O", so no behavior change for zip files created on Ubuntu or other Linux/UNIX systems. This branch just handles zip file created on localized Windows system seamlessly.

charsets list is taken from:
https://msdn.microsoft.com/en-us/goglobal/bb964654
and
msdos/msdos.c in unzip package:
   1682 case 932: /* Japanese */
   1683 case 949: /* Korean */
   1684 case 936: /* Chinese, simple */
   1685 case 950: /* Chinese, traditional */
   1686 case 874: /* Thai */
   1687 case 1258: /* Vietnamese */

[lp:~nobuto/ubuntu/vivid/unzip/fallback-encoding]

31. By Nobuto Murata on 2015-02-13

name path properly

[Jun Kobayashi (jkbys)]

Works fine for me to extract zip file including files named with CP932.

[Aron Xu (happyaron)]

review: Approve

[Sebastien Bacher (seb128)]

thanks, is there any reason that couldn't be forward to Debian? It would also be nice to have a bug report explaining the issue/what the change resolve and having the changelog refer to the said bug

review: Needs Information

[lp:~nobuto/ubuntu/vivid/unzip/fallback-encoding]

32. By Nobuto Murata on 2015-02-16

update changelog to refer lp bug number

[Nobuto Murata (nobuto)]

@Sebastian,

> thanks, is there any reason that couldn't be forward to Debian?

This branch depends on an Ubuntu delta patch[1]. Debian also discussed about it on [2], but it seems stuck for a while.

[1] http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/vivid/unzip/vivid/view/head:/debian/patches/20-unzip60-alt-iconv-utf8

[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483290

> It would also be nice to have a bug report explaining the issue/what the change resolve and having the changelog refer to the said bug

opened and updated the changelog accordingly.

Thanks,

[lp:~nobuto/ubuntu/vivid/unzip/fallback-encoding]

33. By Nobuto Murata on 2015-02-27

rebase

[Mathieu Trudel-Lapierre (cyphermox)]

What will be the effect on decompressing files that were created on non-localized Windows systems for the locales affected by this change?

Otherwise the change looks fine to me.

review: Needs Information

[lp:~nobuto/ubuntu/vivid/unzip/fallback-encoding]

34. By Nobuto Murata on 2015-05-28

rebase

35. By Nobuto Murata on 2015-05-29

add autopkgtest to make sure all of 3 types of zip files can be
extracted properly

Unmerged revisions

35. By Nobuto Murata on 2015-05-29

add autopkgtest to make sure all of 3 types of zip files can be
extracted properly

34. By Nobuto Murata on 2015-05-28

rebase

33. By Nobuto Murata on 2015-02-27

rebase

32. By Nobuto Murata on 2015-02-16

update changelog to refer lp bug number

31. By Nobuto Murata on 2015-02-13

name path properly

30. By Nobuto Murata on 2015-02-13

tweak variables' name

29. By Nobuto Murata on 2015-02-08

add default -O option to handle Windows' encoding for CJKV + th
locale, inspired by Ubuntu Kylin way

=== modified file 'debian/changelog'
--- debian/changelog	2015-02-17 14:22:58 +0000
+++ debian/changelog	2015-02-27 16:10:30 +0000
@@ -1,3 +1,10 @@
+unzip (6.0-13ubuntu4) UNRELEASED; urgency=medium
+
+  * add default charsets for Windows archives in CJKV+th locale, 
+    inspired by Ubuntu Kylin way, LP: #1422290
+
+ -- Nobuto MURATA <[e-mail]>  Mon, 09 Feb 2015 00:18:46 +0900
+
 unzip (6.0-13ubuntu3) vivid; urgency=medium
 
   * SECURITY UPDATE: heap overflow in charset_to_intern()

=== added file 'debian/profile.unzip-default-charset.sh'
--- debian/profile.unzip-default-charset.sh	1970-01-01 00:00:00 +0000
+++ debian/profile.unzip-default-charset.sh	2015-02-27 16:10:30 +0000
@@ -0,0 +1,32 @@
+locale=${LC_ALL:-$LC_CTYPE}
+locale=${locale:-$LANG}
+locale=${locale%%.*}
+
+case "$locale" in
+    ja_JP)
+        charset=CP932
+    ;;
+    ko_KR)
+        charset=CP949
+    ;;
+    th_TH)
+        charset=CP874
+    ;;
+    vi_VN)
+        charset=CP1258
+    ;;
+    zh_CN)
+        charset=CP936
+    ;;
+    zh_TW)
+        charset=CP950
+    ;;
+    *)
+        charset=
+    ;;
+esac
+
+if [ -n "$charset" ]; then
+    export UNZIP="-O $charset"
+    export ZIPINFO="-O $charset"
+fi

=== modified file 'debian/rules'
--- debian/rules	2014-06-05 10:03:44 +0000
+++ debian/rules	2015-02-27 16:10:30 +0000
@@ -50,6 +50,9 @@
 	$(MAKE) -f unix/Makefile install prefix=`pwd`/debian/tmp/usr
 	install -m 755 debian/postinst debian/postrm debian/tmp/DEBIAN
 	install -m 644 debian/mime debian/tmp/usr/lib/mime/packages/$(package)
+	install -d debian/tmp/etc/profile.d
+	install -m 644 debian/profile.unzip-default-charset.sh \
+		debian/tmp/etc/profile.d/unzip-default-charset.sh
 	cat debian/copyright.in LICENSE > $(docdir)/copyright
 	cp debian/changelog $(docdir)/changelog.Debian
 	cp -p History.* BUGS ToDo $(docdir)