From 7cadfb7981791ed98fe97669d0416fa8c8d7727e Mon Sep 17 00:00:00 2001
From: rupalid <rtdesai@gmail.com>
Date: Mon, 17 Feb 2020 10:50:07 +0530
Subject: [PATCH 1/3] ZBUG-148 Updating jars required by Tika (#67)

* ZBUG-148 Updating jars required by Tika

* ZBUG-148 Updating jars required by Tika

(cherry picked from commit 6a0bb05f03fe21560159157ccb3583c7cf2ff0d5)
---
 ivy.xml        | 4 ++--
 pkg-builder.pl | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index d9ecea3..edc62e5 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -36,7 +36,7 @@
     <dependency org="commons-collections" name="commons-collections" rev="3.2.2"/>
     <dependency org="commons-dbcp" name="commons-dbcp" rev="1.4"/>
     <dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.2"/>
-    <dependency org="commons-io" name="commons-io" rev="1.4"/>
+    <dependency org="commons-io" name="commons-io" rev="2.6"/>
     <dependency org="commons-lang" name="commons-lang" rev="2.6"/>
     <dependency org="commons-logging" name="commons-logging" rev="1.1.1"/>
     <dependency org="commons-net" name="commons-net" rev="3.3"/>
@@ -63,7 +63,7 @@
     <dependency org="net.spy" name="spymemcached" rev="2.12.1" transitive="false"/>
     <dependency org="oauth" name="oauth" rev="1.4"/>
     <dependency org="org.antlr" name="antlr" rev="3.2"/>
-    <dependency org="org.apache.commons" name="commons-compress" rev="1.10"/>
+    <dependency org="org.apache.commons" name="commons-compress" rev="1.20"/>
     <dependency org="org.apache.commons" name="commons-csv" rev="1.2"/>
     <dependency org="org.apache.commons" name="commons-pool2" rev="2.4.2"/>
     <dependency org="org.apache.curator" name="curator-client" rev="2.0.1-incubating"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index 515dbdf..268fa7e 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -114,11 +114,11 @@ ($)
         cpy_file("build/dist/commons-cli-1.2.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/commons-cli-1.2.jar");
         cpy_file("build/dist/commons-codec-1.7.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/commons-codec-1.7.jar");
         cpy_file("build/dist/commons-collections-3.2.2.jar",                        "$stage_base_dir/opt/zimbra/lib/jars/commons-collections-3.2.2.jar");
-        cpy_file("build/dist/commons-compress-1.10.jar",                            "$stage_base_dir/opt/zimbra/lib/jars/commons-compress-1.10.jar");
+        cpy_file("build/dist/commons-compress-1.20.jar",                            "$stage_base_dir/opt/zimbra/lib/jars/commons-compress-1.20.jar");
         cpy_file("build/dist/commons-csv-1.2.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/commons-csv-1.2.jar");
         cpy_file("build/dist/commons-dbcp-1.4.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/commons-dbcp-1.4.jar");
         cpy_file("build/dist/commons-fileupload-1.2.2.jar",                         "$stage_base_dir/opt/zimbra/lib/jars/commons-fileupload-1.2.2.jar");
-        cpy_file("build/dist/commons-io-1.4.jar",                                   "$stage_base_dir/opt/zimbra/lib/jars/commons-io-1.4.jar");
+        cpy_file("build/dist/commons-io-2.6.jar",                                   "$stage_base_dir/opt/zimbra/lib/jars/commons-io-2.6.jar");
         cpy_file("build/dist/commons-lang-2.6.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/commons-lang-2.6.jar");
         cpy_file("build/dist/commons-net-3.3.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/commons-net-3.3.jar");
         cpy_file("build/dist/commons-pool-1.6.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/commons-pool-1.6.jar");
@@ -252,10 +252,10 @@ ($)
        cpy_file("build/dist/commons-cli-1.2.jar",                                   "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-cli-1.2.jar");
        cpy_file("build/dist/commons-codec-1.7.jar",                                 "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-codec-1.7.jar");
        cpy_file("build/dist/commons-collections-3.2.2.jar",                         "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-collections-3.2.2.jar");
-       cpy_file("build/dist/commons-compress-1.10.jar",                             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-compress-1.10.jar");
+       cpy_file("build/dist/commons-compress-1.20.jar",                             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-compress-1.20.jar");
        cpy_file("build/dist/commons-dbcp-1.4.jar",                                  "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-dbcp-1.4.jar");
        cpy_file("build/dist/commons-fileupload-1.2.2.jar",                          "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-fileupload-1.2.2.jar");
-       cpy_file("build/dist/commons-io-1.4.jar",                                    "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-io-1.4.jar");
+       cpy_file("build/dist/commons-io-2.6.jar",                                    "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-io-2.6.jar");
        cpy_file("build/dist/commons-lang-2.6.jar",                                  "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-lang-2.6.jar");
        cpy_file("build/dist/commons-logging-1.1.1.jar",                             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-logging-1.1.1.jar");
        cpy_file("build/dist/commons-net-3.3.jar",                                   "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-net-3.3.jar");

From f934a3d817482d1a8caff32c7a444404a19dffc8 Mon Sep 17 00:00:00 2001
From: rupalid <rtdesai@gmail.com>
Date: Tue, 26 May 2020 11:35:22 +0530
Subject: [PATCH 2/3] ZBUG-148 Fixing Tika extractor (#69)

* ZBUG-148 Fixing Tika extractor

* ZBUG-148 Fixing Tika extractor

* ZBUG-148 Fixing Tika extractor

(cherry picked from commit e68744c2ef408a5c809c8f2082b800a156b329ea)
---
 ivy.xml        | 5 +++--
 pkg-builder.pl | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index edc62e5..f32df60 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -5,10 +5,10 @@
   <dependencies>
     <dependency org="ant" name="ant" rev="1.6.5"/>
     <dependency org="ant-contrib" name="ant-contrib" rev="1.0b2"/>
-    <dependency org="asm" name="asm" rev="3.3.1"/>
     <dependency org="org.apache.sshd" name="sshd-common" rev="2.6.1"/>
     <dependency org="org.apache.sshd" name="sshd-core" rev="2.6.1"/>
     <dependency org="net.i2p.crypto" name="eddsa" rev="0.3.0"/>
+    <dependency org="org.ow2.asm" name="asm" rev="8.0.1"/>
     <dependency org="com.101tec" name="zkclient" rev="0.1.0"/>
     <dependency org="com.github.stephenc" name="jamm" rev="0.2.5"/>
     <dependency org="com.google.guava" name="guava" rev="23.0"/>
@@ -32,7 +32,7 @@
     <dependency org="com.unboundid" name="unboundid-ldapsdk" rev="2.3.5"/>
     <dependency org="com.yahoo.platform.yui" name="yuicompressor" rev="2.4.2-zimbra"/>
     <dependency org="commons-cli" name="commons-cli" rev="1.2"/>
-    <dependency org="commons-codec" name="commons-codec" rev="1.7"/>
+    <dependency org="commons-codec" name="commons-codec" rev="1.14"/>
     <dependency org="commons-collections" name="commons-collections" rev="3.2.2"/>
     <dependency org="commons-dbcp" name="commons-dbcp" rev="1.4"/>
     <dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.2"/>
@@ -157,6 +157,7 @@
     <dependency org="org.w3c.css" name="sac" rev="1.3"/>
     <dependency org="org.apache.xmlgraphics" name="batik-i18n" rev="1.9"/>
     <dependency org="org.apache.xmlgraphics" name="batik-util" rev="1.8"/>
+    <dependency org="org.apache.tika" name="tika-app" rev="1.24.1"/>
     <exclude org="com.noelios.restlet" module="com.noelios.restlet"/>
     <exclude org="javax.sql" module="jdbc-stdext"/>
     <exclude org="javax.transaction" module="jta"/>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index 268fa7e..8d8daa4 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -109,10 +109,10 @@ ($)
         cpy_file("build/dist/antlr-3.2.jar",                                        "$stage_base_dir/opt/zimbra/lib/jars/antlr-3.2.jar");
         cpy_file("build/dist/apache-jsieve-core-0.5.jar",                           "$stage_base_dir/opt/zimbra/lib/jars/apache-jsieve-core-0.5.jar");
         cpy_file("build/dist/apache-log4j-extras-1.0.jar",                          "$stage_base_dir/opt/zimbra/lib/jars/apache-log4j-extras-1.0.jar");
-        cpy_file("build/dist/asm-3.3.1.jar",                                        "$stage_base_dir/opt/zimbra/lib/jars/asm-3.3.1.jar");
-        cpy_file("build/dist/bcprov-jdk15on-1.55.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/bcprov-jdk15on-1.55.jar");
+        cpy_file("build/dist/asm-8.0.1.jar",                                        "$stage_base_dir/opt/zimbra/lib/jars/asm-8.0.1.jar");
+        cpy_file("build/dist/bcprov-jdk15on-1.64.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/bcprov-jdk15on-1.64.jar");
         cpy_file("build/dist/commons-cli-1.2.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/commons-cli-1.2.jar");
-        cpy_file("build/dist/commons-codec-1.7.jar",                                "$stage_base_dir/opt/zimbra/lib/jars/commons-codec-1.7.jar");
+        cpy_file("build/dist/commons-codec-1.14.jar",                               "$stage_base_dir/opt/zimbra/lib/jars/commons-codec-1.14.jar");
         cpy_file("build/dist/commons-collections-3.2.2.jar",                        "$stage_base_dir/opt/zimbra/lib/jars/commons-collections-3.2.2.jar");
         cpy_file("build/dist/commons-compress-1.20.jar",                            "$stage_base_dir/opt/zimbra/lib/jars/commons-compress-1.20.jar");
         cpy_file("build/dist/commons-csv-1.2.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/commons-csv-1.2.jar");
@@ -250,7 +250,7 @@ ($)
        cpy_file("build/dist/apache-log4j-extras-1.0.jar",                           "$stage_base_dir/opt/zimbra/jetty_base/common/lib/apache-log4j-extras-1.0.jar");
        cpy_file("build/dist/bcprov-jdk15on-1.55.jar",                               "$stage_base_dir/opt/zimbra/jetty_base/common/lib/bcprov-jdk15on-1.55.jar");
        cpy_file("build/dist/commons-cli-1.2.jar",                                   "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-cli-1.2.jar");
-       cpy_file("build/dist/commons-codec-1.7.jar",                                 "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-codec-1.7.jar");
+       cpy_file("build/dist/commons-codec-1.14.jar",                                "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-codec-1.14.jar");
        cpy_file("build/dist/commons-collections-3.2.2.jar",                         "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-collections-3.2.2.jar");
        cpy_file("build/dist/commons-compress-1.20.jar",                             "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-compress-1.20.jar");
        cpy_file("build/dist/commons-dbcp-1.4.jar",                                  "$stage_base_dir/opt/zimbra/jetty_base/common/lib/commons-dbcp-1.4.jar");

From 7f3e0c629ebd885a0aa44d465641ed681cd15eae Mon Sep 17 00:00:00 2001
From: Yogesh Dasi <yogesh.dasi@synacor.com>
Date: Tue, 25 Jan 2022 17:22:11 +0530
Subject: [PATCH 3/3] ZCS-11132: reset version for bcprov to 1.55

---
 pkg-builder.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg-builder.pl b/pkg-builder.pl
index 8d8daa4..8bf387b 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -110,7 +110,7 @@ ($)
         cpy_file("build/dist/apache-jsieve-core-0.5.jar",                           "$stage_base_dir/opt/zimbra/lib/jars/apache-jsieve-core-0.5.jar");
         cpy_file("build/dist/apache-log4j-extras-1.0.jar",                          "$stage_base_dir/opt/zimbra/lib/jars/apache-log4j-extras-1.0.jar");
         cpy_file("build/dist/asm-8.0.1.jar",                                        "$stage_base_dir/opt/zimbra/lib/jars/asm-8.0.1.jar");
-        cpy_file("build/dist/bcprov-jdk15on-1.64.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/bcprov-jdk15on-1.64.jar");
+        cpy_file("build/dist/bcprov-jdk15on-1.55.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/bcprov-jdk15on-1.55.jar");
         cpy_file("build/dist/commons-cli-1.2.jar",                                  "$stage_base_dir/opt/zimbra/lib/jars/commons-cli-1.2.jar");
         cpy_file("build/dist/commons-codec-1.14.jar",                               "$stage_base_dir/opt/zimbra/lib/jars/commons-codec-1.14.jar");
         cpy_file("build/dist/commons-collections-3.2.2.jar",                        "$stage_base_dir/opt/zimbra/lib/jars/commons-collections-3.2.2.jar");