Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 202692 Details for
Bug 264955
dev-db/firebird-2.1.3 version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
Ebuild and 2 patches
firebird-2.1.2.18118.tar (text/plain), 20.00 KB, created by
John W Higgins
on 2009-08-30 07:20:15 UTC
(
hide
)
Description:
Ebuild and 2 patches
Filename:
MIME Type:
Creator:
John W Higgins
Created:
2009-08-30 07:20:15 UTC
Size:
20.00 KB
patch
obsolete
>firebird-2.1.2.18118.0-gcc-icu-declare.patch0000644000175000017550000000103111246423751016216 0ustar jwhjwh--- src/common/classes/alloc.h.old 2009-07-09 13:04:14.000000000 +0200 >+++ src/common/classes/alloc.h 2009-07-09 13:05:37.000000000 +0200 >@@ -48,6 +48,8 @@ > stdlib.h (EKU) */ > #endif > >+#include <new> >+ > #ifdef _MSC_VER > #define THROW_BAD_ALLOC > #else >@@ -448,15 +450,6 @@ > ); > } > >-inline void* operator new(size_t, void* ptr) throw() >-{ >- return ptr; >-} >-inline void* operator new[](size_t, void* ptr) throw() >-{ >- return ptr; >-} >- > inline void operator delete(void* mem) throw() > { > Firebird::MemoryPool::globalFree(mem); >firebird-2.1.2.18118.0-deps-flags-libs.patch0000644000175000017550000001063411246423751016274 0ustar jwhjwhdiff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird >--- Firebird-2.1.2.18118-0_orig/builds/posix/Makefile.in.firebird 2008-12-10 17:22:15.000000000 +0200 >+++ Firebird-2.1.2.18118-0/builds/posix/Makefile.in.firebird 2009-05-20 15:13:47.673202327 +0300 >@@ -185,14 +185,7 @@ > # > > external_libraries: >-ifeq ($(STD_ICU),false) >- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.icu >-endif >-ifeq ($(STD_EDITLINE),false) >-ifeq ($(EDITLINE_FLG),Y) >- $(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline >-endif >-endif >+ > > btyacc_binary: $(BTYACC) > >diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults Firebird-2.1.2.18118-0/builds/posix/make.defaults >--- Firebird-2.1.2.18118-0_orig/builds/posix/make.defaults 2008-09-04 14:47:18.000000000 +0300 >+++ Firebird-2.1.2.18118-0/builds/posix/make.defaults 2009-05-20 15:15:31.088202976 +0300 >@@ -232,11 +232,7 @@ > LIBFBSTATIC_A = $(LIB)/libfbstatic.a > > ifeq ($(EDITLINE_FLG),Y) >- ifeq ($(STD_EDITLINE), true) >- LIBEDITLINE := -leditline >- else >- LIBEDITLINE := $(LIB)/libeditline.a >- endif >+ LIBEDITLINE := -ledit > endif > > LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \ >diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.rules Firebird-2.1.2.18118-0/builds/posix/make.rules >--- Firebird-2.1.2.18118-0_orig/builds/posix/make.rules 2008-12-10 03:03:31.000000000 +0200 >+++ Firebird-2.1.2.18118-0/builds/posix/make.rules 2009-05-20 15:21:04.114225351 +0300 >@@ -33,9 +33,6 @@ > > # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002 > CFLAGS:= $(CFLAGS) -I$(SRC_ROOT)/include/gen -I$(SRC_ROOT)/include -I$(SRC_ROOT)/vulcan -DNAMESPACE=Vulcan >-ifeq ($(STD_ICU),false) >- CFLAGS:= $(CFLAGS) -I$(ROOT)/extern/icu/source/common -I$(ROOT)/extern/icu/source/i18n >-endif > > ifeq ($(IsProdTypeBuild),Y) > CFLAGS:= $(CFLAGS) $(PROD_FLAGS) -DPROD_BUILD >@@ -69,7 +66,7 @@ > > .SUFFIXES: .c .e .epp .cpp > >-.e.c: >+.e.c: $(GPRE_CURRENT) > $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ > > >diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets Firebird-2.1.2.18118-0/builds/posix/make.shared.targets >--- Firebird-2.1.2.18118-0_orig/builds/posix/make.shared.targets 2008-12-10 03:03:31.000000000 +0200 >+++ Firebird-2.1.2.18118-0/builds/posix/make.shared.targets 2009-05-20 15:21:59.299203496 +0300 >@@ -49,7 +49,7 @@ > > # gpre_meta needs a special boot build since there is no database. > >-$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp >+$(SRC_ROOT)/gpre/gpre_meta.cpp: $(SRC_ROOT)/gpre/gpre_meta.epp $(GPRE_BOOT) > $(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@ > > >diff -Naur Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux Firebird-2.1.2.18118-0/builds/posix/prefix.linux >--- Firebird-2.1.2.18118-0_orig/builds/posix/prefix.linux 2007-05-03 14:24:50.000000000 +0300 >+++ Firebird-2.1.2.18118-0/builds/posix/prefix.linux 2009-05-20 15:23:17.286523276 +0300 >@@ -20,12 +20,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.2.18118-0_orig/configure Firebird-2.1.2.18118-0/configure >--- Firebird-2.1.2.18118-0_orig/configure 2009-03-30 09:42:44.000000000 +0300 >+++ Firebird-2.1.2.18118-0/configure 2009-05-20 15:26:30.856202564 +0300 >@@ -4027,13 +4027,13 @@ > # not need editline in default libs, but need to test for its presence > saveLIBS=$LIBS > if test "$STD_EDITLINE" = "true"; then >- { echo "$as_me:$LINENO: checking for readline in -leditline" >&5 >-echo $ECHO_N "checking for readline in -leditline... $ECHO_C" >&6; } >+ { echo "$as_me:$LINENO: checking for readline in -ledit" >&5 >+echo $ECHO_N "checking for readline in -ledit... $ECHO_C" >&6; } > if test "${ac_cv_lib_editline_readline+set}" = set; then > echo $ECHO_N "(cached) $ECHO_C" >&6 > else > ac_check_lib_save_LIBS=$LIBS >-LIBS="-leditline $LIBS" >+LIBS="-ledit $LIBS" > cat >conftest.$ac_ext <<_ACEOF > /* confdefs.h. */ > _ACEOF >firebird-2.1.2.18118.0.ebuild0000644000175000017550000002362311246423751013471 0ustar jwhjwh# Copyright 1999-2009 Gentoo Foundation ># Distributed under the terms of the GNU General Public License v2 ># $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.2.18118.0.ebuild,v 1.2 2009/01/18 22:03:05 jsbronder Exp $ > >inherit flag-o-matic eutils autotools versionator > >MY_P=Firebird-$(replace_version_separator 4 -) >#MY_P=Firebird-${PV/_rc/-ReleaseCandidate} > >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="IDPL 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 ) > !sys-cluster/ganglia" > >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} > > epatch "${FILESDIR}/${P}-gcc-icu-declare.patch" > > 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" ${PN} > newconfd "${FILESDIR}/${PN}.conf.d" ${PN} > fperms 640 /etc/conf.d/${PN} > fi > > # Install docs > use doc && dodoc "${WORKDIR}"/manuals/* > use examples && docinto examples >} > >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" >} >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=202692">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 264955
:
191899
|
191900
|
202692
|
203819
|
203820
|
203822
|
276271
|
276273
