Remove vulnerable versions, move to maintainer-needed (#460780)

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

12 files changed, 0 insertions, 1418 deletions

diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0387.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0387.patch
deleted file mode 100644
index 374f9454ef89..000000000000
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0387.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Naur Firebird-2.0.3.12981-0_orig/src/remote/protocol.cpp Firebird-2.0.3.12981-0/src/remote/protocol.cpp
---- Firebird-2.0.3.12981-0_orig/src/remote/protocol.cpp	2007-11-05 21:07:50.000000000 -0500
-+++ Firebird-2.0.3.12981-0/src/remote/protocol.cpp	2008-02-17 19:39:16.000000000 -0500
-@@ -1347,7 +1347,7 @@
- 
- 	rem_port* port = (rem_port*) xdrs->x_public;
- 
--	if (request_id >= port->port_object_vector->vec_count)
-+	if (!port->port_objects || request_id >= port->port_object_vector->vec_count)
- 		return FALSE;
- 
- 	rrq* request = (rrq*) port->port_objects[request_id];
-@@ -1644,7 +1644,7 @@
- 	rem_port* port = (rem_port*) xdrs->x_public;
- 	RSR statement;
- 	if (statement_id >= 0) {
--		if (statement_id >= port->port_object_vector->vec_count)
-+		if (!port->port_objects || statement_id >= port->port_object_vector->vec_count)
- 			return FALSE;
- 		if (!(statement = (RSR) port->port_objects[statement_id]))
- 			return FALSE;
-@@ -1736,7 +1736,7 @@
- 
- 	rem_port* port = (rem_port*) xdrs->x_public;
- 	if (statement_id >= 0) {
--		if (statement_id >= port->port_object_vector->vec_count)
-+		if (!port->port_objects || statement_id >= port->port_object_vector->vec_count)
- 			return FALSE;
- 		statement = (RSR) port->port_objects[statement_id];
- 	}
-diff -Naur Firebird-2.0.3.12981-0_orig/src/remote/server.cpp Firebird-2.0.3.12981-0/src/remote/server.cpp
---- Firebird-2.0.3.12981-0_orig/src/remote/server.cpp	2007-11-05 21:07:50.000000000 -0500
-+++ Firebird-2.0.3.12981-0/src/remote/server.cpp	2008-02-17 19:39:31.000000000 -0500
-@@ -74,7 +74,8 @@
- 
- #define CHECK_HANDLE(blk, cast, type, id, err)							\
- 	{																\
--		if (id >= port->port_object_vector->vec_count ||			\
-+		if (!port->port_objects ||									\
-+			id >= port->port_object_vector->vec_count ||			\
- 			!(blk = (cast) port->port_objects [id]) ||				\
- 			((BLK) blk)->blk_type != (UCHAR) type)					\
- 		{															\
-@@ -87,7 +88,8 @@
- 
- #define CHECK_HANDLE_MEMBER(blk, cast, type, id, err)					\
- 	{																\
--		if (id >= this->port_object_vector->vec_count ||			\
-+		if (!this->port_objects ||									\
-+			id >= this->port_object_vector->vec_count ||			\
- 			!(blk = (cast) this->port_objects [id]) ||				\
- 			((BLK) blk)->blk_type != (UCHAR) type)					\
- 		{															\
-@@ -1011,6 +1013,12 @@
- 	port->port_status_vector = status_vector;
- 	success(status_vector);
- 
-+	// This buffer is used by INET and WNET transports
-+	// to return the server identification string
-+	UCHAR buffer[BUFFER_TINY];
-+	const CSTRING save_string = send->p_resp.p_resp_data;
-+	send->p_resp.p_resp_data.cstr_address = buffer;
-+
- 	rem_port* aux_port = port->request(send);
- 	RDB rdb = port->port_context;
- 	if (bad_db(status_vector, rdb))
-@@ -1026,6 +1034,7 @@
- 		/* restore the port status vector */
- 
- 		port->port_status_vector = save_status;
-+		send->p_resp.p_resp_data = save_string;
- 		return;
- 	}
- 
-@@ -1037,6 +1046,7 @@
- /* restore the port status vector */
- 
- 	port->port_status_vector = save_status;
-+	send->p_resp.p_resp_data = save_string;
- }
- 
- 
-@@ -1448,6 +1458,8 @@
- 	printf("disconnect(server)        free rdb         %x\n", rdb);
- #endif
- 	this->port_context = NULL;
-+	if (this->port_async)
-+		this->port_async->port_context = NULL;
- 	ALLR_release(rdb);
- 	if (this->port_object_vector)
- 	{
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0467.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0467.patch
deleted file mode 100644
index 83633af5ec05..000000000000
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-CVE-2008-0467.patch
+++ /dev/null
@@ -1,629 +0,0 @@
-# Stolen from upstream CVS B2_0_Release branch
-# Fixes CVE-2008-0467http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-0467
-# Debian BTS: http://bugs.debian.org/463596
-# Upstream CORE-1603: http://tracker.firebirdsql.org/browse/CORE-1603?page=com.atlassian.jira.plugin.system.issuetabpanels:cvs-tabpanel
---- 2.0.orig/src/jrd/constants.h
-+++ 2.0/src/jrd/constants.h
-@@ -56,7 +56,7 @@
- 
- /* Misc constant values */
- 
--const int USERNAME_LENGTH	= 31;	/* Characters */
-+const unsigned int USERNAME_LENGTH	= 31;	/* Characters */
- 
- const size_t MAX_SQL_IDENTIFIER_SIZE = 32;
- const size_t MAX_SQL_IDENTIFIER_LEN = MAX_SQL_IDENTIFIER_SIZE - 1;
---- 2.0.orig/src/jrd/isc.cpp
-+++ 2.0/src/jrd/isc.cpp
-@@ -87,14 +87,13 @@
- 
- #include <windows.h>
- #include <aclapi.h>
-+#include <lmcons.h>
- 
- static USHORT os_type;
- static SECURITY_ATTRIBUTES security_attr;
- 
- //static TEXT interbase_directory[MAXPATHLEN];
- 
--static bool check_user_privilege();
--
- #endif // WIN_NT
- 
- static TEXT user_name[256];
-@@ -393,14 +392,29 @@
- }
- #endif
- 
-+const TEXT* ISC_get_host(Firebird::string& host)
-+{
-+/**************************************
-+ *
-+ *      I S C _ g e t _ h o s t
-+ *
-+ **************************************
-+ *
-+ * Functional description
-+ *      Get host name in non-plain buffer.
-+ *
-+ **************************************/
-+	TEXT buffer[BUFFER_SMALL];
-+	ISC_get_host(buffer, sizeof(buffer));
-+	host = buffer;
-+	return host.c_str();
-+}
-+
- #ifdef UNIX
--int ISC_get_user(TEXT*	name,
--									  int*	id,
--									  int*	group,
--									  TEXT*	project,
--									  TEXT*	organization,
--									  int*	node,
--									  const TEXT*	user_string)
-+bool ISC_get_user(Firebird::string*	name, 
-+				  int*	id,
-+				  int*	group,
-+				  const TEXT*	user_string)
- {
- /**************************************
-  *
-@@ -448,7 +462,7 @@
- 	}
- 
- 	if (name)
--		strcpy(name, p);
-+		*name = p;
- 
- 	if (id)
- 		*id = euid;
-@@ -456,15 +470,6 @@
- 	if (group)
- 		*group = egid;
- 
--	if (project)
--		*project = 0;
--
--	if (organization)
--		*organization = 0;
--
--	if (node)
--		*node = 0;
--
- 	return (euid == 0);
- }
- #endif
-@@ -573,13 +578,10 @@
- #endif
- 
- #ifdef WIN_NT
--int ISC_get_user(TEXT*	name,
--									  int*	id,
--									  int*	group,
--									  TEXT*	project,
--									  TEXT*	organization,
--									  int*	node,
--									  const TEXT*	user_string)
-+bool ISC_get_user(Firebird::string*	name, 
-+				  int*	id,
-+				  int*	group,
-+				  const TEXT*	user_string)
- {
- /**************************************
-  *
-@@ -597,162 +599,25 @@
- 	if (group)
- 		*group = -1;
- 
--	if (project)
--		*project = 0;
--
--	if (organization)
--		*organization = 0;
--
--	if (node)
--		*node = 0;
--
- 	if (name)
- 	{
--		name[0] = 0;
--		DWORD  name_len = 128;
--		if (GetUserName(name, &name_len))
--		{
--			name[name_len] = 0;
--
--			/* NT user name is case insensitive */
--
--			for (DWORD i = 0; i < name_len; i++)
--			{
--				name[i] = UPPER7(name[i]);
--			}
--
--/* This check is not internationalized, the security model needs to be
-- * reengineered, especially on SUPERSERVER where none of these local
-- * user (in process) assumptions are valid.
--			if (!strcmp(name, "ADMINISTRATOR"))
--			{
--				if (id)
--					*id = 0;
--
--				if (group)
--					*group = 0;
--			}
-- */
--		}
--	}
--
--	return check_user_privilege();
--}
--
--
--//____________________________________________________________
--//
--// Check to see if the user belongs to the administrator group.
--//
--// This routine was adapted from code in routine RunningAsAdminstrator
--// in \mstools\samples\regmpad\regdb.c.
--//
--static bool check_user_privilege()
--{
--	HANDLE tkhandle;
--	SID_IDENTIFIER_AUTHORITY system_sid_authority = {SECURITY_NT_AUTHORITY};
--
--	// First we must open a handle to the access token for this thread.
--
--	if (!OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, FALSE, &tkhandle))
--	{
--		if (GetLastError() == ERROR_NO_TOKEN)
-+		DWORD name_len = UNLEN;
-+		TEXT* nm = name->getBuffer(name_len + 1);
-+		if (GetUserName(nm, &name_len))
- 		{
--			// If the thread does not have an access token, we'll examine the
--			// access token associated with the process.
-+			nm[name_len] = 0;
- 
--			if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &tkhandle))
--			{
--				CloseHandle(tkhandle);
--				return false;
--			}
-+			// NT user name is case insensitive
-+			CharUpperBuff(nm, name_len);
-+			name->recalculate_length();
- 		}
- 		else
- 		{
--			return false;
-+			*name = "";
- 		}
- 	}
- 
--	TOKEN_GROUPS*	ptg       = NULL;
--	DWORD			token_len = 0;
--
--	while (true)
--	{
--		/* Then we must query the size of the group information associated with
--		   the token.  This is guarenteed to fail the first time through
--		   because there is no buffer. */
--
--		if (GetTokenInformation(tkhandle,
--								TokenGroups,
--								ptg,
--								token_len,
--								&token_len))
--		{
--			break;
--		}
--
--		/* If there had been a buffer, it's either too small or something
--		   else is wrong.  Either way, we can dispose of it. */
--
--		if (ptg)
--		{
--			gds__free(ptg);
--		}
--
--		/* Here we verify that GetTokenInformation failed for lack of a large
--		   enough buffer. */
--
--		if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
--		{
--			CloseHandle(tkhandle);
--			return false;
--		}
--
--		// Allocate a buffer for the group information.
--		ptg = (TOKEN_GROUPS *) gds__alloc((SLONG) token_len);
--
--		if (!ptg)
--		{
--			CloseHandle(tkhandle);
--			return false;		/* NOMEM: */
--		}
--		// FREE: earlier in this loop, and at procedure return
--	}
--
--	// Create a System Identifier for the Admin group.
--
--	PSID admin_sid;
--
--	if (!AllocateAndInitializeSid(&system_sid_authority, 2,
--								  SECURITY_BUILTIN_DOMAIN_RID,
--								  DOMAIN_ALIAS_RID_ADMINS,
--								  0, 0, 0, 0, 0, 0, &admin_sid))
--	{
--		gds__free(ptg);
--		CloseHandle(tkhandle);
--		return false;
--	}
--
--	// Finally we'll iterate through the list of groups for this access
--	// token looking for a match against the SID we created above.
--
--	bool admin_priv = false;
--
--	for (DWORD i = 0; i < ptg->GroupCount; i++)
--	{
--		if (EqualSid(ptg->Groups[i].Sid, admin_sid))
--		{
--			admin_priv = true;
--			break;
--		}
--	}
--
--	// Deallocate the SID we created.
--
--	FreeSid(admin_sid);
--	gds__free(ptg);
--	CloseHandle(tkhandle);
--	return admin_priv;
-+	return false;
- }
- #endif
- 
---- 2.0.orig/src/jrd/isc_proto.h
-+++ 2.0/src/jrd/isc_proto.h
-@@ -25,6 +25,7 @@
- #define JRD_ISC_PROTO_H
- 
- #include "../jrd/isc.h"
-+#include "../common/classes/fb_string.h"
- 
- void	ISC_ast_enter(void);
- void	ISC_ast_exit(void);
-@@ -32,9 +33,9 @@
- // There's no body for those functions.
- //void	ISC_get_config(TEXT *, struct ipccfg *);
- //int		ISC_set_config(TEXT *, struct ipccfg *);
--TEXT*	ISC_get_host(TEXT *, USHORT);
--int		ISC_get_user(TEXT*, int*, int*, TEXT*,
--											 TEXT*, int*, const TEXT*);
-+TEXT*  ISC_get_host(TEXT *, USHORT);
-+const TEXT* ISC_get_host(Firebird::string&);
-+bool  ISC_get_user(Firebird::string*, int*, int*, const TEXT*);
- SLONG	ISC_get_user_group_id(const TEXT*);
- void	ISC_set_user(const TEXT*);
- SLONG	ISC_get_prefix(const TEXT*);
---- 2.0.orig/src/jrd/jrd.cpp
-+++ 2.0/src/jrd/jrd.cpp
-@@ -6699,12 +6699,9 @@
-  **/
- static void getUserInfo(UserId& user, const DatabaseOptions& options)
- {
--	TEXT name[129] = "";
--	TEXT project[33] = "";
--	TEXT organization[33] = "";
--
--	int node_id = 0;
- 	int id = -1, group = -1;	// CVC: This var contained trash
-+	int node_id = 0;
-+	Firebird::string name;
- 
- #ifdef BOOT_BUILD
- 	bool wheel = true;
-@@ -6712,12 +6709,9 @@
- 	bool wheel = false;
- 	if (options.dpb_user_name.isEmpty()) 
- 	{
--       wheel = ISC_get_user(name,
-+       wheel = ISC_get_user(&name,
-                             &id,
-                             &group,
--                            project,
--                            organization,
--                            &node_id,
-                             options.dpb_sys_user_name.nullStr());
- 	}
- 
-@@ -6738,18 +6732,18 @@
- 		{
- 			if (options.dpb_user_name.hasData())
- 			{
--				options.dpb_user_name.copyTo(name, sizeof name);
-+				name = options.dpb_user_name;
- 			}
- 			else
- 			{
--				strcpy(name, "<Unknown>");
-+				name = "<Unknown>";
- 			}
- 		}
- 
- 		// if the name from the user database is defined as SYSDBA,
- 		// we define that user id as having system privileges
- 
--		if (!strcmp(name, SYSDBA_USER_NAME))
-+		if (name == SYSDBA_USER_NAME)
- 		{
- 			wheel = true;
- 		}
-@@ -6761,12 +6755,12 @@
- 
- 	if (wheel)
- 	{
--		strcpy(name, SYSDBA_USER_NAME);
-+		name = SYSDBA_USER_NAME;
- 	}
- 
- 	user.usr_user_name = name;
--	user.usr_project_name = project;
--	user.usr_org_name = organization;
-+	user.usr_project_name = "";
-+	user.usr_org_name = "";
- 	user.usr_sql_role_name = options.dpb_role_name;
- 	user.usr_user_id = id;
- 	user.usr_group_id = group;
---- 2.0.orig/src/jrd/jrd_pwd.h
-+++ 2.0/src/jrd/jrd_pwd.h
-@@ -66,11 +66,11 @@
- 
- 	static void initialize();
- 	static void shutdown();
--	static void verifyUser(TEXT*, const TEXT*, const TEXT*, const TEXT*,
-+	static void verifyUser(Firebird::string&, const TEXT*, const TEXT*, const TEXT*,
- 		int*, int*, int*, const Firebird::string&);
- 
- 	static void hash(Firebird::string& h, 
--					 const TEXT* userName, 
-+					 const Firebird::string& userName, 
- 					 const TEXT* passwd)
- 	{
- 		Firebird::string salt;
-@@ -79,7 +79,7 @@
- 	}
- 
- 	static void hash(Firebird::string& h, 
--					 const TEXT* userName, 
-+					 const Firebird::string& userName, 
- 					 const TEXT* passwd,
- 					 const Firebird::string& oldHash)
- 	{
-@@ -110,7 +110,7 @@
- 
- 	void fini();
- 	void init();
--	bool lookup_user(TEXT*, int*, int*, TEXT*);
-+	bool lookup_user(const TEXT*, int*, int*, TEXT*);
- 	bool prepare();
- 
- 	static SecurityDatabase instance;
---- 2.0.orig/src/jrd/pwd.cpp
-+++ 2.0/src/jrd/pwd.cpp
-@@ -263,7 +263,7 @@
- 	counter += (is_cached) ? 1 : 0;
- }
- 
--bool SecurityDatabase::lookup_user(TEXT * user_name, int *uid, int *gid, TEXT * pwd)
-+bool SecurityDatabase::lookup_user(const TEXT* user_name, int* uid, int* gid, TEXT* pwd)
- {
- 	bool found = false;		// user found flag
- 	TEXT uname[129];		// user name buffer
-@@ -433,7 +433,7 @@
- 	instance.fini();
- }
- 
--void SecurityDatabase::verifyUser(TEXT* name,
-+void SecurityDatabase::verifyUser(Firebird::string& name,
- 								  const TEXT* user_name,
- 								  const TEXT* password,
- 								  const TEXT* password_enc,
-@@ -444,12 +444,11 @@
- {
- 	if (user_name)
- 	{
--		TEXT* p = name;
--		for (const TEXT* q = user_name; *q; ++q, ++p)
-+		name = user_name;
-+		for (unsigned int n = 0; n < name.length(); ++n)
- 		{
--			*p = UPPER7(*q);
-+			name[n] = UPPER7(name[n]);
- 		}
--		*p = 0;
- 	}
- 
- #ifndef EMBEDDED
-@@ -459,7 +458,7 @@
- 	// that means the current context must be saved and restored.
- 
- 	TEXT pw1[MAX_PASSWORD_LENGTH + 1];
--	const bool found = instance.lookup_user(name, uid, gid, pw1);
-+	const bool found = instance.lookup_user(name.c_str(), uid, gid, pw1);
- 	pw1[MAX_PASSWORD_LENGTH] = 0;
- 	Firebird::string storedHash(pw1, MAX_PASSWORD_LENGTH);
- 	storedHash.rtrim();
---- 2.0.orig/src/jrd/svc.cpp
-+++ 2.0/src/jrd/svc.cpp
-@@ -516,7 +516,7 @@
- 		}
- 		else 
- 		{
--			TEXT name[129]; // unused after retrieved
-+			Firebird::string name; // unused after retrieved
- 			int id, group, node_id;
- 			
- 			Firebird::string remote = options.spb_network_protocol +
---- 2.0.orig/src/remote/inet.cpp
-+++ 2.0/src/remote/inet.cpp
-@@ -462,20 +462,16 @@
- 
- /* Pick up some user identification information */
- 	Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE);
--	char buffer[BUFFER_SMALL];
--
-+	Firebird::string buffer;
- 	int eff_gid;
- 	int eff_uid;
--	ISC_get_user(buffer, &eff_uid, &eff_gid, 0, 0, 0, user_string);
--	user_id.insertString(CNCT_user, buffer, strlen(buffer));
- 
--	ISC_get_host(buffer, sizeof(buffer));
--	for (char* p = buffer; *p; p++) {
--		if (*p >= 'A' && *p <= 'Z') {
--			*p = *p - 'A' + 'a';
--		}
--	}
--	user_id.insertString(CNCT_host, buffer, strlen(buffer));
-+	ISC_get_user(&buffer, &eff_uid, &eff_gid, user_string);
-+	user_id.insertString(CNCT_user, buffer);
-+
-+	ISC_get_host(buffer);
-+	buffer.lower();
-+	user_id.insertString(CNCT_host, buffer);
- 
- 	if ((eff_uid == -1) || uv_flag) {
- 		user_id.insertTag(CNCT_user_verification);
---- 2.0.orig/src/remote/inet_server.cpp
-+++ 2.0/src/remote/inet_server.cpp
-@@ -96,6 +96,7 @@
- #include "../jrd/sch_proto.h"
- #include "../jrd/thread_proto.h"
- #include "../common/utils_proto.h"
-+#include "../common/classes/fb_string.h"
- 
- #ifdef UNIX
- #ifdef NETBSD
-@@ -328,14 +329,14 @@
-             // Remove restriction on username, for DEV builds
-             // restrict only for production builds.  MOD 21-July-2002
- #ifndef DEV_BUILD
--			TEXT user_name[256];	/* holds the user name */
-+			Firebird::string user_name;	/* holds the user name */
- 			/* check user id */
--			ISC_get_user(user_name, NULL, NULL, NULL, NULL, NULL, NULL);
-+			ISC_get_user(&user_name, NULL, NULL, NULL);
- 
--			if (strcmp(user_name, "root") &&
--				strcmp(user_name, FIREBIRD_USER_NAME) &&
--				strcmp(user_name, INTERBASE_USER_NAME) &&
--				strcmp(user_name, INTERBASE_USER_SHORT))
-+			if (user_name != "root" &&
-+				user_name != FIREBIRD_USER_NAME &&
-+				user_name != INTERBASE_USER_NAME &&
-+				user_name != INTERBASE_USER_SHORT)
- 			{
- 				/* invalid user -- bail out */
- 				fprintf(stderr,
---- 2.0.orig/src/remote/os/win32/wnet.cpp
-+++ 2.0/src/remote/os/win32/wnet.cpp
-@@ -135,25 +135,17 @@
- 	PACKET* packet = &rdb->rdb_packet;
- 
- /* Pick up some user identification information */
--	TEXT buffer[128];
-+	Firebird::string buffer;
- 	TEXT *p;
- 	Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE);
- 
--	ISC_get_user(buffer, 0, 0, 0, 0, 0, 0);
--	for (p = buffer; *p; p++) {
--		if (*p >= 'A' && *p <= 'Z') {
--			*p = *p - 'A' + 'a';
--		}
--	}
--	user_id.insertString(CNCT_user, buffer, strlen(buffer));
--
--	ISC_get_host(buffer, sizeof(buffer));
--	for (p = buffer; *p; p++) {
--		if (*p >= 'A' && *p <= 'Z') {
--			*p = *p - 'A' + 'a';
--		}
--	}
--	user_id.insertString(CNCT_host, buffer, strlen(buffer));
-+	ISC_get_user(&buffer, 0, 0, 0);
-+	buffer.lower();
-+	user_id.insertString(CNCT_user, buffer);
-+
-+	ISC_get_host(buffer);
-+	buffer.lower();
-+	user_id.insertString(CNCT_host, buffer);
- 
- 	if (uv_flag) {
- 		user_id.insertTag(CNCT_user_verification);
---- 2.0.orig/src/remote/xnet.cpp
-+++ 2.0/src/remote/xnet.cpp
-@@ -214,25 +214,16 @@
- 
- 	// Pick up some user identification information
- 
--	TEXT buffer[BUFFER_TINY];
--	TEXT *p;
-+	Firebird::string buffer;
- 	Firebird::ClumpletWriter user_id(Firebird::ClumpletReader::UnTagged, MAX_DPB_SIZE);
- 
--	ISC_get_user(buffer, 0, 0, 0, 0, 0, 0);
--	for (p = buffer; *p; p++) {
--		if (*p >= 'A' && *p <= 'Z') {
--			*p = *p - 'A' + 'a';
--		}
--	}
--	user_id.insertString(CNCT_user, buffer, strlen(buffer));
--
--	ISC_get_host(buffer, sizeof(buffer));
--	for (p = buffer; *p; p++) {
--		if (*p >= 'A' && *p <= 'Z') {
--			*p = *p - 'A' + 'a';
--		}
--	}
--	user_id.insertString(CNCT_host, buffer, strlen(buffer));
-+	ISC_get_user(&buffer, 0, 0, 0);
-+	buffer.lower();
-+	user_id.insertString(CNCT_user, buffer);
-+
-+	ISC_get_host(buffer);
-+	buffer.lower();
-+	user_id.insertString(CNCT_host, buffer);
- 
- 	if (uv_flag) {
- 		user_id.insertTag(CNCT_user_verification);
---- 2.0.orig/src/utilities/guard/guard.cpp
-+++ 2.0/src/utilities/guard/guard.cpp
-@@ -45,6 +45,7 @@
- #include "../jrd/gds_proto.h"
- #include "../jrd/file_params.h"
- #include "../utilities/guard/util_proto.h"
-+#include "../common/classes/fb_string.h"
- 
- const USHORT FOREVER	= 1;
- const USHORT ONETIME	= 2;
-@@ -107,12 +108,13 @@
- 	}							/* while */
- 
- /* check user id */
--	TEXT user_name[256];		/* holds the user name */
--	ISC_get_user(user_name, NULL, NULL, NULL, NULL, NULL, NULL);
-+	Firebird::string user_name;		/* holds the user name */
-+	ISC_get_user(&user_name, NULL, NULL, NULL);
- 
--	if (strcmp(user_name, INTERBASE_USER) && strcmp(user_name, "root")
--		&& strcmp(user_name, FIREBIRD_USER)
--		&& strcmp(user_name, INTERBASE_USER_SHORT))
-+	if (user_name != INTERBASE_USER && 
-+		user_name != "root" &&
-+		user_name != FIREBIRD_USER &&
-+		user_name != INTERBASE_USER_SHORT)
- 	{
- 		/* invalid user bail out */
- 		fprintf(stderr,
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-external-libs.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-external-libs.patch
deleted file mode 100644
index 3de90c0bc40d..000000000000
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-external-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: firebird-2.0.0.12748/builds/posix/Makefile.in.firebird
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/Makefile.in.firebird
-+++ firebird-2.0.0.12748/builds/posix/Makefile.in.firebird
-@@ -186,10 +186,10 @@ $(GEN_ROOT)/Make.Version : $(SRC_ROOT)/m
- # 
- 
- external_libraries:
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
--ifeq ($(EDITLINE_FLG),Y)
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
--endif
-+#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
-+#ifeq ($(EDITLINE_FLG),Y)
-+#	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
-+#endif
- 
- #---------------------------------------------------------------------------
- # Phase1: make a gpre_static from scratch so we can parse .e and .epp files
-Index: firebird-2.0.0.12748/configure.in
-===================================================================
---- firebird-2.0.0.12748.orig/configure.in
-+++ firebird-2.0.0.12748/configure.in
-@@ -445,7 +445,7 @@
-			AC_CHECK_LIB(termcap, tgetent, , \
-				AC_CHECK_LIB(tinfo, tgetent, , \
-					AC_MSG_ERROR(termcap support not found)))))  
--	AC_SUBST(EDITLINE_A, -leditline)
-+	AC_SUBST(EDITLINE_A, -ledit)
- fi
- AC_CHECK_LIB(stdc++, main,,, $LIBS)
- 
-Index: firebird-2.0.0.12748/builds/posix/make.rules
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.rules
-+++ firebird-2.0.0.12748/builds/posix/make.rules
-@@ -33,7 +33,7 @@
- 
- 
- # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
--CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n -DNAMESPACE=Vulcan
-+CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
- 
- ifeq ($(IsProdTypeBuild),Y)
-   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
deleted file mode 100644
index c1cc28edab90..000000000000
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux Firebird-2.0.3.12981-0/builds/posix/prefix.linux
---- Firebird-2.0.3.12981-0_orig/builds/posix/prefix.linux	2007-11-05 21:07:48.000000000 -0500
-+++ Firebird-2.0.3.12981-0/builds/posix/prefix.linux	2007-11-05 21:23:36.000000000 -0500
-@@ -20,7 +20,7 @@
- 
- # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
- # you may remove it if engine is getting compiled with any other GCC version
--PROD_FLAGS=-ggdb -O3 -march=i586 -mcpu=i686 -fno-omit-frame-pointer -fno-builtin -DNDEBUG -DLINUX -pipe -MMD -fPIC -fmessage-length=0
-+PROD_FLAGS=-ggdb -DNDEBUG -DLINUX -pipe -MMD -fPIC
- DEV_FLAGS=-DUSE_VALGRIND -ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
- #DEV_FLAGS=-ggdb -DLINUX -pipe -MMD -p -fPIC -Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable -fmessage-length=0
- 
diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-make-deps.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-make-deps.patch
deleted file mode 100644
index 6369727aa0a7..000000000000
--- a/dev-db/firebird/files/firebird-2.0.3.12981.0-make-deps.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: firebird-2.0.0.12748/builds/posix/make.shared.targets
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.shared.targets
-+++ firebird-2.0.0.12748/builds/posix/make.shared.targets
-@@ -57,7 +57,7 @@ $(SRC_ROOT)/dsql/parse.cpp: $(SRC_ROOT)/
- 
- # gpre_meta needs a special boot build since there is no database.
- 
--$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-Index: firebird-2.0.0.12748/builds/posix/make.rules
-===================================================================
---- firebird-2.0.0.12748.orig/builds/posix/make.rules
-+++ firebird-2.0.0.12748/builds/posix/make.rules
-@@ -103,19 +103,19 @@ DSQL_GPRE_FLAGS =  -lang_internal -r -m 
- 
- .SUFFIXES: .c .e .epp .cpp
- 
--.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
--.epp.cpp:
-+.epp.cpp: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
--$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp 
-+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp  $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
- 
- 
--$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp 
-+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp  $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
- 
- 
diff --git a/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch
deleted file mode 100644
index d324bd7c5c55..000000000000
--- a/dev-db/firebird/files/firebird-2.1.2.18118.0-deps-flags-libs.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird
---- Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird	2008-12-10 17:22:15.000000000 +0200
-+++ Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird	2009-05-20 15:13:47.673202327 +0300
-@@ -185,14 +185,7 @@
- # 
- 
- external_libraries:
--ifeq ($(STD_ICU),false)
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu
--endif
--ifeq ($(STD_EDITLINE),false)
--ifeq ($(EDITLINE_FLG),Y)
--	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
--endif
--endif
-+
- 
- btyacc_binary: $(BTYACC)
- 
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults Firebird-2.1.2.18118-0/builds/posix/make.defaults
---- Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults	2008-09-04 14:47:18.000000000 +0300
-+++ Firebird-2.1.2.18118-0/builds/posix/make.defaults	2009-05-20 15:15:31.088202976 +0300
-@@ -232,11 +232,7 @@
- LIBFBSTATIC_A = $(LIB)/libfbstatic.a
- 
- ifeq ($(EDITLINE_FLG),Y)
--  ifeq ($(STD_EDITLINE), true)
--	LIBEDITLINE := -leditline
--  else
--	LIBEDITLINE := $(LIB)/libeditline.a
--  endif
-+  LIBEDITLINE := -ledit
- endif
- 
- LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.rules Firebird-2.1.2.18118-0/builds/posix/make.rules
---- Firebird-2.1.2.18118-0_orig/builds/posix/make.rules	2008-12-10 03:03:31.000000000 +0200
-+++ Firebird-2.1.2.18118-0/builds/posix/make.rules	2009-05-20 15:21:04.114225351 +0300
-@@ -33,9 +33,6 @@
- 
- # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
- CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan
--ifeq ($(STD_ICU),false)
--  CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
--endif
- 
- ifeq ($(IsProdTypeBuild),Y)
-   CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD
-@@ -69,7 +66,7 @@
- 
- .SUFFIXES: .c .e .epp .cpp
- 
--.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets Firebird-2.1.2.18118-0/builds/posix/make.shared.targets
---- Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets	2008-12-10 03:03:31.000000000 +0200
-+++ Firebird-2.1.2.18118-0/builds/posix/make.shared.targets	2009-05-20 15:21:59.299203496 +0300
-@@ -49,7 +49,7 @@
- 
- # gpre_meta needs a special boot build since there is no database.
- 
--$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux Firebird-2.1.2.18118-0/builds/posix/prefix.linux
---- Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux	2007-05-03 14:24:50.000000000 +0300
-+++ Firebird-2.1.2.18118-0/builds/posix/prefix.linux	2009-05-20 15:23:17.286523276 +0300
-@@ -20,12 +20,10 @@
- 
- # -fno-builtin is used because GCC 3.0-3.2.2 had bug with builtins expansion
- # 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
-+COMMON_FLAGS=-ggdb -DLINUX -pipe -MMD -fPIC
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS)
- DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- #DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.1.2.18118-0_orig/configure Firebird-2.1.2.18118-0/configure
---- Firebird-2.1.2.18118-0_orig/configure	2009-03-30 09:42:44.000000000 +0300
-+++ Firebird-2.1.2.18118-0/configure	2009-05-20 15:26:30.856202564 +0300
-@@ -4027,13 +4027,13 @@
- # not need editline in default libs, but need to test for its presence
- saveLIBS=$LIBS
- if test "$STD_EDITLINE" = "true"; then
--  { echo "$as_me:$LINENO: checking for readline in -leditline" >&5
--echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; }
-+  { echo "$as_me:$LINENO: checking for readline in -ledit" >&5
-+echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; }
- if test "${ac_cv_lib_editline_readline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-leditline  $LIBS"
-+LIBS="-ledit  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch b/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch
deleted file mode 100644
index 1e0fc093668e..000000000000
--- a/dev-db/firebird/files/firebird-2.1.2.18118.0-gcc-icu-declare.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/common/classes/alloc.h.old	2009-07-09 13:04:14.000000000 +0200
-+++ src/common/classes/alloc.h	2009-07-09 13:05:37.000000000 +0200
-@@ -48,6 +48,8 @@
- 					   stdlib.h (EKU) */
- #endif
- 
-+#include <new>
-+
- #ifdef _MSC_VER
- #define THROW_BAD_ALLOC
- #else
-@@ -448,15 +450,6 @@
- 	);
- }
- 
--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);
diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch
deleted file mode 100644
index 1f44fcc97aed..000000000000
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-build.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.client.util B2_5_Release/builds/posix/Makefile.in.client.util
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.client.util	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.client.util	2011-03-09 23:35:01.000000000 -0500
-@@ -53,11 +53,6 @@
- $(CLUMPLETS_Objects) $(FBCONFIG_Objects)
- 
- 
--CREATEDB_Files= create_db.cpp
--CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
--CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
--
--
- DROP_Other_Sources = common/utils.cpp lock/lock.cpp jrd/isc_sync.cpp jrd/isc.cpp \
- common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources)
- 
-@@ -133,7 +128,7 @@
- RELAY_Sources = $(addprefix utilities/, $(RELAY_Files))
- RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources))))
- 
--AllObjects = $(CREATEDB_Object) $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \
-+AllObjects = $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \
- 			 $(FBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(FBSVCMGR_Objects) \
- 			  $(FBTRACEMGR_Objects)
- 
-@@ -141,17 +136,11 @@
- Dependencies = $(AllObjects:.o=.d) 
- 
- 
--.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay create_db fb_lock_print \
-+.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay fb_lock_print \
- 	fbsvcmgr fbtracemgr
- 
- all: $(CLIENT_UTIL_TARGETS)
- 
--create_db: $(CREATE_DB)
--
--$(CREATE_DB):	$(CREATEDB_Objects) 
--	$(STATICEXE_LINK) $(LINK_OPTS) $(CREATEDB_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
--
--
- nbackup: $(LIBFBCLIENT_SO) $(NBACKUP)
- 
- $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.codes B2_5_Release/builds/posix/Makefile.in.codes
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.codes	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.codes	2011-03-09 23:35:01.000000000 -0500
-@@ -22,7 +22,8 @@
- # 
- #
- ROOT=..
--ObjModuleType=std
-+ObjModuleType=boot
-+CXXFLAGS+= -DBOOT_BUILD
- 
- include     $(ROOT)/gen/make.defaults
- include     $(ROOT)/gen/make.platform
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.embed.util B2_5_Release/builds/posix/Makefile.in.embed.util
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.embed.util	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.embed.util	2011-03-09 23:35:01.000000000 -0500
-@@ -56,11 +56,6 @@
- $(FBCONFIG_Objects)
- 
- 
--CREATEDB_Files= create_db.cpp
--CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files))
--CREATEDB_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CREATEDB_Sources))))
--
--
- DROP_Other_Sources += common/utils.cpp jrd/isc_sync.cpp jrd/isc.cpp \
- common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources)
- 
-@@ -128,30 +123,19 @@
- RELAY_Sources = $(addprefix utilities/, $(RELAY_Files))
- RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources))))
- 
--AllObjects = $(CREATEDB_Object) $(DROP_Object) $(FBSVCMGR_Objects) \
-+AllObjects = $(DROP_Object) $(FBSVCMGR_Objects) \
- 			 $(GSEC_Objects) $(GSTAT_Object) $(FBGUARD_Objects) \
- 			 $(IBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(CLUMPLETS_Objects)
- 
- Dependencies = $(AllObjects:.o=.d) 
- 
- 
--.PHONY: create_db gstat gds_drop gds_relay gsec fbguard ibmgr_bin nbackup fb_lock_print \
-+.PHONY: gstat gds_drop gds_relay gsec fbguard ibmgr_bin nbackup fb_lock_print \
- 	fbsvcmgr fbtracemgr
- 
- all: $(EMBED_UTIL_TARGETS)
- 
- 
--# it's important to note here that create_db is linked against the static
--# 'boot' libraries rather than the later embedded shared library.  The
--# other utilities are released but create_db is used in construction.
--# MOD 29-July-2002
--
--create_db: $(CREATE_DB)
--
--$(CREATE_DB):	$(CREATEDB_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
--	$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
--
--
- nbackup: $(LIBFBEMBED_SO) $(NBACKUP)
- 
- $(NBACKUP):	$(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.examples B2_5_Release/builds/posix/Makefile.in.examples
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.examples	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.examples	2011-03-09 23:35:01.000000000 -0500
-@@ -29,7 +29,8 @@
- #
- #
- ROOT=../..
--ObjModuleType=std
-+ObjModuleType=boot
-+CXXFLAGS+= -DBOOT_BUILD
- 
- # Add the install include directory to the search path since the
- # examples need to build using those headers values.
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.fbtrace B2_5_Release/builds/posix/Makefile.in.fbtrace
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.fbtrace	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.fbtrace	2011-03-21 16:00:40.000000000 -0400
-@@ -71,6 +71,12 @@
- 
- fbtrace: $(FBTRACE)
- 
-+ifeq (@FIREBIRD_ARCH_TYPE@,classic)
-+  LINK_TRACE_LIBS += -lfbembed
-+else
-+  FBTRACE_Objects += $(addprefix $(OBJ)/, $(addsuffix .o, $(basename jrd/gds.cpp)))
-+endif
-+
- $(FBTRACE):	$(FBTRACE_Objects)
- 	$(LINK_TRACE) -o $@ $^ $(LINK_TRACE_LIBS)
- 
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird B2_5_Release/builds/posix/Makefile.in.firebird
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.firebird	2011-03-09 23:35:01.000000000 -0500
-@@ -263,7 +263,7 @@
- $(ISC_GDB): create_db empty_db gbak_static isql_static ref_databases
- 
- create_db:
--	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(CREATE_DB)
-+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.createdb
- 
- gbak_static:
- 	$(MAKE) $(CPU_OPTION) -f $(GEN_ROOT)/Makefile.static.gbak
-@@ -286,8 +286,7 @@
- 
- #--------------------------------------------------------------------------
- #Phase3: Now we start building the tools we are actually going to use
--#  against the shared library.
--#  an empty database (lock manager and create_db).  Then we rebuild all the
-+#  against the shared library. Then we rebuild all the
- #  items we have built in the static library into a dynamic library.
- #  (It's probably possible to directly build the dynamic library - but thats
- #  for another day). We still don't have the security database stuff.
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.msgs B2_5_Release/builds/posix/Makefile.in.msgs
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.msgs	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.msgs	2011-03-09 23:35:01.000000000 -0500
-@@ -28,7 +28,8 @@
- # 
- #
- ROOT=..
--ObjModuleType=std
-+ObjModuleType=boot
-+CXXFLAGS+= -DBOOT_BUILD
- 
- include     $(ROOT)/gen/make.defaults
- include     $(ROOT)/gen/make.platform
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.refDatabases B2_5_Release/builds/posix/Makefile.in.refDatabases
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.refDatabases	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/Makefile.in.refDatabases	2011-03-09 23:35:01.000000000 -0500
-@@ -29,7 +29,8 @@
- #
- #
- ROOT=..
--ObjModuleType=std
-+ObjModuleType=boot
-+CXXFLAGS+= -DBOOT_BUILD
- 
- include     $(ROOT)/gen/make.defaults
- include     $(ROOT)/gen/make.platform
-@@ -53,8 +54,8 @@
- 
- .PHONY: empty_db refDatabases
- 
--# This is where you are going to have trouble if there is one, at creating 
--# the first empty database.  Things to watch out for, $INTERBASE variable 
-+# This is where you are going to have trouble if there is one, at creating
-+# the first empty database.  Things to watch out for, $INTERBASE variable
- # pointing in the wrong place, shared library path LD_LIBRARY_PATH
- # not pointing to new stuff (mind you this point it should be creating
- # using create_db statically linked).
-@@ -62,7 +63,7 @@
- empty_db : empty.fdb yachts.lnk
- 
- empty.fdb : $(CREATE_DB)
--	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(BIN)/create_db
-+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.createdb
- 	-$(RM) $@
- 	$(BIN)/create_db $@
- 	$(TOUCH) $@
-diff -Naur '--exclude=.svn' Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults B2_5_Release/builds/posix/make.defaults
---- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults	2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/builds/posix/make.defaults	2011-03-09 23:35:01.000000000 -0500
-@@ -49,9 +49,11 @@
- 
- FIREBIRD=$(GEN_ROOT)/firebird
- INTERBASE=$(FIREBIRD)
-+FIREBIRD_LOCK=$(shell cd $(FIREBIRD); pwd)
- 
- export INTERBASE
- export FIREBIRD
-+export FIREBIRD_LOCK
- 
- LIB=$(FIREBIRD)/lib
- BIN=$(FIREBIRD)/bin
-diff -Naur Firebird-2.5.0.26074-0_orig/configure.in B2_5_Release/configure.in
---- Firebird-2.5.0.26074-0_orig/configure.in    2010-11-09 12:42:45.000000000 -0500
-+++ B2_5_Release/configure.in   2011-06-13 17:10:35.412587676 -0400
-@@ -1359,6 +1389,7 @@
- gen/Makefile.static.gpre:${MAKE_SRC_DIR}/Makefile.in.static.gpre
- gen/Makefile.static.gbak:${MAKE_SRC_DIR}/Makefile.in.static.gbak
- gen/Makefile.static.isql:${MAKE_SRC_DIR}/Makefile.in.static.isql
-+gen/Makefile.static.createdb:${MAKE_SRC_DIR}/Makefile.in.static.createdb
- gen/Makefile.refDatabases:${MAKE_SRC_DIR}/Makefile.in.refDatabases
- gen/Makefile.fbserver:${MAKE_SRC_DIR}/Makefile.in.fbserver
- gen/Makefile.smp_server:${MAKE_SRC_DIR}/Makefile.in.smp_server
-
diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch
deleted file mode 100644
index 8331c8122faf..000000000000
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-client.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird
---- orig/builds/posix/Makefile.in.firebird	2010-11-12 15:46:22.000000000 -0500
-+++ builds/posix/Makefile.in.firebird	2010-11-12 16:36:22.000000000 -0500
-@@ -145,7 +145,7 @@
- 
- firebird : firebird_@FIREBIRD_ARCH_TYPE@ $(PLATFORM_POSTBUILD_TARGET)
- 
--firebird_classic firebird_embedded: firebird_basic classic_targets fbtrace
-+firebird_classic firebird_embedded: firebird_boot libfbclient includes
- firebird_super firebird_server: firebird_basic super_targets fbtrace
- 
- 
diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch
deleted file mode 100644
index 3c40461c7e2b..000000000000
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags-libs.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0/builds/posix/Makefile.in.firebird
---- Firebird-2.5.0.26074-0_orig//builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/Makefile.in.firebird	2010-11-12 15:45:04.000000000 -0500
-@@ -158,7 +158,7 @@
- # some complications particularly for super in needing to start the server
- # that you are currently building. MOD 28-July-2002
- 
--firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
-+firebird_basic: firebird_boot basic_targets
- 
- firebird_boot: updateBuildNum boot_phase1 boot_phase2 
- 
-@@ -189,14 +189,6 @@
- # 
- 
- external_libraries:
--ifeq ($(STD_ICU),false)
--	$(MAKE) CFLAGS="@CFLAGS@" -f $(GEN_ROOT)/Makefile.extern.icu
--endif
--ifeq ($(STD_EDITLINE),false)
--ifeq ($(EDITLINE_FLG),Y)
--	$(MAKE) CFLAGS="@CFLAGS@" $(CPU_OPTION) -f $(GEN_ROOT)/Makefile.extern.editline
--endif
--endif
- 
- btyacc_binary: $(BTYACC)
- 
-@@ -373,7 +365,7 @@
- .PHONY: fbserver 
- .PHONY: libfbclient client_gfix client_gbak client_isql client_gpre client_util client_fbudf
- 
--super_targets: $(PLAT_SUPER_PRE_TARGET) fbserver libfbclient client_gfix client_gbak client_gsec\
-+super_targets: $(PLAT_SUPER_PRE_TARGET) fbserver libfbclient libfbembed fb_smp_server client_gfix client_gbak client_gsec\
- 			client_isql client_gpre client_util client_fbudf client_gdef client_qli $(PLAT_SUPER_POST_TRAGET) 
- 
- fbserver:
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.defaults Firebird-2.5.0.26074-0/builds/posix/make.defaults
---- Firebird-2.5.0.26074-0_orig//builds/posix/make.defaults	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/make.defaults	2010-11-12 15:42:03.000000000 -0500
-@@ -138,7 +138,7 @@
- AR=			ar @AR_OPTIONS@ crsu
- LN=			@LN_S@
- RANLIB=			@RANLIB@
--BTYACC=$(ROOT)/extern/btyacc/btyacc
-+BTYACC=/usr/bin/btyacc
- 
- CC =	@CC@
- CXX =	@CXX@
-@@ -222,13 +222,7 @@
- 
- LIBFBSTATIC_A = $(LIB)/libfbstatic.a
- 
--ifeq ($(EDITLINE_FLG),Y)
--  ifeq ($(STD_EDITLINE), true)
--	LIBEDITLINE := -l$(READLINE)
--  else
--	LIBEDITLINE := $(LIB)/libedit.a
--  endif
--endif
-+LIBEDITLINE := -ledit
- 
- LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc*.$(SHRLIB_FOREIGN_EXT) \
- 			$(LIB)/$(LIB_PREFIX)icudata*.$(SHRLIB_FOREIGN_EXT) \
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.rules Firebird-2.5.0.26074-0/builds/posix/make.rules
---- Firebird-2.5.0.26074-0_orig//builds/posix/make.rules	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/make.rules	2010-11-12 15:06:43.000000000 -0500
-@@ -35,10 +35,6 @@
- WFLAGS:=-I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan \
- 	-DNAMESPACE=Vulcan
- 
--ifeq ($(STD_ICU),false)
--  WFLAGS:= $(WFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n
--endif
--
- ifeq ($(IsProdTypeBuild),Y)
-   WFLAGS:= $(WFLAGS) $(PROD_FLAGS)
- else
-@@ -72,7 +68,7 @@
- 
- .SUFFIXES: .c .e .epp .cpp
- 
--.e.c:
-+.e.c: $(GPRE_CURRENT)
- 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/make.shared.targets Firebird-2.5.0.26074-0/builds/posix/make.shared.targets
---- Firebird-2.5.0.26074-0_orig//builds/posix/make.shared.targets	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/make.shared.targets	2010-11-12 15:06:43.000000000 -0500
-@@ -49,7 +49,7 @@
- 
- # gpre_meta needs a special boot build since there is no database.
- 
--$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
-+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT)
- 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
- 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux Firebird-2.5.0.26074-0/builds/posix/prefix.linux
---- Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux	2010-11-12 15:06:43.000000000 -0500
-@@ -18,11 +18,10 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0/builds/posix/prefix.linux_amd64
---- Firebird-2.5.0.26074-0_orig//builds/posix/prefix.linux_amd64	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/builds/posix/prefix.linux_amd64	2010-11-12 15:06:43.000000000 -0500
-@@ -18,12 +18,11 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
-+COMMON_FLAGS=-DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.5.0.26074-0_orig//configure Firebird-2.5.0.26074-0/configure
---- Firebird-2.5.0.26074-0_orig//configure	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0/configure	2010-11-12 15:06:44.000000000 -0500
-@@ -4585,13 +4585,15 @@
- if test "x$ac_cv_lib_edit_readline" = x""yes; then
-   READLINE=edit EDITLINE_FLG=Y
- else
--  { $as_echo "$as_me:$LINENO: checking for readline in -leditline" >&5
--$as_echo_n "checking for readline in -leditline... " >&6; }
-+  { $as_echo "$as_me:$LINENO: checking for readline in -ledit" >&5
-+$as_echo_n "checking for readline in -ledit... " >&6; }
-+
-+
- if test "${ac_cv_lib_editline_readline+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-leditline  $LIBS"
-+LIBS="-ledit  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch
deleted file mode 100644
index 8be521cc0fac..000000000000
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-deps-flags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird
---- Firebird-2.5.0.26074-0_orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/Makefile.in.firebird	2011-03-28 15:10:09.814370706 -0400
-@@ -158,7 +158,7 @@
- # some complications particularly for super in needing to start the server
- # that you are currently building. MOD 28-July-2002
- 
--firebird_basic: btyacc_binary external_libraries firebird_boot basic_targets
-+firebird_basic: firebird_boot basic_targets
- 
- firebird_boot: updateBuildNum boot_phase1 boot_phase2 
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults
---- Firebird-2.5.0.26074-0_orig/builds/posix/make.defaults	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/make.defaults	2011-03-28 15:21:26.904370708 -0400
-@@ -138,7 +138,7 @@
- AR=			ar @AR_OPTIONS@ crsu
- LN=			@LN_S@
- RANLIB=			@RANLIB@
--BTYACC=$(ROOT)/extern/btyacc/btyacc
-+BTYACC=/usr/bin/btyacc
- 
- CC =	@CC@
- CXX =	@CXX@
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux
---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux	2011-03-25 21:38:29.031037374 -0400
-@@ -18,11 +18,10 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -march=i586 -mtune=i686 -fno-omit-frame-pointer
-+COMMON_FLAGS=-DLINUX -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND -p $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
- 
-diff -Naur Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64 Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64
---- Firebird-2.5.0.26074-0_orig/builds/posix/prefix.linux_amd64	2010-11-09 12:42:45.000000000 -0500
-+++ Firebird-2.5.0.26074-0_deps-flags/builds/posix/prefix.linux_amd64	2011-03-25 21:39:15.134370707 -0400
-@@ -18,12 +18,11 @@
- #
- # 2 Oct 2002, Nickolay Samofatov - Major cleanup
- 
--COMMON_FLAGS=-ggdb -DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -pipe -MMD -fPIC -fmessage-length=0
--OPTIMIZE_FLAGS=-O3 -fno-omit-frame-pointer 
-+COMMON_FLAGS=-DFB_SEND_FLAGS=MSG_NOSIGNAL -DLINUX -DAMD64 -MMD -fPIC -fmessage-length=0
- WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-variable
- CXXFLAGS:= $(CXXFLAGS) -fno-rtti
- 
--PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
-+PROD_FLAGS=$(COMMON_FLAGS)
- #DEV_FLAGS=-DUSE_VALGRIND $(COMMON_FLAGS) $(WARN_FLAGS)
- DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
- 
diff --git a/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch b/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch
deleted file mode 100644
index 3891cc776fae..000000000000
--- a/dev-db/firebird/files/firebird-2.5.0.26074.0-superclassic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur orig/builds/posix/Makefile.in.firebird builds/posix/Makefile.in.firebird
---- orig/builds/posix/Makefile.in.firebird	2010-11-09 12:42:45.000000000 -0500
-+++ builds/posix/Makefile.in.firebird	2011-03-07 20:26:56.612573632 -0500
-@@ -332,7 +332,7 @@
- .PHONY: libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql 
- .PHONY: embed_gpre embed_util
- 
--classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed inet_server fb_smp_server embed_gfix embed_gbak embed_isql \
-+classic_targets: $(PLAT_CLASSIC_PRE_TARGET) libfbembed fbserver fb_smp_server embed_gfix embed_gbak embed_isql \
- 	embed_gpre libfbclient embed_util embed_gdef embed_qli embed_fbudf $(PLAT_CLASSIC_POST_TARGET)
- 
- libfbembed: