chore: update patches from latest commit [skip ci]

Author: actions-user

patches/.github/workflows/create-patches.yml.patch

@@ -0,0 +1,49 @@
+diff --git a/.github/workflows/create-patches.yml b/.github/workflows/create-patches.yml
+new file mode 100644
+index 0000000..ca1b632
+--- /dev/null
++++ b/.github/workflows/create-patches.yml
+@@ -0,0 +1,43 @@
++name: Create Patches
++
++on:
++  push:
++    branches: [ "cla" ]
++
++jobs:
++  generate-patches:
++    runs-on: ubuntu-latest
++
++    steps:
++      - name: Checkout repository
++        uses: actions/checkout@v4
++        with:
++          fetch-depth: 0
++          ref: ${{ github.ref_name }}
++
++      - name: Install build dependencies
++        run: sudo apt-get update && sudo apt-get install -y make
++
++      - name: Run make create-patch
++        run: make create-patch
++
++      - name: Commit and push patch files
++        run: |
++          git config user.name "GitHub Actions"
++          git config user.email "[email protected]"
++
++          if [ -n "$(git status --porcelain patches/)" ]; then
++            git add patches/
++            git commit -m "chore: update patches from latest commit [skip ci]"
++            git push origin HEAD:${GITHUB_REF_NAME}
++          else
++            echo "No changes in patches/ to commit."
++          fi
++        env:
++          GITHUB_REF_NAME: ${{ github.ref_name }}
++
++      - name: Upload patch files as artifact
++        uses: actions/upload-artifact@v4
++        with:
++          name: patches
++          path: patches/

patches/Makefile.patch

@@ -1,42 +1,75 @@
 diff --git a/Makefile b/Makefile
-index e504646..f0e15dc 100644
+index e504646..a82b9dc 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -19,6 +19,22 @@ versions:
+@@ -19,19 +19,63 @@ versions:
  		fi \
  	done
 
+-PATCH:=./name.patch
 +create-patch:
 +	@mkdir -p patches
 +	@echo -e "\e[1;34m[+] Creating and splitting patch from branch 'cla' against 'main' (excluding patches/)...\e[0m"
 +	@git fetch origin main >/dev/null 2>&1
 +	@git diff origin/main...origin/cla -- . ':(exclude)patches/' | awk '\
++		function flush(){ if (out) close(out); out=""; } \
 +		/^diff --git a\// { \
-+			if (out) close(out); \
-+			fname = $$3; \
-+			sub(/^a\//, "", fname); \
-+			gsub(/\//, "_", fname); \
++			flush(); \
++			fname = $$3; sub(/^a\//, "", fname); \
++			dir = fname; sub(/\/[^/]*$$/, "", dir); \
++			if (dir != "") system("mkdir -p patches/" dir); \
 +			out = "patches/" fname ".patch"; \
 +		} \
 +		{ if (out) print > out } \
++		END { flush() } \
 +	'
-+	@echo -e "\e[1;32m[+] Patch files saved to ./patches/\e[0m"
++	@echo -e "\e[1;32m[+] Patch files saved under ./patches/ (mirroring source dirs)\e[0m"
++
++PATCH := ./name.patch
 +
- PATCH:=./name.patch
  patch:
