Revision: 27054 http://sourceforge.net/p/gar/code/27054 Author: dmichelsen Date: 2024-02-28 10:46:45 +0000 (Wed, 28 Feb 2024) Log Message: ----------- bash/trunk: Update to 5.2.26
Modified Paths: -------------- csw/mgar/pkg/bash/trunk/Makefile csw/mgar/pkg/bash/trunk/checksums csw/mgar/pkg/bash/trunk/files/changelog.CSW Added Paths: ----------- csw/mgar/pkg/bash/trunk/files/0001-Add-opt-csw-bin-in-the-hardcoded-paths-used-for-auto.patch csw/mgar/pkg/bash/trunk/files/0001-Use-system-bashrc-and-logout.patch Removed Paths: ------------- csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch csw/mgar/pkg/bash/trunk/files/map.bash csw/mgar/pkg/bash/trunk/files/use_system_bashrc_and_logout.patch Modified: csw/mgar/pkg/bash/trunk/Makefile =================================================================== --- csw/mgar/pkg/bash/trunk/Makefile 2024-02-22 12:42:22 UTC (rev 27053) +++ csw/mgar/pkg/bash/trunk/Makefile 2024-02-28 10:46:45 UTC (rev 27054) @@ -13,45 +13,22 @@ ###### Package information ####### NAME = bash -VERSION = 4.3.42 +VERSION = 5.2.26 GARTYPE = v2 +BASH_VERSION = $(shell echo $(VERSION)c | cut -d. -f1-2) +BASH_PATCHLEVEL = $(shell echo -n $(VERSION) | cut -d. -f3) + DESCRIPTION = A sh-compatible command language interpreter define BLURB GNU Bash is an sh-compatible command language interpreter that executes commands read from the standard input or from a file. Bash also incorporates useful features from the Korn and C shells (ksh and csh). Bash is intended to be a conforming implementation of the IEEE POSIX Shell and Tools specification (IEEE Working Group 1003.2). endef -BASH_VERSION = $(shell echo $(VERSION)c | cut -d. -f1-2) -BASH_PATCHLEVEL = $(shell echo -n $(VERSION) | cut -d. -f3) - -PACKAGES = CSWbash - -RUNTIME_DEP_PKGS = CSWlibintl8 -RUNTIME_DEP_PKGS += CSWlibiconv2 - -SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/bash/bashtop.html - -# /usr/local is present in the default path, this can be safely ignored -CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/bin/bash -CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/bin/bashbug -CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash/NOTES -CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash/FAQ -CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/bash.1 -CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bashref.html -CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash.html - -PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 - -###### Upstream and opencsw files information ####### - -# Patches download location -MASTER_SITES = $(GNU_MIRROR)/bash-$(BASH_VERSION)-patches/ -# Main archive location MASTER_SITES += $(GNU_MIRROR) -UPSTREAM_MASTER_SITES = $(GNU_MIRROR) +MASTER_SITES += $(GNU_MIRROR)/bash-$(BASH_VERSION)-patches/ DISTNAME = $(NAME)-$(BASH_VERSION) -DISTFILES = $(NAME)-$(BASH_VERSION).tar.gz +DISTFILES += $(NAME)-$(BASH_VERSION).tar.gz DISTFILES += changelog.CSW PATCHFILE_PREFIX = bash$(subst .,,$(BASH_VERSION)) @@ -58,24 +35,38 @@ PATCHDIRLEVEL = 0 # we generate the list of patches from the PATCHLEVEL PATCHFILES = $(shell LEVEL=1; \ - PREFIX_0="00"; \ - while [ $$LEVEL -le $(BASH_PATCHLEVEL) ]; do \ - echo $(PATCHFILE_PREFIX)-$$PREFIX_0$$LEVEL; \ - LEVEL=`expr $$LEVEL + 1`; \ - if [ $$LEVEL -ge 10 ]; then \ - PREFIX_0="0"; \ - fi; \ - done ) + PREFIX_0="00"; \ + while [ $$LEVEL -le $(BASH_PATCHLEVEL) ]; do \ + echo $(PATCHFILE_PREFIX)-$$PREFIX_0$$LEVEL; \ + LEVEL=`expr $$LEVEL + 1`; \ + if [ $$LEVEL -ge 10 ]; then \ + PREFIX_0="0"; \ + fi; \ + done ) -# # opencsw bash use /etc/bash.bashrc and /etc/bash.bash_logout files -PATCHFILES += use_system_bashrc_and_logout.patch +PATCHFILES += 0001-Use-system-bashrc-and-logout.patch # add /opt/csw/bin in the hardcoded paths used for auto-selecting the EDITOR variable -PATCHFILES += 0001-bashbug-editor-path.patch +PATCHFILES += 0001-Add-opt-csw-bin-in-the-hardcoded-paths-used-for-auto.patch -LICENSE = COPYING +VENDOR_URL = https://www.gnu.org/software/bash/ +PACKAGES += CSWbash +SPKG_DESC_CSWbash = A sh-compatible command language interpreter +# PKGFILES is catchall +RUNTIME_DEP_PKGS_CSWbash = CSWlibintl9 +RUNTIME_DEP_PKGS_CSWbash += CSWlibiconv2 + +# /usr/local is present in the default path, this can be safely ignored +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/bin/bash +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/bin/bashbug +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash/NOTES +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash/FAQ +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/bash.1 +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bashref.html +CHECKPKG_OVERRIDES_CSWbash += file-with-bad-content|/usr/local|root/opt/csw/share/doc/bash.html + # we add CSW bash to the /etc/shells files using the build script ETCSHELLS = /opt/csw/bin/bash @@ -96,5 +87,5 @@ @( for FILE in README RBASH NEWS NOTES POSIX AUTHORS doc/FAQ doc/INTRO; do \ ginstall -D $(WORKSRC_FIRSTMOD)/$$FILE $(PKGROOT)$(docdir)/$(NAME)/`basename $$FILE`; \ done ) - ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(NAME)/changelog.CSW + # ginstall -D $(WORKDIR_FIRSTMOD)/changelog.CSW $(PKGROOT)$(docdir)/$(NAME)/changelog.CSW ( cd "$(PKGROOT)/$(bindir)" && rm -f rbash && ln -sf bash rbash ) Modified: csw/mgar/pkg/bash/trunk/checksums =================================================================== --- csw/mgar/pkg/bash/trunk/checksums 2024-02-22 12:42:22 UTC (rev 27053) +++ csw/mgar/pkg/bash/trunk/checksums 2024-02-28 10:46:45 UTC (rev 27054) @@ -1,43 +1,27 @@ -81348932d5da294953e15d4814c74dd1 bash-4.3.tar.gz -1ab682b4e36afa4cf1b426aa7ac81c0d bash43-001 -8fc22cf50ec85da00f6af3d66f7ddc1b bash43-002 -a41728eca78858758e26b5dea64ae506 bash43-003 -bf8d53d227829d67235927689a03cc7a bash43-004 -c0c00935c8b8ffff76e8ab77e7be7d15 bash43-005 -6f01e364cd092faa28dd7119f47ddb5f bash43-006 -dcf471d222bcd83283d3094e6ceeb6f8 bash43-007 -f7553416646dc26c266454c78a916d36 bash43-008 -7e73d2151f4064b484a4ba2c4b09960e bash43-009 -a275463d21735bb6d7161f9fbd320d8f bash43-010 -c17103ee20420d77e46b224c8d3fceda bash43-011 -3e2a057a19d02b3f92a3a09eacbc03ae bash43-012 -fb377143a996d4ff087a2771bc8332f9 bash43-013 -1a1aaecc99a9d0cbc310e8e247dcc8b6 bash43-014 -4f04387458a3c1b4d460d199f49991a8 bash43-015 -90e759709720c4f877525bebc9d5dc06 bash43-016 -11e4046e1b86070f6adbb7ffc89641be bash43-017 -cd5a9b46f5bea0dc0248c93c7dfac011 bash43-018 -cff4dc024d9d3456888aaaf8a36ca774 bash43-019 -167839c5f147347f4a03d88ab97ff787 bash43-020 -1d350671c48dec30b34d8b81f09cd79d bash43-021 -11c349af66a55481a3215ef2520bec36 bash43-022 -b3cb0d80fd0c47728264405cbb3b23c7 bash43-023 -b5ea5600942acceb4b6f07313d2de74e bash43-024 -193c06f578d38ffdbaebae9c51a7551f bash43-025 -922578e2be7ed03729454e92ee8d3f3a bash43-026 -8ff6948b16f2db5c29b1b9ae1085bbe7 bash43-027 -dd51fa67913b5dca45a702b672b3323f bash43-028 -0729364c977ef4271e9f8dfafadacf67 bash43-029 -efb709fdb1368945513de23ccbfae053 bash43-030 -236df1ac1130a033ed0dbe2d2115f28f bash43-031 -2360f7e79cfb28526f80021025ea5909 bash43-032 -b551c4ee7b8713759e4143499d0bbd48 bash43-033 -c9a56fbe0348e05a886dff97f2872b74 bash43-034 -e564e8ab44ed1ca3a4e315a9f6cabdc9 bash43-035 -b00ff66c41a7c0f06e191200981980b0 bash43-036 -be2a7b05f6ae560313f3c9d5f7127bda bash43-037 -61e0522830b24fbe8c0d1b010f132470 bash43-038 -a4775487abe958536751c8ce53cdf6f9 bash43-039 -80d3587c58854e226055ef099ffeb535 bash43-040 -20bf63eef7cb441c0b1cc49ef3191d03 bash43-041 -70790646ae61e207c995e44931390e50 bash43-042 +cfb4cf795fc239667f187b3d6b3d396f bash-5.2.tar.gz +8b03b019783c7bbed9ace21f70155716 bash52-001 +d8f7085bfd9f2ebf574858b2e1110c3b bash52-002 +4c27b778445b21e28cf4f6aba76b5171 bash52-003 +40b2db2180d772c9ba72f773e963d211 bash52-004 +05dde44788d0d181206f0a15afd38501 bash52-005 +af9b98aef8fc987cd398ae9be01a6cdf bash52-006 +9919243f7fcc1812eb88efe028da7ce0 bash52-007 +99bc0f731b3ddb1368e676327246cb21 bash52-008 +57f589db109d2c72c7cefff1df0819e1 bash52-009 +c1d97dc661639ab0e4648fa50164881e bash52-010 +e9bc4d7ab21a195f9c6cc78547148112 bash52-011 +0e836c596d19fce655acc9862522423d bash52-012 +62a7f7bf4ad91a403cb3873f7e1d288b bash52-013 +7022d611b94ae8fda6a076c0f33ce00b bash52-014 +a5f9afd119d374ff8f9e1a37ebf11b15 bash52-015 +3fbb82e5500d4d8fc93268a98ea2e474 bash52-016 +4bfdc876c82eda73f563b7aef431ef2f bash52-017 +c677f65b83d782b6478d5ad75acff03a bash52-018 +b5feb40e8986a435a9be8ec7b08b0505 bash52-019 +fa530069a8d1075cf0995d95a59732cb bash52-020 +4773cce94d61b3b7f8482779a4e3c48a bash52-021 +a547f36f2c50f3cb4f8a6ef717f2dfbf bash52-022 +e33fc4c60dbdffd46311d963d1fd4d52 bash52-023 +9cf13adeb43920df0ce4ff621371988c bash52-024 +9de0025a5067cfedddffade2bf059ba7 bash52-025 +3e1bede019794844bd51312bc8675438 bash52-026 Copied: csw/mgar/pkg/bash/trunk/files/0001-Add-opt-csw-bin-in-the-hardcoded-paths-used-for-auto.patch (from rev 27053, csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch) =================================================================== --- csw/mgar/pkg/bash/trunk/files/0001-Add-opt-csw-bin-in-the-hardcoded-paths-used-for-auto.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/0001-Add-opt-csw-bin-in-the-hardcoded-paths-used-for-auto.patch 2024-02-28 10:46:45 UTC (rev 27054) @@ -0,0 +1,65 @@ +From 26ca33a5ce7c11731aa1665719f43a97bb9e18bf Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <d...@opencsw.org> +Date: Wed, 28 Feb 2024 11:14:47 +0100 +Subject: [PATCH] Add /opt/csw/bin in the hardcoded paths used for + auto-selecting the EDITOR variable + +--- + support/bashbug.sh.in | 34 ++++++++-------------------------- + 1 file changed, 8 insertions(+), 26 deletions(-) + +diff --git a/support/bashbug.sh.in b/support/bashbug.sh.in +index 77e14e5..66969ab 100644 +--- a/support/bashbug.sh.in ++++ b/support/bashbug.sh.in +@@ -35,7 +35,7 @@ PATCHLEVEL="!PATCHLEVEL!" + RELSTATUS="@RELSTATUS@" + MACHTYPE="@host@" + +-PATH=/bin:/usr/bin:/usr/local/bin:$PATH ++PATH=/opt/csw/bin:/bin:/usr/bin:/usr/local/bin:$PATH + export PATH + + # Check if TMPDIR is set, default to /tmp +@@ -120,31 +120,13 @@ esac + BUGADDR="${1-$BUGBASH}" + + if [ -z "$DEFEDITOR" ] && [ -z "$EDITOR" ]; then +- if [ -x /usr/bin/editor ]; then +- DEFEDITOR=editor +- elif [ -x /usr/local/bin/ce ]; then +- DEFEDITOR=ce +- elif [ -x /usr/local/bin/emacs ]; then +- DEFEDITOR=emacs +- elif [ -x /usr/contrib/bin/emacs ]; then +- DEFEDITOR=emacs +- elif [ -x /usr/bin/emacs ]; then +- DEFEDITOR=emacs +- elif [ -x /usr/bin/xemacs ]; then +- DEFEDITOR=xemacs +- elif [ -x /usr/bin/vim; then +- DEFEDITOR=vim +- elif [ -x /usr/bin/gvim; then +- DEFEDITOR=gvim +- elif [ -x /usr/bin/nano ]; then +- DEFEDITOR=nano +- elif [ -x /usr/contrib/bin/jove ]; then +- DEFEDITOR=jove +- elif [ -x /usr/local/bin/jove ]; then +- DEFEDITOR=jove +- elif [ -x /usr/bin/vi ]; then +- DEFEDITOR=vi +- else ++ for E in editor ce emacs xemacs vim gvim nano jove vi; do ++ if [ -x /opt/csw/bin/$E ] || [ -x /usr/bin/$E ] || [ -x /usr/local/bin/$E ] || [ -x /usr/contrib/bin/$E ]; then ++ DEFEDITOR=$E ++ break ++ fi ++ done ++ if [ -z "$DEFEDITOR" ]; then + echo "$0: No default editor found: attempting to use vi" >&2 + DEFEDITOR=vi + fi +-- +2.4.0 + Copied: csw/mgar/pkg/bash/trunk/files/0001-Use-system-bashrc-and-logout.patch (from rev 27053, csw/mgar/pkg/bash/trunk/files/use_system_bashrc_and_logout.patch) =================================================================== --- csw/mgar/pkg/bash/trunk/files/0001-Use-system-bashrc-and-logout.patch (rev 0) +++ csw/mgar/pkg/bash/trunk/files/0001-Use-system-bashrc-and-logout.patch 2024-02-28 10:46:45 UTC (rev 27054) @@ -0,0 +1,38 @@ +From f21156250810c2c4a8e5cec902b55a711e2e2405 Mon Sep 17 00:00:00 2001 +From: Dagobert Michelsen <d...@opencsw.org> +Date: Wed, 28 Feb 2024 11:08:23 +0100 +Subject: [PATCH] Use system bashrc and logout + +--- + config-top.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/config-top.h b/config-top.h +index db4ab6e..8720ec8 100644 +--- a/config-top.h ++++ b/config-top.h +@@ -97,10 +97,10 @@ + #define DEFAULT_BASHRC "~/.bashrc" + + /* System-wide .bashrc file for interactive shells. */ +-/* #define SYS_BASHRC "/etc/bash.bashrc" */ ++#define SYS_BASHRC "/etc/bash.bashrc" + + /* System-wide .bash_logout for login shells. */ +-/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ ++#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" + + /* Define this to make non-interactive shells begun with argv[0][0] == '-' + run the startup files when not in posix mode. */ +@@ -110,7 +110,7 @@ + sshd and source the .bashrc if so (like the rshd behavior). This checks + for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, + which can be fooled under certain not-uncommon circumstances. */ +-/* #define SSH_SOURCE_BASHRC */ ++#define SSH_SOURCE_BASHRC + + /* Define if you want the case-toggling operators (~[~]) and the + `capcase' variable attribute (declare -c). */ +-- +2.4.0 + Deleted: csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch 2024-02-22 12:42:22 UTC (rev 27053) +++ csw/mgar/pkg/bash/trunk/files/0001-bashbug-editor-path.patch 2024-02-28 10:46:45 UTC (rev 27054) @@ -1,58 +0,0 @@ -From 620ec77ec8e909bd492005b29762038668e3d77f Mon Sep 17 00:00:00 2001 -From: Yann Rouillard <y...@pleiades.fr.eu.org> -Date: Tue, 23 Nov 2010 21:21:40 +0100 -Subject: [PATCH] add /opt/csw/bin in the hardcoded paths used for auto-selecting the EDITOR variable. - ---- - support/bashbug.sh | 28 ++++++++-------------------- - 1 files changed, 8 insertions(+), 20 deletions(-) - -diff --git a/support/bashbug.sh b/support/bashbug.sh -index 7b36d40..6dfd9bb 100644 ---- a/support/bashbug.sh -+++ b/support/bashbug.sh -@@ -35,7 +35,7 @@ PATCHLEVEL="!PATCHLEVEL!" - RELSTATUS="!RELSTATUS!" - MACHTYPE="!MACHTYPE!" - --PATH=/bin:/usr/bin:/usr/local/bin:$PATH -+PATH=/opt/csw/bin:/bin:/usr/bin:/usr/local/bin:$PATH - export PATH - - # Check if TMPDIR is set, default to /tmp -@@ -120,25 +120,13 @@ esac - BUGADDR="${1-$BUGBASH}" - - if [ -z "$DEFEDITOR" ] && [ -z "$EDITOR" ]; then -- if [ -x /usr/bin/editor ]; then -- DEFEDITOR=editor -- elif [ -x /usr/local/bin/ce ]; then -- DEFEDITOR=ce -- elif [ -x /usr/local/bin/emacs ]; then -- DEFEDITOR=emacs -- elif [ -x /usr/contrib/bin/emacs ]; then -- DEFEDITOR=emacs -- elif [ -x /usr/bin/emacs ]; then -- DEFEDITOR=emacs -- elif [ -x /usr/bin/xemacs ]; then -- DEFEDITOR=xemacs -- elif [ -x /usr/contrib/bin/jove ]; then -- DEFEDITOR=jove -- elif [ -x /usr/local/bin/jove ]; then -- DEFEDITOR=jove -- elif [ -x /usr/bin/vi ]; then -- DEFEDITOR=vi -- else -+ for E in editor ce emacs xemacs jove vi; do -+ if [ -x /opt/csw/bin/$E ] || [ -x /usr/bin/$E ] || [ -x /usr/local/bin/$E ] || [ -x /usr/contrib/bin/$E ]; then -+ DEFEDITOR=$E -+ break -+ fi -+ done -+ if [ -z "$DEFEDITOR" ]; then - echo "$0: No default editor found: attempting to use vi" >&2 - DEFEDITOR=vi - fi --- -1.7.3 - Modified: csw/mgar/pkg/bash/trunk/files/changelog.CSW =================================================================== --- csw/mgar/pkg/bash/trunk/files/changelog.CSW 2024-02-22 12:42:22 UTC (rev 27053) +++ csw/mgar/pkg/bash/trunk/files/changelog.CSW 2024-02-28 10:46:45 UTC (rev 27054) @@ -1,3 +1,9 @@ +bash (5.2.26,REV=2024.02.28) unstable + + * Update to latest version and forward-port patches + + -- Dagobert Michelsen <d...@opencsw.org> Wed, 28 Feb 2023 11:17:00 +0100 + bash (4.3.33,REV=2015.02.15) unstable * Added bash patch bash43-031 to bash43-033 Deleted: csw/mgar/pkg/bash/trunk/files/map.bash =================================================================== --- csw/mgar/pkg/bash/trunk/files/map.bash 2024-02-22 12:42:22 UTC (rev 27053) +++ csw/mgar/pkg/bash/trunk/files/map.bash 2024-02-28 10:46:45 UTC (rev 27054) @@ -1,2 +0,0 @@ -libc.so - SUNW_1.22.5 SUNWprivate_1.1; - Deleted: csw/mgar/pkg/bash/trunk/files/use_system_bashrc_and_logout.patch =================================================================== --- csw/mgar/pkg/bash/trunk/files/use_system_bashrc_and_logout.patch 2024-02-22 12:42:22 UTC (rev 27053) +++ csw/mgar/pkg/bash/trunk/files/use_system_bashrc_and_logout.patch 2024-02-28 10:46:45 UTC (rev 27054) @@ -1,25 +0,0 @@ -diff --speed-large-files --minimal -Nru bash-4.0.orig/config-top.h bash-4.0/config-top.h ---- config-top.h 2009-01-04 20:32:23.000000000 +0100 -+++ config-top.h.new 2009-02-21 17:03:21.765660704 +0100 -@@ -75,10 +75,10 @@ - #define KSH_COMPATIBLE_SELECT - - /* System-wide .bashrc file for interactive shells. */ --/* #define SYS_BASHRC "/etc/bash.bashrc" */ -+#define SYS_BASHRC "/etc/bash.bashrc" - - /* System-wide .bash_logout for login shells. */ --/* #define SYS_BASH_LOGOUT "/etc/bash.bash_logout" */ -+#define SYS_BASH_LOGOUT "/etc/bash.bash_logout" - - /* Define this to make non-interactive shells begun with argv[0][0] == '-' - run the startup files when not in posix mode. */ -@@ -88,7 +88,7 @@ - sshd and source the .bashrc if so (like the rshd behavior). This checks - for the presence of SSH_CLIENT or SSH2_CLIENT in the initial environment, - which can be fooled under certain not-uncommon circumstances. */ --/* #define SSH_SOURCE_BASHRC */ -+#define SSH_SOURCE_BASHRC - - /* Define if you want the case-capitalizing operators (~[~]) and the - `capcase' variable attribute (declare -c). */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.