From 256b238d6c20b96d575f1fd373e3d7d07301c5a7 Mon Sep 17 00:00:00 2001
From: UmaShankar Avagadda <umagmrit@gmail.com>
Date: Fri, 10 Jun 2022 04:08:06 +0000
Subject: [PATCH 1/2] ZCS-11514:copy zmlocalconfig after new log4j jars placed

---
 build.xml           | 1 +
 pkg-builder.pl      | 5 ++++-
 scripts/postinst.sh | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 scripts/postinst.sh

diff --git a/build.xml b/build.xml
index 791cef6..99290c9 100644
--- a/build.xml
+++ b/build.xml
@@ -10,6 +10,7 @@
     <ivy:resolve file="ivy.xml" />
     <delete dir="${build.tmp.dir}" />
     <ivy:retrieve pattern="${dist.dir}/[artifact]-[revision].[ext]" />
+    <copy file="../zm-core-utils/src/bin/zmlocalconfig" todir="${dist.dir}"/>
     <copy todir="${dist.dir}">
       <fileset dir="thirdparty" includes="*.gz" />
     </copy>
diff --git a/pkg-builder.pl b/pkg-builder.pl
index ffb559c..1dcc935 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -232,6 +232,7 @@ ($)
         cpy_file("build/dist/apache-jsp-9.4.46.v20220331.jar",                      "$stage_base_dir/opt/zimbra/lib/jars/apache-jsp-9.4.46.v20220331.jar");
         cpy_file("build/dist/UserAgentUtils-1.21.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/UserAgentUtils-1.21.jar");
         cpy_file("build/dist/tika-core-1.24.1.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/tika-core-1.24.1.jar");
+	cpy_file("build/dist/zmlocalconfig",                                         "$stage_base_dir/opt/zimbra/lib/patches/localconfig/zmlocalconfig");
         return ["."];
 }
 
@@ -381,7 +382,9 @@ ($)
          }
       }
    }
-
+   if ( $pkg_name =~ "zimbra-common-core-libs" ){
+	   push( @cmd, "--pkg-post-install-script=scripts/postinst.sh" );
+   }
    push( @cmd, @{ [ map { "--pkg-replaces=$_"; } @{ $pkg_info->{replaces} } ] } )                                                              if ( $pkg_info->{replaces} );
    push( @cmd, @{ [ map { "--pkg-depends=$_"; } @{ $pkg_info->{other_deps} } ] } )                                                             if ( $pkg_info->{other_deps} );
    push( @cmd, @{ [ map { "--pkg-depends=$_ (>= $PKG_GRAPH{$_}->{version})"; } @{ $pkg_info->{soft_deps} } ] } )                               if ( $pkg_info->{soft_deps} );
diff --git a/scripts/postinst.sh b/scripts/postinst.sh
new file mode 100644
index 0000000..652effb
--- /dev/null
+++ b/scripts/postinst.sh
@@ -0,0 +1,4 @@
+if [ -f /opt/zimbra/bin/zmlocalconfig ]; then
+   cp -af /opt/zimbra/lib/patches/localconfig/zmlocalconfig /opt/zimbra/bin/zmlocalconfig
+   chmod 755 /opt/zimbra/bin/zmlocalconfig
+fi

From 60aa445534cc5632a6969c04ba4cb4f6555abc3d Mon Sep 17 00:00:00 2001
From: UmaShankar Avagadda <umagmrit@gmail.com>
Date: Fri, 10 Jun 2022 11:43:32 +0530
Subject: [PATCH 2/2] ZCS-11514 : corrected indentation

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

diff --git a/pkg-builder.pl b/pkg-builder.pl
index 1dcc935..397a150 100755
--- a/pkg-builder.pl
+++ b/pkg-builder.pl
@@ -232,7 +232,7 @@ ($)
         cpy_file("build/dist/apache-jsp-9.4.46.v20220331.jar",                      "$stage_base_dir/opt/zimbra/lib/jars/apache-jsp-9.4.46.v20220331.jar");
         cpy_file("build/dist/UserAgentUtils-1.21.jar",                              "$stage_base_dir/opt/zimbra/lib/jars/UserAgentUtils-1.21.jar");
         cpy_file("build/dist/tika-core-1.24.1.jar",                                 "$stage_base_dir/opt/zimbra/lib/jars/tika-core-1.24.1.jar");
-	cpy_file("build/dist/zmlocalconfig",                                         "$stage_base_dir/opt/zimbra/lib/patches/localconfig/zmlocalconfig");
+	cpy_file("build/dist/zmlocalconfig",                                        "$stage_base_dir/opt/zimbra/lib/patches/localconfig/zmlocalconfig");
         return ["."];
 }