commit cd18dd563b273e802b684c565c1421f2d158e649 Author: Juergen Daubert <jue@jue.li> Date: Thu Feb 17 16:27:13 2022 +0100 mariadb: move socket and pid to /run/mysld diff --git a/mariadb/.footprint b/mariadb/.footprint index a92c6a4f3..a11856fff 100644 --- a/mariadb/.footprint +++ b/mariadb/.footprint @@ -922,5 +922,3 @@ drwxr-xr-x root/root var/lib/ drwx------ mysql/mysql var/lib/mysql/ drwxr-xr-x root/root var/log/ drwx------ mysql/mysql var/log/mysql/ -drwxr-xr-x root/root var/run/ -drwxr-xr-x mysql/mysql var/run/mysqld/ diff --git a/mariadb/.signature b/mariadb/.signature index 2e3a72e14..0612e93d2 100644 --- a/mariadb/.signature +++ b/mariadb/.signature @@ -1,8 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/b9Bq+T2/yKxudD4jWrmCzKMYAEeJk6U0TvYKebxc5ZU4fMGLQUya6yWe1GOSmLB+WoEf6XsuOVBC4HuO3RmbQE= -SHA256 (Pkgfile) = 2782f7dee64bfbd4893c112417380cff097b81335125887f2761581524c8b7f3 -SHA256 (.footprint) = e55b0a014eee6cbdc1b669f707c4e652b7a36a6bf21acc7c8f4ab066d8552494 +RWSE3ohX2g5d/bLpZ60YfwNDPEImwwjQlXoc6I6aQhAV93pakdPbk1EZl141d6xCWndldBTGDsEwEWJ4+T/Wu7llGnlxbOSjNAo= +SHA256 (Pkgfile) = 03a1bf6e5e5b313b7136c6c08f1cfd6e2511ca6a5a0444242bdb378ac756cd3e +SHA256 (.footprint) = 8042791f05b4ea50089d2d0cd58a63cf73dd8607b335812f023da712cdc940b5 SHA256 (mariadb-10.7.3.tar.gz) = da286919ffc9c913282202349709b6ba4ebcd342815e8dae0aa6b6bd8f515cd4 -SHA256 (mariadb.rc) = b5c4eadfae0d10bd5229ac7181d40246a5da345a9a7dfff6f534113d2a1c1b74 +SHA256 (mariadb.rc) = f0b6fe3b360fcc03c4fae19d5505859b475d8db1630d95e521e5da7b7561bf04 SHA256 (mariadb.pam) = 962b53d37719ed4798643a8fe3557454d23f74c2b14f1dfc1c1c67d361cab891 SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c diff --git a/mariadb/Pkgfile b/mariadb/Pkgfile index e2c6df679..819dd2719 100644 --- a/mariadb/Pkgfile +++ b/mariadb/Pkgfile @@ -5,7 +5,7 @@ name=mariadb version=10.7.3 -release=1 +release=2 source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.... mariadb.rc mariadb.pam pre-install) @@ -21,7 +21,7 @@ build() { -D INSTALL_PCDIR=/usr/lib/pkgconfig \ -D INSTALL_PAMDIR=/lib/security \ -D MYSQL_DATADIR=/var/lib/mysql \ - -D MYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \ + -D MYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \ -D WITH_READLINE=ON \ -D WITH_ZLIB=system \ -D WITH_SSL=system \ @@ -31,7 +31,7 @@ build() { -D WITH_UNIT_TESTS=OFF \ -D SKIP_TESTS=ON - cmake --build build + cmake --build build -j ${JOBS:-1} DESTDIR=$PKG cmake --install build rm -r $PKG/etc/{init.d,logrotate.d} @@ -41,7 +41,6 @@ build() { find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \; install -d -m 700 -o mysql -g mysql $PKG/var/{lib,log}/mysql - install -d -m 755 -o mysql -g mysql $PKG/var/run/mysqld install -D -m 755 $SRC/mariadb.rc $PKG/etc/rc.d/mariadb install -D -m 644 $SRC/mariadb.pam $PKG/etc/pam.d/mysql diff --git a/mariadb/mariadb.rc b/mariadb/mariadb.rc index 92208802e..74c7bb8cd 100644 --- a/mariadb/mariadb.rc +++ b/mariadb/mariadb.rc @@ -6,11 +6,12 @@ SSD=/sbin/start-stop-daemon PROG=/usr/sbin/mysqld NAME=mysqld -PID=/var/run/mysqld/mysqld.pid +PID=/run/mysqld/mysqld.pid OPTS="--pid-file=$PID --user=mysql" case $1 in start) + install -o mysql -g mysql -m 0755 -d /run/mysqld $SSD --start -bC --pidfile $PID --exec $PROG -- $OPTS ;; stop)