diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-23 13:22:09 -0300 |
| commit | 2906c522e750f7e013d7af606f01ad849a7d3876 (patch) | |
| tree | d62491c93d6534817db7f9b7d07adf64b9670b48 /core | |
| parent | 193046ad8ed67a836ffe11e235296e6201e56ce8 (diff) | |
| parent | bd614ac21d2754d778a796cd5e92d1568ec8baec (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/mesa/PKGBUILD
extra/nmap/PKGBUILD
extra/openmpi/PKGBUILD
extra/rasqal/PKGBUILD
extra/sqlite/PKGBUILD
extra/totem/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-libcups/PKGBUILD
multilib/lib32-mesa/PKGBUILD
staging/libreoffice/PKGBUILD
testing/udev/PKGBUILD
testing/udev/initcpio-hooks-udev
testing/udev/initcpio-install-udev
Diffstat (limited to 'core')
| -rw-r--r-- | core/perl/PKGBUILD | 7 | ||||
| -rw-r--r-- | core/sudo/PKGBUILD | 8 |
2 files changed, 10 insertions, 5 deletions
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index c32205957..9f237b803 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 146927 2012-01-19 10:01:03Z bluewind $ +# $Id: PKGBUILD 159280 2012-05-20 20:41:32Z bluewind $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> @@ -28,6 +28,11 @@ md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26' '490852b3d77c3b3866d0d75f5fbf5c5d' 'c25d86206d649046538c3daab7874564') +# workaround to let the integrity check find the correct provides array +if [[ ${0##*/} = "parse_pkgbuilds.sh" ]]; then + true && provides=($(bsdtar -q -O -xf "/srv/ftp/pool/packages/$pkgname-$pkgver-$pkgrel-$CARCH.pkg.tar.xz" .PKGINFO | sed -rn 's#^provides = (.*)#\1#p')) +fi + build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/core/sudo/PKGBUILD b/core/sudo/PKGBUILD index d2cc1bd32..0dc89a5c0 100644 --- a/core/sudo/PKGBUILD +++ b/core/sudo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 153502 2012-03-15 08:12:52Z allan $ +# $Id: PKGBUILD 159265 2012-05-20 05:50:51Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sudo -_ver=1.8.4p4 +_ver=1.8.5p1 pkgver=${_ver/[a-z]/.${_ver//[0-9.]/}} pkgrel=1 pkgdesc="Give certain users the ability to run some commands as root" @@ -15,8 +15,8 @@ backup=('etc/sudoers' 'etc/pam.d/sudo') options=('!libtool' '!makeflags') source=(ftp://ftp.sudo.ws/pub/sudo/$pkgname-$_ver.tar.gz{,.sig} sudo.pam) -md5sums=('b9be6df7ecefedff2263052ed9fc5e93' - '24da0bf96506b81678726778aad9ea4c' +md5sums=('3b843e60e0bb226a24dd784345cbbba8' + '0f789f30462c2658afe9bd16602d76b1' '4e7ad4ec8f2fe6a40e12bcb2c0b256e3') build() { |