summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/bash/PKGBUILD20
-rw-r--r--core/iputils/PKGBUILD13
-rw-r--r--core/iputils/iputils-20101006-ping-integer-overflow.patch11
-rw-r--r--core/pcre/PKGBUILD8
-rw-r--r--core/pkg-config/PKGBUILD15
-rw-r--r--core/readline/PKGBUILD8
-rw-r--r--core/usbutils/PKGBUILD13
7 files changed, 58 insertions, 30 deletions
diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD
index 956361d38..1749c7168 100644
--- a/core/bash/PKGBUILD
+++ b/core/bash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 160448 2012-06-02 03:17:38Z allan $
+# $Id: PKGBUILD 163494 2012-07-13 12:31:26Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
pkgname=bash
_basever=4.2
-_patchlevel=029 #prepare for some patches
+_patchlevel=036 #prepare for some patches
pkgver=$_basever.$_patchlevel
pkgrel=1
pkgdesc="The GNU Bourne Again shell"
@@ -136,4 +136,18 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0'
'da9265aa2527fd4a7481baa3e0550287'
'0043f8b75f46f43608a67b863e300fe8'
'ec444d229e8899fbaaf6fc7de2d82ae6'
- 'b632fca3a4943825bfaf3bd29df6b27d')
+ 'b632fca3a4943825bfaf3bd29df6b27d'
+ 'b4bc1c4dc1b508ff9cdfc44f1a5039b5'
+ '2ffa9a802bbd57540021715f84cc76f4'
+ '89390ff6a3c2ef7e09dd4b8b097a8e56'
+ '3e9b529ef3726b75d125d678de76977f'
+ 'eee08003395c417f677d1a4bf8c548ee'
+ 'f670f7672b11d0df8c31885dbf15f390'
+ '2fe070dd6d75d8ff16f269184a16e9c4'
+ '5018b6b7737808141043b57cf4eb842d'
+ '4e610506c1711bf3483b965800ac3d5d'
+ 'cb65e541f9b60a8cb1fe58404f264b73'
+ '7cd9bfdf7cbfd45274d07620ee94c8d9'
+ 'a7d2eace0da5fd236c93dbfd93458838'
+ '9c3142956064d175a880bcb186e51ef9'
+ 'a1a87649853f20fe99572ddc02b0c67f')
diff --git a/core/iputils/PKGBUILD b/core/iputils/PKGBUILD
index efc4eda5c..e72795dd3 100644
--- a/core/iputils/PKGBUILD
+++ b/core/iputils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162361 2012-06-25 20:10:09Z stephane $
+# $Id: PKGBUILD 163489 2012-07-13 11:24:04Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Aaron Griffin <aaron@archlinux.org>
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/core/iputils/iputils-20101006-ping-integer-overflow.patch b/core/iputils/iputils-20101006-ping-integer-overflow.patch
new file mode 100644
index 000000000..720e5e888
--- /dev/null
+++ b/core/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/core/pcre/PKGBUILD b/core/pcre/PKGBUILD
index f9290cebf..08a9117a6 100644
--- a/core/pcre/PKGBUILD
+++ b/core/pcre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149938 2012-02-11 23:29:42Z allan $
+# $Id: PKGBUILD 163492 2012-07-13 12:30:53Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: Eric Belanger <eric@archlinux.org>
# Contributor: John Proctor <jproctor@prium.net>
pkgname=pcre
-pkgver=8.30
+pkgver=8.31
pkgrel=1
pkgdesc="A library that implements Perl 5-style regular expressions"
arch=('i686' 'x86_64')
@@ -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{,.sig})
-md5sums=('98e8928cccc945d04279581e778fbdff'
- '01eee0333fa71687e0b6756db77f94ad')
+md5sums=('1c9a276af932b5599157f96e945391f0'
+ '873bcd2cd9f1e0aa1e28e256b3e31506')
build() {
cd "${srcdir}"/${pkgname}-${pkgver}
diff --git a/core/pkg-config/PKGBUILD b/core/pkg-config/PKGBUILD
index b671db33e..a235d17d8 100644
--- a/core/pkg-config/PKGBUILD
+++ b/core/pkg-config/PKGBUILD
@@ -1,28 +1,25 @@
-# $Id: PKGBUILD 156205 2012-04-16 03:57:28Z allan $
+# $Id: PKGBUILD 163491 2012-07-13 12:30:49Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Committer: Judd Vinet <jvinet@zeroflux.org>
pkgname=pkg-config
-pkgver=0.26
-pkgrel=2
+pkgver=0.27
+pkgrel=1
pkgdesc="A system for managing library compile/link flags"
arch=('i686' 'x86_64')
url="http://pkgconfig.freedesktop.org/wiki/"
license=('GPL')
groups=('base-devel')
-depends=('glibc' 'popt' 'glib2')
+depends=('glib2')
provides=("pkgconfig=${pkgver}")
conflicts=('pkgconfig')
replaces=('pkgconfig')
source=(http://pkgconfig.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('47525c26a9ba7ba14bf85e01509a7234')
+md5sums=('3a4c9feab14b6719afd8904945d9b4e4')
build() {
cd ${srcdir}/${pkgname}-${pkgver}
-
- # Use system popt
- ./configure --prefix=/usr --with-installed-popt
-
+ ./configure --prefix=/usr
make
}
diff --git a/core/readline/PKGBUILD b/core/readline/PKGBUILD
index f54f18351..b2b924f2d 100644
--- a/core/readline/PKGBUILD
+++ b/core/readline/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156214 2012-04-16 06:12:04Z allan $
+# $Id: PKGBUILD 163490 2012-07-13 12:30:45Z allan $
# Maintainer: Allan McRae <allan@archlinux.org>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=readline
_basever=6.2
-_patchlevel=002 #prepare for some patches
+_patchlevel=003 #prepare for some patches
pkgver=$_basever.$_patchlevel
pkgrel=2
pkgdesc="GNU readline library"
@@ -28,7 +28,9 @@ md5sums=('67948acb2ca081f23359d0256e9a271c'
'83287d52a482f790dfb30ec0a8746669'
'8e6a51e2e0e6e45a82752e3692c111ac'
'0665020ea118e8434bd145fb71f452cc'
- '285361ca6d48c51ae2428157e174e812')
+ '285361ca6d48c51ae2428157e174e812'
+ 'c9d5d79718856e711667dede87cb7622'
+ '4437205bb1462f5f32e4812b8292c675')
build() {
cd ${srcdir}/${pkgname}-$_basever
diff --git a/core/usbutils/PKGBUILD b/core/usbutils/PKGBUILD
index 65b4963cb..08513e513 100644
--- a/core/usbutils/PKGBUILD
+++ b/core/usbutils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 159404 2012-05-23 20:09:22Z tomegun $
+# $Id: PKGBUILD 163502 2012-07-13 16:29:26Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Contributor: Tom Gundersen <teg@jklm.no>
# Contributor: Judd Vinet <jvinet@zeroflux.org>
# Contributor: Curtis Campbell <curtisjamescampbell@hotmail.com>
pkgname=usbutils
-pkgver=005
-pkgrel=2
+pkgver=006
+pkgrel=1
pkgdesc="USB Device Utilities"
arch=(i686 x86_64)
license=('GPL')
@@ -14,9 +14,10 @@ depends=('libusb' 'hwids')
optdepends=('python2: for lsusb.py usage'
'coreutils: for lsusb.py usage')
url="http://linux-usb.sourceforge.net/"
-# currently broken: http://www.kernel.org/pub/linux/utils/usb/$pkgname/$pkgname-$pkgver.tar.gz
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+source=("http://www.kernel.org/pub/linux/utils/usb/usbutils/${pkgname}-${pkgver}.tar.xz"
fix-python2.patch)
+md5sums=('c9aa14ee3d6c991fda183f42cf72a8a8'
+ '45766196895b4cc50b53cd56e1bbf3d1')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -32,5 +33,3 @@ package() {
# this is now in the hwids package
rm -rf $pkgdir/usr/{share/hwdata,sbin}
}
-md5sums=('6a21f7b6c02b76df5e8a7c208d746654'
- '45766196895b4cc50b53cd56e1bbf3d1')
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-13 22:44:45 +0000