openpkg
/
openpkg-packages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

upgrading package: mariadb 10.4.12 -> 10.4.13

master
Dr. Ralf S. Engelschall 6 years ago
parent
6cdb296e96
commit
0c3495863a
2 changed files with 31 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 62
      mariadb/mariadb.patch
  2. 10
      mariadb/mariadb.spec

62
mariadb/mariadb.patch
Unescape View File

@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig 2019-09-11 19:40:59.349952000 +0200
+++ CMakeLists.txt 2019-09-11 20:17:31.836678000 +0200
@@ -417,18 +417,12 @@
--- CMakeLists.txt.orig 2020-05-09 21:27:56.000000000 +0200
+++ CMakeLists.txt 2020-05-14 08:51:10.222525000 +0200
@@ -424,18 +424,12 @@
ADD_SUBDIRECTORY(sql/share)
IF(NOT WITHOUT_SERVER)
@ -21,8 +21,8 @@ Index: CMakeLists.txt
ADD_SUBDIRECTORY(win/upgrade_wizard)
ADD_SUBDIRECTORY(win/packaging)
Index: include/CMakeLists.txt
--- include/CMakeLists.txt.orig 2019-09-08 23:02:29.000000000 +0200
+++ include/CMakeLists.txt 2019-09-11 19:40:59.350179000 +0200
--- include/CMakeLists.txt.orig 2020-05-09 21:27:56.000000000 +0200
+++ include/CMakeLists.txt 2020-05-14 08:51:10.222677000 +0200
@@ -22,6 +22,7 @@
)
@ -32,8 +32,8 @@ Index: include/CMakeLists.txt
mysql_com.h
mysql_com_server.h
Index: include/my_compare.h
--- include/my_compare.h.orig 2019-09-08 23:02:29.000000000 +0200
+++ include/my_compare.h 2019-09-11 19:40:59.350311000 +0200
--- include/my_compare.h.orig 2020-05-09 21:27:56.000000000 +0200
+++ include/my_compare.h 2020-05-14 08:51:10.222814000 +0200
@@ -40,7 +40,7 @@
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
*/
@ -44,8 +44,8 @@ Index: include/my_compare.h
#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
Index: include/myisam.h
--- include/myisam.h.orig 2019-09-08 23:02:29.000000000 +0200
+++ include/myisam.h 2019-09-11 19:40:59.350457000 +0200
--- include/myisam.h.orig 2020-05-09 21:27:56.000000000 +0200
+++ include/myisam.h 2020-05-14 08:51:10.222965000 +0200
@@ -45,7 +45,7 @@
The following defines can be increased if necessary.
But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH.
@ -56,8 +56,8 @@ Index: include/myisam.h
#define MI_NAME_IEXT ".MYI"
Index: include/mysql/service_encryption.h
--- include/mysql/service_encryption.h.orig 2019-09-08 23:02:29.000000000 +0200
+++ include/mysql/service_encryption.h 2019-09-11 19:40:59.350590000 +0200
--- include/mysql/service_encryption.h.orig 2020-05-09 21:27:56.000000000 +0200
+++ include/mysql/service_encryption.h 2020-05-14 08:51:10.223108000 +0200
@@ -37,7 +37,7 @@
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <stdlib.h>
@ -68,8 +68,8 @@ Index: include/mysql/service_encryption.h
#endif
Index: libmariadb/mariadb_config/libmariadb.pc.in
--- libmariadb/mariadb_config/libmariadb.pc.in.orig 2019-09-08 23:02:30.000000000 +0200
+++ libmariadb/mariadb_config/libmariadb.pc.in 2019-09-11 19:40:59.350729000 +0200
--- libmariadb/mariadb_config/libmariadb.pc.in.orig 2020-05-09 21:27:57.000000000 +0200
+++ libmariadb/mariadb_config/libmariadb.pc.in 2020-05-14 08:51:10.223229000 +0200
@@ -13,8 +13,7 @@
Name: libmariadb
Version: @CPACK_PACKAGE_VERSION@
@ -82,9 +82,9 @@ Index: libmariadb/mariadb_config/libmariadb.pc.in
-
Index: mysys/CMakeLists.txt
--- mysys/CMakeLists.txt.orig 2019-09-08 23:02:31.000000000 +0200
+++ mysys/CMakeLists.txt 2019-09-11 19:40:59.350862000 +0200
@@ -85,18 +85,6 @@
--- mysys/CMakeLists.txt.orig 2020-05-14 08:51:10.223401000 +0200
+++ mysys/CMakeLists.txt 2020-05-14 08:54:52.803631000 +0200
@@ -91,14 +91,3 @@
TARGET_LINK_LIBRARIES(mysys pthread)
ENDIF()
@ -99,13 +99,9 @@ Index: mysys/CMakeLists.txt
-ADD_EXECUTABLE(test_hash hash.c)
-TARGET_LINK_LIBRARIES(test_hash mysys)
-SET_TARGET_PROPERTIES(test_hash PROPERTIES COMPILE_FLAGS "-DMAIN")
-
IF(MSVC)
INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
ENDIF()
Index: scripts/mysql_config.sh
--- scripts/mysql_config.sh.orig 2019-09-08 23:02:31.000000000 +0200
+++ scripts/mysql_config.sh 2019-09-11 19:40:59.350981000 +0200
--- scripts/mysql_config.sh.orig 2020-05-09 21:28:00.000000000 +0200
+++ scripts/mysql_config.sh 2020-05-14 08:51:10.223591000 +0200
@@ -86,14 +86,14 @@
fi
@ -124,8 +120,8 @@ Index: scripts/mysql_config.sh
mariadb_config="$basedir/bin/mariadb_config"
if test -x "$basedir/bin/mariadb_config"; then
Index: scripts/mysql_install_db.sh
--- scripts/mysql_install_db.sh.orig 2019-09-08 23:02:31.000000000 +0200
+++ scripts/mysql_install_db.sh 2019-09-11 19:40:59.351149000 +0200
--- scripts/mysql_install_db.sh.orig 2020-05-09 21:28:00.000000000 +0200
+++ scripts/mysql_install_db.sh 2020-05-14 08:51:10.223747000 +0200
@@ -374,7 +374,7 @@
else
basedir="@prefix@"
@ -136,9 +132,9 @@ Index: scripts/mysql_install_db.sh
srcpkgdatadir="@pkgdatadir@"
buildpkgdatadir="@pkgdatadir@"
Index: sql/CMakeLists.txt
--- sql/CMakeLists.txt.orig 2019-09-08 23:02:31.000000000 +0200
+++ sql/CMakeLists.txt 2019-09-11 19:40:59.351303000 +0200
@@ -425,10 +425,6 @@
--- sql/CMakeLists.txt.orig 2020-05-09 21:28:00.000000000 +0200
+++ sql/CMakeLists.txt 2020-05-14 08:51:10.223889000 +0200
@@ -406,10 +406,6 @@
IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
@ -150,8 +146,8 @@ Index: sql/CMakeLists.txt
IF(WIN32 AND TARGET mysqld AND NOT CMAKE_CROSSCOMPILING)
Index: sql/share/CMakeLists.txt
--- sql/share/CMakeLists.txt.orig 2019-09-08 23:02:32.000000000 +0200
+++ sql/share/CMakeLists.txt 2019-09-11 19:40:59.351433000 +0200
--- sql/share/CMakeLists.txt.orig 2020-05-09 21:28:00.000000000 +0200
+++ sql/share/CMakeLists.txt 2020-05-14 08:51:10.224007000 +0200
@@ -15,30 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA
@ -184,13 +180,13 @@ Index: sql/share/CMakeLists.txt
SET(files
Index: support-files/mariadb.pc.in
--- support-files/mariadb.pc.in.orig 2019-09-08 23:02:34.000000000 +0200
+++ support-files/mariadb.pc.in 2019-09-11 19:40:59.351538000 +0200
--- support-files/mariadb.pc.in.orig 2020-05-14 08:51:10.224141000 +0200
+++ support-files/mariadb.pc.in 2020-05-14 08:55:38.993434000 +0200
@@ -19,5 +19,5 @@
Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
URL: @CPACK_PACKAGE_URL@
Version: @VERSION@
-Libs: -L${libdir} @LIBS_FOR_CLIENTS@
-Cflags: -I${includedir} -I${includedir}/.. @CFLAGS_FOR_CLIENTS@
-Cflags: -I${includedir} @CFLAGS_FOR_CLIENTS@
+Libs: -pthread -L${libdir} @LIBS_FOR_CLIENTS@ -lstdc++
+Cflags: -pthread -I${includedir} -I${includedir}/.. @CFLAGS_FOR_CLIENTS@
+Cflags: -pthread -I${includedir} @CFLAGS_FOR_CLIENTS@

10
mariadb/mariadb.spec
Unescape View File

@ -23,7 +23,7 @@
# package version
%define V_major 10.4
%define V_minor 12
%define V_minor 13
%define V_mariadb %{V_major}.%{V_minor}
%define V_opkg %{V_major}.%{V_minor}
@ -38,7 +38,7 @@ Class: EVAL
Group: Database
License: GPL
Version: %{V_opkg}
Release: 20200129
Release: 20200514
# package options
%option with_server yes
@ -293,12 +293,6 @@ Provides: mysql = %{version}
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/mariadb/mysql-test
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/mariadb/support-files
# post-adjusts paths
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/lib
mv $RPM_BUILD_ROOT%{l_prefix}/share/mariadb/pkgconfig \
$RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig
# install global configuration
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/mariadb

Write Preview
Loading…
Cancel
Save