[Midnightbsd-cvs] mports [19640] trunk/databases: mysql 5.5.44

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Jul 31 20:32:03 EDT 2015 

Revision: 19640
          http://svnweb.midnightbsd.org/mports/?rev=19640
Author:   laffer1
Date:     2015-07-31 20:32:03 -0400 (Fri, 31 Jul 2015)
Log Message:
-----------
mysql 5.5.44

Modified Paths:
--------------
    trunk/databases/mysql55-client/Makefile
    trunk/databases/mysql55-client/files/patch-CMakeLists.txt
    trunk/databases/mysql55-client/files/patch-client_CMakeLists.txt
    trunk/databases/mysql55-client/pkg-plist
    trunk/databases/mysql55-server/Makefile
    trunk/databases/mysql55-server/distinfo
    trunk/databases/mysql55-server/files/patch-client_CMakeLists.txt
    trunk/databases/mysql55-server/pkg-plist

Added Paths:
-----------
    trunk/databases/mysql55-client/files/patch-sql_common_client_plugin.c
    trunk/databases/mysql55-server/files/patch-sql_common_client_plugin.c

Modified: trunk/databases/mysql55-client/Makefile
===================================================================
--- trunk/databases/mysql55-client/Makefile	2015-08-01 00:29:08 UTC (rev 19639)
+++ trunk/databases/mysql55-client/Makefile	2015-08-01 00:32:03 UTC (rev 19640)
@@ -8,16 +8,22 @@
 
 MASTERDIR=	${.CURDIR}/../mysql55-server
 
-PKGMESSAGE=	mustnotexist
+PKGMESSAGE=	${.CURDIR}/pkg-message
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql5.[0-46-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql5[0-46-9]-client-* \
+			mariadb*-client-* \
+			percona*-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1 -DENABLE_DTRACE:BOOL=OFF
 
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 
+MMAN1=		comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
+		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
+		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
+
 CLIENT_ONLY=	yes
 
 .include "${MASTERDIR}/Makefile"

Modified: trunk/databases/mysql55-client/files/patch-CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-client/files/patch-CMakeLists.txt	2015-08-01 00:29:08 UTC (rev 19639)
+++ trunk/databases/mysql55-client/files/patch-CMakeLists.txt	2015-08-01 00:32:03 UTC (rev 19640)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2013-05-16 17:47:15.000000000 +0200
-+++ CMakeLists.txt	2013-06-12 09:22:45.000000000 +0200
-@@ -305,31 +305,11 @@
+--- CMakeLists.txt.orig	2014-11-04 07:49:52.000000000 +0000
++++ CMakeLists.txt	2014-12-03 09:20:45.966491617 +0000
+@@ -387,32 +387,11 @@
  ENDIF()
  
  ADD_SUBDIRECTORY(extra)
@@ -28,6 +28,7 @@
 -    ADD_SUBDIRECTORY(internal)
 -  ENDIF()
 -  ADD_SUBDIRECTORY(packaging/rpm-oel)
+-  ADD_SUBDIRECTORY(packaging/rpm-sles)
 -ENDIF()
 +ADD_SUBDIRECTORY(client)
 +ADD_SUBDIRECTORY(libservices)
@@ -37,7 +38,7 @@
  
  INCLUDE(cmake/abi_check.cmake)
  INCLUDE(cmake/tags.cmake)
-@@ -365,8 +345,10 @@
+@@ -448,19 +427,21 @@
  ELSE()
    SET(CPACK_GENERATOR "TGZ")
  ENDIF() 
@@ -48,9 +49,8 @@
  
  # Create a single package with "make package"
  # (see http://public.kitware.com/Bug/view.php?id=11452)
-@@ -374,11 +356,11 @@
+ SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
  
- INCLUDE(CPack)
  IF(UNIX)
 -  INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
  ENDIF()
@@ -61,8 +61,11 @@
  IF(NOT INSTALL_LAYOUT MATCHES "RPM")
    INSTALL(FILES COPYING LICENSE.mysql 
    DESTINATION ${INSTALL_DOCREADMEDIR} 
-@@ -404,3 +386,4 @@
+@@ -486,6 +467,7 @@
      PATTERN "sp-imp-spec.txt" EXCLUDE
    )
  ENDIF()
 +ENDIF()
+ 
+ INCLUDE(CPack)
+ 

Modified: trunk/databases/mysql55-client/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-client/files/patch-client_CMakeLists.txt	2015-08-01 00:29:08 UTC (rev 19639)
+++ trunk/databases/mysql55-client/files/patch-client_CMakeLists.txt	2015-08-01 00:32:03 UTC (rev 19640)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2011-09-09 17:56:40.000000000 +0200
-+++ client/CMakeLists.txt	2011-10-07 11:08:18.000000000 +0200
-@@ -33,9 +33,11 @@
+--- client/CMakeLists.txt.orig	2014-11-04 07:49:50.000000000 +0000
++++ client/CMakeLists.txt	2014-12-03 09:22:09.860599069 +0000
+@@ -33,6 +33,7 @@
    TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY})
  ENDIF(UNIX)
  
