Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/firebird/files/, dev-db/firebird/
Date: Sat, 04 Feb 2017 19:26:55
Message-Id: 1486236333.090c438e1fc6fe17eca317421604a29720871bff.asturm@gentoo
1 commit: 090c438e1fc6fe17eca317421604a29720871bff
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 4 15:54:26 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 4 19:25:33 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=090c438e
7
8 dev-db/firebird: 2.5.6.27020.0 version bump, EAPI 6, drop USE=client
9
10 Gentoo-bug: 420817, 420939, 578230
11
12 - Pick USE=superserver as default
13 - Drop unused eclasses
14 - Update HOMEPAGE, DESCRIPTION
15 - QA fix: Don't install into /var/run (fixed upstream)
16
17 Package-Manager: portage-2.3.3
18
19 dev-db/firebird/Manifest | 1 +
20 .../firebird-2.5.6.27020.0-CVE-2016-1569.patch | 12 ++++++
21 ...0.0-r4.ebuild => firebird-2.5.6.27020.0.ebuild} | 43 ++++++++++------------
22 3 files changed, 32 insertions(+), 24 deletions(-)
23
24 diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest
25 index bdb486c..112d4ca 100644
26 --- a/dev-db/firebird/Manifest
27 +++ b/dev-db/firebird/Manifest
28 @@ -1,2 +1,3 @@
29 DIST Firebird-2.5.3.26780-0.tar.bz2 13798872 SHA256 0c4b500d189aa9b4c12a7d2cf310a0b770118967c37ebe0edf8581cbcdad7aad SHA512 b8a0bef492d15739ea9a156225ac738687241a11571ce52ee6c644e5017dcff03007945aeb19b0537aadd1de01b339645871ff1905edf41c65679db377c69e98 WHIRLPOOL 0321763e79882dcdd2175191e1cbf6c82d656bb16e5ebd4a3bf0f08c77ee0494f06ffb08205b583c4a9990c33d652ac2fa73683e4c7ccebe900236975c8d60a5
30 +DIST Firebird-2.5.6.27020-0.tar.bz2 13610463 SHA256 8e416f2f9a8f1fce2aa872925ca2016010878265ec56fe0a32a73e0080378826 SHA512 db336877bf53503f882f18fbd4c1ef080543d617432c48340a3ac2a9970d960e99d1ca76609c0b3037b2f457ac7c6e23f119e618919b86b52cff89db8aaf3062 WHIRLPOOL c6264f68e917def39eb1ea2ce167e24e6a5903593cb174da656ea7739fbef6ea0a5928a68c772336df10e69440f0cdb6a37c09c98cee6898a43b2f9dc85af671
31 DIST ib_b60_doc.zip 10530848 SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d SHA512 59eccf1d6b1f0410eddbc5967fd77a3d00e09749640b3f81e2f8b624f5a45461dffad4af5ec61488e941fb3d3af266fe86c0b56e6b7e023239537cb6557a145a WHIRLPOOL 5c3e17eec64d835bac8832a51acefe04c3a5ff818d1d1e69a032bae1a730fd73996a2be073d2e22bcd4ad4ee1ba2247da8271cd3a03c0326acf46eef1073033f
32
33 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
34 new file mode 100644
35 index 00000000..1066d58
36 --- /dev/null
37 +++ b/dev-db/firebird/files/firebird-2.5.6.27020.0-CVE-2016-1569.patch
38 @@ -0,0 +1,12 @@
39 +diff -Naur Firebird-2.5.5.26952-0_orig/src/burp/burp.cpp Firebird-2.5.5.26952-0/src/burp/burp.cpp
40 +--- Firebird-2.5.5.26952-0_orig/src/burp/burp.cpp 2016-03-01 16:46:48.418536462 -0500
41 ++++ Firebird-2.5.5.26952-0/src/burp/burp.cpp 2016-03-01 16:48:19.511690164 -0500
42 +@@ -460,7 +460,7 @@
43 + }
44 + else
45 + {
46 +- BURP_print(true, 137, sw.c_str());
47 ++ BURP_error(137, true, sw.c_str());
48 + // msg 137 unknown switch %s
49 + }
50 + }
51
52 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
53 similarity index 88%
54 rename from dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
55 rename to dev-db/firebird/firebird-2.5.6.27020.0.ebuild
56 index f7d460a..f1cfcd8 100644
57 --- a/dev-db/firebird/firebird-2.5.3.26780.0-r4.ebuild
58 +++ b/dev-db/firebird/firebird-2.5.6.27020.0.ebuild
59 @@ -2,29 +2,28 @@
60 # Distributed under the terms of the GNU General Public License v2
61 # $Id$
62
63 -EAPI=5
64 +EAPI=6
65
66 -inherit autotools eutils flag-o-matic multilib readme.gentoo user versionator
67 +inherit autotools flag-o-matic user versionator
68
69 MY_P=${PN/f/F}-$(replace_version_separator 4 -)
70 -#MY_P=${PN/f/F}-${PV/_rc/-ReleaseCandidate}
71
72 -DESCRIPTION="A relational database offering many ANSI SQL:2003 and some SQL:2008 features"
73 -HOMEPAGE="http://www.firebirdsql.org/"
74 +DESCRIPTION="Relational database offering many ANSI SQL:2003 and some SQL:2008 features"
75 +HOMEPAGE="https://www.firebirdsql.org/"
76 SRC_URI="
77 mirror://sourceforge/firebird/${MY_P}.tar.bz2
78 - doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
79 + doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
80
81 LICENSE="IDPL Interbase-1.0"
82 SLOT="0"
83 KEYWORDS="~amd64 ~x86"
84
85 -IUSE="debug doc client examples superserver xinetd"
86 -REQUIRED_USE="?? ( client superserver xinetd )"
87 +IUSE="debug doc examples +superserver xinetd"
88 +REQUIRED_USE="?? ( superserver xinetd )"
89
90 CDEPEND="
91 - dev-libs/libedit
92 dev-libs/icu:=
93 + dev-libs/libedit
94 "
95 DEPEND="${CDEPEND}
96 >=dev-util/btyacc-3.0-r2
97 @@ -37,6 +36,11 @@ RDEPEND="${CDEPEND}
98
99 RESTRICT="userpriv"
100
101 +PATCHES=(
102 + "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
103 + "${FILESDIR}"/${P}-CVE-2016-1569.patch
104 +)
105 +
106 S="${WORKDIR}/${MY_P}"
107
108 pkg_setup() {
109 @@ -45,7 +49,7 @@ pkg_setup() {
110 }
111
112 check_sed() {
113 - MSG="sed of $3, required $2 lines modified $1"
114 + MSG="sed of $3, required $2 line(s) modified $1"
115 einfo "${MSG}"
116 [[ $1 -ge $2 ]] || die "${MSG}"
117 }
118 @@ -61,12 +65,9 @@ src_unpack() {
119 }
120
121 src_prepare() {
122 - # This patch might be portable, and not need to be duplicated per version
123 - # also might no longer be necessary to patch deps or libs, just flags
124 - epatch "${FILESDIR}"/${PN}-2.5.3.26780.0-deps-flags.patch
125 + ! use xinetd && eapply "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
126
127 - use client && epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-client.patch
128 - use superserver || epatch "${FILESDIR}"/${PN}-2.5.1.26351.0-superclassic.patch
129 + default
130
131 # Rename references to isql to fbsql
132 # sed vs patch for portability and addtional location changes
133 @@ -150,8 +151,6 @@ src_install() {
134 insinto /usr/$(get_libdir)/${PN}
135 doins *.msg
136
137 - use client && return
138 -
139 einfo "Renaming isql -> fbsql"
140 mv bin/isql bin/fbsql || die "failed to rename isql -> fbsql"
141
142 @@ -185,11 +184,13 @@ src_install() {
143 exeinto /usr/$(get_libdir)/firebird/intl
144 dolib.so intl/libfbintl.so
145 dosym ../../libfbintl.so /usr/$(get_libdir)/${PN}/intl/fbintl
146 + dosym libfbintl.so /usr/$(get_libdir)/libfbintl.so.1
147 dosym /etc/firebird/fbintl.conf /usr/$(get_libdir)/${PN}/intl/fbintl.conf
148
149 exeinto /usr/$(get_libdir)/${PN}/plugins
150 dolib.so plugins/libfbtrace.so
151 dosym ../../libfbtrace.so /usr/$(get_libdir)/${PN}/plugins/libfbtrace.so
152 + dosym libfbtrace.so /usr/$(get_libdir)/libfbtrace.so.0
153
154 exeinto /usr/$(get_libdir)/${PN}/UDF
155 doexe UDF/*.so
156 @@ -218,24 +219,18 @@ src_install() {
157
158 diropts -m 755 -o firebird -g firebird
159 dodir /var/log/${PN}
160 - dodir /var/run/${PN}
161 keepdir /var/log/${PN}
162 - keepdir /var/run/${PN}
163
164 use examples && docinto examples
165 }
166
167 pkg_postinst() {
168 - use client && return
169 -
170 # Hack to fix ownership/perms
171 chown -fR firebird:firebird "${ROOT}/etc/${PN}" "${ROOT}/usr/$(get_libdir)/${PN}"
172 chmod 750 "${ROOT}/etc/${PN}"
173 }
174
175 pkg_config() {
176 - use client && return
177 -
178 # if found /etc/security.gdb from previous install, backup, and restore as
179 # /etc/security2.fdb
180 if [[ -f "${ROOT}/etc/firebird/security.gdb" ]] ; then
181 @@ -285,5 +280,5 @@ pkg_config() {
182 fi
183
184 einfo "If you're using UDFs, please remember to move them"
185 - einfo "to /usr/lib/firebird/UDF"
186 + einfo "to /usr/$(get_libdir)/firebird/UDF"
187 }