From 78576a2a40ad2164cfcdd22db9c009b5b37cff35 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Tue, 9 Jul 2024 16:11:57 +0800
Subject: [PATCH 1/4] opt: setting firewall in package installation

---
 rpmbuild/SPECS/omc.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec
index 2eeb4f8..e5b3309 100644
--- a/rpmbuild/SPECS/omc.spec
+++ b/rpmbuild/SPECS/omc.spec
@@ -129,7 +129,14 @@ if [ ! -e libwsutil.so ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so; fi
 cd ${UsrLocalBinDir}
 if [ ! -e ${OmcDaemon} ]; then  ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi
 # sed -i 's/listen       80;/listen       1080;/g' ${NginxEtcDir}/nginx.conf
-# sed -i 's/listen       \[::\]:80;/listen       \[::\]:1080;/g' ${NginxEtcDir}/nginx.conf 
+# sed -i 's/listen       \[::\]:80;/listen       \[::\]:1080;/g' ${NginxEtcDir}/nginx.conf
+
+# setting firewall
+PortList="80 33030 443 33443 22222"
+for Port in ${PortList}; do 
+    firewall-cmd --zone=public --add-port=${Port}/tcp --permanent
+done
+
 systemctl daemon-reload
 systemctl enable restagent.service
 systemctl enable crontask.service

From 43d61681aa9d270b5a36a097d9dbd4c8d15d3ea0 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Tue, 9 Jul 2024 16:12:59 +0800
Subject: [PATCH 2/4] opt: setting firewall

---
 rpmbuild/SPECS/omc.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec
index e5b3309..fa7abdf 100644
--- a/rpmbuild/SPECS/omc.spec
+++ b/rpmbuild/SPECS/omc.spec
@@ -136,6 +136,7 @@ PortList="80 33030 443 33443 22222"
 for Port in ${PortList}; do 
     firewall-cmd --zone=public --add-port=${Port}/tcp --permanent
 done
+firewall-cmd --reload
 
 systemctl daemon-reload
 systemctl enable restagent.service

From ccd8a4fd827096ad0ecaaccf26b02a1a6bd72223 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Tue, 9 Jul 2024 16:18:56 +0800
Subject: [PATCH 3/4] opt: setting firewall

---
 rpmbuild/SPECS/omc.spec | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec
index fa7abdf..d90be8c 100644
--- a/rpmbuild/SPECS/omc.spec
+++ b/rpmbuild/SPECS/omc.spec
@@ -169,6 +169,14 @@ rm libwiretap.so
 rm libwsutil.so.13
 rm libwsutil.so
 rm -f ${UsrLocalBinDir}/omcd
+
+# setting firewall
+PortList="80 33030 443 33443 22222"
+for Port in ${PortList}; do 
+    firewall-cmd --zone=public --remove-port=${Port}/tcp --permanent
+done
+firewall-cmd --reload
+
 if [ "$1" = "0" ] ; then
 sudo systemctl stop restagent.service
 sudo systemctl stop crontask.service

From 14c0ecbf8e7646ffb19d94a220c75952c5d5c442 Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Thu, 11 Jul 2024 11:48:57 +0800
Subject: [PATCH 4/4] release 2.2407.2 for multi-tenancy

---
 build.sh                      | 2 +-
 debbuild/22.04/DEBIAN/control | 2 +-
 debbuild/DEBIAN/control       | 2 +-
 rpmbuild/SPECS/omc.spec       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.sh b/build.sh
index 84eb45c..4fa96d6 100644
--- a/build.sh
+++ b/build.sh
@@ -55,7 +55,7 @@ fi
 ProjectL=omc
 ProjectU=OMC
 PROJECT=${ProjectL}
-VERSION=2.2407.1
+VERSION=2.2407.2
 RelDate=`date +%Y%m%d`
 RelVer=${VERSION}-${RelDate}
 Ky10Arch=ky10.aarch64
diff --git a/debbuild/22.04/DEBIAN/control b/debbuild/22.04/DEBIAN/control
index 53b8e5a..e54957c 100644
--- a/debbuild/22.04/DEBIAN/control
+++ b/debbuild/22.04/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: OMC
-Version: 2.2407.1-YYYYMMDD
+Version: 2.2407.2-YYYYMMDD
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  
diff --git a/debbuild/DEBIAN/control b/debbuild/DEBIAN/control
index 53b8e5a..e54957c 100644
--- a/debbuild/DEBIAN/control
+++ b/debbuild/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: OMC
-Version: 2.2407.1-YYYYMMDD
+Version: 2.2407.2-YYYYMMDD
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  
diff --git a/rpmbuild/SPECS/omc.spec b/rpmbuild/SPECS/omc.spec
index d90be8c..beb3d8e 100644
--- a/rpmbuild/SPECS/omc.spec
+++ b/rpmbuild/SPECS/omc.spec
@@ -8,7 +8,7 @@
 
 Name: %{project_lname} 
 Summary: AGrandTech 5GC OMC
-Version: 2.2407.1
+Version: 2.2407.2
 Release: %{release_date}
 Vendor: AGrandTech
 URL: https://www.agrandtech.com/