upg mariadb zeal

This commit is contained in:
joborun linux 2024-05-30 07:45:35 +03:00
parent ed3fbdc683
commit be397d9d75
9 changed files with 288 additions and 26 deletions

View file

@ -1,14 +1,15 @@
From bf66e7d610de0d7d3651742342c01ed9ff93f363 Mon Sep 17 00:00:00 2001
From ceef73b08ba6e73d9477b583e1a4695c0854c0f3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:10:17 +0100
Subject: [PATCH 1/3] enable PrivateTmp for a little bit more security
---
support-files/mariadb.service.in | 2 +-
support-files/mariadb@.service.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index e7665ed1219..a1fe69d61c4 100644
index 79c8b9a8cca..9e1ddfc82e1 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -129,7 +129,7 @@ UMask=007
@ -21,10 +22,10 @@ index e7665ed1219..a1fe69d61c4 100644
# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!)
# this is the same value as used in SysV init scripts in the past
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index ffefc2f22d8..f8b0b8aad8d 100644
index 31f1586f1bf..b7094662bbd 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -241,7 +241,7 @@ UMask=007
@@ -243,7 +243,7 @@ UMask=007
# If you don't use the /tmp directory for SELECT ... OUTFILE and
# LOAD DATA INFILE you can enable PrivateTmp=true for a little more security.
@ -33,21 +34,25 @@ index ffefc2f22d8..f8b0b8aad8d 100644
# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!)
# this is the same value as used in SysV init scripts in the past
--
2.45.1
From 00aab78891a19a14a92039fcc6a73e391a3bb471 Mon Sep 17 00:00:00 2001
From 51fdbe18eca303edfe68111d02638280edd8f5ad Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:10:46 +0100
Subject: [PATCH 2/3] force preloading jemalloc for memory management
---
support-files/mariadb.service.in | 1 +
support-files/mariadb@.service.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
index a1fe69d61c4..9a2941ae917 100644
index 9e1ddfc82e1..f48ac56140c 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -159,6 +159,7 @@ LimitNOFILE=16364
@@ -165,6 +165,7 @@ LimitNOFILE=32768
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
@ -56,10 +61,10 @@ index a1fe69d61c4..9a2941ae917 100644
# Flush caches. previously [mysqld_safe] flush-caches=1
# ExecStartPre=sync
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
index f8b0b8aad8d..3309127330c 100644
index b7094662bbd..c6f1605276e 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
@@ -282,6 +282,7 @@ LimitNOFILE=16364
@@ -290,6 +290,7 @@ LimitNOFILE=32768
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
@ -67,8 +72,11 @@ index f8b0b8aad8d..3309127330c 100644
# Flush caches. previously [mysqld_safe] flush-caches=1
# ExecStartPre=sync
--
2.45.1
From a78ff18c83a5eb2556d4f3716f13786dcd8395d2 Mon Sep 17 00:00:00 2001
From 77d9419c79013e29146d33fe491f8285d6311ead Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:11:31 +0100
Subject: [PATCH 3/3] Make systemd-tmpfiles create MYSQL_DATADIR
@ -81,14 +89,19 @@ systemd-sysusers and uid is not known in advance.
Also this now sets the No_COW attribute.
---
support-files/tmpfiles.conf.in | 2 +
1 file changed, 2 insertion(+)
support-files/tmpfiles.conf.in | 2 ++
1 file changed, 2 insertions(+)
diff --git a/support-files/tmpfiles.conf.in b/support-files/tmpfiles.conf.in
index 03d66abc0c7..3c89cb258c9 100644
index 70de7a12fdb..101b37f306a 100644
--- a/support-files/tmpfiles.conf.in
+++ b/support-files/tmpfiles.conf.in
@@ -1 +1,3 @@
d @MYSQL_UNIX_DIR@ 0755 @MYSQLD_USER@ @MYSQLD_USER@ -
@@ -9,3 +9,5 @@
# It shouldn't be used for datadir which is why it
# may be disabled.
@DISABLE_TMP@d @MYSQL_UNIX_DIR@ 0755 @MYSQLD_USER@ @MYSQLD_USER@ -
+d @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ -
+h @MYSQL_DATADIR@ - - - - +C
--
2.45.1

View file

