Attachment 143737 Details for Bug 190995 – mariadb55-{client,server}-5.5.38 patch

[patch] mariadb55-{client,server}-5.5.38 patch

mariadb55-5.5.38.patch (text/plain), 9.77 KB, created by iron.udjin on 2014-06-13 12:43:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: iron.udjin

Created: 2014-06-13 12:43:52 UTC

Size: 9.77 KB

patch

obsolete

>diff -Naur mariadb55-client.orig/Makefile mariadb55-client/Makefile
>--- mariadb55-client.orig/Makefile	2014-05-21 13:37:51.000000000 +0300
>+++ mariadb55-client/Makefile	2014-06-13 14:41:32.842227074 +0300
>@@ -1,7 +1,6 @@
> # $FreeBSD: head/databases/mariadb55-client/Makefile 354740 2014-05-21 10:37:51Z grembo $
> 
> PORTNAME=	mariadb
>-PORTREVISION=	1
> PKGNAMESUFFIX=	55-client
> 
> COMMENT=	Multithreaded SQL database (client)
>diff -Naur mariadb55-client.orig/files/patch-CMakeLists.txt mariadb55-client/files/patch-CMakeLists.txt
>--- mariadb55-client.orig/files/patch-CMakeLists.txt	2014-06-02 15:28:58.000000000 +0300
>+++ mariadb55-client/files/patch-CMakeLists.txt	2014-06-13 14:41:32.295232187 +0300
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2014-04-15 14:02:39.000000000 +0300
>-+++ CMakeLists.txt	2014-05-16 18:56:55.000000000 +0300
>-@@ -395,29 +395,8 @@
>+--- CMakeLists.txt.orig	2014-06-13 13:33:17.696408174 +0300
>++++ CMakeLists.txt	2014-06-13 13:35:14.888349067 +0300
>+@@ -403,29 +403,8 @@
>  ADD_SUBDIRECTORY(extra)
>  ADD_SUBDIRECTORY(libservices)
>  ADD_SUBDIRECTORY(scripts)
>@@ -30,7 +30,7 @@
>  IF(UNIX)
>    ADD_SUBDIRECTORY(man)
>  ENDIF()
>-@@ -429,7 +408,6 @@
>+@@ -437,7 +416,6 @@
>    ADD_SUBDIRECTORY(win/upgrade_wizard)
>    ADD_SUBDIRECTORY(win/packaging)
>  ENDIF()
>@@ -38,15 +38,15 @@
>  
>  CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
>  CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
>-@@ -462,6 +440,7 @@
>+@@ -470,6 +448,7 @@
>    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
>  )
>  
> +IF(FALSE)
>- INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
>+ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT
>                        COMPONENT Readme)
>  INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
>-@@ -469,6 +448,7 @@
>+@@ -477,6 +456,7 @@
>  IF(UNIX)
>    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
>  ENDIF()
>diff -Naur mariadb55-client.orig/files/patch-support-files_CMakeLists.txt mariadb55-client/files/patch-support-files_CMakeLists.txt
>--- mariadb55-client.orig/files/patch-support-files_CMakeLists.txt	2013-01-05 13:30:51.000000000 +0200
>+++ mariadb55-client/files/patch-support-files_CMakeLists.txt	2014-06-13 14:41:31.702272417 +0300
>@@ -1,6 +1,6 @@
>---- support-files/CMakeLists.txt.orig	2011-01-19 23:37:09.000000000 +0100
>-+++ support-files/CMakeLists.txt	2011-02-07 22:52:05.238344276 +0100
>-@@ -40,15 +40,18 @@
>+--- support-files/CMakeLists.txt.orig	2014-06-13 13:36:52.080474738 +0300
>++++ support-files/CMakeLists.txt	2014-06-13 13:50:59.537282325 +0300
>+@@ -41,15 +41,18 @@
>    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
>  ENDIF()
>  
>@@ -15,23 +15,34 @@
>  
>  IF(UNIX)
>    SET(prefix ${CMAKE_INSTALL_PREFIX})
>-+IF(FALSE)
>-   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
>-     config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
>++  IF(FALSE)
>+   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
>      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
>-@@ -66,8 +69,10 @@
>-   IF(INSTALL_SUPPORTFILESDIR)
>+                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
>+@@ -67,8 +70,10 @@
>      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
>+     INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
>    ENDIF()
>-+ENDIF()
>++  ENDIF()
>  
>    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
>-+IF(FALSE)
>++  IF(FALSE)
>    CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
>    CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
>-   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
>-@@ -85,3 +90,4 @@
>+   
>+@@ -92,6 +97,7 @@
>+     DESTINATION ${inst_location} COMPONENT SupportFiles
>      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
>      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
>- ENDIF()
>-+ENDIF()
>++  
>+ 
>+   IF (INSTALL_SYSCONFDIR)
>+     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
>+@@ -101,6 +107,7 @@
>+             RENAME mysql COMPONENT SupportFiles
>+             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
>+             GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
>++ ENDIF()
>+ 
>+     INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
>+             COMPONENT Common)
>diff -Naur mariadb55-server.orig/Makefile mariadb55-server/Makefile
>--- mariadb55-server.orig/Makefile	2014-06-10 18:22:12.000000000 +0300
>+++ mariadb55-server/Makefile	2014-06-13 14:41:29.296223806 +0300
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/databases/mariadb55-server/Makefile 357334 2014-06-10 15:22:12Z bdrewery $
> 
> PORTNAME?=	mariadb
>-PORTVERSION=	5.5.37
>+PORTVERSION=	5.5.38
> PORTREVISION?=	0
> CATEGORIES=	databases ipv6
> MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/source/ \
>diff -Naur mariadb55-server.orig/distinfo mariadb55-server/distinfo
>--- mariadb55-server.orig/distinfo	2014-06-02 15:28:58.000000000 +0300
>+++ mariadb55-server/distinfo	2014-06-13 14:41:29.209240021 +0300
>@@ -1,2 +1,2 @@
>-SHA256 (mariadb-5.5.37.tar.gz) = a0faf492b3595d938684ed701812a4bd5aaab395b8402efe3322338a80fb3c9c
>-SIZE (mariadb-5.5.37.tar.gz) = 46078042
>+SHA256 (mariadb-5.5.38.tar.gz) = efc839e6627064b3b5c6c39854198f0d34907f48937804758d4c09c7717be8d3
>+SIZE (mariadb-5.5.38.tar.gz) = 45083505
>diff -Naur mariadb55-server.orig/files/patch-CMakeLists.txt mariadb55-server/files/patch-CMakeLists.txt
>--- mariadb55-server.orig/files/patch-CMakeLists.txt	2013-10-01 01:32:28.000000000 +0300
>+++ mariadb55-server/files/patch-CMakeLists.txt	2014-06-13 14:41:29.507225943 +0300
>@@ -1,6 +1,6 @@
>---- CMakeLists.txt.orig	2013-09-20 01:34:26.000000000 +0300
>-+++ CMakeLists.txt	2013-09-27 01:39:19.000000000 +0300
>-@@ -310,17 +310,12 @@
>+--- CMakeLists.txt.orig	2014-06-13 13:53:43.304277057 +0300
>++++ CMakeLists.txt	2014-06-13 13:57:07.790256621 +0300
>+@@ -407,18 +407,12 @@
>  ADD_SUBDIRECTORY(support-files)
>  
>  IF(NOT WITHOUT_SERVER)
>@@ -15,10 +15,11 @@
> -  ADD_SUBDIRECTORY(mysql-test)
> -  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
> -  ADD_SUBDIRECTORY(sql-bench)
>- 
>+-
>    IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
>      ADD_SUBDIRECTORY(internal)
>-@@ -339,7 +334,6 @@
>+   ENDIF()
>+@@ -437,7 +431,6 @@
>    ADD_SUBDIRECTORY(win/upgrade_wizard)
>    ADD_SUBDIRECTORY(win/packaging)
>  ENDIF()
>@@ -26,15 +27,15 @@
>  
>  CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
>  CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
>-@@ -366,6 +360,7 @@
>+@@ -470,6 +463,7 @@
>    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
>  )
>  
> +IF(FALSE)
>- INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
>+ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT
>                        COMPONENT Readme)
>  INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
>-@@ -373,6 +368,7 @@
>+@@ -477,6 +471,7 @@
>  IF(UNIX)
>    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
>  ENDIF()
>diff -Naur mariadb55-server.orig/files/patch-man_CMakeLists.txt mariadb55-server/files/patch-man_CMakeLists.txt
>--- mariadb55-server.orig/files/patch-man_CMakeLists.txt	2013-01-05 13:30:51.000000000 +0200
>+++ mariadb55-server/files/patch-man_CMakeLists.txt	2014-06-13 14:41:30.520254565 +0300
>@@ -1,22 +1,6 @@
>---- man/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
>-+++ man/CMakeLists.txt	2012-12-23 05:38:24.000000000 +0200
>-@@ -16,13 +16,13 @@
>- SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1
>- 		myisamlog.1 myisampack.1 mysql.server.1
>- 		mysql_convert_table_format.1 mysql_fix_extensions.1
>--		mysql_fix_privilege_tables.1 mysql_install_db.1
>-+		mysql_install_db.1
>- 		mysql_secure_installation.1 mysql_setpermission.1
>- 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1
>- 		mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1
>- 		mysqlman.1 mysqltest.1 perror.1 replace.1 resolve_stack_dump.1
>- 		resolveip.1 mysqlbug.1)
>--SET(MAN8_SERVER mysqld.8 mysqlmanager.8)
>-+SET(MAN8_SERVER mysqld.8)
>- SET(MAN1_CLIENT msql2mysql.1 mysql.1 mysql_find_rows.1 mysql_waitpid.1
>- 		mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1
>- 		mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1)
>-@@ -32,7 +32,9 @@
>+--- man/CMakeLists.txt.orig	2014-06-13 13:58:21.397251542 +0300
>++++ man/CMakeLists.txt	2014-06-13 14:00:24.132245109 +0300
>+@@ -33,7 +33,8 @@
>  
>  INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
>  INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
>@@ -24,5 +8,5 @@
>  INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
>  INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
>  INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
>+-
> +ENDIF()
>- 
>diff -Naur mariadb55-server.orig/pkg-plist mariadb55-server/pkg-plist
>--- mariadb55-server.orig/pkg-plist	2014-06-02 15:28:58.000000000 +0300
>+++ mariadb55-server/pkg-plist	2014-06-13 14:41:29.125242928 +0300
>@@ -82,7 +82,6 @@
> man/man1/mysqld_safe.1.gz
> man/man1/mysqldumpslow.1.gz
> man/man1/mysqlhotcopy.1.gz
>-man/man1/mysqlman.1.gz
> man/man1/mysqltest.1.gz
> man/man1/perror.1.gz
> man/man1/replace.1.gz
>@@ -116,9 +115,6 @@
> %%DATADIR%%/charsets/macce.xml
> %%DATADIR%%/charsets/macroman.xml
> %%DATADIR%%/charsets/swe7.xml
>-%%DATADIR%%/config.huge.ini
>-%%DATADIR%%/config.medium.ini
>-%%DATADIR%%/config.small.ini
> %%DATADIR%%/czech/errmsg.sys
> %%DATADIR%%/danish/errmsg.sys
> %%DATADIR%%/dutch/errmsg.sys
>@@ -146,7 +142,6 @@
> %%DATADIR%%/mysql_system_tables_data.sql
> %%DATADIR%%/mysql_test_data_timezone.sql
> %%DATADIR%%/mysqld_multi.server
>-%%DATADIR%%/ndb-config-2-node.ini
> %%DATADIR%%/norwegian-ny/errmsg.sys
> %%DATADIR%%/norwegian/errmsg.sys
> %%DATADIR%%/polish/errmsg.sys

Actions: View | Diff

Attachments on bug 190995: 143737