Browse Source

unzip:
- update to 6.0
- replace nls patch

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8468 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 11 years ago
parent
commit
5f2044ec16
1 changed files with 50 additions and 38 deletions
  1. 50 38
      u/unzip/unzip-vl.spec

+ 50 - 38
u/unzip/unzip-vl.spec

@@ -1,35 +1,47 @@
-%define src_ver 5.52
-%define src_file unzip552
+%define src_file unzip60
 
 Summary: A utility for unpacking zip files.
 Summary(ja): zip ファイルを展開するユーティリティ
 Name: unzip
-Version: %{src_ver}
-Release: 3%{?_dist_release}
+Version: 6.0
+Release: 1%{?_dist_release}
 License: BSD
 Group: Applications/Archiving
-Source: ftp://ftp.info-zip.org/pub/infozip/src/%{src_file}.tar.gz
-Patch0: unzip542-rpmoptflags.patch
+URL: http://www.info-zip.org/UnZip.html
+
+Source: http://downloads.sourceforge.net/infozip/%{src_file}.tar.gz
+
+# Not sent to upstream.
+Patch1: unzip-6.0-bzip2-configure.patch
+# Upstream plans to do this in zip (hopefully also in unzip).
+Patch2: unzip-6.0-exec-shield.patch
+# Upstream plans to do similar thing.
+Patch3: unzip-6.0-close.patch
+# Details in rhbz#532380.
+# Reported to upstream: http://www.info-zip.org/board/board.pl?m-1259575993/
+Patch4: unzip-6.0-attribs-overflow.patch
+# Not sent to upstream, as it's Fedora/RHEL specific.
+# Modify the configure script not to request the strip of binaries.
+Patch5: unzip-6.0-nostrip.patch
+Patch6: unzip-6.0-manpage-fix.patch
+# Update match.c with recmatch() from zip 3.0's util.c
+# This also resolves the license issue in that old function.
+# Original came from here: https://projects.parabolagnulinux.org/abslibre.git/plain/libre/unzip-libre/match.patch
+Patch7: unzip-6.0-fix-recmatch.patch
+# Update process.c
+Patch8: unzip-6.0-symlink.patch
+
+# japanese charset support
+# https://gist.github.com/hamano/573753
+Patch200: unzip-6.0-japanese_charset.patch
+# jus ignore -E option, older nls patch use this.
+Patch201: unzip-6.0-ignore-E-option.patch
 
-Patch1: unzip-5.52-near-4GB.patch
-Patch2: unzip-5.52-near-4GB2.patch
-# Patch3: unzip-5.51-near-4GB3.patch
-Patch10: unzip-5.51-link-segv.patch
-Patch11: unzip-5.51-link-segv2.patch
-# Patch12: unzip-5.51-link-segv3.patch
-Patch13: unzip-5.52-open.patch
-
-Patch100: unzip-5.52_CVE-2005-4667.patch
-Patch110: unzip-5.52-deb-CVE-2008-0888.patch
-
-# http://www.coara.or.jp/~sudakyo/dasworksrpms.html#unzip 
-Patch200: unzip-5.52-nls.patch
-
-URL: http://www.info-zip.org/pub/infozip/UnZip.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: daisuke
 
 %description
 The unzip utility is used to list, test, or extract files from a zip
@@ -54,27 +66,23 @@ zip と unzip は PKWARE(R) の MS-DOS 用 PKZIP で作成された zip アー
 
 
 %prep
-%setup -q 
-%patch0 -p1 -b .rpmo
-%patch1 -p1 -b .4GB
-%patch2 -p1 -b .4GB2
-# %patch3 -p1 -b .4GB3
-
-%patch10 -p1 -b .link-segv
-%patch11 -p1 -b .morn
-# %patch12 -p1 -b .morn2
-%patch13 -p1 -b .open
-
-%patch100 -p1 -b .CVE-2005-4667
-%patch110 -p0 -b .CVE-2008-0888
-
-%patch200 -p1 -b .nls
+%setup -q -n %{src_file}
+%patch1 -p1 -b .bzip2-configure
+%patch2 -p1 -b .exec-shield
+%patch3 -p1 -b .close
+%patch4 -p1 -b .attribs-overflow
+%patch5 -p1 -b .nostrip
+%patch6 -p1 -b .manpage-fix
+%patch7 -p1 -b .recmatch
+%patch8 -p1 -b .symlink
+
+%patch200 -p1 -b .jp
+%patch201 -p1 -b .ignore-E
 
 ln -s unix/Makefile Makefile
 
 %build
-make LOCAL_UNZIP="-DNLS" CFLAGS="-D_LARGEFILE64_SOURCE" linux_noasm LF2=""
-
+make LOCAL_UNZIP="-D_FILE_OFFSET_BITS=64 -DNO_LCHMOD -D_MBCS -DNO_WORKING_ISPRINT" linux_noasm
 
 %install
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -94,6 +102,10 @@ make prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 ins
 
 
 %changelog
+* Thu May 22 2014 Daisuke SUZUKI <daisuke@vinelinux.org> 6.0-1
+- update to 6.0
+- replace nls patch.
+
 * Tue Apr  5 2011 IWAI, Masaharu <iwai@alib.jp> 5.52-3vl6
 - build on current VineSeed