diff options
Diffstat (limited to 'system/csh/csh.SlackBuild')
| -rw-r--r-- | system/csh/csh.SlackBuild | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/system/csh/csh.SlackBuild b/system/csh/csh.SlackBuild index bd4cb04f56..ec240be210 100644 --- a/system/csh/csh.SlackBuild +++ b/system/csh/csh.SlackBuild @@ -6,6 +6,10 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20250115 bkw: +# - update for v20240808_2 (sync with Debian again). +# - remove timespec.diff, it's no longer needed. + # 20230919 bkw: # - update for v20230828_1 (sync with Debian sid). # - remove old no-longer-needed bufsiz.diff and glibc-2.32-sys_siglist.diff. @@ -31,7 +35,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=csh -VERSION=${VERSION:-20230828_1} +VERSION=${VERSION:-20240808_2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -88,30 +92,20 @@ find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + # Apply all of Debian's patches. -for diff in $( cat debian/patches/series ); do - patch -p1 < debian/patches/$diff +# 20250115 bkw: series file has a commented-out patch, deal with it. +for diff in $( grep -v '^#' debian/patches/series ); do + if [ -e "debian/patches/$diff" ]; then + echo "=== Applying $diff" + patch -p1 < debian/patches/$diff + fi done # 20230919 bkw: My own patch. Provides an implementations of # xrealloc(), and replaces xfree() with free(), so we don't have # publib as a dependency. +# 20250115 bkw: Patch had to be reworked for v20240808_2. patch -p1 < $CWD/remove_publib_dep.diff -# 20230919 bkw: My own patch. Fixes the mess caused by debian's -# bsd_time.patch. We need the patch, but it introduces a bug where a -# 'struct timeval' pointer is treated as a 'struct timespec' pointer, -# leading to a broken time builtin. -# This isn't *just* here to fix a compiler warning! Without this -# patch, we get: -# % time sleep 2.3 -# 0.0u 0.0s 0:02.99 0.0% 0+0k 0+0io 0pf+0w -# ...it thinks a 2.3 second sleep took 2.99 sec. Sometimes this -# will print as 0:02:00 instead (also wrong). With the patch: -# % time sleep 2.3 -# 0.0u 0.0s 0:02.30 0.0% 0+0k 0+0io 0pf+0w -# This wasn't an issue in the previous (20110502_6) version. -patch -p1 < $CWD/timespec.diff - # 20230919 bkw: Missing prototype for closefrom(). We don't want # to #include <bsd/unistd.h> to get it, so just prepend it. This # probably didn't cause a problem anyway. |