I prepared these packages of Firebird 2.5 as part of my Hackweek
project. As there are some incompatibilities with Firebird 2.1 packages,
some tuning may be needed to allow smooth upgrade.

old: server:database/firebird
new: home:mkubecek:firebird25/firebird rev NoneIndex: baselibs.conf
===================================================================
--- baselibs.conf (revision 67)
+++ baselibs.conf (revision 26)
@@ -1,7 +1,6 @@
+firebird
+    +/usr/lib(64)?/libib_util.so
 libfbclient2
- +/usr/lib(64)?/libfbclient.so*
- +/usr/lib(64)?/firebird/lib/libfbclient.so*
- +/usr/lib(64)?/libigds.so*
+    +/usr/lib(64)?/libfbclient.*
 libfbembed2
- +/usr/lib(64)?/libfbembed.so* 
- +/usr/lib(64)?/firebird/lib/libfbembed.so* 
+    +/usr/lib(64)?/libfbembed.*
Index: firebird.changes
===================================================================
--- firebird.changes (revision 67)
+++ firebird.changes (revision 26)
@@ -1,171 +1,216 @@
 -------------------------------------------------------------------
-Sat Dec  3 09:41:12 UTC 2011 - aj@suse.de
+Wed Dec 14 12:43:09 UTC 2011 - mkubecek@suse.cz
 
-- Do not package files twice.
-- Remove tmpdirs.d support, handle install.
+- update to upstream version 2.5.2.26397
+  * CORE-3490: Concurrency problem when using named cursors
+  * CORE-3690: Wrong warning message for ambiguous query
+  * CORE-3680: EXECUTE BLOCK statement and ISC_DSQL_EXECUTE2() problem
+  * CORE-927: Grants don't work for procedures used inside views
+  * CORE-3692: Cannot drop a NOT NULL constraint on a field
+    participating in the UNIQUE constraint
+  * CORE-3601 - Incorrect TEXT BLOB charset transliteration on VIEW with
+    trigger
+- add libtool and pkg-config to BuildRequires
 
 -------------------------------------------------------------------
-Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
+Tue Nov 29 09:12:47 UTC 2011 - mkubecek@suse.cz
 