@ -0,0 +1,113 @@
--- 0001-arch-specific.patch 2022-02-05 16:08:50.009021540 +0200
+++ 0001-arch-specific.patch.1 2024-05-29 19:59:46.819972514 +0300
@@ -1,14 +1,15 @@
-From bf66e7d610de0d7d3651742342c01ed9ff93f363 Mon Sep 17 00:00:00 2001
+From ceef73b08ba6e73d9477b583e1a4695c0854c0f3 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:10:17 +0100
Subject: [PATCH 1/3] enable PrivateTmp for a little bit more security
+
---
support-files/mariadb.service.in | 2 +-
support-files/mariadb@.service.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
-index e7665ed1219..a1fe69d61c4 100644
+index 79c8b9a8cca..9e1ddfc82e1 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
@@ -129,7 +129,7 @@ UMask=007
@@ -21,10 +22,10 @@
# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!)
# this is the same value as used in SysV init scripts in the past
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
-index ffefc2f22d8..f8b0b8aad8d 100644
+index 31f1586f1bf..b7094662bbd 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
-@@ -241,7 +241,7 @@ UMask=007
+@@ -243,7 +243,7 @@ UMask=007
# If you don't use the /tmp directory for SELECT ... OUTFILE and
# LOAD DATA INFILE you can enable PrivateTmp=true for a little more security.
@@ -33,21 +34,25 @@
# Set an explicit Start and Stop timeout of 900 seconds (15 minutes!)
# this is the same value as used in SysV init scripts in the past
+--
+2.45.1
+
-From 00aab78891a19a14a92039fcc6a73e391a3bb471 Mon Sep 17 00:00:00 2001
+From 51fdbe18eca303edfe68111d02638280edd8f5ad Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:10:46 +0100
Subject: [PATCH 2/3] force preloading jemalloc for memory management
+
---
support-files/mariadb.service.in | 1 +
support-files/mariadb@.service.in | 1 +
2 files changed, 2 insertions(+)
diff --git a/support-files/mariadb.service.in b/support-files/mariadb.service.in
-index a1fe69d61c4..9a2941ae917 100644
+index 9e1ddfc82e1..f48ac56140c 100644
--- a/support-files/mariadb.service.in
+++ b/support-files/mariadb.service.in
-@@ -159,6 +159,7 @@ LimitNOFILE=16364
+@@ -165,6 +165,7 @@ LimitNOFILE=32768
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
@@ -56,10 +61,10 @@
# Flush caches. previously [mysqld_safe] flush-caches=1
# ExecStartPre=sync
diff --git a/support-files/mariadb@.service.in b/support-files/mariadb@.service.in
-index f8b0b8aad8d..3309127330c 100644
+index b7094662bbd..c6f1605276e 100644
--- a/support-files/mariadb@.service.in
+++ b/support-files/mariadb@.service.in
-@@ -282,6 +282,7 @@ LimitNOFILE=16364
+@@ -290,6 +290,7 @@ LimitNOFILE=32768
# Library substitutions. previously [mysqld_safe] malloc-lib with explicit paths
# (in LD_LIBRARY_PATH) and library name (in LD_PRELOAD).
# Environment="LD_LIBRARY_PATH=/path1 /path2" "LD_PRELOAD=
@@ -67,8 +72,11 @@
# Flush caches. previously [mysqld_safe] flush-caches=1
# ExecStartPre=sync
+--
+2.45.1
-From a78ff18c83a5eb2556d4f3716f13786dcd8395d2 Mon Sep 17 00:00:00 2001
+
+From 77d9419c79013e29146d33fe491f8285d6311ead Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 19 Feb 2020 13:11:31 +0100
Subject: [PATCH 3/3] Make systemd-tmpfiles create MYSQL_DATADIR
@@ -81,14 +89,19 @@
Also this now sets the No_COW attribute.
---
- support-files/tmpfiles.conf.in | 2 +
- 1 file changed, 2 insertion(+)
+ support-files/tmpfiles.conf.in | 2 ++
+ 1 file changed, 2 insertions(+)
diff --git a/support-files/tmpfiles.conf.in b/support-files/tmpfiles.conf.in
-index 03d66abc0c7..3c89cb258c9 100644
+index 70de7a12fdb..101b37f306a 100644
--- a/support-files/tmpfiles.conf.in
+++ b/support-files/tmpfiles.conf.in
-@@ -1 +1,3 @@
- d @MYSQL_UNIX_DIR@ 0755 @MYSQLD_USER@ @MYSQLD_USER@ -
+@@ -9,3 +9,5 @@
+ # It shouldn't be used for datadir which is why it
+ # may be disabled.
+ @DISABLE_TMP@d @MYSQL_UNIX_DIR@ 0755 @MYSQLD_USER@ @MYSQLD_USER@ -
+d @MYSQL_DATADIR@ 0700 @MYSQLD_USER@ @MYSQLD_USER@ -
+h @MYSQL_DATADIR@ - - - - +C
+--
+2.45.1
+

