diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2020-05-16 09:19:28 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2020-05-16 09:19:28 +0000 |
| commit | 2467609b2bcb7639ac2ce6e5a301623a6d8c3d5a (patch) | |
| tree | a3febe6ef96f857641436eebbb2a71ba2b78ec76 /databases/mariadb104-server | |
| parent | 3b17c3bb6df177b962e979795047c71c2f7fd061 (diff) | |
| download | ports-2467609b2bcb7639ac2ce6e5a301623a6d8c3d5a.tar.gz ports-2467609b2bcb7639ac2ce6e5a301623a6d8c3d5a.zip | |
Notes
Diffstat (limited to 'databases/mariadb104-server')
| -rw-r--r-- | databases/mariadb104-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/mariadb104-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/mariadb104-server/files/patch-MDEV-21592 | 14 | ||||
| -rw-r--r-- | databases/mariadb104-server/pkg-plist | 2 |
4 files changed, 9 insertions, 18 deletions
diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index 298401e9c36a..b41876fb8b88 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.4.12 +PORTVERSION= 10.4.13 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -219,6 +219,8 @@ post-configure-INNOBASE-on: post-install: ${RM} -r ${STAGEDIR}${DATADIR} ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server + ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so @@ -227,6 +229,7 @@ post-install-GSSAPI_NONE-off: post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private + ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig .endif # ${PKGNAMESUFFIX:M*-client} .include <bsd.port.post.mk> diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo index 5d8e43e0d2be..aa818ca665a5 100644 --- a/databases/mariadb104-server/distinfo +++ b/databases/mariadb104-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1580199426 -SHA256 (mariadb-10.4.12.tar.gz) = fef1e1d38aa253dd8a51006bd15aad184912fce31c446bb69434fcde735aa208 -SIZE (mariadb-10.4.12.tar.gz) = 79120835 +TIMESTAMP = 1589288654 +SHA256 (mariadb-10.4.13.tar.gz) = 45bbbb12d1de8febd9edf630e940c23cf14efd60570c743b268069516a5d91df +SIZE (mariadb-10.4.13.tar.gz) = 80608459 diff --git a/databases/mariadb104-server/files/patch-MDEV-21592 b/databases/mariadb104-server/files/patch-MDEV-21592 deleted file mode 100644 index e016af42b5de..000000000000 --- a/databases/mariadb104-server/files/patch-MDEV-21592 +++ /dev/null @@ -1,14 +0,0 @@ ---- 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> -+#else - #include <security/pam_ext.h> -+#endif - #include <security/pam_modules.h> - - #define FILENAME "/etc/security/user_map.conf" diff --git a/databases/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist index f1a751fbe5e8..a939de4032d1 100644 --- a/databases/mariadb104-server/pkg-plist +++ b/databases/mariadb104-server/pkg-plist @@ -318,6 +318,8 @@ man/man8/mysqld.8.gz @comment share/mysql/mroonga/COPYING %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md +share/pam_user_map.so +share/user_map.conf @comment bin/mariadb @comment bin/mariadb-access @comment bin/mariadb-admin |