Attachment #208413 for bug #241335

Lines 2-8 Link Here

(-)mariadb104-server/Makefile (-1 / +2 lines)
2	# $FreeBSD: head/databases/mariadb104-server/Makefile 514130 2019-10-09 10:34:56Z bapt $	2	# $FreeBSD: head/databases/mariadb104-server/Makefile 514130 2019-10-09 10:34:56Z bapt $
3		3
4	PORTNAME?= mariadb	4	PORTNAME?= mariadb
5	PORTVERSION= 10.4.7	5	PORTVERSION= 10.4.8
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= databases	7	CATEGORIES= databases
8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \	8	MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \
Lines 154-159 Link Here
154	TOKUDB_PORTDOCS= README.md	154	TOKUDB_PORTDOCS= README.md
155	TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi	155	TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi
156	WSREP_CMAKE_BOOL= WITH_WSREP	156	WSREP_CMAKE_BOOL= WITH_WSREP
		157	WSREP_LIB_DEPENDS= libgalera.so:databases/galera26
157	ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4	158	ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4
158	ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD	159	ZSTD_CMAKE_BOOL= WITH_ROCKSDB_ZSTD
159	ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd	160	ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd

Lines 1-3 Link Here

(-)mariadb104-server/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1564591340	1	TIMESTAMP = 1571429742
2	SHA256 (mariadb-10.4.7.tar.gz) = c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817	2	SHA256 (mariadb-10.4.8.tar.gz) = 10cc2c3bdb76733c9c6fd1e3c6c860d8b4282c85926da7d472d2a0e00fffca9b
3	SIZE (mariadb-10.4.7.tar.gz) = 78155161	3	SIZE (mariadb-10.4.8.tar.gz) = 78262897




--- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig	2019-07-30 11:32:16.000000000 +0000
+++ plugin/auth_pam/testing/pam_mariadb_mtr.c	2019-08-20 18:31:37.712246000 +0000
@@ -15,6 +15,9 @@
 
 #define N 3
 
+typedef unsigned int uint;
+typedef unsigned short ushort;
+
 int pam_sm_authenticate(pam_handle_t *pamh, int flags,
                         int argc, const char *argv[])
 {
--- plugin/auth_pam/CMakeLists.txt.orig	2019-07-30 11:32:16.000000000 +0000
+++ plugin/auth_pam/CMakeLists.txt	2019-08-23 12:04:17.702326000 +0000
@@ -21,7 +21,4 @@ IF(HAVE_PAM_APPL_H)
                      WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
                    COMPONENT Server)
   ENDIF()
-  IF(TARGET auth_pam OR TARGET auth_pam_v1)
-    ADD_SUBDIRECTORY(testing)
-  ENDIF()
 ENDIF(HAVE_PAM_APPL_H)




--- libmariadb/include/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+++ libmariadb/include/CMakeLists.txt
@@ -21,6 +21,7 @@ IF(WIN32)
   SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
 ENDIF()
 
+IF(NOT WITHOUT_CLIENT)
 INSTALL(FILES
    ${MARIADB_CLIENT_INCLUDES}
    DESTINATION ${INSTALL_INCLUDEDIR}
@@ -33,3 +34,4 @@ INSTALL(FILES
    ${MARIADB_ADDITIONAL_INCLUDES}
    DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
    COMPONENT Development)
+ENDIF()




--- libmariadb/libmariadb/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+++ libmariadb/libmariadb/CMakeLists.txt
@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
 INSTALL(TARGETS mariadbclient
           COMPONENT Development
           DESTINATION ${INSTALL_LIBDIR})
+IF(NOT WITHOUT_CLIENT)
 INSTALL(TARGETS libmariadb
           COMPONENT SharedLibraries
         DESTINATION ${INSTALL_LIBDIR})
+ENDIF()
 
 IF(WIN32)
    # On Windows, install PDB




--- libmariadb/plugins/auth/CMakeLists.txt.orig	2018-05-23 20:38:41 UTC
+++ libmariadb/plugins/auth/CMakeLists.txt
@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES)
                   LIBRARIES ${GSSAPI_LIBS})
 ENDIF()
 
+IF(NOT WITHOUT_CLIENT)
 IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL")
   IF(WIN32)
     SET(SHA256_LIBS crypt32)
@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W
                   SOURCES ${AUTH_DIR}/sha256_pw.c
                   LIBRARIES ${SHA256_LIBS})
 ENDIF()