- 	@if [ -f ${PATCH} ]; then \
-@@ -32,6 +48,16 @@ patch:
- 		echo -e "\e[1;31m[+] ${PATCH} file does not exist"; \
+-	@if [ -f ${PATCH} ]; then \
+-		for f in $(wildcard */) ; do \
+-				if [[ -d "$$f" && -f "$$f/Makefile" ]]; then \
+-					 echo -e "\e[1;35m[+] Patching $$f with ${PATCH}\e[0m"; \
+-					patch -d $$f --backup-if-mismatch -p2 < ${PATCH}; \
+-				fi \
+-		done \
++	@patchfile="${PATCH}"; \
++	if [ -f "$$patchfile" ]; then \
++		# --- Derive target dir from patch path/name ---
++		# If nested under patches/<dir>/..., use that <dir>.
++		# Else, fall back to prefix before first "_" in filename.
++		if [[ "$$patchfile" == patches/*/* ]]; then \
++			tmp=$${patchfile#patches/}; \
++			dir=$${tmp%%/*}; \
++		else \
++			base=$${patchfile##*/}; \
++			base=$${base%.patch}; \
++			dir=$${base%%_*}; \
++		fi; \
++		# --- Apply to the single matching dir ---
++		if [[ -d "$$dir" && -f "$$dir/Makefile" ]]; then \
++			echo -e "\e[1;35m[+] Patching $$dir with $$patchfile\e[0m"; \
++			patch -d "$$dir" --backup-if-mismatch -p2 < "$$patchfile"; \
++		else \
++			echo -e "\e[1;31m[!] No matching directory '$$dir' (or missing $$dir/Makefile)\e[0m"; \
++			exit 1; \
++		fi; \
+ 	else \
+-		echo -e "\e[1;31m[+] ${PATCH} file does not exist"; \
++		echo -e "\e[1;31m[!] ${PATCH} file does not exist\e[0m"; \
++		exit 1; \
  	fi
 
 +patch-all:
-+	@for patchfile in patches/*.patch; do \
-+		for f in $(wildcard */); do \
-+			if [[ -d "$$f" && -f "$$f/Makefile" ]]; then \
-+				echo -e "\e[1;35m[+] Patching $$f with $$patchfile\e[0m"; \
-+				patch -d $$f --backup-if-mismatch -p2 < "$$patchfile"; \
-+			fi \
-+		done \
++	@for dir in */; do \
++		[[ -d "$$dir" && -f "$$dir/Makefile" && -d "patches/$$dir" ]] || continue; \
++		for p in patches/"$$dir"*.patch; do \
++			[[ -e "$$p" ]] || continue; \
++			echo -e "\e[1;35m[+] Patching $$dir with $$p\e[0m"; \
++			patch -d "$$dir" --backup-if-mismatch -p2 < "$$p"; \
++		done; \
 +	done
 +
  test:

patches/README.md.patch

@@ -1,5 +1,5 @@
 diff --git a/README.md b/README.md
-index 49b3bba..d238898 100644
+index 49b3bba..461b6dc 100644
 --- a/README.md
 +++ b/README.md
 @@ -1,4 +1,9 @@
@@ -13,15 +13,55 @@ index 49b3bba..d238898 100644
 
  Preconfigured CTF challenge templates with sane defaults and an homogeneous
  interface. Instanced web, instanced qemu+ssh, jailed pwn, sagemath, and much
-@@ -22,7 +27,6 @@ limits? Quickly ssh into a VPS and run `make deploy-docker`. Problems? Run
- `make HOST=0.0.0.0`. Your infrastructure team will have an easier time fixing
- Kubernetes.
+@@ -31,26 +36,27 @@ with `make version`.
 
