From 16310a19148f787e420b0281f288ba8b9dc5cd4d Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Sun, 22 Mar 2020 01:55:55 +0000
Subject: Sun Mar 22 01:55:55 UTC 2020

a/kernel-generic-5.4.27-x86_64-1.txz:  Upgraded.
a/kernel-huge-5.4.27-x86_64-1.txz:  Upgraded.
a/kernel-modules-5.4.27-x86_64-1.txz:  Upgraded.
a/tcsh-6.22.02-x86_64-3.txz:  Rebuilt.
  Actually apply the shell history patch this time. Thanks to jmccue.
ap/cups-filters-1.27.3-x86_64-1.txz:  Upgraded.
d/automake-1.16.2-noarch-1.txz:  Upgraded.
d/kernel-headers-5.4.27-x86-1.txz:  Upgraded.
d/parallel-20200322-noarch-1.txz:  Upgraded.
k/kernel-source-5.4.27-noarch-1.txz:  Upgraded.
l/gmime-3.2.7-x86_64-1.txz:  Upgraded.
l/pangomm-2.42.1-x86_64-1.txz:  Upgraded.
n/gnupg2-2.2.20-x86_64-1.txz:  Upgraded.
xap/xaos-3.7-x86_64-1.txz:  Upgraded.
xap/xscreensaver-5.44-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
testing/packages/PAM/xscreensaver-5.44-x86_64-1_pam.txz:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.
---
 source/a/tcsh/tcsh.SlackBuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source/a')

diff --git a/source/a/tcsh/tcsh.SlackBuild b/source/a/tcsh/tcsh.SlackBuild
index 9c41d8b11..eeee6f187 100755
--- a/source/a/tcsh/tcsh.SlackBuild
+++ b/source/a/tcsh/tcsh.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tcsh
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,9 @@ cd ${PKGNAM}-$VERSION || exit 1
 # built-in color ls:
 zcat $CWD/${PKGNAM}.nobuiltincolorls.diff.gz | patch -p1 --verbose || exit 1
 
+# Fix history merging:
+zcat $CWD/tcsh.sh.hist.diff.gz | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-- 
cgit v1.2.3