firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 18:43:02 +01:00
Code Issues

Renamed the package and the security database to v5

Browse Source
This commit is contained in:
Dmitry Yemanov 2021-05-31 14:36:48 +03:00
parent 1da7502665
commit eac0f27e12
27 changed files with 56 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
autogen.sh
View File

@ -3,7 +3,7 @@
# Run this to generate all the initial makefiles, etc. # Run this to generate all the initial makefiles, etc.
# #
PKG_NAME=Firebird4 PKG_NAME=Firebird5
SRCDIR=`dirname $0` SRCDIR=`dirname $0`
if [ -z "$AUTORECONF" ] if [ -z "$AUTORECONF" ]

4
builds/install/arch-specific/android/AfterUntar.sh
View File

@ -20,7 +20,7 @@ runAndCheckExit() {
runAndCheckExit "Restore messages database" "bin/gbak -rep msg.gbak msg.fdb" runAndCheckExit "Restore messages database" "bin/gbak -rep msg.gbak msg.fdb"
runAndCheckExit "Build messages file (firebird.msg)" bin/build_file runAndCheckExit "Build messages file (firebird.msg)" bin/build_file
runAndCheckExit "Restore security database" "bin/gbak -rep security4.gbak security4.fdb" runAndCheckExit "Restore security database" "bin/gbak -rep security5.gbak security5.fdb"
runAndCheckExit "Restore examples database (employee)" "bin/gbak -rep examples/empbuild/employee.gbak examples/empbuild/employee.fdb" runAndCheckExit "Restore examples database (employee)" "bin/gbak -rep examples/empbuild/employee.gbak examples/empbuild/employee.fdb"
rm -f msg.gbak msg.fdb security4.gbak examples/empbuild/employee.gbak AfterUntar.sh rm -f msg.gbak msg.fdb security5.gbak examples/empbuild/employee.gbak AfterUntar.sh

6
builds/install/arch-specific/darwin/Makefile.in
View File

@ -31,7 +31,7 @@ package_firebird:
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \ -e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
-e 's/_REV_NO_/$(FB_REV_NO)/g' \ -e 's/_REV_NO_/$(FB_REV_NO)/g' \
../builds/install/arch-specific/darwin/Info.plist \ ../builds/install/arch-specific/darwin/Info.plist \
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird4.framework/Resources/Info.plist > $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework/Resources/Info.plist
sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \ sed -e 's/_FB_BUILD_SUFFIX_/$(FB_VER_SUFFIX)/g' \
-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \ -e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \ -e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
@ -39,7 +39,7 @@ package_firebird:
-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \ -e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
-e 's/_REV_NO_/$(FB_REV_NO)/g' \ -e 's/_REV_NO_/$(FB_REV_NO)/g' \
../builds/install/arch-specific/darwin/Description.plist \ ../builds/install/arch-specific/darwin/Description.plist \
> $(ROOT)/gen/$(TARGET)/frameworks/Firebird4.framework/Resources/Description.plist > $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework/Resources/Description.plist
rm -fr $(ROOT)/gen/$(TARGET)/scripts rm -fr $(ROOT)/gen/$(TARGET)/scripts
mkdir $(ROOT)/gen/$(TARGET)/scripts mkdir $(ROOT)/gen/$(TARGET)/scripts
@ -63,7 +63,7 @@ package_firebird:
rm -fr $(TARGET)/packages rm -fr $(TARGET)/packages
mkdir $(TARGET)/packages mkdir $(TARGET)/packages
pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird4.framework \ pkgbuild --root $(ROOT)/gen/$(TARGET)/frameworks/Firebird5.framework \
--identifier com.firebirdsql.Firebird \ --identifier com.firebirdsql.Firebird \
--install-location /Library/Frameworks/Firebird.framework \ --install-location /Library/Frameworks/Firebird.framework \
--scripts $(ROOT)/gen/$(TARGET)/scripts \ --scripts $(ROOT)/gen/$(TARGET)/scripts \

21
builds/install/arch-specific/darwin/install-script
View File

@ -73,7 +73,7 @@ chown -R firebird:firebird "$FB_FW"
# set the permissions correctly # set the permissions correctly
echo "Set the permissions correctly" echo "Set the permissions correctly"
chmod 777 "$FB_FW/Resources/" chmod 777 "$FB_FW/Resources/"
chmod 660 "$FB_FW/Resources/security4.fdb" chmod 660 "$FB_FW/Resources/security5.fdb"
chmod 444 "$FB_FW/Resources/help/help.fdb" chmod 444 "$FB_FW/Resources/help/help.fdb"
# Remove all older traces of Classic first # Remove all older traces of Classic first
@ -92,16 +92,11 @@ if [ -f /etc/xinetd.d/firebird ]; then
HUPNEEDED='y' HUPNEEDED='y'
fi fi
# Install the saved security2 database, if any
echo "Install the saved security2 database"
if test -f /tmp/fb-security-database-update2fdb; then
mv -f /tmp/fb-security-database-update2.fdb "$FB_RES/security2.fdb"
fi
# Install the saved security database, if any # Install the saved security database, if any
echo "Install the saved security database" echo "Install the saved security database"
if test -f /tmp/fb-security-database-update4.fdb; then if test -f /tmp/fb-security-database-update5.fdb; then
mv -f /tmp/fb-security-database-update4.fdb "$FB_RES/security4.fdb" mv -f /tmp/fb-security-database-update5.fdb "$FB_RES/security5.fdb"
rm -f /tmp/fb-security-database-update4.fdb rm -f /tmp/fb-security-database-update5.fdb
fi fi
#Install the saved aliases.conf, if any #Install the saved aliases.conf, if any
@ -123,17 +118,13 @@ cp /tmp/UDF_Save/*.* $FB_RES/UDF/
rm -fr /tmp/UDF_save rm -fr /tmp/UDF_save
# Test for saved security database # Test for saved security database
if test -f "$FB_FW/Versions/A/Resources/security2.fdb"; then if test -f "$FB_RES/security5.fdb"; then
echo "Legacy 2.x Security database has been preserved"
fi
if test -f "$FB_FW/Versions/A/Resources/security4.fdb"; then
echo "Security database has been preserved" echo "Security database has been preserved"
fi fi
# Initilise the security database with default user # Initilise the security database with default user
echo "Add SYSDBA and password" echo "Add SYSDBA and password"
$FB_FW/Versions/A/Resources/bin/gsec -add sysdba -pw masterkey -user sysdba $FB_RES/bin/gsec -add sysdba -pw masterkey -user sysdba
rm -fr /tmp/firebird rm -fr /tmp/firebird
# And last but not least, start the Server # And last but not least, start the Server

4
builds/install/arch-specific/darwin/preupgrade-script
View File

@ -10,8 +10,8 @@
FB_FW="/Library/Frameworks/Firebird.framework" FB_FW="/Library/Frameworks/Firebird.framework"
FB_UDF="/Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF" FB_UDF="/Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF"
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security3.fdb"; then if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb"; then
mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security3.fdb" /tmp/fb-security-database-update3.fdb mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security5.fdb" /tmp/fb-security-database-update5.fdb
fi fi
if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then

2
builds/install/arch-specific/linux/makeInstallImage.sh.in
View File

@ -34,7 +34,7 @@ fb_install_prefix=@prefix@
BuildRootDir=.. BuildRootDir=..
BuiltFBDir=Release/firebird # Where the just build fb exists. BuiltFBDir=Release/firebird # Where the just build fb exists.
TargetDir=buildroot # Where we want to build the install image TargetDir=buildroot # Where we want to build the install image
SecurityDatabase=security4.fdb SecurityDatabase=security5.fdb
TomMathBuild="@TOMMATH_BUILD@" TomMathBuild="@TOMMATH_BUILD@"
TomCryptBuild="@TOMCRYPT_BUILD@" TomCryptBuild="@TOMCRYPT_BUILD@"

10
builds/install/arch-specific/win32/FirebirdInstall.iss
View File

@ -460,8 +460,8 @@ Source: {#FilesDir}\fbtrace.conf; DestDir: {app}; DestName: fbtrace.conf; Compon
Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist Source: {#FilesDir}\databases.conf; DestDir: {app}; Components: ClientComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\replication.conf; DestDir: {app}; DestName: replication.conf.default; Components: ServerComponent; Source: {#FilesDir}\replication.conf; DestDir: {app}; DestName: replication.conf.default; Components: ServerComponent;
Source: {#FilesDir}\replication.conf; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NoReplicationConfExists; Source: {#FilesDir}\replication.conf; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist; check: NoReplicationConfExists;
Source: {#FilesDir}\security4.fdb; DestDir: {app}; Destname: security4.fdb.empty; Components: ServerComponent; Source: {#FilesDir}\security5.fdb; DestDir: {app}; Destname: security5.fdb.empty; Components: ServerComponent;
Source: {#FilesDir}\security4.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist Source: {#FilesDir}\security5.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion Source: {#FilesDir}\firebird.msg; DestDir: {app}; Components: ClientComponent; Flags: sharedfile ignoreversion
Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy Source: {#FilesDir}\firebird.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
@ -1014,7 +1014,7 @@ begin
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security4.fdb', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security5.fdb', false);
IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\replication.conf', false); IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\replication.conf', false);
InitSecurityDB; InitSecurityDB;
@ -1140,8 +1140,8 @@ begin
aStringList.add(appPath+'\firebird.log'); aStringList.add(appPath+'\firebird.log');
aStringList.add(appPath+'\databases.conf'); aStringList.add(appPath+'\databases.conf');
aStringList.add(appPath+'\fbtrace.conf'); aStringList.add(appPath+'\fbtrace.conf');
aStringList.add(appPath+'\security4.fdb'); aStringList.add(appPath+'\security5.fdb');
aStringList.add(appPath+'\security4.fdb.old'); aStringList.add(appPath+'\security5.fdb.old');
aStringList.add(appPath+'\replication.conf'); aStringList.add(appPath+'\replication.conf');
for count := 0 to aStringList.count - 1 do begin for count := 0 to aStringList.count - 1 do begin

6
builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc
View File

@ -795,7 +795,7 @@ else
SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf'; SharedFileArray[27].Filename := ExpandConstant('{app}')+'databases.conf';
SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf'; SharedFileArray[28].Filename := ExpandConstant('{app}')+'firebird.conf';
SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log'; SharedFileArray[29].Filename := ExpandConstant('{app}')+'firebird.log';
SharedFileArray[30].Filename := ExpandConstant('{app}')+'security4.fdb'; SharedFileArray[30].Filename := ExpandConstant('{app}')+'security5.fdb';
SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf'; SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf';
SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe'; SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe';
SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll'; SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll';
@ -1173,7 +1173,7 @@ begin
LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr ); LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr );
if pos('SharedDatabase', FirebirdConfStr) > 0 then begin if pos('SharedDatabase', FirebirdConfStr) > 0 then begin
RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1'); RenameFile(GetAppPath+'\firebird.conf', GetAppPath+'\firebird.conf.preRC1');
RenameFile(GetAppPath+'\security4.fdb', GetAppPath+'\security4.fdb.preRC1'); RenameFile(GetAppPath+'\security5.fdb', GetAppPath+'\security5.fdb.preRC1');
end end
end end
end; end;
@ -1181,7 +1181,7 @@ end;
function ConfigureAuthentication: boolean; function ConfigureAuthentication: boolean;
begin begin
if FileExists(WizardDirValue + '\security4.fdb') then if FileExists(WizardDirValue + '\security5.fdb') then
Result := false Result := false
else else
Result := true; Result := true;

6
builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt
View File

@ -38,7 +38,7 @@ Pogledajte UNINSTALL sekciju ispod za vise informacija o ovome.
Ako ste instalirali beta ili alpha verziju Ako ste instalirali beta ili alpha verziju
firebird-a, instalacija ce preimenovati firebird.conf i firebird-a, instalacija ce preimenovati firebird.conf i
security4.fdb jer ove datoteke vise nisu kompatibilne. security5.fdb jer ove datoteke vise nisu kompatibilne.
Deployment gds32.dll Deployment gds32.dll
@ -69,7 +69,7 @@ Re-instalacija Firebird-a
Instalacioni program radi sve sto moze da detektuje i Instalacioni program radi sve sto moze da detektuje i
sacuva prethodnu instalaciju. Ako instalacija detektuje sacuva prethodnu instalaciju. Ako instalacija detektuje
firebird.conf ili security4.fdb onda nece ponuditi firebird.conf ili security5.fdb onda nece ponuditi
opciju da instalira legacy_auth. Niti ce ponuditi opciju da instalira legacy_auth. Niti ce ponuditi
opciju da postavi SYSDBA username i password. opciju da postavi SYSDBA username i password.
@ -128,7 +128,7 @@ o Deinstalacija ostavlja 6 datoteka u install
- fbtrace.conf - fbtrace.conf
- replication.conf - replication.conf
- firebird.log - firebird.log
- security4.fdb - security5.fdb
Ovo je uradjeno namjerno. Ove datoteke su sve Ovo je uradjeno namjerno. Ove datoteke su sve
potencijalno modifikovane od strane korisnika i mogu potencijalno modifikovane od strane korisnika i mogu

6
builds/install/arch-specific/win32/cz/instalace_ctime.txt
View File

@ -38,7 +38,7 @@ viz část ODINSTALACE níže.
Máte-li nainstalovanou beta či alpha verzi Máte-li nainstalovanou beta či alpha verzi
Firebirdu $MAJOR.$MINOR, instalátor přejmenuje firebird.conf Firebirdu $MAJOR.$MINOR, instalátor přejmenuje firebird.conf
a security3.fdb, jelikož tyto soubory již nejsou kompatibilní. a security5.fdb, jelikož tyto soubory již nejsou kompatibilní.
Instalace gds32.dll Instalace gds32.dll
@ -63,7 +63,7 @@ Reinstalace of Firebird $MAJOR.$MINOR
--------------------------- ---------------------------
Instalační program dělá vše pro detekci a zachování předchozí instalace. Instalační program dělá vše pro detekci a zachování předchozí instalace.
Jestliže instalátor rozpozná firebird.conf či security3.fdb, nebude Jestliže instalátor rozpozná firebird.conf či security5.fdb, nebude
nabízet možnost instalace legacy_auth. Rovněž nebude nabízet nabízet možnost instalace legacy_auth. Rovněž nebude nabízet
volbu pro nastavení hesla pro SYSDBA. volbu pro nastavení hesla pro SYSDBA.
@ -123,7 +123,7 @@ o Odinstalace v instalační složce zanechá
- fbtrace.conf - fbtrace.conf
- replication.conf - replication.conf
- firebird.log - firebird.log
- security3.fdb - security5.fdb
To je záměr. Všechny tyto soubory jsou To je záměr. Všechny tyto soubory jsou
potencionálně pozměnitelné uživatelem a potencionálně pozměnitelné uživatelem a

4
builds/install/arch-specific/win32/fr/installation_lisezmoi.txt
View File

@ -44,7 +44,7 @@ Il est particulièrement important de vérifier que
fbclient.dll et gds32.dll ont été retirés de <system32>. fbclient.dll et gds32.dll ont été retirés de <system32>.
Si vous avez installé une version beta ou alpha de Firebird $MAJOR.$MINOR, Si vous avez installé une version beta ou alpha de Firebird $MAJOR.$MINOR,
l'installeur va renommer firebird.conf et security4.fdb, car ces l'installeur va renommer firebird.conf et security5.fdb, car ces
fichiers ne sont plus compatibles avec la version actuelle. fichiers ne sont plus compatibles avec la version actuelle.
@ -132,7 +132,7 @@ o La désinstallation laisse six fichiers dans le
- fbtrace.conf - fbtrace.conf
- replication.conf - replication.conf
- firebird.log - firebird.log
- security4.fdb - security5.fdb
Ceci est intentionnel. Ces fichiers sont tous Ceci est intentionnel. Ces fichiers sont tous
potentiellement modifiables par les utilisateurs et peuvent potentiellement modifiables par les utilisateurs et peuvent

4
builds/install/arch-specific/win32/installation_readme.txt
View File

@ -52,7 +52,7 @@ Re-installation of Firebird
The binary installer does its best to detect and The binary installer does its best to detect and
preserve a previous install. If the installer detects preserve a previous install. If the installer detects
firebird.conf or security4.fdb it will not offer the firebird.conf or security5.fdb it will not offer the
option to set the SYSDBA username and password. option to set the SYSDBA username and password.
@ -112,7 +112,7 @@ o Uninstallation leaves six files in the install
- fbtrace.conf - fbtrace.conf
- replication.conf - replication.conf
- firebird.log - firebird.log
- security4.fdb - security5.fdb
This is intentional. These files are all This is intentional. These files are all
potentially modifiable by users and may be required potentially modifiable by users and may be required

2
builds/install/arch-specific/win32/installation_scripted.txt
View File

@ -147,7 +147,7 @@ Parameters specific to Firebird uninstalls
firebird.conf firebird.conf
databases.conf databases.conf
firebird.log firebird.log
security3.fdb security5.fdb
fbtrace.conf fbtrace.conf
replication.conf replication.conf

6
builds/install/arch-specific/win32/ru/installation_readme.txt
View File

@ -36,7 +36,7 @@ o Установка из пакетного (bat) файла
каталога <system32>. каталога <system32>.
Если у вас установлена Альфа или Бета версия Firebird $MAJOR.$MINOR, Если у вас установлена Альфа или Бета версия Firebird $MAJOR.$MINOR,
то программа установки переименует файлы firebird.conf и security4.fdb то программа установки переименует файлы firebird.conf и security5.fdb
из-за их несовместимости с устанавливаемой версией. из-за их несовместимости с устанавливаемой версией.
@ -67,7 +67,7 @@ MS VC runtime версии 10.0 установлены в системе.
Программа установки пытается обнаружить и сохранить ранее установленную Программа установки пытается обнаружить и сохранить ранее установленную
версию Firebird. Если программа установки обнаруживает файлы firebird.conf версию Firebird. Если программа установки обнаруживает файлы firebird.conf
или security4.fdb, то некоторые настройки авторизации могут быть недоступны, или security5.fdb, то некоторые настройки авторизации могут быть недоступны,
в частности возможность установить пароль пользователя SYSDBA. в частности возможность установить пароль пользователя SYSDBA.
@ -124,7 +124,7 @@ o Деинсталлятор оставляет следующие файлы в
- fbtrace.conf - fbtrace.conf
- replication.conf - replication.conf
- firebird.log - firebird.log
- security4.fdb - security5.fdb
Это происходит намеренно. Эти файлы потенциально Это происходит намеренно. Эти файлы потенциально
могут быть изменены пользователем и могут могут быть изменены пользователем и могут

2
builds/install/misc/databases.conf
View File

@ -24,7 +24,7 @@ employee = $(dir_sampleDb)/employee.fdb
# Master security database specific setup. # Master security database specific setup.
# Do not remove it until you understand well what are you doing! # Do not remove it until you understand well what are you doing!
# #
security.db = $(dir_secDb)/security4.fdb security.db = $(dir_secDb)/security5.fdb
{ {
RemoteAccess = false RemoteAccess = false
DefaultDbCachePages = 256 DefaultDbCachePages = 256

2
builds/install/misc/firebird.conf
View File

@ -1030,7 +1030,7 @@
# #
# Type: string (pathname) # Type: string (pathname)
# #
#SecurityDatabase = $(dir_secDb)/security4.fdb #SecurityDatabase = $(dir_secDb)/security5.fdb
# ============================== # ==============================

2
builds/install/posix-common/posixLibrary.sh.in
View File

@ -85,7 +85,7 @@ OrigPasswd=""
TmpFile="" TmpFile=""
MANIFEST_TXT="" MANIFEST_TXT=""
Manifest=manifest.txt Manifest=manifest.txt
SecurityDatabase=security4.fdb SecurityDatabase=security5.fdb
DefaultLibrary=libfbclient DefaultLibrary=libfbclient
UninstallScript=FirebirdUninstall.sh UninstallScript=FirebirdUninstall.sh
XINETD=/etc/xinetd.d/ XINETD=/etc/xinetd.d/

2
builds/posix/Makefile.in
View File

@ -413,7 +413,7 @@ $(GPRE): $(GPRE_Objects) $(COMMON_LIB)
$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..) $(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
HELP_FDB = $(FIREBIRD)/help/help.fdb HELP_FDB = $(FIREBIRD)/help/help.fdb
SECURITY_FDB = $(FIREBIRD)/security4.fdb SECURITY_FDB = $(FIREBIRD)/security5.fdb
SECURITY_TMP = security.tmp SECURITY_TMP = security.tmp
databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB) databases: yachts.lnk msg.timestamp $(HELP_FDB) $(SECURITY_FDB)

2
builds/posix/make.defaults
View File

@ -397,7 +397,7 @@ FBMGR_BIN = $(BIN)/fbmgr.bin$(EXEC_EXT)
INSTREG = $(BIN)/instreg$(EXEC_EXT) INSTREG = $(BIN)/instreg$(EXEC_EXT)
INSTSVC = $(BIN)/instsvc$(EXEC_EXT) INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
SECURITY_FDB = $(FIREBIRD)/security4.fdb SECURITY_FDB = $(FIREBIRD)/security5.fdb
# From qli # From qli
QLI = $(BIN)/qli$(EXEC_EXT) QLI = $(BIN)/qli$(EXEC_EXT)

4
builds/posix/postfix.darwin
View File

@ -21,7 +21,7 @@
TARGET ?= Release TARGET ?= Release
ICU_VERS = icu54 ICU_VERS = icu54
ICU_LOC ?= $(HOME)/$(ICU_VERS)/icu/source/lib/ ICU_LOC ?= $(HOME)/$(ICU_VERS)/icu/source/lib/
FB_FW = ../gen/$(TARGET)/frameworks/Firebird4.framework FB_FW = ../gen/$(TARGET)/frameworks/Firebird5.framework
all: framework all: framework
@ -53,7 +53,7 @@ framework:
cp ../gen/$(TARGET)/firebird/intl/fbintl.conf $(FB_FW)/Versions/A/Resources/intl/fbintl.conf cp ../gen/$(TARGET)/firebird/intl/fbintl.conf $(FB_FW)/Versions/A/Resources/intl/fbintl.conf
#chmod a+rx $(FB_FW)/Versions/A/Resources/intl/fbintl #chmod a+rx $(FB_FW)/Versions/A/Resources/intl/fbintl
cp -r ../gen/$(TARGET)/firebird/plugins $(FB_FW)/Versions/A/Resources/plugins cp -r ../gen/$(TARGET)/firebird/plugins $(FB_FW)/Versions/A/Resources/plugins
cp ../gen/$(TARGET)/firebird/security4.fdb $(FB_FW)/Versions/A/Resources/security4.fdb cp ../gen/$(TARGET)/firebird/security5.fdb $(FB_FW)/Versions/A/Resources/security5.fdb
cp ../gen/$(TARGET)/firebird/firebird.msg $(FB_FW)/Versions/A/Resources/firebird.msg cp ../gen/$(TARGET)/firebird/firebird.msg $(FB_FW)/Versions/A/Resources/firebird.msg
cp -r ../gen/$(TARGET)/firebird/help $(FB_FW)/Versions/A/Resources/help cp -r ../gen/$(TARGET)/firebird/help $(FB_FW)/Versions/A/Resources/help
cp -r ../gen/$(TARGET)/firebird/tzdata $(FB_FW)/Versions/A/Resources/tzdata cp -r ../gen/$(TARGET)/firebird/tzdata $(FB_FW)/Versions/A/Resources/tzdata

2
builds/win32/make_all.bat
View File

@ -78,7 +78,7 @@ for %%v in (gpre_boot build_msg codes) do (
@copy %FB_ROOT_PATH%\builds\install\misc\IDPLicense.txt %FB_OUTPUT_DIR% >nul @copy %FB_ROOT_PATH%\builds\install\misc\IDPLicense.txt %FB_OUTPUT_DIR% >nul
:: DATABASES :: DATABASES
@copy %FB_GEN_DIR%\dbs\security4.FDB %FB_OUTPUT_DIR%\security4.fdb >nul @copy %FB_GEN_DIR%\dbs\security5.FDB %FB_OUTPUT_DIR%\security5.fdb >nul
@copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul @copy %FB_GEN_DIR%\dbs\HELP.fdb %FB_OUTPUT_DIR%\help\help.fdb >nul
:: DOCS :: DOCS

8
builds/win32/make_boot.bat
View File

@ -306,11 +306,11 @@ goto :EOF
@rmdir /s /q %FB_GEN_DIR%\dbs 2>nul @rmdir /s /q %FB_GEN_DIR%\dbs 2>nul
@mkdir %FB_GEN_DIR%\dbs 2>nul @mkdir %FB_GEN_DIR%\dbs 2>nul
@echo Create security4.fdb... @echo Create security5.fdb...
@echo create database '%FB_GEN_DB_DIR%\dbs\security4.fdb'; | "%FB_BIN_DIR%\isql" -q @echo create database '%FB_GEN_DB_DIR%\dbs\security5.fdb'; | "%FB_BIN_DIR%\isql" -q
@echo Apply security.sql... @echo Apply security.sql...
@"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security4.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql @"%FB_BIN_DIR%\isql" -q %FB_GEN_DB_DIR%/dbs/security5.fdb -i %FB_ROOT_PATH%\src\dbs\security.sql
@copy %FB_GEN_DIR%\dbs\security4.fdb %FB_GEN_DIR%\dbs\security.fdb > nul @copy %FB_GEN_DIR%\dbs\security5.fdb %FB_GEN_DIR%\dbs\security.fdb > nul
@echo Restore metadata.gbak... @echo Restore metadata.gbak...
@%FB_BIN_DIR%\gbak -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_GEN_DB_DIR%/dbs/metadata.fdb @%FB_BIN_DIR%\gbak -r %FB_ROOT_PATH%\builds\misc\metadata.gbak %FB_GEN_DB_DIR%/dbs/metadata.fdb

2
configure.ac
View File

@ -1419,7 +1419,7 @@ AC_OUTPUT
dnl Print out the build configuration (the most interesting thing) dnl Print out the build configuration (the most interesting thing)
echo echo
echo echo
echo The Firebird4 package has been configured with the following options: echo The Firebird5 package has been configured with the following options:
echo echo
case $DEVEL_FLG in case $DEVEL_FLG in

2
doc/README.security_database.txt
View File

@ -1,6 +1,6 @@
Initializing the Security Database Initializing the Security Database
---------------------------------- ----------------------------------
The security database (security4.fdb) has no predefined users. This is intentional. The security database (security5.fdb) has no predefined users. This is intentional.
Having user with well known predefined password and full access rights is serious security risk. Having user with well known predefined password and full access rights is serious security risk.
Firebird starting with version 3.0 does not require presence of SYSDBA user. One can use another name Firebird starting with version 3.0 does not require presence of SYSDBA user. One can use another name

2
src/CMakeLists.txt
View File

@ -906,7 +906,7 @@ add_subdirectory("utilities")
add_custom_target(copy_files add_custom_target(copy_files
#ALL # uncomment this to copy files every build #ALL # uncomment this to copy files every build
# databases # databases
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security4.fdb COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/security.fdb ${output_dir}/security5.fdb
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb COMMAND ${CMAKE_COMMAND} -E copy_if_different ${GENERATED_DIR}/help.fdb ${output_dir}/help/help.fdb
# configs, text files # configs, text files
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf ${output_dir}/firebird.conf COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/builds/install/misc/firebird.conf ${output_dir}/firebird.conf

2
src/common/file_params.h
View File

@ -81,6 +81,8 @@ static const char MSG_FILE_LANG[] = "intl/%.10s.msg";
static const char* const LOCKDIR = "firebird"; // created in WORKFILE static const char* const LOCKDIR = "firebird"; // created in WORKFILE
static const char* const LOGFILE = FB_LOGFILENAME; static const char* const LOGFILE = FB_LOGFILENAME;
static const char* const MSG_FILE = "firebird.msg"; static const char* const MSG_FILE = "firebird.msg";
static const char* const SECURITY_DB = "security5.fdb";
// Keep in sync with MSG_FILE_LANG // Keep in sync with MSG_FILE_LANG
const int LOCALE_MAX = 10; const int LOCALE_MAX = 10;

3
src/yvalve/PluginManager.cpp
View File

@ -42,6 +42,7 @@
#include "../common/classes/GenericMap.h" #include "../common/classes/GenericMap.h"
#include "../common/db_alias.h" #include "../common/db_alias.h"
#include "../common/dllinst.h" #include "../common/dllinst.h"
#include "../common/file_params.h"
#include "../yvalve/config/os/config_root.h" #include "../yvalve/config/os/config_root.h"
@ -1182,7 +1183,7 @@ public:
cache[i] = fb_utils::getPrefix(i, ""); cache[i] = fb_utils::getPrefix(i, "");
} }
db = fb_utils::getPrefix(IConfigManager::DIR_SECDB, "security4.fdb"); db = fb_utils::getPrefix(IConfigManager::DIR_SECDB, SECURITY_DB);
} }
const char* getDir(unsigned code) const char* getDir(unsigned code)