From 7e31d6219ebffce98bc125dfa5d374ae8e28e9ce Mon Sep 17 00:00:00 2001
From: sun_hai_10 <sunhai10@huawei.com>
Date: Wed, 23 Apr 2025 10:27:52 +0800
Subject: [PATCH] fix start cobbler 3.2.3 failed

---
 bugfix-change-permission-with-web.ss.patch | 24 ----------------------
 cobbler.spec                               | 10 +++++++--
 2 files changed, 8 insertions(+), 26 deletions(-)
 delete mode 100644 bugfix-change-permission-with-web.ss.patch

diff --git a/bugfix-change-permission-with-web.ss.patch b/bugfix-change-permission-with-web.ss.patch
deleted file mode 100644
index 0817480..0000000
--- a/bugfix-change-permission-with-web.ss.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 22a896bea11ef4627222b69056a8b3d9dba0ddee Mon Sep 17 00:00:00 2001
-From: sun_hai_10 <sunhai10@huawei.com>
-Date: Fri, 28 Mar 2025 01:56:16 +0800
-Subject: [PATCH] change permission with web.ss
-
----
- cobbler/cobblerd.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cobbler/cobblerd.py b/cobbler/cobblerd.py
-index df2f4f6..1dd87c8 100644
---- a/cobbler/cobblerd.py
-+++ b/cobbler/cobblerd.py
-@@ -53,6 +53,7 @@ def regen_ss_file():
- 
-     with open(ssfile, 'w', 0o640, encoding="UTF-8") as fd:
-         fd.write(str(binascii.hexlify(data)))
-+    os.chmod(ssfiile, 0o660)
- 
-     http_user = "apache"
-     family = utils.get_family()
--- 
-2.43.0
-
diff --git a/cobbler.spec b/cobbler.spec
index 38e7aeb..33c6eb8 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -4,7 +4,7 @@
 
 Name:       cobbler
 Version:    3.2.3
-Release:    1
+Release:    2
 Summary:    Boot server configurator
 URL:        https://cobbler.github.io/
 License:    GPLv2+
@@ -13,7 +13,7 @@ BuildArch:  noarch
 
 Patch9000:  huawei-adapt-vendor.patch
 Patch9001:  huawei-repair-switch-condition-error.patch
-Patch9002:  bugfix-change-permission-with-web.ss.patch
+
 Patch6001:  backport-Fix-package-building-with-Sphinx.patch
 
 BuildRequires:  system-release
@@ -207,6 +207,12 @@ sed -i -e "s/SECRET_KEY = ''/SECRET_KEY = \'$RAND_SECRET\'/" %{_datadir}/cobbler
 %attr(-,apache,apache) /var/www/cobbler_webui_content/
 
 %changelog
+* Wed Apr 23 2025 sunhai <sunhai10@huawei.com> - 3.2.3-2
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:fix start cobbler failed
+
 * Tue Apr 22 2025 sunhai <sunhai10@huawei.com> - 3.2.3-1
 - Type:bugfix
 - ID:NA