From e0f65a739c6445de07de1585e72c230958d8f011 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 14 Jul 2012 00:01:45 +0000 Subject: Sat Jul 14 00:01:45 UTC 2012 --- testing/iputils/PKGBUILD | 13 +++++++++---- .../iputils/iputils-20101006-ping-integer-overflow.patch | 11 +++++++++++ testing/poppler/PKGBUILD | 6 +++--- testing/util-linux/PKGBUILD | 4 ++-- testing/util-linux/util-linux.install | 4 +++- 5 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 testing/iputils/iputils-20101006-ping-integer-overflow.patch (limited to 'testing') diff --git a/testing/iputils/PKGBUILD b/testing/iputils/PKGBUILD index f5c5d4e3c..6b5348b45 100644 --- a/testing/iputils/PKGBUILD +++ b/testing/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162019 2012-06-18 20:29:20Z stephane $ +# $Id: PKGBUILD 163462 2012-07-12 10:24:03Z stephane $ # Maintainer: Stéphane Gaudreault # Maintainer: Tobias Powalowski # Contributor: Aaron Griffin pkgname=iputils pkgver=20101006 -pkgrel=3 +pkgrel=4 pkgdesc="IP Configuration Utilities (and Ping)" arch=('i686' 'x86_64') license=('GPL') @@ -18,9 +18,11 @@ conflicts=('netkit-base' 'arping' 'netkit-tftpd') replaces=('netkit-base') backup=(etc/xinetd.d/tftp) install=${pkgname}.install -source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd) +source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd + iputils-20101006-ping-integer-overflow.patch) sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242' - 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd') + 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd' + 'ec78574d798b53e4f8bdd37e42514fc17ed71667') build() { cd "${srcdir}/${pkgname}-s${pkgver}" @@ -28,6 +30,9 @@ build() { # Use our CFLAGS sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile + # FS#28897 + patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch + make cd doc diff --git a/testing/iputils/iputils-20101006-ping-integer-overflow.patch b/testing/iputils/iputils-20101006-ping-integer-overflow.patch new file mode 100644 index 000000000..720e5e888 --- /dev/null +++ b/testing/iputils/iputils-20101006-ping-integer-overflow.patch @@ -0,0 +1,11 @@ +--- iputils-s20101006/ping_common.c 2010-10-06 13:59:20.000000000 +0200 ++++ iputils-s20101006-patched/ping_common.c 2012-03-09 16:42:46.878151032 +0100 +@@ -590,7 +590,7 @@ + + /* If we are here, recvmsg() is unable to wait for + * required timeout. */ +- if (1000*next <= 1000000/(int)HZ) { ++ if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) { + /* Very short timeout... So, if we wait for + * something, we sleep for MININTERVAL. + * Otherwise, spin! */ diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD index 77d2c39e8..a5ef22a42 100644 --- a/testing/poppler/PKGBUILD +++ b/testing/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162295 2012-06-24 19:25:19Z foutrelis $ +# $Id: PKGBUILD 163466 2012-07-12 14:37:16Z andyrtr $ # Maintainer: Jan de Groot pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.1 +pkgver=0.20.2 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('a61e3b844061f5324512a16d6d16984c' +md5sums=('45dd2c16c8c4d1a39e830e45745c4e25' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index 2dc698974..73d1c6cd4 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163397 2012-07-11 22:26:49Z tomegun $ +# $Id: PKGBUILD 163482 2012-07-13 02:30:58Z tomegun $ # Maintainer: Tom Gundersen # Contributor: judd pkgname=util-linux pkgver=2.21.2 -pkgrel=4 +pkgrel=5 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install index fa27d4555..90ce5bd73 100644 --- a/testing/util-linux/util-linux.install +++ b/testing/util-linux/util-linux.install @@ -3,6 +3,8 @@ post_upgrade() { if [ -f /var/lib/hwclock/adjtime ]; then mv /var/lib/hwclock/adjtime /etc/adjtime fi - rmdir /var/lib/hwclock + if [ -d /var/lib/hwclock ]; then + rmdir /var/lib/hwclock + fi fi } -- cgit v1.2.3-54-g00ecf