Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Jun 10, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
256b238
ZCS-11514:copy zmlocalconfig after new log4j jars placed
umagmrit Jun 10, 2022
60aa445
ZCS-11514 : corrected indentation
umagmrit Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion pkg-builder.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ["."];
}

Expand Down Expand Up @@ -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} );
Expand Down
4 changes: 4 additions & 0 deletions scripts/postinst.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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