+ENDIF()
 
 # old_password plugin
 REGISTER_PLUGIN(TARGET mysql_old_password
@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor
                 SOURCES ${AUTH_DIR}/old_password.c)
 
 
+IF(NOT WITHOUT_CLIENT)
 # Cleartext
 REGISTER_PLUGIN(TARGET mysql_clear_password
                 TYPE MARIADB_CLIENT_PLUGIN_AUTH
                 CONFIGURATIONS DYNAMIC STATIC OFF
                 DEFAULT DYNAMIC
                 SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
-
+ENDIF()

Return to bug 241335

Lines 1-22 Link Here

(-)mariadb104-server/files/patch-MDEV-20258 (-22 lines)
1	--- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig 2019-07-30 11:32:16.000000000 +0000
2	+++ plugin/auth_pam/testing/pam_mariadb_mtr.c 2019-08-20 18:31:37.712246000 +0000
3	@@ -15,6 +15,9 @@
4
5	#define N 3
6
7	+typedef unsigned int uint;
8	+typedef unsigned short ushort;
9	+
10	int pam_sm_authenticate(pam_handle_t *pamh, int flags,
11	int argc, const char *argv[])
12	{
13	--- plugin/auth_pam/CMakeLists.txt.orig 2019-07-30 11:32:16.000000000 +0000
14	+++ plugin/auth_pam/CMakeLists.txt 2019-08-23 12:04:17.702326000 +0000
15	@@ -21,7 +21,4 @@ IF(HAVE_PAM_APPL_H)
16	WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
17	COMPONENT Server)
18	ENDIF()
19	- IF(TARGET auth_pam OR TARGET auth_pam_v1)
20	- ADD_SUBDIRECTORY(testing)
21	- ENDIF()
22	ENDIF(HAVE_PAM_APPL_H)

Lines 1-15 Link Here

(-)mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt (-15 lines)
1	--- libmariadb/include/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
2	+++ libmariadb/include/CMakeLists.txt
3	@@ -21,6 +21,7 @@ IF(WIN32)
4	SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
5	ENDIF()
6
7	+IF(NOT WITHOUT_CLIENT)
8	INSTALL(FILES
9	${MARIADB_CLIENT_INCLUDES}
10	DESTINATION ${INSTALL_INCLUDEDIR}
11	@@ -33,3 +34,4 @@ INSTALL(FILES
12	${MARIADB_ADDITIONAL_INCLUDES}
13	DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
14	COMPONENT Development)
15	+ENDIF()

Lines 1-14 Link Here

(-)mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt (-14 lines)
1	--- libmariadb/libmariadb/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC
2	+++ libmariadb/libmariadb/CMakeLists.txt
3	@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
4	INSTALL(TARGETS mariadbclient
5	COMPONENT Development
6	DESTINATION ${INSTALL_LIBDIR})
7	+IF(NOT WITHOUT_CLIENT)
8	INSTALL(TARGETS libmariadb
9	COMPONENT SharedLibraries
10	DESTINATION ${INSTALL_LIBDIR})
11	+ENDIF()
12
13	IF(WIN32)
14	# On Windows, install PDB

Lines 1-31 Link Here

(-)mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt (-31 lines)
1	--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC
2	+++ libmariadb/plugins/auth/CMakeLists.txt
3	@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES)
4	LIBRARIES ${GSSAPI_LIBS})
5	ENDIF()
6
7	+IF(NOT WITHOUT_CLIENT)
8	IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL")
9	IF(WIN32)
10	SET(SHA256_LIBS crypt32)
11	@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W
12	SOURCES ${AUTH_DIR}/sha256_pw.c
13	LIBRARIES ${SHA256_LIBS})
14	ENDIF()
15	+ENDIF()
16
17	# old_password plugin
18	REGISTER_PLUGIN(TARGET mysql_old_password
19	@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor
20	SOURCES ${AUTH_DIR}/old_password.c)
21
22
23	+IF(NOT WITHOUT_CLIENT)
24	# Cleartext
25	REGISTER_PLUGIN(TARGET mysql_clear_password
26	TYPE MARIADB_CLIENT_PLUGIN_AUTH
27	CONFIGURATIONS DYNAMIC STATIC OFF
28	DEFAULT DYNAMIC
29	SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
30	-
31	+ENDIF()