View file

@ -8,8 +8,8 @@
pkgbase=mariadb
pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
pkgdesc='Fast SQL database server, derived from MySQL w/o systemd and zstd'
pkgver=11.3.2
pkgrel=02
pkgver=11.4.2
pkgrel=01
url='https://mariadb.org/'
makedepends=('bison' 'boost' 'bzip2' 'cmake' 'cracklib' 'curl' 'git' 'jemalloc'
'judy' 'krb5' 'libaio' 'libxcrypt' 'libxml2' 'lz4' 'openssl' 'pcre2'
@ -267,7 +267,7 @@ license=('GPL')
#validpgpkeys=('199369E5404BD5FC7D2FE43BCBCB082A1BB943DB') # MariaDB Package Signing Key <package-signing-key@mariadb.org>
validpgpkeys=('177F4010FE56CA3336300305F1656F24C74CD1D8') # MariaDB Signing Key <signing-key@mariadb.org>
sha256sums=(a7ee96e4f90bf5d9f4185f36dae506980242b09578578568ed5ac4334dc05287 # mariadb
sha256sums=(da69b2dee70ebf567cb5ff241a07bac2d45076ddf7465da85d1c17589f4b886d # mariadb
'SKIP'
'SKIP'
'SKIP'
@ -276,9 +276,10 @@ sha256sums=(a7ee96e4f90bf5d9f4185f36dae506980242b09578578568ed5ac4334dc05287 #
'SKIP'
711b4e7cf40e2b1ab132655a8d64f5a721027296f7a5731ffa70b504b3d805cd # mariadb.sysusers.conf
5ff8916c32c87ac45f05171669ff94e5a1a81c6bd7e6516b63fd9db8723916fc) # mariadb.tmpfile.conf
## 966ddd4fa21068e6ab5b560d69f607aa9291790fb15c3be424c20962a26032f9 # 0001-arch-specific.patch
## 330dc782518628195c5416857df1cf22b07cecb01b5cfcd197ce30085fb92e9f mariadb-11.3.2-02-x86_64.pkg.tar.lz
## fedaaa0ca744f6cfcddd51fe171ad9aec8c1dbb31989a8fada5aa0d1ecee0f0b mariadb-clients-11.3.2-02-x86_64.pkg.tar.lz
## 4a6abe9c43115acb58075a94cc03422ea3045f7b73f9718e73e0ee76771e4789 mariadb-libs-11.3.2-02-x86_64.pkg.tar.lz
## 3514283b716a907a18e376d73fa2715e12c2b9125afa30a59372cd3cb5e4fd0e mytop-11.3.2-02-x86_64.pkg.tar.lz
## 3cb1bc08f9029486522fb42294f50d0a6c75b8c5a5eb0434e63f9665a102c511 mariadb-11.4.2-01-x86_64.pkg.tar.lz
## d32211a9afc3935919952f32ade999c4fa1223008daf1f551b55c52b8c1df2d6 mariadb-clients-11.4.2-01-x86_64.pkg.tar.lz
## fac7672727cc3644e4e83b26e79e275d003e0918748881d43822bb12ae964d82 mariadb-libs-11.4.2-01-x86_64.pkg.tar.lz
## 34a43d8567f26e6f2d68d75f4cc5e3349a9d272423fbe4c296dc56f81122c8fe mytop-11.4.2-01-x86_64.pkg.tar.lz

View file

@ -3,8 +3,8 @@
pkgbase=mariadb
pkgname=('mariadb-libs' 'mariadb-clients' 'mariadb' 'mytop')
pkgdesc='Fast SQL database server, derived from MySQL'
pkgver=11.3.2
pkgrel=2
pkgver=11.4.2
pkgrel=1
arch=('x86_64')
license=('GPL')
url='https://mariadb.org/'
@ -19,14 +19,14 @@ source=("mariadb::git+https://github.com/MariaDB/server.git#tag=mariadb-${pkgver
'git+https://github.com/mariadb-corporation/libmarias3.git'
'git+https://github.com/mariadb-corporation/mariadb-columnstore-engine.git'
'0001-arch-specific.patch')
sha256sums=('a7ee96e4f90bf5d9f4185f36dae506980242b09578578568ed5ac4334dc05287'
sha256sums=('da69b2dee70ebf567cb5ff241a07bac2d45076ddf7465da85d1c17589f4b886d'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
'3289efb3452d199aec872115f35da3f1d6fd4ce774615076690e9bc8afae1460')
'966ddd4fa21068e6ab5b560d69f607aa9291790fb15c3be424c20962a26032f9')
prepare() {
cd mariadb/

69
zeal/PKGBUILD Normal file
View file

@ -0,0 +1,69 @@
#!/usr/bin/bash
# JOBoRun : Jwm OpenBox Obarun RUNit
# Maintainer : Joe Bo Run <joborun@disroot.org>
# PkgSource : url="https://gittea.disroot.org/joborun-pkg/jobextra/$pkgname"
# Website : https://pozol.eu
#-----------------------------------------| DESCRIPTION |---------------------------------------
pkgname=zeal
pkgver=0.7.1
pkgrel=01
pkgdesc='Offline API documentation browser Qt5 based'
url='https://zealdocs.org'
depends=(
'qt5-webengine'
'qt5-base'
'qt5-webchannel'
'sqlite'
'libarchive'
'libxcb'
'libx11'
'ttf-liberation'
)
makedepends=(
'cmake'
'extra-cmake-modules'
'git'
'qt5-base'
'qt5-webchannel'
'qt5-webengine'
'ttf-liberation'
'jack2'
'qt5-x11extras'
)
source=("$pkgname::git+https://github.com/zealdocs/zeal#tag=v$pkgver")
#pkgver() {
# cd "$pkgname"
#
# git describe --tags | sed 's/^v//'
#}
build() {
cmake \
-B build \
-S "$pkgname" \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_BUILD_TYPE=Release \
-D ZEAL_RELEASE_BUILD=ON
cmake --build build
}
package() {
DESTDIR="$pkgdir" cmake --install build
}
#---- arch license gpg-key & sha256sums ----
arch=(x86_64)
license=('GPL-3.0-or-later')
sha512sums=('a97653fa7609b055c5221cd0138307f7f2b94367b795ebca155cae6cbe664318628c0b8e078cf84a5b738927c44c7f072d2f3b3ae18423da5d1675c6b1bf882b')
b2sums=('b512ec98ba2fdd0ce2e42d2f0e572ef6b42ff0abebb3eb3556eddf5cdc712da975d91ae9cde29c2466134a07e50171b384139102ef35f4f44ef9cee6234d0284')
sha256sums=(SKIP)
## fd8791fc150a24cbea11da1e3c336314e691f07a29b69754b1b94eac15d00cbc zeal-0.7.1-01-x86_64.pkg.tar.lz

48
zeal/PKGBUILD-arch Normal file
View file

@ -0,0 +1,48 @@
# Maintainer: George Rawlinson <george@rawlinson.net.nz>
# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
# Contributor: Oleg Shparber <trollixx+aur@gmail.com>
# Contributor: Thomas Weißschuh <thomas t-8ch de>
pkgname=zeal
pkgver=0.7.1
pkgrel=1
pkgdesc='Offline API documentation browser'
arch=('x86_64')
url='https://zealdocs.org'
license=('GPL-3.0-or-later')
depends=(
'glibc'
'gcc-libs'
'hicolor-icon-theme'
'qt6-webengine'
'qt6-base'
'qt6-webchannel'
'sqlite'
'libarchive'
'libxcb'
'libx11'
'xcb-util-keysyms'
)
makedepends=(
'cmake'
'extra-cmake-modules'
'git'
)
source=("$pkgname::git+https://github.com/zealdocs/zeal#tag=v$pkgver")
sha512sums=('a97653fa7609b055c5221cd0138307f7f2b94367b795ebca155cae6cbe664318628c0b8e078cf84a5b738927c44c7f072d2f3b3ae18423da5d1675c6b1bf882b')
b2sums=('b512ec98ba2fdd0ce2e42d2f0e572ef6b42ff0abebb3eb3556eddf5cdc712da975d91ae9cde29c2466134a07e50171b384139102ef35f4f44ef9cee6234d0284')
build() {
cmake \
-B build \
-S "$pkgname" \
-D CMAKE_INSTALL_PREFIX=/usr \
-D CMAKE_BUILD_TYPE=Release \
-D ZEAL_RELEASE_BUILD=ON
cmake --build build
}
package() {
DESTDIR="$pkgdir" cmake --install build
}

1
zeal/clean Normal file
View file

@ -0,0 +1 @@
rm -rf {src,pkg,zeal}

11
zeal/deps Normal file
View file

@ -0,0 +1,11 @@
cmake
extra-cmake-modules
git
qt5-base
qt5-webchannel
qt5-webengine
ttf-liberation
jack2
qt5-x11extras

6
zeal/time Normal file
View file

@ -0,0 +1,6 @@
real 1m53.003s
user 2m13.909s
sys 0m9.909s