Patched, removed {r,}ksh93, added pfksh

3 files changed, 49 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7762e9c6b30..4ae15f0535a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun Dec 17 23:04:42 UTC 2017
+# Sun Dec 24 12:20:03 UTC 2017
 pkgbase = ksh93-git
 	pkgdesc = AT&T's KornShell (ksh93) from ast-base, Meson Build
 	pkgver = r271.6aa47e0
@@ -18,9 +18,11 @@ pkgbase = ksh93-git
 	conflicts = ksh93
 	source = ksh93::git+http://github.com/att/ast#branch=master
 	source = sample.kshrc
+	source = utimensat.patch
 	source = LICENSE
 	sha512sums = SKIP
 	sha512sums = aeb54cb5ec944628ab64a692d364cab14bbc312c1a892b3692058f7f7b1cf72c95a6bfb4a95ffc3c4ddfb8f8ca4d17707023108d5504f912cb3ceb9e8d4da6b3
+	sha512sums = edd6124ce5d53d183567f056f302dd30cda916b6e96675a36eeca8c771c468fcd1c42bc75a1ce40576c290b5346f9f047637a5a54d3033f6660b6487a05d0471
 	sha512sums = 917ae643f241741919eb7f4633ec7b3cd58fb0d19150a017773562c36b15812bcf5f680024994d546ef18d771ab25aefc4bfe57ebd0c08043c9ad17e9cd7e076
 
 pkgname = ksh93-git
diff --git a/PKGBUILD b/PKGBUILD
index aba2bf999bc2..8ec5f7afd45e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,9 +15,11 @@ provides=('ksh')
 install='ksh93.install'
 source=("${_pkgname}::git+http://github.com/att/ast#branch=master"
 'sample.kshrc'
+'utimensat.patch'
 'LICENSE')
 sha512sums=('SKIP'
 'aeb54cb5ec944628ab64a692d364cab14bbc312c1a892b3692058f7f7b1cf72c95a6bfb4a95ffc3c4ddfb8f8ca4d17707023108d5504f912cb3ceb9e8d4da6b3'
+'edd6124ce5d53d183567f056f302dd30cda916b6e96675a36eeca8c771c468fcd1c42bc75a1ce40576c290b5346f9f047637a5a54d3033f6660b6487a05d0471'
 '917ae643f241741919eb7f4633ec7b3cd58fb0d19150a017773562c36b15812bcf5f680024994d546ef18d771ab25aefc4bfe57ebd0c08043c9ad17e9cd7e076')
 
 pkgver() {
@@ -25,6 +27,11 @@ pkgver() {
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+	cd "$srcdir"
+	patch -Nbup1 -i "${srcdir}/utimensat.patch"
+}
+
 build() {
 	cd "${srcdir}/${_pkgname}"
 	meson build
@@ -44,7 +51,7 @@ package() {
 	install -Dm 644 "src/cmd/${_pkgname}/shell.3" "${pkgdir}/usr/share/man/man3/shell.3"
  	install -Dm 644 "src/cmd/${_pkgname}/ksh.1" "${pkgdir}/usr/share/man/man1/ksh.1"
 	local _man
-	for _man in 'ksh93' 'rksh' 'rksh93'; do
+	for _man in 'rksh' 'pfksh'; do
 		ln -sf 'ksh.1' "${pkgdir}/usr/share/man/man1/${_man}.1"
 	done
 	local _fun
@@ -57,7 +64,7 @@ package() {
 	done
 	install -Dm 755 "build/src/cmd/${_pkgname}/ksh" "${pkgdir}/usr/bin/ksh"	
 	local _exe
-	for _exe in 'ksh93' 'rksh' 'rksh93'; do
+	for _exe in 'rksh' 'pfksh'; do
 		ln -sf 'ksh' "${pkgdir}/usr/bin/${_exe}"
 	done
 	install -Dm 755 "build/src/cmd/${_pkgname}/shcomp" "${pkgdir}/usr/bin/shcomp"
diff --git a/utimensat.patch b/utimensat.patch
new file mode 100644
index 000000000000..5c101bd40126
--- /dev/null
+++ b/utimensat.patch
@@ -0,0 +1,37 @@
+diff --git a/ksh93/src/lib/libast/meson.build b/ksh93/src/lib/libast/meson.build
+--- a/ksh93/src/lib/libast/meson.build
++++ b/ksh93/src/lib/libast/meson.build
+@@ -168,12 +168,6 @@ if not cc.has_function('isnanl', prefix: '#include <math.h>')
+     libast_c_args += [ '-Disnanl=isnan' ]
+ endif
+ 
+-if cc.has_function('utimensat', prefix: '#include <sys/time.h>')
+-    libast_c_args += [ '-D_lib_utimensat' ]
+-elif cc.has_function('utimets', prefix: '#include <sys/time.h>')
+-    libast_c_args += [ '-D_lib_utimets' ]
+-endif
+-
+ if cc.has_function('sysinfo', prefix : '#include <sys/sysinfo.h>')
+     libast_c_args += [ '-D_lib_sysinfo=1' ]
+ endif
+diff --git a/ksh93/src/lib/libast/tm/tvtouch.c b/ksh93/src/lib/libast/tm/tvtouch.c
+--- a/ksh93/src/lib/libast/tm/tvtouch.c
++++ b/ksh93/src/lib/libast/tm/tvtouch.c
+@@ -85,8 +85,6 @@ tvtouch(const char* path, const Tv_t* av, const Tv_t* mv, const Tv_t* cv, int fl
+ 	struct timeval	am[2];
+ 
+ 	oerrno = errno;
+-
+-#if _lib_utimensat
+ 	if (!av)
+ 	{
+ 		ts[0].tv_sec = 0;
+@@ -151,7 +149,7 @@ tvtouch(const char* path, const Tv_t* av, const Tv_t* mv, const Tv_t* cv, int fl
+ 		if (!mv)
+ 			mv = (const Tv_t*)&now;
+ 	}
+-#elif _lib_utimets
++#if _lib_utimets
+ 	if (av == TV_TOUCH_RETAIN)
+ 	{
+ 		ts[0].tv_sec = st.st_atime;