Gentoo Archives: gentoo-commits

From: "William Thomson (wltjr)" <wltjr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-db/firebird: ChangeLog firebird-2.0.3.12981.0-r6.ebuild firebird-2.1.0.17798.0.ebuild firebird-2.1.0.17755_rc2-r1.ebuild firebird-2.0.3.12981.0-r5.ebuild
Date: Sat, 19 Apr 2008 01:35:57
Message-Id: E1Jn1ze-0002Rp-2W@stork.gentoo.org
1 wltjr 08/04/19 01:35:54
2
3 Modified: ChangeLog firebird-2.0.3.12981.0-r6.ebuild
4 Added: firebird-2.1.0.17798.0.ebuild
5 Removed: firebird-2.1.0.17755_rc2-r1.ebuild
6 firebird-2.0.3.12981.0-r5.ebuild
7 Log:
8 Bumped to latest release, removed past rc, and insecure version/files, removed dodoc on examples.
9 (Portage version: 2.1.5_rc2)
10
11 Revision Changes Path
12 1.93 dev-db/firebird/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/ChangeLog?rev=1.93&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/ChangeLog?rev=1.93&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/ChangeLog?r1=1.92&r2=1.93
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v
21 retrieving revision 1.92
22 retrieving revision 1.93
23 diff -u -r1.92 -r1.93
24 --- ChangeLog 14 Apr 2008 20:42:45 -0000 1.92
25 +++ ChangeLog 19 Apr 2008 01:35:53 -0000 1.93
26 @@ -1,6 +1,17 @@
27 # ChangeLog for dev-db/firebird
28 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.92 2008/04/14 20:42:45 maekke Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.93 2008/04/19 01:35:53 wltjr Exp $
31 +
32 +*firebird-2.1.0.17798.0 (19 Apr 2008)
33 +
34 + 19 Apr 2008; William L. Thomson Jr. <wltjr@g.o>
35 + -files/firebird-2.1.0.17755_rc2-deps-flags-libs.patch,
36 + +files/firebird-2.1.0.17798.0-deps-flags-libs.patch,
37 + -files/firebird.conf.d, -files/firebird.init.d.2,
38 + -firebird-2.0.3.12981.0-r5.ebuild, firebird-2.0.3.12981.0-r6.ebuild,
39 + -firebird-2.1.0.17755_rc2-r1.ebuild, +firebird-2.1.0.17798.0.ebuild:
40 + Bumped to latest release, removed past rc, and insecure version/files,
41 + removed dodoc on examples.
42
43 14 Apr 2008; Markus Meier <maekke@g.o>
44 firebird-2.0.3.12981.0-r6.ebuild:
45
46
47
48 1.3 dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild
49
50 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild?rev=1.3&view=markup
51 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild?rev=1.3&content-type=text/plain
52 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild?r1=1.2&r2=1.3
53
54 Index: firebird-2.0.3.12981.0-r6.ebuild
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild,v
57 retrieving revision 1.2
58 retrieving revision 1.3
59 diff -u -r1.2 -r1.3
60 --- firebird-2.0.3.12981.0-r6.ebuild 14 Apr 2008 20:42:45 -0000 1.2
61 +++ firebird-2.0.3.12981.0-r6.ebuild 19 Apr 2008 01:35:53 -0000 1.3
62 @@ -1,6 +1,6 @@
63 # Copyright 1999-2008 Gentoo Foundation
64 # Distributed under the terms of the GNU General Public License v2
65 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild,v 1.2 2008/04/14 20:42:45 maekke Exp $
66 +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild,v 1.3 2008/04/19 01:35:53 wltjr Exp $
67
68 inherit flag-o-matic eutils autotools versionator multilib
69
70 @@ -200,11 +200,7 @@
71
72 # Install docs
73 use doc && dodoc "${WORKDIR}"/manuals/*
74 -
75 - if use examples; then
76 - docinto examples
77 - dodoc examples/*
78 - fi
79 + use examples && docinto examples
80 }
81
82 pkg_postinst() {
83
84
85
86 1.1 dev-db/firebird/firebird-2.1.0.17798.0.ebuild
87
88 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/firebird-2.1.0.17798.0.ebuild?rev=1.1&view=markup
89 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-db/firebird/firebird-2.1.0.17798.0.ebuild?rev=1.1&content-type=text/plain
90
91 Index: firebird-2.1.0.17798.0.ebuild
92 ===================================================================
93 # Copyright 1999-2008 Gentoo Foundation
94 # Distributed under the terms of the GNU General Public License v2
95 # $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.17798.0.ebuild,v 1.1 2008/04/19 01:35:53 wltjr Exp $
96
97 inherit flag-o-matic eutils autotools versionator
98
99 MY_P=Firebird-$(replace_version_separator 4 -)
100 #MY_P=Firebird-${PV/_rc/-ReleaseCandidate}
101
102 DESCRIPTION="A relational database offering many ANSI SQL-99 features"
103 HOMEPAGE="http://firebird.sourceforge.net/"
104 SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2
105 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )"
106
107 LICENSE="IDPL Interbase-1.0"
108 SLOT="0"
109 KEYWORDS="~amd64 -ia64 ~x86"
110 IUSE="doc xinetd examples debug"
111 RESTRICT="userpriv"
112
113 RDEPEND="dev-libs/libedit
114 dev-libs/icu"
115 DEPEND="${RDEPEND}
116 doc? ( app-arch/unzip )"
117 RDEPEND="${RDEPEND}
118 xinetd? ( virtual/inetd )"
119
120 S="${WORKDIR}/${MY_P}"
121
122 pkg_setup() {
123 enewgroup firebird 450
124 enewuser firebird 450 /bin/bash /usr/lib/firebird firebird
125 }
126
127 function check_sed() {
128 MSG="sed of $3, required $2 lines modified $1"
129 einfo "${MSG}"
130 [[ $1 -ge $2 ]] || die "${MSG}"
131 }
132
133 src_unpack() {
134 if use doc; then
135 # Unpack docs
136 mkdir "${WORKDIR}/manuals"
137 cd "${WORKDIR}/manuals"
138 unpack ib_b60_doc.zip
139 cd "${WORKDIR}"
140 fi
141
142 unpack "${MY_P}.tar.bz2"
143
144 # compile time relative path hacks, ew :(
145 mkdir -p "${WORKDIR}/../etc" \
146 "${WORKDIR}/usr" \
147 "${WORKDIR}/var/log/firebird" \
148 "${WORKDIR}/var/run/firebird"
149 cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin"
150 cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird
151
152 cd "${S}"
153
154 epatch "${FILESDIR}/${P}-deps-flags-libs.patch"
155
156 einfo "Split up Firebird via relative path hacks"
157 # sed vs patch for portability and addtional location changes
158 # based on FIREBIRD=/usr/lib/firebird
159 check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \
160 src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line
161 check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \
162 -e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \
163 -e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \
164 -e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \
165 -e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \
166 -e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \
167 -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
168 src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines
169 check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
170 src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line
171 check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
172 src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line
173 check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \
174 -e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \
175 -e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \
176 -e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \
177 -e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \
178 -e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \
179 -e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \
180 -e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \
181 -e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \
182 src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines
183 check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \
184 src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line
185 check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \
186 src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line
187 check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \
188 src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line
189 check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \
190 src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line
191 check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \
192 src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line
193 check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \
194 src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line
195
196 # Rename references to isql to fbsql
197 check_sed "$(sed -i -e 's:"isql :"fbsql :w /dev/stdout' \
198 src/isql/isql.epp | wc -l)" "1" "src/isql/isql.epp" # 1 line
199 check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
200 src/msgs/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines
201 check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
202 src/msgs/history2.sql | wc -l)" "4" "src/msgs/history2.sql" # 4 lines
203 check_sed "$(sed -i -e 's:isql :fbsql :w /dev/stdout' \
204 -e 's:ISQL :FBSQL :w /dev/stdout' \
205 src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 lines
206 check_sed "$(sed -i -e 's:--- ISQL:--- FBSQL:w /dev/stdout' \
207 -e 's:isql :fbsql :w /dev/stdout' \
208 -e 's:ISQL :FBSQL :w /dev/stdout' \
209 src/msgs/messages2.sql | wc -l)" "6" "src/msgs/messages2.sql" # 6 lines
210
211 find "${S}" -name \*.sh -print0 | xargs -0 chmod +x
212 rm -rf "${S}"/extern/{editline,icu}
213
214 eautoreconf
215 }
216
217 src_compile() {
218 filter-flags -fprefetch-loop-arrays
219 filter-mfpmath sse
220
221 econf --prefix=/usr/lib/firebird --with-editline \
222 $(use_enable !xinetd superserver) \
223 $(use_enable debug) \
224 ${myconf} || die "econf failed"
225 emake -j1 || die "error during make"
226 }
227
228 src_install() {
229 cd "${S}/gen/firebird"
230
231 # Seems to be ignored?
232 insinto /usr/share/firebird/bin
233 dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh
234 rm bin/*.sh || die "Could not remove *sh files"
235
236 einfo "Renaming isql -> fbsql"
237 mv bin/isql bin/fbsql
238
239 insinto /usr/bin
240 dobin bin/*
241
242 insinto /usr/include
243 doins include/*
244
245 insinto /usr/lib
246 dolib.so lib/*.so*
247 dolib.a lib/*.a*
248
249 insinto /usr/lib/firebird
250 doins *.msg
251
252 insinto /usr/lib/firebird/help
253 doins help/help.fdb
254
255 insinto /usr/share/firebird/upgrade
256 doins "${S}"/src/misc/upgrade/v2/*
257
258 insinto /etc/firebird
259 insopts -m0644 -o firebird -g firebird
260 doins misc/*
261 doins ../install/misc/aliases.conf
262 insopts -m0660 -o firebird -g firebird
263 doins security2.fdb
264
265 exeinto /usr/lib/firebird/UDF
266 doexe UDF/*.so
267
268 exeinto /usr/lib/firebird/intl
269 newexe intl/libfbintl.so fbintl.so
270
271 insinto /usr/lib/firebird/intl
272 doins ../install/misc/fbintl.conf
273
274 diropts -m 755 -o firebird -g firebird
275 dodir /var/log/firebird
276 dodir /var/run/firebird
277 keepdir /var/log/firebird
278 keepdir /var/run/firebird
279
280 # create links for backwards compatibility
281 cd "${D}/usr/lib"
282 ln -s libfbclient.so libgds.so
283 ln -s libfbclient.so libgds.so.0
284 ln -s libfbclient.so libfbclient.so.1
285
286 if use xinetd ; then
287 insinto /etc/xinetd.d
288 newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed"
289 else
290 newinitd "${FILESDIR}/${PN}.init.d" ${PN}
291 newconfd "${FILESDIR}/${PN}.conf.d.2" ${PN}
292 fperms 640 /etc/conf.d/${PN}
293 fi
294 doenvd "${FILESDIR}/70${PN}"
295
296 # Install docs
297 use doc && dodoc "${WORKDIR}"/manuals/*
298 use examples && docinto examples
299 }
300
301 pkg_postinst() {
302 # Hack to fix ownership/perms
303 chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird"
304 chmod 750 "${ROOT}/etc/firebird"
305
306 elog
307 elog "Firebird is no longer installed in /opt. Binaries are in"
308 elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs"
309 elog "are in /var/log/firebird, and lock files in /var/run/firebird"
310 elog "The command line tool isql has been renamed to fbsql."
311 elog "Please report any problems or issues to bugs.gentoo.org."
312 elog
313 }
314
315 pkg_config() {
316 # if found /etc/security.gdb from previous install, backup, and restore as
317 # /etc/security2.fdb
318 if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then
319 # if we have scurity2.fdb already, back it 1st
320 if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then
321 cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old"
322 fi
323 gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk"
324 gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb"
325 mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old"
326 rm "${ROOT}/etc/firebird/security.gbk"
327
328 # make sure they are readable only to firebird
329 chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}"
330 chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}"
331
332 einfo
333 einfo "Converted old security.gdb to security2.fdb, security.gdb has been "
334 einfo "renamed to security.gdb.old. if you had previous security2.fdb, "
335 einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)."
336 einfo
337 fi
338
339 # we need to enable local access to the server
340 if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then
341 touch "${ROOT}/etc/hosts.equiv"
342 chown root:0 "${ROOT}/etc/hosts.equiv"
343 chmod u=rw,go=r "${ROOT}/etc/hosts.equiv"
344 fi
345
346 # add 'localhost.localdomain' to the hosts.equiv file...
347 if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
348 echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv"
349 einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv"
350 fi
351
352 # add 'localhost' to the hosts.equiv file...
353 if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
354 echo "localhost" >> "${ROOT}/etc/hosts.equiv"
355 einfo "Added localhost to ${ROOT}/etc/hosts.equiv"
356 fi
357
358 HS_NAME=`hostname`
359 if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then
360 echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv"
361 einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv"
362 fi
363
364 einfo "If you're using UDFs, please remember to move them"
365 einfo "to /usr/lib/firebird/UDF"
366 }
367
368
369
370 --
371 gentoo-commits@l.g.o mailing list