[arch-commits] Commit in unzip/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Giovanni Scafora]

    Date: Wednesday, June 10, 2009 @ 16:22:19
  Author: giovanni
Revision: 42089

Merged revisions 356,42080,42084 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/unzip/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (ven, 18 apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r42080 | douglas | 2009-06-10 03:02:19 -0700 (mer, 10 giu 2009) | 2 lines
  
  upgpkg: unzip 6.0-1
      Updated and fixed the large files support bug
........
  r42084 | douglas | 2009-06-10 04:00:13 -0700 (mer, 10 giu 2009) | 2 lines
  
  upgpkg: unzip 6.0-2
      Fixed manpages and deps, thanks JGC
........

Modified:
  unzip/repos/extra-x86_64/	(properties)
  unzip/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)


Property changes on: unzip/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /unzip/trunk:1
   + /unzip/trunk:1-42088

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-06-10 20:10:30 UTC (rev 42088)
+++ extra-x86_64/PKGBUILD	2009-06-10 20:22:19 UTC (rev 42089)
@@ -1,41 +1,41 @@
 # $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
+# Maintainer: Douglas Soares de Andrade <douglas at archlinux.org>
+# Contributor: Robson Peixoto
 
 pkgname=unzip
-pkgver=5.52
-pkgrel=4
+pkgver=6.0
+pkgrel=2
 pkgdesc="Unpacks .zip archives such as those made by PKZIP"
 arch=('i686' 'x86_64')
 url="http://www.info-zip.org/"
 license=('custom')
-depends=('glibc')
-source=(http://downloads.sourceforge.net/infozip/unzip552.tar.gz
-        unzip-5.5.2-CVE-2008-0888.patch
-        unzip-5.50-alt-iconv-v1.2-utf8.patch
-        unzip542-size-64bit.patch)
-md5sums=('9d23919999d6eac9217d1f41472034a9'
-         '2de357c2ba84576f38b17aed87915c87'
-         'a4797a1f6e45385f5e021f9f6f2ec0fa'
-         '83c7e79de9618bf7d081dd639dd3dde1')
+depends=('bzip2' 'bash')
+source=(http://downloads.sourceforge.net/infozip/unzip60.tar.gz)
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd $startdir/src/$pkgname${pkgver/./}
 
-  # http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0888
-  patch -Np0 -i ../unzip-5.5.2-CVE-2008-0888.patch || return 1
+  # 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"
 
-  # FS#8383
-  patch -Np1 -i ../unzip-5.50-alt-iconv-v1.2-utf8.patch || return 1
+  # From Debian
+  make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr LF2="" \
+  D_USE_BZ2=-DUSE_BZIP2 L_BZ2=-lbz2 unzips
 
-  [ "$CARCH" == "x86_64" ] && (patch -Np0 -i ../unzip542-size-64bit.patch || return 1)
-  
-  export CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64"
-  if [ "${CARCH}" = "i686" ]; then
-    make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr linux || return 1
-  else
-    make -f unix/Makefile LOCAL_UNZIP="$CFLAGS" prefix=/usr linux_noasm || return 1
-  fi
-  make -f unix/Makefile prefix=$startdir/pkg/usr install
+  make -f unix/Makefile prefix=$startdir/pkg/usr INSTALL_PROGRAM="install" \
+  install
 
   install -Dm644 LICENSE $startdir/pkg/usr/share/licenses/unzip/LICENSE
+
+  # Fixing manpages
+  cd $pkgdir/usr
+  mkdir share
+  mv man share  
+
+ 
 }
+
+md5sums=('62b490407489521db863b523a7f86375')