svn commit: r441551 - in head/databases: mariadb100-client/files mariadb100-server mariadb100-server/files

[Bernard Spil]

Author: brnrd
Date: Tue May 23 20:10:27 2017
New Revision: 441551
URL: https://svnweb.freebsd.org/changeset/ports/441551

Log:
  databases/mariadb100-server: Update to 10.0.31
  
   - Security and bug-fix update
   - Remove build fix (included upstream)
   - Fix-up CMakeLists patches
  
  Security:	d9e01c35-2531-11e7-b291-b499baebfeaf

Deleted:
  head/databases/mariadb100-client/files/patch-build-fail-MDEV-12261
Modified:
  head/databases/mariadb100-client/files/patch-CMakeLists.txt
  head/databases/mariadb100-server/Makefile
  head/databases/mariadb100-server/distinfo
  head/databases/mariadb100-server/files/patch-CMakeLists.txt

Modified: head/databases/mariadb100-client/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mariadb100-client/files/patch-CMakeLists.txt	Tue May 23 19:36:56 2017	(r441550)
+++ head/databases/mariadb100-client/files/patch-CMakeLists.txt	Tue May 23 20:10:27 2017	(r441551)
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2017-01-12 01:45:16 UTC
-+++ CMakeLists.txt
+--- CMakeLists.txt.orig	2017-05-20 01:04:09.000000000 +0200
++++ CMakeLists.txt	2017-05-23 20:47:01.403482000 +0200
 @@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client)
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
@@ -24,10 +24,10 @@
  )
  
 +IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
-                       COMPONENT Readme)
+ INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
  
-@@ -490,6 +492,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
+ # MDEV-6526 these files are not installed anymore
+@@ -489,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
  IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
  ENDIF()

Modified: head/databases/mariadb100-server/Makefile
==============================================================================
--- head/databases/mariadb100-server/Makefile	Tue May 23 19:36:56 2017	(r441550)
+++ head/databases/mariadb100-server/Makefile	Tue May 23 20:10:27 2017	(r441551)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.30
-PORTREVISION?=	2
+PORTVERSION=	10.0.31
+PORTREVISION?=	0
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \

Modified: head/databases/mariadb100-server/distinfo
==============================================================================
--- head/databases/mariadb100-server/distinfo	Tue May 23 19:36:56 2017	(r441550)
+++ head/databases/mariadb100-server/distinfo	Tue May 23 20:10:27 2017	(r441551)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1489029439
-SHA256 (mariadb-10.0.30.tar.gz) = 9a2cb7f06ecce1bb64dddc70c484e36507b50b756c110c1d37fa145a13a796bb
-SIZE (mariadb-10.0.30.tar.gz) = 63433598
+TIMESTAMP = 1495565124
+SHA256 (mariadb-10.0.31.tar.gz) = 371f2dae0b9e1a92939fba1efca77ac83ba15b6b6dcfd389ca5cbf79eb8b842a
+SIZE (mariadb-10.0.31.tar.gz) = 63461177

Modified: head/databases/mariadb100-server/files/patch-CMakeLists.txt
==============================================================================
--- head/databases/mariadb100-server/files/patch-CMakeLists.txt	Tue May 23 19:36:56 2017	(r441550)
+++ head/databases/mariadb100-server/files/patch-CMakeLists.txt	Tue May 23 20:10:27 2017	(r441551)
@@ -1,14 +1,14 @@
---- CMakeLists.txt.orig	2015-08-05 18:11:27 UTC
-+++ CMakeLists.txt
+--- CMakeLists.txt.orig	2017-05-20 01:04:09.000000000 +0200
++++ CMakeLists.txt	2017-05-23 20:53:22.017238000 +0200
 @@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(FALSE)
- INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
-                       COMPONENT Readme)
+ INSTALL_DOCUMENTATION(README CREDITS COPYING EXCEPTIONS-CLIENT COMPONENT Readme)
  
-@@ -490,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
+ # MDEV-6526 these files are not installed anymore
+@@ -489,6 +490,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
  IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
  ENDIF()