--Powered by [LosFuzzys](https://losfuzzys.net).
+ | Name                           | Version |
+ | :----------------------------- | :-----: |
+-| bash-jail-ubuntu24.04          | 1.0.0   |
+-| bash-nojail-ubuntu24.04        | 1.0.0   |
+-| flask-instanced-alpine3.21     | 1.0.0   |
+-| flask-nojail-alpine3.21        | 1.0.0   |
+-| offline                        | 1.0.0   |
+-| php-instanced-ubuntu24.04      | 1.0.0   |
+-| php-nojail-ubuntu24.04         | 1.0.0   |
+-| phpxss-nojail-ubuntu24.04      | 1.0.0   |
+-| pwn-jail-alpine3.21            | 1.0.0   |
+-| pwn-jail-ubuntu24.04           | 1.0.0   |
+-| pwn-nojail-alpine3.21          | 1.0.0   |
+-| pwn-nojail-ubuntu24.04         | 1.0.0   |
+-| pwn-qemu-kernel                | 1.0.0   |
+-| python3.12-jail-alpine3.21     | 1.0.0   |
+-| python3.12-jail-ubuntu24.04    | 1.0.0   |
+-| python3.12-nojail-alpine3.21   | 1.0.0   |
+-| python3.12-nojail-ubuntu24.04  | 1.0.0   |
+-| rust-nojail-alpine3.21         | 1.0.0   |
+-| rust-nojail-ubuntu24.04        | 1.0.0   |
+-| sagemath-nojail-ubuntu22.04    | 1.0.0   |
++| bash-jail-ubuntu24.04          | 1.0.1   |
++| bash-nojail-ubuntu24.04        | 1.0.1   |
++| flask-instanced-alpine3.21     | 1.0.1   |
++| flask-nojail-alpine3.21        | 1.0.1   |
++| offline                        | 1.0.1   |
++| php-instanced-ubuntu24.04      | 1.0.1   |
++| php-nojail-ubuntu24.04         | 1.0.1   |
++| phpxss-nojail-ubuntu24.04      | 1.0.1   |
++| pwn-jail-alpine3.21            | 1.0.1   |
++| pwn-jail-debian12.11           | 1.0.1   |
++| pwn-jail-ubuntu24.04           | 1.0.1   |
++| pwn-nojail-alpine3.21          | 1.0.1   |
++| pwn-nojail-ubuntu24.04         | 1.0.1   |
++| pwn-qemu-kernel                | 1.0.1   |
++| python3.12-jail-alpine3.21     | 1.0.1   |
++| python3.12-jail-ubuntu24.04    | 1.0.1   |
++| python3.12-nojail-alpine3.21   | 1.0.1   |
++| python3.12-nojail-ubuntu24.04  | 1.0.1   |
++| rust-nojail-alpine3.21         | 1.0.1   |
++| rust-nojail-ubuntu24.04        | 1.0.1   |
++| sagemath-nojail-ubuntu22.04    | 1.0.1   |
+ | solidity-nojail-debian11       | 0.0.1   |
 
- ## Versions
- 
-@@ -59,13 +63,12 @@ You can check for the latest versions within a script [here](https://raw.githubu
+ You can check for the latest versions within a script [here](https://raw.githubusercontent.com/LosFuzzys/LosTemplates/refs/heads/main/.versions)
+@@ -59,13 +65,12 @@ You can check for the latest versions within a script [here](https://raw.githubu
 
  ### Challenge Author
 
@@ -37,7 +77,7 @@ index 49b3bba..d238898 100644
  # Install podman or docker at your choice
  sudo apt install podman podman-docker
  ```
-@@ -73,14 +76,14 @@ sudo apt install podman podman-docker
+@@ -73,14 +78,14 @@ sudo apt install podman podman-docker
  **Fedora**:
  ```sh
  # Fedora 42
@@ -54,7 +94,13 @@ index 49b3bba..d238898 100644
  # Install podman or docker at your choice
  sudo pacman -S docker
  # If you prefer rootless docker, install it from AUR
-@@ -96,7 +99,7 @@ nix develop
+@@ -91,12 +96,12 @@ yay docker-rootless-extras
+ **Nix**:
+ 
+ ```sh
+-nix develop
++nix-shell .
+ ```
 
  ### Players
 
@@ -63,7 +109,7 @@ index 49b3bba..d238898 100644
 
  For Windows: `docker` (WSL2 backend) and `tar` support.
 
-@@ -107,6 +110,9 @@ template folder. This `Makefile` holds metadata configuration that authors can
+@@ -107,6 +112,9 @@ template folder. This `Makefile` holds metadata configuration that authors can
  change. The name of the challenge will be the name of the folder holding the
  `Makefile` (by default).
 

patches/bash-jail-ubuntu24.04/Makefile.patch

@@ -0,0 +1,54 @@
+diff --git a/bash-jail-ubuntu24.04/Makefile b/bash-jail-ubuntu24.04/Makefile
+index 2d34021..fb5b389 100644
+--- a/bash-jail-ubuntu24.04/Makefile
++++ b/bash-jail-ubuntu24.04/Makefile
+@@ -13,18 +13,17 @@ kill: ckill skill
+ # CTFd Configuration #
+ ######################
+ 
+-export FULLNAME  = CTFd challenge name
+-export AUTHOR    = LosFuzzys
+-export CATEGORY  = pwn
+-define DESC
+-This is a multiline challenge description!
++$(shell yq ".flag" Manifest.yaml | tr -d '\n' > challenge/flag.txt)
+ 
+-Feel free to add more lines.
+-endef
+-export DESC
+-export FLAG      = $(shell cat challenge/flag.txt)
+-export FAKE_FLAG = $(shell cat dist/flag.txt)
+-export TAGS      = tag1, tag2, tag with space 
++export FULLNAME := $(shell yq -o yaml ".name" Manifest.yaml)
++export DESC     := $(shell yq -o yaml ".description" Manifest.yaml | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/<br>/g')
++
++# Config for CTFd
++export AUTHOR   := $(shell yq -o yaml ".author.name" Manifest.yaml)
++export CATEGORY := $(shell yq -o yaml ".category" Manifest.yaml)
++export FLAG     := $(shell cat challenge/flag.txt)
++export FAKE_FLAG := $(shell cat dist/flag.txt)
++export TAGS      := $(shell yq -o=tsv '.tags | join(",")' Manifest.yaml)
+ 
+ ############################
+ # Deployment Configuration #
+@@ -47,7 +46,7 @@ export NAME=$(shell echo ${UNCLEAN_NAME} | tr "[:upper:]" "[:lower:]")
+ # Major: Big features & breakage of interfaces                  (in sync)
+ # Minor: Small functionality changes w/ backward compatibility  (in sync)
+ # Patch: Small fixes specific to this template                  (not in sync)
+-export _VERSION = 1.0.0
++export _VERSION = 1.0.1
+ export _TEMPLATE = bash-jail-ubuntu24.04
+ 
+ ########################
+@@ -154,9 +153,9 @@ define run_check
+ 	RETVAL=$$? ; \
+ 	exec 3>&- ; \
+ 	echo -e	"\e[1;36m<<<<<<<<<<<<<< END $$(date +'%H:%M:%S')\e[0m"; \
+-	printf "$$O" | grep ${FLAG} > /dev/null 2>&1 && \
++	printf "$$O" | grep -F -q -- "${FLAG}" > /dev/null 2>&1 && \
+ 		echo -e "\033[1;32m[+] Real flag found: ${FLAG}\033[0;0m" || ( \
+-	printf "$$O" | grep ${FAKE_FLAG} > /dev/null 2>&1 && \
++	printf "$$O" | grep -F -q -- "${FAKE_FLAG}" > /dev/null 2>&1 && \
+ 		echo -e "\033[1;32m[+] Fake flag found: ${FAKE_FLAG}\033[0;0m" \
+ 		|| ([[ "$$RETVAL" -eq "0" ]] && \
+ 		echo -e "\033[1;31m[!] Flag not found\033[0;0m"; exit 1))

patches/bash-jail-ubuntu24.04/Manifest.yaml.patch

@@ -0,0 +1,52 @@
+diff --git a/bash-jail-ubuntu24.04/Manifest.yaml b/bash-jail-ubuntu24.04/Manifest.yaml
+new file mode 100644
+index 0000000..0f99a41
+--- /dev/null
++++ b/bash-jail-ubuntu24.04/Manifest.yaml
+@@ -0,0 +1,45 @@
++# The name must match the following regex:
++#   ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
++name: ctfd-challenge-name
++
++display_name: "CTFd challenge name"
++
++category: misc
++
++# Tags for CTFd 
++tags: []
++
++author:
++    name: CTFd author
++    # The email is ignored in gctf & legacy-kdctf
++    email: ""
++
++# This deployment-information is only relevant for yctf
++points:
++    initial: 550
++    decay: 50
++    minimum: 100
++    function: linear
++
++# This deployment-information is only relevant for yctf
++deployment:
++    ports: []
++    web: false
++    compose: false
++    privileged: true
++
++flag: flag{REAL_REAL_REAL_REAL_REAL_REAL}
++
++# The description can be written as block-content, all line breaks are
++# being retained
++# https://yaml.org/spec/1.2.2/#23-scalars
++description: |
++    Description
++
++# The build-flag is only relevant for yctf
++# It indicates if a container needs to be build (false for offline-challenges)
++build: true
++
++# The check-flag is only relevant for yctf
++# If a solvescript is present, it is being used to test the challenge
++check: false
+\ No newline at end of file