@@ -7,12 +7,16 @@
 +IF(FALSE)
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ # mysqltest has unused result errors, so we skip Werror
+@@ -42,6 +43,7 @@
+   ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
+ ENDIF()
  TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 +ENDIF()
  
  
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
-@@ -47,15 +49,19 @@
+@@ -53,15 +55,19 @@
  MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
  
@@ -32,7 +36,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
-@@ -72,7 +78,7 @@
+@@ -78,7 +84,7 @@
    MYSQL_ADD_EXECUTABLE(echo echo.c)
  ENDIF(WIN32)
  

Added: trunk/databases/mysql55-client/files/patch-sql_common_client_plugin.c
===================================================================
--- trunk/databases/mysql55-client/files/patch-sql_common_client_plugin.c	                        (rev 0)
+++ trunk/databases/mysql55-client/files/patch-sql_common_client_plugin.c	2015-08-01 00:32:03 UTC (rev 19640)
@@ -0,0 +1,47 @@
+--- sql-common/client_plugin.c.orig	2014-09-22 09:23:23 UTC
++++ sql-common/client_plugin.c
+@@ -233,11 +233,13 @@
+ {
+   MYSQL mysql;
+   struct st_mysql_client_plugin **builtin;
++  va_list unused;
+ 
+   if (initialized)
+     return 0;
+ 
+   bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
++  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
+ 
+   pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
+   init_alloc_root(&mem_root, 128, 128);
+@@ -249,7 +251,7 @@
+   pthread_mutex_lock(&LOCK_load_client_plugin);
+ 
+   for (builtin= mysql_client_builtins; *builtin; builtin++)
+-    add_plugin(&mysql, *builtin, 0, 0, 0);
++    add_plugin(&mysql, *builtin, 0, 0, unused);
+ 
+   pthread_mutex_unlock(&LOCK_load_client_plugin);
+ 
+@@ -293,9 +295,12 @@
+ mysql_client_register_plugin(MYSQL *mysql,
+                              struct st_mysql_client_plugin *plugin)
+ {
++  va_list unused;
+   if (is_not_initialized(mysql, plugin->name))
+     return NULL;
+ 
++  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
++
+   pthread_mutex_lock(&LOCK_load_client_plugin);
+ 
+   /* make sure the plugin wasn't loaded meanwhile */
+@@ -307,7 +312,7 @@
+     plugin= NULL;
+   }
+   else
+-    plugin= add_plugin(mysql, plugin, 0, 0, 0);
++    plugin= add_plugin(mysql, plugin, 0, 0, unused);
+ 
+   pthread_mutex_unlock(&LOCK_load_client_plugin);
+   return plugin;


Property changes on: trunk/databases/mysql55-client/files/patch-sql_common_client_plugin.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/mysql55-client/pkg-plist
===================================================================
--- trunk/databases/mysql55-client/pkg-plist	2015-08-01 00:29:08 UTC (rev 19639)
+++ trunk/databases/mysql55-client/pkg-plist	2015-08-01 00:32:03 UTC (rev 19640)
@@ -83,7 +83,3 @@
 man/man1/mysqlshow.1.gz
 man/man1/mysqlslap.1.gz
 share/aclocal/mysql.m4
- at dirrm include/mysql/mysql/psi
- at dirrm include/mysql/mysql
- at dirrm include/mysql
- at dirrmtry lib/mysql

Modified: trunk/databases/mysql55-server/Makefile
===================================================================
--- trunk/databases/mysql55-server/Makefile	2015-08-01 00:29:08 UTC (rev 19639)
+++ trunk/databases/mysql55-server/Makefile	2015-08-01 00:32:03 UTC (rev 19640)
@@ -1,11 +1,10 @@
 # $MidnightBSD$
 
 PORTNAME?=	mysql
-PORTVERSION=	5.5.40
+PORTVERSION=	5.5.44
 PORTREVISION?=	0
 CATEGORIES=	databases ipv6
-MASTER_SITES=	${MASTER_SITE_MYSQL}
-MASTER_SITE_SUBDIR=	MySQL-5.5
+MASTER_SITES=	MYSQL/MySQL-5.5
 PKGNAMESUFFIX?=	55-server
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -15,6 +14,7 @@
 
 SLAVEDIRS=	databases/mysql55-client
 USES=		cmake readline shebangfix
+CXXFLAGS+=	${CPPFLAGS}
 NO_OPTIONS_SORT=yes
 
 OPTIONS_DEFINE=	SSL FASTMTX
@@ -68,7 +68,9 @@
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	55
 
-CONFLICTS_INSTALL=	mysql5.[0-46-9]-server-* mysql[0-46-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-*
+CONFLICTS_INSTALL=	mysql5[0-46-9]-server-* \
+			mariadb*-server-* \
+			percona*-server-*
 
 USE_RC_SUBR=	mysql-server
 
@@ -75,7 +77,7 @@
 USERS=		mysql
 GROUPS=		mysql
 
-MAN1=		my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \
+MMAN1=		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_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \
 		mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \
@@ -83,9 +85,9 @@
 		mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1
 
 CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON"
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
-.endif
+	@${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt
 
 .include <bsd.port.mk>

Modified: trunk/databases/mysql55-server/distinfo
===================================================================
--- trunk/databases/mysql55-server/distinfo	2015-08-01 00:29:08 UTC (rev 19639)
+++ trunk/databases/mysql55-server/distinfo	2015-08-01 00:32:03 UTC (rev 19640)
@@ -1,2 +1,2 @@
-SHA256 (mysql-5.5.40.tar.gz) = 4d3721761a31c28866e8ee0fde47558a3e9047aaef3b89135ae8d45eebb74960
-SIZE (mysql-5.5.40.tar.gz) = 21727672
+SHA256 (mysql-5.5.44.tar.gz) = 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de
+SIZE (mysql-5.5.44.tar.gz) = 21789766

Modified: trunk/databases/mysql55-server/files/patch-client_CMakeLists.txt
===================================================================
--- trunk/databases/mysql55-server/files/patch-client_CMakeLists.txt	2015-08-01 00:29:08 UTC (rev 19639)
+++ trunk/databases/mysql55-server/files/patch-client_CMakeLists.txt	2015-08-01 00:32:03 UTC (rev 19640)
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2011-09-09 17:56:40.000000000 +0200
-+++ client/CMakeLists.txt	2011-10-07 11:06:21.000000000 +0200
-@@ -27,17 +27,20 @@
+--- client/CMakeLists.txt.orig	2014-11-04 07:49:50.000000000 +0000
++++ client/CMakeLists.txt	2014-12-03 09:23:56.610710083 +0000
+@@ -27,11 +27,13 @@
  
  ADD_DEFINITIONS(${READLINE_DEFINES})
  ADD_DEFINITIONS(${SSL_DEFINES})
@@ -14,6 +14,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+@@ -44,6 +46,7 @@
  TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
  
  
@@ -21,7 +22,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
  
-@@ -46,17 +49,21 @@
+@@ -52,17 +55,21 @@
  
  MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@@ -43,7 +44,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
  
-@@ -66,13 +73,14 @@
+@@ -72,13 +79,14 @@
  MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)

Added: trunk/databases/mysql55-server/files/patch-sql_common_client_plugin.c
===================================================================
--- trunk/databases/mysql55-server/files/patch-sql_common_client_plugin.c	                        (rev 0)
+++ trunk/databases/mysql55-server/files/patch-sql_common_client_plugin.c	2015-08-01 00:32:03 UTC (rev 19640)
@@ -0,0 +1,47 @@
+--- sql-common/client_plugin.c.orig	2014-09-22 09:23:23 UTC
++++ sql-common/client_plugin.c
+@@ -233,11 +233,13 @@
+ {
+   MYSQL mysql;
+   struct st_mysql_client_plugin **builtin;
++  va_list unused;
+ 
+   if (initialized)
+     return 0;
+ 
+   bzero(&mysql, sizeof(mysql)); /* dummy mysql for set_mysql_extended_error */
++  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
+ 
+   pthread_mutex_init(&LOCK_load_client_plugin, MY_MUTEX_INIT_SLOW);
+   init_alloc_root(&mem_root, 128, 128);
+@@ -249,7 +251,7 @@
+   pthread_mutex_lock(&LOCK_load_client_plugin);
+ 
+   for (builtin= mysql_client_builtins; *builtin; builtin++)
+-    add_plugin(&mysql, *builtin, 0, 0, 0);
++    add_plugin(&mysql, *builtin, 0, 0, unused);
+ 
+   pthread_mutex_unlock(&LOCK_load_client_plugin);
+ 
+@@ -293,9 +295,12 @@
+ mysql_client_register_plugin(MYSQL *mysql,
+                              struct st_mysql_client_plugin *plugin)
+ {
++  va_list unused;
+   if (is_not_initialized(mysql, plugin->name))
+     return NULL;
+ 
++  bzero(&unused, sizeof(unused)); /* suppress uninitialized-value warnings */
++
+   pthread_mutex_lock(&LOCK_load_client_plugin);
+ 
+   /* make sure the plugin wasn't loaded meanwhile */
+@@ -307,7 +312,7 @@
+     plugin= NULL;
+   }
+   else
+-    plugin= add_plugin(mysql, plugin, 0, 0, 0);
++    plugin= add_plugin(mysql, plugin, 0, 0, unused);
+ 
+   pthread_mutex_unlock(&LOCK_load_client_plugin);
+   return plugin;


Property changes on: trunk/databases/mysql55-server/files/patch-sql_common_client_plugin.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/databases/mysql55-server/pkg-plist
===================================================================
--- trunk/databases/mysql55-server/pkg-plist	2015-08-01 00:29:08 UTC (rev 19639)
+++ trunk/databases/mysql55-server/pkg-plist	2015-08-01 00:32:03 UTC (rev 19640)
@@ -1,4 +1,3 @@
- at stopdaemon mysql-server
 bin/innochecksum
 bin/my_print_defaults
 bin/myisam_ftdump
@@ -136,30 +135,3 @@
 %%DATADIR%%/spanish/errmsg.sys
 %%DATADIR%%/swedish/errmsg.sys
 %%DATADIR%%/ukrainian/errmsg.sys
- at dirrm lib/mysql/plugin
- at dirrmtry lib/mysql
- at dirrm %%DATADIR%%/charsets
- at dirrm %%DATADIR%%/czech
- at dirrm %%DATADIR%%/danish
- at dirrm %%DATADIR%%/dutch
- at dirrm %%DATADIR%%/english
- at dirrm %%DATADIR%%/estonian
- at dirrm %%DATADIR%%/french
- at dirrm %%DATADIR%%/german
- at dirrm %%DATADIR%%/greek
- at dirrm %%DATADIR%%/hungarian
- at dirrm %%DATADIR%%/italian
- at dirrm %%DATADIR%%/japanese
- at dirrm %%DATADIR%%/korean
- at dirrm %%DATADIR%%/norwegian
- at dirrm %%DATADIR%%/norwegian-ny
- at dirrm %%DATADIR%%/polish
- at dirrm %%DATADIR%%/portuguese
- at dirrm %%DATADIR%%/romanian
- at dirrm %%DATADIR%%/russian
- at dirrm %%DATADIR%%/serbian
- at dirrm %%DATADIR%%/slovak
- at dirrm %%DATADIR%%/spanish
- at dirrm %%DATADIR%%/swedish
- at dirrm %%DATADIR%%/ukrainian
- at dirrm %%DATADIR%%

More information about the Midnightbsd-cvs mailing list