From 8a2e2b7734d5f22d836b5f0523a840b175065610 Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Fri, 06 Jan 2023 22:04:14 +0100 Subject: [PATCH] dash: update to 0.5.12 --- components/shell/dash/patches/01-configure-stat64.patch | 27 ++++++++++++++++----------- components/shell/dash/Makefile | 8 ++++---- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/components/shell/dash/Makefile b/components/shell/dash/Makefile index 3e70b07..9bed11d 100644 --- a/components/shell/dash/Makefile +++ b/components/shell/dash/Makefile @@ -17,13 +17,13 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= dash -COMPONENT_VERSION= 0.5.11.5 +COMPONENT_VERSION= 0.5.12 COMPONENT_SUMMARY= DASH is a POSIX-compliant implementation of /bin/sh that aims to be as small as possible. COMPONENT_PROJECT_URL= http://gondor.apana.org.au/~herbert/dash COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz -COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)/files/$(COMPONENT_ARCHIVE) -COMPONENT_ARCHIVE_HASH= sha256:db778110891f7937985f29bf23410fe1c5d669502760f584e54e0e7b29e123bd +COMPONENT_ARCHIVE_URL= https://git.kernel.org/pub/scm/utils/dash/dash.git/snapshot/$(COMPONENT_ARCHIVE) +COMPONENT_ARCHIVE_HASH= sha256:0d632f6b945058d84809cac7805326775bd60cb4a316907d0bd4228ff7107154 COMPONENT_FMRI= shell/dash COMPONENT_CLASSIFICATION=System/Shells COMPONENT_LICENSE= BSD @@ -31,7 +31,7 @@ TEST_TARGET= $(NO_TESTS) include $(WS_MAKE_RULES)/common.mk -PATH=$(PATH.gnu) +PATH= $(PATH.gnu) COMPONENT_PRE_CONFIGURE_ACTION= \ (cd $(SOURCE_DIR) && autoreconf -fi) diff --git a/components/shell/dash/patches/01-configure-stat64.patch b/components/shell/dash/patches/01-configure-stat64.patch index b701471..1526f6a 100644 --- a/components/shell/dash/patches/01-configure-stat64.patch +++ b/components/shell/dash/patches/01-configure-stat64.patch @@ -1,19 +1,26 @@ ---- dash-0.5.11.5/configure.ac.orig 2021-09-03 09:03:16.000000000 +0000 -+++ dash-0.5.11.5/configure.ac 2022-11-26 22:26:39.599209483 +0000 -@@ -140,19 +140,23 @@ +--- dash-0.5.12/configure.ac.orig 2022-12-11 07:33:43.000000000 +0000 ++++ dash-0.5.12/configure.ac 2023-01-06 11:13:22.359719502 +0000 +@@ -140,12 +140,13 @@ fi dnl Check for stat64 (dietlibc/klibc). --AC_CHECK_FUNC(stat64,, [ +-AC_CHECK_DECL(stat64, AC_CHECK_FUNC(stat64)) +-if test "$ac_cv_func_stat64" != yes; then - AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit]) - AC_DEFINE(lstat64, lstat, [64-bit operations are the same as 32-bit]) - AC_DEFINE(stat64, stat, [64-bit operations are the same as 32-bit]) +-fi +AC_CHECK_DECL(stat64,, [ + AC_CHECK_FUNC(stat64,, [ -+ AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit]) -+ AC_DEFINE(lstat64, lstat, [64-bit operations are the same as 32-bit]) -+ AC_DEFINE(stat64, stat, [64-bit operations are the same as 32-bit]) ++ AC_DEFINE(fstat64, fstat, [64-bit operations are the same as 32-bit]) ++ AC_DEFINE(lstat64, lstat, [64-bit operations are the same as 32-bit]) ++ AC_DEFINE(stat64, stat, [64-bit operations are the same as 32-bit]) + ]) ++]) + + AC_CHECK_FUNC(glob64,, [ + AC_DEFINE(glob64_t, glob_t, [64-bit operations are the same as 32-bit]) +@@ -155,12 +156,12 @@ ]) dnl OS X apparently has stat64 but not open64. @@ -26,10 +33,8 @@ +AC_CHECK_DECL(stat64,, [ + AC_CHECK_FUNC(open64,, [ + AC_DEFINE(open64, open, [64-bit operations are the same as 32-bit]) -+ AC_DEFINE(readdir64, readdir, -+ [64-bit operations are the same as 32-bit]) -+ AC_DEFINE(dirent64, dirent, -+ [64-bit operations are the same as 32-bit]) ++ AC_DEFINE(readdir64, readdir, [64-bit operations are the same as 32-bit]) ++ AC_DEFINE(dirent64, dirent, [64-bit operations are the same as 32-bit]) + ]) ]) -- Gitblit v1.9.3