diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2020-01-29 19:02:14 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2020-01-29 19:02:14 +0000 |
| commit | 042e4f6b00c4442569e983881d590e10383a9865 (patch) | |
| tree | 176b43b1da5994f1df2d91c48ca90ecfd4fb5920 /databases/mariadb104-server | |
| parent | 2d49571815a5350ca386ee98c4d39fadcdcd30ff (diff) | |
| download | ports-042e4f6b00c4442569e983881d590e10383a9865.tar.gz ports-042e4f6b00c4442569e983881d590e10383a9865.zip | |
databases/mariadb104-server: Security update to 10.4.12
MFH: 2020Q1
Security: a6cf65ad-37d2-11ea-a1c7-b499baebfeaf
Security: CVE-2020-2574
Notes
Notes:
svn path=/head/; revision=524565
Diffstat (limited to 'databases/mariadb104-server')
| -rw-r--r-- | databases/mariadb104-server/Makefile | 2 | ||||
| -rw-r--r-- | databases/mariadb104-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb104-server/files/patch-MDEV-21592 | 14 |
3 files changed, 18 insertions, 4 deletions
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 476c84b173a0..298401e9c36a 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.4.11 +PORTVERSION= 10.4.12 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo index c6367c310f10..5d8e43e0d2be 100644 --- a/databases/mariadb104-server/distinfo +++ b/databases/mariadb104-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1576075415 -SHA256 (mariadb-10.4.11.tar.gz) = 4c076232b99433b09eb3c6d62f607192b3474d022703699b8f6aef4e79de3fb9 -SIZE (mariadb-10.4.11.tar.gz) = 78389909 +TIMESTAMP = 1580199426 +SHA256 (mariadb-10.4.12.tar.gz) = fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208 +SIZE (mariadb-10.4.12.tar.gz) = 79120835 diff --git a/databases/mariadb104-server/files/patch-MDEV-21592 b/databases/mariadb104-server/files/patch-MDEV-21592 new file mode 100644 index 000000000000..f744a84e4ca7 --- /dev/null +++ b/databases/mariadb104-server/files/patch-MDEV-21592 @@ -0,0 +1,14 @@ +--- plugin/auth_pam/mapper/pam_user_map.c.orig 2020-01-26 20:43:53 UTC ++++ plugin/auth_pam/mapper/pam_user_map.c +@@ -39,7 +39,11 @@ and usually end up in /var/log/secure file. + #include <grp.h> + #include <pwd.h> + ++#ifdef __FreeBSD__ ++#include <security/pam_appl.h> ++#elif + #include <security/pam_ext.h> ++#endif + #include <security/pam_modules.h> + + #define FILENAME "/etc/security/user_map.conf" |