databases/xtrabackup: Update to 2.4.9

Port changes:
* Change to DISTVERSION
* Add the specific boost version to fix build
* Add curl to LIB_DEPENDS
* Move bison from BUILD_DEPENDS to USES=bison
* Add/delete patches

PR:		216870
Submitted by:	samm@os2.kiev.ua
Approved by:	Aleksandr Kuzminsky <aleks@twindb.com> (maintainer)

9 files changed, 105 insertions, 27 deletions

diff --git a/databases/xtrabackup/Makefile b/databases/xtrabackup/Makefile
index 599b2be2af07..675b0bf0ab3d 100644
--- a/databases/xtrabackup/Makefile
+++ b/databases/xtrabackup/Makefile
@@ -2,10 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	xtrabackup
-PORTVERSION=	2.3.6
+DISTVERSION=	2.4.9
 CATEGORIES=	databases
-MASTER_SITES=	https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/
-DISTNAME=	percona-${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	https://www.percona.com/downloads/XtraBackup/Percona-XtraBackup-${PORTVERSION}/source/tarball/:xtrabackup \
+		SF/boost/boost/1.59.0/:boost
+DISTFILES=	percona-${PORTNAME}-${PORTVERSION}.tar.gz:xtrabackup \
+		boost_1_59_0.tar.bz2:boost
 
 MAINTAINER=	aleks@twindb.com
 COMMENT=	OpenSource version of InnoDB backup with support of Percona extensions
@@ -16,9 +18,9 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 # quilt is required by build.sh
 BUILD_DEPENDS=	bash:shells/bash \
 		cmake:devel/cmake \
-		bison:devel/bison \
 		xxd:editors/vim-console
-LIB_DEPENDS=	libev.so:devel/libev \
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libev.so:devel/libev \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error
 RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-mysql \
@@ -30,9 +32,12 @@ BROKEN_mips64=		fails to compile: 'fpsetmask' was not declared in this scope
 BROKEN_powerpc64=	fails to link: ld: final link failed: Bad value
 
 # autotool is in use for 5.1 builds
-USES=		alias autoreconf:build cpe gettext cmake:noninja libtool perl5 shebangfix
+USES=		alias autoreconf:build bison cpe gettext cmake:noninja libtool perl5 shebangfix
 CPE_VENDOR=	percona
 SHEBANG_FILES=	storage/innobase/xtrabackup/xbcloud_osenv.sh
+CMAKE_ARGS=	-DWITH_BOOST=${WRKDIR}/boost_1_59_0
+
+WRKSRC=		${WRKDIR}/percona-${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt \
 		bin/xbcloud bin/xbcloud_osenv
diff --git a/databases/xtrabackup/distinfo b/databases/xtrabackup/distinfo
index 88acddc96ab7..87e415e2a04e 100644
--- a/databases/xtrabackup/distinfo
+++ b/databases/xtrabackup/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1482861814
-SHA256 (percona-xtrabackup-2.3.6.tar.gz) = 9d2dfa4ad61dd9ef8a3c292f0c15d7504c4c0de7e141a69fc5afde9d4666aec7
-SIZE (percona-xtrabackup-2.3.6.tar.gz) = 34916730
+TIMESTAMP = 1521236900
+SHA256 (percona-xtrabackup-2.4.9.tar.gz) = 23c1e42ad4161b38edef126cf600e28779788a4d1736cadbb8e8f3dc219135a7
+SIZE (percona-xtrabackup-2.4.9.tar.gz) = 58001052
+SHA256 (boost_1_59_0.tar.bz2) = 727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca
+SIZE (boost_1_59_0.tar.bz2) = 70389425
diff --git a/databases/xtrabackup/files/patch-cmake-install_layout.cmake b/databases/xtrabackup/files/patch-cmake-install_layout.cmake
index d2d9776cea76..19d6bd955454 100644
--- a/databases/xtrabackup/files/patch-cmake-install_layout.cmake
+++ b/databases/xtrabackup/files/patch-cmake-install_layout.cmake
@@ -1,11 +1,11 @@
---- cmake/install_layout.cmake.orig	2014-11-19 12:37:46.000000000 +0100
-+++ cmake/install_layout.cmake	2014-11-19 12:38:08.000000000 +0100
-@@ -114,7 +114,7 @@
+--- cmake/install_layout.cmake	2017-02-06 18:02:22.189764000 +0000
++++ cmake/install_layout.cmake	2017-02-06 18:02:29.642407000 +0000
+@@ -162,7 +162,7 @@
  #
  SET(INSTALL_SHAREDIR_STANDALONE         "share")
  SET(INSTALL_MYSQLSHAREDIR_STANDALONE    "share")
 -SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
 +# SET(INSTALL_MYSQLTESTDIR_STANDALONE     "xtrabackup-test")
- SET(INSTALL_SQLBENCHDIR_STANDALONE      ".")
  SET(INSTALL_SUPPORTFILESDIR_STANDALONE  "support-files")
  #
+ SET(INSTALL_MYSQLDATADIR_STANDALONE     "data")
diff --git a/databases/xtrabackup/files/patch-libarchive-CMakeLists.txt b/databases/xtrabackup/files/patch-libarchive-CMakeLists.txt
deleted file mode 100644
index 8259ac699553..000000000000
--- a/databases/xtrabackup/files/patch-libarchive-CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
---- storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt	2015-10-16 20:40:52.000000000 +0200
-+++ storage/innobase/xtrabackup/src/libarchive/CMakeLists.txt.new	2015-11-03 14:46:57.952677630 +0100
-@@ -822,9 +822,9 @@
- # Especially for early development, we want to be a little
- # aggressive about diagnosing build problems; this can get
- # relaxed somewhat in final shipping versions.
--IF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-+IF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
-   ADD_DEFINITIONS(-Wall -Werror)
--ENDIF ("CMAKE_C_COMPILER_ID" MATCHES "^GNU$")
-+ENDIF (CMAKE_C_COMPILER_ID MATCHES "^GNU$")
- 
- IF(ENABLE_TEST)
- ADD_CUSTOM_TARGET(run_all_tests)
diff --git a/databases/xtrabackup/files/patch-sql-json_dom.h b/databases/xtrabackup/files/patch-sql-json_dom.h
new file mode 100644
index 000000000000..b4c4e346f1b7
--- /dev/null
+++ b/databases/xtrabackup/files/patch-sql-json_dom.h
@@ -0,0 +1,11 @@
+--- sql/json_dom.h.orig	2018-03-17 00:21:21.146040000 +0300
++++ sql/json_dom.h	2018-03-17 00:21:26.264131000 +0300
+@@ -368,7 +368,7 @@
+   Json_object class.
+ */
+ typedef std::map<std::string, Json_dom *, Json_key_comparator,
+-  Malloc_allocator<std::pair<std::string, Json_dom *> > > Json_object_map;
++  Malloc_allocator<std::pair<const std::string, Json_dom *> > > Json_object_map;
+ 
+ /**
+   Represents a JSON container value of type "object" (ECMA), type
diff --git a/databases/xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc b/databases/xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc
new file mode 100644
index 000000000000..759ec543327d
--- /dev/null
+++ b/databases/xtrabackup/files/patch-storage-innobase-buf-buf0buf.cc
@@ -0,0 +1,11 @@
+--- storage/innobase/buf/buf0buf.cc.orig	2018-03-17 00:16:39.121076000 +0300
++++ storage/innobase/buf/buf0buf.cc	2018-03-17 00:17:08.295213000 +0300
+@@ -340,7 +340,7 @@
+ 	const byte*,
+ 	buf_chunk_t*,
+ 	std::less<const byte*>,
+-	ut_allocator<std::pair<const byte*, buf_chunk_t*> > >
++	ut_allocator<std::pair<const byte* const, buf_chunk_t*> > >
+ 	buf_pool_chunk_map_t;
+ 
+ static buf_pool_chunk_map_t*			buf_chunk_map_reg;
diff --git a/databases/xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc b/databases/xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc
new file mode 100644
index 000000000000..a5833cc90d5c
--- /dev/null
+++ b/databases/xtrabackup/files/patch-storage-innobase-dict-dict0stats.cc
@@ -0,0 +1,11 @@
+--- storage/innobase/dict/dict0stats.cc.orig	2018-03-17 00:37:34.099255000 +0300
++++ storage/innobase/dict/dict0stats.cc	2018-03-17 00:37:59.009449000 +0300
+@@ -139,7 +139,7 @@
+ typedef std::vector<ib_uint64_t, ut_allocator<ib_uint64_t> >	boundaries_t;
+ 
+ /** Allocator type used for index_map_t. */
+-typedef ut_allocator<std::pair<const char*, dict_index_t*> >
++typedef ut_allocator<std::pair<const char* const, dict_index_t*> >
+ 	index_map_t_allocator;
+ 
+ /** Auxiliary map used for sorting indexes by name in dict_stats_save(). */
diff --git a/databases/xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc b/databases/xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc
new file mode 100644
index 000000000000..773b4abed607
--- /dev/null
+++ b/databases/xtrabackup/files/patch-storage-innobase-sync-sync0debug.cc
@@ -0,0 +1,29 @@
+--- storage/innobase/sync/sync0debug.cc.orig	2018-03-17 00:25:16.778406000 +0300
++++ storage/innobase/sync/sync0debug.cc	2018-03-17 00:27:34.072173000 +0300
+@@ -129,7 +129,7 @@
+ 		os_thread_id_t,
+ 		Latches*,
+ 		os_thread_id_less,
+-		ut_allocator<std::pair<const std::string, latch_meta_t> > >
++		ut_allocator<std::pair<const os_thread_id_t, Latches*> > >
+ 		ThreadMap;
+ 
+ 	/** Constructor */
+@@ -424,7 +424,7 @@
+ 		latch_level_t,
+ 		std::string,
+ 		latch_level_less,
+-		ut_allocator<std::pair<latch_level_t, std::string> > >
++		ut_allocator<std::pair<const latch_level_t, std::string> > >
+ 		Levels;
+ 
+ 	/** Mutex protecting the deadlock detector data structures. */
+@@ -1718,7 +1718,7 @@
+ 		const void*,
+ 		File,
+ 		std::less<const void*>,
+-		ut_allocator<std::pair<const void*, File> > >
++		ut_allocator<std::pair<const void* const, File> > >
+ 		Files;
+ 
+ 	typedef OSMutex	Mutex;
diff --git a/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c b/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c
new file mode 100644
index 000000000000..4b31a89c0ddf
--- /dev/null
+++ b/databases/xtrabackup/files/patch-storage-myisam-mi_dynrec.c
@@ -0,0 +1,23 @@
+--- storage/myisam/mi_dynrec.c.orig	2018-03-16 23:50:04.334166000 +0300
++++ storage/myisam/mi_dynrec.c	2018-03-16 23:50:29.996533000 +0300
+@@ -65,18 +65,13 @@
+     DBUG_RETURN(1);
+   }
+   /*
+-    I wonder if it is good to use MAP_NORESERVE. From the Linux man page:
+-    MAP_NORESERVE
+-      Do not reserve swap space for this mapping. When swap space is
+-      reserved, one has the guarantee that it is possible to modify the
+-      mapping. When swap space is not reserved one might get SIGSEGV
+-      upon a write if no physical memory is available.
++      MAP_NORESERVE is unimplemented in FreeBSD
+   */
+   info->s->file_map= (uchar*)
+                   my_mmap(0, (size_t) size,
+                           info->s->mode==O_RDONLY ? PROT_READ :
+                           PROT_READ | PROT_WRITE,
+-                          MAP_SHARED | MAP_NORESERVE,
++                          MAP_SHARED,
+                           info->dfile, 0L);
+   if (info->s->file_map == (uchar*) MAP_FAILED)
+   {