Attachment 179231 Details for Bug 211164 – Update ksh93 port to 20160716

[patch] Update ksh93 port to 20160716

ksh-20160716.txt (text/plain), 3.82 KB, created by Marcin Cieślak on 2017-01-23 01:27:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Cieślak

Created: 2017-01-23 01:27:10 UTC

Size: 3.82 KB

patch

obsolete

>diff -ruN ksh93.orig/Makefile ksh93/Makefile
>--- ksh93.orig/Makefile	2017-01-23 01:21:18.568438000 +0000
>+++ ksh93/Makefile	2017-01-23 01:22:24.552307000 +0000
>@@ -12,10 +12,8 @@
> 
> PORTNAME=	ksh93
> PORTVERSION=	${KSHVERSION:S/-//g}
>-PORTREVISION=	2
> CATEGORIES=	shells
>-MASTER_SITES=	http://www2.research.att.com/~astopen/download/tgz/ \
>-		LOCAL/sunpoet/${PORTNAME}
>+MASTER_SITES=	https://marcincieslak.com/tmp/distfiles/
> DISTFILES=	INIT.${INITVERSION}.tgz ast-ksh.${KSHVERSION}.tgz
> DIST_SUBDIR=	${PORTNAME}
> 
>@@ -31,8 +29,8 @@
> MAKE_ENV=	CCFLAGS="${CFLAGS}"
> NO_WRKSUBDIR=	yes
> 
>-INITVERSION=	2013-05-24
>-KSHVERSION=	2012-08-01
>+INITVERSION=	2014-12-24
>+KSHVERSION=	2016-07-16
> 
> STATIC_MAKE_ENV=	LDFLAGS+=-static
> 
>diff -ruN ksh93.orig/distinfo ksh93/distinfo
>--- ksh93.orig/distinfo	2017-01-23 01:21:18.567992000 +0000
>+++ ksh93/distinfo	2017-01-23 01:21:26.971946000 +0000
>@@ -1,4 +1,5 @@
>-SHA256 (ksh93/INIT.2013-05-24.tgz) = 118b2c8a4d651727fcd680289be69941d3045951bf9e3a4d45dcb42f0658f014
>-SIZE (ksh93/INIT.2013-05-24.tgz) = 383979
>-SHA256 (ksh93/ast-ksh.2012-08-01.tgz) = e6192cfa52a6a9fd20618cbaf3fa81f0cc9fd83525500757e83017275e962851
>-SIZE (ksh93/ast-ksh.2012-08-01.tgz) = 2053532
>+TIMESTAMP = 1468711452
>+SHA256 (ksh93/INIT.2014-12-24.tgz) = 66a88b56dd94fce01fd60ec5c9201ce7029c9401621ddb8030d2aed79676cc76
>+SIZE (ksh93/INIT.2014-12-24.tgz) = 385659
>+SHA256 (ksh93/ast-ksh.2016-07-16.tgz) = 7cc877e9bf296bce29b57e38407e249a05140f21e2d1e492476e74b426b01da1
>+SIZE (ksh93/ast-ksh.2016-07-16.tgz) = 2283587
>diff -ruN ksh93.orig/files/patch-src-lib-libast-features-wchar ksh93/files/patch-src-lib-libast-features-wchar
>--- ksh93.orig/files/patch-src-lib-libast-features-wchar	2017-01-23 01:21:18.567691000 +0000
>+++ ksh93/files/patch-src-lib-libast-features-wchar	1970-01-01 00:00:00.000000000 +0000
>@@ -1,10 +0,0 @@
>---- src/lib/libast/features/wchar.orig	2012-01-12 15:40:22.000000000 +0800
>-+++ src/lib/libast/features/wchar	2012-06-12 10:05:37.278869903 +0800
>-@@ -51,6 +51,7 @@
>- run{
>- cat <<!
>- 	#if _hdr_wchar && defined(_nxt_wchar)
>-+	#define _STDFILE_DECLARED
>- 	#include ${_nxt_wchar-_nxt_wchar}	/* the native wchar.h */
>- 	#endif
>- 
>diff -ruN ksh93.orig/files/patch-src-lib-libast-hash-hashalloc.c ksh93/files/patch-src-lib-libast-hash-hashalloc.c
>--- ksh93.orig/files/patch-src-lib-libast-hash-hashalloc.c	2017-01-23 01:21:18.567329000 +0000
>+++ ksh93/files/patch-src-lib-libast-hash-hashalloc.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,20 +0,0 @@
>---- src/lib/libast/hash/hashalloc.c.orig	2013-12-28 22:09:43.000000000 +0100
>-+++ src/lib/libast/hash/hashalloc.c	2013-12-28 22:43:14.000000000 +0100
>-@@ -49,6 +49,7 @@
>- 	va_list*		vp = va;
>- 	Hash_region_f		region = 0;
>- 	void*			handle;
>-+	va_listarg		tmpval;
>- 
>- 	va_start(ap, ref);
>- 
>-@@ -151,7 +152,8 @@
>- 				va_copy(*vp, ap);
>- 				vp++;
>- 			}
>--			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>-+			tmpval = va_listval(va_arg(ap, va_listarg));
>-+			va_copy(ap, tmpval);
>- 			break;
>- 		case 0:
>- 			if (vp > va)
>diff -ruN ksh93.orig/files/patch-src-lib-libast-string-tokscan.c ksh93/files/patch-src-lib-libast-string-tokscan.c
>--- ksh93.orig/files/patch-src-lib-libast-string-tokscan.c	2017-01-23 01:21:18.566846000 +0000
>+++ ksh93/files/patch-src-lib-libast-string-tokscan.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,20 +0,0 @@
>---- ./src/lib/libast/string/tokscan.c.orig	2013-12-28 22:16:20.000000000 +0100
>-+++ ./src/lib/libast/string/tokscan.c	2013-12-28 22:43:28.000000000 +0100
>-@@ -188,6 +188,7 @@
>- 	char**		p_string;
>- 	char*		prv_f = 0;
>- 	va_list		prv_ap;
>-+	va_listarg	tmpval;
>- 
>- 	va_start(ap, fmt);
>- 	if (!*s || *s == '\n')
>-@@ -233,7 +234,8 @@
>- 			prv_f = f;
>- 			f = va_arg(ap, char*);
>- 			va_copy(prv_ap, ap);
>--			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>-+			tmpval = va_listval(va_arg(ap, va_listarg));
>-+			va_copy(ap, tmpval);
>- 			continue;
>- 		case 'c':
>- 			p_char = va_arg(ap, char*);

Actions: View | Diff

Attachments on bug 211164: 172599 | 179231 | 183019 | 193586