[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2022-12-02 Thread Sam James 
commit: 59693b49cfd41df01375b0e4bb8c588e654ff2f3
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  3 06:00:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  3 06:06:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59693b49

dev-db/firebird: add 3.0.10.33601.0

Closes: https://bugs.gentoo.org/757282
Closes: https://bugs.gentoo.org/828067
Closes: https://bugs.gentoo.org/881327
Signed-off-by: Sam James  gentoo.org>

 dev-db/firebird/Manifest   |  1 +
 ...ird-3.0.10.33601.0-configure-autoconf2.72.patch | 21 +
 ...firebird-3.0.10.33601.0-configure-clang16.patch | 48 +++
 .../files/firebird-3.0.10.33601.0-unbundle.patch   | 97 ++
 0-r3.ebuild => firebird-3.0.10.33601.0.ebuild} | 21 +++--
 5 files changed, 181 insertions(+), 7 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index 51396b4f1a13..f1ba268e1bd6 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
+DIST Firebird-3.0.10.33601-0.tar.bz2 13270269 BLAKE2B 
1c30b002525287b239a6e24e59f146fdb61e1a9880cf66f2c59605b9f2a28c42603e21b2c5275e03a319af24c18f8fa5a7fa73f34c9a0d6c19e36e69864ad122
 SHA512 
0297a191ea1d0eda9557519d8ce6b7686cc3698a98b9c6c00547c2d36bf098083ae9d34b61614a7232b6195344bea1d66d2cbd3b092844b11f5b139162f8f886
 DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 
4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d
 SHA512 
a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
 DIST ib_b60_doc.zip 10530848 BLAKE2B 
b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d
 SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a

diff --git 
a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch 
b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
new file mode 100644
index ..29cca62fc790
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-autoconf2.72.patch
@@ -0,0 +1,21 @@
+https://github.com/FirebirdSQL/firebird/commit/3fe8f6510de79689a26868e244840b24dcb19567
+
+From 3fe8f6510de79689a26868e244840b24dcb19567 Mon Sep 17 00:00:00 2001
+From: AlexPeshkoff 
+Date: Wed, 23 Nov 2022 20:30:03 +0300
+Subject: [PATCH] Fixed #7394: autoconf 2.72 support
+
+--- a/configure.ac
 b/configure.ac
+@@ -696,8 +696,9 @@ if test "$STD_EDITLINE" = "true"; then
+   AC_CHECK_LIB(readline, readline, [READLINE=readline EDITLINE_FLG=Y],
+ [STD_EDITLINE=false
+  if test "$EDITLINE_FLG" = "Y"; then
+-   AC_MSG_WARN([[[--with-system-editline specified, not found. Using 
bundled editline]]])])))
++   AC_MSG_WARN([[[--with-system-editline specified, not found. Using 
bundled editline]]])
+fi
++   ])))
+ fi
+ XE_RESTORE_ENV()
+ 
+

diff --git 
a/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch 
b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
new file mode 100644
index ..06d6907369ca
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.10.33601.0-configure-clang16.patch
@@ -0,0 +1,48 @@
+https://github.com/FirebirdSQL/firebird/pull/7407
+
+From a39cde31c4c78866c8f8ee0285fc4bcb81496d81 Mon Sep 17 00:00:00 2001
+From: Florian Weimer 
+Date: Thu, 1 Dec 2022 18:26:06 +0100
+Subject: [PATCH] configure.ac: Add missing int return types to main
+
+Implicit ints are a language feature that was removed in C99 and
+future compilers may require declaration of all return types.
+--- a/configure.ac
 b/configure.ac
