commit: 090c438e1fc6fe17eca317421604a29720871bff
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 15:54:26 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 19:25:33 2017 +0000
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 00000000..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"
+ MSG="sed of $3, required $2 line(s) modified $1"
einfo "${MSG}"
[[ $1 -ge $2 ]] || die "${MSG}"
}
@@ -61,12 +65,9 @@ src_unpack() {
}
src_prepare() {
- # This patch might be portable, and not need to be duplicated per
version
- # also might no longer be necessary to patch deps or libs, just flags
- epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
+ ! use xinetd && eapply
"${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
- use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
- use superserver || epatch
"${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
+ default
# Rename references to isql to fbsql
# sed vs patch for portability and addtional location changes
@@ -150,8 +151,6 @@ src_install() {
insinto /usr/$(get_libdir)/${PN}
doins *.msg
- use client && return
-
einfo "Renaming isql -> fbsql"
mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
@@ -185,11 +184,13 @@ src_install() {
exeinto /usr/$(get_libdir)/firebird/intl
dolib.so intl/libfbintl.so
dosym ../../libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
+ dosym libfbintl.so /usr/$(get_libdir)/libfbintl.so.1
dosym /etc/firebird/fbintl.conf
/usr/$(get_libdir)/${PN}/intl/fbintl.conf
exeinto /usr/$(get_libdir)/${PN}/plugins
dolib.so plugins/libfbtrace.so
dosym ../../libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
+ dosym libfbtrace.so /usr/$(get_libdir)/libfbtrace.so.0
exeinto /usr/$(get_libdir)/${PN}/UDF
doexe UDF/*.so
@@ -218,24 +219,18 @@ src_install() {
diropts -m 755 -o firebird -g firebird
dodir /var/log/${PN}
- dodir /var/run/${PN}
keepdir /var/log/${PN}
- keepdir /var/run/${PN}
use examples && docinto examples
}
pkg_postinst() {
- use client && return
-
# Hack to fix ownership/perms
chown -fR firebird:firebird "${ROOT}/etc/${PN}"
"${ROOT}/usr/$(get_libdir)/${PN}"
chmod 750 "${ROOT}/etc/${PN}"
}
pkg_config() {
- use client && return
-
# if found /etc/security.gdb from previous install, backup, and restore
as
# /etc/security2.fdb
if [[ -f "${ROOT}/etc/firebird/security.gdb" ]] ; then
@@ -285,5 +280,5 @@ pkg_config() {
fi
einfo "If you're using UDFs, please remember to move them"
- einfo "to /usr/lib/firebird/UDF"
+ einfo "to /usr/$(get_libdir)/firebird/UDF"
}
