Date: Saturday, February 27, 2010 @ 10:46:11 Author: thayer Revision: 70615
upgpkg: unzip 6.0-5 removed utf8 patch, updated PKGBUILD Modified: unzip/trunk/PKGBUILD Deleted: unzip/trunk/unzip60-alt-iconv-utf8.patch ------------------------------+ PKGBUILD | 32 +-- unzip60-alt-iconv-utf8.patch | 374 ----------------------------------------- 2 files changed, 15 insertions(+), 391 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2010-02-27 15:30:00 UTC (rev 70614) +++ PKGBUILD 2010-02-27 15:46:11 UTC (rev 70615) @@ -1,42 +1,40 @@ # $Id$ -# Maintainer: Douglas Soares de Andrade <doug...@archlinux.org> +# Maintainer: Thayer Williams <tha...@archlinux.org> +# Contributor: Douglas Soares de Andrade <doug...@archlinux.org> # Contributor: Robson Peixoto pkgname=unzip pkgver=6.0 -pkgrel=4 +pkgrel=5 pkgdesc="Unpacks .zip archives such as those made by PKZIP" arch=('i686' 'x86_64') url="http://www.info-zip.org/" license=('custom') depends=('bzip2' 'bash') -source=(http://downloads.sourceforge.net/infozip/unzip60.tar.gz - unzip60-alt-iconv-utf8.patch) -md5sums=('62b490407489521db863b523a7f86375' - '4dcfb2084e9db5a3f411f470d92ab2a4') +source=('http://downloads.sourceforge.net/infozip/unzip60.tar.gz') +md5sums=('62b490407489521db863b523a7f86375') build() { cd ${srcdir}/${pkgname}${pkgver/./} - patch -Np1 -i ${srcdir}/unzip60-alt-iconv-utf8.patch - # From Debian + # set CFLAGS -- from Debian export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -DACORN_FTYPE_NFS \ -DWILD_STOP_AT_DIR -DLARGE_FILE_SUPPORT -DUNICODE_SUPPORT \ -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE -DNO_LCHMOD -DDATE_FORMAT=DF_YMD \ -DUSE_BZIP2 -DNATIVE" - # From Debian + # make -- from Debian make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \ - D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips + D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips || return 1 - make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" \ - install + # install -- from Debian + make -f unix/Makefile prefix=${pkgdir}/usr INSTALL_PROGRAM="install" install || return 1 - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE + # install the license file + install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/unzip/LICENSE || return 1 - # Fixing manpages - cd ${pkgdir}/usr - mkdir share - mv man share + # fix manpage location + mkdir -p ${pkgdir}/usr/share || return 1 + mv ${pkgdir}/usr/man ${pkgdir}/usr/share/ || return 1 } Deleted: unzip60-alt-iconv-utf8.patch =================================================================== --- unzip60-alt-iconv-utf8.patch 2010-02-27 15:30:00 UTC (rev 70614) +++ unzip60-alt-iconv-utf8.patch 2010-02-27 15:46:11 UTC (rev 70615) @@ -1,374 +0,0 @@ -diff -r e812cb68e51d unix/unix.c ---- a/unix/unix.c Tue Jun 23 23:08:25 2009 -0500 -+++ b/unix/unix.c Thu Jun 25 00:10:29 2009 -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,90 @@ - } - } - #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; -+ dlen = buflen = 2*slen; -+ d = buf = malloc(buflen + 1); -+ if(!d) -+ goto cleanup; -+ bzero(buf,buflen); -+ 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); -+} -diff -r e812cb68e51d unix/unxcfg.h ---- a/unix/unxcfg.h Tue Jun 23 23:08:25 2009 -0500 -+++ b/unix/unxcfg.h Thu Jun 25 00:10:29 2009 -0500 -@@ -227,4 +227,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 */ -diff -r e812cb68e51d unzip.c ---- a/unzip.c Tue Jun 23 23:08:25 2009 -0500 -+++ b/unzip.c Thu Jun 25 00:10:29 2009 -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"; -@@ -665,6 +675,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\ -@@ -803,6 +824,10 @@ - #endif /* UNICODE_SUPPORT */ - - -+#ifdef UNIX -+ init_conversion_charsets(); -+#endif -+ - #if (defined(__IBMC__) && defined(__DEBUG_ALLOC__)) - extern void DebugMalloc(void); - -@@ -1336,6 +1361,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 */ -@@ -1517,6 +1547,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; -@@ -1592,6 +1651,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; -diff -r e812cb68e51d unzpriv.h ---- a/unzpriv.h Tue Jun 23 23:08:25 2009 -0500 -+++ b/unzpriv.h Thu Jun 25 00:10:29 2009 -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)); \ -diff -r e812cb68e51d zipinfo.c ---- a/zipinfo.c Tue Jun 23 23:08:25 2009 -0500 -+++ b/zipinfo.c Thu Jun 25 00:10:29 2009 -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;