Merge pull request #98 from Zimbra/ZCS-11514

ZCS-11514 : Getting log4j dependency errors while upgrading from Zimbra 9 Patch24.1 to Patch25

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>

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} );

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