commit c0137dda2455f5e53c9b20799b62e8a8c7f761fb Author: Juergen Daubert <jue@jue.li> Date: Fri Jan 31 16:59:31 2020 +0100 mariadb: update to 10.4.12 diff --git a/mariadb/.footprint b/mariadb/.footprint index 82f08d545..2539e3fff 100644 --- a/mariadb/.footprint +++ b/mariadb/.footprint @@ -5,8 +5,15 @@ drwxr-xr-x root/root etc/my.cnf.d/ -rw-r--r-- root/root etc/my.cnf.d/enable_encryption.preset -rw-r--r-- root/root etc/my.cnf.d/mysql-clients.cnf -rw-r--r-- root/root etc/my.cnf.d/server.cnf +drwxr-xr-x root/root etc/pam.d/ +-rw-r--r-- root/root etc/pam.d/mysql drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/mariadb +drwxr-xr-x root/root etc/security/ +-rw-r--r-- root/root etc/security/user_map.conf +drwxr-xr-x root/root lib/ +drwxr-xr-x root/root lib/security/ +-rwxr-xr-x root/root lib/security/pam_user_map.so drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/aria_chk @@ -261,6 +268,7 @@ drwxr-xr-x root/root usr/include/mysql/server/private/atomic/ -rw-r--r-- root/root usr/include/mysql/server/private/hostname.h -rw-r--r-- root/root usr/include/mysql/server/private/init.h -rw-r--r-- root/root usr/include/mysql/server/private/innodb_priv.h +-rw-r--r-- root/root usr/include/mysql/server/private/intrusive_list.h -rw-r--r-- root/root usr/include/mysql/server/private/item.h -rw-r--r-- root/root usr/include/mysql/server/private/item_cmpfunc.h -rw-r--r-- root/root usr/include/mysql/server/private/item_create.h diff --git a/mariadb/.signature b/mariadb/.signature index 770f41bb6..dc18e2dda 100644 --- a/mariadb/.signature +++ b/mariadb/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/S1k8B3V6bteAAO/KyIRAGXUsa0Fm5sRoINnGyECI6N14yEgXhCTuNiOfLkjby01PNYzKlDqsN7t7DuF4s+whQY= -SHA256 (Pkgfile) = f6c5a8ff375ae1cf5266ae628ea7576ae33ea04cc90c7ce4e2b79f8313769510 -SHA256 (.footprint) = f5bf9804738e8468a3cc64fb750d69e2f27f61b355a7c10ad2311de6a7f009c7 -SHA256 (mariadb-10.4.11.tar.gz) = 4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9 -SHA256 (mariadb) = 737fe0eaad407e2b078ba21c1e4082dc4361da10354939ed4f6da651a76a8c1f +RWSE3ohX2g5d/TUZJaJd/8TwfL/847mDdJZ3J1bbM1WKoFuZ2GWPT/Tqr9qaJaoluoGdgBRECxDnGe1qLN2LzrY1Gb7ebH6QJgc= +SHA256 (Pkgfile) = 875bca7ca5a8f6e2952f962d263cb41e1897045affa687eb060913416b50682f +SHA256 (.footprint) = f4be81fb2701c9a87419eb5ac06f6c26522b4ac7f35dbed5da9abf9eed598d83 +SHA256 (mariadb-10.4.12.tar.gz) = fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208 +SHA256 (mariadb.rc) = 737fe0eaad407e2b078ba21c1e4082dc4361da10354939ed4f6da651a76a8c1f +SHA256 (mariadb.pam) = 962b53d37719ed4798643a8fe3557454d23f74c2b14f1dfc1c1c67d361cab891 SHA256 (pre-install) = 62040c17eeb3da88172d49240633c871a93c3c642ad7f61911ce2e83d8414d1c diff --git a/mariadb/Pkgfile b/mariadb/Pkgfile index 418d52d9f..34a91d938 100644 --- a/mariadb/Pkgfile +++ b/mariadb/Pkgfile @@ -4,10 +4,10 @@ # Depends on: ncurses zlib openssl cmake libaio linux-pam name=mariadb -version=10.4.11 +version=10.4.12 release=1 source=(https://downloads.mariadb.com/MariaDB//$name-$version/source/$name-$version.... - mariadb + mariadb.rc mariadb.pam pre-install) build() { @@ -43,5 +43,7 @@ build() { 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 $PKG/etc/rc.d/mariadb + + 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.pam b/mariadb/mariadb.pam new file mode 100644 index 000000000..d3667a8dd --- /dev/null +++ b/mariadb/mariadb.pam @@ -0,0 +1,9 @@ +# +# /etc/pam.d/mysql - mariadb service module configuration +# + +auth include common-auth +auth required pam_user_map.so + +account include common-account + diff --git a/mariadb/mariadb b/mariadb/mariadb.rc old mode 100755 new mode 100644 similarity index 100% rename from mariadb/mariadb rename to mariadb/mariadb.rc