Accepting request 808309 from server:database
OBS-URL: https://build.opensuse.org/request/show/808309 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mariadb-connector-c?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
79871149f6
@ -2,16 +2,16 @@ 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.3-src/mariadb_config/mariadb_config.c.in
|
||||
Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
|
||||
===================================================================
|
||||
--- mariadb-connector-c-3.1.3-src.orig/mariadb_config/mariadb_config.c.in
|
||||
+++ mariadb-connector-c-3.1.3-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_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql"
|
||||
-#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb"
|
||||
-#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@"
|
||||
@ -23,10 +23,10 @@ Index: mariadb-connector-c-3.1.3-src/mariadb_config/mariadb_config.c.in
|
||||
#define SOCKET "@MARIADB_UNIX_ADDR@"
|
||||
#define PORT "@MARIADB_PORT@"
|
||||
#define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@"
|
||||
Index: mariadb-connector-c-3.1.3-src/mariadb_config/libmariadb.pc.in
|
||||
Index: mariadb-connector-c-3.1.8-src/mariadb_config/libmariadb.pc.in
|
||||
===================================================================
|
||||
--- mariadb-connector-c-3.1.3-src.orig/mariadb_config/libmariadb.pc.in
|
||||
+++ mariadb-connector-c-3.1.3-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 @@
|
||||
#
|
||||
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:64f7bc8f5df3200ba6e3080f68ee4942382a33e8371baea8ca4b9242746df59a
|
||||
size 742923
|
||||
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQEcBAABCAAGBQJeMaEDAAoJEM4aPdXjyU9JzUgIAONDecQgdFhNnfi0TF5gvoYO
|
||||
2z8GSrw6hT3sXr7eQT33UpIqb4Qc3H0gLTIYbBYcFC8qbwtfvhO3ROoTiQRDWeA9
|
||||
rQiaFg6pojMWyRsdmcBpo8SatnE9R6rk7sVDzEemmkPWN9xmggUQRHbsbMLtK1D4
|
||||
EY9eQ2k2oD4rTm699IjYYoZICTWuVqxPQTnNLyWdvlHgJPOnV9n+wr5SEPLAMj0T
|
||||
ETrVX5usnzZPcJ9yKX196rNSdGYzPq3MPW6JiKpTTXlNbqFcrb+yzrlxluuqNXuV
|
||||
X2z5O5gayi7Nn28dK4pSMWJnga4N64+AI13mf1zIArLpIV0lqJPXm7h4Kc+yuXM=
|
||||
=urB6
|
||||
-----END PGP SIGNATURE-----
|
||||
3
mariadb-connector-c-3.1.8-src.tar.gz
Normal file
3
mariadb-connector-c-3.1.8-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
|
||||
size 744745
|
||||
11
mariadb-connector-c-3.1.8-src.tar.gz.asc
Normal file
11
mariadb-connector-c-3.1.8-src.tar.gz.asc
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQEcBAABCAAGBQJevFK0AAoJEM4aPdXjyU9JDxwIAL6cDHSoPcnc9OcSF8HrriMz
|
||||
cb4qwabGFnzpPl8ieXtr+8B1KYt/etsJqHZhCPoaKMvLboTKlN68vHX9O6Clii9i
|
||||
4C8p02trGgbtJ3Pl+e4rBTX2bHIJXXCha9orbcHYUaNXMTc5tw84kgmvLRNUyf4o
|
||||
kBkGghq4WZ5vulinkidSn47DM0BeGQ0QqM/EaGSDoQjtPR/7U0XtptLDKZ4mACAb
|
||||
mvRMBRXiOJk4CfVrmmiyKKjo86IG5iiFqQotu+/f/BxGDr2p9/1HAiQv7oyQ8GLY
|
||||
o5qDdf37RxHMkcqfmYszp4cQuJlW2yDZLK8SnctMIUbj71ruOFNKf1g+23uR30c=
|
||||
=L+bO
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri May 22 15:05:07 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>
|
||||
|
||||
- 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
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Feb 6 20:30:28 UTC 2020 - Kristyna Streitova <kstreitova@suse.com>
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
%endif
|
||||
%bcond_with sqlite3
|
||||
Name: mariadb-connector-c
|
||||
Version: 3.1.7
|
||||
Version: 3.1.8
|
||||
Release: 0
|
||||
Summary: MariaDB connector in C
|
||||
License: LGPL-2.1-or-later
|
||||
|
||||
@ -8,11 +8,11 @@ static linking, create a private shared library that simply
|
||||
exports all symbols. With the exception of exported symbols, it is
|
||||
identical to the regular library.
|
||||
|
||||
Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt
|
||||
Index: mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt
|
||||
===================================================================
|
||||
--- mariadb-connector-c-3.1.4-src.orig/libmariadb/CMakeLists.txt
|
||||
+++ mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt
|
||||
@@ -410,17 +410,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
|
||||
--- mariadb-connector-c-3.1.8-src.orig/libmariadb/CMakeLists.txt
|
||||
+++ mariadb-connector-c-3.1.8-src/libmariadb/CMakeLists.txt
|
||||
@@ -411,17 +411,25 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
|
||||
SET_TARGET_PROPERTIES(mariadbclient PROPERTIES STATIC_LIBRARY_FLAGS "/machine:x64")
|
||||
ENDIF()
|
||||
|
||||
@ -25,7 +25,7 @@ Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt
|
||||
IF(CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
||||
CMAKE_SYSTEM_NAME MATCHES "GNU")
|
||||
IF (NOT WITH_ASAN AND NOT WITH_TSAN AND NOT WITH_UBSAN AND NOT WITH_MSAN)
|
||||
TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
|
||||
TARGET_LINK_LIBRARIES (libmariadb LINK_PRIVATE "-Wl,--no-undefined")
|
||||
ENDIF()
|
||||
SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
|
||||
+ SET_TARGET_PROPERTIES(libmariadbprivate PROPERTIES LINK_FLAGS "-Wl,--no-undefined")
|
||||
@ -38,7 +38,7 @@ Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt
|
||||
SET_TARGET_PROPERTIES(libmariadb PROPERTIES PREFIX "")
|
||||
|
||||
#
|
||||
@@ -454,7 +462,9 @@ INSTALL(TARGETS mariadbclient
|
||||
@@ -455,7 +463,9 @@ INSTALL(TARGETS mariadbclient
|
||||
INSTALL(TARGETS libmariadb
|
||||
COMPONENT SharedLibraries
|
||||
DESTINATION ${INSTALL_LIBDIR})
|
||||
@ -47,12 +47,12 @@ Index: mariadb-connector-c-3.1.4-src/libmariadb/CMakeLists.txt
|
||||
+ COMPONENT SharedLibraries
|
||||
+ DESTINATION ${INSTALL_LIBDIR})
|
||||
|
||||
IF(WIN32)
|
||||
IF(MSVC)
|
||||
# On Windows, install PDB
|
||||
Index: mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in
|
||||
Index: mariadb-connector-c-3.1.8-src/mariadb_config/mariadb_config.c.in
|
||||
===================================================================
|
||||
--- mariadb-connector-c-3.1.4-src.orig/mariadb_config/mariadb_config.c.in
|
||||
+++ mariadb-connector-c-3.1.4-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
|
||||
@@ -7,6 +7,8 @@ static char *mariadb_progname;
|
||||
|
||||
#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@/mariadb"
|
||||
@ -62,15 +62,15 @@ Index: mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in
|
||||
#define LIBS_SYS "@extra_dynamic_LDFLAGS@"
|
||||
#define CFLAGS INCLUDE
|
||||
#define VERSION "@MARIADB_CLIENT_VERSION@"
|
||||
@@ -30,6 +32,7 @@ static struct option long_options[]=
|
||||
{"port", no_argument, 0, 'i'},
|
||||
{"plugindir", no_argument, 0, 'j'},
|
||||
{"tlsinfo", no_argument, 0, 'k'},
|
||||
+ {"privatelibs", no_argument, 0, 'm'},
|
||||
@@ -35,6 +37,7 @@ static struct option long_options[]=
|
||||
{OPT_STRING_TYPE "port", no_argument, 0, 'i'},
|
||||
{OPT_STRING_TYPE "plugindir", no_argument, 0, 'j'},
|
||||
{OPT_STRING_TYPE "tlsinfo", no_argument, 0, 'k'},
|
||||
+ {OPT_STRING_TYPE "privatelibs", no_argument, 0, 'm'},
|
||||
{NULL, 0, 0, 0}
|
||||
};
|
||||
|
||||
@@ -45,6 +48,7 @@ static const char *values[]=
|
||||
@@ -50,6 +53,7 @@ static const char *values[]=
|
||||
CC_VERSION,
|
||||
SOCKET,
|
||||
PORT,
|
||||
@ -78,7 +78,7 @@ Index: mariadb-connector-c-3.1.4-src/mariadb_config/mariadb_config.c.in
|
||||
PLUGIN_DIR,
|
||||
TLS_LIBRARY_VERSION
|
||||
};
|
||||
@@ -115,6 +119,9 @@ int main(int argc, char **argv)
|
||||
@@ -120,6 +124,9 @@ int main(int argc, char **argv)
|
||||
case 'l':
|
||||
puts(LIBS_SYS);
|
||||
break;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user