Renamed the package and the security database to v5

autogen.sh

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

builds/install/arch-specific/android/AfterUntar.sh

@@ -20,7 +20,7 @@ runAndCheckExit() {
 
 runAndCheckExit "Restore messages database" "bin/gbak -rep msg.gbak msg.fdb"
 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"
 
-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

builds/install/arch-specific/darwin/Makefile.in

@@ -31,15 +31,15 @@ package_firebird:
 			-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
 			-e 's/_REV_NO_/$(FB_REV_NO)/g' \
 			../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' \
 			-e 's/_SMFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_SM)/g' \
 			-e 's/_MFB_BUILD_SUFFIX_/$(FB_VER_SUFFIX_M)/g' \
 			-e 's/_MAJOR_VERS_/$(FB_MAJOR_VERS)/g' \
 			-e 's/_MINOR_VERS_/$(FB_MINOR_VERS)/g' \
 			-e 's/_REV_NO_/$(FB_REV_NO)/g' \
 			../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
 	mkdir $(ROOT)/gen/$(TARGET)/scripts
@@ -63,7 +63,7 @@ package_firebird:
 
 	rm -fr $(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 \
 			--install-location /Library/Frameworks/Firebird.framework \
 			--scripts $(ROOT)/gen/$(TARGET)/scripts \

builds/install/arch-specific/darwin/install-script

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

builds/install/arch-specific/darwin/preupgrade-script

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

builds/install/arch-specific/linux/makeInstallImage.sh.in

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

builds/install/arch-specific/win32/FirebirdInstall.iss

@@ -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}\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}\security4.fdb; DestDir: {app}; Destname: security4.fdb.empty; Components: ServerComponent;
-Source: {#FilesDir}\security4.fdb; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall onlyifdoesntexist
+Source: {#FilesDir}\security5.fdb; DestDir: {app}; Destname: security5.fdb.empty; Components: ServerComponent;
+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.log; DestDir: {app}; Components: ServerComponent; Flags: uninsneveruninstall skipifsourcedoesntexist external dontcopy
 
@@ -1014,7 +1014,7 @@ begin
       IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\firebird.log', false);
       IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\databases.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);
 
 			InitSecurityDB;
@@ -1140,8 +1140,8 @@ begin
           aStringList.add(appPath+'\firebird.log');
           aStringList.add(appPath+'\databases.conf');
           aStringList.add(appPath+'\fbtrace.conf');
-          aStringList.add(appPath+'\security4.fdb');
-          aStringList.add(appPath+'\security4.fdb.old');
+          aStringList.add(appPath+'\security5.fdb');
+          aStringList.add(appPath+'\security5.fdb.old');
           aStringList.add(appPath+'\replication.conf');
 
           for count := 0 to aStringList.count - 1 do begin

builds/install/arch-specific/win32/FirebirdInstallEnvironmentChecks.inc

@@ -795,7 +795,7 @@ else
 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}')+'security4.fdb';
+SharedFileArray[30].Filename := ExpandConstant('{app}')+'security5.fdb';
 SharedFileArray[31].Filename := ExpandConstant('{app}')+'fbtrace.conf';
 SharedFileArray[32].Filename := ExpandConstant('{app}')+'fbsvcmgr.exe';
 SharedFileArray[33].Filename := ExpandConstant('{app}')+'fbrmclib.dll';
@@ -1173,15 +1173,15 @@ begin
     LoadStringFromFile( GetAppPath+'\firebird.conf', FirebirdConfStr );
     if  pos('SharedDatabase', FirebirdConfStr) > 0 then begin
       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;
 }
 
 function ConfigureAuthentication: boolean;
 begin
-  if FileExists(WizardDirValue + '\security4.fdb') then
+  if FileExists(WizardDirValue + '\security5.fdb') then
 		Result := false
 	else
 		Result := true;

builds/install/arch-specific/win32/ba/Instalacija_ProcitajMe.txt

