diff options
Diffstat (limited to 'dev-db/firebird')
| -rw-r--r-- | dev-db/firebird/ChangeLog | 15 | ||||
| -rw-r--r-- | dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch | 230 | ||||
| -rw-r--r-- | dev-db/firebird/files/firebird.conf.d.2 | 4 | ||||
| -rw-r--r-- | dev-db/firebird/files/firebird.init.d | 32 | ||||
| -rw-r--r-- | dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild | 213 | ||||
| -rw-r--r-- | dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild | 276 | ||||
| -rw-r--r-- | dev-db/firebird/firebird-2.1.0.17755_rc2-r1.ebuild (renamed from dev-db/firebird/firebird-2.1.0.17755_rc2.ebuild) | 8 |
7 files changed, 328 insertions, 450 deletions
diff --git a/dev-db/firebird/ChangeLog b/dev-db/firebird/ChangeLog index e1c80bf9f802..358a8f4361c4 100644 --- a/dev-db/firebird/ChangeLog +++ b/dev-db/firebird/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for dev-db/firebird # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.90 2008/03/25 19:54:55 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/ChangeLog,v 1.91 2008/04/10 22:59:59 wltjr Exp $ + +*firebird-2.1.0.17755_rc2-r1 (10 Apr 2008) +*firebird-2.0.3.12981.0-r6 (10 Apr 2008) + + 10 Apr 2008; William L. Thomson Jr. <wltjr@gentoo.org> + -files/firebird-2.0.3.12981.0-paths.patch, files/firebird.conf.d.2, + +files/firebird.init.d, -firebird-2.0.3.12981.0-r2.ebuild, + +firebird-2.0.3.12981.0-r6.ebuild, -firebird-2.1.0.17755_rc2.ebuild, + +firebird-2.1.0.17755_rc2-r1.ebuild: + Updated conf.d and init.d files. Removed legacy ISC cruft, + username/password in text file, exported to env during start. Resolves bug + #216158. Init script using s-s-d now for start and stop via pid. Added + restart. *firebird-2.1.0.17755_rc2 (25 Mar 2008) diff --git a/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch b/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch deleted file mode 100644 index 1e8624b1108b..000000000000 --- a/dev-db/firebird/files/firebird-2.0.3.12981.0-paths.patch +++ /dev/null @@ -1,230 +0,0 @@ -diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/db_alias.cpp Firebird-2.0.3.12981-0/src/jrd/db_alias.cpp ---- Firebird-2.0.3.12981-0_orig/src/jrd/db_alias.cpp 2007-09-19 21:00:33.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/jrd/db_alias.cpp 2007-09-20 19:26:44.000000000 -0400 -@@ -29,7 +29,7 @@ - - typedef Firebird::PathName string; - --const char* ALIAS_FILE = "aliases.conf"; -+const char* ALIAS_FILE = "../../../etc/firebird/aliases.conf"; - - bool ResolveDatabaseAlias(const string& alias, string& database) - { -diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/file_params.h Firebird-2.0.3.12981-0/src/jrd/file_params.h ---- Firebird-2.0.3.12981-0_orig/src/jrd/file_params.h 2007-09-19 21:00:33.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/jrd/file_params.h 2007-09-20 18:48:00.000000000 -0400 -@@ -38,17 +38,17 @@ - const int EVENT_SEMAPHORES = 1; - - #ifdef NOHOSTNAME --static const char* EVENT_FILE = "isc_event1"; --static const char* LOCK_FILE = "isc_lock1.gbl"; --static const char* LOCK_HEADER = "isc_config"; --static const char* INIT_FILE = "isc_init1"; --static const char* GUARD_FILE = "isc_guard1"; -+static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1"; -+static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.gbl"; -+static const char* LOCK_HEADER = "../../../var/run/firebird/isc_config"; -+static const char* INIT_FILE = "../../../var/run/firebird/isc_init1"; -+static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1"; - #elif defined(SMALL_FILE_NAMES) --static const char* EVENT_FILE = "isce1.%s"; --static const char* LOCK_FILE = "iscl1.%s"; --static const char* LOCK_HEADER = "isc_config"; --static const char* INIT_FILE = "isci1.%s"; --static const char* GUARD_FILE = "iscg1.%s"; -+static const char* EVENT_FILE = "../../../var/run/firebird/isce1.%s"; -+static const char* LOCK_FILE = "../../../var/run/firebird/iscl1.%s"; -+static const char* LOCK_HEADER = "../../../var/run/firebird/isc_config"; -+static const char* INIT_FILE = "../../../var/run/firebird/isci1.%s"; -+static const char* GUARD_FILE = "../../../var/run/firebird/iscg1.%s"; - #elif defined(VMS) - static const char* EVENT_FILE = "[000000]isc_event1.%s"; - static const char* LOCK_FILE = "[000000]isc_lock1.%s"; -@@ -62,11 +62,11 @@ - static const char* INIT_FILE = "%s.int"; - static const char* GUARD_FILE = "%s.grd"; - #else --static const char* EVENT_FILE = "isc_event1.%s"; --static const char* LOCK_FILE = "isc_lock1.%s"; --static const char* LOCK_HEADER = "isc_config"; --static const char* INIT_FILE = "isc_init1.%s"; --static const char* GUARD_FILE = "isc_guard1.%s"; -+static const char* EVENT_FILE = "../../../var/run/firebird/isc_event1.%s"; -+static const char* LOCK_FILE = "../../../var/run/firebird/isc_lock1.%s"; -+static const char* LOCK_HEADER = "../../../var/run/firebird/isc_config"; -+static const char* INIT_FILE = "../../../var/run/firebird/isc_init1.%s"; -+static const char* GUARD_FILE = "../../../var/run/firebird/isc_guard1.%s"; - #endif - - #ifdef sun -@@ -97,7 +97,7 @@ - static const char* MSG_FILE = "firebird.msg"; - static const char MSG_FILE_LANG[]= "intl/%.10s.msg"; - const int LOCALE_MAX = 10; --static const char* LOGFILE = "firebird.log"; -+static const char* LOGFILE = "../../../var/log/firebird/firebird.log"; - #define TEMP_PATTERN "_XXXXXX" - #elif defined(WIN_NT) - static const char* WORKFILE = "c:\\temp\\"; -@@ -139,7 +139,7 @@ - static const char* MSG_FILE = "firebird.msg"; - static const char MSG_FILE_LANG[]= "intl/%.10s.msg"; - const int LOCALE_MAX = 10; --static const char* LOGFILE = "firebird.log"; -+static const char* LOGFILE = "../../../var/log/firebird/firebird.log"; - #define TEMP_PATTERN "_XXXXXX" - #endif - -diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/jrd_pwd.h Firebird-2.0.3.12981-0/src/jrd/jrd_pwd.h ---- Firebird-2.0.3.12981-0_orig/src/jrd/jrd_pwd.h 2007-09-19 21:00:33.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/jrd/jrd_pwd.h 2007-09-20 18:48:18.000000000 -0400 -@@ -58,7 +58,7 @@ - #ifdef VMS - "[sysmgr]security2.fdb"; - #else -- "security2.fdb"; -+ "../../../etc/firebird/security2.fdb"; - #endif - - gds__prefix(path_buffer, USER_INFO_NAME); -diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/os/config_root.h Firebird-2.0.3.12981-0/src/jrd/os/config_root.h ---- Firebird-2.0.3.12981-0_orig/src/jrd/os/config_root.h 2007-09-19 21:00:33.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/jrd/os/config_root.h 2007-09-20 18:48:36.000000000 -0400 -@@ -32,7 +32,7 @@ - #include "../jrd/os/path_utils.h" - #include "../common/utils_proto.h" - --static const char* CONFIG_FILE = "firebird.conf"; -+static const char* CONFIG_FILE = "../../../etc/firebird/firebird.conf"; - - /** - Since the original (isc.cpp) code wasn't able to provide powerful and -diff -Naur Firebird-2.0.3.12981-0_orig/src/jrd/svc.cpp Firebird-2.0.3.12981-0/src/jrd/svc.cpp ---- Firebird-2.0.3.12981-0_orig/src/jrd/svc.cpp 2007-09-19 21:00:33.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/jrd/svc.cpp 2007-09-20 19:34:33.000000000 -0400 -@@ -366,38 +366,38 @@ - static serv_entry services[] = - { - -- { isc_action_max, "print_cache", "-svc", "bin/fb_cache_print", NULL, 0 }, -- { isc_action_max, "print_locks", "-svc", "bin/fb_lock_print", NULL, 0 }, -- { isc_action_max, "start_cache", "-svc", "bin/fb_cache_manager", NULL, 0 }, -- { isc_action_max, "analyze_database", "-svc", "bin/gstat", NULL, 0 }, -- { isc_action_max, "backup", "-svc -b", "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_max, "create", "-svc -c", "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_max, "restore", "-svc -r", "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_max, "gdef", "-svc", "bin/gdef", NULL, 0 }, -- { isc_action_max, "gsec", "-svc", "bin/gsec", NULL, 0 }, -- { isc_action_max, "disable_journal", "-svc -disable", "bin/gjrn", NULL, 0 }, -- { isc_action_max, "dump_journal", "-svc -online_dump", "bin/gjrn", NULL, 0 }, -- { isc_action_max, "enable_journal", "-svc -enable", "bin/gjrn", NULL, 0 }, -- { isc_action_max, "monitor_journal", "-svc -console", "bin/gjrn", NULL, 0 }, -+ { isc_action_max, "print_cache", "-svc", "../../../usr/bin/fb_cache_print", NULL, 0 }, -+ { isc_action_max, "print_locks", "-svc", "../../../usr/bin/fb_lock_print", NULL, 0 }, -+ { isc_action_max, "start_cache", "-svc", "../../../usr/bin/fb_cache_manager", NULL, 0 }, -+ { isc_action_max, "analyze_database", "-svc", "../../../usr/bin/gstat", NULL, 0 }, -+ { isc_action_max, "backup", "-svc -b", "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_max, "create", "-svc -c", "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_max, "restore", "-svc -r", "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_max, "gdef", "-svc", "../../../usr/bin/gdef", NULL, 0 }, -+ { isc_action_max, "gsec", "-svc", "../../../usr/bin/gsec", NULL, 0 }, -+ { isc_action_max, "disable_journal", "-svc -disable", "../../../usr/bin/gjrn", NULL, 0 }, -+ { isc_action_max, "dump_journal", "-svc -online_dump", "../../../usr/bin/gjrn", NULL, 0 }, -+ { isc_action_max, "enable_journal", "-svc -enable", "../../../usr/bin/gjrn", NULL, 0 }, -+ { isc_action_max, "monitor_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 }, - { isc_action_max, "query_server", NULL, NULL, NULL, 0 }, -- { isc_action_max, "start_journal", "-svc -server", "bin/gjrn", NULL, 0 }, -- { isc_action_max, "stop_cache", "-svc -shut -cache", "bin/gfix", NULL, 0 }, -- { isc_action_max, "stop_journal", "-svc -console", "bin/gjrn", NULL, 0 }, -+ { isc_action_max, "start_journal", "-svc -server", "../../../usr/bin/gjrn", NULL, 0 }, -+ { isc_action_max, "stop_cache", "-svc -shut -cache", "../../../usr/bin/gfix", NULL, 0 }, -+ { isc_action_max, "stop_journal", "-svc -console", "../../../usr/bin/gjrn", NULL, 0 }, - { isc_action_max, "anonymous", NULL, NULL, NULL, 0 }, - - /* NEW VERSION 2 calls, the name field MUST be different from those names above - */ - { isc_action_max, "service_mgr", NULL, NULL, NULL, 0 }, -- { isc_action_svc_backup, "Backup Database", NULL, "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_svc_restore, "Restore Database", NULL, "bin/gbak", MAIN_GBAK, 0 }, -- { isc_action_svc_repair, "Repair Database", NULL, "bin/gfix", MAIN_GFIX, 0 }, -- { isc_action_svc_add_user, "Add User", NULL, "bin/gsec", MAIN_GSEC, 0 }, -- { isc_action_svc_delete_user, "Delete User", NULL, "bin/gsec", MAIN_GSEC, 0 }, -- { isc_action_svc_modify_user, "Modify User", NULL, "bin/gsec", MAIN_GSEC, 0 }, -- { isc_action_svc_display_user, "Display User", NULL, "bin/gsec", MAIN_GSEC, 0 }, -- { isc_action_svc_properties, "Database Properties", NULL, "bin/gfix", MAIN_GFIX, 0 }, -- { isc_action_svc_lock_stats, "Lock Stats", NULL, "bin/fb_lock_print", TEST_THREAD, 0 }, -- { isc_action_svc_db_stats, "Database Stats", NULL, "bin/gstat", MAIN_GSTAT, 0 }, -+ { isc_action_svc_backup, "Backup Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_svc_restore, "Restore Database", NULL, "../../../usr/bin/gbak", MAIN_GBAK, 0 }, -+ { isc_action_svc_repair, "Repair Database", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 }, -+ { isc_action_svc_add_user, "Add User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 }, -+ { isc_action_svc_delete_user, "Delete User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 }, -+ { isc_action_svc_modify_user, "Modify User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 }, -+ { isc_action_svc_display_user, "Display User", NULL, "../../../usr/bin/gsec", MAIN_GSEC, 0 }, -+ { isc_action_svc_properties, "Database Properties", NULL, "../../../usr/bin/gfix", MAIN_GFIX, 0 }, -+ { isc_action_svc_lock_stats, "Lock Stats", NULL, "../../../usr/bin/fb_lock_print", TEST_THREAD, 0 }, -+ { isc_action_svc_db_stats, "Database Stats", NULL, "../../../usr/bin/gstat", MAIN_GSTAT, 0 }, - { isc_action_svc_get_fb_log, "Get Log File", NULL, NULL, SVC_read_fb_log, 0 }, - /* actions with no names are undocumented */ - { isc_action_svc_set_config, NULL, NULL, NULL, TEST_THREAD, 0 }, -diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/fbcpl/fbdialog.cpp Firebird-2.0.3.12981-0/src/utilities/fbcpl/fbdialog.cpp ---- Firebird-2.0.3.12981-0_orig/src/utilities/fbcpl/fbdialog.cpp 2007-09-19 21:00:33.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/utilities/fbcpl/fbdialog.cpp 2007-09-20 18:49:23.000000000 -0400 -@@ -1335,7 +1335,7 @@ - bool CFBDialog::UpdateFirebirdConf(CString option, CString value) - { - CStdioFile FbConfFile, FbConfFileNew; -- CString FirebirdConfFilename = m_Root_Path + "firebird.conf"; -+ CString FirebirdConfFilename = "../../../etc/firebird/firebird.conf"; - CString FirebirdConfNewname = FirebirdConfFilename + ".new"; - CString FirebirdConfOldname = FirebirdConfFilename + ".old"; - CString FirebirdConfLine = ""; -diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/gsec/security.epp Firebird-2.0.3.12981-0/src/utilities/gsec/security.epp ---- Firebird-2.0.3.12981-0_orig/src/utilities/gsec/security.epp 2007-09-19 21:00:34.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/utilities/gsec/security.epp 2007-09-20 18:49:55.000000000 -0400 -@@ -41,7 +41,7 @@ - #endif - #include "../common/utils_proto.h" - --DATABASE DB = STATIC FILENAME "security2.fdb"; -+DATABASE DB = STATIC FILENAME "../../../etc/firebird/security2.fdb"; - - static const char* SYSDBA_USER_NAME = "SYSDBA"; - -diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/guard/guard.cpp Firebird-2.0.3.12981-0/src/utilities/guard/guard.cpp ---- Firebird-2.0.3.12981-0_orig/src/utilities/guard/guard.cpp 2007-09-19 21:00:34.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/utilities/guard/guard.cpp 2007-09-20 19:33:31.000000000 -0400 -@@ -51,7 +51,7 @@ - const USHORT IGNORE = 3; - const USHORT NORMAL_EXIT= 0; - --const char* SUPER_SERVER_BINARY = "bin/fbserver"; -+const char* SUPER_SERVER_BINARY = "../../../usr/bin/fbserver"; - - const char* INTERBASE_USER = "interbase"; - const char* FIREBIRD_USER = "firebird"; -diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/ibmgr.h Firebird-2.0.3.12981-0/src/utilities/ibmgr/ibmgr.h ---- Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/ibmgr.h 2007-09-19 21:00:34.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/utilities/ibmgr/ibmgr.h 2007-09-20 19:33:06.000000000 -0400 -@@ -31,7 +31,7 @@ - static const char* FIREBIRD_USER_NAME = "firebird"; - static const char* INTERBASE_USER_NAME = "interbase"; - static const char* INTERBASE_USER_SHORT= "interbas"; --static const char* SERVER_GUARDIAN = "bin/fbguard"; -+static const char* SERVER_GUARDIAN = "../../../usr/bin/fbguard"; - - const USHORT MSG_FAC = 18; - const int MSG_LEN = 128; -diff -Naur Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/srvrmgr.cpp Firebird-2.0.3.12981-0/src/utilities/ibmgr/srvrmgr.cpp ---- Firebird-2.0.3.12981-0_orig/src/utilities/ibmgr/srvrmgr.cpp 2007-09-19 21:00:34.000000000 -0400 -+++ Firebird-2.0.3.12981-0/src/utilities/ibmgr/srvrmgr.cpp 2007-09-19 21:29:15.000000000 -0400 -@@ -271,7 +271,7 @@ - rs = "can not quit now, use shut -ign"; - break; - case MSG_STARTERR: -- rs = "check $FIREBIRD/firebird.log file for errors"; -+ rs = "check /var/log/firebird/firebird.log file for errors"; - break; - case MSG_STARTFAIL: - rs = "can not start server"; diff --git a/dev-db/firebird/files/firebird.conf.d.2 b/dev-db/firebird/files/firebird.conf.d.2 index b386f60bd8aa..64b454410516 100644 --- a/dev-db/firebird/files/firebird.conf.d.2 +++ b/dev-db/firebird/files/firebird.conf.d.2 @@ -1,4 +1,4 @@ -ISC_USER=SYSDBA -ISC_PASSWORD=masterke FIREBIRD=/usr/share/firebird FBRunUser=firebird +MANAGER=/usr/bin/fbmgr.bin +LD_LIBRARY_PATH=$FIREBIRD/lib diff --git a/dev-db/firebird/files/firebird.init.d b/dev-db/firebird/files/firebird.init.d new file mode 100644 index 000000000000..dae68cf40735 --- /dev/null +++ b/dev-db/firebird/files/firebird.init.d @@ -0,0 +1,32 @@ +#!/sbin/runscript +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/files/firebird.init.d,v 1.4 2008/04/10 23:00:00 wltjr Exp $ + +pidfile=/var/run/firebird/firebird.pid +FB_OPTS="-pidfile $pidfile -start -forever" + +export FIREBIRD LD_LIBRARY_PATH + +depend() { + need net +} + +start(){ + ebegin "Starting Firebird server" + start-stop-daemon --oknodo --start --pidfile $pidfile --chuid $FBRunUser --startas $MANAGER -- $FB_OPTS + eend $? +} + +stop(){ + ebegin "Stopping Firebird server" + start-stop-daemon --stop --pidfile $pidfile --oknodo + eend $? +} + +restart(){ + svc_stop + sleep 1 + svc_start +} + diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild deleted file mode 100644 index 0e37e447242c..000000000000 --- a/dev-db/firebird/firebird-2.0.3.12981.0-r2.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# 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.0.3.12981.0-r2.ebuild,v 1.7 2008/01/16 06:50:10 wltjr Exp $ - -inherit flag-o-matic eutils autotools versionator - -MY_P=Firebird-$(replace_version_separator 4 -) - -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 )" - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - enewgroup firebird 450 - enewuser firebird 450 /bin/bash /usr/share/firebird firebird -} - -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" - - mkdir -p "${WORKDIR}/../etc" \ - "${WORKDIR}/usr" \ - "${WORKDIR}/var/log/firebird" \ - "${WORKDIR}/var/run/firebird" - cd "${WORKDIR}/usr"; ln -s "${WORKDIR}/${MY_P}/gen/firebird/bin" - cd "${WORKDIR}/../etc"; ln -s "${WORKDIR}/${MY_P}/gen/firebird" firebird - - cd "${S}" - - epatch "${FILESDIR}/${P}-external-libs.patch" - epatch "${FILESDIR}/${P}-make-deps.patch" - epatch "${FILESDIR}/${P}-paths.patch" - - 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/share/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" - - insinto /usr/bin - dobin bin/* - - insinto /usr/include - doins include/* - - insinto /usr/lib - dolib.so lib/*.so* - dolib.a lib/*.a* - - insinto /usr/share/firebird - doins *.msg - - insinto /usr/share/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/share/firebird/UDF - doexe UDF/*.so - - exeinto /usr/share/firebird/intl - newexe intl/libfbintl.so fbintl - - insinto /usr/share/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.2" ${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/share/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/share/firebird. Logs" - elog "are in /var/log/firebird, and lock files in /var/run/firebird" - 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/share/firebird/UDF" -} diff --git a/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild b/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild new file mode 100644 index 000000000000..659a33e55490 --- /dev/null +++ b/dev-db/firebird/firebird-2.0.3.12981.0-r6.ebuild @@ -0,0 +1,276 @@ +# 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.0.3.12981.0-r6.ebuild,v 1.1 2008/04/10 22:59:59 wltjr Exp $ + +inherit flag-o-matic eutils autotools versionator multilib + +MY_P=Firebird-$(replace_version_separator 4 -) + +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 )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + enewgroup firebird 450 + enewuser firebird 450 /bin/bash /usr/$(get_libdir)/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}-CVE-2008-0387.patch" + epatch "${FILESDIR}/${P}-CVE-2008-0467.patch" + epatch "${FILESDIR}/${P}-external-libs.patch" + epatch "${FILESDIR}/${P}-flags.patch" + epatch "${FILESDIR}/${P}-make-deps.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_config:"../../../var/run/firebird/isc_config:w /dev/stdout' \ + -e 's:"isc_guard1:"../../../var/run/firebird/isc_guard1: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)" "14" "src/jrd/file_params.h" # 14 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' \ + -e 's:ISQL :FBSQL :w /dev/stdout' \ + src/msgs/messages.sql | wc -l)" "4" "src/msgs/messages.sql" # 4 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/$(get_libdir)/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/$(get_libdir) + dolib.so lib/*.so* + dolib.a lib/*.a* + + insinto /usr/$(get_libdir)/firebird + doins *.msg + + insinto /usr/$(get_libdir)/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/$(get_libdir)/firebird/UDF + doexe UDF/*.so + + exeinto /usr/$(get_libdir)/firebird/intl + newexe intl/libfbintl.so fbintl.so + + insinto /usr/$(get_libdir)/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/$(get_libdir)" + 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.2" ${PN} + fperms 640 /etc/conf.d/${PN} + 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/$(get_libdir)/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.17755_rc2.ebuild b/dev-db/firebird/firebird-2.1.0.17755_rc2-r1.ebuild index f8702d5910b6..f3d56de45861 100644 --- a/dev-db/firebird/firebird-2.1.0.17755_rc2.ebuild +++ b/dev-db/firebird/firebird-2.1.0.17755_rc2-r1.ebuild @@ -1,6 +1,6 @@ # 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.17755_rc2.ebuild,v 1.1 2008/03/25 19:54:55 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-db/firebird/firebird-2.1.0.17755_rc2-r1.ebuild,v 1.1 2008/04/10 22:59:59 wltjr Exp $ inherit flag-o-matic eutils autotools versionator @@ -195,9 +195,9 @@ src_install() { 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 + newinitd "${FILESDIR}/${PN}.init.d" ${PN} + newconfd "${FILESDIR}/${PN}.conf.d.2" ${PN} + fperms 640 /etc/conf.d/${PN} fi doenvd "${FILESDIR}/70${PN}" |