Bump actions/upload-artifact from 5 to 6

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/release.yml

@@ -0,0 +1,108 @@
+name: release
+
+on:
+  push:
+    tags: [scallop-*]
+  workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    outputs:
+      release: ${{ steps.release.outputs.release }}
+      version: ${{ steps.release.outputs.version }}
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+
+    - name: Get the release name
+      id: release
+      run: |
+        name=$(sed -rn "/^PACKAGE_NAME=/ s/^.*='(.*)'/\1/p" configure)
+        version=$(sed -rn "/^PACKAGE_VERSION=/ s/^.*='(.*)'/\1/p" configure)
+        release=${name}-${version}
+        ref=${{ github.ref_name }}
+
+        # verify tag name matches configure script
+        if [[ ${ref} != main && ${ref} != ${release} ]]; then
+          echo "tag name ${ref} doesn't match package: ${release}"
+          exit 1
+        fi
+
+        echo "release=${release}" >> $GITHUB_OUTPUT
+        echo "version=${version}" >> $GITHUB_OUTPUT
+
+  source:
+    needs: release
+    runs-on: ubuntu-latest
+    env:
+      RELEASE: ${{ needs.release.outputs.release }}
+      VERSION: ${{ needs.release.outputs.version }}
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+      with:
+        path: bash
+
+    - name: Copy release files
+      run: |
+        # remove unused files
+        rm -r bash/{doc,examples,tests,po}
+
+        # copy release files
+        mkdir ${RELEASE}
+        cp -a bash/* ${RELEASE}
+
+
+    - name: Build and install
+      run: |
+        # copy release files
+        cp -a ${RELEASE} ${RELEASE}-test
+        cd ${RELEASE}-test
+
+        # configure using required scallop options
+        ./configure-scallop
+
+        # build static and shared libraries
+        make -j libscallop.a libscallop.so
+
+        # install shared library and headers
+        sudo make install-library install-headers
+
+    - name: Test
+      run: |
+        # verify shared library is installed and pkg-config works as expected
+        pkg-config --modversion scallop
+        pkg-config --exact-version ${VERSION} scallop
+
+    - name: Create tarball
+      run: tar -c -I "xz -9 -T0" -f ${RELEASE}.tar.xz ${RELEASE}
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v6
+      with:
+        name: source
+        path: ./*.tar.xz
+        if-no-files-found: error
+        retention-days: 3
+
+  publish:
+    if: startsWith(github.ref, 'refs/tags/')
+    needs: source
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+    - name: Download artifacts
+      uses: actions/download-artifact@v6
+      with:
+        path: artifacts
+        merge-multiple: true
+
+    - name: Create GitHub release
+      uses: softprops/action-gh-release@v2
+      with:
+        files: artifacts/*.tar.xz
+        fail_on_unmatched_files: true

.github/workflows/test.yml

@@ -0,0 +1,57 @@
+name: test
+
+on:
+  push:
+    branches: '**'
+  workflow_dispatch:
+
+jobs:
+  version:
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+
+    - name: Get the package version
+      id: version
+      run: |
+        version=$(sed -rn "/^PACKAGE_VERSION=/ s/^.*='(.*)'/\1/p" configure)
+        date=${version##*.}
+        expected_date=$(date -u +"%Y%m%d")
+
+        # verify patch date
+        if [[ ${date} != ${expected_date} ]]; then
+          echo outdated scallop patch date: ${date}
+          exit 1
+        fi
+
+        echo "version=${version}" >> $GITHUB_OUTPUT
+
+  test:
+    needs: version
+    runs-on: ubuntu-latest
+    env:
+      VERSION: ${{ needs.version.outputs.version }}
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v6
+
+    - name: Build and install
+      run: |
+        # configure using required scallop options
+        ./configure-scallop
+
+        # build static and shared libraries
+        make -j libscallop.a libscallop.so
+
+        # install shared library and headers
+        sudo make install-library install-headers
+
+    - name: Test
+      run: |
+        # verify shared library is installed and pkg-config works as expected
+        pkg-config --modversion scallop
+        pkg-config --exact-version ${VERSION} scallop

Makefile.in

@@ -115,9 +115,13 @@ VERSOBJ = bashversion.$(OBJEXT)
 
 Program = bash$(EXEEXT)
 Version = @BASHVERS@
-PatchLevel = `$(BUILD_DIR)/$(VERSPROG) -p`
+PatchLevel = $(shell $(BUILD_DIR)/$(VERSPROG) -p)
 RELSTATUS = @RELSTATUS@
 
+# scallop targets
+StaticLibrary = libscallop.a
+SharedLibrary = libscallop.so
+
 Machine = @host_cpu@
 OS = @host_os@
 VENDOR = @host_vendor@
@@ -504,11 +508,11 @@ INSTALLED_HEADERS = shell.h bashjmp.h command.h syntax.h general.h error.h \
 		    bashtypes.h xmalloc.h config-top.h config-bot.h \
 		    bashintl.h bashansi.h bashjmp.h alias.h hashlib.h \
 		    conftypes.h unwind_prot.h jobs.h siglist.h \
-		    execute_cmd.h
+		    execute_cmd.h input.h pathexp.h flags.h
 # these can appear in either the source directory or the build directory and
 # are installed by install-headers
 HYBRID_HEADERS = y.tab.h
-INSTALLED_BUILTINS_HEADERS = bashgetopt.h common.h getopt.h
+INSTALLED_BUILTINS_HEADERS = builtext.h bashgetopt.h common.h getopt.h
 INSTALLED_INCLUDE_HEADERS = posixstat.h ansi_stdlib.h filecntl.h posixdir.h \
 	memalloc.h stdc.h posixjmp.h posixwait.h posixtime.h systimes.h \
 	unionwait.h maxpath.h shtty.h typemax.h ocache.h chartypes.h gettext.h \
@@ -636,6 +640,22 @@ $(Program): $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP) .build
 	ls -l $(Program)
 	-$(SIZE) $(Program)
 
+$(StaticLibrary): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
+	$(RM) $@
+	$(AR) $(ARFLAGS) $@ $(OBJECTS)
+	-for lib in $(BUILTINS_DEP) $(LIBDEP); do \
+		for obj in $$($(AR) t $$lib); do \
+			$(AR) q $@ $$(dirname $$lib)/$$obj ;\
+		done ;\
+	done
+	$(RANLIB) $@
+
+$(SharedLibrary): .build $(OBJECTS) $(BUILTINS_DEP) $(LIBDEP)
+	$(RM) $@
+	$(eval SCALLOP_LIBRARY = $(SharedLibrary).$(PACKAGE_VERSION))
+	$(CC) $(BUILTINS_LDFLAGS) $(LIBRARY_LDFLAGS) $(LDFLAGS) \
+		-Wl,-soname,${SCALLOP_LIBRARY} -shared -o ${SCALLOP_LIBRARY} $(OBJECTS) $(LIBS)
+
 .build:	$(SOURCES) config.h Makefile $(DEFDIR)/builtext.h version.h $(VERSPROG)
 	@echo
 	@echo "	  ***********************************************************"
@@ -862,8 +882,8 @@ $(SUPPORT_DIR)/bashbug.sh: $(SUPPORT_DIR)/bashbug.sh.in
 	CONFIG_FILES=$(SUPPORT_DIR)/bashbug.sh CONFIG_HEADERS= $(SHELL) ./config.status
 
 # comment out for distribution
-$(srcdir)/configure:	$(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
-	cd $(srcdir) && autoconf
+#$(srcdir)/configure:	$(srcdir)/configure.ac $(srcdir)/aclocal.m4 $(srcdir)/config.h.in
+#	cd $(srcdir) && autoconf
 
 # for chet
 reconfig: force
@@ -925,6 +945,11 @@ install:	.made installdirs
 	-( cd $(PO_DIR) ; $(MAKE) $(BASH_MAKEFLAGS) DESTDIR=$(DESTDIR) $@ )
 	-( cd $(LOADABLES_DIR) && $(MAKE) $(BASH_MAKEFLAGS) DESTDIR=$(DESTDIR) $@ )
 
+install-library:
+	@${SHELL} $(SUPPORT_SRC)mkinstalldirs $(DESTDIR)$(libdir)
+	$(INSTALL) $(INSTALLMODE) $(SharedLibrary).* $(DESTDIR)$(libdir)
+	cd $(DESTDIR)$(libdir) && ln -sf $(SharedLibrary).* $(SharedLibrary)
+
 install-strip:
 	$(MAKE) $(BASH_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_STRIP_PROGRAM)' \
 		prefix=${prefix} exec_prefix=${exec_prefix} \
@@ -966,7 +991,7 @@ install-headers: maybe-install-headers
 			${INSTALL_DATA} $(srcdir)/"$$hf" $(DESTDIR)$(headersdir)/$$hf || exit 1; \
 		fi ; \
 	done
-	-$(INSTALL_DATA) $(SUPPORT_DIR)/bash.pc $(DESTDIR)$(pkgconfigdir)/bash.pc
+	-$(INSTALL_DATA) $(SUPPORT_DIR)/$(PACKAGE).pc $(DESTDIR)$(pkgconfigdir)/$(PACKAGE).pc
 
 uninstall-headers-dirs:
 	-$(RMDIR) $(DESTDIR)$(headersdir)/builtins $(DESTDIR)$(headersdir)/include
@@ -981,7 +1006,7 @@ uninstall-headers:
 	for hf in $${SDH} ; do \
 		( cd $(DESTDIR)$(headersdir) && $(RM) $$(basename "$$hf") ) \
 	done
-	-( $(RM) $(DESTDIR)$(pkgconfigdir)/bash.pc )
+	-( $(RM) $(DESTDIR)$(pkgconfigdir)/$(PACKAGE).pc )
 	# uninstall-headers-dirs
 	-$(RMDIR) $(DESTDIR)$(headersdir)/builtins $(DESTDIR)$(headersdir)/include
 	-$(RMDIR) $(DESTDIR)$(headersdir)
@@ -1003,7 +1028,7 @@ LIB_SUBDIRS = ${RL_LIBDIR}  ${HIST_LIBDIR} ${TERM_LIBDIR} ${GLOB_LIBDIR} \
 		${INTL_LIBDIR} ${TILDE_LIBDIR} ${ALLOC_LIBDIR} ${SH_LIBDIR}
 
 basic-clean:
-	$(RM) $(OBJECTS) $(Program) bashbug
+	$(RM) $(OBJECTS) $(Program) $(StaticLibrary) $(SharedLibrary)* bashbug
 	$(RM) .build .made version.h 
 
 clean:	basic-clean

README.md

@@ -0,0 +1,11 @@
+[![ci](https://github.com/pkgcraft/bash/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/pkgcraft/bash/actions/workflows/test.yml)
+
+# bash
+
+Forked version of bash supporting shell interactions (e.g. writing builtins or
+modifying variables, arrays, and functions) natively in rust via the scallop crate.
+
+## Development
+
+Note that the development workflow involves rebasing against upstream and force
+pushing to keep the patch stack in order.