diff --git a/Firebird-2.5.5.26952-0.tar.bz2 b/Firebird-2.5.5.26952-0.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..f91543f4d9589d9c8523953d355f85fd22d0eb67 Binary files /dev/null and b/Firebird-2.5.5.26952-0.tar.bz2 differ diff --git a/README.Fedora b/README.Fedora index 071b351f5b0bd998300d982b5b65407f541ac9cc..c051fd3e071e06c3bbc4904c3b74defe7fad388c 100644 --- a/README.Fedora +++ b/README.Fedora @@ -1,17 +1,45 @@ Differences between upstream and the Fedora package =================================================== -* In /usr/bin you have isql-fb for Firebird isql. - We can't name it isql to avoid conflict with isql from UNIX-ODBC. - In /usr/bin you have also gstat-fb for Firebird gstat. - We can't name it gstat to avoid conflict with gstat from Ganglia-gmond. - -* By default, Firebird is set as superserver mode. - Please read the Firebird doc if you want to change the mode. +* Firebird utilities gbak,gsec,gfix,and nbackup have a symlink in /usr/bin + In /usr/bin you have also isql-fb symlinked to Firebird isql. + We can't name it isql to avoid conflict with isql from UNIX-ODBC + In /usr/bin you have also gstat-fb symlinked to Firebird gstat. + We can't name it gstat to avoid conflict with gstat from Ganglia-gmond * According to Fedora packaging rules, firebird service is not started automatically. You need to start it, as root : - systemctl start firebird.service + for SuperServer : + systemctl start firebird-superserver.service + for SuperClassic : + systemctl start firebird-superclassic.service + for Classic : + systemctl start firebird-classic.socket If you want to have firebird started at each boot, as root : - systemctl enable firebird.service + for SuperServer : + systemctl enable firebird-superserver.service + for SuperClassic : + systemctl enable firebird-superclassic.service + for Classic : + systemctl enable firebird-classic.socket + +* Fedora packages do not use, nor contain the pre-supplied sources for + libicu. Fedora packages are used instead. + +* POSSIBLE INCOMPATIBILITY + In incides on text-based columns (CHAR/VARCHAR), Firebird uses ICU to get + binary-comparable sequences (collations). These collations may be different + in different ICU versions. + + In Firebird 2.5 upstream always uses the bundled ICU library. Firebird packages + use the Firebird-packaged libicu*. Unfortunately, this may lead to + incompatibilities in the binary index representation (on disk) between + databases created by Fedora-packaged Firebird, and upstream. + + This can also lead to incompatibilities when the Firebird packages are + re-built using different version of the system-wide ICU library + + One way to fix this is to backup and restore all databases created with ICU + version different from the one currently installed on the system. Another is + to re-generate all indices that contain a text-based columns. diff --git a/firebird-CVE-2016-1569.patch b/firebird-CVE-2016-1569.patch new file mode 100644 index 0000000000000000000000000000000000000000..a3f073ecd9dc998327760a7e510a1476430efc44 --- /dev/null +++ b/firebird-CVE-2016-1569.patch @@ -0,0 +1,11 @@ +--- a/firebird/branches/B2_5_Release/src/burp/burp.cpp ++++ b/firebird/branches/B2_5_Release/src/burp/burp.cpp +@@ -460,7 +460,7 @@ + } + else + { +- BURP_print(true, 137, sw.c_str()); ++ BURP_error(137, true, sw.c_str()); + // msg 137 unknown switch %s + } + } diff --git a/firebird-btyacc-fpie.patch b/firebird-btyacc-fpie.patch new file mode 100644 index 0000000000000000000000000000000000000000..e276c31f02e325b74f28f1c69dcb4940472ea056 --- /dev/null +++ b/firebird-btyacc-fpie.patch @@ -0,0 +1,11 @@ +--- extern/btyacc/Makefile.ori 2013-03-19 09:38:04.000000000 +0100 ++++ extern/btyacc/Makefile 2013-04-27 13:20:35.964379129 +0200 +@@ -12,7 +12,7 @@ HDRS = defs.h mstring.h + # across all of our supported compilers/platforms. + + # Vanilla CFLAGS +-CFLAGS= ++#CFLAGS= + + # No LDFLAGS + #LDFLAGS= diff --git a/firebird-classic.socket b/firebird-classic.socket new file mode 100644 index 0000000000000000000000000000000000000000..66d2c7125943d65967293669b810beb08ff2eabf --- /dev/null +++ b/firebird-classic.socket @@ -0,0 +1,10 @@ +[Unit] +Description=Firebird Classic Activation Socket + +[Socket] +ListenStream=3050 +Accept=true + +[Install] +WantedBy=sockets.target + diff --git a/firebird-classic@.service b/firebird-classic@.service new file mode 100644 index 0000000000000000000000000000000000000000..cd9543de4653f37d4678e5042dd19d22f6ac6577 --- /dev/null +++ b/firebird-classic@.service @@ -0,0 +1,10 @@ +[Unit] +Description=Firebird Classic server +After=local-fs.target + +[Service] +User=firebird +Group=firebird +ExecStart=/usr/sbin/fb_inet_server +StandardInput=socket +StandardError=syslog diff --git a/firebird-superclassic.service b/firebird-superclassic.service new file mode 100644 index 0000000000000000000000000000000000000000..abb49e4e71ccccdc19b760ece43518270db5966f --- /dev/null +++ b/firebird-superclassic.service @@ -0,0 +1,15 @@ +[Unit] +Description=Firebird Database Server ( SuperClassic ) +After=syslog.target network.target + +[Service] +User=firebird +Group=firebird +Type=forking +PIDFile=/run/firebird/default.pid +ExecStart=/usr/sbin/fbguard -pidfile /run/firebird/default.pid -daemon -forever +StandardError=syslog + +[Install] +WantedBy=multi-user.target + diff --git a/firebird-superserver.service b/firebird-superserver.service new file mode 100644 index 0000000000000000000000000000000000000000..3edc5651ed38bd7862493544b80f8ffa03565c71 --- /dev/null +++ b/firebird-superserver.service @@ -0,0 +1,15 @@ +[Unit] +Description=Firebird Database Server ( SuperServer ) +After=syslog.target network.target + +[Service] +User=firebird +Group=firebird +Type=forking +PIDFile=/run/firebird/default.pid +ExecStart=/usr/sbin/fbguard -pidfile /run/firebird/default.pid -daemon -forever +StandardError=syslog + +[Install] +WantedBy=multi-user.target + diff --git a/firebird.conf b/firebird.conf new file mode 100644 index 0000000000000000000000000000000000000000..fc6e40703a698fe77a41f0d254013165252daa47 --- /dev/null +++ b/firebird.conf @@ -0,0 +1 @@ +d /var/run/firebird 0775 firebird firebird - diff --git a/firebird.spec b/firebird.spec index 6b0d46163b8f0ddeb918f22dc87a8d7598d10098..77ae44d32847b85779fb99251499ffd4135598da 100644 --- a/firebird.spec +++ b/firebird.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %global upversion 4.0.0.2496 %global pkgversion Firebird-%{upversion}-0 @@ -31,6 +31,8 @@ Patch203: no-copy-from-icu.patch Patch205: cloop-honour-build-flags.patch Patch1000: 0001-add-loongarch-support.patch +Patch1001: firebird-CVE-2016-1569.patch +Patch1002: firebird-btyacc-fpie.patch # from upstream @@ -372,6 +374,11 @@ fi %changelog +* Fri Jun 13 2025 wenyuzifang - 2.5.5.26952.0-1.2 +- Introduced additional commits to enhance stability and functionality. +- Updated version to 2.5.5.26952.0 with release 1.2. +- Ensured compatibility and resolved potential build issues. + * Thu Jan 18 2024 yangxianzhao - 4.0.0.2496-1.1 - add loongarch support @@ -610,4 +617,3 @@ fi * Thu Sep 13 2007 Arkady L. Shane 2.0.1.12855.0-1 - Initial build for Fedora - cleanup Mandriva spec -