zimbra: 9.0.0p10

1 files changed, 30 insertions, 31 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6084d757532d..8583be3ff7fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,21 +21,11 @@ arch=(x86_64)
 url="https://www.zimbra.com/open-source-email-overview/"
 license=(CPAL)
 depends=(
-  'java-runtime>=11' 'perl-archive-zip' 'perl-berkeleydb' 'perl-bit-vector' 'perl-cache-fastmmap' 'perl-canary-stability' 'perl-carp-clan'
-  'perl-class-inspector' 'perl-compress-raw-bzip2' 'perl-compress-raw-zlib' 'perl-config-inifiles' 'perl-convert-asn1' 'perl-convert-binhex'
-  'perl-convert-tnef' 'perl-convert-uulib' 'perl-crypt-openssl-random' 'perl-crypt-openssl-rsa' 'perl-data-uuid'
-  'perl-date-calc' 'perl-date-manip' 'perl-dbd-mysql' 'perl-dbd-sqlite' 'perl-dbi' 'perl-digest-hmac' 'perl-digest-sha1'
-  'perl-email-date-format' 'perl-encode-detect' 'perl-encode-locale' 'perl-error' 'perl-exporter-tiny' 'perl-extutils-constant' 'perl-file-grep'
-  'perl-file-libmagic' 'perl-file-listing' 'perl-file-tail' 'perl-filesys-df' 'perl-html-parser' 'perl-http-cookies'
-  'perl-http-daemon' 'perl-http-date' 'perl-http-message' 'perl-http-negotiate' 'perl-io-compress' 'perl-io-html' 'perl-io-multiplex' 'perl-ldap' 'perl-list-moreutils-xs'
-  'perl-io-socket-inet6' 'perl-io-socket-ip' 'perl-io-socket-ssl' 'perl-io-stringy' 'perl-ip-country' 'perl-json-pp' 'perl-libwww' 'perl-list-moreutils'
-  'perl-lwp-mediatypes' 'perl-lwp-protocol-https' 'perl-mail-dkim' 'perl-mail-spf' 'perl-mailtools' 'perl-math-bigint'
-  'perl-mime-lite' 'perl-mime-tools' 'perl-mime-types' 'perl-mozilla-ca' 'perl-net-cidr' 'perl-net-cidr-lite' 'perl-net-dns' 'perl-net-dns-resolver-programmable'
-  'perl-net-http' 'perl-net-ldapapi' 'perl-net-libidn' 'perl-net-server' 'perl-net-ssleay' 'perl-netaddr-ip' 'perl-parent' 'perl-proc-processtable'
-  'perl-soap-lite' 'perl-socket' 'perl-socket6' 'perl-storable' 'perl-task-weaken' 'perl-term-readkey' 'perl-timedate'
-  'perl-unix-syslog' 'perl-uri' 'perl-xml-parser' 'perl-xml-sax' 'perl-xml-sax-base' 'perl-xml-sax-expat')
-optdepends=('innotop')
-makedepends=('maven' 'ant' 'java-hamcrest' 'jdk8-openjdk' 'junit' 'lsb-release' 'perl-devel-checklib' 'rsync' 'ruby')
+  'java-runtime>=11' 'perl-data-uuid' 'perl-dbi' 'perl-file-grep'
+  'perl-ldap' 'perl-net-dns' 'perl-net-http' 'perl-netaddr-ip'
+  'perl-unix-syslog'
+  'perl-xml-parser' 'perl-xml-sax' 'perl-xml-sax-base' 'perl-xml-simple')
+makedepends=('maven' 'ant' 'java-hamcrest' 'jdk8-openjdk' 'junit' 'lsb-release' 'rsync' 'ruby')
 install=
 
 # Zimbra Configuration Variables
@@ -117,41 +107,50 @@ source=("git+https://github.com/Zimbra/zm-build#tag=${_releaseno}" # Repo list i
 noextract=()
 
 prepare() {
-  cd "$srcdir"
+  cd "${srcdir}"
 
-  # Bypass build.pl git checkout
-  sed -i 's/Checkout($all_repos)/#Checkout($all_repos)/g' \
-    zm-build/build.pl
   # Add support for Arch in some scripts
   patch -Np0 -i arch-patch.diff
 }
 
 build() {
-  cd "$srcdir/zm-build"
+  cd "${srcdir}/zm-build"
 
   # Set JDK 8 as runtime
   export JAVA_HOME=/usr/lib/jvm/java-8-openjdk
   export JAVA_PATH=/usr/lib/jvm/java-8-openjdk/bin
 
   # Let's build for real now
-  ./build.pl -build-no=$pkgrel --build-ts=${_timestamp} \
+  ./build.pl -build-no=${pkgrel} --build-ts=${_timestamp} \
     --build-release=${_release} --build-release-no=${_releaseno} \
     --build-os=${_os} --build-release-candidate=${_rc} --build-type=${_buildtype} \
     --build-arch=$CARCH --pkg-os-tag=${_ostag} \
     --build-thirdparty-server=files.zimbra.com --no-interactive \
-    --build-prod-flag --disable-bundle --ant-options="-DskipTests=1"
+    --build-prod-flag --ant-options="-DskipTests=1"
 }
 
 package() {
-  cd "$srcdir"
+  cd "${srcdir}"
+  find zm-mailbox/build/stage \
+    -type d \
+    -name "opt" \
+    -exec rsync -av {} "${pkgdir}" \;
+
   cd .staging/${_os}-${_release}-${_major}${_minor}${_micro}-${_timestamp}-${_buildtype}-${pkgrel}
-  find . -type d -name "opt" -exec rsync -av {} "$pkgdir" \;
-  find . -type d -name "opt" | xargs rm -rf
-  find . -type d -name "etc" -exec rsync -av {} "$pkgdir" \;
-  find . -type d -name "etc" | xargs rm -rf
-  rsync -av "$srcdir/zm-mailbox/build/stage/zimbra-common-core-jar/opt" "$pkgdir"
-  chmod 750 -R $pkgdir/etc/sudoers.d
-  chmod +x $pkgdir/opt/zimbra/bin/*
+
+  find . -type d \
+    -name "opt" \
+    -exec rsync -av {} "${pkgdir}" \;
+  find . -type d \
+    -name "sudoers.d" -exec rsync -av {} "${pkgdir}/etc" \;
+  find . -type d \
+    -name "conf" -exec rsync -av {} "${pkgdir}"/opt/zimbra \;
+  find zm-zcs-lib -type f \
+    -iname "*.jar" \
+    -exec rsync -av {} "${pkgdir}"/opt/zimbra/lib/jars \;
+
+  chmod 750 -R ${pkgdir}/etc/sudoers.d
+  chmod +x ${pkgdir}/opt/zimbra/bin/*
 
   # systemd
   #	install -D -m644 "${srcdir}/zimbra.service" -t "${pkgdir}/usr/lib/systemd/system"
@@ -224,4 +223,4 @@ md5sums=('SKIP'
          '21b3bdbcb2d23357104122df3de217b5'
          '84ad300287d602d4d6b2601748ddbaac'
          '9c97f489e0fa84a7be0a0dec593fd946'
-         'a33b2181aa9bd50470192727bab7d3fa')
+         '693dabf11d6994537f91e6b1d11f2e03')