From d68b730be8f96cff1b53a0f966ac71516c88dc1b Mon Sep 17 00:00:00 2001 From: daocoder Date: Sat, 8 Aug 2026 01:48:40 +0000 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Debian=20?= =?UTF-8?q?=E6=8D=A2=E6=BA=90=E5=90=8E=20sources.list.d/=20=E4=B8=8B?= =?UTF-8?q?=E6=97=A7=E6=A0=BC=E5=BC=8F=20deb-src.list=20=E6=AE=8B=E7=95=99?= =?UTF-8?q?=E5=AE=98=E6=96=B9=E6=BA=90=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/recipe/os/APT/Debian.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/recipe/os/APT/Debian.c b/src/recipe/os/APT/Debian.c index 23563bfdf..b3e100e61 100644 --- a/src/recipe/os/APT/Debian.c +++ b/src/recipe/os/APT/Debian.c @@ -10,7 +10,7 @@ os_debian_prelude () chef_prep_this (os_debian, gsr); chef_set_recipe_created_on (this, "2023-09-02"); - chef_set_recipe_last_updated (this, "2026-06-26"); + chef_set_recipe_last_updated (this, "2026-08-08"); chef_set_chefs (this, 2, "@ccmywish", "@G_I_Y"); chef_set_sauciers (this, 2, "@Yangmoooo", "@wcbing"); @@ -95,6 +95,13 @@ os_debian_setsrc_for_deb822 (char *option) cmd = xy_strcat (3, "sed -E -i 's@https?://.*/debian-security/?@", source.url, "-security@g' " OS_Debian_SourceList_DEB822); chsrc_run (cmd, RunOpt_Default); + /* 清理 sources.list.d/ 下旧格式 deb-src.list 等残留的官方源 (deb.debian.org) */ + chsrc_backup (OS_Apt_SourceList_D "deb-src.list"); + cmd = xy_strcat (3, + "find " OS_Apt_SourceList_D " -name '*.list' -exec sed -i -E 's@https?://deb\\.debian\\.org/debian(-security)?@", + source.url, "\\1@g' {} +"); + chsrc_run (cmd, RunOpt_Dont_Abort_On_Failure); + chsrc_run ("apt-get update", RunOpt_No_Last_New_Line); chsrc_determine_chgtype (ChgType_Auto); @@ -152,6 +159,14 @@ os_debian_setsrc (char *option) char *cmd = xy_strcat (3, "sed -E -i \'s@https?://.*/debian/?@", source.url, "@g\' " OS_Debian_old_SourceList); chsrc_run (cmd, RunOpt_Default); + + /* 清理 sources.list.d/ 下旧格式 deb-src.list 等残留的官方源 (deb.debian.org) */ + chsrc_backup (OS_Apt_SourceList_D "deb-src.list"); + cmd = xy_strcat (3, + "find " OS_Apt_SourceList_D " -name '*.list' -exec sed -i -E 's@https?://deb\\.debian\\.org/debian(-security)?@", + source.url, "\\1@g' {} +"); + chsrc_run (cmd, RunOpt_Dont_Abort_On_Failure); + chsrc_run ("apt-get update", RunOpt_No_Last_New_Line); chsrc_determine_chgtype (ChgType_Auto); From fdc92a8bae4d06604534b87a7a9f6b03808a47aa Mon Sep 17 00:00:00 2001 From: daocoder Date: Tue, 11 Aug 2026 06:15:43 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/chsrc-main.c | 1 + src/recipe/os/APT/Debian.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/chsrc-main.c b/src/chsrc-main.c index c8e73f4af..57093b0c6 100644 --- a/src/chsrc-main.c +++ b/src/chsrc-main.c @@ -73,6 +73,7 @@ chsrc_register_contributors () chef_register_contributor ("@techoc", "Rui Yang", "techoc@foxmail.com", NULL); chef_register_contributor ("@BingChunMoLi", "BingChunMoLi", "bingchunmoli@bingchunmoli.com", NULL); chef_register_contributor ("@wcbing", "wcbing", "i@wcbing.top", NULL); + chef_register_contributor ("@daocoder", "daocoder", "daocoder@foxmail.com", NULL); // 该注释下一行的用户 ID 为 Gitee ID chef_register_contributor ("@hezonglun", "HeZongLun", "hezonglun123456@outlook.com", NULL); chef_register_contributor ("@Young-Lord", "LY", "ly-niko@qq.com", NULL); diff --git a/src/recipe/os/APT/Debian.c b/src/recipe/os/APT/Debian.c index b3e100e61..4fae44477 100644 --- a/src/recipe/os/APT/Debian.c +++ b/src/recipe/os/APT/Debian.c @@ -10,10 +10,10 @@ os_debian_prelude () chef_prep_this (os_debian, gsr); chef_set_recipe_created_on (this, "2023-09-02"); - chef_set_recipe_last_updated (this, "2026-08-08"); + chef_set_recipe_last_updated (this, "2026-08-11"); chef_set_chefs (this, 2, "@ccmywish", "@G_I_Y"); - chef_set_sauciers (this, 2, "@Yangmoooo", "@wcbing"); + chef_set_sauciers (this, 3, "@Yangmoooo", "@wcbing", "@daocoder"); chef_set_os_scope (this);