Date: Friday, June 1, 2018 @ 13:42:59
Author: mtorromeo
Revision: 336101
upgpkg: percona-server 5.7.22_22-1
Modified:
percona-server/trunk/PKGBUILD
Deleted:
percona-server/trunk/mysql-tirpc.patch
-------------------+
PKGBUILD | 24 ++++++++------------
mysql-tirpc.patch | 62 ----------------------------------------------------
2 files changed, 10 insertions(+), 76 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-06-01 13:26:20 UTC (rev 336100)
+++ PKGBUILD 2018-06-01 13:42:59 UTC (rev 336101)
@@ -3,11 +3,11 @@
pkgbase=percona-server
pkgname=('libperconaserverclient' 'percona-server-clients' 'percona-server')
-pkgver=5.7.21_21
+pkgver=5.7.22_22
_boost_ver=1.59.0
_pkgver=${pkgver/_/-}
_myver=${pkgver/_rel*}
-pkgrel=2
+pkgrel=1
arch=('x86_64')
makedepends=('cmake' 'zlib' 'lz4' 'zstd' 'libaio' 'systemd-tools' 'pam'
'numactl' 'jemalloc' 'openssl' 'rpcsvc-proto')
license=('GPL')
@@ -16,14 +16,12 @@
"http://jenkins.percona.com/downloads/boost/boost_${_boost_ver//./_}.tar.gz";
'my.cnf'
'mysql-user.conf'
- 'rocksdb-systemlibs.patch'
- 'mysql-tirpc.patch')
-sha256sums=('8f9b3723741ad8f7b4d1d9366199aa3e7bb081b46130260c13fe9c14302d6b6b'
+ 'rocksdb-systemlibs.patch')
+sha256sums=('3b94644861628fa6e17b82318220327f0beb2767739c976c961c8a9eb6c9783a'
'47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac'
'ae451839c368f0db25a63bb0a6a890194897a8e74818bd4245140933c29e5f83'
'e638a2657085f15b6728f43c1fd6aa551b27608fbf6b435e33afd3606a0cfb0e'
- 'fcc3bea0982cda6cc35637d448a46924eccdfeb4c4da0634a26c9d190cf50fe4'
- 'fa3e4b3e6fab751fe6857e994e72a1ba951b36d27c8a1e59a7263d3f60a13c28')
+ 'fcc3bea0982cda6cc35637d448a46924eccdfeb4c4da0634a26c9d190cf50fe4')
prepare() {
cd $pkgbase-$_pkgver
@@ -35,7 +33,6 @@
plugin/tokudb-backup-plugin/Percona-TokuBackup/backup/CMakeLists.txt
patch -p1 -i "$srcdir"/rocksdb-systemlibs.patch
- patch -p1 -i "$srcdir"/mysql-tirpc.patch
}
build() {
@@ -128,12 +125,12 @@
# install man pages
install -d "$pkgdir"/usr/share/man/man1
- for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow
mysqlslap mysqlpump; do
+ for man in
mysql{,admin,check,dump,import,show,slap,pump,binlog,_plugin,_upgrade}; do
install -m644 "$srcdir"/$pkgbase-$_pkgver/man/$man.1
"$pkgdir"/usr/share/man/man1/$man.1
done
# provided by percona-server
- rm
"$pkgdir"/usr/bin/mysql{_plugin,_upgrade,binlog,test,_config_editor,_install_db,_secure_installation,_ssl_rsa_setup}
+ rm
"$pkgdir"/usr/bin/mysql{_config_editor,_install_db,_secure_installation,_ssl_rsa_setup}
}
package_percona-server() {
@@ -165,12 +162,12 @@
rm usr/bin/mysql_config
rm usr/lib/lib{mysql,perconaserver}*
rm -r usr/include/
- rm
usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+ rm usr/share/man/man1/mysql_config.1
rm -r usr/share/aclocal usr/lib/pkgconfig
# provided by percona-server-clients
- rm usr/bin/mysql{,admin,check,dump,import,show,slap,pump}
- rm usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump}.1
+ rm
usr/bin/mysql{,admin,check,dump,import,show,slap,pump,binlog,_plugin,test,_upgrade}
+ rm
usr/share/man/man1/mysql{,admin,check,dump,import,show,slap,pump,binlog,_plugin,_upgrade}.1
# deprecated/unused
rm usr/bin/replace
@@ -178,5 +175,4 @@
# not needed
rm -r usr/mysql-test
- rm usr/share/man/man1/mysql-test-run.pl.1
}
Deleted: mysql-tirpc.patch
===================================================================
--- mysql-tirpc.patch 2018-06-01 13:26:20 UTC (rev 336100)
+++ mysql-tirpc.patch 2018-06-01 13:42:59 UTC (rev 336101)
@@ -1,62 +0,0 @@
-diff --git a/rapid/plugin/group_replication/configure.cmake
b/rapid/plugin/group_replication/configure.cmake
-index 59a074bd..35c99dbf 100644
---- a/rapid/plugin/group_replication/configure.cmake
-+++ b/rapid/plugin/group_replication/configure.cmake
-@@ -50,8 +50,16 @@ IF (WIN32)
- ENDIF()
-
- IF (NOT WIN32)
-+ # First look for tirpc, then the old Sun RPC
-+ FIND_PATH(RPC_INCLUDE_DIR
-+ NAMES rpc/rpc.h
-+ HINTS /usr/include/tirpc
-+ NO_DEFAULT_PATH
-+ )
-+ FIND_PATH(RPC_INCLUDE_DIR NAMES rpc/rpc.h)
- SET (CMAKE_REQUIRED_FLAGS_BACKUP ${CMAKE_REQUIRED_FLAGS})
- SET (CMAKE_REQUIRED_FLAGS "-Wno-error")
-+ SET (CMAKE_REQUIRED_INCLUDES ${RPC_INCLUDE_DIR})
- ENDIF()
-
- #
-diff --git a/rapid/plugin/group_replication/rpcgen.cmake
b/rapid/plugin/group_replication/rpcgen.cmake
-index b9c5895c..7856e046 100644
---- a/rapid/plugin/group_replication/rpcgen.cmake
-+++ b/rapid/plugin/group_replication/rpcgen.cmake
-@@ -87,6 +87,23 @@ FOREACH(X xcom_vp)
- ${XCOM_BASEDIR}/xcom_proto_enum.h
- ${XCOM_BASEDIR}/xcom_limits.h)
- ELSE()
-+ FIND_PROGRAM(RPCGEN_EXECUTABLE rpcgen DOC "path to the rpcgen executable")
-+ MARK_AS_ADVANCED(RPCGEN_EXECUTABLE)
-+ IF(NOT RPCGEN_EXECUTABLE)
-+ MESSAGE(FATAL_ERROR "Could not find rpcgen")
-+ ENDIF()
-+
-+ IF(NOT RPC_INCLUDE_DIR)
-+ MESSAGE(FATAL_ERROR
-+ "Could not find rpc/rpc.h in /usr/include or /usr/include/tirpc")
-+ ENDIF()
-+ MESSAGE(STATUS "RPC_INCLUDE_DIR ${RPC_INCLUDE_DIR}")
-+ IF(RPC_INCLUDE_DIR STREQUAL "/usr/include/tirpc")
-+ INCLUDE_DIRECTORIES(SYSTEM /usr/include/tirpc)
-+ ADD_DEFINITIONS(-DHAVE_TIRPC)
-+ SET(TIRPC_LIBRARY tirpc)
-+ ENDIF()
-+
- # on unix systems try to generate them if needed
- ADD_CUSTOM_COMMAND(OUTPUT ${x_gen_h} ${x_gen_c} ${x_tmp_plat_h}
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
-@@ -103,10 +120,10 @@ FOREACH(X xcom_vp)
-
- # generate the sources
- COMMAND ${CMAKE_COMMAND} -E remove -f ${x_gen_h}
-- COMMAND rpcgen -C -h -o
-+ COMMAND ${RPCGEN_EXECUTABLE} -C -h -o
- ${x_gen_h} ${x_tmp_x_canonical_name}
- COMMAND ${CMAKE_COMMAND} -E remove -f ${x_gen_c}
-- COMMAND rpcgen -C -c -o
-+ COMMAND ${RPCGEN_EXECUTABLE} -C -c -o
- ${x_gen_c} ${x_tmp_x_canonical_name}
- WORKING_DIRECTORY ${gen_xdr_dir}
- DEPENDS