@@ -38,7 +38,7 @@ Pogledajte UNINSTALL sekciju ispod za vise informacija o ovome.
 
 Ako ste instalirali beta ili alpha verziju 
 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
@@ -69,7 +69,7 @@ Re-instalacija Firebird-a
 
 Instalacioni program radi sve sto moze da detektuje i 
 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 postavi SYSDBA username i password.
 
@@ -128,7 +128,7 @@ o Deinstalacija ostavlja 6 datoteka u install
   - fbtrace.conf
   - replication.conf
   - firebird.log
-  - security4.fdb
+  - security5.fdb
 
   Ovo je uradjeno namjerno. Ove datoteke su sve
   potencijalno modifikovane od strane korisnika i mogu

builds/install/arch-specific/win32/cz/instalace_ctime.txt

@@ -38,7 +38,7 @@ viz část ODINSTALACE níže.
 
 Máte-li nainstalovanou beta či alpha verzi
 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
@@ -63,7 +63,7 @@ Reinstalace of Firebird $MAJOR.$MINOR
 ---------------------------
 
 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
 volbu pro nastavení hesla pro SYSDBA.
 
@@ -123,7 +123,7 @@ o Odinstalace v instalační složce zanechá
   - fbtrace.conf
   - replication.conf
   - firebird.log
-  - security3.fdb
+  - security5.fdb
 
   To je záměr. Všechny tyto soubory jsou
   potencionálně pozměnitelné uživatelem a

builds/install/arch-specific/win32/fr/installation_lisezmoi.txt

@@ -44,7 +44,7 @@ Il est particulièrement important de vérifier que
 fbclient.dll et gds32.dll ont été retirés de <system32>.
 
 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.
 
 
@@ -132,7 +132,7 @@ o La désinstallation laisse six fichiers dans le
   - fbtrace.conf
   - replication.conf
   - firebird.log
-  - security4.fdb
+  - security5.fdb
 
   Ceci est intentionnel. Ces fichiers sont tous
   potentiellement modifiables par les utilisateurs et peuvent

builds/install/arch-specific/win32/installation_readme.txt

@@ -52,7 +52,7 @@ Re-installation of Firebird
 
 The binary installer does its best to detect and
 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.
 
 
@@ -112,7 +112,7 @@ o Uninstallation leaves six files in the install
   - fbtrace.conf
   - replication.conf
   - firebird.log
-  - security4.fdb
+  - security5.fdb
 
   This is intentional. These files are all
   potentially modifiable by users and may be required

builds/install/arch-specific/win32/installation_scripted.txt

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

builds/install/arch-specific/win32/ru/installation_readme.txt

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

builds/install/misc/databases.conf

@@ -24,7 +24,7 @@ employee = $(dir_sampleDb)/employee.fdb
 # Master security database specific setup.
 # 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
 	DefaultDbCachePages = 256

builds/install/misc/firebird.conf

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

builds/install/posix-common/posixLibrary.sh.in

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

builds/posix/Makefile.in

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

builds/posix/make.defaults

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

builds/posix/postfix.darwin

@@ -21,7 +21,7 @@
 TARGET ?= Release
 ICU_VERS = icu54
 ICU_LOC ?= $(HOME)/$(ICU_VERS)/icu/source/lib/
-FB_FW = ../gen/$(TARGET)/frameworks/Firebird4.framework
+FB_FW = ../gen/$(TARGET)/frameworks/Firebird5.framework
 
 all: framework
 
@@ -53,7 +53,7 @@ framework:
 	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
 	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 -r ../gen/$(TARGET)/firebird/help $(FB_FW)/Versions/A/Resources/help
 	cp -r ../gen/$(TARGET)/firebird/tzdata $(FB_FW)/Versions/A/Resources/tzdata

builds/win32/make_all.bat

@@ -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
 
 :: 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
 
 :: DOCS

builds/win32/make_boot.bat

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

configure.ac

@@ -1419,7 +1419,7 @@ AC_OUTPUT
 dnl Print out the build configuration (the most interesting thing)
 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
 
 case $DEVEL_FLG in