diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/bin86/PKGBUILD | 17 | ||||
-rw-r--r-- | core/binutils/PKGBUILD | 19 | ||||
-rw-r--r-- | core/cloog/PKGBUILD | 31 | ||||
-rw-r--r-- | core/coreutils/PKGBUILD | 10 | ||||
-rw-r--r-- | core/file/PKGBUILD | 17 | ||||
-rw-r--r-- | core/gcc/PKGBUILD | 121 | ||||
-rw-r--r-- | core/gcc/gcc-ada.install | 2 | ||||
-rw-r--r-- | core/gcc/gcc-fortran.install | 2 | ||||
-rw-r--r-- | core/gcc/gcc-go.install | 20 | ||||
-rw-r--r-- | core/gcc/gcc-hash-style-both.patch | 209 | ||||
-rw-r--r-- | core/gcc/gcc-libs.install | 12 | ||||
-rw-r--r-- | core/gcc/gcc.install | 2 | ||||
-rw-r--r-- | core/glibc/PKGBUILD | 14 | ||||
-rw-r--r-- | core/glibc/glibc-2.13-futex.patch | 31 | ||||
-rw-r--r-- | core/isl/PKGBUILD | 33 | ||||
-rw-r--r-- | core/less/PKGBUILD | 8 | ||||
-rw-r--r-- | core/libfetch/Makefile | 71 | ||||
-rw-r--r-- | core/libfetch/PKGBUILD | 12 | ||||
-rw-r--r-- | core/libfetch/fetch-handle-temp-redirect.patch | 15 | ||||
-rw-r--r-- | core/linux-api-headers/PKGBUILD | 15 | ||||
-rw-r--r-- | core/mdadm/PKGBUILD | 19 | ||||
-rwxr-xr-x | core/mdadm/mdadm | 1 | ||||
-rw-r--r-- | core/mdadm/segfault-3.2.1.patch | 68 | ||||
-rw-r--r-- | core/mpfr/PKGBUILD | 23 |
24 files changed, 470 insertions, 302 deletions
diff --git a/core/bin86/PKGBUILD b/core/bin86/PKGBUILD index b068ab833..c3865a24e 100644 --- a/core/bin86/PKGBUILD +++ b/core/bin86/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 87909 2010-08-18 18:45:21Z andyrtr $ -# Maintainer: judd <jvinet@zeroflux.org> +# $Id: PKGBUILD 119692 2011-04-13 17:22:23Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + pkgname=bin86 -pkgver=0.16.17 -pkgrel=5 +pkgver=0.16.18 +pkgrel=1 pkgdesc="A complete 8086 assembler and loader" arch=(i686 x86_64) license=('GPL') url="http://www.debath.co.uk/" depends=('glibc') -source=(http://homepage.ntlworld.com/robert.debath/dev86/$pkgname-$pkgver.tar.gz +source=(http://www.debath.co.uk/dev86//$pkgname-$pkgver.tar.gz bin86-0.16.17-x86_64-1.patch) -md5sums=('c9e8d72dd2e7457b52d0e3164fc199a1' '92bdce7b0655cd2e9f83c83fc56d128e') +md5sums=('914068fb649b93642d1cf21857b75699' + '92bdce7b0655cd2e9f83c83fc56d128e') build() { cd $srcdir/$pkgname-$pkgver if [ "$CARCH" = "x86_64" ]; then - patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch || return 1 + patch -Np1 -i ../bin86-0.16.17-x86_64-1.patch fi make PREFIX=/usr } diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index da43e8b5e..fa5a47b64 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 109378 2011-02-09 08:54:49Z allan $ +# $Id: PKGBUILD 116976 2011-03-27 06:07:38Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.21 -pkgrel=4 -_date=20110209 +pkgrel=6 +_date=20110326 pkgdesc="A set of programs to assemble and manipulate binary and object files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/binutils/" @@ -16,10 +16,8 @@ depends=('glibc>=2.13' 'zlib') makedepends=('dejagnu') options=('!libtool' '!distcc' '!ccache') install=binutils.install -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2 - binutils.git-39637246.patch) -md5sums=('673ef8f4fc0b497232b4458982e76179' - 'dd72cb6df5467bc6237cff2a886099d0') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2) +md5sums=('884dcbc87d4722b152aea72312356da1') mksource() { mkdir ${pkgname}-${_date} @@ -32,9 +30,6 @@ mksource() { } build() { - cd ${srcdir}/binutils - patch -Np1 -i ${srcdir}/binutils.git-39637246.patch - cd ${srcdir} mkdir binutils-build && cd binutils-build @@ -49,6 +44,10 @@ build() { make configure-host make tooldir=${pkgdir}/usr +} + +check() { + cd ${srcdir}/binutils-build # do not abort on errors - manually check log files make -k -j1 check || true diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD new file mode 100644 index 000000000..39645a7e5 --- /dev/null +++ b/core/cloog/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 119094 2011-04-10 21:37:04Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=cloog +pkgver=0.16.2 +pkgrel=1 +pkgdesc="Library that generates loops for scanning polyhedra" +arch=('i686' 'x86_64') +url="http://www.bastoul.net/cloog/" +license=('GPL') +depends=('isl' 'gmp') +conflicts=('cloog-ppl<0.15.10-2') +options=('!libtool') +source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz) +md5sums=('83877caaa879c7160063138bb18348e7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --with-isl=system --with-gmp=system + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install +} diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index a994defcf..78b74c33f 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 108936 2011-02-04 23:03:34Z allan $ +# $Id: PKGBUILD 119714 2011-04-14 01:48:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=coreutils -pkgver=8.10 +pkgver=8.11 pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz coreutils-uname.patch coreutils-pam.patch su.pam) -md5sums=('4bb81c051da6e5436fc1ad9a67ae44fe' +md5sums=('b623ee9b1b768a14e40dfd35ff446f4c' 'c4fcca138b6abf6d443d48a6f0cd8833' 'aad79a2aa6d566c375d7bdd1b0767278' 'fa85e5cce5d723275b14365ba71a8aad') @@ -39,6 +39,10 @@ build() { --enable-no-install-program=groups,hostname,kill,uptime \ --enable-pam make +} + +check() { + cd ${srcdir}/${pkgname}-${pkgver} make RUN_EXPENSIVE_TESTS=yes check } diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index e81c14eb9..c7dd791be 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111169 2011-02-24 15:25:47Z stephane $ +# $Id: PKGBUILD 119819 2011-04-15 12:49:27Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file -pkgver=5.05 -pkgrel=2 +pkgver=5.06 +pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -13,11 +13,9 @@ url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.05-zip64.patch - file-5.05-python-3.2.patch) -md5sums=('0b429063710457be2bd17a18389cb018' - '385f020467debd98bd2d8df6143f93d0' - '3f5e147be5b9c36c74323a1317328538') + file-5.05-zip64.patch) +md5sums=('deb12b0fb9d09e7681be72bad6eba4e0' + '385f020467debd98bd2d8df6143f93d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,9 +24,6 @@ build() { # identify zip64 files patch -Np1 -i ${srcdir}/file-5.05-zip64.patch - # identify python 3.2 files - patch -Np1 -i ../file-5.05-python-3.2.patch - ./configure --prefix=/usr --datadir=/usr/share/file make } diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index a88cd0a4f..61f6fbcb5 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,35 +1,35 @@ -# $Id: PKGBUILD 107993 2011-01-28 20:01:16Z allan $ +# $Id: PKGBUILD 119862 2011-04-16 05:35:51Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc # NOTE: libtool requires rebuilt with each new gcc version -pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada') -pkgver=4.5.2 -pkgrel=6 -_snapshot=4.5-20110127 -_libstdcppmanver=4.5.2 # Note: check source directory name when updating this +pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') +pkgver=4.6.0 +pkgrel=3 +_snapshot=4.6-20110415 +_libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'custom') +license=('GPL' 'LGPL' 'FDL' 'custom') url="http://gcc.gnu.org" -makedepends=('binutils>=2.21' 'libmpc' 'cloog-ppl>=0.15.9-2' 'elfutils' 'gcc-ada' 'dejagnu') +makedepends=('binutils>=2.21' 'libmpc' 'cloog' 'ppl' 'gcc-ada' 'dejagnu') options=('!libtool' '!emptydirs') -source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,testsuite}-${pkgver}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,testsuite}-${_snapshot}.tar.bz2 - ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api-${_libstdcppmanver}.man.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-{core,g++,fortran,objc,ada,go,testsuite}-${_snapshot}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2 gcc_pure64.patch gcc-hash-style-both.patch) -md5sums=('7dbdf06186dc98955221b2f7b987645b' - '4893036a98d8bedf44fe0741dfec6e1f' - 'c741c614e975c858cffb9e78b0b5124f' - 'b141fadc984cc0c1c0f15feb16db14e5' - '067672b640d0b912298791c1837606bc' - 'daffd2ba5917a263cdff5f38dcf8c323' - '2776eab5ebb7f9cc62dd2199a3a24382' +md5sums=('aed037654091d1f478dfcb6e13444325' + '8d4b78c03c1d477c6cb562d42f461958' + 'c346e76014569b25e2869ff986d2ac2d' + '8376485de1c7aa90bb32f52f2372d451' + '0c2d89f9e2e614ad84c6e2aa239c5c1c' + '50bab6a0c9e5403ea77f57361dec5436' + '6e0032461f87ce60db6302ca652ae9d8' + '1e9fd2eaf0ee47ea64e82c48998f1999' '4030ee1c08dd1e843c0225b772360e76' - '6fd395bacbd7b6e47c7b74854b478363') - + '4df25b623799b148a0703eaeec8fdf3f') if [ -n "${_snapshot}" ]; then _basedir="${srcdir}/gcc-${_snapshot}" @@ -40,9 +40,6 @@ fi build() { cd ${_basedir} - # "Add" ppl-0.11 compatibility - sed -i "/ppl_minor_version=/s#10#11#" configure - # Do not install libiberty sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in @@ -58,18 +55,26 @@ build() { cd ${srcdir} mkdir gcc-build && cd gcc-build + ${_basedir}/configure --prefix=/usr \ - --enable-languages=c,c++,fortran,objc,obj-c++,ada \ - --enable-shared --enable-threads=posix --enable-__cxa_atexit \ - --enable-clocale=gnu --enable-gnu-unique-object \ - --enable-lto --enable-plugin \ - --enable-gold --with-plugin-ld=ld.gold \ - --disable-multilib --disable-libstdcxx-pch \ - --with-system-zlib --with-ppl \ - --with-cloog --with-cloog-include=/usr/include/cloog-ppl \ --libdir=/usr/lib --libexecdir=/usr/lib \ - --mandir=/usr/share/man --infodir=/usr/share/info + --mandir=/usr/share/man --infodir=/usr/share/info \ + --with-bugurl=https://bugs.archlinux.org/ \ + --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \ + --enable-shared --enable-threads=posix \ + --with-system-zlib --enable-__cxa_atexit \ + --disable-libunwind-exceptions --enable-clocale=gnu \ + --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-libstdcxx-pch \ + --enable-checking=release make +} + +check() { + cd gcc-build # increase stack size to prevent test failures # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827 @@ -95,11 +100,12 @@ package_gcc-libs() make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info + make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=${pkgdir} install-target-libgfortran - make -j1 DESTDIR=${pkgdir} install-target-libobjc - # I thought I said to only install the lib... - rm -rf ${pkgdir}/usr/lib/gcc/ + + # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} + rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} # remove static libraries find ${pkgdir} -name *.a -delete @@ -112,21 +118,26 @@ package_gcc-libs() package_gcc() { pkgdesc="The GNU Compiler Collection - C and C++ frontends" - depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog-ppl>=0.15.9-2' 'elfutils') + depends=('binutils>=2.20.1' 'libmpc>=0.8.1-2' 'cloog' 'ppl') groups=('base-devel') install=gcc.install cd gcc-build - # much, much easier to install the lot and clean-up the mess + # unfortunately it is much, much easier to install the lot and clean-up the mess... make -j1 DESTDIR=${pkgdir} install - rm $pkgdir/usr/bin/{*gfortran,gnat*} - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}/* - rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,libgfortranbegin.a} - rm $pkgdir/usr/lib/{*.so*,lib{gfortran,objc}.a} - rm $pkgdir/usr/share/info/{gfortran,gnat*,libgomp}.info + rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*} + rm $pkgdir/usr/lib/*.so* + rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a + rm $pkgdir/usr/lib/libgfortran.spec + rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h} + rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a} + rm -r $pkgdir/usr/lib/go + rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo - rm $pkgdir/usr/share/man/man1/gfortran.1 + rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1 + rm $pkgdir/usr/share/man/man3/ffi* # many packages require these symlinks install -dm755 ${pkgdir}/lib @@ -165,8 +176,7 @@ EOF # install the libstdc++ man pages install -dm755 ${pkgdir}/usr/share/man/man3 - install -m644 ${srcdir}/libstdc++-api-${_libstdcppmanver}.man/man3/* \ - ${pkgdir}/usr/share/man/man3/ + install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/ # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -180,13 +190,15 @@ package_gcc-fortran() install=gcc-fortran.install cd gcc-build + make -j1 DESTDIR=${pkgdir} install-target-libquadmath make -j1 DESTDIR=$pkgdir install-target-libgfortran make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info} install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951 # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/libgfortran.so* + rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so* + rm ${pkgdir}/usr/share/info/libquadmath.info # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -204,7 +216,7 @@ package_gcc-objc() install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/ # remove libraries included in gcc-libs - rm -f ${pkgdir}/usr/lib/libobjc.so* + rm ${pkgdir}/usr/lib/libobjc.so* # Install Runtime Library Exception install -Dm644 ${_basedir}/COPYING.RUNTIME \ @@ -226,3 +238,18 @@ package_gcc-ada() ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION } +package_gcc-go() +{ + pkgdesc="Go front-end for GCC" + depends=("gcc=$pkgver-$pkgrel") + install=gcc-go.install + + cd gcc-build + make -j1 DESTDIR=$pkgdir install-target-libgo + make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info} + install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1 + + # Install Runtime Library Exception + install -Dm644 ${_basedir}/COPYING.RUNTIME \ + ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION +} diff --git a/core/gcc/gcc-ada.install b/core/gcc/gcc-ada.install index 81794685f..df0553a4f 100644 --- a/core/gcc/gcc-ada.install +++ b/core/gcc/gcc-ada.install @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/core/gcc/gcc-fortran.install b/core/gcc/gcc-fortran.install index 2aeab7123..b15d89a97 100644 --- a/core/gcc/gcc-fortran.install +++ b/core/gcc/gcc-fortran.install @@ -14,5 +14,3 @@ pre_remove() { [ -x usr/bin/install-info ] || return 0 install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null } - -# vim:set ts=2 sw=2 et: diff --git a/core/gcc/gcc-go.install b/core/gcc/gcc-go.install new file mode 100644 index 000000000..7dc50dee5 --- /dev/null +++ b/core/gcc/gcc-go.install @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(gccgo.info) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} diff --git a/core/gcc/gcc-hash-style-both.patch b/core/gcc/gcc-hash-style-both.patch index fbb210598..8b59f4535 100644 --- a/core/gcc/gcc-hash-style-both.patch +++ b/core/gcc/gcc-hash-style-both.patch @@ -1,47 +1,6 @@ -#! /bin/sh -e - -# DP: Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - #cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - #rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2006-07-11 Jakub Jelinek <jakub@redhat.com> - - * config/i386/linux.h (LINK_SPEC): Add --hash-style=both. - * config/i386/linux64.h (LINK_SPEC): Likewise. - * config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise. - * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, - LINK_OS_LINUX_SPEC64): Likewise. - * config/s390/linux.h (LINK_SPEC): Likewise. - * config/ia64/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC, - LINK_ARCH64_SPEC): Likewise. - * config/alpha/linux-elf.h (LINK_SPEC): Likewise. - ---- gcc/config/alpha/linux-elf.h.orig 2007-08-04 08:55:58.000000000 +0200 -+++ gcc/config/alpha/linux-elf.h 2007-09-01 15:47:26.605865578 +0200 -@@ -39,7 +39,7 @@ +--- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000 +@@ -41,7 +41,7 @@ #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER @@ -50,8 +9,68 @@ exit 0 %{O*:-O3} %{!O*:-O1} \ %{shared:-shared} \ %{!shared: \ ---- gcc/config/s390/linux.h.orig 2007-08-04 08:55:59.000000000 +0200 -+++ gcc/config/s390/linux.h 2007-09-01 15:47:26.605865578 +0200 +--- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000 ++++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -78,7 +78,7 @@ + %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + + #undef LINK_SPEC +-#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ ++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000 ++++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -104,7 +104,7 @@ + { "dynamic_linker", LINUX_DYNAMIC_LINKER } + + #undef LINK_SPEC +-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ ++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ + %{!shared: \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +--- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -64,7 +64,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + + #undef LINK_SPEC +-#define LINK_SPEC "\ ++#define LINK_SPEC "--hash-style=both \ + %{shared:-shared} \ + %{!shared: \ + %{!static: \ +--- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000 ++++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000 +@@ -389,11 +389,11 @@ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) + + +-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" + +-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}" + +--- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000 ++++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000 +@@ -830,7 +830,7 @@ + #define LINUX_DYNAMIC_LINKER \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) + +-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ ++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" + +--- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000 ++++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000 @@ -77,7 +77,7 @@ #undef LINK_SPEC @@ -61,103 +80,43 @@ exit 0 %{shared:-shared} \ %{!shared: \ %{static:-static} \ ---- gcc/config/sparc/linux.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -132,7 +132,7 @@ - - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!ibcs: \ ---- gcc/config/sparc/linux64.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux64.h 2007-09-01 15:47:26.605865578 +0200 -@@ -166,7 +166,7 @@ +--- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000 ++++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000 +@@ -113,7 +113,7 @@ { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ { "link_arch", LINK_ARCH_SPEC }, -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ +#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -175,7 +175,7 @@ - %{static:-static}}} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -121,7 +121,7 @@ + %{static:-static}} \ " -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ +#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -256,7 +256,7 @@ + %{!static: \ + %{rdynamic:-export-dynamic} \ +@@ -193,7 +193,7 @@ #else /* !SPARC_BI_ARCH */ #undef LINK_SPEC -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ +#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -108,7 +108,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux64.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux64.h 2007-09-01 15:48:27.336781690 +0200 -@@ -65,7 +65,7 @@ - #endif - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ %{!static: \ ---- gcc/config/ia64/linux.h.orig 2006-12-12 18:59:53.000000000 +0100 -+++ gcc/config/ia64/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -40,7 +40,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" + %{rdynamic:-export-dynamic} \ +--- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000 ++++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000 +@@ -74,7 +74,7 @@ + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ + #undef LINK_SPEC +-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ ++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ + %{!mno-relax:%{!r:-relax}} \ %{!shared: \ %{!static: \ ---- gcc/config/rs6000/sysv4.h.orig 2007-08-08 23:37:49.000000000 +0200 -+++ gcc/config/rs6000/sysv4.h 2007-09-01 15:47:26.615865729 +0200 -@@ -901,7 +901,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" - ---- gcc/config/rs6000/linux64.h.orig 2007-08-04 08:56:12.000000000 +0200 -+++ gcc/config/rs6000/linux64.h 2007-09-01 15:47:26.615865729 +0200 -@@ -354,11 +354,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}" - diff --git a/core/gcc/gcc-libs.install b/core/gcc/gcc-libs.install index b5fbf9211..23553b8f0 100644 --- a/core/gcc/gcc-libs.install +++ b/core/gcc/gcc-libs.install @@ -1,14 +1,16 @@ infodir=usr/share/info -file="libgomp.info" +filelist=(libgomp.info libquadmath.info) post_upgrade() { [ -x usr/bin/install-info ] || return 0 - install-info $infodir/$file.gz $infodir/dir 2> /dev/null + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done } pre_remove() { [ -x usr/bin/install-info ] || return 0 - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done } - -# vim:set ts=2 sw=2 et: diff --git a/core/gcc/gcc.install b/core/gcc/gcc.install index a7a405288..3407a5e1f 100644 --- a/core/gcc/gcc.install +++ b/core/gcc/gcc.install @@ -18,5 +18,3 @@ pre_remove() { install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null done } - -# vim:set ts=2 sw=2 et: diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 6ae2db02f..60aeb8ae6 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 110236 2011-02-18 04:46:54Z allan $ +# $Id: PKGBUILD 116984 2011-03-27 06:35:25Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.13 -pkgrel=4 +pkgrel=5 _glibcdate=20110117 pkgdesc="GNU C Library" arch=('i686' 'x86_64') @@ -26,6 +26,7 @@ source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.t glibc-2.12.1-static-shared-getpagesize.patch glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-prelink.patch + glibc-2.13-futex.patch nscd locale.gen.txt locale-gen) @@ -36,6 +37,7 @@ md5sums=('b7b17d9c6b5b71b5e5322e04ca63c190' 'a3ac6f318d680347bb6e2805d42b73b2' 'b042647ea7d6f22ad319e12e796bd13e' '24dfab6fd244f3773523412588ecc52c' + '7d0154b7e17ea218c9fa953599d24cc4' 'b587ee3a70c9b3713099295609afde49' '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') @@ -74,9 +76,7 @@ build() { patch -Np1 -i ${srcdir}/glibc-2.13-prelink.patch # http://sourceware.org/bugzilla/show_bug.cgi?id=12403 - if [[ $CARCH == "x86_64" ]]; then - sed -i '/__ASSUME_PRIVATE_FUTEX/d' $srcdir/glibc/sysdeps/unix/sysv/linux/kernel-features.h - fi + patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -103,6 +103,10 @@ build() { --disable-multi-arch make +} + +check() { + cd ${srcdir}/glibc-build # some errors are expected - manually check log files make -k check || true diff --git a/core/glibc/glibc-2.13-futex.patch b/core/glibc/glibc-2.13-futex.patch new file mode 100644 index 000000000..9b9c3ac45 --- /dev/null +++ b/core/glibc/glibc-2.13-futex.patch @@ -0,0 +1,31 @@ +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S ++++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: + + 7: movq %rdx, %rax + +-#ifndef __ASSUME_PRIVATE_FUTEX ++#ifndef __ASSUME_FUTEX_CLOCK_REALTIME + addq $16, %rsp + cfi_adjust_cfa_offset(-16) + popq %r14 +@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: + cfi_restore(%r12) + retq + +-#ifdef __ASSUME_PRIVATE_FUTEX ++#ifdef __ASSUME_FUTEX_CLOCK_REALTIME + cfi_adjust_cfa_offset(16) + cfi_rel_offset(%r12, 8) + cfi_rel_offset(%r13, 0) diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD new file mode 100644 index 000000000..bba92fb24 --- /dev/null +++ b/core/isl/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 119089 2011-04-10 21:34:57Z allan $ +# Maintainer: Allan McRae <allan@archlinux.org> + +pkgname=isl +pkgver=0.06 +pkgrel=1 +pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" +arch=('i686' 'x86_64') +url="http://www.kotnet.org/~skimo/isl/" +license=('LGPL2.1') +options=('!libtool') +source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2) +md5sums=('504f054eaffdd8d07c497ebe3ebc7e04') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 DESTDIR="$pkgdir/" install + + # this seems a better place for this file... + install -dm755 $pkgdir/usr/share/gdb/auto-load/ + mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.6.0.0-gdb.py +} diff --git a/core/less/PKGBUILD b/core/less/PKGBUILD index c84d7d787..707787bbb 100644 --- a/core/less/PKGBUILD +++ b/core/less/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 100030 2010-11-20 00:42:11Z stephane $ +# $Id: PKGBUILD 119700 2011-04-13 21:50:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=less -pkgver=436 -pkgrel=2 +pkgver=443 +pkgrel=1 pkgdesc="A terminal based program for viewing text files" license=('GPL3') arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url="http://www.greenwoodsoftware.com/less" groups=('base') depends=('ncurses' 'pcre') source=(http://www.greenwoodsoftware.com/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('817bf051953ad2dea825a1cdf460caa4') +md5sums=('47db098fb3cdaf847b3c4be05ee954fc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/libfetch/Makefile b/core/libfetch/Makefile index 53bcee9c4..34f3b1d99 100644 --- a/core/libfetch/Makefile +++ b/core/libfetch/Makefile @@ -5,31 +5,23 @@ FETCH_WITH_INET6 = true FETCH_WITH_OPENSSL = true WARNINGS = -Wall -Wstrict-prototypes -Wsign-compare -Wchar-subscripts \ - -Wpointer-arith -Wcast-align -CFLAGS = -O2 -pipe -I. -fPIC $(WARNINGS) \ - -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES + -Wpointer-arith -Wcast-align -CFLAGS += -DFTP_COMBINE_CWDS -DNETBSD +CFLAGS ?= -O2 -pipe + +CFLAGS += -fPIC $(WARNINGS) +CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES +CFLAGS += -DFTP_COMBINE_CWDS -DNETBSD ifeq ($(strip $(FETCH_WITH_INET6)), true) -CFLAGS+= -DINET6 +CFLAGS += -DINET6 endif ifeq ($(strip $(FETCH_WITH_OPENSSL)), true) -CFLAGS+= -DWITH_SSL -LDFLAGS= -lssl -lcrypto -endif - -ifeq ($(strip $(DEBUG)), true) -CFLAGS += -g -DDEBUG -else -CFLAGS += -UDEBUG +CFLAGS += -DWITH_SSL +LDADD += -Wl,-lssl -Wl,-lcrypto endif -CC = gcc -LD = gcc -AR = ar -RANLIB = ranlib INSTALL = install -c -D OBJS= fetch.o common.o ftp.o http.o file.o @@ -37,53 +29,40 @@ INCS= fetch.h common.h GEN = ftperr.h httperr.h MAN = libdownload.3 -#pretty print! -E = @/bin/echo -Q = @ - all: libfetch.so libfetch.a .PHONY: all %.o: %.c $(INCS) $(GEN) - $(E) " compile " $@ - $(Q) $(CC) $(CFLAGS) -c $< + $(CC) $(CFLAGS) -c $< ftperr.h: ftp.errors Makefile errlist.sh - $(E) " generate " $@ - $(Q) ./errlist.sh ftp_errlist FTP ftp.errors > $@ + ./errlist.sh ftp_errlist FTP ftp.errors > $@ httperr.h: http.errors Makefile errlist.sh - $(E) " generate " $@ - $(Q) ./errlist.sh http_errlist HTTP http.errors > $@ + ./errlist.sh http_errlist HTTP http.errors > $@ libfetch.so: $(GEN) $(INCS) $(OBJS) - $(E) " build " $@ - $(Q) rm -f $@ - $(Q) $(LD) $(LDFLAGS) *.o -shared -o $@ - $(E) " built with: " $(CFLAGS) + rm -f $@ + $(CC) $(LDFLAGS) $(OBJS) $(LDADD) -shared -fPIC -o $@ libfetch.a: $(GEN) $(INCS) $(OBJS) - $(E) " build " $@ - $(Q) rm -f $@ - $(Q) $(AR) rcs $@ *.o - $(Q) $(RANLIB) $@ - $(E) " built with: " $(CFLAGS) + rm -f $@ + $(AR) rcs $@ $(OBJS) clean: - $(E) " clean " - $(Q) rm -f libfetch.so libfetch.a *.o $(GEN) + rm -f libfetch.so libfetch.a *.o $(GEN) .PHONY: clean install: all - $(Q) $(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so - $(Q) $(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a - $(Q) $(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h - $(Q) $(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3 + $(INSTALL) -m 755 libfetch.so $(DESTDIR)$(prefix)/lib/libfetch.so + $(INSTALL) -m 644 libfetch.a $(DESTDIR)$(prefix)/lib/libfetch.a + $(INSTALL) -m 644 fetch.h $(DESTDIR)$(prefix)/include/fetch.h + $(INSTALL) -m 644 fetch.3 $(DESTDIR)$(prefix)/share/man/man3/fetch.3 .PHONY: install uninstall: - $(Q) rm -f $(DESTDIR)$(prefix)/lib/libfetch.so - $(Q) rm -f $(DESTDIR)$(prefix)/lib/libfetch.a - $(Q) rm -f $(DESTDIR)$(prefix)/include/fetch.h - $(Q) rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3 + rm -f $(DESTDIR)$(prefix)/lib/libfetch.so + rm -f $(DESTDIR)$(prefix)/lib/libfetch.a + rm -f $(DESTDIR)$(prefix)/include/fetch.h + rm -f $(DESTDIR)$(prefix)/share/man/man3/fetch.3 .PHONY: uninstall diff --git a/core/libfetch/PKGBUILD b/core/libfetch/PKGBUILD index 641e7d42c..328ebcf88 100644 --- a/core/libfetch/PKGBUILD +++ b/core/libfetch/PKGBUILD @@ -1,19 +1,21 @@ -# $Id$ +# $Id:$ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Contributor: Xavier Chantry <shiningxc@gmail.com> pkgname=libfetch pkgver=2.33 -pkgrel=1 +pkgrel=3 pkgdesc="URL based download library" arch=('i686' 'x86_64') license=('BSD') depends=('openssl>=1.0.0') url="http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/libfetch/" source=(Makefile - ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('5167d18db7660228e75290fc7d25fe56' - 'a176b94f7f30344ef8a71c047ca2136b') + ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz + fetch-handle-temp-redirect.patch) +md5sums=('7dffdd5a81bb32084a2f45e61f70dcf9' + 'a176b94f7f30344ef8a71c047ca2136b' + '2ee40d7e7d76c39ae5500d89075ef8a6') # keep an upgrade path for older installations PKGEXT='.pkg.tar.gz' diff --git a/core/libfetch/fetch-handle-temp-redirect.patch b/core/libfetch/fetch-handle-temp-redirect.patch new file mode 100644 index 000000000..351cbcfd8 --- /dev/null +++ b/core/libfetch/fetch-handle-temp-redirect.patch @@ -0,0 +1,15 @@ +Index: http.c +=================================================================== +RCS file: /cvsroot/pkgsrc/net/libfetch/files/http.c,v +retrieving revision 1.29 +diff -u -r1.29 http.c +--- http.c 24 Jan 2010 19:10:35 -0000 1.29 ++++ http.c 19 Apr 2011 13:29:04 -0000 +@@ -974,6 +974,7 @@ + case HTTP_MOVED_PERM: + case HTTP_MOVED_TEMP: + case HTTP_SEE_OTHER: ++ case HTTP_TEMP_REDIRECT: + /* + * Not so fine, but we still have to read the + * headers to get the new location. diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD index 27dfd88f7..9dc5fb1f7 100644 --- a/core/linux-api-headers/PKGBUILD +++ b/core/linux-api-headers/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 106756 2011-01-19 00:34:07Z allan $ +# $Id: PKGBUILD 116973 2011-03-27 06:05:36Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=linux-api-headers -pkgver=2.6.37 -_basever=2.6.37 +pkgver=2.6.38.1 +_basever=2.6.38 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64') @@ -14,13 +14,14 @@ license=('GPL2') provides=("kernel-headers=${pkgver}") conflicts=('kernel-headers') replaces=('kernel-headers') -source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2) - #http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2) -md5sums=('c8ee37b4fdccdb651e0603d35350b434') +source=(http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_basever}.tar.bz2 + http://www.kernel.org/pub/linux/kernel/v2.6/patch-${pkgver}.bz2) +md5sums=('7d471477bfa67546f902da62227fa976' + 'bd2be4d0465345e4e9355d6773f5f6fe') build() { cd ${srcdir}/linux-${_basever} - #patch -Np1 -i ${srcdir}/patch-${pkgver} + [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver} make mrproper make headers_check diff --git a/core/mdadm/PKGBUILD b/core/mdadm/PKGBUILD index d6c56b553..0455dce6e 100644 --- a/core/mdadm/PKGBUILD +++ b/core/mdadm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 117346 2011-03-31 06:36:59Z tpowa $ +# $Id: PKGBUILD 120375 2011-04-23 07:42:14Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=mdadm pkgver=3.2.1 -pkgrel=1 +pkgrel=3 pkgdesc="A tool for managing/monitoring Linux md device arrays, also known as Software RAID" arch=(i686 x86_64) license=('GPL') @@ -16,17 +16,14 @@ source=(ftp://ftp.kernel.org/pub/linux/utils/raid/mdadm/mdadm-$pkgver.tar.bz2 mdadm mdadm.conf mdadm_install - mdadm_hook) + mdadm_hook + segfault-3.2.1.patch) install=mdadm.install replaces=('raidtools') -md5sums=('d1e2549202bd79d9e99f1498d1109530' - '7bff0e506fb6017510c8ec4a01896952' - '00cbed931db4f15b6ce49e3e7d433966' - '865c3d39e5f5dae58388160b563981f1' - '1a3eb63832cecd6550f5b0a21d58cfdb') build() { cd $srcdir/$pkgname-$pkgver + patch -Np1 -i ../segfault-3.2.1.patch make CXFLAGS="$CFLAGS" } @@ -43,3 +40,9 @@ package() { make MDASSEMBLE_AUTO=1 mdassemble install -D -m755 mdassemble $pkgdir/sbin/mdassemble } +md5sums=('d1e2549202bd79d9e99f1498d1109530' + '6df172c8f77b280018cf87eb3d313f29' + '00cbed931db4f15b6ce49e3e7d433966' + '865c3d39e5f5dae58388160b563981f1' + '1a3eb63832cecd6550f5b0a21d58cfdb' + '2fd25605bd1836a33c689ac442cb73ed') diff --git a/core/mdadm/mdadm b/core/mdadm/mdadm index 918a62537..e196f3642 100755 --- a/core/mdadm/mdadm +++ b/core/mdadm/mdadm @@ -13,7 +13,6 @@ case "$1" in if [ ! -z "$PID" -o $? -gt 0 ]; then stat_fail else - mdadm --monitor --oneshot --scan add_daemon mdadm stat_done fi diff --git a/core/mdadm/segfault-3.2.1.patch b/core/mdadm/segfault-3.2.1.patch new file mode 100644 index 000000000..6042d86c2 --- /dev/null +++ b/core/mdadm/segfault-3.2.1.patch @@ -0,0 +1,68 @@ +From 4019ad07013a5d8618b867f724d1c4a13c5cb05d Mon Sep 17 00:00:00 2001 +From: Jonathan Liu <net147@gmail.com> +Date: Tue, 12 Apr 2011 18:28:01 +1000 +Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata + +0.90 array do not report the metadata type in /proc/mdstat, so +we cannot assume that mse->metadata_version is non-NULL. + +So add an appropriate check. + +This adds an additional check missed by commit +eb28e119b03fd5149886ed516fa4bb006ad3602e. + +Signed-off-by: NeilBrown <neilb@suse.de> +--- + Monitor.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/Monitor.c b/Monitor.c +index a3ea724..55aebeb 100644 +--- a/Monitor.c ++++ b/Monitor.c +@@ -577,7 +577,8 @@ static int check_array(struct state *st, struct mdstat_ent *mdstat, + info[i].major = info[i].minor = 0; + } + +- if (strncmp(mse->metadata_version, "external:", 9) == 0 && ++ if (mse->metadata_version && ++ strncmp(mse->metadata_version, "external:", 9) == 0 && + is_subarray(mse->metadata_version+9)) + st->parent_dev = + devname2devnum(mse->metadata_version+10); +-- +1.7.2.3 + +From eb28e119b03fd5149886ed516fa4bb006ad3602e Mon Sep 17 00:00:00 2001 +From: NeilBrown <neilb@suse.de> +Date: Tue, 5 Apr 2011 09:16:57 +1000 +Subject: [PATCH] Monitor: avoid NULL dereference with 0.90 metadata + +0.90 array do not report the metadata type in /proc/mdstat, so +we cannot assume that mse->metadata_version is non-NULL. + +So add an appropriate check. + +Reported-by: Eugene <hdejin@yahoo.com> +Signed-off-by: NeilBrown <neilb@suse.de> +--- + Monitor.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/Monitor.c b/Monitor.c +index 291e465..337785d 100644 +--- a/Monitor.c ++++ b/Monitor.c +@@ -688,7 +688,8 @@ static int add_new_arrays(struct mdstat_ent *mdstat, struct state **statelist, + st->devnum = mse->devnum; + st->percent = -2; + st->expected_spares = -1; +- if (strncmp(mse->metadata_version, "external:", 9) == 0 && ++ if (mse->metadata_version && ++ strncmp(mse->metadata_version, "external:", 9) == 0 && + is_subarray(mse->metadata_version+9)) + st->parent_dev = + devname2devnum(mse->metadata_version+10); +-- +1.7.2.3 + diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index 89a3b1b25..7e1f4c1a3 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,34 +1,33 @@ -# $Id: PKGBUILD 101731 2010-12-01 03:50:59Z allan $ +# $Id: PKGBUILD 118927 2011-04-09 13:01:31Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=mpfr -_basever=3.0.0 -_patchlevel=p8 -pkgver=${_basever}.${_patchlevel} +pkgver=3.0.1 pkgrel=1 pkgdesc="Multiple-precision floating-point library" arch=('i686' 'x86_64') -license=('LGPL') url="http://www.mpfr.org/" +license=('LGPL') depends=('gmp>=5.0') options=('!libtool') install=mpfr.install -source=(http://www.mpfr.org/mpfr-current/mpfr-${_basever}.tar.xz - mpfr-${_basever}-${_patchlevel}.patch) -md5sums=('8ab3bef2864b8c6e6a291f5603141bbd' - 'ac4591dea9abdd7573cd05a2fce2bb14') +source=(http://www.mpfr.org/mpfr-current/mpfr-${pkgver}.tar.xz) +md5sums=('645882d9d179113a70af84d27086ed9f') build() { - cd "${srcdir}/${pkgname}-${_basever}" - patch -Np1 -i ${srcdir}/${pkgname}-${_basever}-${_patchlevel}.patch + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --enable-thread-safe --enable-shared make +} + +check() { + cd "${srcdir}/${pkgname}-${pkgver}" make check } package() { - cd "${srcdir}/${pkgname}-${_basever}" + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } |