From 7d1887d0bd655fd03364959f7350c36c8ad324f3 Mon Sep 17 00:00:00 2001
From: supix <esposito.marce@gmail.com>
Date: Thu, 20 Jun 2024 19:46:58 +0000
Subject: [PATCH 1/2] Dockerfile updated to install znuny 6.5.8 LTS

The update was done due to critical and high vulnerabilities in znuny v6.0.45, mainly related to ckeditor plugin v4.17.1. This new znuny version uses ckeditor v4.22.1-min.

Note that this minor release needs some more dependencies with respect to 6.0.45 version:

* perl-Apache-DBI
* perl(Data::UUID)
* perl(Apache3::Reload)
* perl(iCal::Parser)
---
 otrs/Dockerfile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/otrs/Dockerfile b/otrs/Dockerfile
index 1ec88c5..c89611a 100644
--- a/otrs/Dockerfile
+++ b/otrs/Dockerfile
@@ -1,7 +1,7 @@
 #OTRS ticketing system docker image.
 FROM centos:7
 LABEL maintainer="Juan Luis Baptiste <juan@juanbaptiste.tech>"
-ENV OTRS_VERSION=6.0.45-01
+ENV OTRS_VERSION=6.5.8-01
 ENV OTRS_ROOT "/opt/otrs/"
 ENV OTRS_BACKUP_DIR "/var/otrs/backups"
 ENV OTRS_CONFIG_DIR "${OTRS_ROOT}Kernel"
@@ -15,17 +15,18 @@ RUN yum install -y yum-plugin-fastestmirror && \
     yum install -y epel-release && \
     yum -y install https://harbottle.gitlab.io/epmel/7/x86_64/epmel-release.rpm && \
     yum update -y && \
-    yum -y install bzip2 cronie httpd mysql mod_perl \
+    yum -y install bzip2 cronie httpd mysql mod_perl perl-Apache-DBI \
     perl-core "perl(Crypt::SSLeay)" "perl(Net::LDAP)" "perl(URI)" \
-    procmail "perl(Date::Format)" "perl(LWP::UserAgent)" \
+    procmail "perl(Date::Format)" "perl(LWP::UserAgent)" "perl(Data::UUID)" \
     "perl(Net::DNS)" "perl(IO::Socket::SSL)" "perl(XML::Parser)" \
-    "perl(Apache2::Reload)" "perl(Crypt::Eksblowfish::Bcrypt)" \
+    "perl(Apache3::Reload)" "perl(Crypt::Eksblowfish::Bcrypt)" \
     "perl(Encode::HanExtra)" "perl(GD)" "perl(GD::Text)" "perl(GD::Graph)" \
     "perl(JSON::XS)" "perl(Mail::IMAPClient)" "perl(PDF::API2)" "perl(DateTime)" \
     "perl(Text::CSV_XS)" "perl(YAML::XS)" "perl(Text::CSV_XS)" "perl(DBD::mysql)" \
     perl-Moo "perl(namespace::clean)" "perl(Crypt::Random::Source)" "perl(Exporter::Tiny)" \
     "perl(Math::Random::ISAAC)" "perl(Math::Random::Secure)" "perl(Module::Find)" \
-    "perl(Types::TypeTiny)" rsyslog supervisor tar which && \
+    "perl(Types::TypeTiny)" rsyslog supervisor tar which cpanminus && \
+    cpanm iCal::Parser && \
     yum install -y https://download.znuny.org/releases/RPMS/rhel/7/znuny-${OTRS_VERSION}.noarch.rpm && \
     /opt/otrs/bin/otrs.CheckModules.pl && \
     yum clean all

From 090d420f5944b3894ffc1b4d91aba3a364789ea7 Mon Sep 17 00:00:00 2001
From: supix <esposito.marce@gmail.com>
Date: Fri, 21 Jun 2024 04:33:29 +0000
Subject: [PATCH 2/2] DB scripts renamed according to new znuny release

---
 otrs/functions.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/otrs/functions.sh b/otrs/functions.sh
index 81bb890..486d59f 100644
--- a/otrs/functions.sh
+++ b/otrs/functions.sh
@@ -288,14 +288,14 @@ function load_defaults() {
     #Check that a backup isn't being restored
     if [ "$OTRS_INSTALL" == "no" ]; then
       print_info "Loading default db schemas..."
-      $mysqlcmd ${OTRS_DB_NAME} < ${OTRS_ROOT}scripts/database/otrs-schema.mysql.sql
-      [ $? -gt 0 ] && print_error "\n\e[1;31mERROR:\e[0m Couldn't load otrs-schema.mysql.sql schema !!\n" && exit 1
+      $mysqlcmd ${OTRS_DB_NAME} < ${OTRS_ROOT}scripts/database/schema.mysql.sql
+      [ $? -gt 0 ] && print_error "\n\e[1;31mERROR:\e[0m Couldn't load schema.mysql.sql schema !!\n" && exit 1
       print_info "Loading initial db inserts..."
-      $mysqlcmd ${OTRS_DB_NAME} < ${OTRS_ROOT}scripts/database/otrs-initial_insert.mysql.sql
+      $mysqlcmd ${OTRS_DB_NAME} < ${OTRS_ROOT}scripts/database/initial_insert.mysql.sql
       [ $? -gt 0 ] && print_error "\n\e[1;31mERROR:\e[0m Couldn't load OTRS database initial inserts !!\n" && exit 1
       print_info "Loading initial schema constraints..."
-      $mysqlcmd ${OTRS_DB_NAME} < ${OTRS_ROOT}scripts/database/otrs-schema-post.mysql.sql
-      [ $? -gt 0 ] && print_error "\n\e[1;31mERROR:\e[0m Couldn't load otrs-schema-post.mysql.sql schema !!\n" && exit 1
+      $mysqlcmd ${OTRS_DB_NAME} < ${OTRS_ROOT}scripts/database/schema-post.mysql.sql
+      [ $? -gt 0 ] && print_error "\n\e[1;31mERROR:\e[0m Couldn't load schema-post.mysql.sql schema !!\n" && exit 1
     fi
   else
     print_warning "otrs database already exists, Ok."