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.

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

dev-db/mariadb: bump to 10.4.25 #25704

Closed
wants to merge 1 commit into from

Conversation

hydrapolic
Copy link
Contributor

Tests pass on amd64:

ulimit -n 16500
MTR_PARALLEL=64 USE='extraengine perl server xml' FEATURES='test userpriv' emerge -v1 =dev-db/mariadb-10.4.25
--- mariadb-10.4.22.ebuild      2022-05-31 18:32:10.234394185 +0000
+++ mariadb-10.4.25.ebuild      2022-05-31 18:49:14.082008149 +0000
@@ -10,7 +10,7 @@
        multiprocessing java-pkg-opt-2 cmake
 
 # Patch version
-PATCH_SET="https://dev.gentoo.org/~whissi/dist/${PN}/${PN}-10.4.22-patches-01.tar.xz"
+PATCH_SET="https://github.com/hydrapolic/gentoo-dist/raw/master/mariadb/mariadb-10.4.25-patches-01.tar.xz"
 
 SRC_URI="mirror://mariadb/${PN}-${PV}/source/${P}.tar.gz
        ${PATCH_SET}"
@@ -32,7 +32,7 @@
        ?? ( tcmalloc jemalloc )
        static? ( yassl !pam )"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
@@ -468,7 +468,7 @@
 }
 
 # Official test instructions:
-# USE='extraengine perl server' \
+# USE='extraengine perl server xml' \
 # FEATURES='test userpriv' \
 # ebuild mariadb-X.X.XX.ebuild \
 # digest clean package
@@ -696,6 +696,9 @@
                rm "${ED}/usr/bin/wsrep_sst_rsync_wan" || die
        fi
 
+       # Remove dangling symlink
+       rm "${ED}/usr/$(get_libdir)/libmariadb.a" || die
+
        # Remove broken SST scripts that are incompatible
        local scriptremove
        for scriptremove in wsrep_sst_xtrabackup wsrep_sst_xtrabackup-v2 ; do

Bug: https://bugs.gentoo.org/832490
Signed-off-by: Tomáš Mózes <hydrapolic@gmail.com>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @hydrapolic
Areas affected: ebuilds
Packages affected: dev-db/mariadb

dev-db/mariadb: @gentoo/mysql

Linked bugs

Bugs linked: 832490


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. security PR that needs to be merged promptly as it addresses security issues labels May 31, 2022
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-05-31 19:16 UTC
Newest commit scanned: f9684db
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/889f21590b/output.html

@hydrapolic
Copy link
Contributor Author

Thank you @thesamesam

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. security PR that needs to be merged promptly as it addresses security issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants