!26 [sync] PR-19: Fix failed to parse pid from pid file

From: @openeuler-sync-bot 
Reviewed-by: @bzhaoop 
Signed-off-by: @bzhaoop
This commit is contained in:
openeuler-ci-bot 2022-08-08 01:21:54 +00:00 committed by Gitee
commit 7fd9029a49
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 29 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: firebird Name: firebird
Version: 3.0.3.32900 Version: 3.0.3.32900
Release: 8 Release: 9
Summary: SQL relational database management system Summary: SQL relational database management system
License: Interbase License: Interbase
URL: http://www.firebirdsql.org/ URL: http://www.firebirdsql.org/
@ -18,6 +18,7 @@ Patch0004: no-copy-from-icu.patch
Patch0005: cloop-honour-build-flags.patch Patch0005: cloop-honour-build-flags.patch
Patch0006: a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab.patch Patch0006: a4cb621bf55ef2101e22b1e7da5c458a1e0cc2ab.patch
Patch0007: 0001-Port-to-RISC-V-64-bit-riscv64.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: autoconf automake libtommath-devel libtool ncurses-devel libicu-devel
BuildRequires: libedit-devel gcc-c++ libstdc++-static systemd-units chrpath zlib-devel procmail 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 %exclude %{_docdir}/firebird/IPLicense.txt
%changelog %changelog
* Mon Mar 7 2022 yaoxin <yaoxin30@huawei.com> - 3.0.3.32900-9
- Fix failed to parse pid from pid file
* Fri Sep 10 2021 bzhaoop <bzhaojyathousandy@gmail.com> - 3.0.3.32900-8 * Fri Sep 10 2021 bzhaoop <bzhaojyathousandy@gmail.com> - 3.0.3.32900-8
- Del rpath in some binaries for firebird. - Del rpath in some binaries for firebird.

View File

@ -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