From 9254c2bc6500471b22eead69781ddef84f87e2bf Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Aug 2011 23:14:30 +0000 Subject: Tue Aug 23 23:14:30 UTC 2011 --- testing/cloog/PKGBUILD | 8 ++-- testing/gcc/PKGBUILD | 28 ++++------- testing/isl/PKGBUILD | 10 ++-- testing/logrotate/PKGBUILD | 48 +++++++++++++++++++ testing/logrotate/logrotate-3.8.0-noasprintf.patch | 55 ++++++++++++++++++++++ testing/logrotate/logrotate.conf | 31 ++++++++++++ testing/logrotate/logrotate.cron.daily | 3 ++ testing/net-tools/PKGBUILD | 4 +- testing/pcre/PKGBUILD | 21 +++++++-- testing/pcre/r661.diff | 26 ++++++++++ 10 files changed, 200 insertions(+), 34 deletions(-) create mode 100644 testing/logrotate/PKGBUILD create mode 100644 testing/logrotate/logrotate-3.8.0-noasprintf.patch create mode 100644 testing/logrotate/logrotate.conf create mode 100755 testing/logrotate/logrotate.cron.daily create mode 100644 testing/pcre/r661.diff (limited to 'testing') diff --git a/testing/cloog/PKGBUILD b/testing/cloog/PKGBUILD index 1b26aee0f..0f99d53d7 100644 --- a/testing/cloog/PKGBUILD +++ b/testing/cloog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135495 2011-08-14 09:41:50Z allan $ +# $Id: PKGBUILD 136092 2011-08-23 01:52:17Z heftig $ # Maintainer: Allan McRae pkgname=cloog -pkgver=0.16.2 -pkgrel=2 +pkgver=0.16.3 +pkgrel=1 pkgdesc="Library that generates loops for scanning polyhedra" arch=('i686' 'x86_64') url="http://www.bastoul.net/cloog/" @@ -12,7 +12,7 @@ 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') +md5sums=('a0f8a241cd1c4f103f8d2c91642b3498') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD index 559239a1f..cf21a0880 100644 --- a/testing/gcc/PKGBUILD +++ b/testing/gcc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135498 2011-08-14 09:49:10Z allan $ +# $Id: PKGBUILD 136096 2011-08-23 01:52:22Z heftig $ # Maintainer: Allan McRae # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,9 +6,9 @@ pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go') pkgver=4.6.1 -pkgrel=3 -#_snapshot=4.6-20110603 -_libstdcppmanver=20110201 # Note: check source directory name when updating this +pkgrel=4 +_snapshot=4.6-20110819 +_libstdcppmanver=20110814 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL' 'custom') @@ -16,13 +16,13 @@ url="http://gcc.gnu.org" makedepends=('binutils>=2.21-9' 'libmpc' 'cloog' 'ppl' 'gcc-ada') checkdepends=('dejagnu') options=('!libtool' '!emptydirs') -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 - #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 +source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2 + ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_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=('c57a9170c677bf795bdc04ed796ca491' - '1e9fd2eaf0ee47ea64e82c48998f1999' +md5sums=('b14d22730f9085eab7fd927039e68d28' + 'ce920d2550ff7e042b9f091d27764d8f' '4030ee1c08dd1e843c0225b772360e76' '4df25b623799b148a0703eaeec8fdf3f') @@ -63,17 +63,9 @@ build() { --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 \ + --disable-multilib --disable-libssp --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() { @@ -97,7 +89,7 @@ package_gcc-libs() cd gcc-build make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared - for lib in libmudflap libgomp libssp libstdc++-v3/src; do + for lib in libmudflap libgomp libstdc++-v3/src; do make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES done make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install diff --git a/testing/isl/PKGBUILD b/testing/isl/PKGBUILD index 5a118360a..e15ced106 100644 --- a/testing/isl/PKGBUILD +++ b/testing/isl/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 135492 2011-08-14 09:39:59Z allan $ +# $Id: PKGBUILD 136094 2011-08-23 01:52:18Z heftig $ # Maintainer: Allan McRae pkgname=isl -pkgver=0.06 -pkgrel=2 +pkgver=0.07 +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') +md5sums=('0d1a38db9f1c7d526758092b985827ea') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,5 +29,5 @@ package() { # 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 + mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.7.0.0-gdb.py } diff --git a/testing/logrotate/PKGBUILD b/testing/logrotate/PKGBUILD new file mode 100644 index 000000000..eac5714c2 --- /dev/null +++ b/testing/logrotate/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 136073 2011-08-22 13:06:08Z allan $ +# Maintainer: Aaron Griffin +# Contributor: Judd Vinet + +pkgname=logrotate +pkgver=3.8.0 +pkgrel=2 +pkgdesc="Rotates system logs automatically" +arch=('i686' 'x86_64') +url="https://fedorahosted.org/logrotate/" +license=('GPL') +groups=('base') +depends=('popt' 'cron' 'gzip') +backup=('etc/logrotate.conf') +source=(https://fedorahosted.org/releases/l/o/logrotate/logrotate-${pkgver}.tar.gz + logrotate-3.8.0-noasprintf.patch + logrotate.conf + logrotate.cron.daily) +md5sums=('590f77c13077a4c384dbec7ca9c5f242' + '624801859beb9abe7958b6392c854d72' + '462a5f364717461537eb2ae6394ad23e' + '8e23d5d4cc29b1e055b24df87e355cdc') + +build() { + cd "$srcdir/${pkgname}-${pkgver}" + + patch -Np1 -i "$srcdir"/logrotate-3.8.0-noasprintf.patch + + sed -i 's|#define DEFAULT_MAIL_COMMAND .*|#define DEFAULT_MAIL_COMMAND "/usr/bin/mail"|'\ + config.h + sed -i "s|CFLAGS = -Wall|CFLAGS = -Wall $CFLAGS|" Makefile + sed -i 's|$(BASEDIR)/man|$(BASEDIR)/share/man|' Makefile + + make +} + +check() { + cd "$srcdir/${pkgname}-${pkgver}" + make test +} + +package() { + cd "$srcdir/${pkgname}-${pkgver}" + make PREFIX="$pkgdir" install + + install -Dm644 "$srcdir/logrotate.conf" "$pkgdir/etc/logrotate.conf" + install -Dm744 "$srcdir/logrotate.cron.daily" "$pkgdir/etc/cron.daily/logrotate" +} diff --git a/testing/logrotate/logrotate-3.8.0-noasprintf.patch b/testing/logrotate/logrotate-3.8.0-noasprintf.patch new file mode 100644 index 000000000..b9464e230 --- /dev/null +++ b/testing/logrotate/logrotate-3.8.0-noasprintf.patch @@ -0,0 +1,55 @@ +diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/config.c logrotate-3.8.0/config.c +--- logrotate-3.8.0.orig/config.c 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate-3.8.0/config.c 2011-07-12 13:47:36.274319050 -0400 +@@ -41,39 +41,6 @@ + #endif + #endif + +-#if !defined(asprintf) +-#include +- +-int asprintf(char **string_ptr, const char *format, ...) +-{ +- va_list arg; +- char *str; +- int size; +- int rv; +- +- va_start(arg, format); +- size = vsnprintf(NULL, 0, format, arg); +- size++; +- va_start(arg, format); +- str = malloc(size); +- if (str == NULL) { +- va_end(arg); +- /* +- * Strictly speaking, GNU asprintf doesn't do this, +- * but the caller isn't checking the return value. +- */ +- fprintf(stderr, "failed to allocate memory\\n"); +- exit(1); +- } +- rv = vsnprintf(str, size, format, arg); +- va_end(arg); +- +- *string_ptr = str; +- return (rv); +-} +- +-#endif +- + enum { + STATE_DEFAULT = 2, + STATE_SKIP_LINE = 4, +diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN logrotate-3.8.0.orig/logrotate.h logrotate-3.8.0/logrotate.h +--- logrotate-3.8.0.orig/logrotate.h 2011-06-21 04:12:02.000000000 -0400 ++++ logrotate-3.8.0/logrotate.h 2011-07-12 13:47:38.949285608 -0400 +@@ -66,8 +66,5 @@ extern int numLogs; + extern int debug; + + int readAllConfigPaths(const char **paths); +-#if !defined(asprintf) +-int asprintf(char **string_ptr, const char *format, ...); +-#endif + + #endif diff --git a/testing/logrotate/logrotate.conf b/testing/logrotate/logrotate.conf new file mode 100644 index 000000000..88b4935cd --- /dev/null +++ b/testing/logrotate/logrotate.conf @@ -0,0 +1,31 @@ +# see "man logrotate" for details +# rotate log files weekly +weekly + +# keep 4 weeks worth of backlogs +rotate 4 + +# restrict maximum size of log files +#size 20M + +# create new (empty) log files after rotating old ones +create + +# uncomment this if you want your log files compressed +#compress + +# Logs are moved into directory for rotation +# olddir /var/log/archive + +# Ignore pacman saved files +tabooext + .pacorig .pacnew .pacsave + +# Arch packages drop log rotation information into this directory +include /etc/logrotate.d + +/var/log/wtmp { + monthly + create 0664 root root + rotate 1 +} + diff --git a/testing/logrotate/logrotate.cron.daily b/testing/logrotate/logrotate.cron.daily new file mode 100755 index 000000000..e8ab921ea --- /dev/null +++ b/testing/logrotate/logrotate.cron.daily @@ -0,0 +1,3 @@ +#!/bin/sh + +/usr/sbin/logrotate /etc/logrotate.conf diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD index 68a081571..c12969f29 100644 --- a/testing/net-tools/PKGBUILD +++ b/testing/net-tools/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 135870 2011-08-19 21:16:25Z eric $ +# $Id: PKGBUILD 136068 2011-08-22 12:40:31Z allan $ # Maintainer: Ronald van Haren # Contributor: judd @@ -16,7 +16,7 @@ depends=('glibc') source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2 net-tools-1.60-miiioctl.patch net-tools-1.60-nameif_strncpy.patch) -#options=(!makeflags) +options=(!makeflags) install=net-tools.install sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf' '654a96bc6575efb4a2e04b49de45d448d240eb6e' diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD index d66b7c8ff..e00105faa 100644 --- a/testing/pcre/PKGBUILD +++ b/testing/pcre/PKGBUILD @@ -1,28 +1,39 @@ -# $Id: PKGBUILD 135641 2011-08-16 22:23:31Z allan $ +# $Id: PKGBUILD 136064 2011-08-22 11:33:49Z allan $ # Maintainer: Allan McRae # Contributor: Eric Belanger # Contributor: John Proctor pkgname=pcre pkgver=8.13 -pkgrel=1 +pkgrel=2 pkgdesc="A library that implements Perl 5-style regular expressions" arch=('i686' 'x86_64') url="http://www.pcre.org/" license=('BSD') depends=('gcc-libs') options=('!libtool') -source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2) -md5sums=('5e595edbcded141813fa1a10dbce05cb') - +source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2 + r661.diff) +md5sums=('5e595edbcded141813fa1a10dbce05cb' + '70e2725b46ff6f3f114ce5067fd03405') build() { cd "${srcdir}"/${pkgname}-${pkgver} + + # http://bugs.exim.org/show_bug.cgi?id=1136 + patch -Np2 -i "${srcdir}"/r661.diff + sed -i '12140d' testdata/testoutput2 + [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC" ./configure --prefix=/usr --enable-utf8 --enable-unicode-properties make } +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install diff --git a/testing/pcre/r661.diff b/testing/pcre/r661.diff new file mode 100644 index 000000000..7bed4ce2e --- /dev/null +++ b/testing/pcre/r661.diff @@ -0,0 +1,26 @@ +--- code/trunk/pcre_compile.c 2011/08/02 11:00:40 654 ++++ code/trunk/pcre_compile.c 2011/08/21 09:00:54 661 +@@ -2295,8 +2295,13 @@ + A user pointed out that PCRE was rejecting [:a[:digit:]] whereas Perl was not. + It seems that the appearance of a nested POSIX class supersedes an apparent + external class. For example, [:a[:digit:]b:] matches "a", "b", ":", or +-a digit. Also, unescaped square brackets may also appear as part of class +-names. For example, [:a[:abc]b:] gives unknown class "[:abc]b:]"in Perl. ++a digit. ++ ++In Perl, unescaped square brackets may also appear as part of class names. For ++example, [:a[:abc]b:] gives unknown POSIX class "[:abc]b:]". However, for ++[:a[:abc]b][b:] it gives unknown POSIX class "[:abc]b][b:]", which does not ++seem right at all. PCRE does not allow closing square brackets in POSIX class ++names. + + Arguments: + ptr pointer to the initial [ +@@ -2314,6 +2319,7 @@ + { + if (*ptr == CHAR_BACKSLASH && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) + ptr++; ++ else if (*ptr == CHAR_RIGHT_SQUARE_BRACKET) return FALSE; + else + { + if (*ptr == terminator && ptr[1] == CHAR_RIGHT_SQUARE_BRACKET) -- cgit v1.2.3-54-g00ecf