Date: Thursday, December 12, 2013 @ 16:38:21 Author: allan Revision: 201469
upgpkg: make 4.0-2 fix overflow bug Added: make/trunk/make-4.0-char-cast.patch Modified: make/trunk/PKGBUILD --------------------------+ PKGBUILD | 15 ++++++++++++--- make-4.0-char-cast.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-12-12 15:37:16 UTC (rev 201468) +++ PKGBUILD 2013-12-12 15:38:21 UTC (rev 201469) @@ -4,7 +4,7 @@ pkgname=make pkgver=4.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU make utility to maintain groups of programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/make" @@ -12,10 +12,19 @@ groups=('base-devel') depends=('glibc' 'sh' 'guile') install=$pkgname.install -source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig}) +source=(ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig} + make-4.0-char-cast.patch) md5sums=('571d470a7647b455e3af3f92d79f1c18' - 'SKIP') + 'SKIP' + '1840aae18e1c0d1c52563020ef3ff5f3') +prepare() { + cd ${srcdir}/${pkgname}-${pkgver} + + # http://git.savannah.gnu.org/cgit/make.git/commit/?id=9d58570c + patch -p1 -i ${srcdir}/make-4.0-char-cast.patch +} + build() { cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr Added: make-4.0-char-cast.patch =================================================================== --- make-4.0-char-cast.patch (rev 0) +++ make-4.0-char-cast.patch 2013-12-12 15:38:21 UTC (rev 201469) @@ -0,0 +1,43 @@ +From 9d58570c77240fed53d1f88217877f8e778f4bb2 Mon Sep 17 00:00:00 2001 +From: Paul Smith <psm...@gnu.org> +Date: Sat, 26 Oct 2013 04:10:17 +0000 +Subject: * makeint.h (STOP_SET): [SV 40371] Cast to unsigned char. + +* tests/scripts/misc/utf8: Test variable names with characters >127. +Fix suggested by Robert Bogomip <bob.b...@milohedge.com> +--- +diff --git a/makeint.h b/makeint.h +index 77f51e0..c591427 100644 +--- a/makeint.h ++++ b/makeint.h +@@ -415,7 +415,7 @@ extern int unixy_shell; + # define MAP_VMSCOMMA 0x0000 + #endif + +-#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(int)(_v)],(_m)) ++#define STOP_SET(_v,_m) ANY_SET (stopchar_map[(unsigned char)(_v)],(_m)) + + #if defined(HAVE_SYS_RESOURCE_H) && defined(HAVE_GETRLIMIT) && defined(HAVE_SETRLIMIT) + # define SET_STACK_SIZE +diff --git a/tests/scripts/misc/utf8 b/tests/scripts/misc/utf8 +new file mode 100644 +index 0000000..2adcd07 +--- a/dev/null ++++ b/tests/scripts/misc/utf8 +@@ -0,0 +1,14 @@ ++# -*-perl-*- ++$description = "Test utf8 handling."; ++ ++$details = ""; ++ ++# Variable names containing UTF8 characters ++run_make_test(" ++\xe2\x96\xaa := hello ++\$(info \$(\xe2\x96\xaa)) ++all: ++", ++ '', "hello\n#MAKE#: Nothing to be done for 'all'."); ++ ++1; +-- +cgit v0.9.0.2