diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/gzip/PKGBUILD | 11 | ||||
| -rw-r--r-- | core/gzip/gzip-1.5-yesno-declaration.patch | 36 | ||||
| -rw-r--r-- | core/perl/PKGBUILD | 30 |
3 files changed, 58 insertions, 19 deletions
diff --git a/core/gzip/PKGBUILD b/core/gzip/PKGBUILD index f3a6aa28c..fc9052e7e 100644 --- a/core/gzip/PKGBUILD +++ b/core/gzip/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 176246 2013-01-28 00:29:24Z allan $ +# $Id: PKGBUILD 177557 2013-02-07 05:59:16Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=gzip pkgver=1.5 -pkgrel=2 +pkgrel=3 pkgdesc="GNU compression utility" arch=('i686' 'x86_64') url="http://www.gnu.org/software/gzip/" @@ -12,13 +12,16 @@ license=('GPL3') groups=('base' 'base-devel') depends=('glibc' 'bash') install=gzip.install -source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig}) +source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig} + gzip-1.5-yesno-declaration.patch) md5sums=('2a431e169b6f62f7332ef6d47cc53bae' - '2de95937a3f65137acf9c55d4ad0447a') + '2de95937a3f65137acf9c55d4ad0447a' + 'd63249578de2eb6aadaded26918d8eed') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr + patch -p1 -i $srcdir/gzip-1.5-yesno-declaration.patch make } diff --git a/core/gzip/gzip-1.5-yesno-declaration.patch b/core/gzip/gzip-1.5-yesno-declaration.patch new file mode 100644 index 000000000..518ec6a49 --- /dev/null +++ b/core/gzip/gzip-1.5-yesno-declaration.patch @@ -0,0 +1,36 @@ +From e40a9b65ae95ed6face7ce1336905f0ab0a4992b Mon Sep 17 00:00:00 2001 +From: Paul Eggert <eggert@cs.ucla.edu> +Date: Tue, 05 Feb 2013 21:37:40 +0000 +Subject: gzip: fix bug where you say "n" and gzip acts as if you said "y" + +Problem reported for GCC 4.7 x86-64 -O2 by Allan McRae in +<http://lists.gnu.org/archive/html/bug-gzip/2013-02/msg00000.html>. +* NEWS: Document this. Use consistent format in earlier note. +* gzip.c: Include yesno.h. +* gzip.h (yesno): Remove decl; that's yesno.h's job. +--- +diff --git a/gzip.c b/gzip.c +index b9b4d64..66529e0 100644 +--- a/gzip.c ++++ b/gzip.c +@@ -74,6 +74,7 @@ static char const *const license_msg[] = { + #include "ignore-value.h" + #include "stat-time.h" + #include "version.h" ++#include "yesno.h" + + /* configuration */ + +diff --git a/gzip.h b/gzip.h +index bf253d0..648073e 100644 +--- a/gzip.h ++++ b/gzip.h +@@ -321,6 +321,3 @@ extern void fprint_off (FILE *, off_t, int); + + /* in inflate.c */ + extern int inflate (void); +- +- /* in yesno.c */ +-extern int yesno (void); +-- +cgit v0.9.0.2 diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD index 821b0837c..40f3545bc 100644 --- a/core/perl/PKGBUILD +++ b/core/perl/PKGBUILD @@ -1,12 +1,13 @@ -# $Id: PKGBUILD 173216 2012-12-13 12:43:19Z bluewind $ +# $Id: PKGBUILD 177560 2013-02-07 09:32:23Z bluewind $ # Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Angel Velasquez <angvp@archlinux.org> +# Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: kevin <kevin.archlinux.org> # Contributor: judd <jvinet.zeroflux.org> -# Contributor: francois <francois.archlinux.org> +# Contributor: francois <francois.archlinux.org> + pkgname=perl pkgver=5.16.2 -pkgrel=2 +pkgrel=3 pkgdesc="A highly capable, feature-rich programming language" arch=(i686 x86_64) license=('GPL' 'PerlArtistic') @@ -14,10 +15,10 @@ url="http://www.perl.org" groups=('base') depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh') source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2 -cgi-cr-escaping.diff -perlbin.sh -perlbin.csh -provides.pl) + cgi-cr-escaping.diff + perlbin.sh + perlbin.csh + provides.pl) install=perl.install options=('makeflags' '!purge') md5sums=('2818ab01672f005a4e552a713aa27b08' @@ -45,7 +46,7 @@ build() { fi ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \ - -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \ + -Dprefix=/usr -Dvendorprefix=/usr \ -Dprivlib=/usr/share/perl5/core_perl \ -Darchlib=/usr/lib/perl5/core_perl \ -Dsitelib=/usr/share/perl5/site_perl \ @@ -73,14 +74,15 @@ package() { provides=(${new_provides[@]}) cd ${srcdir}/${pkgname}-${pkgver} - make install + make DESTDIR="$pkgdir" install ### Perl Settings ### # Change man page extensions for site and vendor module builds. - # Use archlinux email address instead of my own. + # Set no mail address since bug reports should go to the bug tracker + # and not someone's email. sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \ - -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \ - -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \ + -e "/^cf_email=/ s/'.*'/''/" \ + -e "/^perladmin=/ s/'.*'/''/" \ -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl ### CPAN Settings ### @@ -104,8 +106,6 @@ package() { (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl) (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed) - grep -Rl "${pkgdir}" ${pkgdir}/usr | \ - xargs sed -i "s^${pkgdir}^^g" # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/ # (FS#16488) |