Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[63101] firebird/trunk
|
From: <di...@us...> - 2016-03-06 08:32:23
|
Revision: 63101
http://sourceforge.net/p/firebird/code/63101
Author: dimitr
Date: 2016-03-06 08:32:18 +0000 (Sun, 06 Mar 2016)
Log Message:
-----------
Renamed security3.fdb -> security4.fdb.
Modified Paths:
--------------
firebird/trunk/autogen.sh
firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in
firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
firebird/trunk/builds/install/misc/databases.conf.in
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/builds/install/posix-common/posixLibrary.sh.in
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/builds/posix/make.defaults
firebird/trunk/builds/win32/make_all.bat
firebird/trunk/builds/win32/make_boot.bat
firebird/trunk/configure.ac
firebird/trunk/src/CMakeLists.txt
firebird/trunk/src/common/config/config.cpp
Modified: firebird/trunk/autogen.sh
===================================================================
--- firebird/trunk/autogen.sh 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/autogen.sh 2016-03-06 08:32:18 UTC (rev 63101)
@@ -3,7 +3,7 @@
# Run this to generate all the initial makefiles, etc.
#
-PKG_NAME=Firebird3
+PKG_NAME=Firebird4
SRCDIR=`dirname $0`
if [ -z "$AUTORECONF" ]
Modified: firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -37,7 +37,7 @@
BuildRootDir=..
BuiltFBDir=Release/firebird # Where the just build fb exists.
TargetDir=buildroot # Where we want to build the install image
-SecurityDatabase=security3.fdb
+SecurityDatabase=security4.fdb
#------------------------------------------------------------------------
Modified: firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc 2016-03-06 08:32:18 UTC (rev 63101)
@@ -792,7 +792,7 @@
SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf';
SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf';
SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log';
-SharedFileArray[30].Filename := ExpandConstant('{app}')+'security3.fdb';
+SharedFileArray[30].Filename := ExpandConstant('{app}')+'security4.fdb';
SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf';
SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe';
SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll';
@@ -1177,7 +1177,7 @@
LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr );
if pos('SharedDatabase', FirebirdConfStr) > 0 then begin
RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1');
- RenameFile(GetAppPath+'\security3.fdb', GetAppPath+'\security3.fdb.preRC1');
+ RenameFile(GetAppPath+'\security4.fdb', GetAppPath+'\security4.fdb.preRC1');
end
end
end;
@@ -1185,7 +1185,7 @@
function ConfigureAuthentication: boolean;
begin
- if FileExists(WizardDirValue + '\security3.fdb') then
+ if FileExists(WizardDirValue + '\security4.fdb') then
Result := false
else
Result := true;
Modified: firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss
===================================================================
--- firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/arch-specific/win32/FirebirdInstall_30.iss 2016-03-06 08:32:18 UTC (rev 63101)
@@ -474,8 +474,8 @@
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf.default; Components: ServerComponent;
Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NofbtraceConfExists;
Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
-Source: {#FilesDir}\security3.fdb; DestDir: {app}; Destname: security3.fdb.empty; Components: ServerComponent;
-Source: {#FilesDir}\security3.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
+Source: {#FilesDir}\security4.fdb; DestDir: {app}; Destname: security4.fdb.empty; Components: ServerComponent;
+Source: {#FilesDir}\security4.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
@@ -1074,7 +1074,7 @@
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
- IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false);
+ IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security4.fdb', false);
InitSecurityDB;
@@ -1189,8 +1189,8 @@
aStringList.add(appPath+'\firebird.log');
aStringList.add(appPath+'\databases.conf');
aStringList.add(appPath+'\fbtrace.conf');
- aStringList.add(appPath+'\security3.fdb');
- aStringList.add(appPath+'\security3.fdb.old');
+ aStringList.add(appPath+'\security4.fdb');
+ aStringList.add(appPath+'\security4.fdb.old');
for count := 0 to aStringList.count - 1 do begin
// We are manually handling the share count of these files, so we must
Modified: firebird/trunk/builds/install/misc/databases.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/databases.conf.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/misc/databases.conf.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -24,7 +24,7 @@
# Master security database specific setup.
# Do not remove it until you understand well what are you doing!
#
-security.db = $(dir_secDb)/security3.fdb
+security.db = $(dir_secDb)/security4.fdb
{
RemoteAccess = false
DefaultDbCachePages = 50
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -772,7 +772,7 @@
#
# Type: string (pathname)
#
-#SecurityDatabase = $(dir_secDb)/security3.fdb
+#SecurityDatabase = $(dir_secDb)/security4.fdb
# ==============================
Modified: firebird/trunk/builds/install/posix-common/posixLibrary.sh.in
===================================================================
--- firebird/trunk/builds/install/posix-common/posixLibrary.sh.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/install/posix-common/posixLibrary.sh.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -43,7 +43,7 @@
OrigPasswd=""
TmpFile=""
MANIFEST_TXT=""
-SecurityDatabase=security3.fdb
+SecurityDatabase=security4.fdb
DefaultLibrary=libfbclient
UninstallScript=FirebirdUninstall.sh
ArchiveDateTag=`date +"%Y%m%d_%H%M"`
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/posix/Makefile.in 2016-03-06 08:32:18 UTC (rev 63101)
@@ -310,7 +310,7 @@
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS)
HELP_FDB = $(FIREBIRD)/help/help.fdb
-SECURITY_FDB = $(FIREBIRD)/security3.fdb
+SECURITY_FDB = $(FIREBIRD)/security4.fdb
SECURITY_TMP = security.tmp
databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB)
Modified: firebird/trunk/builds/posix/make.defaults
===================================================================
--- firebird/trunk/builds/posix/make.defaults 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/posix/make.defaults 2016-03-06 08:32:18 UTC (rev 63101)
@@ -351,7 +351,7 @@
INSTREG = $(BIN)/instreg$(EXEC_EXT)
INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
-SECURITY_FDB = $(FIREBIRD)/security3.fdb
+SECURITY_FDB = $(FIREBIRD)/security4.fdb
# From qli
QLI = $(BIN)/qli$(EXEC_EXT)
Modified: firebird/trunk/builds/win32/make_all.bat
===================================================================
--- firebird/trunk/builds/win32/make_all.bat 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/win32/make_all.bat 2016-03-06 08:32:18 UTC (rev 63101)
@@ -73,7 +73,7 @@
@copy %FB_ROOT_PATH%\builds\install\misc\IDPLicense.txt %FB_OUTPUT_DIR% >nul
:: DATABASES
-@copy %FB_GEN_DIR%\dbs\security3.FDB %FB_OUTPUT_DIR%\security3.fdb >nul
+@copy %FB_GEN_DIR%\dbs\security4.FDB %FB_OUTPUT_DIR%\security4.fdb >nul
@copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul
:: DOCS
Modified: firebird/trunk/builds/win32/make_boot.bat
===================================================================
--- firebird/trunk/builds/win32/make_boot.bat 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/builds/win32/make_boot.bat 2016-03-06 08:32:18 UTC (rev 63101)
@@ -236,9 +236,9 @@
@rmdir /s /q %FB_GEN_DIR%\dbs 2>nul
@mkdir %FB_GEN_DIR%\dbs 2>nul
-@echo create database '%FB_GEN_DB_DIR%\dbs\security3.fdb'; | "%FB_BIN_DIR%\isql" -q
-@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security3.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
-@copy %FB_GEN_DIR%\dbs\security3.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
+@echo create database '%FB_GEN_DB_DIR%\dbs\security4.fdb'; | "%FB_BIN_DIR%\isql" -q
+@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security4.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
+@copy %FB_GEN_DIR%\dbs\security4.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
@%FB_BIN_DIR%\gbak -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_GEN_DB_DIR%/dbs/metadata.fdb
Modified: firebird/trunk/configure.ac
===================================================================
--- firebird/trunk/configure.ac 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/configure.ac 2016-03-06 08:32:18 UTC (rev 63101)
@@ -1339,7 +1339,7 @@
dnl Print out the build configuration (the most interesting thing)
echo
echo
-echo The Firebird3 package has been configured with the following options:
+echo The Firebird4 package has been configured with the following options:
echo
case $DEVEL_FLG in
Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/src/CMakeLists.txt 2016-03-06 08:32:18 UTC (rev 63101)
@@ -936,7 +936,7 @@
add_custom_target(copy_files
#ALL # uncomment this to copy files every build
# databases
- COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security3.fdb
+ COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security4.fdb
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb
# configs, text files
COMMAND sed "/@UDF_COMMENT@/d" < ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf.in > ${output_dir}/firebird.conf
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2016-03-06 08:17:00 UTC (rev 63100)
+++ firebird/trunk/src/common/config/config.cpp 2016-03-06 08:32:18 UTC (rev 63101)
@@ -185,7 +185,7 @@
#endif
{TYPE_STRING, "UserManager", (ConfigValue) "Srp"},
{TYPE_STRING, "TracePlugin", (ConfigValue) "fbtrace"},
- {TYPE_STRING, "SecurityDatabase", (ConfigValue) "$(dir_secDb)/security3.fdb"}, // security database name
+ {TYPE_STRING, "SecurityDatabase", (ConfigValue) "$(dir_secDb)/security4.fdb"}, // security database name
{TYPE_STRING, "ServerMode", (ConfigValue) "Super"},
{TYPE_STRING, "WireCrypt", (ConfigValue) NULL},
{TYPE_STRING, "WireCryptPlugin", (ConfigValue) "Arc4"},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
