[packages/percona-server] Up to 5.7.44-51 (git only release)
arekm
arekm at pld-linux.org
Sat Mar 15 18:54:49 CET 2025
commit cd6d8d9dfcd71c79599e8c08982f81a8519308be
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Sat Mar 15 18:32:17 2025 +0100
Up to 5.7.44-51 (git only release)
branch.sh | 33 +++++++++++++++++++++++++++++++++
build.patch | 35 +++++++++++++++++++++++++++++++++++
percona-server.spec | 27 ++++++++++++++++-----------
3 files changed, 84 insertions(+), 11 deletions(-)
---
diff --git a/percona-server.spec b/percona-server.spec
index 44fade5..37a71bc 100644
--- a/percona-server.spec
+++ b/percona-server.spec
@@ -41,7 +41,8 @@
%undefine with_coredumper
%endif
-%define rel 2
+%define rel 1
+%define percona_git_rel 51
%define percona_rel 48
Summary: Percona Server: a very fast and reliable SQL database engine
Summary(de.UTF-8): Percona Server: ist eine SQL-Datenbank
@@ -53,7 +54,7 @@ Summary(uk.UTF-8): Percona Server - швидкий SQL-сервер
Summary(zh_CN.UTF-8): Percona Server数据库服务器
Name: percona-server
Version: 5.7.44
-Release: %{percona_rel}.%{rel}
+Release: %{percona_git_rel}.%{rel}
License: GPL + Percona Server FLOSS Exception
Group: Applications/Databases
Source0: https://downloads.percona.com/downloads/Percona-Server-5.7/LATEST/source/tarball/%{name}-%{version}-%{percona_rel}.tar.gz
@@ -77,6 +78,8 @@ Source11: %{name}-ndb-cpc.init
Source12: %{name}-ndb-cpc.sysconfig
Source13: %{name}-client.conf
Source14: my.cnf
+Patch100: percona-server-git.patch
+# Patch100-md5: bd4d4d8f219788e9b186bd4f343b70d9
Patch0: mysql-opt.patch
Patch1: mysql-versioning.patch
Patch2: mysql-protobuf.patch
@@ -93,6 +96,7 @@ BuildRequires: bison >= 1.875
BuildRequires: cmake >= 2.8.2
BuildRequires: curl-devel
BuildRequires: readline-devel >= 6.2
+BuildRequires: libevent-devel
BuildRequires: libstdc++-devel >= 5:4.0
BuildRequires: automake
%{?with_system_boost:BuildRequires: boost-devel = 1.59.0}
@@ -475,21 +479,22 @@ Ten pakiet zawiera standardowego demona Percona Server NDB CPC.
%prep
%setup -q -n %{name}-%{version}-%{percona_rel} %{?with_sphinx:-a100} %{!?with_system_boost:-a101}
-%patch0 -p1
+%patch -P100 -p1
+%patch -P0 -p1
%if %{with sphinx}
# http://www.sphinxsearch.com/docs/manual-0.9.9.html#sphinxse-mysql51
%{__mv} sphinx-*/mysqlse storage/sphinx
-%patch4 -p1
+%patch -P4 -p1
cd storage/sphinx
-%patch5 -p2
+%patch -P5 -p2
cd ../..
%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+%patch -P1 -p1
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P6 -p1
+%patch -P7 -p1
+%patch -P8 -p1
# to get these files rebuild
[ -f sql/sql_yacc.cc ] && %{__rm} sql/sql_yacc.cc
diff --git a/branch.sh b/branch.sh
new file mode 100755
index 0000000..459c1e0
--- /dev/null
+++ b/branch.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+url=https://github.com/percona/percona-server.git
+package=percona-server
+tag=Percona-Server-5.7.44-48
+branch=5.7
+out=$package-git.patch
+repo=$package.git
+
+# use filterdiff, etc to exclude bad chunks from diff
+filter() {
+ filterdiff \
+ -x '*/build-ps/*'
+}
+
+if [ ! -d $repo ]; then
+ git clone --bare $url -b $branch $repo
+fi
+
+cd $repo
+ git fetch origin +$branch:$branch +refs/tags/$tag:refs/tags/$tag
+ git log -p --date=default --reverse $tag..$branch | filter > ../$out.tmp
+cd ..
+
+if cmp -s $out{,.tmp}; then
+ echo >&2 "No new diffs..."
+ rm -f $out.tmp
+ exit 0
+fi
+mv -f $out{.tmp,}
+
+../md5 $package.spec
+../dropin $out
diff --git a/build.patch b/build.patch
index 3a8dafd..775c542 100644
--- a/build.patch
+++ b/build.patch
@@ -48,3 +48,38 @@
#include <iterator>
#include <list>
#include <map>
+
+--- percona-server-5.7.44-48/storage/tokudb/PerconaFT/cmake_modules/TokuBuildTagDatabases.cmake~ 2025-03-15 18:05:03.000000000 +0100
++++ percona-server-5.7.44-48/storage/tokudb/PerconaFT/cmake_modules/TokuBuildTagDatabases.cmake 2025-03-15 18:06:40.528033591 +0100
+@@ -37,10 +37,14 @@ option(USE_ETAGS "Build the etags databa
+ if (USE_ETAGS)
+ find_program(ETAGS "etags")
+ if (NOT ETAGS MATCHES NOTFOUND)
++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/etags.files" "")
++ foreach(file ${all_srcs} ${all_hdrs})
++ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/etags.files" "${file}\n")
++ endforeach(file)
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/TAGS"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp"
+- COMMAND ${ETAGS} -o TAGS ${all_srcs} ${all_hdrs}
++ COMMAND ${ETAGS} -o TAGS -L "${CMAKE_CURRENT_BINARY_DIR}/etags.files"
+ COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/etags-stamp"
+ DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
+@@ -54,10 +58,14 @@ if (USE_CTAGS AND
+ (NOT APPLE OR NOT USE_ETAGS))
+ find_program(CTAGS "ctags")
+ if (NOT CTAGS MATCHES NOTFOUND)
++ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/ctags.files" "")
++ foreach(file ${all_srcs} ${all_hdrs})
++ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/ctags.files" "${file}\n")
++ endforeach(file)
+ add_custom_command(
+ OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/tags"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ctags-stamp"
+- COMMAND ${CTAGS} -o tags ${all_srcs} ${all_hdrs}
++ COMMAND ${CTAGS} -o tags -L "${CMAKE_CURRENT_BINARY_DIR}/ctags.files"
+ COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/ctags-stamp"
+ DEPENDS ${all_srcs} ${all_hdrs} install_tdb_h generate_config_h generate_log_code
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/percona-server.git/commitdiff/cd6d8d9dfcd71c79599e8c08982f81a8519308be
More information about the pld-cvs-commit
mailing list