diff options
Diffstat (limited to 'core')
-rw-r--r-- | core/binutils/PKGBUILD | 4 | ||||
-rw-r--r-- | core/cloog/PKGBUILD | 4 | ||||
-rw-r--r-- | core/diffutils/PKGBUILD | 17 | ||||
-rw-r--r-- | core/diffutils/diffutils.install | 4 | ||||
-rw-r--r-- | core/gcc/PKGBUILD | 12 | ||||
-rw-r--r-- | core/gcc/PKGBUILD.mips64el | 25 | ||||
-rw-r--r-- | core/glibc/PKGBUILD | 25 | ||||
-rw-r--r-- | core/gmp/PKGBUILD | 4 | ||||
-rw-r--r-- | core/isl/PKGBUILD | 4 | ||||
-rw-r--r-- | core/libmpc/PKGBUILD | 4 | ||||
-rw-r--r-- | core/links/PKGBUILD | 8 | ||||
-rw-r--r-- | core/linux-api-headers/PKGBUILD | 14 | ||||
-rw-r--r-- | core/mkinitcpio-busybox/PKGBUILD | 8 | ||||
-rw-r--r-- | core/mkinitcpio-busybox/config | 20 | ||||
-rw-r--r-- | core/mpfr/PKGBUILD | 4 | ||||
-rw-r--r-- | core/pcre/PKGBUILD | 8 | ||||
-rw-r--r-- | core/ppl/PKGBUILD | 4 | ||||
-rw-r--r-- | core/sudo/PKGBUILD | 6 | ||||
-rw-r--r-- | core/util-linux/PKGBUILD | 16 | ||||
-rw-r--r-- | core/util-linux/two-component-linux.patch | 32 | ||||
-rw-r--r-- | core/wget/PKGBUILD | 6 | ||||
-rw-r--r-- | core/zlib/PKGBUILD | 11 |
22 files changed, 166 insertions, 74 deletions
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD index b4fc52379..07253158b 100644 --- a/core/binutils/PKGBUILD +++ b/core/binutils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 129398 2011-06-27 11:06:48Z allan $ +# $Id: PKGBUILD 135920 2011-08-20 07:14:19Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc pkgname=binutils pkgver=2.21.1 -pkgrel=1 +pkgrel=2 pkgver=2.21.51 #holdver pkgrel=6 #holdver _date=20110627 diff --git a/core/cloog/PKGBUILD b/core/cloog/PKGBUILD index f53c19480..608a4eb01 100644 --- a/core/cloog/PKGBUILD +++ b/core/cloog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119094 2011-04-10 21:37:04Z allan $ +# $Id: PKGBUILD 135904 2011-08-20 07:13:54Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=cloog pkgver=0.16.2 -pkgrel=1 +pkgrel=2 pkgdesc="Library that generates loops for scanning polyhedra" arch=('i686' 'x86_64' 'mips64el') url="http://www.bastoul.net/cloog/" diff --git a/core/diffutils/PKGBUILD b/core/diffutils/PKGBUILD index 56180aca3..8125571f5 100644 --- a/core/diffutils/PKGBUILD +++ b/core/diffutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 102649 2010-12-09 13:50:53Z stephane $ +# $Id: PKGBUILD 135711 2011-08-18 02:10:15Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=diffutils -pkgver=3.0 -pkgrel=2 +pkgver=3.1 +pkgrel=1 pkgdesc="Utility programs used for creating patch files" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/diffutils" @@ -13,15 +13,20 @@ groups=('base') depends=('glibc' 'sh') install=diffutils.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('7624eb7e6b53ea3ce38958a092d2216e') +md5sums=('fbb1d804849fa32ff5853f028a3be46f') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr make } +check() { + cd ${srcdir}/${pkgname}-${pkgver} + make check +} + package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/core/diffutils/diffutils.install b/core/diffutils/diffutils.install index 3ebec2831..ae6655fba 100644 --- a/core/diffutils/diffutils.install +++ b/core/diffutils/diffutils.install @@ -1,5 +1,5 @@ -infodir=/usr/share/info -filelist=(diff.info) +infodir=usr/share/info +filelist=(diffutils.info) post_install() { [ -x usr/bin/install-info ] || return 0 diff --git a/core/gcc/PKGBUILD b/core/gcc/PKGBUILD index ecba694b3..a5ac9be2b 100644 --- a/core/gcc/PKGBUILD +++ b/core/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 130912 2011-07-09 03:10:41Z allan $ +# $Id: PKGBUILD 135922 2011-08-20 07:14:22Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.6.1 -pkgrel=2 +pkgrel=3 #_snapshot=4.6-20110603 _libstdcppmanver=20110201 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" @@ -66,6 +66,14 @@ build() { --disable-multilib --disable-libstdcxx-pch \ --enable-checking=release make + + # rebuild libssp without -fstack-protector and -D_FORTIFY_SOURCE=2 + # adjusting Makefile.in prior to build still results in these leaking through (yay libtool...) + cd $CHOST/libssp + sed -i -e "s#-fstack-protector#-fno-stack-protector#" \ + -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile + make clean + make } check() { diff --git a/core/gcc/PKGBUILD.mips64el b/core/gcc/PKGBUILD.mips64el index 9b0b02234..f747db1ac 100644 --- a/core/gcc/PKGBUILD.mips64el +++ b/core/gcc/PKGBUILD.mips64el @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 130912 2011-07-09 03:10:41Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 54542 2011-08-20 07:14:14Z allan $ +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: 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' 'gcc-go') pkgver=4.6.1 -pkgrel=2 +pkgrel=3 pkgver=4.6.0 pkgrel=7 # hold ver #_snapshot=4.6-20110603 @@ -71,6 +72,21 @@ build() { --disable-multilib --disable-libstdcxx-pch \ --enable-checking=release make + + # rebuild libssp without -fstack-protector and -D_FORTIFY_SOURCE=2 + # adjusting Makefile.in prior to build still results in these leaking through (yay libtool...) + cd $CHOST/libssp + sed -i -e "s#-fstack-protector#-fno-stack-protector#" \ + -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile + make clean + make + + # rebuild 32-bit libssp + cd ../32/libssp + sed -i -e "s#-fstack-protector#-fno-stack-protector#" \ + -e "s#-D_FORTIFY_SOURCE=2#-U_FORTIFY_SOURCE#" Makefile + make clean + make } check() { @@ -107,6 +123,9 @@ package_gcc-libs() # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc} rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec} + # remove stuff in lib32-gcc-libs + rm -rf ${pkgdir}/usr/lib32 + # remove static libraries find ${pkgdir} -name *.a -delete diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index f3a040236..0008d80ac 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 128661 2011-06-25 11:56:19Z allan $ +# $Id: PKGBUILD 135924 2011-08-20 07:14:27Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,15 +6,15 @@ pkgname=glibc pkgver=2.14 -pkgrel=4 +pkgrel=5 _glibcdate=20110617 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') groups=('base') -depends=('linux-api-headers>=2.6.39' 'tzdata') -makedepends=('gcc>=4.4') +depends=('linux-api-headers>=3.0' 'tzdata') +makedepends=('gcc>=4.6') backup=(etc/locale.gen etc/nscd.conf) options=('!strip') @@ -112,6 +112,10 @@ build() { echo "slibdir=/lib" >> configparms + # remove hardening options from CFLAGS for building libraries + CFLAGS=${CFLAGS/-fstack-protector/} + CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/} + ${srcdir}/glibc/configure --prefix=/usr \ --libdir=/usr/lib --libexecdir=/usr/lib \ --with-headers=/usr/include \ @@ -121,8 +125,19 @@ build() { --enable-bind-now --without-gd \ --without-cvs --disable-profile \ --disable-multi-arch - + + # build libraries with hardening disabled + echo "build-programs=no" >> configparms make + + # re-enable hardening for programs + sed -i "s#=no#=yes#" configparms + echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms + make + + # remove harding in preparation to run test-suite + sed -i '2,4d' configparms } check() { diff --git a/core/gmp/PKGBUILD b/core/gmp/PKGBUILD index 237ae7d68..e8a2c1367 100644 --- a/core/gmp/PKGBUILD +++ b/core/gmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 131961 2011-07-18 11:43:05Z allan $ +# $Id: PKGBUILD 135906 2011-08-20 07:13:57Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gmp pkgver=5.0.2 -pkgrel=2 +pkgrel=3 pkgdesc="A free library for arbitrary precision arithmetic" arch=('i686' 'x86_64' 'mips64el') url="http://gmplib.org/" diff --git a/core/isl/PKGBUILD b/core/isl/PKGBUILD index 9fc3e3ca6..f1253d7bb 100644 --- a/core/isl/PKGBUILD +++ b/core/isl/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119089 2011-04-10 21:34:57Z allan $ +# $Id: PKGBUILD 135908 2011-08-20 07:13:59Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=isl pkgver=0.06 -pkgrel=1 +pkgrel=2 pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints" arch=('i686' 'x86_64' 'mips64el') url="http://www.kotnet.org/~skimo/isl/" diff --git a/core/libmpc/PKGBUILD b/core/libmpc/PKGBUILD index edbdb85f6..df2984082 100644 --- a/core/libmpc/PKGBUILD +++ b/core/libmpc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129838 2011-06-29 04:23:14Z allan $ +# $Id: PKGBUILD 135910 2011-08-20 07:14:03Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> pkgname=libmpc pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="Library for the arithmetic of complex numbers with arbitrarily high precision" arch=('i686' 'x86_64' 'mips64el') url="http://www.multiprecision.org/" diff --git a/core/links/PKGBUILD b/core/links/PKGBUILD index 286f4f46b..c52cf0a05 100644 --- a/core/links/PKGBUILD +++ b/core/links/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 126520 2011-06-06 04:11:26Z eric $ +# $Id: PKGBUILD 135821 2011-08-18 19:55:28Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=links -pkgver=2.3pre2 +pkgver=2.3 pkgrel=1 pkgdesc="A text WWW browser, similar to Lynx" arch=('i686' 'x86_64' 'mips64el') @@ -15,9 +15,9 @@ provides=('links-g') conflicts=('links-g') replaces=('links-g') source=(http://links.twibright.com/download/${pkgname}-${pkgver}.tar.bz2 links.desktop) -md5sums=('4a6970d54f4a9c64b8cf5d83a5815c45' +md5sums=('1dc17862e766cec7c544166186e7167b' '7c47b15aaef51f1de129ff3a2afb7eac') -sha1sums=('5bc210f746559725565bec1d4748b5c56b263ee5' +sha1sums=('0f91e550a80a2bc358ce3bdf48a23504a0582b02' 'f600e27c2a71184444f7dd07a10230aa44463a02') build() { diff --git a/core/linux-api-headers/PKGBUILD b/core/linux-api-headers/PKGBUILD index 1ab9483e7..c0f5c39bf 100644 --- a/core/linux-api-headers/PKGBUILD +++ b/core/linux-api-headers/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 126765 2011-06-07 07:31:07Z allan $ +# $Id: PKGBUILD 135918 2011-08-20 07:14:16Z 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.39.1 -_basever=2.6.39 +pkgver=3.0.1 +_basever=3.0 pkgrel=1 pkgdesc="Kernel headers sanitized for use in userspace" arch=('i686' 'x86_64' 'mips64el') @@ -14,10 +14,10 @@ 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=('1aab7a741abe08d42e8eccf20de61e05' - '215f7ebaafe1175dbc5d1e439c9a96d5') +source=(http://www.kernel.org/pub/linux/kernel/v${_basever}/linux-${_basever}.tar.bz2 + http://www.kernel.org/pub/linux/kernel/v${_basever}/patch-${pkgver}.bz2) +md5sums=('398e95866794def22b12dfbc15ce89c0' + 'ac49f7907f1fc85fbab92d0f1aa1552a') build() { cd ${srcdir}/linux-${_basever} diff --git a/core/mkinitcpio-busybox/PKGBUILD b/core/mkinitcpio-busybox/PKGBUILD index 7458facf3..e2e797741 100644 --- a/core/mkinitcpio-busybox/PKGBUILD +++ b/core/mkinitcpio-busybox/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 123921 2011-05-14 11:29:02Z thomas $ +# $Id: PKGBUILD 135588 2011-08-16 07:52:57Z thomas $ # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgname=mkinitcpio-busybox -pkgver=1.18.4 +pkgver=1.18.5 pkgrel=1 pkgdesc="base initramfs tools" arch=('i686' 'x86_64' 'mips64el') @@ -10,8 +10,8 @@ license=('GPL') depends=('glibc') source=(http://busybox.net/downloads/busybox-${pkgver}.tar.bz2 config) -sha256sums=('4d24d37bd6f1bd153e8cf9a984ec2f32f18464f73ca535e2cc2e8be9694097fa' - 'dd6dca08fbc335f1394e0f1b619df6895349c759d0c6e43456aed411e16d4194') +sha256sums=('10954fcd5c48d8a262a3497b16227bf983a05658bf2bf661af2fdeca773f2fc0' + '0961b4db5eb5eaa1b8d353a3fc792884f4f2733ec0f5715ba88a0e667f0f48ec') build() { cd "${srcdir}/busybox-${pkgver}" diff --git a/core/mkinitcpio-busybox/config b/core/mkinitcpio-busybox/config index 1aa333faf..31a9d4330 100644 --- a/core/mkinitcpio-busybox/config +++ b/core/mkinitcpio-busybox/config @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.18.2 -# Wed Jan 26 23:08:18 2011 +# Busybox version: 1.18.5 +# Sun Aug 14 01:22:25 2011 # CONFIG_HAVE_DOT_CONFIG=y @@ -90,7 +90,7 @@ CONFIG_PREFIX="./_install" # Busybox Library Tuning # CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SIZE_VS_SPEED=3 +CONFIG_MD5_SIZE_VS_SPEED=0 CONFIG_FEATURE_FAST_TOP=y # CONFIG_FEATURE_ETC_NETWORKS is not set # CONFIG_FEATURE_USE_TERMIOS is not set @@ -227,7 +227,7 @@ CONFIG_FEATURE_LS_TIMESTAMPS=y CONFIG_FEATURE_LS_USERNAME=y # CONFIG_FEATURE_LS_COLOR is not set # CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set -# CONFIG_MD5SUM is not set +CONFIG_MD5SUM=y CONFIG_MKDIR=y CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y CONFIG_MKFIFO=y @@ -247,9 +247,9 @@ CONFIG_RM=y CONFIG_RMDIR=y CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y CONFIG_SEQ=y -# CONFIG_SHA1SUM is not set -# CONFIG_SHA256SUM is not set -# CONFIG_SHA512SUM is not set +CONFIG_SHA1SUM=y +CONFIG_SHA256SUM=y +CONFIG_SHA512SUM=y CONFIG_SLEEP=y CONFIG_FEATURE_FANCY_SLEEP=y CONFIG_FEATURE_FLOAT_SLEEP=y @@ -297,7 +297,11 @@ CONFIG_FEATURE_AUTOWIDTH=y # Common options for df, du, ls # CONFIG_FEATURE_HUMAN_READABLE=y -# CONFIG_FEATURE_MD5_SHA1_SUM_CHECK is not set + +# +# Common options for md5sum, sha1sum, sha256sum, sha512sum +# +CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y # # Console Utilities diff --git a/core/mpfr/PKGBUILD b/core/mpfr/PKGBUILD index 78691e05d..75085339e 100644 --- a/core/mpfr/PKGBUILD +++ b/core/mpfr/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 128942 2011-06-25 14:51:58Z allan $ +# $Id: PKGBUILD 135912 2011-08-20 07:14:08Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: damir <damir@archlinux.org> @@ -7,7 +7,7 @@ pkgname=mpfr _pkgver=3.0.1 _patchlevel=p4 pkgver=${_pkgver}.${_patchlevel} -pkgrel=1 +pkgrel=2 pkgdesc="Multiple-precision floating-point library" license=('LGPL') arch=('i686' 'x86_64' 'mips64el') diff --git a/core/pcre/PKGBUILD b/core/pcre/PKGBUILD index 92995bc71..0c1f768fc 100644 --- a/core/pcre/PKGBUILD +++ b/core/pcre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 106454 2011-01-17 12:49:41Z allan $ +# $Id: PKGBUILD 135715 2011-08-18 02:10:20Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=pcre -pkgver=8.12 +pkgver=8.13 pkgrel=1 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('BSD') depends=('gcc-libs') options=('!libtool') source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2) -md5sums=('f14a9fef3c92f3fc6c5ac92d7a2c7eb3') -sha1sums=('2219b372bff53ee29a7e44ecf5977ad15df01cea') +md5sums=('5e595edbcded141813fa1a10dbce05cb') + build() { cd "${srcdir}"/${pkgname}-${pkgver} diff --git a/core/ppl/PKGBUILD b/core/ppl/PKGBUILD index 649f2b572..193da1a19 100644 --- a/core/ppl/PKGBUILD +++ b/core/ppl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 129854 2011-06-29 04:31:09Z allan $ +# $Id: PKGBUILD 135914 2011-08-20 07:14:11Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: ezzetabi <ezzetabi at gawab dot com> pkgname=ppl pkgver=0.11.2 -pkgrel=1 +pkgrel=2 pkgdesc="A modern library for convex polyhedra and other numerical abstractions." arch=('i686' 'x86_64' 'mips64el') url="http://www.cs.unipr.it/ppl" diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index fcb315b9e..d26d3fc2f 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 124889 2011-05-24 21:47:33Z eric $ +# $Id: PKGBUILD 135926 2011-08-20 07:14:30Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_ver=1.8.1p2 +_ver=1.8.2 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -15,7 +15,7 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool' '!makeflags') source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz sudo.pam) -md5sums=('e8330f0e63b0ecb2e12b5c76922818cc' +md5sums=('000f458e7391be9fdf459a9ad6a4912a' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD index 5828eafd3..6bb6c2676 100644 --- a/core/util-linux/PKGBUILD +++ b/core/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 123897 2011-05-14 09:14:06Z tpowa $ -# Maintainer: +# $Id: PKGBUILD 135595 2011-08-16 14:10:53Z tomegun $ +# Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.19.1 -pkgrel=2 +pkgrel=3 pkgdesc="Miscellaneous system utilities for Linux" url="http://userweb.kernel.org/~kzak/util-linux-ng/" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,14 @@ provides=('linux32' "util-linux-ng=${pkgver}") license=('GPL2') options=('!libtool') source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.19/${pkgname}-${pkgver}.tar.bz2 - mount-segfault-2.19.1.patch) + mount-segfault-2.19.1.patch + two-component-linux.patch) optdepends=('perl: for chkdupexe support') -md5sums=('3eab06f05163dfa65479c44e5231932c' - '3247b52f0e4b8044f23f2f7218e2fdea') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # add support for linux 3.0, which is needed mkswap + patch -Np1 -i ../two-component-linux.patch # fix https://bugs.archlinux.org/task/24261 patch -Np1 -i ../mount-segfault-2.19.1.patch # hardware clock @@ -36,3 +37,6 @@ package() { install -dm755 "${pkgdir}/var/lib/hwclock" make DESTDIR="${pkgdir}" install } +md5sums=('3eab06f05163dfa65479c44e5231932c' + '3247b52f0e4b8044f23f2f7218e2fdea' + '6eb23edb484adf7192e107d1c6d94bd3') diff --git a/core/util-linux/two-component-linux.patch b/core/util-linux/two-component-linux.patch new file mode 100644 index 000000000..1b65ca295 --- /dev/null +++ b/core/util-linux/two-component-linux.patch @@ -0,0 +1,32 @@ +From fa7e0d6d442de9f5940f99fd93f4522602439131 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Mon, 6 Jun 2011 12:35:26 +0200 +Subject: [PATCH] lib: [linux_version.c] accommodate two-component linux + version (e.g. 3.0) + +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + lib/linux_version.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lib/linux_version.c b/lib/linux_version.c +index f9fbd8d..ada566a 100644 +--- a/lib/linux_version.c ++++ b/lib/linux_version.c +@@ -16,10 +16,10 @@ get_linux_version (void) + return kver; + if (uname (&uts)) + kver = 0; +- else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) != 3) +- kver = 0; +- else ++ else if (sscanf (uts.release, "%d.%d.%d", &major, &minor, &teeny) == 3) + kver = KERNEL_VERSION (major, minor, teeny); ++ else if (sscanf (uts.release, "%d.%d", &major, &minor) == 2) ++ kver = KERNEL_VERSION (major, minor, 0); + + return kver; + } +-- +1.7.6 + diff --git a/core/wget/PKGBUILD b/core/wget/PKGBUILD index 0ac83efc3..0d627a3e9 100644 --- a/core/wget/PKGBUILD +++ b/core/wget/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135508 2011-08-14 11:32:07Z allan $ +# $Id: PKGBUILD 135713 2011-08-18 02:10:18Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=wget -pkgver=1.13 +pkgver=1.13.1 pkgrel=1 pkgdesc="A network utility to retrieve files from the Web" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ optdepends=('ca-certificates: HTTPS downloads') backup=('etc/wgetrc') install=wget.install source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz) -md5sums=('48c5384123156e7b7501d2f5b5c7189a') +md5sums=('5c9056fcec2f398111e97be65e8592cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/core/zlib/PKGBUILD b/core/zlib/PKGBUILD index cbf9bdaef..e92f893de 100644 --- a/core/zlib/PKGBUILD +++ b/core/zlib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 100000 2010-11-19 17:40:38Z pierre $ +# $Id: PKGBUILD 135916 2011-08-20 07:14:14Z allan $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=zlib pkgver=1.2.5 -pkgrel=3 +pkgrel=4 pkgdesc='Compression library implementing the deflate compression method found in gzip and PKZIP' arch=('i686' 'x86_64' 'mips64el') license=('custom') @@ -18,7 +18,7 @@ md5sums=('c735eab2d659a96e5a594c9e8541ad63' build() { cd ${srcdir}/zlib-$pkgver # see http://bugs.archlinux.org/task/19280 - patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch || return 1 + patch -p1 -i ${srcdir}/zlib-1.2.5-lfs-decls.patch # work around gcc bug; see https://bugs.archlinux.org/task/20647 export CFLAGS="${CFLAGS/-O2/-O3} -fno-tree-vectorize -DUNALIGNED_OK" ./configure --prefix=/usr @@ -27,6 +27,11 @@ build() { grep -A 24 '^ Copyright' zlib.h > LICENSE } +check() { + cd ${srcdir}/zlib-$pkgver + make check +} + package() { cd ${srcdir}/zlib-$pkgver make install DESTDIR=${pkgdir} |