From 6bd315f837e6d9cf81956392495e3086bc2d87ed Mon Sep 17 00:00:00 2001 From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 06:00:03 +0300 Subject: [PATCH] Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:00:03 04.05.2026. --- html/AM-GlobalFunc.rsc | 4 ++-- html/certs/.#Makefile | 1 - html/certs/Makefile | 23 ++++------------------- 3 files changed, 6 insertions(+), 22 deletions(-) delete mode 120000 html/certs/.#Makefile diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index 9f3081d62..fb26ed342 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/508/2246f173"; +:global CommitId "main/509/c2f4139d"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 05:55:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:00:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 138; diff --git a/html/certs/.#Makefile b/html/certs/.#Makefile deleted file mode 120000 index 858263df7..000000000 --- a/html/certs/.#Makefile +++ /dev/null @@ -1 +0,0 @@ -root@amster.1174539 \ No newline at end of file diff --git a/html/certs/Makefile b/html/certs/Makefile index 5ef4bb5d1..9b35d699f 100644 --- a/html/certs/Makefile +++ b/html/certs/Makefile @@ -16,7 +16,6 @@ DIR_TARGETS := $(notdir $(LIST_DIRS)) TARGETS := $(sort $(FILE_TARGETS) $(DIR_TARGETS)) CHECK_TARGETS := $(addprefix check-,$(TARGETS)) CLEAN_TARGETS := $(addprefix clean-,$(TARGETS)) -CLEAN_ALL := $(notdir $(LIST_DIRS)) # Big CA list with all certificates ~ 2Mb ALL_CA_URL := https://curl.se/ca/cacert.pem @@ -30,7 +29,7 @@ CURL := curl \ --silent \ --show-error -.PHONY: default help all all-ca-lst download-list check-list clean-list clean $(TARGETS) $(CHECK_TARGETS) $(CLEAN_TARGETS) $(CLEAN_ALL) +.PHONY: default help all clean all-ca-lst download-list check-list clean-list $(TARGETS) $(CHECK_TARGETS) $(CLEAN_TARGETS) default: help @@ -39,7 +38,6 @@ help: @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" @@ -49,9 +47,7 @@ help: all: all-ca-lst $(TARGETS) -clean-list: $(CLEAN_TARGETS) - -clean: $(CLEAN_ALL) +clean: $(CLEAN_TARGETS) all-ca-lst: @tmp="$$(mktemp)"; \ @@ -89,16 +85,12 @@ $(FILE_TARGETS): %: $(LIST_ROOT)/Makefile.% $(DIR_TARGETS): %: $(LIST_ROOT)/% @$(MAKE) download-list LIST="$<" OUT_DIR="$@" -$(CHECK_TARGETS): check-list-%: +$(CHECK_TARGETS): check-%: @$(MAKE) check-list OUT_DIR="$*" -$(CLEAN_TARGETS): clean-list-%: +$(CLEAN_TARGETS): clean-%: @$(MAKE) clean-list OUT_DIR="$*" -$(CLEAN_ALL): %: $(LIST_ROOT)/% - @$(MAKE) clean LIST="$<" RM_DIR="$@" - - # List format: check-url download-url. Both may omit https://. # download-url may also be a local path. Downloaded files are named by CN. download-list: @@ -187,10 +179,3 @@ clean-list: mv -- "$$tmp_index" "$(OUT_DIR)/$(INDEX_FILE)"; \ mv -- "$$tmp_urls" "$(OUT_DIR)/$(INDEX_URLS)"; \ true - -clean: - echo "Remove directory $(RM_DIR)"; >&2; \ - echo "List directory $(LIST)"; >&2; \ - echo "===> $@ done!" >&2; - -# @rm -rf $(BUILD_DIR)/$(OUT_DIR); \ -- 2.52.0