From 1991411f16366f5acda5c9478ea544c56c3974f0 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Tue, 18 Apr 2017 19:35:48 +0000
Subject: [PATCH] MDEV-9566 MariaBackup packaging

---
 cmake/cpack_rpm.cmake              | 7 ++++++-
 debian/control                     | 8 ++++++++
 debian/mariadb-backup-10.1.files   | 2 ++
 win/packaging/CPackWixConfig.cmake | 7 ++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 debian/mariadb-backup-10.1.files

diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index f1aab2c353c..d6f43e3f730 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -23,10 +23,14 @@ SET(CPACK_COMPONENT_SHAREDLIBRARIES_GROUP "shared")
 SET(CPACK_COMPONENT_COMMON_GROUP "common")
 SET(CPACK_COMPONENT_CLIENTPLUGINS_GROUP "common")
 SET(CPACK_COMPONENT_COMPAT_GROUP "compat")
+SET(CPACK_COMPONENT_BACKUP_GROUP "backup")
+
 SET(CPACK_COMPONENTS_ALL Server ManPagesServer IniFiles Server_Scripts
                          SupportFiles Development ManPagesDevelopment
                          ManPagesTest Readme ManPagesClient Test 
-                         Common Client SharedLibraries ClientPlugins)
+                         Common Client SharedLibraries ClientPlugins
+                         backup
+)
 
 SET(CPACK_RPM_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
 SET(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${VERSION}-${RPM}-${CMAKE_SYSTEM_PROCESSOR}")
@@ -98,6 +102,7 @@ SET(CPACK_RPM_client_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSC
 SET(CPACK_RPM_compat_USER_FILELIST ${ignored})
 SET(CPACK_RPM_devel_USER_FILELIST ${ignored})
 SET(CPACK_RPM_test_USER_FILELIST ${ignored})
+SET(CPACK_RPM_backup_USER_FILELIST ${ignored})
 
 # "set/append array" - append a set of strings, separated by a space
 MACRO(SETA var)
diff --git a/debian/control b/debian/control
index cb602510d95..c25ce6dd20f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: bison,
                dh-apparmor,
                dpatch,
                libaio-dev,
+               libarchive-dev,
                libboost-dev,
                libjudy-dev,
                libkrb5-dev,
@@ -443,3 +444,10 @@ Section: database
 Architecture: any
 Depends: libgssapi-krb5-2, mariadb-client-10.1
 Description: GSSAPI authentication plugin for MariaDB client
+
+
+Package: mariadb-backup-10.1
+Section: database
+Architecture: any
+Depends: libarchive12 | libarchive13
+Description: Backup tool for MariaDB server
\ No newline at end of file
diff --git a/debian/mariadb-backup-10.1.files b/debian/mariadb-backup-10.1.files
new file mode 100644
index 00000000000..734117c92e2
--- /dev/null
+++ b/debian/mariadb-backup-10.1.files
@@ -0,0 +1,2 @@
+usr/bin/mariabackup
+usr/bin/mbstream
diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake
index 6df49678d52..6683020c179 100644
--- a/win/packaging/CPackWixConfig.cmake
+++ b/win/packaging/CPackWixConfig.cmake
@@ -9,7 +9,7 @@ IF(ESSENTIALS)
  ENDIF()
 ELSE()
   SET(CPACK_COMPONENTS_USED 
-    "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo;Common;connect-engine;ClientPlugins;gssapi-server;gssapi-client;aws-key-management")
+    "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo;Common;connect-engine;ClientPlugins;gssapi-server;gssapi-client;aws-key-management;backup")
 ENDIF()
 
 SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents")
@@ -55,6 +55,11 @@ SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install server")
    "Debug/trace versions of executables and libraries" )
  #SET(CPACK_COMPONENT_DEBUGBINARIES_WIX_LEVEL 2)
  
+ # Subfeature "Backup"
+ SET(CPACK_COMPONENT_BACKUP_GROUP "MySQLServer")
+ SET(CPACK_COMPONENT_BACKUP_DISPLAY_NAME "Backup utilities")
+ SET(CPACK_COMPONENT_BACKUP_DESCRIPTION "Installs backup utilities(mariabackup and mbstream)")
+
  
  #Miscellaneous (hidden) components, part of server / or client programs
  FOREACH(comp connect-engine ClientPlugins gssapi-server gssapi-client aws-key-management)