-- Apply packaging guidelines (remove redundant/obsolete
-  tags/sections from specfile, etc.)
+- fixed include directory in pkg-config files
+- set --prefix to /usr (shouldn't influence anything anyway)
 
 -------------------------------------------------------------------
-Wed Jul  6 08:19:45 UTC 2011 - aj@suse.de
+Mon Nov 28 10:39:34 UTC 2011 - mkubecek@suse.cz
 
-- Fix spelling of openSUSE.
-- Use /usr/lib/tmpfiles.d instead of /etc/tmpfiles.d.
+- provide pkg-config files for libfbclient and libfbembed
 
 -------------------------------------------------------------------
-Mon May 30 18:08:48 UTC 2011 - dimstar@opensuse.org
+Thu Nov 10 12:37:45 UTC 2011 - mkubecek@suse.cz
 
-- Fix update-alternatives usage: -classic and -super need to be
-  registered as the same name to make it obvious that they are
-  alternatives.
+- update to upstream version 2.5.2.26389
+  * CORE-3646: Segmentation fault in multi-threaded program when using
+    2.5.x client library on Linux
+  * CORE-3650: Recreation of collation leads to FB "death"
+  * CORE-3557: AV in engine when preparing query against dropping table
+  * CORE-3579: Can't drop table when computed field depends on later
+  * created another field
 
 -------------------------------------------------------------------
-Mon Feb 21 06:25:10 UTC 2011 - daniel.rahn@novell.com
+Mon Oct 31 09:04:15 UTC 2011 - mkubecek@suse.cz
 
-- add baselibs.conf to build 32bit client packages on 64bit systems 
+- update to upstream version 2.5.2.26386
+  * CORE-3636: Firebird 2.5.1 server crashes with Trace API
+  * CORE-3631: Duplicate records with NULLs checked incorrectly
+  * CORE-3627: Server crashes with access violation when inserting
+    row into table with unique index
+  * CORE-3600: temp files fb_query_xxxx remains after ISQL has been
+    closed
+  * CORE-3612: gfix-related services may loose error value in status
+    vector in isc_service_start()
+  * CORE-3610: Can insert DUPLICATE keys in UNIQUE index
 
 -------------------------------------------------------------------
-Thu Nov  4 09:51:05 UTC 2010 - aj@suse.de
+Tue Oct 18 06:56:41 UTC 2011 - mkubecek@suse.cz
 
-- Add firebird.conf for tmpfs mounting via systemd.
+- compatibility with upstream tarball
 
 -------------------------------------------------------------------
-Tue May 11 21:00:00 UTC 2010 - makowski.opensuse@gmail.com
+Fri Sep 30 13:34:30 UTC 2011 - mkubecek@suse.cz
 
-- conditional %dir %{_sysconfdir}/tmpdirs.d 
+- fixes in init script, removed unneeded patch
 
 -------------------------------------------------------------------
-Thu May  6 06:22:39 UTC 2010 - makowski.opensuse@gmail.com
+Thu Sep 29 17:28:16 UTC 2011 - mkubecek@suse.cz
 
-- add dir /etc/tmpdirs.d to the package 
+- fix baselibs.conf (libib_util.so moved to firebird)
 
 -------------------------------------------------------------------
-Wed May  5 13:56:31 UTC 2010 - makowski.opensuse@gmail.com
+Thu Sep 29 17:22:15 UTC 2011 - mkubecek@suse.cz
 
-- stable upstream
-- make changes need for mounting /var/run as tmpfs 
+- add /srv/firebird directory
+- restrict DatabaseAccess to /srv/firebird in default configuration
+- move libib_util back to main server package (it depends on it)
+- mark xinetd config file as config
+- build with system editline
+- don't fail install/upgrade if user or group creation fails
+- rename isql and gstat to avoid conflict with other packages
 
 -------------------------------------------------------------------
-Wed Aug 19 16:45:07 CEST 2009 - makowski.opensuse@gmail.com
+Tue Sep 27 18:47:57 UTC 2011 - mkubecek@suse.cz
 
-- remove distro check
-- cleaning superserver and classic pre and post
+- common firebird-devel for header files and libib_util.so
+- separate firebird-superserver package
+- separate firebird-classic package
+- build firebird-doc as noarch if possible (suse_version > 1110)
+- restart on update (in postun)
+- remove full version from patch names
+- disable xinetd service by default
+- move misc to _datadir
 
 -------------------------------------------------------------------
-Tue Aug 18 01:28:50 CEST 2009 - makowski.opensuse@gmail.com
+Mon Sep 26 15:00:49 UTC 2011 - mkubecek@suse.cz
 
-- rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond 
-- change pre and post
- 
+- moved to BuildService
+- removed %debug_package
+- build libfbclient2-32bit
+- move libib_util.so to main package
+- restart on update
+- fixed typo init init script
 
 -------------------------------------------------------------------
-Mon Aug 10 19:16:21 CEST 2009 - makowski.opensuse@gmail.com
+Mon Sep 19 2011 - mike@mk-sys.cz
+- update to 2.5.1.26358
 
-- set correct suid to bin-classic/fb_lock_mgr 
+-------------------------------------------------------------------
+Fri Jun 24 2011 - mike@mk-sys.cz
+
+- update to 2.5.1.26319
 
 -------------------------------------------------------------------
-Thu Jul 23 20:44:31 CEST 2009 - makowski.opensuse@gmail.com
+Wed May 25 2011 - mike@mk-sys.cz
+
+- update to 2.5.1.26285
+- remove init scripts for other distributions
+- simplify user/group creation
 
-- new upstream version (2.1.3.18185.0)
-- build it against system edit libs
- 
 -------------------------------------------------------------------
-Sun Jul 12 12:00:00  UTC 2009 - makowski.opensuse@gmail.com
+Tue May 17 2011 - mike@mk-sys.cz
 
-- removing firebird-profile no need since user have /sbin/nologin as shell
-- moving security database to %%{_localstatedir}/lib/%%{name}/system
+- update to 2.5.1.26279
+- compile against system ICU
+- shared libraries moved into a subpackage
+- create /var/run/firebird in init script
+- add Short-Description into the init script
+- fixed interpreter specification in support scripts
+- full path tu useradd and groupadd in pre-install script
 
 -------------------------------------------------------------------
-Fri Jul 10 12:00:00  UTC 2009 - mhrusecky@suse.cz
+Sat Mar 19 2011 - mike@mk-sys.cz
 
-- adding rcfirebird for firebird superserver (openSUSE only)
+- update to 2.5.1.26239
 
 -------------------------------------------------------------------
-Tue Jul 07 12:00:00  UTC 2009 - mhrusecky@suse.cz
+Mon Jan 17 2011 - mike@mk-sys.cz
 
-- not cleaning during %install
-- not packaging quite empty log file
-- generating library suffixes from major version
-- cleaning broken symlinks
-- automatically created user now have /bin/nologin as shell to make things a
-  little bit more secure
+- update to 2.5.0.26179
 
 -------------------------------------------------------------------
-Mon Jun 29 12:00:00  UTC 2009 - makowski.opensuse@gmail.com
+Sun Nov 07 2010 - mike@mk-sys.cz
 
-- Adapted to OpenSuse
+- add useradd and groupadd to dependencies
 
 -------------------------------------------------------------------
-Fri Jun 19 12:00:00  UTC 2009 - makowski.opensuse@gmail.com
+Fri Oct 15 2010 - mike@mk-sys.cz
 
-- Update to 2.1.3
-- change xinetd script (rh #506528)
-- add missing library (and header files) for build php4-interbase module (rh #506728)
-- remove doc patch 
(107 more lines skipped)
Index: firebird.spec
===================================================================
--- firebird.spec (revision 67)
+++ firebird.spec (revision 26)
@@ -1,523 +1,279 @@
-#
-# spec file for package firebird
-#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-%global pkgname Firebird-2.1.3.18185-0
-%global fbroot	%{_libdir}/%{name}
-%global major	2.1.3
-%define libfbclient libfbclient2
-%define libfbembed libfbembed2
-Summary:        SQL relational database management system
-
-Name:           firebird
-Version:        2.1.3.18185.0
-Release:        1
-Group:          Productivity/Databases/Servers
-License:        Interbase
-Url:            http://www.firebirdsql.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
-Source3:        firebird-logrotate
-Source4:        README.openSUSE
-Source5:        01_firebird
-Source6:        firebird.conf
-Patch0:         firebird-mcpu-to-mtune.patch
-Patch1:         Firebird-edit_fix.diff
-Patch2:         firebird-gcc-warnings-fixes.patch
-Patch3:         firebird_lock-file-location.patch
-Patch4:         firebird-gcc-icu.patch
-BuildRequires:  autoconf
-BuildRequires:  automake
-BuildRequires:  bison
-BuildRequires:  libtool
-BuildRequires:  ncurses-devel
-BuildRequires:  gcc-c++
-BuildRequires:  libicu-devel
-BuildRequires:  xinetd
-Provides:       %{name}-server-common
-Obsoletes:      %{name}-server-common < %{version}
-Requires:       %{name}-arch = %{version}
-Requires:       grep
-Requires:       sed
-PreReq:         pwdutils
-PreReq:         update-alternatives  
-Requires:       %libfbclient
-Requires:       logrotate
-Requires:       netcfg
+%define upversion Firebird-2.5.2.26397-0
 
-%description
-This package contains common files between firebird-classic and
-firebird-superserver. You will need this if you want to use either one.
-
-%package		doc
-License:        Interbase
-Summary:        Documentation for Firebird SQL RDBMS
-Group:          Applications/Databases
-
-%description	doc
-This are the Firebird SQL Database shared doc and examples files.
-
-%package		filesystem
-License:        Interbase
-Summary:        Filesystem for Firebird SQL RDBMS
-Group:          Applications/Databases
-
-%description	filesystem
-This is the Firebird SQL Database root file system.
-
-%package		devel
-License:        Interbase
-Summary:        Development Libraries for Firebird 
-Group:          Development/Databases
-Requires:       %libfbclient = %{version}
-Requires:       %libfbembed = %{version}
-
-%description	devel
-Development libraries for Firebird SQL RDBMS.
-
-%package		classic
-License:        Interbase
-Summary:        Classic (xinetd) server for Firebird SQL RDBMS
-Group:          Applications/Databases
-Provides:       %{name}-arch = %{version}-%{release}
-Requires:       xinetd
-Requires:       %{name} = %{version}
-Conflicts:      %{name}-superserver
-Requires:       %libfbembed = %{version}
-Provides:       %{name}-utils-classic
-Obsoletes:      %{name}-utils-classic < %{version}
-Provides:       %{name}-server-classic
-Obsoletes:      %{name}-server-classic < %{version}
-PreReq:         permissions
-PreReq:         update-alternatives  
-
-%description	classic
-This is the classic (xinetd) server Firebird SQL RDBMS.
-It can also be used as an embedded server, when paired with the
-client-embedded package.
-
-%package		superserver
-License:        Interbase
-Summary:        Superserver server for Firebird SQL RDBMS
-Group:          Applications/Databases
-Provides:       %{name}-arch = %{version}-%{release}
-Requires:       %{name} = %{version}
-Conflicts:      %{name}-classic
-Provides:       %{name}-utils-superserver
-Obsoletes:      %{name}-utils-superserver < %{version}
-Provides:       %{name}-server-superserver
-Obsoletes:      %{name}-server-superserver < %{version}
-PreReq:         update-alternatives  
-
-%description		superserver
-This is the Superserver (single process) Firebird SQL RDBMS.
-
-
-%package		-n libfbclient2
-License:        Interbase
-Summary:        Multi-threaded client libraries for Firebird SQL RDBMS
-Group:          System Environment/Libraries
-Requires(post):		/sbin/ldconfig
-Requires(postun):	/sbin/ldconfig
-Requires:       %{name}-filesystem 
-
-%description		-n %libfbclient
-Multi-threaded, non-local client libraries for Firebird SQL RDBMS
-
-
-%package		-n libfbembed2
-License:        Interbase
-Summary:        Multi-process client libraries for Firebird SQL RDBMS
-Group:          System Environment/Libraries
-Requires(post):		/sbin/ldconfig
-Requires(postun):	/sbin/ldconfig
-Requires:       %{name}-filesystem 
+Name: firebird
+Version: 2.5.2.26397
+Release: 1
+Source: %{upversion}.tar.bz2
+URL: http://www.firebirdsql.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
+BuildRequires: gcc-c++ libtool pkg-config
+BuildRequires: ncurses-devel libicu-devel libedit-devel
+Requires(pre): pwdutils
+Requires: %{name}-server = %{version}
+Group: Productivity/Databases/Servers
+License: IDPL
+Summary: An SQL database server
+
+Patch1: %{name}-2.5.1-chown.patch
+Patch2: %{name}-2.5.1-libs.patch
+Patch3: %{name}-2.5.1-init.patch
+Patch4: %{name}-2.5.1-shebang.patch
+Patch5: %{name}-2.5.1-disable.patch
+Patch6: %{name}-2.5.1-config.patch
+Patch7: %{name}-2.5.2-pkgconfig.patch
+Patch11: %{name}-2.5.1-isqlalign.patch
 
-%description		-n %libfbembed
-Multi-process, local client libraries for Firebird SQL RDBMS
+%description
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
 
 
 %prep
-%setup -q -n %{pkgname}
-# convert intl character to UTF-8
-iconv -f ISO-8859-1 -t utf-8 -c ./doc/README.intl -o ./doc/README.intl
-# backport patch
-%patch1 -p1
-%patch0
+%setup -n %{upversion}
+%patch1
 %patch2
 %patch3
 %patch4
+%patch5
+%patch6
+%patch7
+%patch11
+
(576 more lines skipped)
Index: Firebird-2.5.2.26397-0.tar.bz2
===================================================================
Binary files Firebird-2.5.2.26397-0.tar.bz2 (revision 26) added
Index: firebird-2.5.1-chown.patch
===================================================================
--- firebird-2.5.1-chown.patch (added)
+++ firebird-2.5.1-chown.patch (revision 26)
@@ -0,0 +1,23 @@
+diff -up builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig-chown builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
+--- builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig-chown	2010-10-13 17:35:13.000000000 +0200
++++ builds/install/arch-specific/linux/misc/makeInstallImage.sh.in	2011-05-17 10:38:04.500019633 +0200
+@@ -28,10 +28,15 @@
+ # This script builds an image of the installed system into 
+ # the gen/buildroot directory.
+ 
+-if [ "`whoami`" != "root" ]; then
+-	echo 'You must be root to build package'
+-	exit 1
+-fi
++#if [ "`whoami`" != "root" ]; then
++#	echo 'You must be root to build package'
++#	exit 1
++#fi
++
++function chown
++{
++  :
++}
+ 
+ # Making an assumption that this program is being run in the gen directory
+ BuildRootDir=..
Index: firebird-2.5.1-config.patch
===================================================================
--- firebird-2.5.1-config.patch (added)
+++ firebird-2.5.1-config.patch (revision 26)
@@ -0,0 +1,11 @@
+diff -up builds/install/misc/firebird.conf.in.orig-config builds/install/misc/firebird.conf.in
+--- builds/install/misc/firebird.conf.in.orig-config	2011-09-19 11:19:53.000000000 +0200
++++ builds/install/misc/firebird.conf.in	2011-09-29 10:53:08.938861246 +0200
+@@ -92,6 +92,7 @@
+ # Type: string (special format)
+ #
+ #DatabaseAccess = Full
++DatabaseAccess = Restrict /srv/firebird
+ 
+ 
+ # ----------------------------
Index: firebird-2.5.1-disable.patch
===================================================================
--- firebird-2.5.1-disable.patch (added)
+++ firebird-2.5.1-disable.patch (revision 26)
@@ -0,0 +1,18 @@
+diff -up builds/install/arch-specific/linux/misc/firebird.xinetd.in.orig-xinetd builds/install/arch-specific/linux/misc/firebird.xinetd.in
+--- builds/install/arch-specific/linux/misc/firebird.xinetd.in.orig-xinetd	2011-09-19 11:19:52.000000000 +0200
++++ builds/install/arch-specific/linux/misc/firebird.xinetd.in	2011-09-27 17:16:19.940917686 +0200
+@@ -7,11 +7,12 @@
+ 
+ service @FB_SERVICE_NAME@
+ {
+-	disable = no
++	disable		= yes
+ 	flags		= REUSE
++	protocol	= tcp
+ 	socket_type	= stream
+ 	wait		= no
+-	user		= root
++	user		= firebird
+ # These lines cause problems with Windows XP SP2 clients
+ # using default firewall configuration (SF#1065511)
+ #	log_on_success	+= USERID
Index: firebird-2.5.1-init.patch
===================================================================
--- firebird-2.5.1-init.patch (added)
+++ firebird-2.5.1-init.patch (revision 26)
@@ -0,0 +1,46 @@
+diff -up builds/install/arch-specific/linux/misc/firebird.init.d.suse.in.orig-init builds/install/arch-specific/linux/misc/firebird.init.d.suse.in
+--- builds/install/arch-specific/linux/misc/firebird.init.d.suse.in.orig-init	2011-10-13 13:58:02.000000000 +0200
++++ builds/install/arch-specific/linux/misc/firebird.init.d.suse.in	2011-10-18 09:09:53.847872486 +0200
+@@ -17,6 +17,7 @@
+ # Required-Stop:  
+ # Default-Start:  2 3 5
+ # Default-Stop:   0 1 6
++# Short-Description: Firebird SQL server
+ # Description:    Start the Firebird database server.
+ ### END INIT INFO
+ 
+@@ -42,6 +43,7 @@ test "$START_FIREBIRD" = yes || exit 0
+ 
+ FIREBIRD=@FB_CONFDIR@
+ FBRunUser=firebird
++FBRunGroup=firebird
+ INSTANCE=default
+ 
+ makeFbDir() {
+@@ -54,10 +56,10 @@ makeFbDir() {
+ 			chmod $mode $mDir
+ 		fi
+ 	fi
+-	chown $FBRunUser:$FBRunUser $mDir
++	chown $FBRunUser:$FBRunGroup $mDir
+ }
+-runDir=/var/run/firebird
+-makeFbDir $runDir
++runDir=@FB_GUARDDIR@
++makeFbDir $runDir 0755
+ lockDir=/tmp/firebird
+ makeFbDir $lockDir 0770
+ 
+@@ -122,11 +124,7 @@ case "$1" in
+ 	## set echo the echo return value.
+ 
+ 	## I had to use generic approach here - I can't test on suse. AP.
+-	if [ -f $pidfile ]
+-	then
+-		kill `cat $pidfile`
+-		sleep 1
+-	fi
++	killproc -p "$pidfile" $FBSBIN/fbguard
+ 		
+ 
+ 	# Remember status and be verbose
Index: firebird-2.5.1-isqlalign.patch
===================================================================
--- firebird-2.5.1-isqlalign.patch (added)
+++ firebird-2.5.1-isqlalign.patch (revision 26)
@@ -0,0 +1,105 @@
+diff -up src/isql/isql.epp.orig-isqlalign src/isql/isql.epp
+--- src/isql/isql.epp.orig-isqlalign	2011-02-23 13:19:16.000000000 +0100
++++ src/isql/isql.epp	2011-05-17 10:39:11.498686994 +0200
+@@ -70,6 +70,9 @@
+ #ifdef HAVE_TERMIOS_H
+ #include <termios.h>
+ #endif
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
+ 
+ //#ifdef HAVE_IO_H
+ //#include <io.h> // mktemp
+@@ -575,6 +578,8 @@ int ISQL_main(int argc, char* argv[])
+ 	}
+ #endif	// MU_ISQL
+ 
++	setlocale(LC_ALL, "");
++
+ 	TEXT tabname[WORDLENGTH];
+ 	tabname[0] = '\0';
+ 	isqlGlob.db_SQL_dialect = 0;
+@@ -7350,6 +7355,35 @@ static bool checkSpecial(TEXT* const p,
+ }
+ 
+ 
++// *********************************
++// p r i n t _ i t e m _ s t r i n g
++// *********************************
++// print a string considering multibyte character sets
++
++static void print_item_string(
++	char* buff, char* str, SLONG disp_wd)
++{
++	int mlen = 0;
++	wchar_t* ws = reinterpret_cast<wchar_t*>(
++		ISQL_ALLOC((disp_wd+1)*sizeof(wchar_t)));
++	int wlen = mbstowcs(ws, str, disp_wd);
++	if (wlen >= 0) {
++		ws[disp_wd] = L'\0';
++		mlen = wcstombs(buff, ws, disp_wd*MB_CUR_MAX);
++		if (mlen >= 0)
++			buff[mlen] = '\0';
++	}
++	if (wlen < 0 || mlen < 0) {
++		strncpy(buff, str, disp_wd);
++		mlen = MIN(strlen(str), disp_wd);
++		wlen = mlen;
++	}
++	memset(buff+mlen, ' ', disp_wd-wlen+1);
++	buff[mlen+disp_wd-wlen+1] = '\0';
++	ISQL_FREE(ws);
++}
++
++
+ static SSHORT print_item(TEXT** s, XSQLVAR* var, const int length)
+ {
+ /**************************************
+@@ -7642,10 +7676,7 @@ static SSHORT print_item(TEXT** s, XSQLV
+ 			}
+ 			else
+ 			{
+-				// Truncate if necessary
+-				if (length < var->sqllen)
+-					string[length] = '\0';
+-				sprintf(p, "%-*s ", length, var->sqldata);
++				print_item_string(p, string, length);
+ 			}
+ 			break;
+ 
+@@ -7738,10 +7769,7 @@ static SSHORT print_item(TEXT** s, XSQLV
+ 				}
+ 				else
+ 				{
+-					// Truncate if necessary
+-					if (length < avary->vary_length)
+-						avary->vary_length = length;
+-					sprintf(p, "%-*.*s ", length, (int) avary->vary_length, avary->vary_string);
++					print_item_string(p, avary->vary_string, length);
+ 				}
+ 				break;
+ 			}
+@@ -8425,7 +8453,7 @@ static SLONG process_sqlda_display(XSQLD
+ 		// Record the length of name and var, then convert to print
+ 		// length, later to be stored in pad array
+ 
+-		USHORT data_length, disp_length, alignment;
++		USHORT data_length, disp_length, alignment, buff_length;
+ 		data_length = disp_length = alignment = var->sqllen;
+ 		SSHORT namelength = var->aliasname_length;
+ 
+@@ -8513,10 +8541,12 @@ static SLONG process_sqlda_display(XSQLD
+ 		{
+ 			if (!global_Cols.find(var->aliasname, &pad[i]) && global_Col_default)
+ 				pad[i] = global_Col_default;
++			buff_length = pad[i] * MB_CUR_MAX;
+ 		}
++		else buff_length = pad[i];
+ 
+ 		// The total line length
+-		linelength += pad[i] + 1;
++		linelength += buff_length + 1;	
+ 
+ 		// Allocate space in buffer for data
+ 
Index: firebird-2.5.1-libs.patch
===================================================================
--- firebird-2.5.1-libs.patch (added)
+++ firebird-2.5.1-libs.patch (revision 26)
@@ -0,0 +1,12 @@
+diff -up builds/posix/Makefile.in.client.isql.orig-libs builds/posix/Makefile.in.client.isql
+--- builds/posix/Makefile.in.client.isql.orig-libs	2010-10-13 17:35:00.000000000 +0200
++++ builds/posix/Makefile.in.client.isql	2011-05-17 10:38:45.241601166 +0200
+@@ -59,7 +59,7 @@ Dependencies = $(AllObjects:.o=.d)
+ isql : $(LIBFBCLIENT_SO) $(ISQL)
+ 
+ $(ISQL):	$(ISQL_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
+-	$(EXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) $(LIBEDITLINE)
++	$(EXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LIBEDITLINE) $(LINK_LIBS)
+ 
+ 
+ include $(ROOT)/gen/make.shared.targets
Index: firebird-2.5.1-shebang.patch
===================================================================
--- firebird-2.5.1-shebang.patch (added)
+++ firebird-2.5.1-shebang.patch (revision 26)
@@ -0,0 +1,12 @@
+diff -up builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig-shebang builds/install/arch-specific/linux/misc/makeInstallImage.sh.in
+--- builds/install/arch-specific/linux/misc/makeInstallImage.sh.in.orig-shebang	2011-05-17 15:17:52.526524357 +0200
++++ builds/install/arch-specific/linux/misc/makeInstallImage.sh.in	2011-05-17 15:20:09.648750283 +0200
+@@ -60,6 +60,8 @@ addLibs() {
+ 	then
+ 		rm -f $libTarget
+ 		touch $libTarget
++		echo "#!/bin/sh" >>$libTarget
++		echo >>$libTarget
+ 		for i in posixLibrary.sh @FIREBIRD_ARCH_TYPE@Library.sh linuxLibrary.sh
+ 		do
+ 			echo "# $i" >>$libTarget
Index: firebird-2.5.2-pkgconfig.patch
===================================================================
--- firebird-2.5.2-pkgconfig.patch (added)
+++ firebird-2.5.2-pkgconfig.patch (revision 26)
@@ -0,0 +1,44 @@
+diff -up builds/install/arch-specific/linux/classic/fbembed.pc.in.orig-pc builds/install/arch-specific/linux/classic/fbembed.pc.in
+--- builds/install/arch-specific/linux/classic/fbembed.pc.in.orig-pc	2011-11-29 09:05:40.657958483 +0100
++++ builds/install/arch-specific/linux/classic/fbembed.pc.in	2011-11-29 09:11:59.873852393 +0100
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@FB_LIBDIR@
++includedir=@FB_INCDIR@
++
++Name: fbembed
++Description: Firebird embedded client library
++Version: @FIREBIRD_VERSION@
++Cflags: -I${includedir}
++Libs: -L${libdir} -lfbclient
+diff -up builds/install/arch-specific/linux/super/fbclient.pc.in.orig-pc builds/install/arch-specific/linux/super/fbclient.pc.in
+--- builds/install/arch-specific/linux/super/fbclient.pc.in.orig-pc	2011-11-29 09:05:40.657958483 +0100
++++ builds/install/arch-specific/linux/super/fbclient.pc.in	2011-11-29 09:12:04.660753104 +0100
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@FB_LIBDIR@
++includedir=@FB_INCDIR@
++
++Name: fbclient
++Description: Firebird client library
++Version: @FIREBIRD_VERSION@
++Cflags: -I${includedir}
++Libs: -L${libdir} -lfbclient
+diff -up configure.in.orig-pc configure.in
+--- configure.in.orig-pc	2011-08-02 17:50:56.000000000 +0200
++++ configure.in	2011-11-29 09:05:40.657958483 +0100
+@@ -1290,6 +1290,12 @@ case "$PLATFORM" in
+                      gen/install/misc/rc.config.firebird:builds/install/arch-specific/linux/misc/rc.config.firebird.in
+                      gen/firebird/bin/linuxLibrary.sh:builds/install/arch-specific/linux/misc/linuxLibrary.sh.in]
+       ,[chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null])
++    if test $FIREBIRD_ARCH_TYPE = super; then
++      AC_CONFIG_FILES([gen/install/misc/fbclient.pc:${INSTALL_SRC_DIR}/fbclient.pc.in])
++    fi
++    if test $FIREBIRD_ARCH_TYPE = classic; then
++      AC_CONFIG_FILES([gen/install/misc/fbembed.pc:${INSTALL_SRC_DIR}/fbembed.pc.in])
++    fi
+     ;;
+ 
+   HPUX)
Index: firebird-classic.changes
===================================================================
--- firebird-classic.changes (added)
+++ firebird-classic.changes (revision 26)
@@ -0,0 +1,216 @@
+-------------------------------------------------------------------
+Wed Dec 14 12:43:09 UTC 2011 - mkubecek@suse.cz
+
+- update to upstream version 2.5.2.26397
+  * CORE-3490: Concurrency problem when using named cursors
+  * CORE-3690: Wrong warning message for ambiguous query
+  * CORE-3680: EXECUTE BLOCK statement and ISC_DSQL_EXECUTE2() problem
+  * CORE-927: Grants don't work for procedures used inside views
+  * CORE-3692: Cannot drop a NOT NULL constraint on a field
+    participating in the UNIQUE constraint
+  * CORE-3601 - Incorrect TEXT BLOB charset transliteration on VIEW with
+    trigger
+- add libtool and pkg-config to BuildRequires
+
+-------------------------------------------------------------------
+Tue Nov 29 09:12:47 UTC 2011 - mkubecek@suse.cz
+
+- fixed include directory in pkg-config files
+- set --prefix to /usr (shouldn't influence anything anyway)
+
+-------------------------------------------------------------------
+Mon Nov 28 10:39:34 UTC 2011 - mkubecek@suse.cz
+
+- provide pkg-config files for libfbclient and libfbembed
+
+-------------------------------------------------------------------
+Thu Nov 10 12:37:45 UTC 2011 - mkubecek@suse.cz
+
+- update to upstream version 2.5.2.26389
+  * CORE-3646: Segmentation fault in multi-threaded program when using
+    2.5.x client library on Linux
+  * CORE-3650: Recreation of collation leads to FB "death"
+  * CORE-3557: AV in engine when preparing query against dropping table
+  * CORE-3579: Can't drop table when computed field depends on later
+  * created another field
+
+-------------------------------------------------------------------
+Mon Oct 31 09:04:15 UTC 2011 - mkubecek@suse.cz
+
+- update to upstream version 2.5.2.26386
+  * CORE-3636: Firebird 2.5.1 server crashes with Trace API
+  * CORE-3631: Duplicate records with NULLs checked incorrectly
+  * CORE-3627: Server crashes with access violation when inserting
+    row into table with unique index
+  * CORE-3600: temp files fb_query_xxxx remains after ISQL has been
+    closed
+  * CORE-3612: gfix-related services may loose error value in status
+    vector in isc_service_start()
+  * CORE-3610: Can insert DUPLICATE keys in UNIQUE index
+
+-------------------------------------------------------------------
+Tue Oct 18 06:56:41 UTC 2011 - mkubecek@suse.cz
+
+- compatibility with upstream tarball
+
+-------------------------------------------------------------------
+Fri Sep 30 13:34:30 UTC 2011 - mkubecek@suse.cz
+
+- fixes in init script, removed unneeded patch
+
+-------------------------------------------------------------------
+Thu Sep 29 17:28:16 UTC 2011 - mkubecek@suse.cz
+
+- fix baselibs.conf (libib_util.so moved to firebird)
+
+-------------------------------------------------------------------
+Thu Sep 29 17:22:15 UTC 2011 - mkubecek@suse.cz
+
+- add /srv/firebird directory
+- restrict DatabaseAccess to /srv/firebird in default configuration
+- move libib_util back to main server package (it depends on it)
+- mark xinetd config file as config
+- build with system editline
+- don't fail install/upgrade if user or group creation fails
+- rename isql and gstat to avoid conflict with other packages
+
+-------------------------------------------------------------------
+Tue Sep 27 18:47:57 UTC 2011 - mkubecek@suse.cz
+
+- common firebird-devel for header files and libib_util.so
+- separate firebird-superserver package
+- separate firebird-classic package
+- build firebird-doc as noarch if possible (suse_version > 1110)
+- restart on update (in postun)
+- remove full version from patch names
+- disable xinetd service by default
+- move misc to _datadir
+
+-------------------------------------------------------------------
+Mon Sep 26 15:00:49 UTC 2011 - mkubecek@suse.cz
+
+- moved to BuildService
+- removed %debug_package
+- build libfbclient2-32bit
+- move libib_util.so to main package
+- restart on update
+- fixed typo init init script
+
+-------------------------------------------------------------------
+Mon Sep 19 2011 - mike@mk-sys.cz
+- update to 2.5.1.26358
+
+-------------------------------------------------------------------
+Fri Jun 24 2011 - mike@mk-sys.cz
+
+- update to 2.5.1.26319
+
+-------------------------------------------------------------------
+Wed May 25 2011 - mike@mk-sys.cz
+
+- update to 2.5.1.26285
+- remove init scripts for other distributions
+- simplify user/group creation
+
+-------------------------------------------------------------------
+Tue May 17 2011 - mike@mk-sys.cz
+
+- update to 2.5.1.26279
+- compile against system ICU
+- shared libraries moved into a subpackage
+- create /var/run/firebird in init script
+- add Short-Description into the init script
+- fixed interpreter specification in support scripts
+- full path tu useradd and groupadd in pre-install script
+
+-------------------------------------------------------------------
+Sat Mar 19 2011 - mike@mk-sys.cz
+
+- update to 2.5.1.26239
+
+-------------------------------------------------------------------
+Mon Jan 17 2011 - mike@mk-sys.cz
+
+- update to 2.5.0.26179
+
+-------------------------------------------------------------------
+Sun Nov 07 2010 - mike@mk-sys.cz
+
+- add useradd and groupadd to dependencies
+
+-------------------------------------------------------------------
+Fri Oct 15 2010 - mike@mk-sys.cz
+
+- update to 2.5.0.26098 (2.5.0 Release)
+
+-------------------------------------------------------------------
+Wed Aug 04 2010 - mike@mk-sys.cz
+
+- fixed typo in specfile (BuildRoot)
+
+-------------------------------------------------------------------
+Mon Aug 02 2010 - mike@mk-sys.cz
+
+- create firebird user and group in preinstall script
+
+-------------------------------------------------------------------
+Sun Aug 01 2010 - mike@mk-sys.cz
+
+- update to 2.5.0.26054
+
+-------------------------------------------------------------------
+Tue Jun 01 2010 - mike@mk-sys.cz
+
+- update to 2.5.0.26038
+
+-------------------------------------------------------------------
+Wed May 12 2010 - mike@mk-sys.cz
+
+- update to 2.5.0.26005
+
+-------------------------------------------------------------------
+Fri Apr 02 2010 - mike@mk-sys.cz
+
+- update to 2.5.0.25980
+
+-------------------------------------------------------------------
+Sat Mar 20 2010 - mike@mk-sys.cz
+
+- update to 2.5.0.25958
+
+-------------------------------------------------------------------
+Sat Feb 06 2010 - mike@mk-sys.cz
+
+- update to 2.5.0.25920
+
+-------------------------------------------------------------------
+Mon Jan 04 2010 - mike@mk-sys.cz
+
+- update to 2.5.0.25904
+
+-------------------------------------------------------------------
+Sun Dec 06 2009 - mike@mk-sys.cz
+
+- update to 2.5.0.25856
+
+-------------------------------------------------------------------
+Thu Nov 12 2009 - mike@mk-sys.cz
+
+- update to 2.5.0.25784
(17 more lines skipped)
Index: firebird-classic.spec
===================================================================
--- firebird-classic.spec (added)
+++ firebird-classic.spec (revision 26)
@@ -0,0 +1,152 @@
+%define upversion Firebird-2.5.2.26397-0
+%define bname firebird
+
+Name: firebird-classic
+Version: 2.5.2.26397
+Release: 1
+Source: %{upversion}.tar.bz2
+URL: http://www.firebirdsql.org/
+BuildRoot: %{_tmppath}/%{bname}-%{version}-buildroot
+BuildRequires: gcc-c++ libtool pkg-config
+BuildRequires: ncurses-devel libicu-devel libedit-devel
+Requires(pre): pwdutils
+Requires: %{bname} = %{version}
+Provides: %{bname}-server
+Group: Productivity/Databases/Servers
+License: IDPL
+Summary: Classic architecture binaries for SQL database server
+
+Patch1: %{bname}-2.5.1-chown.patch
+Patch2: %{bname}-2.5.1-libs.patch
+Patch3: %{bname}-2.5.1-init.patch
+Patch4: %{bname}-2.5.1-shebang.patch
+Patch5: %{bname}-2.5.1-disable.patch
+Patch6: %{bname}-2.5.1-config.patch
+Patch7: %{bname}-2.5.2-pkgconfig.patch
+Patch11: %{bname}-2.5.1-isqlalign.patch
+
+%description
+Classic architecture binaries for Firebird SQL server. These can be used
+either for Classic (separate processes run by (x)inetd) or SuperClassic
+(one multithreaded daemon with per-connection cache and shared locking
+system) model.
+
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
+
+
+%prep
+%setup -n %{upversion}
+%patch1
+%patch2
+%patch3
+%patch4
+%patch5
+%patch6
+%patch7
+%patch11
+
+
+%build
+./autogen.sh --prefix=%{_prefix} \
+  --with-system-icu --with-system-editline \
+  --with-fbbin=%{_bindir} --with-fbsbin=%{_sbindir} \
+  --with-fbconf=%{_sysconfdir}/%{bname} \
+  --with-fblib=%{_libdir} --with-fbinclude=%{_includedir}/%{bname} \
+  --with-fbdoc=%{_docdir}/%{bname} \
+  --with-fbudf=%{_libdir}/%{bname}/udf \
+  --with-fbsample=%{_docdir}/%{bname}/sample \
+  --with-fbsample-db=%{_libdir}/%{bname}/sample \
+  --with-fbhelp=%{_libdir}/%{bname}/lib \
+  --with-fbintl=%{_libdir}/%{bname}/intl \
+  --with-fbmisc=%{_datadir}/%{bname}/misc \
+  --with-fbsecure-db=%{_localstatedir}/lib/%{bname}/secdb \
+  --with-fbmsg=%{_libdir}/%{bname}/lib \
+  --with-fblog=%{_localstatedir}/log/%{bname} \
+  --with-fbglock=%{_localstatedir}/run/%{bname} \
+  --with-fbplugins=%{_libdir}/%{bname}/plugins
+make %{?jobs:CPU=%jobs}
+cd gen
+make -f Makefile.install buildRoot
+chmod -R u+w buildroot%{_docdir}/%{bname}
+
+
+%install
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+cp gen/buildroot%{_bindir}/* ${RPM_BUILD_ROOT}%{_bindir}/
+mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
+cp gen/buildroot%{_sbindir}/* ${RPM_BUILD_ROOT}%{_sbindir}/
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}
+cp -a gen/buildroot%{_libdir}/libfbembed.so* ${RPM_BUILD_ROOT}%{_libdir}/
+mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d
+cp gen/buildroot%{_datadir}/%{bname}/misc/firebird.xinetd \
+  ${RPM_BUILD_ROOT}%{_sysconfdir}/xinetd.d/%{bname}
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
+cp -v gen/install/misc/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/
+cd ${RPM_BUILD_ROOT}
+rm -vf .%{_sbindir}/*.sh
+rm -vf .%{_sbindir}/fb_config
+mv -v .%{_bindir}/isql .%{_bindir}/isql-fb
+mv -v .%{_bindir}/gstat .%{_bindir}/gstat-fb
+
+
+%files
+%defattr(-,root,root)
+%{_bindir}/*
+%{_sbindir}/*
+%config(noreplace) %{_sysconfdir}/xinetd.d/%{bname}
+
+
+# ----------------------------------------------------------------------------
+
+%package -n libfbembed2_5
+Group: Development/Libraries/C and C++
+Summary: Firebird SQL server embedded client library
+
+%description -n libfbembed2_5
+Shared embedded client library for Firebird SQL server.
+
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
+
+
+%files -n libfbembed2_5
+%defattr(-,root,root)
+%{_libdir}/libfbembed.so.*
+
+%post -n libfbembed2_5
+/sbin/ldconfig
+
+%postun -n libfbembed2_5
+/sbin/ldconfig
+
+
+# ----------------------------------------------------------------------------
+
+%package -n libfbembed-devel
+Group: Development/Libraries/C and C++
+Summary: Development files for Firebird SQL server embedded client library
+Requires: %{bname}-devel
+Requires: libfbembed2_5 = %{version}
+ 
+%description -n libfbembed-devel
+Development files for Firebird SQL server embedded client library.
+ 
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
+
+
+%files -n libfbembed-devel
+%defattr(-,root,root)
+%{_libdir}/libfbembed.so
+%{_libdir}/pkgconfig/fbembed.pc
+
Index: 01_firebird
===================================================================
--- 01_firebird (revision 67)
+++ 01_firebird (deleted)
@@ -1,3 +0,0 @@
-test -d /var/run || mkdir -m 755 /var/run
-test -d /var/run/firebird || mkdir -m 1777 /var/run/firebird
-
Index: Firebird-2.1.3.18185-0.tar.bz2
===================================================================
Binary files Firebird-2.1.3.18185-0.tar.bz2 (revision 67) deleted
Index: Firebird-edit_fix.diff
===================================================================
--- Firebird-edit_fix.diff (revision 67)
+++ Firebird-edit_fix.diff (deleted)
@@ -1,24 +0,0 @@
-diff -Naur Firebird-2.1.1.17910-0/builds/posix/make.defaults Firebird-2.1.1.17910-0.oden/builds/posix/make.defaults
---- Firebird-2.1.1.17910-0/builds/posix/make.defaults	2008-05-27 05:26:39.000000000 -0400
-+++ Firebird-2.1.1.17910-0.oden/builds/posix/make.defaults	2008-07-18 09:54:40.000000000 -0400
-@@ -230,7 +230,7 @@
- 
- ifeq ($(EDITLINE_FLG),Y)
-   ifeq ($(STD_EDITLINE), true)
--	LIBEDITLINE := -leditline
-+	LIBEDITLINE := -ledit
-   else
- 	LIBEDITLINE := $(LIB)/libeditline.a
-   endif
-diff -Naur Firebird-2.1.1.17910-0/configure.in Firebird-2.1.1.17910-0.oden/configure.in
---- Firebird-2.1.1.17910-0/configure.in	2008-05-27 05:26:28.000000000 -0400
-+++ Firebird-2.1.1.17910-0.oden/configure.in	2008-07-18 09:54:25.000000000 -0400
-@@ -399,7 +399,7 @@
- # not need editline in default libs, but need to test for its presence
- saveLIBS=$LIBS
- if test "$STD_EDITLINE" = "true"; then
--  AC_CHECK_LIB(editline, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
-+  AC_CHECK_LIB(edit, readline, EDITLINE_FLG=Y, STD_EDITLINE=false)
- fi
- LIBS=$saveLIBS
- 
Index: README.openSUSE
===================================================================
--- README.openSUSE (revision 67)
+++ README.openSUSE (deleted)
@@ -1,41 +0,0 @@
-Differences between upstream and the openSUSE package
-=====================================================
-
-* All files are installed according to the FHS. Relatively complete
-  environment as provided by upstream may be found in %{fbroot} 
-
-* Firebird utilities gbak,gsec,gfix,nbackup and gstat 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 openSUSE packaging rules, firebird service is not started 
-  automatically. You need to start it, as root : 
-  for SuperServer :  
-    service firebird start
-  for Classic :  
-    chkconfig firebird on
-  If you wanted to have firebird Superserver started at each boot, as root :
-  chkconfig --level 345 firebird on
-
-* openSUSE 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.1 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.
-
Index: firebird-gcc-icu.patch
===================================================================
--- firebird-gcc-icu.patch (revision 67)
+++ firebird-gcc-icu.patch (deleted)
@@ -1,32 +0,0 @@
-# Author: Adriano dos Santos Fernandes
-#Index: src/common/classes/alloc.h
-#===================================================================
-#RCS file: /cvsroot/firebird/firebird2/src/common/classes/alloc.h,v
-#retrieving revision 1.71
-diff -u -p -r1.71 alloc.h
---- src/common/classes/alloc.h	26 Sep 2007 17:48:20 -0000	1.71
-+++ src/common/classes/alloc.h	20 May 2009 02:20:08 -0000
-@@ -47,6 +47,7 @@
- #include <stdlib.h> /* XPG: prototypes for malloc/free have to be in
- 					   stdlib.h (EKU) */
- #endif
-+#include <new>
- 
- #ifdef _MSC_VER
- #define THROW_BAD_ALLOC
-@@ -448,15 +449,6 @@ inline void* operator new[](size_t s) TH
- 	);
- }
- 
--inline void* operator new(size_t, void* ptr) throw() 
--{
--	return ptr;
--}
--inline void* operator new[](size_t, void* ptr) throw() 
--{
--	return ptr;
--}
--
- inline void operator delete(void* mem) throw()
- {
- 	Firebird::MemoryPool::globalFree(mem);
Index: firebird-gcc-warnings-fixes.patch
===================================================================
--- firebird-gcc-warnings-fixes.patch (revision 67)
+++ firebird-gcc-warnings-fixes.patch (deleted)
@@ -1,96 +0,0 @@
-diff -ruN ../Firebird-2.1.2.18118-0/examples/empbuild/empbuild.e ./examples/empbuild/empbuild.e
---- ../Firebird-2.1.2.18118-0/examples/empbuild/empbuild.e	2005-12-09 18:17:25.000000000 +0800
-+++ ./examples/empbuild/empbuild.e	2009-05-27 21:01:12.000000000 +0900
-@@ -145,7 +145,7 @@
-  *
-  **************************************/
- TEXT	job_code[6], job_country[16];
--TEXT	line[81];
-+TEXT	line[100]; //fixed destbufferoverflow 
- TEXT	lang_array[5][16];
- int	i, job_grade, rec_cnt = 0;
- 
-@@ -211,7 +211,7 @@
-  *
-  **************************************/
- TEXT		job_code[6];
--TEXT		line[82], job_country[16];
-+TEXT		line[100], job_country[16]; //fixed destbufferoverflow 
- int		len;
- ISC_QUAD	job_blob;
- int		job_grade, rec_cnt = 0;
-@@ -288,7 +288,7 @@
-  *
-  **************************************/
- TEXT		proj_id[6];
--TEXT		line[82];
-+TEXT		line[100]; //fixed destbufferoverflow
- int		len;
- ISC_QUAD	proj_blob;
- int		rec_cnt = 0;
-@@ -363,7 +363,7 @@
-  **************************************/
- TEXT		proj_id[6], dept_no[4];
- int		yr;
--TEXT		line[81];
-+TEXT		line[100]; //fixed destbufferoverflow
- int		hcnt[4];
- int		rec_cnt = 0;
- 
-diff -ruN ../Firebird-2.1.2.18118-0/src/burp/restore.epp ./src/burp/restore.epp
---- ../Firebird-2.1.2.18118-0/src/burp/restore.epp	2008-12-06 00:30:07.000000000 +0800
-+++ ./src/burp/restore.epp	2009-05-27 21:09:44.000000000 +0900
-@@ -5574,6 +5574,7 @@
- 			break;
- 		}
- 	}
-+	return true; // fixed  no-return-in-nonvoid-function
- }
- 
- bool get_sql_roles(BurpGlobals* tdgbl)
-diff -ruN ../Firebird-2.1.2.18118-0/src/qli/compile.cpp ./src/qli/compile.cpp
---- ../Firebird-2.1.2.18118-0/src/qli/compile.cpp	2007-02-22 17:58:56.000000000 +0800
-+++ ./src/qli/compile.cpp	2009-05-27 21:23:02.000000000 +0900
-@@ -865,7 +865,7 @@
- 
- 	qli_nod* list = node->nod_arg[e_fun_args];
- 
--	qli_nod** ptr = ptr = list->nod_arg;
-+	qli_nod** ptr = list->nod_arg; //fixed undified operation, maybe
- 	for (const qli_nod* const* const end = ptr + list->nod_count; ptr < end; ptr++)
- 		compile_expression(*ptr, request, true);
- 
-diff -ruN ../Firebird-2.1.2.18118-0/src/qli/exe.h ./src/qli/exe.h
---- ../Firebird-2.1.2.18118-0/src/qli/exe.h	2004-05-25 02:20:44.000000000 +0900
-+++ ./src/qli/exe.h	2009-05-27 21:55:22.000000000 +0900
-@@ -38,7 +38,7 @@
- const USHORT RLB_BUFFER_SIZE	= 2048;
- const USHORT RLB_SAFETY_MARGIN	= 48;
- 
--#define CHECK_RLB(in)	(!in || (in->rlb_data > in->rlb_limit)) ? (in = GEN_rlb_extend (in)) : in;
-+#define CHECK_RLB(in)	(!in || (in->rlb_data > in->rlb_limit)) ? (GEN_rlb_extend (in)) : in; //fixed undefined operation
- /* Would need gener_proto.h visible here to use this macro.
- inline qli_rlb* CHECK_RLB(qli_rlb*& in)
- {
-diff -ruN ../Firebird-2.1.2.18118-0/src/utilities/drop.cpp ./src/utilities/drop.cpp
---- ../Firebird-2.1.2.18118-0/src/utilities/drop.cpp	2008-12-01 22:46:26.000000000 +0800
-+++ ./src/utilities/drop.cpp	2009-05-29 10:24:35.000000000 +0900
-@@ -223,7 +223,7 @@
- 
- 	if (!(strcmp(label, "lock manager"))) {
- 		if (!(pid = vfork())) {
--			execl(orig_argv[0], orig_argv[0], "-s", 0);
-+			execl(orig_argv[0], orig_argv[0], "-s", NULL); //fixed missing-sentinel
- 			_exit(FINI_ERROR);
- 		}
-         // wait(pid)  // this is wrong wait takes a *int anyway.
-@@ -307,7 +307,7 @@
- 
- 	if (!(strcmp(label, "lock manager"))) {
- 		if (!(pid = vfork())) {
--			execl(orig_argv[0], orig_argv[0], "-s", 0);
-+			execl(orig_argv[0], orig_argv[0], "-s", NULL); //fixed missing-sentinel
- 			_exit(FINI_ERROR);
- 		}
- #ifdef SCO_EV					/* 5.5 SCO Port: SCO needs waitpid() to function properly */
-
Index: firebird-logrotate
===================================================================
--- firebird-logrotate (revision 67)
+++ firebird-logrotate (deleted)
@@ -1,9 +0,0 @@
-firebird.log {
-     weekly
-     missingok
-     rotate 52
-     compress
-     delaycompress
-     notifempty
-     create 640 firebird adm
- }
Index: firebird-mcpu-to-mtune.patch
===================================================================
--- firebird-mcpu-to-mtune.patch (revision 67)
+++ firebird-mcpu-to-mtune.patch (deleted)
@@ -1,12 +0,0 @@
-diff -ruN ./builds/posix/prefix.linux ../Firebird-2.1.2.18118-0/builds/posix/prefix.linux
---- ./builds/posix/prefix.linux	2007-05-03 20:24:50.000000000 +0900
-+++ ../Firebird-2.1.2.18118-0/builds/posix/prefix.linux	2009-05-26 17:39:11.000000000 +0900
-@@ -22,7 +22,7 @@
- # you may remove it if engine is getting compiled with any other GCC version
- 
- COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin
-+OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer -fno-builtin
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
- PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
Index: firebird.conf
===================================================================
--- firebird.conf (revision 67)
+++ firebird.conf (deleted)
@@ -1,2 +0,0 @@
-d /var/run/firebird 1777 root root -
-
Index: firebird_lock-file-location.patch
===================================================================
--- firebird_lock-file-location.patch (revision 67)
+++ firebird_lock-file-location.patch (deleted)
@@ -1,49 +0,0 @@
-# Author: Damyan Ivanov <dmn@debian.org>
-# Description: use proper Fedora location for lock files,
-#              control sockets and such
---- src/jrd/file_params.h
-+++ src/jrd/file_params.h
-@@ -38,11 +38,11 @@ const int EVENT_VERSION		= 2;
- const int EVENT_SEMAPHORES	= 1;
- 
- #ifdef NOHOSTNAME
--static const char* EVENT_FILE	= "isc_event1";
--static const char* LOCK_FILE	= "isc_lock1.gbl";
--static const char* INIT_FILE	= "isc_init1";
--static const char* GUARD_FILE	= "isc_guard1";
--static const char* MONITOR_FILE	= "isc_monitor1";
-+static const char* EVENT_FILE	= "run/isc_event1";
-+static const char* LOCK_FILE	= "run/isc_lock1.gbl";
-+static const char* INIT_FILE	= "run/isc_init1";
-+static const char* GUARD_FILE	= "run/isc_guard1";
-+static const char* MONITOR_FILE	= "run/isc_monitor1";
- #elif defined(VMS)
- static const char* EVENT_FILE	= "[000000]isc_event1.%s";
- static const char* LOCK_FILE	= "[000000]isc_lock1.%s";
-@@ -56,11 +56,11 @@ static const char* INIT_FILE	= "%s.int";
- static const char* GUARD_FILE	= "%s.grd";
- static const char* MONITOR_FILE	= "%s.mon";
- #else
--static const char* EVENT_FILE	= "isc_event1.%s";
--static const char* LOCK_FILE	= "isc_lock1.%s";
--static const char* INIT_FILE	= "isc_init1.%s";
--static const char* GUARD_FILE	= "isc_guard1.%s";
--static const char* MONITOR_FILE	= "isc_monitor1.%s";
-+static const char* EVENT_FILE	= "run/isc_event1.%s";
-+static const char* LOCK_FILE	= "run/isc_lock1.%s";
-+static const char* INIT_FILE	= "run/isc_init1.%s";
-+static const char* GUARD_FILE	= "run/isc_guard1.%s";
-+static const char* MONITOR_FILE	= "run/isc_monitor1.%s";
- #endif
- 
- #ifdef sun
---- configure.in
-+++ configure.in
-@@ -940,6 +940,7 @@ mkdir -p gen/firebird/examples/udf
- mkdir -p gen/firebird/lib
- mkdir -p gen/firebird/misc
- mkdir -p gen/firebird/help
-+mkdir -p gen/firebird/run
- 
- dnl #### TEMP ######### directories for .o and .d
- dnl # by module name

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

Remove merged file.

• Files Changed
• Browse Source

Fix build with gcc 4.7 - Please work with upstream to resolve it in upstream code base. There is also a chance that a newer version of the package might have this fixed already.

• Files Changed
• Browse Source

Update to upstream 2.1.4 final, which comes with important bug fixes.

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

Do not package files twice.;Remove tmpdirs.d support, handle install.

• Files Changed
• Browse Source

- Apply packaging guidelines (remove redundant/obsolete
  tags/sections from specfile, etc.)
  (adding -j1 is for easier grepping across all pkgs)

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

Use /usr/lib/tmpfiles.d instead of /etc/tmpfiles.d.

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

Fixup to the previous fixup for update-alternatives. I did not add more .changes entries, as this should apparently have been part of the last submit / changes. For some reason though the build did not fail before it went to sever:database. If you really need .changes, let me know.

• Files Changed
• Browse Source

This SR fixes the build on Factory, where update-alternatives got stricter in checking for proper usage.

- Fix update-alternatives usage: -classic and -super need to be
  registered as the same name to make it obvious that they are
  alternatives.

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

• Files Changed
• Browse Source

• Files Changed
• Browse Source

baserev update by copy to link target

• Files Changed
• Browse Source

• Files Changed
• Browse Source

checked in (request 39829)

• Files Changed
• Browse Source

- conditional %dir %{_sysconfdir}/tmpdirs.d 

• Files Changed
• Browse Source