summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGianluca Boiano2020-11-16 19:39:25 +0100
committerGianluca Boiano2020-11-16 19:39:25 +0100
commit87f79f1ebecc0be38f210cd9bc1a521d20ef146b (patch)
treee8591cfa05d8362451913dca7d859d91f5c299d2
parent808e0bcce6b721ee16d461e5d016a18c9912840c (diff)
downloadaur-87f79f1ebecc0be38f210cd9bc1a521d20ef146b.tar.gz
zimbra: add some custom repos to avoid sed usage
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD175
-rw-r--r--arch-patch.diff12
3 files changed, 105 insertions, 92 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 73716c4ecfe..88351a3796f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,6 +11,7 @@ pkgbase = zimbra
makedepends = jdk8-openjdk
makedepends = junit
makedepends = lsb-release
+ makedepends = perl-devel-checklib
makedepends = rsync
makedepends = ruby
depends = java-runtime>=11
@@ -57,7 +58,9 @@ pkgbase = zimbra
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
@@ -90,6 +93,7 @@ pkgbase = zimbra
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
@@ -102,6 +106,7 @@ pkgbase = zimbra
depends = perl-xml-sax-expat
optdepends = innotop
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
source = git+https://github.com/Zimbra/ant-tar-patched#tag=9.0.0
source = git+https://github.com/Zimbra/ical4j-0.9.16-patched#tag=9.0.0
@@ -142,7 +147,7 @@ pkgbase = zimbra
source = git+https://github.com/Zimbra/zm-nginx-conf#tag=9.0.0.p9
source = git+https://github.com/Zimbra/zm-nginx-lookup-store#tag=9.0.0
source = git+https://github.com/Zimbra/zm-openid-consumer-store#tag=9.0.0
- source = git+https://github.com/Zimbra/zm-pkg-tool#tag=9.0.0.p7
+ source = git+https://github.com/M0Rf30/zm-pkg-tool#tag=9.0.0.arch.p7
source = git+https://github.com/Zimbra/zm-postfix#tag=9.0.0
source = git+https://github.com/Zimbra/zm-proxy-config-admin-zimlet#tag=9.0.0
source = git+https://github.com/Zimbra/zm-ssdb-ephemeral-store#tag=9.0.0
@@ -162,6 +167,8 @@ pkgbase = zimbra
source = zimbra.sysusers
source = zimbra.tmpfiles
source = localconfig.xml
+ source = arch-patch.diff
+ md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
@@ -223,6 +230,7 @@ pkgbase = zimbra
md5sums = 21b3bdbcb2d23357104122df3de217b5
md5sums = 84ad300287d602d4d6b2601748ddbaac
md5sums = 66f2930f13484ae782a162e8e7da28c1
+ md5sums = a33b2181aa9bd50470192727bab7d3fa
pkgname = zimbra
diff --git a/PKGBUILD b/PKGBUILD
index 8e09aa1f197..823ec8fcd5f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,6 +3,7 @@
# perl-geography-countries
# perl-socket-linux
# perl-unix-getrusage
+# perl-ipc-cmd
# perl-io-sessiondata
# perl-mail-spamassassin
# perl-swatchdog
@@ -20,21 +21,21 @@ 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-ldap'
-'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-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')
+ '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' 'rsync' 'ruby')
+makedepends=('maven' 'ant' 'java-hamcrest' 'jdk8-openjdk' 'junit' 'lsb-release' 'perl-devel-checklib' 'rsync' 'ruby')
install=
# Zimbra Configuration Variables
@@ -42,14 +43,15 @@ _buildtype="FOSS"
_major=$(echo "${pkgver}" | cut -d'.' -f1)
_micro=$(echo "${pkgver}" | cut -d'.' -f3)
_minor=$(echo "${pkgver}" | cut -d'.' -f2)
-_os="Arch"
-_ostag="urolling"
+_os="ARCH"
+_ostag="arch"
_rc="GA"
_release="KEPLER"
_releaseno="${pkgver%.*}"
_timestamp=$(date +'%Y%m%d')
source=("git+https://github.com/Zimbra/zm-build#tag=${_releaseno}" # Repo list is synced with instructions/FOSS_repo_list.pl
+ "git+https://github.com/M0Rf30/zimbra-package-stub" # A fork of mine to detect Arch
"git+https://github.com/Zimbra/ant-1.7.0-ziputil-patched#tag=${_releaseno}"
"git+https://github.com/Zimbra/ant-tar-patched#tag=${_releaseno}"
"git+https://github.com/Zimbra/ical4j-0.9.16-patched#tag=${_releaseno}"
@@ -90,7 +92,7 @@ source=("git+https://github.com/Zimbra/zm-build#tag=${_releaseno}" # Repo list i
"git+https://github.com/Zimbra/zm-nginx-conf#tag=${_releaseno}.p9"
"git+https://github.com/Zimbra/zm-nginx-lookup-store#tag=${_releaseno}"
"git+https://github.com/Zimbra/zm-openid-consumer-store#tag=${_releaseno}"
- "git+https://github.com/Zimbra/zm-pkg-tool#tag=${_releaseno}.p7"
+ "git+https://github.com/M0Rf30/zm-pkg-tool#tag=${_releaseno}.arch.p7" # A fork of mine to support Arch
"git+https://github.com/Zimbra/zm-postfix#tag=${_releaseno}"
"git+https://github.com/Zimbra/zm-proxy-config-admin-zimlet#tag=${_releaseno}"
"git+https://github.com/Zimbra/zm-ssdb-ephemeral-store#tag=${_releaseno}"
@@ -110,6 +112,7 @@ source=("git+https://github.com/Zimbra/zm-build#tag=${_releaseno}" # Repo list i
"zimbra.sysusers"
"zimbra.tmpfiles"
"localconfig.xml"
+ "arch-patch.diff"
)
noextract=()
@@ -119,20 +122,8 @@ prepare() {
# Bypass build.pl git checkout
sed -i 's/Checkout($all_repos)/#Checkout($all_repos)/g' \
zm-build/build.pl
-
- # Bypass deb generation
- sed -i 's/Die("Unknown PACKAGING format");/print("Arch Linux PACKAGING format\n");/g' \
- zm-pkg-tool/pkg-build.pl
- sed -i 's/return "deb"/return "tar.xz"/g' \
- zm-pkg-tool/pkg-build.pl
- sed -i '/echo "OS not supported./{n;s/.*//}' \
- zm-build/instructions/bundling-scripts/utils.sh
-
- # Fix zimbra-package-stub RELEASE descriptors
- mkdir -p zimbra-package-stub/version
- echo "${_major}" >zimbra-package-stub/version/MAJOR
- echo "${_minor}" >zimbra-package-stub/version/MINOR
- echo "${_micro}_${_rc}" >zimbra-package-stub/version/MICRO
+ # Add support for Arch in some scripts
+ patch -Np0 -i arch-patch.diff
}
build() {
@@ -172,63 +163,65 @@ package() {
}
md5sums=('SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- 'SKIP'
- '21b3bdbcb2d23357104122df3de217b5'
- '84ad300287d602d4d6b2601748ddbaac'
- '66f2930f13484ae782a162e8e7da28c1')
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '21b3bdbcb2d23357104122df3de217b5'
+ '84ad300287d602d4d6b2601748ddbaac'
+ '66f2930f13484ae782a162e8e7da28c1'
+ 'a33b2181aa9bd50470192727bab7d3fa')
diff --git a/arch-patch.diff b/arch-patch.diff
new file mode 100644
index 00000000000..47352e79969
--- /dev/null
+++ b/arch-patch.diff
@@ -0,0 +1,12 @@
+--- zm-build/instructions/bundling-scripts/utils.sh 2020-11-16 19:10:10.207776349 +0100
++++ zm-build/instructions/bundling-scripts/utils.sh 2020-11-16 19:10:03.064930426 +0100
+@@ -47,6 +47,9 @@
+ elif [[ $1 == RHEL* ]]
+ then
+ CreateRhelPackage
++ elif [[ $1 == ARCH ]]
++ then
++ echo "Build on Arch Linux done"
+ else
+ echo "OS not supported. Run using UBUNTU or RHEL system. "
+ exit 1