+@@ -1118,7 +1118,7 @@ AC_CHECK_FUNCS(sem_init)
+ if test "$ac_cv_func_sem_init" = "yes"; then
+ AC_MSG_CHECKING(for working sem_init())
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include 
+-  main () {
++  int main () {
+   sem_t s;
+   return sem_init(,0,0);
+   }
+@@ -1159,7 +1159,7 @@ AC_SYS_LARGEFILE
+ if test "$ac_cv_sys_file_offset_bits" = "no"; then
+   AC_MSG_CHECKING(for native large file support)
+   AC_RUN_IFELSE([AC_LANG_SOURCE([[#include 
+-main () {
++int main () {
+ return !(sizeof(off_t) == 8);
+   }]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
+@@ -1206,7 +1206,7 @@ dnl EKU: try to determine the alignment of long and 
double
+ dnl  replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
+ AC_MSG_CHECKING(alignment of long)
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include 
+-main () {
++int main () {
+   struct s {
+ char a;
+ union { long long x; sem_t y; } b;
+@@ -1217,7 +1217,7 @@ AC_MSG_RESULT($ac_cv_c_alignment)
+ AC_DEFINE_UNQUOTED(FB_ALIGNMENT,

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2022-06-02 Thread Sam James 
commit: 7dce4489ac962b89da6d80cd17abd971bee3fb92
Author: Brian Evans  gentoo  org>
AuthorDate: Fri Jun  3 05:28:26 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  3 05:30:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dce4489

dev-db/firebird: Improve OpenRC script

The attached script updates a couple things which effectively is the same
as the current model however it follows the modular nature of the declarative
syntax.

Changes:
* Removes -p which is implied via pidfile=
* Sets user via command_user
* Moves the daemon options to command_args_background

Closes: https://bugs.gentoo.org/828073
Signed-off-by: Brian Evans  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 dev-db/firebird/files/firebird.init.d.3.0-r1 |  22 +++
 dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild | 228 +++
 2 files changed, 250 insertions(+)

diff --git a/dev-db/firebird/files/firebird.init.d.3.0-r1 
b/dev-db/firebird/files/firebird.init.d.3.0-r1
new file mode 100644
index ..c49ea97f9203
--- /dev/null
+++ b/dev-db/firebird/files/firebird.init.d.3.0-r1
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+name=${RC_SVCNAME}
+
+fbhomedir="/var/run/firebird"
+fblogdir="/var/log/firebird"
+pidfile="${fbhomedir}/firebird.pid"
+command="/usr/sbin/fbguard"
+command_args="-forever"
+command_args_background="-daemon -pidfile $pidfile"
+command_user="${FBUSER:-firebird}:${FBGROUP:-firebird}"
+
+depend() {
+   need net
+}
+
+start_pre() {
+   checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} 
${fbhomedir} || return 1
+   checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} 
${fblogdir} || return 1
+}

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild 
b/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild
new file mode 100644
index ..3ee04900edfe
--- /dev/null
+++ b/dev-db/firebird/firebird-3.0.4.33054.0-r3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN/f/F}-$(ver_rs 4 '-')
+inherit autotools flag-o-matic
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
+HOMEPAGE="https://www.firebirdsql.org/;
+SRC_URI="
+   https://github.com/FirebirdSQL/firebird/releases/download/R$(ver_rs 1-3 
'_' $(ver_cut 1-3))/${MY_P}.tar.bz2
+   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="IDPL Interbase-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +server xinetd"
+
+BDEPEND="
+   >=dev-util/btyacc-3.0-r2
+   doc? ( app-arch/unzip )
+"
+# FIXME: cloop?
+DEPEND="
+   dev-libs/icu:=
+   dev-libs/libedit
+   dev-libs/libtommath
+"
+RDEPEND="
+   ${DEPEND}
+   acct-group/firebird
+   acct-user/firebird
+   xinetd? ( virtual/inetd )
+   !sys-cluster/ganglia
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-3.0.2.32703.0-unbundle.patch
+   "${FILESDIR}"/${PN}-3.0.2.32703.0-cloop-compiler.patch
+)
+
+pkg_pretend() {
+   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
+   ewarn
+   ewarn "The presence of server connections may prevent isql or 
gsec"
+   ewarn "from establishing an embedded connection. Accordingly,"
+   ewarn "creating employee.fdb or security3.fdb could fail."
+   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
+   ewarn
+   fi
+}
+
+check_sed() {
+   MSG="sed of $3, required $2 line(s) modified $1"
+   einfo "${MSG}"
+   [[ $1 -ge $2 ]] || die "${MSG}"
+}
+
+src_unpack() {
+   unpack "${MY_P}.tar.bz2"
+   if use doc; then
+   # Unpack docs
+   mkdir "manuals" || die
+   cd "manuals" || die
+   unpack ib_b60_doc.zip
+   fi
+}
+
+src_prepare() {
+   default
+
+   # Rename references to isql to fbsql
+   # sed vs patch for portability and addtional location changes
+   check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
+   src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
+   check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
+   src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 
lines
+   check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
+   -e 's:isql :fbsql :w /dev/stdout' \
+   -e 's:ISQL :FBSQL :w /dev/stdout' \
+   src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 
6 lines
+
+   find . -name \*.sh -exec chmod +x {} + || die
+   rm -r extern/{btyacc,editline,icu} || die
+
+   eautoreconf
+}
+
+src_configure() {
+   filter-flags -fprefetch-loop-arrays
+   filter-mfpmath sse
+
+

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2021-11-11 Thread Sam James 
commit: 4aed90b3ded4cb4624856384297b2dec9748c8ae
Author: Sam James  gentoo  org>
AuthorDate: Fri Nov 12 05:03:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Nov 12 05:05:12 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aed90b3

dev-db/firebird: fix logrotate file syntax

Signed-off-by: Sam James  gentoo.org>

 dev-db/firebird/files/firebird.logrotate| 2 +-
 .../{firebird-3.0.4.33054.0.ebuild => firebird-3.0.4.33054.0-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-db/firebird/files/firebird.logrotate 
b/dev-db/firebird/files/firebird.logrotate
index c87cd43f30f..a4542b47ea9 100644
--- a/dev-db/firebird/files/firebird.logrotate
+++ b/dev-db/firebird/files/firebird.logrotate
@@ -3,7 +3,7 @@
  weekly
  missingok
  rotate 52
- size=+1024k
+ size +1024k
  delaycompress
  notifempty
  create 644 firebird

diff --git a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild 
b/dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
similarity index 99%
rename from dev-db/firebird/firebird-3.0.4.33054.0.ebuild
rename to dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
index 899d3889c9e..02ac62b72c4 100644
--- a/dev-db/firebird/firebird-3.0.4.33054.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.4.33054.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2019-08-16 Thread Andreas Sturmlechner 
commit: 2f1b7fab01208fea762ce9b179d2f55095c1381b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug 16 07:40:15 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug 16 08:24:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f1b7fab

dev-db/firebird: Drop 3.0.2.32703.0-r2

Bug: https://bugs.gentoo.org/686150
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-db/firebird/Manifest   |   1 -
 .../files/firebird-3.0.2.32703.0-gcc6.patch|  19 --
 dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild   | 235 -
 3 files changed, 255 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index ad827f3ecc0..51396b4f1a1 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,2 @@
-DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 
58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6
 SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 DIST Firebird-3.0.4.33054-0.tar.bz2 9778106 BLAKE2B 
4b9116cbc351e0c2e10d15e6ea8e9754a383da77d8e016337604143eb2677ff2519da34b1a5c2e9b7b071fa9774eddbb535e9f926058ee626573b0411f6c042d
 SHA512 
a346ebd53aeccf0b33eac5d35c3c3356624c1fbd0ad897173b3f68d940143062b28460a2822df807e8e8a1ea8792ebf98ed33e5b3ae273d86e6e36295a7fc8ad
 DIST ib_b60_doc.zip 10530848 BLAKE2B 
b4008b3e8b0416014d024cbbc9ac2e648ad671c71b91b7aeb0eedf0f8479aef80e22aff7105c5e7417e88bcf57f2cdacbc2d5f51a2ef7fb870f9d361c5f0ed6d
 SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a

diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch
deleted file mode 100644
index e1361415c03..000
--- a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 3618aa2171674babf79ef935aa049c40a3db1321
-Author: asfernandes 
-Date:   Sat Mar 5 03:39:36 2016 +
-
-Make the generated code compatible with gcc 6 in C++-14 mode.
-
-diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
-index 2af96c6..2dcffd6 100644
 a/src/gpre/c_cxx.cpp
-+++ b/src/gpre/c_cxx.cpp
-@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
-   printa(0, "static %sshort\n   isc_%dl = %d;",
-  (request->req_flags & REQ_extend_dpb) ? "" : 
CONST_STR,
-  request->req_ident, request->req_length);
--  printa(0, "static %schar\n   isc_%d [] = {", CONST_STR, 
request->req_ident);
-+  printa(0, "static %sunsigned char\n   isc_%d [] = {", 
CONST_STR, request->req_ident);
- 
-   const TEXT* string_type = "blr";
-   if (gpreGlob.sw_raw)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
deleted file mode 100644
index 8ab5dd6952c..000
--- a/dev-db/firebird/firebird-3.0.2.32703.0-r2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic user versionator
-
-MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-
-DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
-HOMEPAGE="https://www.firebirdsql.org/;
-SRC_URI="
-   mirror://sourceforge/firebird/${MY_P}.tar.bz2
-   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
-
-LICENSE="IDPL Interbase-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc examples +server xinetd"
-
-# FIXME: cloop?
-CDEPEND="
-   dev-libs/libtommath
-   dev-libs/icu:=
-   dev-libs/libedit
-"
-DEPEND="${CDEPEND}
-   >=dev-util/btyacc-3.0-r2
-   doc? ( app-arch/unzip )
-"
-RDEPEND="${CDEPEND}
-   xinetd? ( virtual/inetd )
-   !sys-cluster/ganglia
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-   "${FILESDIR}/${P}"-unbundle.patch
-   "${FILESDIR}/${P}"-gcc6.patch
-   "${FILESDIR}/${P}"-cloop-compiler.patch
-)
-
-pkg_pretend() {
-   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
-   ewarn
-   ewarn "The presence of server connections may prevent isql or 
gsec"
-   ewarn "from establishing an embedded connection. Accordingly,"
-   ewarn "creating employee.fdb or security3.fdb could fail."
-   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
-   ewarn
-   fi
-}
-
-pkg_setup() {
-   enewgroup firebird 450
-   enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
-}
-
-check_sed() {
-   MSG="sed of $3, required $2 line(s) modified $1"
-

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-12-06 Thread Andreas Sturmlechner 
commit: e7b0cb0b12132fdc710a9ef12fbb53c1bbe21eec
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 19:58:45 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec  6 20:14:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7b0cb0b

dev-db/firebird: Fix build with GCC-6

Thanks-to: Maciej S. Szmigiero  maciej.szmigiero.name>
Bug: https://bugs.gentoo.org/639614
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 dev-db/firebird/Manifest| 4 ++--
 dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch | 2 +-
 dev-db/firebird/firebird-2.5.7.27050.0.ebuild   | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index b7e1145f12f..3335ecdfda5 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,3 +1,3 @@
-DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 SHA256 
0a3b68c94e9d4eab0e56c98312f0955a0ec69ec4e9e801e0a81be758f032171a SHA512 
793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
 WHIRLPOOL 
d162deb478fcee737aa973c3d87498a8fc418cf8facabf72a4d4cbc00db213ba0f6d98a29dc9bfd00a545e55cdb702770a3e10b7db0d0211b4cb60286c63105a
-DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 SHA256 
1eb4ca57538b03cf1f7504f19d10c86f5b0238604d72df7fbd7f24927a66ad2d SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 WHIRLPOOL 
2cba1a0d395147b730d7d97e7226edcaf3b90f816a18cb9fe46fb6914771bf74d1339c956b91b8a7b5da25c354dc33899a430ae53775b941720c203010fc52dd
+DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 BLAKE2B 
fbe7af7b5cfa738459df7fd1dba0b897b04f2f6c8244d1f951e18c908c298e91e89b2300677c45834103e5215856341f673040b80b761921e68b1dc05381938b
 SHA512 
793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
+DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 BLAKE2B 
58afbdb430adb5f9aafe33d5459fb4fe8607e9440b6b114291777e43d447a7a5b5696c9f5903a10b63217a15836ce6386569e636369e37bf83195ec0b96e4fc6
 SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 DIST ib_b60_doc.zip 10530848 SHA256 
8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
 WHIRLPOOL 
5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f

diff --git a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch 
b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
index f051ea02b4c..312f3576bcc 100644
--- a/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
+++ b/dev-db/firebird/files/firebird-2.5.7.27050.0-gcc6.patch
@@ -32,4 +32,4 @@ PR: https://github.com/FirebirdSQL/firebird/pull/104
 +  static_cast(blr_end),
blr_eoc
};
-   static FB_API_HANDLE req_handle;
\ No newline at end of file
+   static FB_API_HANDLE req_handle;

diff --git a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild 
b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
index b6e56990fd8..afe4c215521 100644
--- a/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
+++ b/dev-db/firebird/firebird-2.5.7.27050.0.ebuild
@@ -88,6 +88,8 @@ src_prepare() {
 src_configure() {
filter-flags -fprefetch-loop-arrays
filter-mfpmath sse
+   # bug 639614
+   append-cxxflags -flifetime-dse=1 -fno-sized-deallocation 
-fno-delete-null-pointer-checks
 
econf \
--prefix=/usr/$(get_libdir)/firebird \

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-05-21 Thread Andreas Hüttel 
commit: e246873f43db77850c172263be72bc5153b23adb
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun May 21 11:56:02 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sun May 21 11:57:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e246873f

dev-db/firebird: Simplify and add work from linuxunderground overlay

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/files/firebird.init.d.3.0 |  22 +++
 dev-db/firebird/files/firebird.xinetd.3.0 |  11 ++
 dev-db/firebird/firebird-3.0.2.32703.0.ebuild | 186 --
 dev-db/firebird/metadata.xml  |   1 +
 4 files changed, 116 insertions(+), 104 deletions(-)

diff --git a/dev-db/firebird/files/firebird.init.d.3.0 
b/dev-db/firebird/files/firebird.init.d.3.0
new file mode 100644
index 000..9fd4f850476
--- /dev/null
+++ b/dev-db/firebird/files/firebird.init.d.3.0
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+name=${RC_SVCNAME}
+
+fbhomedir="/var/run/firebird"
+fblogdir="/var/log/firebird"
+pidfile="${fbhomedir}/firebird.pid"
+command="/usr/sbin/fbguard"
+command_args="-forever -daemon -pidfile $pidfile"
+
+start_stop_daemon_args="-p ${pidfile} -u 
${FBUSER:-firebird}:${FBGROUP:-firebird}"
+
+depend() {
+   need net
+}
+
+start_pre() {
+   checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} 
${fbhomedir} || return 1
+   checkpath -q -d -m 0770 -o ${FBUSER:-firebird}:${FBGROUP:-firebird} 
${fblogdir} || return 1
+}

diff --git a/dev-db/firebird/files/firebird.xinetd.3.0 
b/dev-db/firebird/files/firebird.xinetd.3.0
new file mode 100644
index 000..4e094bdf062
--- /dev/null
+++ b/dev-db/firebird/files/firebird.xinetd.3.0
@@ -0,0 +1,11 @@
+service gds_db
+{
+   flags   = REUSE
+   socket_type = stream
+   wait= no
+   user= firebird
+   log_on_success  += USERID
+   log_on_failure  += USERID
+   server  = /usr/bin/firebird
+   disable = yes
+}

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
index 4cf71cd1fe1..4bee6fc80bd 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -17,9 +17,11 @@ LICENSE="IDPL Interbase-1.0"
 SLOT="0"
 KEYWORDS=""
 
-IUSE="doc examples xinetd"
+IUSE="doc examples +server xinetd"
 
+# FIXME: cloop?
 CDEPEND="
+   dev-libs/libtommath
dev-libs/icu:=
dev-libs/libedit
 "
@@ -40,6 +42,17 @@ PATCHES=(
"${FILESDIR}/${P}"-cloop-compiler.patch
 )
 
+pkg_pretend() {
+   if [[ -e /var/run/${PN}/${PN}.pid ]] ; then
+   ewarn
+   ewarn "The presence of server connections may prevent isql or 
gsec"
+   ewarn "from establishing an embedded connection. Accordingly,"
+   ewarn "creating employee.fdb or security3.fdb could fail."
+   ewarn "It is more secure to stop the firebird daemon before 
running emerge."
+   ewarn
+   fi
+}
+
 pkg_setup() {
enewgroup firebird 450
enewuser firebird 450 /bin/sh /usr/$(get_libdir)/firebird firebird
@@ -99,10 +112,10 @@ src_configure() {
--with-fbconf=/etc/${PN} \
--with-fblib=/usr/$(get_libdir) \
--with-fbinclude=/usr/include \
-   --with-fbdoc=/usr/share/doc/${P} \
+   --with-fbdoc=/usr/share/doc/${PF} \
--with-fbudf=/usr/$(get_libdir)/${PN}/UDF \
-   --with-fbsample=/usr/share/doc/${P}/examples \
-   --with-fbsample-db=/usr/share/doc/${P}/examples/db \
+   --with-fbsample=/usr/share/doc/${PF}/examples \
+   --with-fbsample-db=/usr/share/doc/${PF}/examples/db \
--with-fbhelp=/usr/$(get_libdir)/${PN}/help \
--with-fbintl=/usr/$(get_libdir)/${PN}/intl \
--with-fbmisc=/usr/share/${PN} \
@@ -115,143 +128,108 @@ src_configure() {
${myconf}
 }
 
-src_compile() {
-   MAKEOPTS="${MAKEOPTS/-j*/-j1} ${MAKEOPTS/-j/CPU=}"
-   emake
-}
-
+# from linux underground, merging into this here
 src_install() {
-   cd "gen/Release/${PN}" || die
-
if use doc; then
-   dodoc "${S}"/doc/*.pdf
+   dodoc -r doc
find "${WORKDIR}"/manuals -type f -iname "*.pdf" -exec dodoc 
'{}' + || die
fi
 
-   doheader include/*
+   cd "${S}/gen/Release/${PN}" || die
 
-   insinto /usr/$(get_libdir)
+   doheader include/*
dolib.so lib/*.so*
 
# links for backwards compatibility
+   insinto /usr/$(get_libdir)
dosym libfbclient.so /usr/$(get_libdir)/libgds.so
dosym libfbclient.so

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-05-19 Thread Andreas Hüttel 
commit: 27c1365ddac261581a5e97294c162a5669521228
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Fri May 19 23:42:38 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Fri May 19 23:43:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c1365d

dev-db/firebird: Builds, but the install phase needs more analysis

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../firebird-3.0.2.32703.0-cloop-compiler.patch| 15 +++
 .../files/firebird-3.0.2.32703.0-gcc6.patch| 19 +
 dev-db/firebird/firebird-3.0.2.32703.0.ebuild  | 31 +-
 3 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch
new file mode 100644
index 000..363602bed8f
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-cloop-compiler.patch
@@ -0,0 +1,15 @@
+Source: LibreOffice git master
+
+
+diff -ur firebird.org/extern/cloop/Makefile firebird/extern/cloop/Makefile
+--- firebird.org/extern/cloop/Makefile 2016-08-17 18:32:59.078044357 +0200
 firebird/extern/cloop/Makefile 2016-08-17 18:33:14.430518561 +0200
+@@ -4,8 +4,6 @@
+ 
+ TARGET:= release
+ 
+-CC:= gcc
+-CXX   := g++
+ LD:= $(CXX)
+ 
+ SRC_DIR   := src

diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch
new file mode 100644
index 000..e1361415c03
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-gcc6.patch
@@ -0,0 +1,19 @@
+commit 3618aa2171674babf79ef935aa049c40a3db1321
+Author: asfernandes 
+Date:   Sat Mar 5 03:39:36 2016 +
+
+Make the generated code compatible with gcc 6 in C++-14 mode.
+
+diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
+index 2af96c6..2dcffd6 100644
+--- a/src/gpre/c_cxx.cpp
 b/src/gpre/c_cxx.cpp
+@@ -2820,7 +2820,7 @@ static void gen_request(const gpre_req* request)
+   printa(0, "static %sshort\n   isc_%dl = %d;",
+  (request->req_flags & REQ_extend_dpb) ? "" : 
CONST_STR,
+  request->req_ident, request->req_length);
+-  printa(0, "static %schar\n   isc_%d [] = {", CONST_STR, 
request->req_ident);
++  printa(0, "static %sunsigned char\n   isc_%d [] = {", 
CONST_STR, request->req_ident);
+ 
+   const TEXT* string_type = "blr";
+   if (gpreGlob.sw_raw)

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
index 9180b5aa186..4cf71cd1fe1 100644
--- a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -34,9 +34,10 @@ RDEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-# this is work in progress and likely does not build yet
 PATCHES=(
-   "${FILESDIR}/${P}-unbundle.patch"
+   "${FILESDIR}/${P}"-unbundle.patch
+   "${FILESDIR}/${P}"-gcc6.patch
+   "${FILESDIR}/${P}"-cloop-compiler.patch
 )
 
 pkg_setup() {
@@ -84,11 +85,10 @@ src_configure() {
filter-flags -fprefetch-loop-arrays
filter-mfpmath sse
 
-   # otherwise this doesnt build with gcc-6?
+   # otherwise this doesnt build with gcc-6
# http://tracker.firebirdsql.org/browse/CORE-5099
append-cflags -fno-sized-deallocation -fno-delete-null-pointer-checks
-   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks 
-Wno-narrowing
-   # -std=c++11
+   append-cxxflags -fno-sized-deallocation -fno-delete-null-pointer-checks
 
econf \
--prefix=/usr/$(get_libdir)/firebird \
@@ -130,8 +130,6 @@ src_install() {
 
doheader include/*
 
-   rm lib/libfbstatic.a || die "failed to remove libfbstatic.a"
-
insinto /usr/$(get_libdir)
dolib.so lib/*.so*
 
@@ -146,29 +144,12 @@ src_install() {
einfo "Renaming isql -> fbsql"
mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
 
-   local bins="fbsql fbsvcmgr fbtracemgr gbak gdef gfix gpre gsec gstat 
nbackup qli"
+   local bins="fbguard fbsql fbsvcmgr fbtracemgr firebird gbak gfix gpre 
gpre_boot gpre_current gsec gsplit gstat nbackup qli"
for bin in ${bins}; do
dobin bin/${bin}
done
 
dosbin bin/fb_lock_print
-   # SuperServer
-   if use superserver ; then
-   dosbin bin/{fbguard,fbserver}
-   # ClassicServer
-   elif use xinetd ; then
-   dosbin bin/fb_inet_server
-   # SuperClassic
-   else
-   dosbin bin/{fbguard,fb_smp_server}
-
-   #Temp should not be necessary, need to patch/fix
-   dosym ../../libib_util.so 
/usr/$(get_libdir)/${PN}/lib/libib_util.so
-   fi
-
-   exeinto /usr/bin/${PN}
-   exeopts -m0755
-   doexe

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-05-13 Thread Andreas Hüttel 
commit: 2ee359baae6e5853d90f0ae511bdd9cb48d5aac2
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat May 13 23:45:26 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Sat May 13 23:45:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee359ba

dev-db/firebird: Work in progress. Build fails so far.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-db/firebird/Manifest   |   1 +
 .../files/firebird-3.0.2.32703.0-unbundle.patch|  51 
 dev-db/firebird/firebird-3.0.2.32703.0.ebuild  | 276 +
 3 files changed, 328 insertions(+)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index feadd1192ef..b7e1145f12f 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
 DIST Firebird-2.5.7.27050-0.tar.bz2 13402538 SHA256 
0a3b68c94e9d4eab0e56c98312f0955a0ec69ec4e9e801e0a81be758f032171a SHA512 
793d47a8c8395dfb6f8417253950034dcd61b6b8337e654510d2d133396e5d1fccf615fc614bbe3129a64a101e956cb8b54d7460b06e72b245518f1b5af99327
 WHIRLPOOL 
d162deb478fcee737aa973c3d87498a8fc418cf8facabf72a4d4cbc00db213ba0f6d98a29dc9bfd00a545e55cdb702770a3e10b7db0d0211b4cb60286c63105a
+DIST Firebird-3.0.2.32703-0.tar.bz2 9536416 SHA256 
1eb4ca57538b03cf1f7504f19d10c86f5b0238604d72df7fbd7f24927a66ad2d SHA512 
5950d1689c77fbcda22f1bd8015321d887dec3c7ef39665428a8bda9122838e767b168442ce7d8fb3b9b80cbd1206725b0f54bd215c5c9eb1d322b546cb042e6
 WHIRLPOOL 
2cba1a0d395147b730d7d97e7226edcaf3b90f816a18cb9fe46fb6914771bf74d1339c956b91b8a7b5da25c354dc33899a430ae53775b941720c203010fc52dd
 DIST ib_b60_doc.zip 10530848 SHA256 
8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
 WHIRLPOOL 
5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f

diff --git a/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch 
b/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch
new file mode 100644
index 000..6fdd657223d
--- /dev/null
+++ b/dev-db/firebird/files/firebird-3.0.2.32703.0-unbundle.patch
@@ -0,0 +1,51 @@
+diff -ruN Firebird-3.0.2.32703-0.orig/builds/posix/Makefile.in 
Firebird-3.0.2.32703-0/builds/posix/Makefile.in
+--- Firebird-3.0.2.32703-0.orig/builds/posix/Makefile.in   2017-03-21 
10:11:35.0 +0100
 Firebird-3.0.2.32703-0/builds/posix/Makefile.in2017-05-14 
01:32:34.032241679 +0200
+@@ -123,7 +123,6 @@
+ #
+ 
+ extern:
+-  $(MAKE) -C $(ROOT)/extern/btyacc
+   $(MAKE) -C $(ROOT)/extern/cloop TARGET=release WITH_FPC=0 
BUILD_DIR=$(TMP_ROOT)/cloop OUT_DIR=$(GEN_ROOT)/$(TARGET)/cloop
+ 
+ ifeq ($(TOMBUILD_FLG),Y)
+@@ -648,7 +647,7 @@
+ # various cleaning
+ #
+ .PHONY: clean clean_objects clean_dependancies clean_extern_objects 
clean_build \
+-  clean_gpre_gen clean_icu clean_dbs clean_examples 
clean_makefiles \
++  clean_gpre_gen clean_dbs clean_examples clean_makefiles \
+   clean_editline clean_all
+ 
+ 
+@@ -669,8 +668,6 @@
+   $(RM) $(ROOT)/libtool
+   $(RM_R) $(ROOT)/autom4te.cache
+   -$(MAKE) -C $(ROOT)/extern/editline distclean
+-# -$(MAKE) -C $(ROOT)/extern/icu/source distclean
+-  -$(MAKE) -C $(ROOT)/extern/btyacc distclean
+ 
+ clean_dbs:
+   $(RM) *.fdb *.FDB msg.timestamp
+@@ -687,9 +684,6 @@
+ clean_editline:
+   -$(MAKE) -C $(ROOT)/extern/editline clean
+ 
+-#clean_icu:
+-# -$(MAKE) -C $(ROOT)/extern/icu/source clean
+-
+ clean_tommath:
+   -$(MAKE) -C $(ROOT)/extern/libtommath clean
+ 
+diff -ruN Firebird-3.0.2.32703-0.orig/builds/posix/make.defaults 
Firebird-3.0.2.32703-0/builds/posix/make.defaults
+--- Firebird-3.0.2.32703-0.orig/builds/posix/make.defaults 2017-03-21 
10:11:35.0 +0100
 Firebird-3.0.2.32703-0/builds/posix/make.defaults  2017-05-14 
01:29:54.590235045 +0200
+@@ -155,7 +155,7 @@
+ AR=   ar @AR_OPTIONS@
+ LN=   @LN_S@
+ RANLIB=   @RANLIB@
+-BTYACC=$(ROOT)/extern/btyacc/btyacc
++BTYACC=/usr/bin/btyacc
+ CLOOP=$(GEN_ROOT)/$(TARGET)/cloop/release/bin/cloop
+ 
+ CC =  @CC@

diff --git a/dev-db/firebird/firebird-3.0.2.32703.0.ebuild 
b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
new file mode 100644
index 000..345fb30b315
--- /dev/null
+++ b/dev-db/firebird/firebird-3.0.2.32703.0.ebuild
@@ -0,0 +1,276 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic user versionator
+
+MY_P=${PN/f/F}-$(replace_version_separator 4 -)
+
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
+HOMEPAGE="https://www.firebirdsql.org/;
+SRC_URI="
+   mirror://sourceforge/firebird/${MY_P}.tar.bz2
+   doc? (

[gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/

2017-02-04 Thread Andreas Sturmlechner 
commit: 090c438e1fc6fe17eca317421604a29720871bff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb  4 15:54:26 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  4 19:25:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090c438e

dev-db/firebird: 2.5.6.27020.0 version bump, EAPI 6, drop USE=client

Gentoo-bug: 420817, 420939, 578230

- Pick USE=superserver as default
- Drop unused eclasses
- Update HOMEPAGE, DESCRIPTION
- QA fix: Don't install into /var/run (fixed upstream)

Package-Manager: portage-2.3.3

 dev-db/firebird/Manifest   |  1 +
 .../firebird-2.5.6.27020.0-CVE-2016-1569.patch | 12 ++
 ...0.0-r4.ebuild => firebird-2.5.6.27020.0.ebuild} | 43 ++
 3 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
index bdb486c..112d4ca 100644
--- a/dev-db/firebird/Manifest
+++ b/dev-db/firebird/Manifest
@@ -1,2 +1,3 @@
 DIST Firebird-2.5.3.26780-0.tar.bz2 13798872 SHA256 
0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad SHA512 
b8a0bef492d15739ea9a156225ac738687241a11571ce52ee6c644e5017dcff03007945aeb19b0537aadd1de01b339645871ff1905edf41c65679db377c69e98
 WHIRLPOOL 
0321763e79882dcdd2175191e1cbf6c82d656bb16e5ebd4a3bf0f08c77ee0494f06ffb08205b583c4a9990c33d652ac2fa73683e4c7ccebe900236975c8d60a5
+DIST Firebird-2.5.6.27020-0.tar.bz2 13610463 SHA256 
8e416f2f9a8f1fce2aa872925ca2016010878265ec56fe0a32a73e0080378826 SHA512 
db336877bf53503f882f18fbd4c1ef080543d617432c48340a3ac2a9970d960e99d1ca76609c0b3037b2f457ac7c6e23f119e618919b86b52cff89db8aaf3062
 WHIRLPOOL 
c6264f68e917def39eb1ea2ce167e24e6a5903593cb174da656ea7739fbef6ea0a5928a68c772336df10e69440f0cdb6a37c09c98cee6898a43b2f9dc85af671
 DIST ib_b60_doc.zip 10530848 SHA256 
8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 
59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a
 WHIRLPOOL 
5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f

diff --git a/dev-db/firebird/files/firebird-2.5.6.27020.0-CVE-2016-1569.patch 
b/dev-db/firebird/files/firebird-2.5.6.27020.0-CVE-2016-1569.patch
new file mode 100644
index ..1066d58
--- /dev/null
+++ b/dev-db/firebird/files/firebird-2.5.6.27020.0-CVE-2016-1569.patch
@@ -0,0 +1,12 @@
+diff -Naur Firebird-2.5.5.26952-0_orig/src/burp/burp.cpp 
Firebird-2.5.5.26952-0/src/burp/burp.cpp
+--- Firebird-2.5.5.26952-0_orig/src/burp/burp.cpp  2016-03-01 
16:46:48.418536462 -0500
 Firebird-2.5.5.26952-0/src/burp/burp.cpp   2016-03-01 16:48:19.511690164 
-0500
+@@ -460,7 +460,7 @@
+   }
+   else
+   {
+-  BURP_print(true, 137, sw.c_str());
++  BURP_error(137, true, sw.c_str());
+   // msg 137  unknown switch %s
+   }
+   }

diff --git a/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild 
b/dev-db/firebird/firebird-2.5.6.27020.0.ebuild
similarity index 88%
rename from dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
rename to dev-db/firebird/firebird-2.5.6.27020.0.ebuild
index f7d460a..f1cfcd8 100644
--- a/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
+++ b/dev-db/firebird/firebird-2.5.6.27020.0.ebuild
@@ -2,29 +2,28 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools eutils flag-o-matic multilib readme.gentoo user versionator
+inherit autotools flag-o-matic user versionator
 
 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
-#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
 
-DESCRIPTION="A relational database offering many ANSI SQL:2003 and some 
SQL:2008 features"
-HOMEPAGE="http://www.firebirdsql.org/;
+DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 
features"
+HOMEPAGE="https://www.firebirdsql.org/;
 SRC_URI="
mirror://sourceforge/firebird/${MY_P}.tar.bz2
-   doc? (  ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
+   doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
 
 LICENSE="IDPL Interbase-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-IUSE="debug doc client examples superserver xinetd"
-REQUIRED_USE="?? ( client superserver xinetd )"
+IUSE="debug doc examples +superserver xinetd"
+REQUIRED_USE="?? ( superserver xinetd )"
 
 CDEPEND="
-   dev-libs/libedit
dev-libs/icu:=
+   dev-libs/libedit
 "
 DEPEND="${CDEPEND}
>=dev-util/btyacc-3.0-r2
@@ -37,6 +36,11 @@ RDEPEND="${CDEPEND}
 
 RESTRICT="userpriv"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+   "${FILESDIR}"/${P}-CVE-2016-1569.patch
+)
+
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
@@ -45,7 +49,7 @@ pkg_setup() {
 }
 
 check_sed() {
-   MSG="sed of $3, required $2 lines modified $1"
+