diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-02-01 01:35:33 -0600 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2012-02-01 01:35:33 -0600 |
commit | e80fbd1a17f3b41bc13792e5f43eccac19522411 (patch) | |
tree | 53f9095277053aed2a04eaa9e819df3819e88eef /core | |
parent | 1d455d585a64ba0c90b71e98bd3030af57b29e0e (diff) | |
parent | 5330206481631dda2c1e585b758c58f90ab807ee (diff) |
Merge branch 'master' of gitpar:abslibre-mips64el
Diffstat (limited to 'core')
-rw-r--r-- | core/curl/PKGBUILD | 20 | ||||
-rw-r--r-- | core/e2fsprogs/PKGBUILD | 9 | ||||
-rw-r--r-- | core/gcc/PKGBUILD | 24 | ||||
-rw-r--r-- | core/glibc/PKGBUILD | 58 | ||||
-rw-r--r-- | core/glibc/glibc-2.15-regex.patch | 16 | ||||
-rw-r--r-- | core/glibc/glibc-2.15-strcmp-disable-avx.patch | 48 | ||||
-rw-r--r-- | core/gmp/PKGBUILD | 14 | ||||
-rw-r--r-- | core/libarchive/PKGBUILD | 26 | ||||
-rw-r--r-- | core/libarchive/interpret-non-posix-zips.patch | 165 | ||||
-rw-r--r-- | core/libarchive/test-with-zip-mtime.patch | 23 | ||||
-rw-r--r-- | core/linux-api-headers/PKGBUILD | 2 | ||||
-rw-r--r-- | core/nilfs-utils/PKGBUILD | 11 | ||||
-rw-r--r-- | core/openssl/gnu-linux-mips64el-gcc.patch | 10 | ||||
-rw-r--r-- | core/pam/PKGBUILD | 2 | ||||
-rw-r--r-- | core/sqlite3/PKGBUILD | 3 | ||||
-rw-r--r-- | core/udev/PKGBUILD | 7 | ||||
-rw-r--r-- | core/util-linux/PKGBUILD | 3 | ||||
-rw-r--r-- | core/wireless_tools/PKGBUILD | 30 |
18 files changed, 388 insertions, 83 deletions
diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index eb142196f..f8653faad 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 143109 2011-11-23 02:58:17Z dreisner $ +# $Id: PKGBUILD 147269 2012-01-25 13:57:06Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,20 +6,19 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.23.1 -pkgrel=2 +pkgver=7.24.0 +pkgrel=1 pkgdesc="An URL retrival utility and library" arch=('i686' 'x86_64' 'mips64el') url="http://curl.haxx.se" license=('MIT') depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') -makedepends=('perl-libwww') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} fix-J-with-O-regression.patch curlbuild.h) -md5sums=('8e23151f569fb54afef093ac0695077d' - '5d8eb7e2e38be0fb00a043f714f6d49f' +md5sums=('b93420f80a2baaa61a0f45214eddc2ba' + '710242df6bc318d16eea611e7d1b1410' 'aa4539ec4f4a2dad1663dc22dd3ab0a1' '751bd433ede935c8fae727377625a8ae') @@ -33,11 +32,7 @@ case $ptrsize in esac build() { - cd "$srcdir/$pkgname-$pkgver" - - # upstream bugfix - # http://curl.haxx.se/mail/archive-2011-11/0030.html - patch -Np1 < "$srcdir/fix-J-with-O-regression.patch" + cd "$pkgname-$pkgver" ./configure \ --prefix=/usr \ @@ -52,11 +47,12 @@ build() { --without-libidn \ --with-random=/dev/urandom \ --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt + make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD index 3f7526340..b3ddd142b 100644 --- a/core/e2fsprogs/PKGBUILD +++ b/core/e2fsprogs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 142380 2011-11-08 22:04:59Z ronald $ +# $Id: PKGBUILD 147737 2012-01-27 16:09:24Z dan $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=e2fsprogs -pkgver=1.41.14 -pkgrel=2.1 +pkgver=1.42 +pkgrel=1 pkgdesc="Ext2/3/4 filesystem utilities" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL' 'MIT') @@ -16,9 +16,8 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'MIT-LICENSE') backup=('etc/mke2fs.conf') install=${pkgname}.install -sha1sums=('24f9364fa3d4c0d7d00cb627b819d0e51055d6c5' +sha1sums=('e69bc63bc319e4d1e4242cc278bfd442a60646e6' 'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb') - build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index 748052b09..32a53b565 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145915 2012-01-04 01:24:59Z allan $ +# $Id: PKGBUILD 147558 2012-01-25 22:42:47Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -10,8 +10,8 @@ else pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc') fi pkgver=4.6.2 -pkgrel=5 -_snapshot=4.6-20111223 +pkgrel=6 +_snapshot=4.6-20120120 _libstdcppmanver=20111215 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64' 'mips64el') @@ -30,6 +30,11 @@ source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 gcc_pure64.patch gcc_mips64el_lib.patch gcc-hash-style-both.patch) +md5sums=('f7ca5d9f7a07216577f81318b7cf56ef' + '450772ce32daed97d7383199f8797f33' + '4030ee1c08dd1e843c0225b772360e76' + '67e337993d821d72fccacbed52d48c34' + '4df25b623799b148a0703eaeec8fdf3f') if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -73,11 +78,12 @@ build() { --enable-shared --enable-threads=posix \ --with-system-zlib --enable-__cxa_atexit \ --disable-libunwind-exceptions --enable-clocale=gnu \ + --disable-libstdcxx-pch --enable-libstdcxx-time \ --enable-gnu-unique-object --enable-linker-build-id \ --with-ppl --enable-cloog-backend=isl \ --enable-lto --enable-gold --enable-ld=default \ --enable-plugin --with-plugin-ld=ld.gold \ - --disable-multilib --disable-libssp --disable-libstdcxx-pch \ + --disable-multilib --disable-libssp \ --enable-checking=release make } @@ -158,6 +164,11 @@ package_gcc() install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/ + # plugin headers are all over the place at the moment... + for i in common objc pragma pretty-print; do + ln -sf ../c-$i.h $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/plugin/include/c-family/c-$i.h + done + # POSIX conformance launcher scripts for c89 and c99 cat > $pkgdir/usr/bin/c89 <<"EOF" #!/bin/sh @@ -266,8 +277,3 @@ package_gcc-go() install -Dm644 ${_basedir}/COPYING.RUNTIME \ ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION } -md5sums=('4755b9f6ac0abecbaa2097ed9738406a' - '450772ce32daed97d7383199f8797f33' - '4030ee1c08dd1e843c0225b772360e76' - '67e337993d821d72fccacbed52d48c34' - '4df25b623799b148a0703eaeec8fdf3f') diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 730633e9c..730c7f46c 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145917 2012-01-04 01:25:10Z allan $ +# $Id: PKGBUILD 147715 2012-01-27 11:00:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,8 +6,10 @@ pkgname=glibc pkgver=2.15 -pkgrel=3 +pkgrel=4 _glibcdate=20111227 +_glibcportsver=2.15 +_glibcportsdate=20120127 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -20,7 +22,7 @@ backup=(etc/gai.conf etc/nscd.conf) options=('!strip') install=glibc.install -source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz +source=(http://mirrors.kernel.org/archlinux/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz http://repo.parabolagnulinux.org/other/glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz glibc-2.10-dont-build-timezone.patch glibc-2.10-bz4781.patch @@ -30,13 +32,15 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.14-revert-4768ae77.patch glibc-2.14-reexport-rpc-interface.patch glibc-2.14-reinstall-nis-rpc-headers.patch + glibc-2.15-regex.patch glibc-2.15-lddebug-scopes.patch glibc-2.15-revert-c5a0802a.patch - glibc-2.15-math64crash.patch + glibc-2.15-strcmp-disable-avx.patch nscd locale.gen.txt locale-gen) md5sums=('6ffdf5832192b92f98bdd125317c0dfc' + '935995663b89924a98d20a636045949a' '4dadb9203b69a3210d53514bb46f41c3' '0c5540efc51c0b93996c51b57a8540ae' '40cd342e21f71f5e49e32622b25acc52' @@ -45,29 +49,30 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc' '7da8c554a3b591c7401d7023b1928afc' 'c5de2a946215d647c8af5432ec4b0da0' '55febbb72139ac7b65757df085024b83' + 'b3526cbd5e29773560dba725db99af5a' '3c219ddfb619b6df903cac4cc42c611d' '7ae3e426251ae33e73dbad71f9c91378' - 'dc7550e659ddd685bd78a930d15a01f2' + '7a44dd821835e4984aa75ad44fad3baf' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') mksource() { - git clone git://sourceware.org/git/glibc.git + git clone http://sourceware.org/git/glibc.git pushd glibc #git checkout -b glibc-2.15-arch origin/release/2.15/master - git checkout -b glibc-2.15-arch origin/master + git checkout -b glibc-${pkgver}-arch origin/master popd tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/* mksource-ports } mksource-ports() { - git clone git://sourceware.org/git/glibc-ports.git + git clone http://sourceware.org/git/glibc-ports.git pushd glibc-ports - git checkout -b glibc-2.14-arch origin/release/2.14/master + git checkout -b glibc-${_glibcportsver}-arch origin/release/${_glibcportsver}/master popd - tar -cvJf glibc-ports-${pkgver}_${_glibcdate}.tar.xz glibc-ports/* + tar -cvJf glibc-ports-${_glibcportsver}_${_glibcportsdate}.tar.xz glibc-ports/* } build() { @@ -104,6 +109,10 @@ build() { # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch + # Fix up regcomp/regexec + # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745 + patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch + # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223 # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...) patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch @@ -112,12 +121,19 @@ build() { # https://bugzilla.redhat.com/show_bug.cgi?id=769421 patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch - # revert optimized math routines that can cause crashes (FS#27736, FS#27743) - # obviously not a real fix... - patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch + # Disable AVX in strcmp as this breaks Xen + # http://sourceware.org/bugzilla/show_bug.cgi?id=13583 + patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch + + # "revert" optimized math routines that can cause crashes (FS#27736, FS#27743) + # http://sourceware.org/bugzilla/show_bug.cgi?id=13618 + rm sysdeps/x86_64/fpu/multiarch/* ln -s ../glibc-ports ports + # Fix typo making util-linux build fail. + sed -i "s/_MIPS_SIM_ABIN32/_MIPS_SIM_NABI32/" ports/sysdeps/unix/sysv/linux/mips/Makefile + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -226,3 +242,19 @@ package() { lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } +md5sums=('6ffdf5832192b92f98bdd125317c0dfc' + 'a006504b83553d0b554cf8badff005b6' + '4dadb9203b69a3210d53514bb46f41c3' + '0c5540efc51c0b93996c51b57a8540ae' + '40cd342e21f71f5e49e32622b25acc52' + 'b042647ea7d6f22ad319e12e796bd13e' + '6970bcfeb3bf88913436d5112d16f588' + '7da8c554a3b591c7401d7023b1928afc' + 'c5de2a946215d647c8af5432ec4b0da0' + '55febbb72139ac7b65757df085024b83' + '3c219ddfb619b6df903cac4cc42c611d' + '7ae3e426251ae33e73dbad71f9c91378' + 'dc7550e659ddd685bd78a930d15a01f2' + 'b587ee3a70c9b3713099295609afde49' + '07ac979b6ab5eeb778d55f041529d623' + '476e9113489f93b348b21e144b6a8fcf') diff --git a/core/glibc/glibc-2.15-regex.patch b/core/glibc/glibc-2.15-regex.patch new file mode 100644 index 000000000..6385f2c08 --- /dev/null +++ b/core/glibc/glibc-2.15-regex.patch @@ -0,0 +1,16 @@ +diff --git a/posix/regex_internal.c b/posix/regex_internal.c +index bc19243..124f8cc 100644 +--- a/posix/regex_internal.c ++++ b/posix/regex_internal.c +@@ -868,7 +868,7 @@ re_string_peek_byte_case (const re_string_t *pstr, int idx) + } + + static unsigned char +-internal_function __attribute ((pure)) ++internal_function + re_string_fetch_byte_case (re_string_t *pstr) + { + if (BE (!pstr->mbs_allocated, 1)) +-- +1.7.3.4 + diff --git a/core/glibc/glibc-2.15-strcmp-disable-avx.patch b/core/glibc/glibc-2.15-strcmp-disable-avx.patch new file mode 100644 index 000000000..7f1f5b8f2 --- /dev/null +++ b/core/glibc/glibc-2.15-strcmp-disable-avx.patch @@ -0,0 +1,48 @@ +diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S +index f93c83d..d8aa889 100644 +--- a/sysdeps/x86_64/multiarch/strcmp.S ++++ b/sysdeps/x86_64/multiarch/strcmp.S +@@ -105,11 +105,6 @@ ENTRY(__strcasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strcasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strcasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -128,11 +123,6 @@ ENTRY(__strncasecmp) + jne 1f + call __init_cpu_features + 1: +-# ifdef HAVE_AVX_SUPPORT +- leaq __strncasecmp_avx(%rip), %rax +- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip) +- jnz 2f +-# endif + leaq __strncasecmp_sse42(%rip), %rax + testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip) + jnz 2f +@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp) + # include "strcmp-sse42.S" + + +-# ifdef HAVE_AVX_SUPPORT +-# if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L +-# define LABEL(l) .L##l##_avx +-# define GLABEL(l) l##_avx +-# define USE_AVX 1 +-# undef STRCMP_SSE42 +-# define STRCMP_SSE42 STRCMP_AVX +-# define SECTION avx +-# include "strcmp-sse42.S" +-# endif +-# endif +- +- + # undef ENTRY + # define ENTRY(name) \ + .type STRCMP_SSE2, @function; \ diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index e8a2c1367..12ccca6ee 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135906 2011-08-20 07:13:57Z allan $ +# $Id: PKGBUILD 148026 2012-01-30 02:43:10Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gmp -pkgver=5.0.2 -pkgrel=3 +pkgver=5.0.3 +pkgrel=1 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64' 'mips64el') url="http://gmplib.org/" @@ -12,14 +12,12 @@ depends=('gcc-libs' 'sh') license=('LGPL3') options=(!libtool) install=gmp.install -source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.bz2 - 538dfce27f41.patch) -md5sums=('0bbaedc82fb30315b06b1588b9077cd3' - 'a769be9c41618ca9c35d83375e7097d0') +source=(ftp://ftp.gnu.org/gnu/gmp/gmp-${pkgver}.tar.xz{,.sig}) +md5sums=('1e8edebe33bc3ac6de17df3201732825' + '9efbe14533ded9cd3ae4e998ee0efc98') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i $srcdir/538dfce27f41.patch [ "${CARCH}" = "i686" ] && export ABI="32" [ "${CARCH}" = "mips64el" ] && export ABI="n32" diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD index dfae5e946..a447951a5 100644 --- a/core/libarchive/PKGBUILD +++ b/core/libarchive/PKGBUILD @@ -1,16 +1,23 @@ -# $Id: PKGBUILD 146703 2012-01-16 19:48:41Z dreisner $ +# $Id: PKGBUILD 147657 2012-01-26 02:44:17Z dreisner $ # Maintainer: Dan McGee <dan@archlinux.org> + pkgname=libarchive pkgver=3.0.3 -pkgrel=2 +pkgrel=3 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") -md5sums=('ca4090f0099432a9ac5a8b6618dc3892') -sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7') +source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz" + 'interpret-non-posix-zips.patch' + 'test-with-zip-mtime.patch') +md5sums=('ca4090f0099432a9ac5a8b6618dc3892' + 'f02b88eb10877c7a7d527ed89c662e44' + '8366def6d7d70d424fa28a986c78c015') +sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7' + '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc' + 'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' @@ -18,6 +25,12 @@ PKGEXT='.pkg.tar.gz' build() { cd "$srcdir/$pkgname-$pkgver" + # http://code.google.com/p/libarchive/issues/detail?id=225 + patch -Np0 <"$srcdir/interpret-non-posix-zips.patch" + + # http://code.google.com/p/libarchive/issues/detail?id=231 + patch -Np0 <"$srcdir/test-with-zip-mtime.patch" + ./configure --prefix=/usr --without-xml2 make } @@ -25,8 +38,7 @@ build() { check() { cd "$srcdir/$pkgname-$pkgver" - # currently fails on i686 in a minor test involving atime updates (#60) - make check || : + make check } package() { diff --git a/core/libarchive/interpret-non-posix-zips.patch b/core/libarchive/interpret-non-posix-zips.patch new file mode 100644 index 000000000..63bc439d9 --- /dev/null +++ b/core/libarchive/interpret-non-posix-zips.patch @@ -0,0 +1,165 @@ +Index: libarchive/archive_read_support_format_zip.c +=================================================================== +--- libarchive/archive_read_support_format_zip.c (revision 4189) ++++ libarchive/archive_read_support_format_zip.c (revision 4190) +@@ -217,14 +217,13 @@ + } + + /* +- * TODO: This is a performance sink because it forces +- * the read core to drop buffered data from the start +- * of file, which will then have to be re-read again +- * if this bidder loses. ++ * TODO: This is a performance sink because it forces the read core to ++ * drop buffered data from the start of file, which will then have to ++ * be re-read again if this bidder loses. + * +- * Consider passing in the winning bid value to subsequent +- * bidders so that this bidder in particular can avoid +- * seeking if it knows it's going to lose anyway. ++ * We workaround this a little by passing in the best bid so far so ++ * that later bidders can do nothing if they know they'll never ++ * outbid. But we can certainly do better... + */ + static int + archive_read_format_zip_seekable_bid(struct archive_read *a, int best_bid) +@@ -311,19 +310,29 @@ + external_attributes = archive_le32dec(p + 38); + zip_entry->local_header_offset = archive_le32dec(p + 42); + ++ /* If we can't guess the mode, leave it zero here; ++ when we read the local file header we might get ++ more information. */ ++ zip_entry->mode = 0; + if (zip_entry->system == 3) { + zip_entry->mode = external_attributes >> 16; +- } else { +- zip_entry->mode = AE_IFREG | 0777; + } + +- /* Do we need to parse filename here? */ +- /* Or can we wait until we read the local header? */ ++ /* We don't read the filename until we get to the ++ local file header. Reading it here would speed up ++ table-of-contents operations (removing the need to ++ find and read local file header to get the ++ filename) at the cost of requiring a lot of extra ++ space. */ ++ /* We don't read the extra block here. We assume it ++ will be duplicated at the local file header. */ + __archive_read_consume(a, + 46 + filename_length + extra_length + comment_length); + } + +- /* TODO: Sort zip entries. */ ++ /* TODO: Sort zip entries by file offset so that we ++ can optimize get_next_header() to use skip instead of ++ seek. */ + + return ARCHIVE_OK; + } +@@ -434,6 +443,11 @@ + return (30); + } + ++ /* TODO: It's worth looking ahead a little bit for a valid ++ * PK signature. In particular, that would make it possible ++ * to read some UUEncoded SFX files or SFX files coming from ++ * a network socket. */ ++ + return (0); + } + +Index: libarchive/test/test_compat_zip_6.zip.uu +=================================================================== +--- libarchive/test/test_compat_zip_6.zip.uu (revision 0) ++++ libarchive/test/test_compat_zip_6.zip.uu (revision 4190) +@@ -0,0 +1,10 @@ ++begin 755 test_compat_zip_6.zip ++M4$L#!`H``````'@3-T`````````````````6````3F5W($9O;&1E<B].97<@ ++M1F]L9&5R+U!+`P0*``````!\$S=`%4-8OPL````+````*P```$YE=R!&;VQD ++M97(O3F5W($9O;&1E<B].97<@5&5X="!$;V-U;65N="YT>'1S;VUE('1E>'0- ++M"E!+`0(4"PH``````'@3-T`````````````````6````````````$``````` ++M``!.97<@1F]L9&5R+TYE=R!&;VQD97(O4$L!`A0+"@``````?!,W0!5#6+\+ ++M````"P```"L``````````0`@````-````$YE=R!&;VQD97(O3F5W($9O;&1E ++M<B].97<@5&5X="!$;V-U;65N="YT>'102P4&``````(``@"=````B``````` ++` ++end +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4189) ++++ libarchive/test/test_compat_zip.c (revision 4190) +@@ -348,6 +348,53 @@ + free(p); + } + ++/* ++ * Issue 225: Errors extracting MSDOS Zip archives with directories. ++ */ ++static void ++compat_zip_6_verify(struct archive *a) ++{ ++ struct archive_entry *ae; ++ ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); ++ assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); ++ assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); ++ assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ assertEqualInt(0, archive_entry_size(ae)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); ++ assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); ++ assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); ++ assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ assertEqualInt(11, archive_entry_size(ae)); ++ assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); ++} ++ ++static void ++test_compat_zip_6(void) ++{ ++ const char *refname = "test_compat_zip_6.zip"; ++ struct archive *a; ++ void *p; ++ size_t s; ++ ++ extract_reference_file(refname); ++ p = slurpfile(&s, refname); ++ ++ assert((a = archive_read_new()) != NULL); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory_seek(a, p, s, 7)); ++ compat_zip_6_verify(a); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); ++ ++ assert((a = archive_read_new()) != NULL); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_filter_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_support_format_all(a)); ++ assertEqualIntA(a, ARCHIVE_OK, read_open_memory(a, p, s, 7)); ++ compat_zip_6_verify(a); ++ assertEqualIntA(a, ARCHIVE_OK, archive_read_free(a)); ++} ++ + DEFINE_TEST(test_compat_zip) + { + test_compat_zip_1(); +@@ -355,6 +402,7 @@ + test_compat_zip_3(); + test_compat_zip_4(); + test_compat_zip_5(); ++ test_compat_zip_6(); + } + + +Index: Makefile.am +=================================================================== +--- Makefile.am (revision 4189) ++++ Makefile.am (revision 4190) +@@ -462,6 +462,7 @@ + libarchive/test/test_compat_zip_3.zip.uu \ + libarchive/test/test_compat_zip_4.zip.uu \ + libarchive/test/test_compat_zip_5.zip.uu \ ++ libarchive/test/test_compat_zip_6.zip.uu \ + libarchive/test/test_fuzz_1.iso.Z.uu \ + libarchive/test/test_fuzz.cab.uu \ + libarchive/test/test_fuzz.lzh.uu \ diff --git a/core/libarchive/test-with-zip-mtime.patch b/core/libarchive/test-with-zip-mtime.patch new file mode 100644 index 000000000..79e2f3c7e --- /dev/null +++ b/core/libarchive/test-with-zip-mtime.patch @@ -0,0 +1,23 @@ +Index: libarchive/test/test_compat_zip.c +=================================================================== +--- libarchive/test/test_compat_zip.c (revision 4197) ++++ libarchive/test/test_compat_zip.c (revision 4198) +@@ -359,12 +359,16 @@ + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/", archive_entry_pathname(ae)); + assertEqualInt(AE_IFDIR, archive_entry_filetype(ae)); +- assertEqualInt(1327314468, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* TODO: A more complex assert would work here; we could ++ verify that it's within +/- 24 hours of a particular value. */ ++ /* assertEqualInt(1327314468, archive_entry_mtime(ae)); */ + assertEqualInt(0, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae)); + assertEqualString("New Folder/New Folder/New Text Document.txt", archive_entry_pathname(ae)); + assertEqualInt(AE_IFREG, archive_entry_filetype(ae)); +- assertEqualInt(1327314476, archive_entry_mtime(ae)); ++ /* Zip timestamps are local time, so vary by time zone. */ ++ /* assertEqualInt(1327314476, archive_entry_mtime(ae)); */ + assertEqualInt(11, archive_entry_size(ae)); + assertEqualIntA(a, ARCHIVE_EOF, archive_read_next_header(a, &ae)); + } diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD index 370a5cf2c..53cb05f2c 100644 --- a/core/linux-api-headers/PKGBUILD +++ b/core/linux-api-headers/PKGBUILD @@ -35,3 +35,5 @@ package() { # clean-up unnecessary files generated during install find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f } +md5sums=('d73df15ab1d36fe3c102755d8f42117f' + 'cb42276bca126c676c51d02d74bf7fe7') diff --git a/core/nilfs-utils/PKGBUILD b/core/nilfs-utils/PKGBUILD index 88ffd0291..79316346d 100644 --- a/core/nilfs-utils/PKGBUILD +++ b/core/nilfs-utils/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 145721 2011-12-28 18:28:07Z ibiru $ +# $Id: PKGBUILD 147682 2012-01-26 19:27:33Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> +# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> + pkgname=nilfs-utils -pkgver=2.1.0 -pkgrel=2 +pkgver=2.1.1 +pkgrel=1 pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)" arch=('i686' 'x86_64' 'mips64el') url="http://www.nilfs.org/" @@ -12,7 +13,7 @@ backup=('etc/nilfs_cleanerd.conf') depends=('util-linux') options=(!libtool) source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2) -md5sums=('738f7bee062051c14dcff444bb17ada7') +md5sums=('caa7d8b7121311bd978120e2f0c45d81') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/core/openssl/gnu-linux-mips64el-gcc.patch b/core/openssl/gnu-linux-mips64el-gcc.patch new file mode 100644 index 000000000..412ea873f --- /dev/null +++ b/core/openssl/gnu-linux-mips64el-gcc.patch @@ -0,0 +1,10 @@ +--- Configure.orig 2011-09-23 10:49:56.725704188 -0300 ++++ Configure 2011-09-23 11:01:00.377697297 -0300 +@@ -337,6 +337,7 @@ + # *-generic* is endian-neutral target, but ./config is free to + # throw in -D[BL]_ENDIAN, whichever appropriate... + "linux-generic32","gcc:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++"gnu-linux-mips64el-gcc","gcc:-mabi=n32 -O3 -DTERMIO -Wall::-D_REENTRANT::-ldl:BN_LLONG MD2_CHAR RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips3_asm}:dlfcn:linux-shared:-fPIC::-mabi=n32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):::32", + "linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL:${ppc32_asm}:linux32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + # It's believed that majority of ARM toolchains predefine appropriate -march. + # If you compiler does not, do complement config command line with one! diff --git a/core/pam/PKGBUILD b/core/pam/PKGBUILD index a1d698271..21e9088b8 100644 --- a/core/pam/PKGBUILD +++ b/core/pam/PKGBUILD @@ -11,8 +11,6 @@ license=('GPL2') url="http://www.kernel.org/pub/linux/libs/pam/" depends=('glibc' 'db' 'cracklib' 'libtirpc') makedepends=('flex' 'w3m' 'docbook-xml>=4.4' 'docbook-xsl') -[ "$CARCH" = "mips64el" ] && \ -makedepends=('flex' 'docbook-xml>=4.4' 'docbook-xsl') backup=(etc/security/{access.conf,group.conf,limits.conf,namespace.conf,namespace.init,pam_env.conf,time.conf} etc/pam.d/other etc/default/passwd etc/environment) source=(https://fedorahosted.org/releases/l/i/linux-pam/Linux-PAM-$pkgver.tar.bz2 #http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-$pkgver.tar.bz2 diff --git a/core/sqlite3/PKGBUILD b/core/sqlite3/PKGBUILD index 6951af611..c00db6b7d 100644 --- a/core/sqlite3/PKGBUILD +++ b/core/sqlite3/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite3" -pkgname=('sqlite3' 'sqlite3-tcl' 'sqlite3-doc') +pkgname=('sqlite3' 'sqlite3-tcl') _amalgamationver=3071000 _amalgamationver2=${_amalgamationver/00/} _docver=${_amalgamationver} #3070700 @@ -20,7 +20,6 @@ source=( # tarball containing the amalgamation for SQLite 3.7.5 together with a license.txt) options=('!libtool' '!emptydirs') md5sums=('9ed2ca93577b58cfa0d01f64b9312ab9' - 'd4c8070ea2cec54b77002c265e680b0f' 'c1cdbc5544034d9012e421e75a5e4890') build() { diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 5564ec3b9..ea10e0570 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 147123 2012-01-22 11:00:58Z tpowa $ +# $Id: PKGBUILD 147273 2012-01-25 16:27:42Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,7 +6,7 @@ pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=178 +pkgver=179 pkgrel=1 arch=(i686 x86_64 mips64el) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -15,7 +15,6 @@ groups=('base') options=(!makeflags !libtool) makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz) -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') build() { cd $srcdir/$pkgbase-$pkgver @@ -100,4 +99,4 @@ package_udev-compat() { mknod cpu/microcode c 10 184 } -md5sums=('173cc6061e3a82dd6e9a1a5cf767a858') +md5sums=('7d2880f66ea39146aae928f19ff3ca09') diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 2ce762a71..b5f7dada8 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -15,8 +15,7 @@ conflicts=('linux32' 'util-linux-ng' 'e2fsprogs<1.41.8-2') provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') -#source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v${pkgver}/${pkgname}-${pkgver}.tar.bz2) -source=(ftp://ftp.infradead.org/pub/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2 +source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.20/${pkgname}-${pkgver}.tar.bz2 0001-findmnt-support-alternative-location-of-fstab.patch) optdepends=('perl: for chkdupexe support') diff --git a/core/wireless_tools/PKGBUILD b/core/wireless_tools/PKGBUILD index 1b996d604..8019d8ae4 100644 --- a/core/wireless_tools/PKGBUILD +++ b/core/wireless_tools/PKGBUILD @@ -1,27 +1,29 @@ -# $Id: PKGBUILD 142302 2011-11-08 06:06:08Z tomegun $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributer: Jason Chu <jchu@xentac.net> +# $Id: PKGBUILD 147661 2012-01-26 03:32:18Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> +# Contributor: Jason Chu <jchu@xentac.net> pkgname=wireless_tools pkgver=29 -pkgrel=5.1 -pkgdesc="Wireless Tools" +pkgrel=6 +pkgdesc='Wireless Tools' +url='http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html' arch=('i686' 'x86_64' 'mips64el') -url="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html" license=('GPL') -depends=('glibc') -source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${pkgver}.tar.gz") -md5sums=('e06c222e186f7cc013fd272d023710cb') +source=("http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/${pkgname}.${pkgver}.tar.gz") +sha1sums=('22040ac1497f4c5f8ddeca365591b01ae3475710') build() { - cd ${srcdir}/wireless_tools.${pkgver} - make + cd "${srcdir}/${pkgname}.${pkgver}" + make CFLAGS="${CFLAGS} -Wall -Wextra -I." LDFLAGS="${LDFLAGS}" } package() { - cd ${srcdir}/wireless_tools.${pkgver} - make INSTALL_DIR="${pkgdir}/usr/sbin" \ + cd "${srcdir}/${pkgname}.${pkgver}" + make \ + INSTALL_DIR="${pkgdir}/usr/sbin" \ INSTALL_LIB="${pkgdir}/usr/lib" \ INSTALL_INC="${pkgdir}/usr/include" \ - INSTALL_MAN="${pkgdir}/usr/share/man" install + INSTALL_MAN="${pkgdir}/usr/share/man" \ + install } |