Rebase to 3.1.2 version
Disabling the ED25519 plugin Plugindir patch upstreamed
This commit is contained in:
Michal Schorm
parent
fa32028be2
commit
db2966c1ba
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@
|
||||
/mariadb-connector-c-3.0.8-src.tar.gz
|
||||
/mariadb-connector-c-3.0.9-src.tar.gz
|
||||
/mariadb-connector-c-3.0.10-src.tar.gz
|
||||
/mariadb-connector-c-3.1.2-src.tar.gz
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
Name: mariadb-connector-c
|
||||
Version: 3.0.10
|
||||
Release: 2%{?dist}
|
||||
Version: 3.1.2
|
||||
Release: 1%{?dist}
|
||||
Summary: The MariaDB Native Client library (C driver)
|
||||
License: LGPLv2+
|
||||
Source: https://downloads.mariadb.org/interstitial/connector-c-%{version}/mariadb-connector-c-%{version}-src.tar.gz
|
||||
@ -9,7 +9,6 @@ Source3: client.cnf
|
||||
Url: http://mariadb.org/
|
||||
# More information: https://mariadb.com/kb/en/mariadb/building-connectorc-from-source/
|
||||
|
||||
Patch1: plugindir.patch
|
||||
Patch2: pkgconfig.patch
|
||||
|
||||
Requires: %{_sysconfdir}/my.cnf
|
||||
@ -53,7 +52,6 @@ and require this package, so the /etc/my.cnf file is present.
|
||||
%prep
|
||||
%setup -q -n mariadb-connector-c-%{version}-src
|
||||
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
# Remove unsused parts
|
||||
@ -69,7 +67,7 @@ rm -r win zlib win-iconv examples
|
||||
# If it's a positive number, say, 3306, it will be 3306, no matter what /etc/services say.
|
||||
# I don't know if that behavior makes much sense, /etc/services wasn't supposed to be a system configuration file.
|
||||
|
||||
# The INSTALL_xxx macros have to be specified relative to CMAKE_INSTALL_PREFIX
|
||||
# The INSTALL_* macros have to be specified relative to CMAKE_INSTALL_PREFIX
|
||||
# so we can't use %%{_datadir} and so forth here.
|
||||
|
||||
%cmake . \
|
||||
@ -82,6 +80,7 @@ rm -r win zlib win-iconv examples
|
||||
-DWITH_EXTERNAL_ZLIB=YES \
|
||||
-DWITH_SSL=OPENSSL \
|
||||
-DWITH_MYSQLCOMPAT=ON \
|
||||
-DPLUGIN_CLIENT_ED25519=OFF \
|
||||
\
|
||||
-DINSTALL_LAYOUT=RPM \
|
||||
-DCMAKE_INSTALL_PREFIX="%{_prefix}" \
|
||||
@ -93,7 +92,8 @@ rm -r win zlib win-iconv examples
|
||||
\
|
||||
-DWITH_UNITTEST=ON
|
||||
|
||||
|
||||
# ED25519 plugin build disabled for now, since it is already shipped by the MariaDB server.
|
||||
# We need to disable it there first
|
||||
|
||||
#cmake ./ -LAH
|
||||
|
||||
@ -176,9 +176,6 @@ popd
|
||||
# https://jira.mariadb.org/browse/CONC-293
|
||||
# DESCRIPTION: add mysql_config and mariadb_config man page
|
||||
# IN_PROGRESS: upsteam plans to add it to 3.1 release
|
||||
# https://jira.mariadb.org/browse/CONC-383
|
||||
# DESCRIPTION: Plugin auth_gssapi_client could not be loaded; missing "/usr/" prefix
|
||||
# IN_PROGRESS: Fix from Fedora offered to upstream, waiting for validation; https://github.com/MariaDB/mariadb-connector-c/pull/105
|
||||
# https://jira.mariadb.org/browse/CONC-410
|
||||
# DESCRIPTION: Fix pkgconfig file - overlinking issues
|
||||
# IN_PROGRESS: PR submitted, problem consulted & explained, waiting on upstream response
|
||||
@ -189,6 +186,7 @@ popd
|
||||
# TODO: Check atleast the important issues
|
||||
|
||||
# Downstream issues:
|
||||
# Start building the ED25519 plugin in CONC/C instead of MariaDB server
|
||||
# Start running this package testsuite at the build time
|
||||
# It requires a running MariaDB server
|
||||
# mariadb-server package pulls in mariadb-connector-c as a dependency
|
||||
@ -198,6 +196,11 @@ popd
|
||||
# Currently, one of the tests - 'ps_bugs' - is failing
|
||||
|
||||
%changelog
|
||||
* Fri Jul 12 2019 Michal Schorm <mschorm@redhat.com> - 3.1.2-1
|
||||
- Rebase to 3.1 version
|
||||
- Disabling the ED25519 plugin
|
||||
- Plugindir patch upstreamed
|
||||
|
||||
* Tue May 21 2019 Michal Schorm <mschorm@redhat.com> - 3.0.10-2
|
||||
- Fix overlinking issues
|
||||
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
The plugins build system used different path than the mariadb_config, which resulted in plugins that
|
||||
couldn't be loaded, because they missed "/usr/" at the beginning of their path.
|
||||
|
||||
RH bug:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1624533
|
||||
Upstream Bug:
|
||||
https://jira.mariadb.org/browse/CONC-383
|
||||
Upstream PR:
|
||||
https://github.com/MariaDB/mariadb-connector-c/pull/105
|
||||
|
||||
--- mariadb-connector-c-3.0.9-src/include/mariadb_version.h.in 2019-02-08 16:36:35.000000000 +0100
|
||||
+++ mariadb-connector-c-3.0.9-src/include/mariadb_version.h.in_patched 2019-03-21 04:11:47.722080986 +0100
|
||||
@@ -24,7 +24,7 @@
|
||||
#define MARIADB_PACKAGE_VERSION_ID @MARIADB_PACKAGE_VERSION_ID@
|
||||
#define MARIADB_SYSTEM_TYPE "@CMAKE_SYSTEM_NAME@"
|
||||
#define MARIADB_MACHINE_TYPE "@CMAKE_SYSTEM_PROCESSOR@"
|
||||
-#define MARIADB_PLUGINDIR "@PLUGINDIR@"
|
||||
+#define MARIADB_PLUGINDIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@"
|
||||
|
||||
/* mysqld compile time options */
|
||||
#ifndef MYSQL_CHARSET
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (mariadb-connector-c-3.0.10-src.tar.gz) = 1358d8f87e4693ef05d17915a399054ef40a1c9d58675b2704673fd40af843b366293c5b7d1e60c9335f68018c22d8aa86e41d90acebf1d4364229911dc8b6dc
|
||||
SHA512 (mariadb-connector-c-3.1.2-src.tar.gz) = 8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb
|
||||
|
||||
Loading…
Reference in New Issue
Block a user