summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorM0Rf302020-12-19 22:25:40 +0100
committerM0Rf302020-12-19 22:25:40 +0100
commitced0f6519ae90c98ce228785d11ff0d9cd3547f7 (patch)
tree33f4665369e7c30b5f43a51715ffbb0833b13253
parent41368d43bcfd4c24df6cccd74134ec38467fefe4 (diff)
downloadaur-zimbra.tar.gz
zimbra: 9.0.0p10
-rw-r--r--.SRCINFO81
-rw-r--r--PKGBUILD61
-rw-r--r--arch-patch.diff11
3 files changed, 42 insertions, 111 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f20b285f393..a8decf53273 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,100 +11,21 @@ pkgbase = zimbra
makedepends = jdk8-openjdk
makedepends = junit
makedepends = lsb-release
- makedepends = perl-devel-checklib
makedepends = rsync
makedepends = ruby
depends = java-runtime>=11
- depends = perl-archive-zip
- depends = perl-berkeleydb
- depends = perl-bit-vector
- depends = perl-cache-fastmmap
- depends = perl-canary-stability
- depends = perl-carp-clan
- depends = perl-class-inspector
- depends = perl-compress-raw-bzip2
- depends = perl-compress-raw-zlib
- depends = perl-config-inifiles
- depends = perl-convert-asn1
- depends = perl-convert-binhex
- depends = perl-convert-tnef
- depends = perl-convert-uulib
- depends = perl-crypt-openssl-random
- depends = perl-crypt-openssl-rsa
depends = perl-data-uuid
- depends = perl-date-calc
- depends = perl-date-manip
- depends = perl-dbd-mysql
- depends = perl-dbd-sqlite
depends = perl-dbi
- depends = perl-digest-hmac
- depends = perl-digest-sha1
- depends = perl-email-date-format
- depends = perl-encode-detect
- depends = perl-encode-locale
- depends = perl-error
- depends = perl-exporter-tiny
- depends = perl-extutils-constant
depends = perl-file-grep
- depends = perl-file-libmagic
- depends = perl-file-listing
- depends = perl-file-tail
- depends = perl-filesys-df
- depends = perl-html-parser
- depends = perl-http-cookies
- depends = perl-http-daemon
- depends = perl-http-date
- depends = perl-http-message
- depends = perl-http-negotiate
- depends = perl-io-compress
- depends = perl-io-html
- depends = perl-io-multiplex
depends = perl-ldap
- depends = perl-list-moreutils-xs
- depends = perl-io-socket-inet6
- depends = perl-io-socket-ip
- depends = perl-io-socket-ssl
- depends = perl-io-stringy
- depends = perl-ip-country
- depends = perl-json-pp
- depends = perl-libwww
- depends = perl-list-moreutils
- depends = perl-lwp-mediatypes
- depends = perl-lwp-protocol-https
- depends = perl-mail-dkim
- depends = perl-mail-spf
- depends = perl-mailtools
- depends = perl-math-bigint
- depends = perl-mime-lite
- depends = perl-mime-tools
- depends = perl-mime-types
- depends = perl-mozilla-ca
- depends = perl-net-cidr
- depends = perl-net-cidr-lite
depends = perl-net-dns
- depends = perl-net-dns-resolver-programmable
depends = perl-net-http
- depends = perl-net-ldapapi
- depends = perl-net-libidn
- depends = perl-net-server
- depends = perl-net-ssleay
depends = perl-netaddr-ip
- depends = perl-parent
- depends = perl-proc-processtable
- depends = perl-soap-lite
- depends = perl-socket
- depends = perl-socket6
- depends = perl-storable
- depends = perl-task-weaken
- depends = perl-term-readkey
- depends = perl-timedate
depends = perl-unix-syslog
- depends = perl-uri
depends = perl-xml-parser
depends = perl-xml-sax
depends = perl-xml-sax-base
- depends = perl-xml-sax-expat
- optdepends = innotop
+ depends = perl-xml-simple
source = git+https://github.com/Zimbra/zm-build#tag=9.0.0
source = git+https://github.com/M0Rf30/zimbra-package-stub
source = git+https://github.com/Zimbra/ant-1.7.0-ziputil-patched#tag=9.0.0
diff --git a/PKGBUILD b/PKGBUILD
index 6084d757532..8583be3ff7f 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')
diff --git a/arch-patch.diff b/arch-patch.diff
index 47352e79969..22cf7cba1b5 100644
--- a/arch-patch.diff
+++ b/arch-patch.diff
@@ -10,3 +10,14 @@
else
echo "OS not supported. Run using UBUNTU or RHEL system. "
exit 1
+--- zm-build/build.pl 2020-12-19 22:23:36.705531953 +0100
++++ zm-build/build.pl 2020-12-19 22:13:41.557178188 +0100
+@@ -1073,7 +1073,7 @@
+
+ Prepare();
+
+- Checkout($all_repos);
++ #Checkout($all_repos);
+
+ if ( !$CFG{STOP_AFTER_CHECKOUT} )
+ {