This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 86e3546 Fixed: Disable the Birt component in all branches (including
trunk) because of CVE-2022-25371 (OFBIZ-12824)
86e3546 is described below
commit 86e35462b49998b956e9429adccca76322ee594c
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Thu May 25 14:52:09 2023 +0200
Fixed: Disable the Birt component in all branches (including trunk) because
of CVE-2022-25371 (OFBIZ-12824)
Removes now useless patch and calls to it
---
demo-backup/next-manual.sh | 1 -
demo-backup/patch/trunk/birt.patch | 7 -------
demo-backup/stable-manual.sh | 1 -
demo-backup/trunk.sh | 1 -
4 files changed, 10 deletions(-)
diff --git a/demo-backup/next-manual.sh b/demo-backup/next-manual.sh
index 4fdcd9c..0860e90 100755
--- a/demo-backup/next-manual.sh
+++ b/demo-backup/next-manual.sh
@@ -22,7 +22,6 @@ rm /home/ofbizDemo/branch22.01/framework/base/config/*.jks
# Here no need to check out, it's not a repo. So patching is OK
cd /home/ofbizDemo/branch22.01/plugins
patch -p0 < /home/ofbizDemo/branch22.01/solr.config.patch
-patch -p0 < /home/ofbizDemo/trunk/birt.patch
cd ..
./gradlew --no-daemon "ofbiz --shutdown --portoffset 20000"
diff --git a/demo-backup/patch/trunk/birt.patch
b/demo-backup/patch/trunk/birt.patch
deleted file mode 100644
index 96391a4..0000000
--- a/demo-backup/patch/trunk/birt.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --git birt/ofbiz-component.xml birt/ofbiz-component.xml
-index 5e58dec..b1d3d27 100644
---- birt/ofbiz-component.xml
-+++ birt/ofbiz-component.xml
-@@ -21 +21 @@
--<ofbiz-component name="birt" enabled="true"
-+<ofbiz-component name="birt" enabled="false"
diff --git a/demo-backup/stable-manual.sh b/demo-backup/stable-manual.sh
index fed0eda..d4d9945 100755
--- a/demo-backup/stable-manual.sh
+++ b/demo-backup/stable-manual.sh
@@ -22,7 +22,6 @@ rm /home/ofbizDemo/branch18.12/framework/base/config/*.jks
# Here no need to check out, it's not a repo. So patching is OK
cd /home/ofbizDemo/branch18.12/plugins
patch -p0 < /home/ofbizDemo/branch18.12/solr.config.patch
-patch -p0 < /home/ofbizDemo/trunk/birt.patch
cd ..
./gradlew --no-daemon "ofbiz --shutdown --portoffset 10000"
diff --git a/demo-backup/trunk.sh b/demo-backup/trunk.sh
index a700c8e..257659a 100755
--- a/demo-backup/trunk.sh
+++ b/demo-backup/trunk.sh
@@ -23,7 +23,6 @@ rm /home/ofbizDemo/trunk/framework/base/config/*.jks || true
# Here no need to check out, it's not a repo. So patching is OK
cd /home/ofbizDemo/trunk/plugins
patch -p0 < /home/ofbizDemo/trunk/solr.config.patch
-patch -p0 < /home/ofbizDemo/trunk/birt.patch
cd ..
./gradlew --no-daemon "ofbiz --shutdown"
