From: Bartek Szady Date: Thu, 5 Mar 2020 13:52:00 +0000 (+0100) Subject: - updated to 3.0.5.33220 X-Git-Tag: auto/th/Firebird-3.0.5.33220-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=535fa407bfefadd49dbac7f8a84738c94d068c0a;p=packages%2FFirebird.git - updated to 3.0.5.33220 - pidfile moved to /run/fireird/ --- diff --git a/Firebird.spec b/Firebird.spec index 3e3dfcd..cbde1d4 100644 --- a/Firebird.spec +++ b/Firebird.spec @@ -15,12 +15,12 @@ Summary: Firebird SQL Database Server and Client tools Summary(de.UTF-8): Firebird - relationalen Open-Source- Datenbankmanagementsystems Summary(pl.UTF-8): Firebird - serwer baz danych SQL oraz narzędzia klienckie Name: Firebird -Version: 3.0.4.33054 -Release: 3 +Version: 3.0.5.33220 +Release: 1 License: Interbase Public License 1.0, Initial Developer's Public License 1.0 Group: Applications/Databases -Source0: https://github.com/FirebirdSQL/firebird/releases/download/R3_0_4/%{name}-%{version}-0.tar.bz2 -# Source0-md5: 43569120299b2db7587dcfbddab1e25a +Source0: https://github.com/FirebirdSQL/firebird/releases/download/R3_0_5/%{name}-%{version}-0.tar.bz2 +# Source0-md5: 4844be811fd4022d68f530eac75bd5b8 Source1: http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/%{name}-3-QuickStart.pdf # Source1-md5: 8e029d449e9cb3e1da8213ac6c11ad02 # distfiles refuses this, would require some audit to allow '('/')' chars @@ -278,7 +278,7 @@ rm -f $RPM_BUILD_ROOT%{ibdir}/bin/{FirebirdUninstall.sh,changeServerMode.sh} sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE100} >$RPM_BUILD_ROOT/etc/rc.d/init.d/firebird cp -p %{SOURCE101} $RPM_BUILD_ROOT/etc/sysconfig/firebird sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE104} >$RPM_BUILD_ROOT%{systemdunitdir}/firebird.service -install -d $RPM_BUILD_ROOT/var/run/firebird +install -d $RPM_BUILD_ROOT/run/firebird sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE102} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/firebird sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE105} >$RPM_BUILD_ROOT%{systemdunitdir}/firebird-classic@.service @@ -427,7 +427,7 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/firebird %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tmpfiles.d/firebird.conf %attr(755,root,root) %{ibdir}/bin/fbguard -%dir %attr(770,root,firebird) /var/run/firebird +%dir %attr(770,root,firebird) /run/firebird %{systemdunitdir}/firebird.service %files classic diff --git a/cloop-honour-build-flags.patch b/cloop-honour-build-flags.patch index 1f556e0..0939f5a 100644 --- a/cloop-honour-build-flags.patch +++ b/cloop-honour-build-flags.patch @@ -2,18 +2,18 @@ Description: make cloop build honor compiler/linker flags from the environment Author: Damyan Ivanov Forwarded: no ---- a/extern/cloop/Makefile -+++ b/extern/cloop/Makefile -@@ -6,7 +6,7 @@ TARGET := release +--- Firebird-3.0.5.33220-0/extern/cloop/Makefile.orig 2020-01-09 10:53:10.000000000 +0100 ++++ Firebird-3.0.5.33220-0/extern/cloop/Makefile 2020-01-13 12:47:47.869169239 +0100 +@@ -6,7 +6,7 @@ - CC := gcc - CXX := g++ + CC := $(CC) + CXX := $(CXX) -LD := $(CXX) +LD := $(CXX) $(LDFLAGS) SRC_DIR := src BUILD_DIR := build -@@ -27,8 +27,9 @@ SRCS_CPP := $(foreach sdir,$(SRC_DIRS),$ +@@ -27,8 +27,9 @@ OBJS_C := $(patsubst $(SRC_DIR)/%.c,$(OBJ_DIR)/%.o,$(SRCS_C)) OBJS_CPP := $(patsubst $(SRC_DIR)/%.cpp,$(OBJ_DIR)/%.o,$(SRCS_CPP)) diff --git a/firebird.init b/firebird.init index 87b41ec..33ccc46 100644 --- a/firebird.init +++ b/firebird.init @@ -12,13 +12,13 @@ . /etc/sysconfig/network -# Source oident configureation. +# Source firebird configuration. if [ -f /etc/sysconfig/firebird ]; then . /etc/sysconfig/firebird fi GUARDIAN=/usr/lib/interbase/bin/fbguard -PIDFILE=/var/run/firebird/firebird.pid +PIDFILE=/run/firebird/firebird.pid # Check that networking is up. if is_yes "${NETWORKING}"; then diff --git a/firebird.service b/firebird.service index 5633e51..340bf8d 100644 --- a/firebird.service +++ b/firebird.service @@ -7,8 +7,8 @@ Conflicts=firebird-classic.socket User=firebird Group=firebird Type=forking -PIDFile=/var/run/firebird/default.pid -ExecStart=/usr/lib/interbase/bin/fbguard -pidfile /var/run/firebird/default.pid -daemon -forever +PIDFile=/run/firebird/default.pid +ExecStart=/usr/lib/interbase/bin/fbguard -pidfile /run/firebird/default.pid -daemon -forever StandardError=syslog [Install] diff --git a/firebird.tmpfiles b/firebird.tmpfiles index c5b9866..b581bdc 100644 --- a/firebird.tmpfiles +++ b/firebird.tmpfiles @@ -1 +1 @@ -d /var/run/firebird 0770 root firebird - +d /run/firebird 0770 root firebird - diff --git a/no-copy-from-icu.patch b/no-copy-from-icu.patch index 42ef318..96ce3eb 100644 --- a/no-copy-from-icu.patch +++ b/no-copy-from-icu.patch @@ -38,15 +38,15 @@ Author: Damyan Ivanov // Return the number of characters of a string. static unsigned charLength(SSHORT charset, unsigned len, const char* str) { ---- a/builds/posix/Makefile.in -+++ b/builds/posix/Makefile.in -@@ -454,7 +454,8 @@ $(GSTAT): $(GSTAT_Objects) $(COMMON_LIB +--- Firebird-3.0.5.33220-0/builds/posix/Makefile.in.orig 2020-01-13 12:24:58.332032230 +0100 ++++ Firebird-3.0.5.33220-0/builds/posix/Makefile.in 2020-01-13 12:37:30.703461522 +0100 +@@ -481,7 +481,8 @@ isql: $(ISQL) $(ISQL): $(ISQL_Objects) $(COMMON_LIB) -- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) -+ $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) \ -+ $(LIBEDITLINE) $(LINK_LIBS) $(ICU_LIBS) +- $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..) ++ $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) \ ++ $(LINK_LIBS) $(ICU_LIBS) $(call LINK_DARWIN_RPATH,..) nbackup: $(NBACKUP)