Attachment 193586 Details for Bug 211164 – Update to ksh93 20180520

[patch] Update to ksh93 20180520

patch-ksh93-20180520 (text/plain), 4.25 KB, created by Marcin Cieślak on 2018-05-21 01:20:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcin Cieślak

Created: 2018-05-21 01:20:15 UTC

Size: 4.25 KB

patch

obsolete

>diff -ruN /usr/ports/shells/ksh93/Makefile ksh93/Makefile
>--- /usr/ports/shells/ksh93/Makefile	2017-08-10 22:57:50.673006000 +0000
>+++ ksh93/Makefile	2018-05-21 00:37:39.041743000 +0000
>@@ -12,32 +12,29 @@
> 
> 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://distfile.net/local-ports-distfiles/
> DISTFILES=	INIT.${INITVERSION}.tgz ast-ksh.${KSHVERSION}.tgz
> DIST_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	saper@saper.info
>-COMMENT=	Official AT&T release of KornShell 93
>+COMMENT=	KornShell 93
> 
> LICENSE=	EPL
> 
>+BROKEN_aarch64=	Fails to link: missing sbrk
>+
> OPTIONS_DEFINE=	EXAMPLES STATIC
> 
>-FETCH_ENV=	HTTP_AUTH=basic:*:I\ accept\ www.opensource.org/licenses/cpl:.
> LDFLAGS+=	-lm
>-MAKE_ENV=	CCFLAGS="${CFLAGS}"
>+MAKE_ENV=	CCFLAGS="-Wno-unused-value -Wno-parentheses -Wno-logical-op-parentheses ${CFLAGS}"
> NO_WRKSUBDIR=	yes
> 
>-INITVERSION=	2013-05-24
>-KSHVERSION=	2012-08-01
>+INITVERSION=	2014-12-24
>+KSHVERSION=	2018-05-20
> 
> STATIC_MAKE_ENV=	LDFLAGS+=-static
> 
>-BROKEN_aarch64=		Fails to compile: error: unknown type name Dllscan_t
>-
> .include <bsd.port.pre.mk>
> 
> post-patch:
>diff -ruN /usr/ports/shells/ksh93/distinfo ksh93/distinfo
>--- /usr/ports/shells/ksh93/distinfo	2017-08-10 22:57:50.649776000 +0000
>+++ ksh93/distinfo	2018-05-20 23:47:04.557387000 +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 = 1526860024
>+SHA256 (ksh93/INIT.2014-12-24.tgz) = 66a88b56dd94fce01fd60ec5c9201ce7029c9401621ddb8030d2aed79676cc76
>+SIZE (ksh93/INIT.2014-12-24.tgz) = 385659
>+SHA256 (ksh93/ast-ksh.2018-05-20.tgz) = f3aa96cc8ffbcbc686cd5dc869160b1585b252daf2f0ebe19bbefa943d82ec7f
>+SIZE (ksh93/ast-ksh.2018-05-20.tgz) = 2283023
>diff -ruN /usr/ports/shells/ksh93/files/patch-src-lib-libast-features-wchar ksh93/files/patch-src-lib-libast-features-wchar
>--- /usr/ports/shells/ksh93/files/patch-src-lib-libast-features-wchar	2017-08-10 22:57:50.657541000 +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 07:40:22 UTC
>-+++ src/lib/libast/features/wchar
>-@@ -51,6 +51,7 @@ endif
>- run{
>- cat <<!
>- 	#if _hdr_wchar && defined(_nxt_wchar)
>-+	#define _STDFILE_DECLARED
>- 	#include ${_nxt_wchar-_nxt_wchar}	/* the native wchar.h */
>- 	#endif
>- 
>diff -ruN /usr/ports/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c ksh93/files/patch-src-lib-libast-hash-hashalloc.c
>--- /usr/ports/shells/ksh93/files/patch-src-lib-libast-hash-hashalloc.c	2017-08-10 22:57:50.645919000 +0000
>+++ ksh93/files/patch-src-lib-libast-hash-hashalloc.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,19 +0,0 @@
>---- src/lib/libast/hash/hashalloc.c.orig	2006-11-07 22:29:04 UTC
>-+++ src/lib/libast/hash/hashalloc.c
>-@@ -151,7 +151,16 @@ hashalloc(Hash_table_t* ref, ...)
>- 				va_copy(*vp, ap);
>- 				vp++;
>- 			}
>-+#if __clang__ && __SIZEOF_POINTER__ == 4
>-+			{
>-+				va_list		np;
>-+
>-+				np = va_listval(va_arg(ap, va_listarg));
>-+				va_copy(ap, np);
>-+			}
>-+#else
>- 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>-+#endif
>- 			break;
>- 		case 0:
>- 			if (vp > va)
>diff -ruN /usr/ports/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c ksh93/files/patch-src-lib-libast-string-tokscan.c
>--- /usr/ports/shells/ksh93/files/patch-src-lib-libast-string-tokscan.c	2017-08-10 22:57:50.676815000 +0000
>+++ ksh93/files/patch-src-lib-libast-string-tokscan.c	1970-01-01 00:00:00.000000000 +0000
>@@ -1,19 +0,0 @@
>---- src/lib/libast/string/tokscan.c.orig	2006-11-07 22:29:31 UTC
>-+++ src/lib/libast/string/tokscan.c
>-@@ -233,7 +233,16 @@ tokscan(register char* s, char** nxt, co
>- 			prv_f = f;
>- 			f = va_arg(ap, char*);
>- 			va_copy(prv_ap, ap);
>-+#if __clang__ && __SIZEOF_POINTER__ == 4
>-+			{
>-+				va_list		np;
>-+
>-+				np = va_listval(va_arg(ap, va_listarg));
>-+				va_copy(ap, np);
>-+			}
>-+#else
>- 			va_copy(ap, va_listval(va_arg(ap, va_listarg)));
>-+#endif
>- 			continue;
>- 		case 'c':
>- 			p_char = va_arg(ap, char*);

Actions: View | Diff

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