diff options
Diffstat (limited to 'user/mariadb/APKBUILD')
| -rw-r--r-- | user/mariadb/APKBUILD | 71 |
1 files changed, 37 insertions, 34 deletions
diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD index aca78406b..ee293e709 100644 --- a/user/mariadb/APKBUILD +++ b/user/mariadb/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Dan Theisen <djt@hxx.in> pkgname=mariadb -pkgver=10.4.7 -pkgrel=0 +pkgver=10.6.4 +pkgrel=1 pkgdesc="Open source database server" url="https://mariadb.org/" arch="all" @@ -18,34 +18,45 @@ depends="$pkgname-common" depends_dev="openssl-dev zlib-dev" makedepends="$depends_dev bison cmake curl-dev libaio-dev libarchive-dev libedit-dev libevent-dev libexecinfo-dev libxml2-dev ncurses-dev - linux-pam-dev pcre-dev xz-dev" + linux-pam-dev pcre2-dev xz-dev" _mytopdeps="perl perl-dbi perl-dbd-mysql perl-getopt-long perl-socket perl-term-readkey" subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded - $pkgname-common::noarch $pkgname-backup mytop::noarch $pkgname-openrc + $pkgname-common $pkgname-backup mytop::noarch $pkgname-openrc $pkgname-doc $pkgname-dev" -source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz - crc32-power.patch - gcc_builtins_ppc.h - libedit.patch +source="https://archive.mariadb.org/$pkgname-$pkgver/source/$pkgname-$pkgver.tar.gz ppchax.patch - types.patch + missing-header.patch mariadb.initd mariadb-server.limits " +# secfixes: +# 10.6.4-r0: +# - CVE-2020-13249 +# - CVE-2020-2814 +# - CVE-2020-2812 +# - CVE-2020-2760 +# - CVE-2020-2752 +# - CVE-2020-28912 +# - CVE-2020-14812 +# - CVE-2020-14789 +# - CVE-2020-14776 +# - CVE-2020-14765 +# - CVE-2021-27928 +# - CVE-2021-2166 +# - CVE-2021-2154 +# - CVE-2021-2389 +# - CVE-2021-2389 +# 10.4.12-r0: +# - CVE-2020-7221 + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - case "$CTARGET_ARCH" in - ppc) - cp "$srcdir"/gcc_builtins_ppc.h "$builddir"/include/atomic/gcc_builtins.h - ;; - esac - - local _release="\ + _release="\ -DBUILD_CONFIG=mysql_release \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS=\"$CXXFLAGS -DNDEBUG\" \ @@ -57,7 +68,7 @@ build() { # SKIP_TESTS skips client unittests that require a server to be present # JEMALLOC is reported to not work on musl, TODO: test this # ASAN also doesn't work on musl iirc - local _deps="\ + _deps="\ -DWITH_MARIABACKUP=ON \ -DWITH_NUMA=OFF \ -DWITH_LIBNUMA=OFF \ @@ -77,7 +88,7 @@ build() { -DSKIP_TESTS=ON " # AWS_KEY_MANAGEMENT makes this package non-redistributable, disable it - local _plugins="\ + _plugins="\ -DPLUGIN_ARCHIVE=YES \ -DPLUGIN_ARIA=YES \ -DPLUGIN_BLACKHOLE=YES \ @@ -90,7 +101,7 @@ build() { -DPLUGIN_FEEDBACK=NO " # Investigate turning more of these on - local _innodb="\ + _innodb="\ -DWITH_INNODB_LZMA=YES \ -DWITH_INNODB_BZIP2=NO \ -DWITH_INNODB_LZ4=NO \ @@ -98,7 +109,7 @@ build() { -DWITH_INNODB_SNAPPY=NO " # MongoDB is not libre software, disable it - local _connect="\ + _connect="\ -DCONNECT_WITH_MYSQL=YES \ -DCONNECT_WITH_MONGO=NO \ -DCONNECT_WITH_ODBC=NO \ @@ -106,12 +117,12 @@ build() { -DCONNECT_WITH_LIBXML2=system " # non-portable things, things that don't work on musl, BE, 32-bit etc - local _evil="\ + _evil="\ -DPLUGIN_MROONGA=NO \ -DPLUGIN_ROCKSDB=NO \ -DPLUGIN_TOKUDB=NO " - local _system_libs="\ + _system_libs="\ -DWITH_LIBARCHIVE=system \ -DWITH_PCRE=system \ -DWITH_SSL=system \ @@ -119,7 +130,7 @@ build() { -DWITH_EXTERNAL_ZLIB=YES \ -DCONC_WITH_EXTERNAL_ZLIB=YES " - local _system_paths="\ + _system_paths="\ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ -DMYSQL_DATADIR=/var/lib/mariadb \ @@ -249,11 +260,6 @@ dev() { provides="mysql-dev=$pkgver-r$pkgrel" depends="$pkgname-libs" _install_component Development - - # move symlinks for static libs from libs subpackage to dev - LIB_PATH=${pkgdir}-libs/usr/lib - mv $LIB_PATH/libmysqlclient.a ${subpkgdir}/usr/lib/ - mv $LIB_PATH/libmysqlclient_r.a ${subpkgdir}/usr/lib/ } doc() { @@ -263,11 +269,8 @@ doc() { default_doc } -sha512sums="cb8b5adaef1970b9c8f04db08c18660f8b3df87f699aa93c1bee9497b887ddf50fcf3a2aebbe21a5fc9dfcbd118d0192d7421512522d98eaf30a014822c2f7ce mariadb-10.4.7.tar.gz -03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch -15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h -41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4 libedit.patch -0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594 ppchax.patch -8dda61a8e0bc3d1712de36bc53e39dc348bc5bc9e37de37b644977df6144f8ee588e55674466dc8d45624d0cad91cc1e3d15e3951214d6d4fe783465592b1a2e types.patch +sha512sums="c216244ce126e6f8954303a76078dc12146e8ea941041edd215dc05201adda1d5158cd7f1c9831328f783aba4f884965ae288f33bbc43229bc6224a4f1079071 mariadb-10.6.4.tar.gz +0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch +6618ee5608b06941da08872ea7ea16149b72a0174b157f970c03a9a9110efe0704c72742e63181f8059244e89fe25d1b07f1c87fed72115d62f347f58fafccdd missing-header.patch 1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits" |