forked from pool/mariadb-connector-c
Adam Majer
2b90bc66f3
- Update to release 3.1.8 [bsc#1171550]
* CONC-304: Rename the static library to libmariadb.a and other
libmariadb files in a consistent manner
* CONC-441: Default user name for C/C is wrong if login user
is different from effective user
* CONC-449: Check $MARIADB_HOME/my.cnf in addition to
$MYSQL_HOME/my.cnf
* CONC-457: mysql_list_processes crashes in unpack_fields
* CONC-458: mysql_get_timeout_value crashes when used improperly
* CONC-464: Fix static build for auth_gssapi_client plugin
* Fixes for the following security vulnerabilities:
CVE-2020-13249
- refresh absolute_path_fix.patch and private_library.patch
OBS-URL: https://build.opensuse.org/request/show/808293
OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb-connector-c?expand=0&rev=55
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
Author: Adam Majer <amajer@suse.de>
|
|
Date: Fri Mar 3 15:59:09 CET 2017
|
|
Summary: Remove pure ugliness with paths
|
|
|
|
Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
|
|
===================================================================
|
|
--- mariadb-connector-c-3.1.8-src.orig/mariadb_config/mariadb_config.c.in
|
|
+++ mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
|
|
@@ -5,13 +5,13 @@
|
|
|
|
static char *mariadb_progname;
|
|
|
|
-#define INCLUDE "-I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
|
|
-#define LIBS "-L@CMAKE_SYSROOT@@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
|
|
+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
|
|
+#define LIBS "-L@INSTALL_LIBDIR@ -lmariadb"
|
|
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
|
|
#define CFLAGS INCLUDE
|
|
#define VERSION "@MARIADB_CLIENT_VERSION@"
|
|
#define CC_VERSION "@CPACK_PACKAGE_VERSION@"
|
|
-#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@"
|
|
+#define PLUGIN_DIR "@INSTALL_PLUGINDIR@"
|
|
#define SOCKET "@MARIADB_UNIX_ADDR@"
|
|
#define PORT "@MARIADB_PORT@"
|
|
#define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"
|
|
Index: mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in
|
|
===================================================================
|
|
--- mariadb-connector-c-3.1.8-src.orig/mariadb_config/libmariadb.pc.in
|
|
+++ mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in
|
|
@@ -7,8 +7,8 @@
|
|
#
|
|
|
|
prefix=@CMAKE_INSTALL_PREFIX@
|
|
-includedir=${prefix}/@INSTALL_INCLUDEDIR@/@SUFFIX_INSTALL_DIR@
|
|
-libdir=${prefix}/@INSTALL_LIBDIR@/@SUFFIX_INSTALL_DIR@
|
|
+includedir=@INSTALL_INCLUDEDIR@
|
|
+libdir=@INSTALL_LIBDIR@
|
|
|
|
Name: libmariadb
|
|
Version: @CPACK_PACKAGE_VERSION@
|