diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
| commit | 33fcf0e7b95e530b849e59e90fdea4001e01283d (patch) | |
| tree | 5eab4f238207cce42c8351067ade9999df065a1f /core/libarchive | |
| parent | 3b0910bf6527c3b761d9579b2ed37a9a42595fa3 (diff) | |
| parent | a1922d0ec660fdc1892f2783515f781c090df0a9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnash/PKGBUILD
community/libopenraw/PKGBUILD
community/smalltalk/PKGBUILD
core/coreutils/PKGBUILD
core/libarchive/PKGBUILD
extra/dhcp/PKGBUILD
extra/gmime/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libreoffice/PKGBUILD
extra/lirc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sdl_image/PKGBUILD
extra/sdl_net/PKGBUILD
extra/sdl_ttf/PKGBUILD
extra/spamassassin/PKGBUILD
extra/tftp-hpa/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/tumbler/PKGBUILD
extra/vim/PKGBUILD
extra/wipe/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kde-np.pam
kde-unstable/kdebase-workspace/kde.pam
multilib/binutils-multilib/PKGBUILD
multilib/chuck/PKGBUILD
multilib/dev86/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/lib32-glibc.conf
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sdl_ttf/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/nspluginwrapper/PKGBUILD
multilib/q4wine/PKGBUILD
multilib/wine/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
Diffstat (limited to 'core/libarchive')
| -rw-r--r-- | core/libarchive/PKGBUILD | 21 | ||||
| -rw-r--r-- | core/libarchive/sparse-file.patch | 13 |
2 files changed, 23 insertions, 11 deletions
diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index 00ea96ae3..dfae5e946 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,33 +1,32 @@ -# $Id: PKGBUILD 140981 2011-10-20 13:56:51Z dan $ +# $Id: PKGBUILD 146703 2012-01-16 19:48:41Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=libarchive -pkgver=2.8.5 -pkgrel=2.1 +pkgver=3.0.3 +pkgrel=2 pkgdesc="library that can create and read several streaming archive formats" arch=('i686' 'x86_64' 'mips64el') url="http://libarchive.googlecode.com/" license=('BSD') depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat') -source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" - release-2.8-fixes.patch) -md5sums=('9caf51dcf6213e9c9f5a1c27448b9c90' - '14dbbf2d31d68d8eedb93ec5531f3b0c') -sha256sums=('13993e0ffbd121ccda46ea226b1f8eac218de0fa8da7d8b1f998093d5c32a72d' - 'fcadc5ac3020a9fab5922d343baca28f067cc051e9b6f59e480349ba5b0a5060') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz") +md5sums=('ca4090f0099432a9ac5a8b6618dc3892') +sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' build() { cd "$srcdir/$pkgname-$pkgver" - patch -Np0 < ../release-2.8-fixes.patch + ./configure --prefix=/usr --without-xml2 make } check() { cd "$srcdir/$pkgname-$pkgver" - make check + + # currently fails on i686 in a minor test involving atime updates (#60) + make check || : } package() { diff --git a/core/libarchive/sparse-file.patch b/core/libarchive/sparse-file.patch new file mode 100644 index 000000000..e7d3e473b --- /dev/null +++ b/core/libarchive/sparse-file.patch @@ -0,0 +1,13 @@ +Index: libarchive/archive_write_set_format_pax.c +=================================================================== +--- libarchive/archive_write_set_format_pax.c (revision 4094) ++++ libarchive/archive_write_set_format_pax.c (working copy) +@@ -1647,7 +1647,7 @@ + return (total); + + p = ((const unsigned char *)buff) + total; +- ws = s; ++ ws = s - total; + if (ws > pax->sparse_list->remaining) + ws = pax->sparse_list->remaining; + |