From 427c677eceb6c476f48d86b24a9798d7fb616db9 Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 05:10:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:10:02 04.05.2026. --- html/AM-GlobalFunc.rsc | 4 ++-- html/certs/Makefile | 30 ++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index c80c1f737..a7ffedee4 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/498/954e6669"; +:global CommitId "main/499/9fc0c4df"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:00:03 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:10:02 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/certs/Makefile b/html/certs/Makefile index 634c0f47e..a130e8872 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -15,7 +15,8 @@ LIST_DIRS := $(filter-out $(LIST_ROOT)/Makefile.%,$(wildcard $(LIST_ROOT)/*)) DIR_TARGETS := $(notdir $(LIST_DIRS)) TARGETS := $(sort $(FILE_TARGETS) $(DIR_TARGETS)) CHECK_TARGETS := $(addprefix check-,$(TARGETS)) -CLEAN_TARGETS := $(addprefix clean-,$(TARGETS)) +CLEAN_ALL := $(addprefix clean-,$(TARGETS)) +CLEAN_TARGETS := $(addprefix clean-list-,$(TARGETS)) # Big CA list with all certificates ~ 2Mb ALL_CA_URL := https://curl.se/ca/cacert.pem @@ -29,25 +30,28 @@ CURL := curl \ --silent \ --show-error -.PHONY: default help all clean all-ca-lst download-list check-list clean-list $(TARGETS) $(CHECK_TARGETS) $(CLEAN_TARGETS) +.PHONY: default help all clean clean-list all-ca-lst download-list check-list clean-list $(TARGETS) $(CHECK_TARGETS) $(CLEAN_ALL) $(CLEAN_TARGETS) default: help help: @echo "Targets:" - @echo " make all Download all-ca-lst and all list targets: $(TARGETS)" - @echo " make Download certs into .// as CN-based *.pem" - @echo " make check- Check certs using .//$(INDEX_FILE)" - @echo " make clean Remove unavailable PEM files from target dirs only" - @echo " make clean- Clean one target dir using its index" - @echo " make all-ca-lst Recreate $(CA_LIST_DIR)/ and split bundle into CN-based PEM files" + @echo " make all Download all-ca-lst and all list targets: $(TARGETS)" + @echo " make Download certs into .// as CN-based *.pem" + @echo " make check- Check certs using .//$(INDEX_FILE)" + @echo " make clean Remove all targets dirs" + @echo " make clean-list Remove unavailable PEM files from target dirs only" + @echo " make clean-list- Clean one target dir using its index" + @echo " make all-ca-lst Recreate $(CA_LIST_DIR)/ and split bundle into CN-based PEM files" @echo "Lists: $(LIST_ROOT)/Makefile. or $(LIST_ROOT)//*" @echo "Format: check-url download-url" @echo "Example: api.telegram.org https://certs.godaddy.com/repository/gdroot-g2.crt" all: all-ca-lst $(TARGETS) -clean: $(CLEAN_TARGETS) +clean: $(CLEAN_ALL) + +clean-list: $(CLEAN_TARGETS) all-ca-lst: @tmp="$$(mktemp)"; \ @@ -88,7 +92,7 @@ $(DIR_TARGETS): %: $(LIST_ROOT)/% $(CHECK_TARGETS): check-%: @$(MAKE) check-list OUT_DIR="$*" -$(CLEAN_TARGETS): clean-%: +$(CLEAN_TARGETS): clean-list-%: @$(MAKE) clean-list OUT_DIR="$*" # List format: check-url download-url. Both may omit https://. @@ -179,3 +183,9 @@ clean-list: mv -- "$$tmp_index" "$(OUT_DIR)/$(INDEX_FILE)"; \ mv -- "$$tmp_urls" "$(OUT_DIR)/$(INDEX_URLS)"; \ true + +clean: + @echo "Remove directory $(OUT_DIR)"; \ + cd "$(BUILD_DIR)"; \ + rm -rf $(OUT_DIR); \ + @echo "===> $@ done!"; -- 2.52.0