From c9884172c99393a26f8d2ae6f4a9ef1076cef3ff Mon Sep 17 00:00:00 2001 From: William Thomson Date: Fri, 4 Jan 2008 17:34:39 +0000 Subject: Updated patch to remove default hard coded cflags, accidentally removed that patch during a revision. Package-Manager: portage-2.1.4_rc14 --- dev-db/firebird/ChangeLog | 13 +- dev-db/firebird/Manifest | 30 +-- .../files/digest-firebird-2.1.0.16780_beta2-r2 | 6 - .../files/digest-firebird-2.1.0.16780_beta2-r3 | 6 + ...irebird-2.1.0.16780_beta2-deps-flags-libs.patch | 28 ++- .../firebird/firebird-2.1.0.16780_beta2-r2.ebuild | 278 --------------------- .../firebird/firebird-2.1.0.16780_beta2-r3.ebuild | 278 +++++++++++++++++++++ 7 files changed, 333 insertions(+), 306 deletions(-) delete mode 100644 dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2 create mode 100644 dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r3 delete mode 100644 dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild create mode 100644 dev-db/firebird/firebird-2.1.0.16780_beta2-r3.ebuild (limited to 'dev-db/firebird') diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index c2b6ec2c86d6..7cc315b9c383 100644 --- a/dev-db/firebird/ChangeLog +++ b/dev-db/firebird/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-db/firebird -# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.83 2007/12/04 23:59:54 wltjr Exp $ +# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.84 2008/01/04 17:34:39 wltjr Exp $ + +*firebird-2.1.0.16780_beta2-r3 (04 Jan 2008) + + 04 Jan 2008; William L. Thomson Jr. + files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch, + -firebird-2.1.0.16780_beta2-r2.ebuild, + +firebird-2.1.0.16780_beta2-r3.ebuild: + Updated patch to remove default hard coded cflags, accidentally removed that + patch during a revision. *firebird-2.1.0.16780_beta2-r2 (04 Dec 2007) *firebird-2.0.3.12981.0-r4 (04 Dec 2007) diff --git a/dev-db/firebird/Manifest b/dev-db/firebird/Manifest index b844740d3963..e18a7d711f05 100644 --- a/dev-db/firebird/Manifest +++ b/dev-db/firebird/Manifest @@ -18,10 +18,10 @@ AUX firebird-2.0.3.12981.0-paths.patch 12954 RMD160 acac734477715e2bcf5833b7fba1 MD5 ecf89f096f817130287b8f42967d0b6e files/firebird-2.0.3.12981.0-paths.patch 12954 RMD160 acac734477715e2bcf5833b7fba11be2d07455dd files/firebird-2.0.3.12981.0-paths.patch 12954 SHA256 f3d1c896094961d824cb179a6c527470953f9727501a4b8d3ab2b58250113dc7 files/firebird-2.0.3.12981.0-paths.patch 12954 -AUX firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 RMD160 603b6557b472865c1d0a9836e959c82506c9033d SHA1 5bae5306fc658243553e0265b329b9a938fe90d5 SHA256 ee7eff4c59841b223aeb4821644c51a7430c9f88eabf28c8c02e62f306897240 -MD5 7d3925cca75dfb73653e50819c261ca4 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 -RMD160 603b6557b472865c1d0a9836e959c82506c9033d files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 -SHA256 ee7eff4c59841b223aeb4821644c51a7430c9f88eabf28c8c02e62f306897240 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 3880 +AUX firebird-2.1.0.16780_beta2-deps-flags-libs.patch 5002 RMD160 fdb35777355c4f438669d53263d431699f6fccf5 SHA1 270fd5991d10e8c61f08d2b1b92688ac6a88f6d3 SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a +MD5 e14577e8c468e4e6fcedbed209f72377 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 5002 +RMD160 fdb35777355c4f438669d53263d431699f6fccf5 files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 5002 +SHA256 604a7274b38baa48a8e74b7a267ae61d858bf2b8047028432c8936f44c76014a files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch 5002 AUX firebird.conf.d 84 RMD160 87e007bf5b9a540e67dd602b8d85da7c8a8aea21 SHA1 dd16a06bfb864c31d53220bdb5f0e3c3687e292c SHA256 e2d60371eb14ebfc20eaa1fc19610499ab495f9bdaffbb3075454ffc6a324d70 MD5 13a568c7c840d1bfc98661ef6b217740 files/firebird.conf.d 84 RMD160 87e007bf5b9a540e67dd602b8d85da7c8a8aea21 files/firebird.conf.d 84 @@ -49,14 +49,14 @@ EBUILD firebird-2.0.3.12981.0-r4.ebuild 9805 RMD160 2f1116509e8715f301fde6920e1f MD5 414ecbacc857e1978a7ff5a9fd03fd3b firebird-2.0.3.12981.0-r4.ebuild 9805 RMD160 2f1116509e8715f301fde6920e1f91cddb9fdc44 firebird-2.0.3.12981.0-r4.ebuild 9805 SHA256 13d21129e438585ba2e1a16c5aed5b0d18cc4efb856c244bbeb2e3c9a86e008b firebird-2.0.3.12981.0-r4.ebuild 9805 -EBUILD firebird-2.1.0.16780_beta2-r2.ebuild 10102 RMD160 1d337118dc7d714790ce93898d6c64622cfe8cec SHA1 3f919900a1ef94431b952b0c4e938c83b1cb8e03 SHA256 f00c9ee305af71a3ebfbc26fd43b1d1fa01281db1c57c68daed917a56c3324a3 -MD5 4b48ddc94ddc1b68965cf0a8c76e4814 firebird-2.1.0.16780_beta2-r2.ebuild 10102 -RMD160 1d337118dc7d714790ce93898d6c64622cfe8cec firebird-2.1.0.16780_beta2-r2.ebuild 10102 -SHA256 f00c9ee305af71a3ebfbc26fd43b1d1fa01281db1c57c68daed917a56c3324a3 firebird-2.1.0.16780_beta2-r2.ebuild 10102 -MISC ChangeLog 16593 RMD160 3092db256c82cb97df568e72090f1321a5de320b SHA1 0ed2ab41af6788f80901d37b2ec4f046dc7ea421 SHA256 9f0c60e2c9adfa3acea9f4ab58d40d55beb67c4adc865d8f95f0f4c1f48c618a -MD5 5102c5c7cde1a55f4ce090a53775e74b ChangeLog 16593 -RMD160 3092db256c82cb97df568e72090f1321a5de320b ChangeLog 16593 -SHA256 9f0c60e2c9adfa3acea9f4ab58d40d55beb67c4adc865d8f95f0f4c1f48c618a ChangeLog 16593 +EBUILD firebird-2.1.0.16780_beta2-r3.ebuild 10102 RMD160 ac496a515f895c7995da0fffa47f017b0b4d844f SHA1 2578010a96b415f94d4c564d42a8eb4471afd47c SHA256 bfb3d369ef7a359475452e8dd5b7c731ba824d583115d46f74e4d53248ef352a +MD5 06593440ff9455080895e3474978cb82 firebird-2.1.0.16780_beta2-r3.ebuild 10102 +RMD160 ac496a515f895c7995da0fffa47f017b0b4d844f firebird-2.1.0.16780_beta2-r3.ebuild 10102 +SHA256 bfb3d369ef7a359475452e8dd5b7c731ba824d583115d46f74e4d53248ef352a firebird-2.1.0.16780_beta2-r3.ebuild 10102 +MISC ChangeLog 16943 RMD160 e0b949e7c97e598bf79081510965c91492036723 SHA1 a9facdef6f7114c9fbe1fca8277c41eeb9a76439 SHA256 9c22791914c80020706ecf8f4ee3e8ba2496f5fdeaca258b0818832341bdec44 +MD5 a6ff319fecde350bb8cf0d902a31899f ChangeLog 16943 +RMD160 e0b949e7c97e598bf79081510965c91492036723 ChangeLog 16943 +SHA256 9c22791914c80020706ecf8f4ee3e8ba2496f5fdeaca258b0818832341bdec44 ChangeLog 16943 MISC metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 SHA1 ce284a4db1ea6aa20a3824fb0c5730385659f84c SHA256 feb96e25e1e94eda2ebdfb016e9c44de6f59374b49ba256a5187f5a76d912e63 MD5 bf38ebc9198cc6b2bfc486bc9328c943 metadata.xml 611 RMD160 f6ee917e095b5fdf35200713fcc5a19b676cc369 metadata.xml 611 @@ -67,6 +67,6 @@ SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/di MD5 693fad7757fc0c2e66f358e8703ef309 files/digest-firebird-2.0.3.12981.0-r4 506 RMD160 b0ba0f24dd612555f7ce7b7858fc6456448dbe78 files/digest-firebird-2.0.3.12981.0-r4 506 SHA256 f3d5d10532c1f6d2cc2fdd4e1a1150102f2b5ec2bf44f13b6d1b3e6c16abc29d files/digest-firebird-2.0.3.12981.0-r4 506 -MD5 e0a12cb514870a26e879ca8125320723 files/digest-firebird-2.1.0.16780_beta2-r2 518 -RMD160 921fd99f434236240864e3479fa05aa8b68b21eb files/digest-firebird-2.1.0.16780_beta2-r2 518 -SHA256 0f053ca3649de2329b0046f598693ebad94b81a9bfeff34a190db93778aaf01b files/digest-firebird-2.1.0.16780_beta2-r2 518 +MD5 e0a12cb514870a26e879ca8125320723 files/digest-firebird-2.1.0.16780_beta2-r3 518 +RMD160 921fd99f434236240864e3479fa05aa8b68b21eb files/digest-firebird-2.1.0.16780_beta2-r3 518 +SHA256 0f053ca3649de2329b0046f598693ebad94b81a9bfeff34a190db93778aaf01b files/digest-firebird-2.1.0.16780_beta2-r3 518 diff --git a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2 deleted file mode 100644 index f63a1165d43f..000000000000 --- a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r2 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 e25589c8409f4eb2724e39898ec7ccf5 Firebird-2.1.0.16780-Beta2.tar.bz2 13507524 -RMD160 960ebaa83773020c0406a89a1b20982ea5eb669b Firebird-2.1.0.16780-Beta2.tar.bz2 13507524 -SHA256 7aaf8bbb0eb8af63f4e751f9ebcc9cc57a5c5e788bcc01f003b60771ffdf690a Firebird-2.1.0.16780-Beta2.tar.bz2 13507524 -MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848 -RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848 -SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848 diff --git a/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r3 b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r3 new file mode 100644 index 000000000000..f63a1165d43f --- /dev/null +++ b/dev-db/firebird/files/digest-firebird-2.1.0.16780_beta2-r3 @@ -0,0 +1,6 @@ +MD5 e25589c8409f4eb2724e39898ec7ccf5 Firebird-2.1.0.16780-Beta2.tar.bz2 13507524 +RMD160 960ebaa83773020c0406a89a1b20982ea5eb669b Firebird-2.1.0.16780-Beta2.tar.bz2 13507524 +SHA256 7aaf8bbb0eb8af63f4e751f9ebcc9cc57a5c5e788bcc01f003b60771ffdf690a Firebird-2.1.0.16780-Beta2.tar.bz2 13507524 +MD5 e48478a6034eb449ad502495e83a0764 ib_b60_doc.zip 10530848 +RMD160 c64b4b6bc9125929928517ba072558a58ddf577d ib_b60_doc.zip 10530848 +SHA256 8c0158678b2a2fe3ba3abfea1f5487fc5af2644d66837ab8a558f5ad6b6cfd6d ib_b60_doc.zip 10530848 diff --git a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch index 661b95acaeba..8bcd3ca0dfd4 100644 --- a/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch +++ b/dev-db/firebird/files/firebird-2.1.0.16780_beta2-deps-flags-libs.patch @@ -1,5 +1,5 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird 2007-11-14 13:22:07.000000000 -0500 +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird 2007-10-19 11:11:36.000000000 -0400 +++ Firebird-2.1.0.16780-Beta2/builds/posix/Makefile.in.firebird 2007-11-14 13:43:55.000000000 -0500 @@ -185,14 +185,7 @@ # @@ -17,7 +17,8 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Fir btyacc_binary: $(BTYACC) ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults 2007-11-14 13:22:07.000000000 -0500 +diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.defaults 2007-10-19 11:11:36.000000000 -0400 +++ Firebird-2.1.0.16780-Beta2/builds/posix/make.defaults 2007-11-14 13:44:39.000000000 -0500 @@ -229,11 +229,7 @@ LIBFBSTATIC_A = $(LIB)/libfbstatic.a @@ -33,7 +34,7 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/Makefile.in.firebird Fir LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1.0.16780-Beta2/builds/posix/make.rules ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules 2007-11-14 13:22:07.000000000 -0500 +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules 2007-11-14 14:29:58.000000000 -0500 +++ Firebird-2.1.0.16780-Beta2/builds/posix/make.rules 2007-11-14 14:30:13.000000000 -0500 @@ -33,9 +33,6 @@ @@ -70,7 +71,7 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.rules Firebird-2.1. diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets ---- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets 2007-11-14 13:22:07.000000000 -0500 +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets 2007-10-19 11:11:36.000000000 -0400 +++ Firebird-2.1.0.16780-Beta2/builds/posix/make.shared.targets 2007-11-14 13:46:49.000000000 -0500 @@ -49,7 +49,7 @@ @@ -81,8 +82,25 @@ diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/make.shared.targets Fire $(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@ +diff -Naur Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux +--- Firebird-2.1.0.16780-Beta2_orig/builds/posix/prefix.linux 2007-10-19 11:11:36.000000000 -0400 ++++ Firebird-2.1.0.16780-Beta2/builds/posix/prefix.linux 2007-11-14 13:47:56.000000000 -0500 +@@ -21,11 +21,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.0.16780-Beta2_orig/configure Firebird-2.1.0.16780-Beta2/configure ---- Firebird-2.1.0.16780-Beta2_orig/configure 2007-11-14 13:22:15.000000000 -0500 +--- Firebird-2.1.0.16780-Beta2_orig/configure 2007-10-19 11:11:39.000000000 -0400 +++ Firebird-2.1.0.16780-Beta2/configure 2007-11-14 13:48:51.000000000 -0500 @@ -3928,13 +3928,13 @@ # not need editline in default libs, but need to test for its presence diff --git a/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild b/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild deleted file mode 100644 index 7b413658a372..000000000000 --- a/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild +++ /dev/null @@ -1,278 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r2.ebuild,v 1.1 2007/12/04 23:59:54 wltjr Exp $ - -inherit flag-o-matic eutils autotools versionator - -#MY_P=Firebird-$(replace_version_separator 4 -) -MY_P=Firebird-${PV/_b/-B} - -DESCRIPTION="A relational database offering many ANSI SQL-99 features" -HOMEPAGE="http://firebird.sourceforge.net/" -SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2 - doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )" - -LICENSE="Interbase-1.0" -SLOT="0" -KEYWORDS="~amd64 -ia64 ~x86" -IUSE="doc xinetd examples debug" -RESTRICT="userpriv" - -RDEPEND="dev-libs/libedit - dev-libs/icu" -DEPEND="${RDEPEND} - doc? ( app-arch/unzip )" -RDEPEND="${RDEPEND} - xinetd? ( virtual/inetd )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup firebird 450 - enewuser firebird 450 /bin/bash /usr/lib/firebird firebird -} - -function check_sed() { - MSG="sed of $3, required $2 lines modified $1" - einfo "${MSG}" - [[ $1 -ge $2 ]] || die "${MSG}" -} - -src_unpack() { - if use doc; then - # Unpack docs - mkdir "${WORKDIR}/manuals" - cd "${WORKDIR}/manuals" - unpack ib_b60_doc.zip - cd "${WORKDIR}" - fi - - unpack "${MY_P}.tar.bz2" - - # compile time relative path hacks, ew :( - mkdir -p "${WORKDIR}/../etc" \ - "${WORKDIR}/usr" \ - "${WORKDIR}/var/log/firebird" \ - "${WORKDIR}/var/run/firebird" - cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin" - cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird - - cd "${S}" - - epatch "${FILESDIR}/${P}-deps-flags-libs.patch" - - einfo "Split up Firebird via relative path hacks" - # sed vs patch for portability and addtional location changes - # based on FIREBIRD=/usr/lib/firebird - check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \ - src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line - check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \ - -e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \ - -e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \ - -e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \ - -e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \ - -e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \ - -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines - check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line - check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ - src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line - check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \ - -e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \ - -e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \ - -e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \ - -e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \ - -e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \ - -e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \ - -e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \ - -e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \ - src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines - check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \ - src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line - check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ - src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line - check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ - src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line - check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \ - src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line - check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \ - src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line - check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \ - src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line - - # Rename references to isql to fbsql - 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/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines - 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' \ - src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.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 "${S}" -name \*.sh -print0 | xargs -0 chmod +x - rm -rf "${S}"/extern/{editline,icu} - - eautoreconf -} - -src_compile() { - filter-flags -fprefetch-loop-arrays - filter-mfpmath sse - - econf --prefix=/usr/lib/firebird --with-editline \ - $(use_enable !xinetd superserver) \ - $(use_enable debug) \ - ${myconf} || die "econf failed" - emake -j1 || die "error during make" -} - -src_install() { - cd "${S}/gen/firebird" - -# Seems to be ignored? - insinto /usr/share/firebird/bin - dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh - rm bin/*.sh || die "Could not remove *sh files" - - einfo "Renaming isql -> fbsql" - mv bin/isql bin/fbsql - - insinto /usr/bin - dobin bin/* - - insinto /usr/include - doins include/* - - insinto /usr/lib - dolib.so lib/*.so* - dolib.a lib/*.a* - - insinto /usr/lib/firebird - doins *.msg - - insinto /usr/lib/firebird/help - doins help/help.fdb - - insinto /usr/share/firebird/upgrade - doins "${S}"/src/misc/upgrade/v2/* - - insinto /etc/firebird - insopts -m0644 -o firebird -g firebird - doins misc/* - doins ../install/misc/aliases.conf - insopts -m0660 -o firebird -g firebird - doins security2.fdb - - exeinto /usr/lib/firebird/UDF - doexe UDF/*.so - - exeinto /usr/lib/firebird/intl - newexe intl/libfbintl.so fbintl.so - - insinto /usr/lib/firebird/intl - doins ../install/misc/fbintl.conf - - diropts -m 755 -o firebird -g firebird - dodir /var/log/firebird - dodir /var/run/firebird - keepdir /var/log/firebird - keepdir /var/run/firebird - - # create links for backwards compatibility - cd "${D}/usr/lib" - ln -s libfbclient.so libgds.so - ln -s libfbclient.so libgds.so.0 - ln -s libfbclient.so libfbclient.so.1 - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed" - else - newinitd "${FILESDIR}/${PN}.init.d.2" ${PN} - newconfd "${FILESDIR}/firebird.conf.d" ${PN} - fperms 640 /etc/conf.d/firebird - fi - doenvd "${FILESDIR}/70${PN}" - - # Install docs - use doc && dodoc "${WORKDIR}"/manuals/* - - if use examples; then - docinto examples - dodoc examples/* - fi -} - -pkg_postinst() { - # Hack to fix ownership/perms - chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird" - chmod 750 "${ROOT}/etc/firebird" - - elog - elog "Firebird is no longer installed in /opt. Binaries are in" - elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs" - elog "are in /var/log/firebird, and lock files in /var/run/firebird" - elog "The command line tool isql has been renamed to fbsql." - elog "Please report any problems or issues to bugs.gentoo.org." - elog -} - -pkg_config() { - # if found /etc/security.gdb from previous install, backup, and restore as - # /etc/security2.fdb - if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then - # if we have scurity2.fdb already, back it 1st - if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then - cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old" - fi - gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" - gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" - mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" - rm "${ROOT}/etc/firebird/security.gbk" - - # make sure they are readable only to firebird - chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" - chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" - - einfo - einfo "Converted old security.gdb to security2.fdb, security.gdb has been " - einfo "renamed to security.gdb.old. if you had previous security2.fdb, " - einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)." - einfo - fi - - # we need to enable local access to the server - if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then - touch "${ROOT}/etc/hosts.equiv" - chown root:0 "${ROOT}/etc/hosts.equiv" - chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" - fi - - # add 'localhost.localdomain' to the hosts.equiv file... - if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then - echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" - einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv" - fi - - # add 'localhost' to the hosts.equiv file... - if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then - echo "localhost" >> "${ROOT}/etc/hosts.equiv" - einfo "Added localhost to ${ROOT}/etc/hosts.equiv" - fi - - HS_NAME=`hostname` - if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then - echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" - einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv" - fi - - einfo "If you're using UDFs, please remember to move them" - einfo "to /usr/lib/firebird/UDF" -} diff --git a/dev-db/firebird/firebird-2.1.0.16780_beta2-r3.ebuild b/dev-db/firebird/firebird-2.1.0.16780_beta2-r3.ebuild new file mode 100644 index 000000000000..ae8e061f77c6 --- /dev/null +++ b/dev-db/firebird/firebird-2.1.0.16780_beta2-r3.ebuild @@ -0,0 +1,278 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.16780_beta2-r3.ebuild,v 1.1 2008/01/04 17:34:39 wltjr Exp $ + +inherit flag-o-matic eutils autotools versionator + +#MY_P=Firebird-$(replace_version_separator 4 -) +MY_P=Firebird-${PV/_b/-B} + +DESCRIPTION="A relational database offering many ANSI SQL-99 features" +HOMEPAGE="http://firebird.sourceforge.net/" +SRC_URI="mirror://sourceforge/firebird/${MY_P}.tar.bz2 + doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )" + +LICENSE="Interbase-1.0" +SLOT="0" +KEYWORDS="~amd64 -ia64 ~x86" +IUSE="doc xinetd examples debug" +RESTRICT="userpriv" + +RDEPEND="dev-libs/libedit + dev-libs/icu" +DEPEND="${RDEPEND} + doc? ( app-arch/unzip )" +RDEPEND="${RDEPEND} + xinetd? ( virtual/inetd )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup firebird 450 + enewuser firebird 450 /bin/bash /usr/lib/firebird firebird +} + +function check_sed() { + MSG="sed of $3, required $2 lines modified $1" + einfo "${MSG}" + [[ $1 -ge $2 ]] || die "${MSG}" +} + +src_unpack() { + if use doc; then + # Unpack docs + mkdir "${WORKDIR}/manuals" + cd "${WORKDIR}/manuals" + unpack ib_b60_doc.zip + cd "${WORKDIR}" + fi + + unpack "${MY_P}.tar.bz2" + + # compile time relative path hacks, ew :( + mkdir -p "${WORKDIR}/../etc" \ + "${WORKDIR}/usr" \ + "${WORKDIR}/var/log/firebird" \ + "${WORKDIR}/var/run/firebird" + cd "${WORKDIR}/usr"; ln -s "${S}/gen/firebird/bin" + cd "${WORKDIR}/../etc"; ln -s "${S}/gen/firebird" firebird + + cd "${S}" + + epatch "${FILESDIR}/${P}-deps-flags-libs.patch" + + einfo "Split up Firebird via relative path hacks" + # sed vs patch for portability and addtional location changes + # based on FIREBIRD=/usr/lib/firebird + check_sed "$(sed -i -e 's:"aliases.conf":"../../../etc/firebird/aliases.conf":w /dev/stdout' \ + src/jrd/db_alias.cpp | wc -l )" "1" "src/jrd/db_alias.cpp" # 1 line + check_sed "$(sed -i -e 's:"isc_event1:"../../../var/run/firebird/isc_event1:w /dev/stdout' \ + -e 's:"isc_lock1:"../../../var/run/firebird/isc_lock1:w /dev/stdout' \ + -e 's:"isc_init1:"../../../var/run/firebird/isc_init1:w /dev/stdout' \ + -e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1:w /dev/stdout' \ + -e 's:"isc_monitor1:"../../../var/run/firebird/isc_monitor1:w /dev/stdout' \ + -e 's:"firebird.log":"../../../var/log/firebird/firebird.log":w /dev/stdout' \ + -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/jrd/file_params.h | wc -l)" "12" "src/jrd/file_params.h" # 12 lines + check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/jrd/jrd_pwd.h | wc -l)" "1" "src/jrd/jrd_pwd.h" # 1 line + check_sed "$(sed -i -e 's:"firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ + src/jrd/os/config_root.h | wc -l)" "1" "src/jrd/os/config_root.h" # 1 line + check_sed "$(sed -i -e 's:"bin/fb_cache_print":"../../../usr/bin/fb_cache_print":w /dev/stdout' \ + -e 's:"bin/fb_lock_print":"../../../usr/bin/fb_lock_print":w /dev/stdout' \ + -e 's:"bin/fb_cache_manager":"../../../usr/bin/fb_cache_manager":w /dev/stdout' \ + -e 's:"bin/gstat":"../../../usr/bin/gstat":w /dev/stdout' \ + -e 's:"bin/gbak":"../../../usr/bin/gbak":w /dev/stdout' \ + -e 's:"bin/gdef":"../../../usr/bin/gdef":w /dev/stdout' \ + -e 's:"bin/gsec":"../../../usr/bin/gsec":w /dev/stdout' \ + -e 's:"bin/gjrn":"../../../usr/bin/gjrn":w /dev/stdout' \ + -e 's:"bin/gfix":"../../../usr/bin/gfix":w /dev/stdout' \ + src/jrd/svc.cpp | wc -l)" "26" "src/jrd/svc.cpp" # 26 lines + check_sed "$(sed -i -e 's:"bin/fb_lock_mgr":"../../../usr/bin/fb_lock_mgr":w /dev/stdout' \ + src/lock/lock.cpp | wc -l)" "1" "src/lock/lock.cpp" # 1 line + check_sed "$(sed -i -e 's:m_Root_Path + "firebird.conf":"../../../etc/firebird/firebird.conf":w /dev/stdout' \ + src/utilities/fbcpl/fbdialog.cpp | wc -l)" "1" "src/utilities/fbcpl/fbdialog.cpp" # 1 line + check_sed "$(sed -i -e 's:"security2.fdb":"../../../etc/firebird/security2.fdb":w /dev/stdout' \ + src/utilities/gsec/security.epp | wc -l)" "1" "src/utilities/gsec/security.epp" # 1 line + check_sed "$(sed -i -e 's:"bin/fbserver":"../../../usr/bin/fbserver":w /dev/stdout' \ + src/utilities/guard/guard.cpp | wc -l)" "1" "src/utilities/guard/guard.cpp" # 1 line + check_sed "$(sed -i -e 's:"bin/fbguard":"../../../usr/bin/fbguard":w /dev/stdout' \ + src/utilities/ibmgr/ibmgr.h | wc -l)" "1" "src/utilities/ibmgr/ibmgr.h" # 1 line + check_sed "$(sed -i -e 's:$FIREBIRD/firebird.log:/var/log/firebird/firebird.log:w /dev/stdout' \ + src/utilities/ibmgr/srvrmgr.cpp | wc -l)" "1" "src/utilities/ibmgr/srvrmgr.cpp" # 1 line + + # Rename references to isql to fbsql + 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/history.sql | wc -l)" "4" "src/msgs/history.sql" # 4 lines + 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' \ + src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.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 "${S}" -name \*.sh -print0 | xargs -0 chmod +x + rm -rf "${S}"/extern/{editline,icu} + + eautoreconf +} + +src_compile() { + filter-flags -fprefetch-loop-arrays + filter-mfpmath sse + + econf --prefix=/usr/lib/firebird --with-editline \ + $(use_enable !xinetd superserver) \ + $(use_enable debug) \ + ${myconf} || die "econf failed" + emake -j1 || die "error during make" +} + +src_install() { + cd "${S}/gen/firebird" + +# Seems to be ignored? + insinto /usr/share/firebird/bin + dobin bin/{changeRunUser,restoreRootRunUser,changeDBAPassword}.sh + rm bin/*.sh || die "Could not remove *sh files" + + einfo "Renaming isql -> fbsql" + mv bin/isql bin/fbsql + + insinto /usr/bin + dobin bin/* + + insinto /usr/include + doins include/* + + insinto /usr/lib + dolib.so lib/*.so* + dolib.a lib/*.a* + + insinto /usr/lib/firebird + doins *.msg + + insinto /usr/lib/firebird/help + doins help/help.fdb + + insinto /usr/share/firebird/upgrade + doins "${S}"/src/misc/upgrade/v2/* + + insinto /etc/firebird + insopts -m0644 -o firebird -g firebird + doins misc/* + doins ../install/misc/aliases.conf + insopts -m0660 -o firebird -g firebird + doins security2.fdb + + exeinto /usr/lib/firebird/UDF + doexe UDF/*.so + + exeinto /usr/lib/firebird/intl + newexe intl/libfbintl.so fbintl.so + + insinto /usr/lib/firebird/intl + doins ../install/misc/fbintl.conf + + diropts -m 755 -o firebird -g firebird + dodir /var/log/firebird + dodir /var/run/firebird + keepdir /var/log/firebird + keepdir /var/run/firebird + + # create links for backwards compatibility + cd "${D}/usr/lib" + ln -s libfbclient.so libgds.so + ln -s libfbclient.so libgds.so.0 + ln -s libfbclient.so libfbclient.so.1 + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/${PN}.xinetd.2" ${PN} || die "newins xinetd file failed" + else + newinitd "${FILESDIR}/${PN}.init.d.2" ${PN} + newconfd "${FILESDIR}/firebird.conf.d" ${PN} + fperms 640 /etc/conf.d/firebird + fi + doenvd "${FILESDIR}/70${PN}" + + # Install docs + use doc && dodoc "${WORKDIR}"/manuals/* + + if use examples; then + docinto examples + dodoc examples/* + fi +} + +pkg_postinst() { + # Hack to fix ownership/perms + chown -fR firebird:firebird "${ROOT}/etc/firebird" "${ROOT}/usr/lib/firebird" + chmod 750 "${ROOT}/etc/firebird" + + elog + elog "Firebird is no longer installed in /opt. Binaries are in" + elog "/usr/bin. The core, udfs, etc are in /usr/lib/firebird. Logs" + elog "are in /var/log/firebird, and lock files in /var/run/firebird" + elog "The command line tool isql has been renamed to fbsql." + elog "Please report any problems or issues to bugs.gentoo.org." + elog +} + +pkg_config() { + # if found /etc/security.gdb from previous install, backup, and restore as + # /etc/security2.fdb + if [ -f "${ROOT}/etc/firebird/security.gdb" ] ; then + # if we have scurity2.fdb already, back it 1st + if [ -f "${ROOT}/etc/firebird/security2.fdb" ] ; then + cp "${ROOT}/etc/firebird/security2.fdb" "${ROOT}/etc/firebird/security2.fdb.old" + fi + gbak -B "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gbk" + gbak -R "${ROOT}/etc/firebird/security.gbk" "${ROOT}/etc/firebird/security2.fdb" + mv "${ROOT}/etc/firebird/security.gdb" "${ROOT}/etc/firebird/security.gdb.old" + rm "${ROOT}/etc/firebird/security.gbk" + + # make sure they are readable only to firebird + chown firebird:firebird "${ROOT}/etc/firebird/{security.*,security2.*}" + chmod 660 "${ROOT}/etc/firebird/{security.*,security2.*}" + + einfo + einfo "Converted old security.gdb to security2.fdb, security.gdb has been " + einfo "renamed to security.gdb.old. if you had previous security2.fdb, " + einfo "it's backed to security2.fdb.old (all under ${ROOT}/etc/firebird)." + einfo + fi + + # we need to enable local access to the server + if [ ! -f "${ROOT}/etc/hosts.equiv" ] ; then + touch "${ROOT}/etc/hosts.equiv" + chown root:0 "${ROOT}/etc/hosts.equiv" + chmod u=rw,go=r "${ROOT}/etc/hosts.equiv" + fi + + # add 'localhost.localdomain' to the hosts.equiv file... + if [ grep -q 'localhost.localdomain$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then + echo "localhost.localdomain" >> "${ROOT}/etc/hosts.equiv" + einfo "Added localhost.localdomain to ${ROOT}/etc/hosts.equiv" + fi + + # add 'localhost' to the hosts.equiv file... + if [ grep -q 'localhost$' "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then + echo "localhost" >> "${ROOT}/etc/hosts.equiv" + einfo "Added localhost to ${ROOT}/etc/hosts.equiv" + fi + + HS_NAME=`hostname` + if [ grep -q ${HS_NAME} "${ROOT}/etc/hosts.equiv" 2>/dev/null ] ; then + echo "${HS_NAME}" >> "${ROOT}/etc/hosts.equiv" + einfo "Added ${HS_NAME} to ${ROOT}/etc/hosts.equiv" + fi + + einfo "If you're using UDFs, please remember to move them" + einfo "to /usr/lib/firebird/UDF" +} -- cgit v1.2.3-65-gdbad