From ecb7e9b7b29d1317b24974536e9ac43a3ea44077 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Mon, 7 Mar 2022 16:49:22 +0800 Subject: [PATCH] Fix failed to parse pid from pid file (cherry picked from commit 22e1e1540b5a738fc9955769f790ac9072b1f3e0) --- firebird.spec | 6 +++++- fix-failed-to-parse-pid-from-pid-file.patch | 24 +++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 fix-failed-to-parse-pid-from-pid-file.patch diff --git a/firebird.spec b/firebird.spec index e5609d7..e50ff13 100644 --- a/firebird.spec +++ b/firebird.spec @@ -1,6 +1,6 @@ Name: firebird Version: 3.0.3.32900 -Release: 8 +Release: 9 Summary: SQL relational database management system License: Interbase URL: http://www.firebirdsql.org/ @@ -18,6 +18,7 @@ Patch0004: no-copy-from-icu.patch Patch0005: cloop-honour-build-flags.patch Patch0006: a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab.patch Patch0007: 0001-Port-to-RISC-V-64-bit-riscv64.patch +Patch0008: fix-failed-to-parse-pid-from-pid-file.patch BuildRequires: autoconf automake libtommath-devel libtool ncurses-devel libicu-devel BuildRequires: libedit-devel gcc-c++ libstdc++-static systemd-units chrpath zlib-devel procmail @@ -203,6 +204,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/firebird.conf %exclude %{_docdir}/firebird/IPLicense.txt %changelog +* Mon Mar 7 2022 yaoxin - 3.0.3.32900-9 +- Fix failed to parse pid from pid file + * Fri Sep 10 2021 bzhaoop - 3.0.3.32900-8 - Del rpath in some binaries for firebird. diff --git a/fix-failed-to-parse-pid-from-pid-file.patch b/fix-failed-to-parse-pid-from-pid-file.patch new file mode 100644 index 0000000..6dd6f94 --- /dev/null +++ b/fix-failed-to-parse-pid-from-pid-file.patch @@ -0,0 +1,24 @@ +From 16b7c7ddb797a83863ec472f0db611c6c5777073 Mon Sep 17 00:00:00 2001 +From: starlet-dx <15929766099@163.com> +Date: Mon, 7 Mar 2022 16:24:03 +0800 +Subject: [PATCH 1/1] fix failed to parse pid from pid file + +--- + .../install/arch-specific/linux/firebird-superserver.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/builds/install/arch-specific/linux/firebird-superserver.service.in b/builds/install/arch-specific/linux/firebird-superserver.service.in +index fa9fbef..7501868 100644 +--- a/builds/install/arch-specific/linux/firebird-superserver.service.in ++++ b/builds/install/arch-specific/linux/firebird-superserver.service.in +@@ -9,6 +9,7 @@ Group=firebird + Type=forking + PIDFile=/var/run/firebird/default.pid + ExecStart=@FB_SBINDIR@/fbguard -pidfile /var/run/firebird/default.pid -daemon -forever ++ExecStartPost=/usr/bin/sleep 0.1 + StandardError=syslog + + [Install] +-- +2.30.0 + -- Gitee