Merge ~danilogondolfo/ubuntu/+source/firebird3.0:mantic_merge_1 into ubuntu/+source/firebird3.0:ubuntu/devel

[Danilo Egea Gondolfo]

Unmerged commits

c648f1d... by Danilo Egea Gondolfo on 2023-07-04

changelog

ba77bdd... by Danilo Egea Gondolfo on 2023-07-04

Merge branch 'ubuntu/devel' into mantic_merge_1

bfc434c... by Damyan Ivanov on 2022-10-24

3.0.11.33637.ds4-2 (patches unapplied)

Imported using git-ubuntu import.

9bcb942... by Damyan Ivanov on 2022-10-23

3.0.11.33637.ds4-1 (patches unapplied)

Imported using git-ubuntu import.

e681bf4... by Damyan Ivanov on 2022-06-09

3.0.10.33601.ds4-1 (patches unapplied)

Imported using git-ubuntu import.

35b5a24... by Damyan Ivanov on 2022-05-12

3.0.9.33560.ds4-3 (patches unapplied)

Imported using git-ubuntu import.

def9fad... by Damyan Ivanov on 2022-04-15

3.0.9.33560.ds4-2 (patches unapplied)

Imported using git-ubuntu import.

e09a3d4... by Damyan Ivanov on 2022-02-14

3.0.9.33560.ds4-1 (patches unapplied)

Imported using git-ubuntu import.

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index ef72bb9..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,78 +0,0 @@
-matrix:
-  include:
-  # - os: osx
-  #   osx_image: xcode9.2    # macOS 10.12 Sierra
-  # - os: osx
-  #   osx_image: xcode11.2   # macOS 10.14 Mojave
-  - os: linux
-
-language: cpp
-
-notifications:
-  email: false
-
-sudo: required
-dist: trusty
-
-install:
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      sudo apt-get update
-      sudo apt-get install -y libtommath0 libtommath-dev
-    fi
-
-script:
-  - |
-    if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-      ./autogen.sh --enable-binreloc --prefix=/opt/firebird
-      make -j4
-      make dist
-      tar xzvf gen/Firebird-[0-9]*.tar.gz
-      (cd Firebird-[0-9]*; sudo ./install.sh -silent)
-    fi
-
-    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      export LIBTOOLIZE=glibtoolize
-      export LIBTOOL=glibtool
-
-      mkdir extern/icu-macos
-      pushd extern/icu-macos
-      curl -OL https://github.com/unicode-org/icu/releases/download/release-59-2/icu4c-59_2-src.tgz
-      curl -OL https://github.com/unicode-org/icu/commit/24aeb9a5a5874f4ce5db912e30670ac3ae236971.patch
-      tar xzf icu4c-59_2-src.tgz
-      ICU_INSTALL_PATH=`pwd`/install
-      cd icu/source
-      patch -p3 < ../../24aeb9a5a5874f4ce5db912e30670ac3ae236971.patch
-      ./runConfigureICU MacOSX --prefix=$ICU_INSTALL_PATH
-      make -j4
-      make install
-      install_name_tool -id @rpath/lib/libicuuc.dylib $ICU_INSTALL_PATH/lib/libicuuc.dylib
-      install_name_tool -id @rpath/lib/libicui18n.dylib $ICU_INSTALL_PATH/lib/libicui18n.dylib
-      install_name_tool -id @rpath/lib/libicudata.dylib $ICU_INSTALL_PATH/lib/libicudata.dylib
-      install_name_tool -change libicudata.59.dylib @loader_path/libicudata.59.dylib $ICU_INSTALL_PATH/lib/libicuuc.59.dylib
-      install_name_tool -change libicudata.59.dylib @loader_path/libicudata.59.dylib $ICU_INSTALL_PATH/lib/libicui18n.59.dylib
-      install_name_tool -change libicuuc.59.dylib @loader_path/libicuuc.59.dylib $ICU_INSTALL_PATH/lib/libicui18n.59.dylib
-      popd
-      mkdir -p gen/Release/firebird/lib
-      mkdir -p gen/Debug/firebird/lib
-      cp $ICU_INSTALL_PATH/lib/*.dylib gen/Release/firebird/lib/
-      cp $ICU_INSTALL_PATH/lib/*.dylib gen/Debug/firebird/lib/
-
-      export C_INCLUDE_PATH="$ICU_INSTALL_PATH/include:$C_INCLUDE_PATH"
-      export CPLUS_INCLUDE_PATH="$ICU_INSTALL_PATH/include:$CPLUS_INCLUDE_PATH"
-
-      LIBRARY_PATH="$ICU_INSTALL_PATH/lib:$LIBRARY_PATH" ./autogen.sh --with-builtin-tommath
-      make -j4
-
-      (cd gen; make -B -f make.platform.postfix ICU_LOC="$ICU_INSTALL_PATH/lib/")
-      (cd gen; make -B -f Makefile.install)
-
-      # Rename directory to make sure the build is relocatable.
-      mv gen gen2
-      sudo installer -pkg gen2/Release/*.pkg -verbose -target /
-
-      export FIREBIRD_LOCK=`pwd`/temp
-      echo "create database 't.fdb'; select '1' from rdb\$database; select _win1252 '2' from rdb\$database; select _utf8 '3' collate unicode from rdb\$database;" | /Library/Frameworks/Firebird.framework/Resources/bin/isql
-
-      echo "create database 'localhost:/tmp/t.fdb' user sysdba password 'masterkey'; select '11' from rdb\$database; select _win1252 '22' from rdb\$database; select _utf8 '33' collate unicode from rdb\$database;" | /Library/Frameworks/Firebird.framework/Resources/bin/isql
-    fi
diff --git a/README.md b/README.md
index 1c8a5e0..4759d06 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-[![Build Status](https://api.travis-ci.com/FirebirdSQL/firebird.svg?branch=B3_0_Release)](https://travis-ci.com/FirebirdSQL/firebird)
-[![Build Status](https://ci.appveyor.com/api/projects/status/github/FirebirdSQL/firebird?branch=B3_0_Release&svg=true)](https://ci.appveyor.com/project/FirebirdSQL/firebird)
+[![Build Status (GitHub)](https://github.com/FirebirdSQL/firebird/actions/workflows/main.yml/badge.svg?branch=B3_0_Release)](https://github.com/FirebirdSQL/firebird/actions/workflows/main.yml?query=branch%3AB3_0_Release)
+[![Build Status (AppVeyor)](https://ci.appveyor.com/api/projects/status/github/FirebirdSQL/firebird?branch=B3_0_Release&svg=true)](https://ci.appveyor.com/project/FirebirdSQL/firebird)
 
 # Firebird README
 
diff --git a/builds/install/arch-specific/android/BuildPackage.sh b/builds/install/arch-specific/android/BuildPackage.sh
index beb8406..f7f5caa 100644
--- a/builds/install/arch-specific/android/BuildPackage.sh
+++ b/builds/install/arch-specific/android/BuildPackage.sh
@@ -1,10 +1,18 @@
+bits=${1}
+[ -z "$bits" ] && bits=32
+[ "$bits" = "32" ] && cross=arm-linux-androideabi
+[ "$bits" = "64" ] && cross=aarch64-linux-android
+[ -z "$cross" ] && echo "Invalid bits passed" && exit 1
+arm=""
+[ "$bits" = "64" ] && arm=64
+
 MakeVersion=gen/Make.Version
 Build=`grep ^BuildNum ${MakeVersion}|awk '{print $3;}'`
 Version=`grep ^FirebirdVersion ${MakeVersion}|awk '{print $3;}'`
-Release="Firebird-${Version}.${Build}-0.arm.tar.gz"
-Debug="Firebird-withDebugInfo-${Version}.${Build}-0.arm.tar.gz"
+Release="Firebird-${Version}.${Build}-0.arm${arm}.tar.gz"
+Debug="Firebird-withDebugInfo-${Version}.${Build}-0.arm${arm}.tar.gz"
 Stripped=strip
-aStrip=${NDK}/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip
+aStrip=${NDK}/toolchains/${cross}-4.9/prebuilt/linux-x86_64/bin/${cross}-strip
 fbRootDir=`pwd`
 
 cd gen/Release
diff --git a/builds/install/arch-specific/win32/BuildExecutableInstall.bat b/builds/install/arch-specific/win32/BuildExecutableInstall.bat
index b3437f0..1d86344 100644
--- a/builds/install/arch-specific/win32/BuildExecutableInstall.bat
+++ b/builds/install/arch-specific/win32/BuildExecutableInstall.bat
@@ -264,7 +264,7 @@ copy %FB_ROOT_PATH%\lang_helpers\ib_util.pas %FB_OUTPUT_DIR%\include > nul || (c
 @if errorlevel 0 (
 if "%PROCESSOR_ARCHITECTURE%"=="x86" (
   @echo   Generating fbclient_bor.lib
-  @implib %FB_OUTPUT_DIR%\lib\fbclient_bor.lib %FB_OUTPUT_DIR%\fbclient.dll > nul
+  @implib.exe %FB_OUTPUT_DIR%\lib\fbclient_bor.lib %FB_OUTPUT_DIR%\fbclient.dll > nul
 )
 )
 
@@ -302,7 +302,7 @@ for %%v in ( ib_udf.sql ib_udf2.sql ) do (
 for %%v in ( fbudf.sql fbudf.txt ) do (
   copy %FB_ROOT_PATH%\src\extlib\fbudf\%%v  %FB_OUTPUT_DIR%\UDF\%%v > nul
   @if %ERRORLEVEL% GEQ 1 (
-    call :ERROR Copying %FB_ROOT_PATH%\src\extlib\%%v failed with error %ERRORLEVEL%
+    call :ERROR Copying %FB_ROOT_PATH%\src\extlib\fbudf\%%v to %FB_OUTPUT_DIR%\UDF\%%v failed with error %ERRORLEVEL%
     goto :EOF
   )
 )
@@ -585,7 +585,7 @@ if "%FBBUILD_SHIP_PDB%" == "ship_pdb" (
     )
     set FBBUILD_ZIPFILE=%FBBUILD_INSTALL_IMAGES%\Firebird-%FBBUILD_FILE_ID%%FBBUILD_FILENAME_SUFFIX%.zip
 )
-
+@echo calling sevenzip - %SEVENZIP% %FBBUILD_ZIPFILE% %FBBUILD_ZIP_PACK_ROOT%\*.*
 @%SEVENZIP%\7z.exe a -r -tzip -mx9 %FBBUILD_ZIPFILE% %FBBUILD_ZIP_PACK_ROOT%\*.*
 @echo   End of ZIP_PACK
 @echo.
diff --git a/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc b/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc
index 7bfefac..c95696f 100644
--- a/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc
+++ b/builds/install/arch-specific/win32/FirebirdInstallSupportFunctions.inc
@@ -356,6 +356,20 @@ begin
 end;
 
 
+function FindInFile( Filename, StringToFind: String): Boolean;
+var
+  i: Integer;
+  AString: AnsiString;
+begin
+  Result := False;
+  LoadStringFromFile( Filename, Astring );
+  i := Length( Astring );
+  if i <> 0 then
+    i := Pos ( StringToFind, Astring );
+  if i <> 0 then Result := True;
+end;
+
+
 procedure DecodeVersion( VerStr: String; var VerInt: array of Integer );
 var
   i,p: Integer; s: string;
diff --git a/builds/install/arch-specific/win32/FirebirdInstall_30.iss b/builds/install/arch-specific/win32/FirebirdInstall_30.iss
index 6b38cd0..5a31401 100644
--- a/builds/install/arch-specific/win32/FirebirdInstall_30.iss
+++ b/builds/install/arch-specific/win32/FirebirdInstall_30.iss
@@ -191,7 +191,7 @@
 ;If we are still under development we can ignore some missing files.
 #if GetEnv("FBBUILD_PROD_STATUS") == "DEV"
 #define SkipFileIfDevStatus " skipifsourcedoesntexist "
-#else 
+#else
 #define SkipFileIfDevStatus " "
 #endif
 
@@ -351,7 +351,7 @@ Name: ru; MessagesFile: compiler:Languages\Russian.isl; InfoBeforeFile: {#GenDir
 #endif
 
 #ifdef iss_debug
-; *** Note - this comment section needs revision or deletion. 
+; *** Note - this comment section needs revision or deletion.
 ; It is only applicable to the ansi installer, which is no longer
 ; supported for Firebird 3
 ; By default, the languages available at runtime depend on the user's
@@ -435,7 +435,7 @@ Root: HKLM; Subkey: "SOFTWARE\FirebirdSQL"; ValueType: none; Flags: deletekey;
 
 [Icons]
 Name: {group}\Firebird Server; Filename: {app}\firebird.exe; Parameters: {code:StartAppParams}; Flags: runminimized; MinVersion: 4.0,4.0;  Check: InstallServerIcon; IconIndex: 0; Components: ServerComponent; Comment: Run Firebird Server (without guardian)
-Name: {group}\Firebird Guardian; Filename: {app}\fbguard.exe; Parameters: {code:StartAppParams}; Flags: runminimized; MinVersion: 4.0,4.0;  Check: InstallGuardianIcon; IconIndex: 1; Components: ServerComponent; Comment: Run Firebird Server (with guardian); 
+Name: {group}\Firebird Guardian; Filename: {app}\fbguard.exe; Parameters: {code:StartAppParams}; Flags: runminimized; MinVersion: 4.0,4.0;  Check: InstallGuardianIcon; IconIndex: 1; Components: ServerComponent; Comment: Run Firebird Server (with guardian);
 Name: {group}\Firebird ISQL Tool; Filename: {app}\isql.exe; Parameters: -z; WorkingDir: {app}; MinVersion: 4.0,4.0;  Comment: {cm:RunISQL}
 Name: {group}\Firebird {#FB_cur_ver} Release Notes; Filename: {app}\doc\Firebird_v{#FB_cur_ver}.ReleaseNotes.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {cm:ReleaseNotes}
 Name: {group}\Firebird {#GroupnameVer} Quick Start Guide; Filename: {app}\doc\Firebird-3-QuickStart.pdf; MinVersion: 4.0,4.0; Comment: {#MyAppName} {#FB_cur_ver}
@@ -688,7 +688,7 @@ begin
 //	or
 //    (pos('/?',Uppercase(CommandLine)) > 0) or		// InnoSetup displays its own help if these switches are passed.
 //    (pos('/H',Uppercase(CommandLine)) > 0) ) 		// Note also that our help scren only appears after the Choose Language dialogue :-(
-	then begin
+  then begin
     ShowHelpDlg;
     result := False;
     Exit;
@@ -835,7 +835,7 @@ begin
   if IsComponentSelected('ServerComponent') and ( IsTaskSelected('UseSuperServerTask\UseGuardianTask')
       or ( IsTaskSelected('UseSuperClassicTask\UseGuardianTask') ) ) then
     SvcParams := ServerType + SvcParams +  ' -guardian ';
-  
+
   InstanceName := ServiceName('We currently do not support or test for a different instance name');
 
   SvcParams := SvcParams + InstanceName;
@@ -858,29 +858,69 @@ begin
 end;
 
 
-
-
-function InitSecurityDB: Boolean;
+function InitSecurityDB( PluginName: String ) : Boolean;
 var
   AStringList: TStringList;
   TempDir: String;
-	ResultCode: Integer;
-	CmdStr: string;
+  ResultCode: Integer;
+  CmdStr: string;
+  InputStr: string;
+  OutputStr: string;
 begin
-	TempDir := ExpandConstant( '{tmp}' );
-	CmdStr := ExpandConstant( '{app}\isql.exe' );
-	AStringList := TStringList.create;
-	with AStringList do begin
-		Add( 'create user ' + GetAdminUserName + ' password ''' + GetAdminUserPassword + ''' using plugin Srp;' );
-    if IsTaskSelected('EnableLegacyClientAuth') then
-      if ( ( uppercase( GetAdminUserName ) <> 'SYSDBA' ) or ( GetAdminUserPassword <> 'masterkey' ) ) then
-        Add( 'create or alter user ' + GetAdminUserName + ' password ''' + GetAdminUserPassword + ''' using plugin Legacy_UserManager;' );
-		Add( 'commit;' );  //Technically exit implies a commit so this not necessary. OTOH, explicitly committing makes for more readable code.
-		Add( 'exit;' );
-		SaveToFile( Tempdir +'\temp.sql' );
-	end;
-	Result := Exec( CmdStr , ' -m -m2 -user SYSDBA -i ' + TempDir + '\temp.sql -o ' + TempDir + '\temp.sql.txt employee ' , TempDir, SW_HIDE, ewWaitUntilTerminated, ResultCode );
-	DeleteFile( TempDir + +'\temp.sql ');
+
+  if PluginName = '' then
+    PluginName := 'Srp';
+
+  TempDir := ExpandConstant( '{tmp}' );
+  CmdStr := ExpandConstant( '{app}\isql.exe' );
+  InputStr := TempDir + '\' + PluginName + '_temp.sql';
+  OutputStr := InputStr + '.txt';
+
+  // Do we need to do this?
+  if FileExists( InputStr ) then DeleteFile( InputStr );
+  if FileExists( OutputStr ) then DeleteFile( OutputStr );
+
+  AStringList := TStringList.create;
+  with AStringList do begin
+    Add( 'create or alter user ' + GetAdminUserName + ' password ''' + GetAdminUserPassword + ''' using plugin ' + PluginName + ';' );
+    Add( 'exit;' );
+    SaveToFile( InputStr );
+  end;
+
+
+  Result := Exec( CmdStr , ' -m -m2 -user SYSDBA -i ' + InputStr + ' -o ' + OutputStr + ' employee ' , TempDir, SW_HIDE, ewWaitUntilTerminated, ResultCode );
+
+// DOC NOTE - we are not actually handling a non-zero result code.
+// This is a complicated subject as the installer can be run either scripted
+// or as a GUI. This needs more research. If InitSecurityDB fails do we fail 
+// the entire install? Allow user to complete and fix manually? Or give both options?
+  if ResultCode <> 0 then begin
+    Result := False;
+    Log( 'In function InitSecurityDB Exec isql returned ' + IntToStr(ResultCode) + ' executing ' + InputStr  );
+  end;
+  if FindInFile( OutputStr, 'error' ) then begin
+    Result := False;
+    Log( 'In function InitSecurityDB FindInFile found an error in ' + OutputStr );
+  end;
+
+end;
+
+
+function ConfigLegacyClientAuth: Boolean;
+begin
+
+// This order of plugin evaluation favours Legacy_Auth as the preferred plugin
+  ReplaceLine(GetAppPath+'\firebird.conf','AuthServer = ','AuthServer = Legacy_Auth, Srp, Win_Sspi','#');
+  ReplaceLine(GetAppPath+'\firebird.conf','AuthClient = ','AuthClient = Legacy_Auth, Srp, Srp256,  Win_Sspi','#');
+  ReplaceLine(GetAppPath+'\firebird.conf','UserManager = ','UserManager = Legacy_UserManager, Srp','#');
+  ReplaceLine(GetAppPath+'\firebird.conf','WireCrypt = ','WireCrypt = enabled','#');
+
+// This order of plugin evaluation favours the more secure defaults
+//  ReplaceLine(GetAppPath+'\firebird.conf','AuthServer = ','AuthServer = Srp, Win_Sspi, Legacy_Auth ','#');
+//  ReplaceLine(GetAppPath+'\firebird.conf','AuthClient = ','AuthClient = Srp, Srp256, Win_Sspi, Legacy_Auth','#');
+//  ReplaceLine(GetAppPath+'\firebird.conf','UserManager = ','UserManager = Srp, Legacy_UserManager','#');
+//  ReplaceLine(GetAppPath+'\firebird.conf','WireCrypt = ','WireCrypt = enabled','#');
+
 end;
 
 
@@ -897,8 +937,8 @@ end;
 function InstallServerIcon(): Boolean;
 begin
   result := false;
-  if IsTaskSelected('UseApplicationTask') and 
-    IsComponentSelected('ServerComponent') and 
+  if IsTaskSelected('UseApplicationTask') and
+    IsComponentSelected('ServerComponent') and
       not ( IsTaskSelected('UseSuperServerTask\UseGuardianTask') or
             IsTaskSelected('UseSuperClassicTask\UseGuardianTask') ) then
       result := true;
@@ -906,7 +946,7 @@ end;
 
 function StartApp(Default: String): String;
 begin
-  if IsComponentSelected('ServerComponent') and ( 
+  if IsComponentSelected('ServerComponent') and (
       IsTaskSelected('UseSuperServerTask\UseGuardianTask') or
       IsTaskSelected('UseSuperClassicTask\UseGuardianTask') ) then
     Result := GetAppPath+'\fbguard.exe'
@@ -945,8 +985,8 @@ end;
 
 
 procedure UpdateFirebirdConf;
-// Update firebird conf. 
-// If user has deselected the guardian we should update firebird.conf accordingly. 
+// Update firebird conf.
+// If user has deselected the guardian we should update firebird.conf accordingly.
 // We also test if user has asked for classic or super server
 // If EnableLegacyClientAuth has ben selected we update the file.......
 // Otherwise we leave the file unchanged.
@@ -956,34 +996,31 @@ begin
   //firebird.conf exists. If it doesn't then we don't care.
   if FileExists(GetAppPath+'\firebird.conf') then begin
 
-    if (IsComponentSelected('ServerComponent') ) then begin 
+    if (IsComponentSelected('ServerComponent') ) then begin
 
-// Setting GuardianOption to 0 makes no sense. If the user deploys the guardian 
-// there is an expectation that it will restart the server in the event of a crash. 
+// Setting GuardianOption to 0 makes no sense. If the user deploys the guardian
+// there is an expectation that it will restart the server in the event of a crash.
 // Otherwise, why start firebird with the guardian?
 //      if not ( IsTaskSelected('UseSuperServerTask\UseGuardianTask') or  IsTaskSelected('UseSuperClassicTask\UseGuardianTask') ) then
 //				ReplaceLine(GetAppPath+'\firebird.conf','GuardianOption','GuardianOption = 0','#');
 
-      // These attempts to modify firebird.conf may not survice repeated installs.  
+      // These attempts to modify firebird.conf may not survice repeated installs.
 
-			if IsTaskSelected('UseClassicServerTask') then
-				ReplaceLine(GetAppPath+'\firebird.conf','ServerMode = ','ServerMode = Classic','#');
+      if IsTaskSelected('UseClassicServerTask') then
+        ReplaceLine(GetAppPath+'\firebird.conf','ServerMode = ','ServerMode = Classic','#');
 
       if IsTaskSelected('UseSuperClassicTask') then
-				ReplaceLine(GetAppPath+'\firebird.conf','ServerMode = ','ServerMode = SuperClassic','#');
+        ReplaceLine(GetAppPath+'\firebird.conf','ServerMode = ','ServerMode = SuperClassic','#');
 
-			if IsTaskSelected('UseSuperServerTask')  then
-				ReplaceLine(GetAppPath+'\firebird.conf','ServerMode = ','ServerMode = Super','#');
+      if IsTaskSelected('UseSuperServerTask')  then
+        ReplaceLine(GetAppPath+'\firebird.conf','ServerMode = ','ServerMode = Super','#');
 
       if IsTaskSelected('EnableLegacyClientAuth') then begin
-				ReplaceLine(GetAppPath+'\firebird.conf','AuthServer = ','AuthServer = Legacy_Auth, Srp, Win_Sspi','#');
-				ReplaceLine(GetAppPath+'\firebird.conf','AuthClient = ','AuthClient = Legacy_Auth, Srp, Win_Sspi','#');
-				ReplaceLine(GetAppPath+'\firebird.conf','UserManager = ','UserManager = Legacy_UserManager, Srp','#');
-				ReplaceLine(GetAppPath+'\firebird.conf','WireCrypt = ','WireCrypt = enabled','#');
+        ConfigLegacyClientAuth;
       end;
 
-		end;	
-			
+    end;
+
   end;
 end;
 
@@ -1021,9 +1058,9 @@ end;
 
 procedure CurPageChanged(CurPage: Integer);
 // These are the predefined page IDs of the Wizard form as of InnoSetup 5.5.6
-// wpWelcome, wpLicense, wpPassword, wpInfoBefore, wpUserInfo, 
-// wpSelectDir, wpSelectComponents, wpSelectProgramGroup, wpSelectTasks, 
-// wpReady, wpPreparing, wpInstalling, wpInfoAfter, wpFinished 
+// wpWelcome, wpLicense, wpPassword, wpInfoBefore, wpUserInfo,
+// wpSelectDir, wpSelectComponents, wpSelectProgramGroup, wpSelectTasks,
+// wpReady, wpPreparing, wpInstalling, wpInfoAfter, wpFinished
 begin
   case CurPage of
     wpWelcome:      ResizeWizardForm(True); //There was a bug: every time when "go back" pressed the form was resized!
@@ -1034,12 +1071,12 @@ end;
 
 
 procedure CurStepChanged(CurStep: TSetupStep);
-// currently just three steps - ssInstall, ssPostInstall, ssDone 
+// currently just three steps - ssInstall, ssPostInstall, ssDone
 var
   AppStr: String;
   ReadMeFileStr: String;
 begin
-   case CurStep of
+  case CurStep of
     ssInstall: begin
       RenamePreFB3RC1Files;
       SetupSharedFilesArray;
@@ -1054,13 +1091,15 @@ begin
       IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\fbtrace.conf', false);
       IncrementSharedCount(Is64BitInstallMode, GetAppPath+'\security3.fdb', false);
 
-			InitSecurityDB;
+      InitSecurityDB('Srp');
 
       //Fix up conf file
       UpdateFirebirdConf;
       RemoveSavedConfIfNoDiff;
 
-				
+      if IsTaskSelected('EnableLegacyClientAuth') then
+        InitSecurityDB( 'Legacy_UserManager' );
+
       end;
 
     ssDone: begin
@@ -1099,7 +1138,7 @@ end;
 // # FIXME - we can probably remove this function
 function ChooseUninstallIcon(Default: String): String;
 begin
-	result := GetAppPath+'\firebird.exe';
+  result := GetAppPath+'\firebird.exe';
 end;
 
 //InnoSetup has a Check Parameter that allows installation if the function returns true.
@@ -1175,11 +1214,11 @@ begin
       // a) Decrement shared count of each one and
       // b) If Decrement reaches 0 (ie, function returns true) then we
             //    delete the file.
-            // c) We arbitrarily break after 100 loops. Typically the shared count should only be 
+            // c) We arbitrarily break after 100 loops. Typically the shared count should only be
             //    in single digits anyway but we don't want to risk the test entering an endless loop.
             i := 0;
-            while not DecrementSharedCount(Is64BitInstallMode, aStringList[ count ] ) 
-            do 
+            while not DecrementSharedCount(Is64BitInstallMode, aStringList[ count ] )
+            do
               if i = 100 then break else inc(i);
 
             res := DeleteFile( aStringList[ count ] );
@@ -1204,29 +1243,31 @@ begin
       Result := True
     else if not ConfigureAuthentication then
       Result := True
-    else 
+    else
       Result := False;
 end;
 
 
 function NextButtonClick(CurPageID: Integer): Boolean;
 var
-	i: integer;
+  i: integer;
 begin
   Result := True;
   case CurPageID of
     AdminUserPage.ID : begin
-	  { check user has entered new sysdba password correctly. }
+    { check user has entered new sysdba password correctly. }
       i := CompareStr(AdminUserPage.Values[0],AdminUserPage.Values[1]);
       If  not (i = 0) then begin
         Result := False;
         AdminUserPage.Values[0] :='';
         AdminUserPage.Values[1] :='';
         MsgBox(ExpandConstant('{cm:SYSDBAPasswordMismatch}'), mbError, MB_OK);
-	  end;
+    end;
     end;
   end;
 end;
-	
+
 begin
 end.
+
+; kate: replace-tabs on; indent-width 2; tab-width 2; replace-tabs-save on; syntax Pascal;
diff --git a/builds/install/arch-specific/win32/installation_scripted.txt b/builds/install/arch-specific/win32/installation_scripted.txt
index 15d159b..a155bfa 100644
--- a/builds/install/arch-specific/win32/installation_scripted.txt
+++ b/builds/install/arch-specific/win32/installation_scripted.txt
@@ -14,14 +14,14 @@ General notes on preparing a scripted install
 ---------------------------------------------
 
 These notes only document the firebird specific options for a scripted
-installation. Developers should refer to the full InnoSetup documentation 
-for a description of the other options available for a scripted install. 
+installation. Developers should refer to the full InnoSetup documentation
+for a description of the other options available for a scripted install.
 This can be found here:
   http://www.jrsoftware.org/ishelp/
 
-It is highly recommended that a scripted install is tested thoroughly 
-before deployment. The easiest way to test is to run the script without 
-the /SILENT parameter. This will present a standard installer with the 
+It is highly recommended that a scripted install is tested thoroughly
+before deployment. The easiest way to test is to run the script without
+the /SILENT parameter. This will present a standard installer with the
 scripted options preselected.
 
 NOTE that the /TASKS parameter clears all the default task settings. If
@@ -44,7 +44,7 @@ HELP
 Setup parameters specific to the Firebird Uninstaller
 /CLEAN
 
-For general parameters available to all InnoSetup based installers see the 
+For general parameters available to all InnoSetup based installers see the
 documentation for innosetup. A summary is available via /? or /HELP
 
 
@@ -53,10 +53,10 @@ Parameters specific to Firebird installs
 
 HELP
   Invoke this file as a help screen at installation time.
-  Note no / is prefixed !! Because /? and /HELP are now 
+  Note no / is prefixed !! Because /? and /HELP are now
   used by innosetup itself to dispaly innosetup specific help.
 
-  
+
 /COMPONENTS="comma separated list of component names"
 
   Choose from - ServerComponent,
@@ -70,28 +70,28 @@ HELP
   /COMPONENTS="ClientComponent"
 
   would be required for a client only install.
-  
-  NOTE - If a full server instal is required there is no need to 
+
+  NOTE - If a full server install is required there is no need to
   specify /COMPONENTS. All three are chosen by default.
-  
+
 
 /TASKS="comma separated list of task names"
 
   Specifies a list of tasks that should be initially selected or
   deselected. To deselect a task, prefix its name with a "!" character.
 
-  Choose from - UseSuperServerTask                      
+  Choose from - UseSuperServerTask
                 UseSuperServerTask\UseGuardianTask        (optional)
-              or 
-                UseSuperClassicTask                     
+              or
+                UseSuperClassicTask
                 UseSuperClassicTask\UseGuardianTask       (optional)
               or
                 UseClassicServerTask
-                
-                UseApplicationTask                        
-              or 
+
+                UseApplicationTask
+              or
                 UseServiceTask
-                
+
                 AutoStartTask
                 CopyFbClientToSysTask
                 CopyFbClientAsGds32Task
@@ -104,7 +104,7 @@ HELP
 
   By default the following tasks are run:
 
-    UseSuperServerTask,UseServiceTask,AutoStartTask,CopyFbClientToSysTask 
+    UseSuperServerTask,UseServiceTask,AutoStartTask,CopyFbClientToSysTask
 
 /MERGETASKS="comma separated list of task names"
 
@@ -119,8 +119,8 @@ HELP
 /SYSDBAPASSWORD="mypassword"
 
   If supplied this will override the default SYSDBA password "masterkey".
-  
-  NOTE: If an existing Security database is found this parameter will be 
+
+  NOTE: If an existing Security database is found this parameter will be
   ignored.
 
 
@@ -135,8 +135,8 @@ HELP
   users by breaking a perfectly good working install of Firebird or InterBase.
   Its your choice.
 
-  
-  
+
+
 Parameters specific to Firebird uninstalls
 ------------------------------------------
 
@@ -159,27 +159,27 @@ Parameters specific to Firebird uninstalls
 
 Examples
 --------
-These examples are just for firebird related options. In practice you 
-they will probably be combined with options such as /SILENT, /LOG, 
+These examples are just for firebird related options. In practice you
+they will probably be combined with options such as /SILENT, /LOG,
 /RESTARTEXITCODE etc.
 
 1/ Full server install of super server architecture
-  o Change SYSDBA password from default masterkey, 
+  o Change SYSDBA password from default masterkey,
   o deploy gds32 to <SYS>
   o enable legacy authentication for older clients
 
     /MERGETASKS="CopyFbClientAsGds32Task,EnableLegacyClientAuth" /SYSDBAPASSWORD="mypassword"
-    
+
 2/ Deploy Classic Server and keep other default tasks
 
-    /MERGETASKS="UseClassicServerTask" 
+    /MERGETASKS="UseClassicServerTask"
 
-3/ Really mess things up by accidentally deselecting the defaults and 
+3/ Really mess things up by accidentally deselecting the defaults and
 letting InnoSetup guess:
 
-    /TASKS="CopyFbClientAsGds32Task" 
+    /TASKS="CopyFbClientAsGds32Task"
 
 Be careful when using the /TASKS parameter !
 
- 
+
 
diff --git a/builds/install/misc/firebird.conf.in b/builds/install/misc/firebird.conf.in
index 807bc2d..3244959 100644
--- a/builds/install/misc/firebird.conf.in
+++ b/builds/install/misc/firebird.conf.in
@@ -720,9 +720,12 @@
 # Either enables or disables the "TCP Loopback Fast Path" feature (SIO_LOOPBACK_FAST_PATH).
 # Applies to Windows (version 8/2012 or higher) only.
 #
-# Type: Boolean, default 1 (true)
+# Note: Microsoft has deprecated it and not recommended to use anymore.
+# To be removed in future Firebird versions.
 #
-#TcpLoopbackFastPath = 1
+# Type: Boolean, default 0 (false)
+#
+#TcpLoopbackFastPath = 0
 
 #
 # Allows setting of IPV6_V6ONLY socket option. If enabled, IPv6 sockets
diff --git a/builds/posix/Makefile.in b/builds/posix/Makefile.in
index b6e90be..13e83cb 100644
--- a/builds/posix/Makefile.in
+++ b/builds/posix/Makefile.in
@@ -348,7 +348,7 @@ $(LIBFBINTL_SO):	$(INTL_Objects) $(COMMON_LIB)
 gpre: $(GPRE) databases
 
 $(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)
 
 HELP_FDB = $(FIREBIRD)/help/help.fdb
 SECURITY_FDB = $(FIREBIRD)/security3.fdb
@@ -374,7 +374,7 @@ $(HELP_FDB):	help.fdb
 	$(CHMOD) 0444 $@
 
 help.fdb:	$(BLD_ROOT)/misc/help.gbak
-	$(RUN_GBAK) -MODE read_only -R $< $@
+	$(RUN_GBAK) -MODE read_only -replace $< $@
 	$(CHMOD) 0444 $@
 
 $(SECURITY_FDB):	security.fdb
@@ -439,62 +439,62 @@ utilities: firebird_server fb_lock_print fbguard fbsvcmgr fbtracemgr gbak gfix g
 firebird_server:	$(FB_DAEMON)
 
 $(FB_DAEMON):	$(Remote_Server_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)
 
 fb_lock_print:	$(LOCKPRINT)
 
 $(LOCKPRINT):	$(LOCKPRINT_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)
 
 fbguard:		$(FBGUARD)
 
 $(FBGUARD):		$(FBGUARD_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)
 
 fbsvcmgr:		$(FBSVCMGR)
 
 $(FBSVCMGR):	$(FBSVCMGR_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)
 
 fbtracemgr:		$(FBTRACEMGR)
 
 $(FBTRACEMGR):	$(FBTRACEMGR_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)
 
 gbak:			$(GBAK)
 
 $(GBAK):		$(GBAK_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)
 
 gsplit:			$(GSPLIT)
 
 $(GSPLIT):		$(GSPLIT_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)
 
 gfix:			$(GFIX)
 
 $(GFIX):		$(GFIX_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)
 
 gsec:			$(GSEC)
 
 $(GSEC):		$(GSEC_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)
 
 gstat:			$(GSTAT)
 
 $(GSTAT):		$(GSTAT_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)
 
 isql:			$(ISQL)
 
 $(ISQL):		$(ISQL_Objects) $(COMMON_LIB)
-	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS) $(call LINK_DARWIN_RPATH,..)
+	$(EXE_LINK) $(EXE_LINK_OPTIONS) $^ -o $@ $(FIREBIRD_LIBRARY_LINK) $(LIBEDITLINE) $(LINK_LIBS)
 
 nbackup:		$(NBACKUP)
 
 $(NBACKUP):		$(NBACKUP_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)
 
 
 #___________________________________________________________________________
@@ -570,7 +570,7 @@ gen_codes:	$(CODES) msg.timestamp
 	$(CODES) $(SRC_ROOT)/include/gen $(LNG_ROOT)
 
 $(CODES):	$(CODES_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)
 
 $(IDS):		$(SRC_ROOT)/misc/ids.m $(SRC_ROOT)/jrd/relations.h
 	m4 $< > $@
@@ -594,7 +594,7 @@ cross_rest:	qli gbak_files
 qli:		$(QLI)
 
 $(QLI):		$(QLI_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)
 
 examples: include_generic
 	$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
@@ -607,7 +607,7 @@ $(FIREBIRD_MSG):	$(BUILD_FILE) msg.timestamp
 	$(CHMOD_6) $@
 
 $(BUILD_FILE):	$(BUILD_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)
 
 gbak_files: $(GBAK_FILES)
 
diff --git a/builds/posix/Makefile.in.examples b/builds/posix/Makefile.in.examples
index bf21355..cf6e2ce 100644
--- a/builds/posix/Makefile.in.examples
+++ b/builds/posix/Makefile.in.examples
@@ -60,6 +60,7 @@ export PATH
 GPRE_FLAGS=	-m -z -n
 
 LIB_LINK_RPATH = $(call LIB_PLATFORM_RPATH,$(if $(subst intl,,$(1)),$(LIB),$(LIB)/../intl))
+LINK_DARWIN_RPATH = -Wl,-rpath,@loader_path/../$(TARGET)/firebird
 LIB_LINK_MAPFILE =
 
 EXAMPLES_DEST=	$(GEN_ROOT)/examples
diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
index e24079e..5e4f598 100755
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@@ -315,7 +315,7 @@ LIB_LINK_SONAME= -Wl,-soname,$(1)
 LIB_LINK_MAPFILE= -Wl,--version-script,$(1)
 FIREBIRD_LIBRARY_LINK= -L$(LIB) -lfbclient $(MATHLIB)
 
-EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(LINK_EMPTY_SYMBOLS)
+EXE_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) $(UNDEF_FLAGS) $(LIB_PATH_OPTS) $(call LINK_DARWIN_RPATH,..) $(LINK_EMPTY_SYMBOLS)
 LIB_LINK_OPTIONS= $(LDFLAGS) $(THR_FLAGS) -shared
 
 FB_DAEMON = $(BIN)/firebird$(EXEC_EXT)
diff --git a/builds/posix/prefix.darwin_i386 b/builds/posix/prefix.darwin_i386
index b07d2fe..60d05cb 100644
--- a/builds/posix/prefix.darwin_i386
+++ b/builds/posix/prefix.darwin_i386
@@ -27,17 +27,14 @@
 # configure using --with-builtin-tommath
 # or add the relevant -I, -L for an installed version of libtommath
 
-DYLD_LIBRARY_PATH=$(HOME)/icu54/icu/source/lib
-export DYLD_LIBRARY_PATH
-
 MACOSX_DEPLOYMENT_TARGET=10.9
 export MACOSX_DEPLOYMENT_TARGET
 
 PROD_FLAGS=-DDARWIN -pipe -O2 -MMD -fPIC -fno-common -arch i386 -mmacosx-version-min=10.9
 DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-common -Wall -arch i386 -mmacosx-version-min=10.9 -Wno-non-virtual-dtor
-CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -msse4 
+CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -msse4
 
-EXE_LINK_OPTIONS:=-m32
+EXE_LINK_OPTIONS+=-m32
 LD_FLAGS+=-m32 -arch i386
 LINK_LIBS+=-liconv
 MATHLIB=$(ROOT)/extern/libtommath/.libs/libtommath.a
diff --git a/builds/posix/prefix.darwin_powerpc b/builds/posix/prefix.darwin_powerpc
index f8816c6..c56b5fe 100644
--- a/builds/posix/prefix.darwin_powerpc
+++ b/builds/posix/prefix.darwin_powerpc
@@ -17,9 +17,6 @@
 # Start of file prefix.darwin:	$(VERSION)	@PLATFORM@
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
 
-DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
-export DYLD_LIBRARY_PATH
-
 MACOSX_DEPLOYMENT_TARGET=10.2
 export MACOSX_DEPLOYMENT_TARGET
 
@@ -27,6 +24,4 @@ PROD_FLAGS=-DDARWIN -pipe -p -MMD -fPIC -fno-common -arch ppc -mmacosx-version-m
 DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -arch ppc -mmacosx-version-min=10.2 -Wno-non-virtual-dtor
 CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -fno-weak
 
-EXE_LINK_OPTIONS:=
-
 include $(ROOT)/gen/darwin.defaults
diff --git a/builds/posix/prefix.darwin_ppc64 b/builds/posix/prefix.darwin_ppc64
index 9fbc89d..a33ed45 100644
--- a/builds/posix/prefix.darwin_ppc64
+++ b/builds/posix/prefix.darwin_ppc64
@@ -18,7 +18,7 @@
 # 2 Oct 2002, Nickolay Samofatov - Major Cleanup
 
 # To use this file to build 64bit version of Firebird for MacOS 10.5 (Leopard)
-# Can only be built on MacOSX 10.5 (Leopard) due to lack of 64bit support in 
+# Can only be built on MacOSX 10.5 (Leopard) due to lack of 64bit support in
 # Carbon in previous versions of MacOSX
 # 1. edit configure.in so that MAKEFILE_PREFIX=darwin_ppc64
 # 2. uncomment the CPU_TYPE
@@ -29,9 +29,6 @@
 # 6. export LDFLAGS='-arch ppc_64'
 # 7. export MACOSX_DEPLOYMENT_TARGET=10.5
 
-DYLD_LIBRARY_PATH=$(FIREBIRD)/lib
-export DYLD_LIBRARY_PATH
-
 MACOSX_DEPLOYMENT_TARGET=10.5
 export MACOSX_DEPLOYMENT_TARGET
 
@@ -39,7 +36,7 @@ PROD_FLAGS=-O3 -DDARWIN -pipe -p -MMD -fPIC -fno-common -mmacosx-version-min=10.
 DEV_FLAGS=-ggdb -DDARWIN -pipe -p -MMD -fPIC -fno-common -Wall -mmacosx-version-min=10.5 -Wno-non-virtual-dtor
 CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden
 
-EXE_LINK_OPTIONS:=-arch ppc64 
+EXE_LINK_OPTIONS+=-arch ppc64
 LD_FLAGS+=-arch ppc64
 
 include $(ROOT)/gen/darwin.defaults
diff --git a/builds/posix/prefix.darwin_x86_64 b/builds/posix/prefix.darwin_x86_64
index cea366a..8fe5ea4 100644
--- a/builds/posix/prefix.darwin_x86_64
+++ b/builds/posix/prefix.darwin_x86_64
@@ -43,7 +43,6 @@ PROD_FLAGS=-DDARWIN -pipe -O2 -MMD -fPIC -fno-common -mmacosx-version-min=10.9
 DEV_FLAGS=-ggdb -DDARWIN -pipe -MMD -fPIC -fno-omit-frame-pointer -fno-common -Wall -fno-optimize-sibling-calls -mmacosx-version-min=10.9 -Wno-non-virtual-dtor
 CXXFLAGS:=$(CXXFLAGS) -fvisibility-inlines-hidden -fvisibility=hidden -stdlib=libc++ -msse4
 
-EXE_LINK_OPTIONS:=
 UNDEF_PLATFORM=
 
 LINK_LIBS+=-liconv
diff --git a/builds/win32/msvc10/empbuild.vcxproj b/builds/win32/msvc10/empbuild.vcxproj
index fe18fa4..4bf14d8 100644
--- a/builds/win32/msvc10/empbuild.vcxproj
+++ b/builds/win32/msvc10/empbuild.vcxproj
@@ -154,8 +154,9 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;fbclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\temp\$(Platform)\$(Configuration)\fbclient;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ProfileGuidedDatabase>
       </ProfileGuidedDatabase>
@@ -178,8 +179,9 @@
       <Culture>0x0c0a</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;fbclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\temp\$(Platform)\$(Configuration)\fbclient;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ProfileGuidedDatabase>
       </ProfileGuidedDatabase>
diff --git a/builds/win32/msvc12/empbuild.vcxproj b/builds/win32/msvc12/empbuild.vcxproj
index 893b48f..b52c463 100644
--- a/builds/win32/msvc12/empbuild.vcxproj
+++ b/builds/win32/msvc12/empbuild.vcxproj
@@ -158,8 +158,9 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;fbclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\temp\$(Platform)\$(Configuration)\fbclient;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ProfileGuidedDatabase>
       </ProfileGuidedDatabase>
@@ -182,8 +183,9 @@
       <Culture>0x0c0a</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;fbclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\temp\$(Platform)\$(Configuration)\fbclient;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ProfileGuidedDatabase>
       </ProfileGuidedDatabase>
diff --git a/builds/win32/msvc14/empbuild.vcxproj b/builds/win32/msvc14/empbuild.vcxproj
index 862a256..61630c9 100644
--- a/builds/win32/msvc14/empbuild.vcxproj
+++ b/builds/win32/msvc14/empbuild.vcxproj
@@ -158,8 +158,9 @@
     </ResourceCompile>
     <Link>
       <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;fbclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\temp\$(Platform)\$(Configuration)\fbclient;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ProfileGuidedDatabase>
       </ProfileGuidedDatabase>
@@ -182,8 +183,9 @@
       <Culture>0x0c0a</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>odbc32.lib;odbccp32.lib;fbclient.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\..\..\temp\$(Platform)\$(Configuration)\fbclient;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>
+      </AdditionalLibraryDirectories>
       <SubSystem>Console</SubSystem>
       <ProfileGuidedDatabase>
       </ProfileGuidedDatabase>
diff --git a/configure.ac b/configure.ac
index 180dd2d..93c3917 100644
--- a/configure.ac
+++ b/configure.ac
@@ -239,7 +239,7 @@ dnl CPU_TYPE=ppc64
     STD_EDITLINE=true
     ;;
 
-  aarch64*-*-linux*)                           
+  aarch64*-*-linux*)
     MAKEFILE_PREFIX=linux_arm64
     INSTALL_PREFIX=linux
     PLATFORM=LINUX
@@ -251,7 +251,7 @@ dnl CPU_TYPE=ppc64
     libdir=/usr/lib64
     ;;
 
-  powerpc64le-*-linux*)                           
+  powerpc64le-*-linux*)
     MAKEFILE_PREFIX=linux_powerpc64el
     INSTALL_PREFIX=linux
     PLATFORM=LINUX
@@ -263,7 +263,7 @@ dnl CPU_TYPE=ppc64
     libdir=/usr/lib64
     ;;
 
-  powerpc64-*-linux*)                           
+  powerpc64-*-linux*)
     MAKEFILE_PREFIX=linux_powerpc64
     INSTALL_PREFIX=linux
     PLATFORM=LINUX
@@ -840,7 +840,7 @@ AC_COMPILE_IFELSE(
 dnl check for va_copy() in stdarg.h
 AC_COMPILE_IFELSE(
 	[AC_LANG_PROGRAM([[#include <stdarg.h>
-		void vafun(const char* fmt, ...) {va_list par, par2; va_start(par, fmt); va_copy(par2, par); va_end(par2); va_end(par);}]], 
+		void vafun(const char* fmt, ...) {va_list par, par2; va_start(par, fmt); va_copy(par2, par); va_end(par2); va_end(par);}]],
 		[[return 0;]])],
 	AC_DEFINE(HAVE_VA_COPY, 1, [Define this if va_copy() is defined in stdarg.h]))
 
@@ -924,15 +924,8 @@ AC_COMPILE_IFELSE(
 	AC_DEFINE(HAVE_AO_COMPARE_AND_SWAP_FULL, 1, [Define this if AO_compare_and_swap_full() is defined in atomic_ops.h]))
 
 dnl Check for time function
-case $host in
-        *-darwin*)
-                ac_cv_func_clock_gettime=no
-                ;;
-        *)
-		AC_SEARCH_LIBS(clock_gettime, rt)
-                AC_CHECK_FUNCS(clock_gettime)
-                ;;
-esac
+AC_SEARCH_LIBS(clock_gettime, rt)
+AC_CHECK_FUNCS(clock_gettime)
 
 dnl Checks for pthread functions
 AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
@@ -959,7 +952,7 @@ AC_MSG_CHECKING(for working sem_init())
 AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
 	main () {
 		sem_t s;
-		exit(sem_init(&s,0,0));
+		return sem_init(&s,0,0);
 		}
 	]])],[AC_DEFINE(WORKING_SEM_INIT,1,[Define this if sem_init() works on the platform])
 AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
@@ -991,7 +984,7 @@ if test "$ac_cv_sys_file_offset_bits" = "no"; then
   AC_MSG_CHECKING(for native large file support)
   AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <unistd.h>
     main () {
-    exit(!(sizeof(off_t) == 8));
+    return !(sizeof(off_t) == 8);
   }]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
    AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
 fi
@@ -1033,7 +1026,7 @@ main () {
     char a;
     union { long long x; sem_t y; } b;
   };
-  exit((int)&((struct s*)0)->b);
+  return (int)&((struct s*)0)->b;
 }]])],[ac_cv_c_alignment=$ac_status],[ac_cv_c_alignment=$ac_status],[])
 AC_MSG_RESULT($ac_cv_c_alignment)
 AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_c_alignment, [Alignment of long])
@@ -1044,7 +1037,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
     char a;
     double b;
   };
-  exit((int)&((struct s*)0)->b);
+  return (int)&((struct s*)0)->b;
 }]])],[ac_cv_c_double_align=$ac_status],[ac_cv_c_double_align=$ac_status],[])
 AC_MSG_RESULT($ac_cv_c_double_align)
 AC_DEFINE_UNQUOTED(FB_DOUBLE_ALIGN, $ac_cv_c_double_align, [Alignment of double])
diff --git a/debian/changelog b/debian/changelog
index 0fe809d..3f1ab74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,69 @@
+firebird3.0 (3.0.11.33637.ds4-2ubuntu1) mantic; urgency=medium
+
+  * Merge with Debian unstable (LP: #2025754). Remaining changes:
+    - Switch architecture to i686 on Ubuntu instead of i486
+
+ -- Danilo Egea Gondolfo <[e-mail]>  Tue, 04 Jul 2023 11:46:03 +0100
+
+firebird3.0 (3.0.11.33637.ds4-2) unstable; urgency=medium
+
+  * fix arch-all-only build by overriding only dh_lintian-arch for libib-util
+    override mangling.
+    Thanks to Ondřej Surý (Closes: #1022579)
+
+ -- Damyan Ivanov <[e-mail]>  Mon, 24 Oct 2022 19:36:38 +0000
+
+firebird3.0 (3.0.11.33637.ds4-1) unstable; urgency=medium
+
+  * add gbp.conf for DEP-14 git repository layout
+  * switch debian/watch to releases published on firebirdsql.org
+    the ones on github aren't always accessible (JavaScript)
+  * pack-upstream-snapshot: use mk-origtargz for cleaning upstream sources
+    single source of truth about what needs to be removed
+  * add files to source repackaging exclusion list to match official releases
+    when using git snapshots
+  * New upstream snapshot 3.0.11.33637.ds4
+    Closes: #1021817 -- undistributable source files
+  * drop two files from d/copyright that are not present in the source
+  * adapt lintian overrides to version 2.115.3
+  * bump Standards-Version from 4.6.0 to 4.6.1 (no changes needed)
+  * review debian/copyright, move files under right licensing stanza, update
+    copyright years, drop additional files with missing/unclear licenses when
+    repackaging
+
+ -- Damyan Ivanov <[e-mail]>  Sun, 23 Oct 2022 18:48:29 +0000
+
+firebird3.0 (3.0.10.33601.ds4-1) unstable; urgency=medium
+
+  * New upstream version 3.0.10.33601.ds4
+  * update debian/copyright (one new file)
+  * rebase no-binary-gbaks.patch to apply to slightly changed upstream
+
+ -- Damyan Ivanov <[e-mail]>  Thu, 09 Jun 2022 14:33:54 +0000
+
+firebird3.0 (3.0.9.33560.ds4-3) unstable; urgency=medium
+
+  * add missing trailing slash from debian/firebird-image/ entry of
+    debian/clean (Closes: #1010876)
+    Thanks to John Paul Adrian Glaubitz
+
+ -- Damyan Ivanov <[e-mail]>  Thu, 12 May 2022 09:51:55 +0000
+
+firebird3.0 (3.0.9.33560.ds4-2) unstable; urgency=medium
+
+  * rules: stop overriding -O3 with -O2 during build
+  * apply upstream commit adding Documentation to the systemd service
+  * apply upstream commit dropping StdErr=syslog from the service
+
+ -- Damyan Ivanov <[e-mail]>  Fri, 15 Apr 2022 06:05:22 +0000
+
+firebird3.0 (3.0.9.33560.ds4-1) unstable; urgency=medium
+
+  * New upstream version 3.0.9.33560.ds4
+   + refresh/update several patches
+
+ -- Damyan Ivanov <[e-mail]>  Mon, 14 Feb 2022 21:09:03 +0000
+
 firebird3.0 (3.0.8.33535.ds4-1ubuntu4) lunar; urgency=medium
 
   * Rebuild against latest icu
diff --git a/debian/clean b/debian/clean
index 60cba92..5d8014d 100644
--- a/debian/clean
+++ b/debian/clean
@@ -14,7 +14,7 @@ config.status
 config.status
 configure
 configure
-debian/firebird-image
+debian/firebird-image/
 debian/man/*.1
 debian/man/*.8
 extern/btyacc/btyacc
diff --git a/debian/control b/debian/control
index b02323d..e32bb2f 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends:
  rename,
  zlib1g-dev,
 Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Vcs-Git: https://salsa.debian.org/firebird-team/firebird3.0.git
 Vcs-Browser: https://salsa.debian.org/firebird-team/firebird3.0
 Homepage: https://firebirdsql.org/
diff --git a/debian/copyright b/debian/copyright
index 180c4b0..ec89ecd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,12 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Firebird
 Upstream-Contact: https://www.firebirdsql.org/
 Files-Excluded:
+ .editorconfig
+ .gitignore
+ */.gitignore
+ .github
+ .vscode
+ appveyor.yml
  builds/install/arch-specific/linux/firebird.init.d.suse.in
  builds/install/arch-specific/solaris
  builds/install/arch-specific/solx86gcc/CS/postinstall.in
@@ -20,6 +26,7 @@ Files-Excluded:
  doc/README.build.mingw.html
  doc/README.build.msvc.html
  doc/README.build.posix.html
+ doc/README.makefiles
  doc/README.plugins.html
  doc/README.providers.html
  doc/README.SecureRemotePassword.html
@@ -39,6 +46,8 @@ Files-Excluded:
  src/include/gen/ids.h
  src/include/gen/parse.h
  src/msgs/templates.sql
+ src/utilities/fbcpl
+ src/utilities/install/registry.h
 Comment:
  What is removed from upstream source and why
  ============================================
@@ -65,8 +74,10 @@ Comment:
  they are not needed when building on Debiian.
  .
   - builds/install/arch-specific/solaris/
+  - doc/README.makefiles
   - src/msgs/templates.sql
   - extern/SfIO/
+  - src/utilities/install/registry.h
  .
  * Generated files without source
  .
@@ -76,6 +87,11 @@ Comment:
   - doc/ReleaseNotes.pdf
   - doc/README.SecureRemotePassword.html
  .
+  * Other generated files and files with possible missing licensing that are
+   needed only on Windows
+ .
+  - src/utilities/fbcpl/*
+ .
  * Generated files and other cruft.
  .
  Repackaging is a good opportunity to also remove the following files, which 
@@ -91,8 +107,17 @@ Comment:
  Also, the following files are just cruft and are present in the upstream 
  tarball by mistake:
   - .cvsignore (in several directories)
+ .
+ These aren't tipicaly present in released tarballs, but are in upstream Git
+ and therefore in snapshot tarballs made from the release branch
+ .editorconfig
+ .gitignore (in several directories)
+ .github
+ .vscode
+ appveyor.yml
 
-Files: debian/*
+Files:
+ debian/*
 Copyright: © 2006, 2007, 2008, 2009, 2010, 2014, 2017, 2018
              Damyan Ivanov <[e-mail]>
 License: other
@@ -278,8 +303,6 @@ Files:
  src/misc/pascal/Pascal.implementation.pas
  src/misc/pascal/Pascal.interface.pas
  src/misc/upgrade/recovering_build.txt
- src/misc/upgrade/v2.1/metadata_charset_create.sql
- src/misc/upgrade/v2.1/metadata_charset_drop.sql
  src/misc/upgrade/v2/ib_udf2_params.txt
  src/misc/upgrade/v2/ib_udf_params.txt
  src/misc/upgrade/v2/security_database.txt
@@ -302,23 +325,8 @@ Files:
  src/remote/server/os/win32/window_proto.h
  src/utilities/CMakeLists.txt
  src/utilities/create_db.cpp
- src/utilities/fbcpl/ctrlpan.cpp
- src/utilities/fbcpl/ctrlpan.h
- src/utilities/fbcpl/fbcontrol.clw
- src/utilities/fbcpl/fbcontrol.cpp
- src/utilities/fbcpl/fbcontrol.def
- src/utilities/fbcpl/fbcontrol.h
- src/utilities/fbcpl/FBControl.rc
- src/utilities/fbcpl/res/fbcontrol.rc2
- src/utilities/fbcpl/resource.h
- src/utilities/fbcpl/res/server.ico
- src/utilities/fbcpl/res/server_stop.ico
- src/utilities/fbcpl/stdafx.cpp
- src/utilities/fbcpl/stdafx.h
  src/utilities/gsec/gsec_proto.h
  src/utilities/ntrace/fbtrace.conf
- travis.sh
- .travis.yml
 Copyright: none
 License: public-domain
  (assumed)
@@ -331,7 +339,8 @@ License: public-domain
    contains no header, it means that this code is freeware and nobody owns the
    appropriate copyrights.
 
-Files: src/common/sha.cpp
+Files:
+ src/common/sha.cpp
 Copyright: none
 License: public-domain
  NIST Secure Hash Algorithm
@@ -340,8 +349,9 @@ License: public-domain
  Applied Cryptography by Bruce Schneier
  This code is in the public domain
 
-Files: src/common/sha2/sha2.cpp
-       src/common/sha2/sha2.h
+Files:
+ src/common/sha2/sha2.cpp
+ src/common/sha2/sha2.h
 Copyright: 2005, 2007, Olivier Gay <[e-mail]>
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
@@ -479,6 +489,8 @@ Files:
  src/alice/exe_proto.h
  src/alice/tdr.cpp
  src/alice/tdr_proto.h
+ src/auth/SecDbCache.cpp
+ src/auth/SecDbCache.h
  src/auth/SecurityDatabase/LegacyHash.h
  src/auth/SecurityDatabase/LegacyManagement.epp
  src/auth/SecurityDatabase/LegacyServer.cpp
@@ -511,6 +523,8 @@ Files:
  src/common/classes/NoThrowTimeStamp.cpp
  src/common/classes/timestamp.cpp
  src/common/common.h
+ src/common/config/dir_list.cpp
+ src/common/config/dir_list.h
  src/common/cvt.cpp
  src/common/dsc.cpp
  src/common/dsc.h
@@ -1135,7 +1149,6 @@ Files:
  src/utilities/install/install_svc.cpp
  src/utilities/install/regis_proto.h
  src/utilities/install/registry.cpp
- src/utilities/install/registry.h
  src/utilities/install/services.cpp
  src/utilities/install/servi_proto.h
  src/utilities/print_event.cpp
@@ -1175,53 +1188,82 @@ Files:
  src/yvalve/why_proto.h
  src/yvalve/YObjects.h
 Copyright:
- Inprise Corporation and its predecessors
  Adriano dos Santos Fernandes
- Alan Barclay
+ 2006, Adriano dos Santos Fernandes
+ 2008, Alan Barclay <[e-mail]>
  Alex Peshkoff
+ 2003, 2004, Alex Peshkoff
+ Alex Peshkov
  Alex Peshkov <[e-mail]>
+ 2009, 2013, 2020, Alex Peshkov
+ 2011-2020, Alexander Peshkov
  Ann Harrison
- Ann W. Harrison
- Arno Brinkman
+ 2001, Ann Harrison
+ 2001, Ann W. Harrison
+ 2002, 2003, Arno Brinkman
  Bill Oliver
  Blas Rodriguez Somoza
+ 2003 Blas Rodriguez Somoza
+ 2003 BRS
+ 1992-1994, 1996, Borland International
+ Clare Taylor
  Claudio Valderrama
  Claudio Valderrama C.
+ 2001, Claudio Valderrama
  Damyan Ivanov
  Dimitry Sibiryakov <[e-mail]>
  Dmitry Yemanov
+ Dmitry Yemanov <[e-mail]>
+ 2002, 2003, Dmitry Yemanov
  Fikret Hasovic
  Frank Schlottmann-Gödde
- Fred Polizo, Jr.
- FSG (Frank Schlottmann-Gödde)
+ 2003, Fred Polizo, Jr.
+ 2002, FSG (Frank Schlottmann-Gödde)
  Gabor Boros
+ 1986, Groton Database Systems, Inc.
+ Inprise Corporation and its predecessors
+ 2000, Inprise Corporation
  Ivan Prenosil
  Jaroslaw Glowacki <[e-mail]>
  Jerry Adair
  John Bellardo
+ 2001, John Bellardo
+ John H. Jenkins <[e-mail]>
  Jonas Jasas
+ K.D.Chang   <[e-mail]>
  Karel Brichnac <[e-mail]>
  Konstantin Kuznetsov
+ 2002, Leyne
  Manuel A. Fernandez Montecelo
- Mark O'Donohue [e-mail]
+ 2018, Manuel A. Fernandez Montecelo <[e-mail]>
+ Mark O'Donohue <[e-mail]>
  Michal Bukovjan
  Mike Nordell
+ 2001, Mike Nordell
  Neil McCalden
+ 2001, Neil McCalden
  Nickolay Samofatov
  Nikolay Samofatov
+ 2002, 2003, Nickolay Samofatov
  patrickgriffin
  Patrick J. P. Griffin
  Paul Beach
+ 2001, 2002, Paul Beach
  Paul Reeves
  Roman Simakov
  Sandor Szollosi <[e-mail]>
  Sean Leyne
+ 2001, 2002, Sean Leyne
+ 2001, SJL
  Slavomir Skopalik
  Stephen W. Boyd
+ 2006, 2007, Stephen W. Boyd
  Steve Boyd
  TMN (Mike Nordell)
+ 2001, TMN (Mike Nordell)
  Toni Martir
  Victor Seryodkin
+ 2003, Victor Seryodkin
  Vlad Horsun
 License: IPL-1.0
 Comment:
@@ -1250,12 +1292,10 @@ Files:
  builds/install/posix-common/FirebirdUninstall.sh.in
  builds/install/posix-common/install.sh.in
  builds/install/posix-common/posixLibrary.sh.in
- builds/install/posix-common/registerDatabase.sh.in
  builds/posix/empty.vers
  builds/posix/fbintl.vers
  builds/posix/fbplugin.vers
  builds/posix/ib_util.vers
- builds/posix/make.rules
  builds/posix/udr_plugin.vers
  builds/posix/vers.sh.in
  builds/win32/defs/plugin.def
@@ -1297,8 +1337,6 @@ Files:
  src/alice/main/aliceMain.cpp
  src/auth/AuthDbg.cpp
  src/auth/AuthDbg.h
- src/auth/SecDbCache.cpp
- src/auth/SecDbCache.h
  src/auth/SecureRemotePassword/client/SrpClient.cpp
  src/auth/SecureRemotePassword/client/SrpClient.h
  src/auth/SecureRemotePassword/manage/SrpManagement.cpp
@@ -1401,8 +1439,6 @@ Files:
  src/common/config/config_file.cpp
  src/common/config/config_file.h
  src/common/config/config.h
- src/common/config/dir_list.cpp
- src/common/config/dir_list.h
  src/common/CRC32C.cpp
  src/common/CsConvert.h
  src/common/cvt.h
@@ -1581,6 +1617,7 @@ Files:
  src/jrd/SysFunction.h
  src/jrd/TempSpace.cpp
  src/jrd/TempSpace.h
+ src/jrd/ThreadCollect.h
  src/jrd/trace/TraceCmdLine.cpp
  src/jrd/trace/TraceConfigStorage.cpp
  src/jrd/trace/TraceConfigStorage.h
@@ -1605,6 +1642,8 @@ Files:
  src/misc/smallog.cpp
  src/misc/src_bundle.sh
  src/misc/upgrade/v2.1/metadata_charset.txt
+ src/misc/upgrade/v2.1/metadata_charset_create.sql
+ src/misc/upgrade/v2.1/metadata_charset_drop.sql
  src/misc/upgrade/v2/ib_udf_upgrade.sql
  src/misc/upgrade/v2/security_database.sql
  src/misc/upgrade/v3.0/security_database.sql
@@ -1616,10 +1655,6 @@ Files:
  src/remote/client/BlrFromMessage.h
  src/remote/client/interface.h
  src/remote/SockAddr.h
- src/utilities/fbcpl/fbdialog.cpp
- src/utilities/fbcpl/fbdialog.h
- src/utilities/fbcpl/fbpanel.cpp
- src/utilities/fbcpl/fbpanel.h
  src/utilities/fbsvcmgr/fbsvcmgr.cpp
  src/utilities/fbtracemgr/traceMgrMain.cpp
  src/utilities/gsec/main/gsecMain.cpp
@@ -1673,7 +1708,7 @@ Copyright:
  2006, 2007, 2008, 2009, 2010, 2011, 2012, 2015, 2017
    Alex Peshkov <[e-mail]>
  2007, 2008, 2009, 2013, 2014, 2016 Alexander Peshkoff <[e-mail]>
- 2018, 2020 Alexander Peshkoff <[e-mail]>
+ 2018, 2020, 2022 Alexander Peshkoff <[e-mail]>
  Bill Oliver <[e-mail]>
  2009 Nikolay Samofatov <[e-mail]>
  2003, 2004 Arno Brinkman
@@ -1755,6 +1790,7 @@ Files:
  builds/install/arch-specific/netbsd/install.sh.in
  builds/install/arch-specific/netbsd/Makefile.in
  builds/install/arch-specific/solx86gcc/Makefile.in
+ builds/install/posix-common/registerDatabase.sh.in
  builds/posix/Makefile.in
  builds/posix/Makefile.in.examples
  builds/posix/Makefile.in.extern.editline
@@ -1813,10 +1849,11 @@ Comment:
 
 Files:
  builds/posix/make.defaults
+ builds/posix/make.rules
  examples/build_unix/Makefile.in.example5
 Copyright:
  Mark O'Donohue <[e-mail]>
-License: MPL-1.1-or-GPL-2+
+License: MPL-1.1 or GPL-2+
  The contents of this file are subject to the Mozilla Public License Version 
  1.1 (the "License"); you may not use this file except in compliance with the 
  License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
@@ -1872,7 +1909,8 @@ License: bsd-like
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 
-Files: acx_pthread.m4
+Files:
+ acx_pthread.m4
 Copyright: © 2007 Steven G. Johnson <[e-mail]>
 License: GPL-3+ with autoconf exception
  Available from the GNU Autoconf Macro Archive
@@ -1909,7 +1947,8 @@ License: GPL-3+ with autoconf exception
  The full text of GNU General Public License version 3 can be found at
  /usr/share/common-licenses/GPL-3 on every Debian system.
 
-Files: extern/btyacc/*
+Files:
+ extern/btyacc/*
 Copyright: Chris Dodd <[e-mail]>, Siber Systems <[e-mail]>
 License: public-domain
  BTYACC was created by Chris Dodd using ideas from many places and lots of 
diff --git a/debian/firebird3.0-server.lintian-overrides b/debian/firebird3.0-server.lintian-overrides
index 3ff59cb..b5510e7 100644
--- a/debian/firebird3.0-server.lintian-overrides
+++ b/debian/firebird3.0-server.lintian-overrides
@@ -1,6 +1,6 @@
 # These templates are used, but via shell variables and therefore lintian can't
 # detect the usage
-firebird3.0-server: unused-debconf-template shared/firebird/sysdba_password/first_install
-firebird3.0-server: unused-debconf-template shared/firebird/sysdba_password/upgrade_reconfigure
-firebird3.0-server: unused-debconf-template shared/firebird/server_in_use
+firebird3.0-server: unused-debconf-template shared/firebird/sysdba_password/first_install [templates:1]
+firebird3.0-server: unused-debconf-template shared/firebird/sysdba_password/upgrade_reconfigure [templates:178]
+firebird3.0-server: unused-debconf-template shared/firebird/server_in_use [templates:360]
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..47f4e0f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+upstream-branch=upstream/latest
+debian-branch=debian/unstable
diff --git a/debian/libib-util.lintian-overrides b/debian/libib-util.lintian-overrides
index b862d50..739c62a 100644
--- a/debian/libib-util.lintian-overrides
+++ b/debian/libib-util.lintian-overrides
@@ -14,4 +14,4 @@
 libib-util: shlib-without-versioned-soname usr/lib/*/libib_util.so libib_util.so
 
 # this is not a dev package
-libib-util: dev-pkg-without-shlib-symlink usr/lib/*/libib_util.so usr/lib/*/libib_util.so
+libib-util: lacks-unversioned-link-to-shared-library example: usr/lib/TRIPLET/libib_util.so [usr/lib/TRIPLET/libib_util.so]
diff --git a/debian/pack-upstream-snapshot.sh b/debian/pack-upstream-snapshot.sh
index e256284..5a17636 100644
--- a/debian/pack-upstream-snapshot.sh
+++ b/debian/pack-upstream-snapshot.sh
@@ -34,7 +34,8 @@ VER=$(upstream_ver PRODUCT_VER_STRING)
 echo "Version is $VER"
 
 TAR="firebird3.0-$VER"
+DS=$(perl -F, -anwE'for (@F) { say($_), exit if s/^repacksuffix=([^"]+).*/$1/ }' debian/watch)
 
-git archive --format=tar "--prefix=$TAR/" "$HEAD" | gzip -9 -n > "../$TAR.tar.gz"
+git archive --format=tar "--prefix=$TAR/" "$HEAD" | pigz -9 -n > "../$TAR.tar.gz"
 
-sh debian/repack.sh --upstream-version "$VER" "../$TAR.tar.gz"
+mk-origtargz --force-repack --repack-suffix="$DS" --compression=xz --version "$VER" "../$TAR.tar.gz"
diff --git a/debian/patches/deb/no-suse.init.patch b/debian/patches/deb/no-suse.init.patch
index e7c9738..2793ab9 100644
--- a/debian/patches/deb/no-suse.init.patch
+++ b/debian/patches/deb/no-suse.init.patch
@@ -6,7 +6,7 @@ Forwarded: no
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1251,7 +1251,6 @@ case "$PLATFORM" in
+@@ -1244,7 +1244,6 @@ case "$PLATFORM" in
          gen/install/misc/firebird.xinetd:builds/install/arch-specific/linux/firebird.xinetd.in
          gen/install/misc/firebird.init.d.generic:builds/install/arch-specific/linux/firebird.init.d.generic.in
          gen/install/misc/firebird.init.d.mandrake:builds/install/arch-specific/linux/firebird.init.d.mandrake.in
diff --git a/debian/patches/no-binary-gbaks.patch b/debian/patches/no-binary-gbaks.patch
index accc033..adbe858 100644
--- a/debian/patches/no-binary-gbaks.patch
+++ b/debian/patches/no-binary-gbaks.patch
@@ -26,7 +26,7 @@
 -	$(CHMOD) 0444 $@
 -
 -help.fdb:	$(BLD_ROOT)/misc/help.gbak
--	$(RUN_GBAK) -MODE read_only -R $< $@
+-	$(RUN_GBAK) -MODE read_only -replace $< $@
 -	$(CHMOD) 0444 $@
 -
  $(SECURITY_FDB):	security.fdb
@@ -52,7 +52,7 @@
 -qli:		$(QLI)
 -
 -$(QLI):		$(QLI_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)
 -
  examples: include_generic
  	$(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
diff --git a/debian/patches/out/cross-configure.patch b/debian/patches/out/cross-configure.patch
index 9910802..12f862a 100644
--- a/debian/patches/out/cross-configure.patch
+++ b/debian/patches/out/cross-configure.patch
@@ -45,7 +45,7 @@ Subject: improve cross buildability
      ;;
  esac
  
-@@ -975,7 +979,8 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include
+@@ -968,7 +972,8 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include
  		}
  	]])],[AC_DEFINE(WORKING_SEM_INIT,1,[Define this if sem_init() works on the platform])
  AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
@@ -55,14 +55,14 @@ Subject: improve cross buildability
  fi
  fi
  
-@@ -1000,12 +1005,10 @@ AC_TYPE_SIZE_T
+@@ -993,12 +998,10 @@ AC_TYPE_SIZE_T
  AC_TYPE_UID_T
  AC_SYS_LARGEFILE
  if test "$ac_cv_sys_file_offset_bits" = "no"; then
 -  AC_MSG_CHECKING(for native large file support)
 -  AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <unistd.h>
 -    main () {
--    exit(!(sizeof(off_t) == 8));
+-    return !(sizeof(off_t) == 8);
 -  }]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
 -   AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
 +  AC_CHECK_SIZEOF([off_t],[],[#include <unistd.h>])
@@ -72,7 +72,7 @@ Subject: improve cross buildability
  fi
  
  AC_CHECK_SIZEOF(void *)
-@@ -1038,27 +1041,17 @@ AC_CHECK_MEMBER([struct dirent.d_type],
+@@ -1031,27 +1034,17 @@ AC_CHECK_MEMBER([struct dirent.d_type],
  
  dnl EKU: try to determine the alignment of long and double
  dnl      replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
@@ -83,7 +83,7 @@ Subject: improve cross buildability
 -    char a;
 -    union { long long x; sem_t y; } b;
 -  };
--  exit((int)&((struct s*)0)->b);
+-  return (int)&((struct s*)0)->b;
 -}]])],[ac_cv_c_alignment=$ac_status],[ac_cv_c_alignment=$ac_status],[])
 -AC_MSG_RESULT($ac_cv_c_alignment)
 +AC_CHECK_ALIGNOF([long long])
@@ -101,7 +101,7 @@ Subject: improve cross buildability
 -    char a;
 -    double b;
 -  };
--  exit((int)&((struct s*)0)->b);
+-  return (int)&((struct s*)0)->b;
 -}]])],[ac_cv_c_double_align=$ac_status],[ac_cv_c_double_align=$ac_status],[])
 -AC_MSG_RESULT($ac_cv_c_double_align)
 +AC_CHECK_ALIGNOF([double])
diff --git a/debian/patches/out/hurd-maxpathlen.patch b/debian/patches/out/hurd-maxpathlen.patch
index 01ac8db..e9520aa 100644
--- a/debian/patches/out/hurd-maxpathlen.patch
+++ b/debian/patches/out/hurd-maxpathlen.patch
@@ -18,7 +18,7 @@ Author: Damyan Ivanov
  #if defined AIX || defined AIX_PPC || defined __sun
 --- a/src/common/common.h
 +++ b/src/common/common.h
-@@ -539,14 +539,6 @@ extern "C" int remove(const char* path);
+@@ -537,14 +537,6 @@ extern "C" int remove(const char* path);
  #define API_ROUTINE_VARARG      __cdecl
  #define CLIB_ROUTINE    __cdecl
  
@@ -33,7 +33,7 @@ Author: Damyan Ivanov
  #define ERRNO		GetLastError()
  #define INET_ERRNO	WSAGetLastError()
  #define H_ERRNO		WSAGetLastError()
-@@ -559,6 +551,15 @@ extern "C" int remove(const char* path);
+@@ -557,6 +549,15 @@ extern "C" int remove(const char* path);
  #endif /* WIN_NT */
  
  
diff --git a/debian/patches/out/obsolete-syslogd.target.patch b/debian/patches/out/obsolete-syslogd.target.patch
index a08276c..606526f 100644
--- a/debian/patches/out/obsolete-syslogd.target.patch
+++ b/debian/patches/out/obsolete-syslogd.target.patch
@@ -10,5 +10,5 @@ Author: Damyan Ivanov <[e-mail]>
 -After=syslog.target network.target
 +After=network.target
  Conflicts=firebird-classic.socket
+ Documentation=https://firebirdsql.org/en/firebird-rdbms/
  
- [Service]
diff --git a/debian/patches/series b/debian/patches/series
index bb7b879..6821e85 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,8 @@
 upstream/riscv64-support.patch
+upstream/systemd-service-documentation.patch
 out/riscv64-prefix.patch
 out/obsolete-syslogd.target.patch
+upstream/systemd-service-stderr.patch
 out/honour-buildflags.patch
 out/c++-std.patch
 out/kfreebsd-sse4.patch
diff --git a/debian/patches/upstream/riscv64-support.patch b/debian/patches/upstream/riscv64-support.patch
index 0da07dc..a93bb99 100644
--- a/debian/patches/upstream/riscv64-support.patch
+++ b/debian/patches/upstream/riscv64-support.patch
@@ -22,7 +22,7 @@ Bug: http://tracker.firebirdsql.org/browse/CORE-5779
 +    libdir=/usr/lib64
 +    ;;
 +
-   powerpc64le-*-linux*)                           
+   powerpc64le-*-linux*)
      MAKEFILE_PREFIX=linux_powerpc64el
      INSTALL_PREFIX=linux
 --- a/src/common/classes/DbImplementation.cpp
diff --git a/debian/patches/upstream/systemd-service-documentation.patch b/debian/patches/upstream/systemd-service-documentation.patch
new file mode 100644
index 0000000..b7d9041
--- /dev/null
+++ b/debian/patches/upstream/systemd-service-documentation.patch
@@ -0,0 +1,15 @@
+Description: add Documentation key to the systemd service
+ Adapted from upstream commit 70bbc0e7a54c796d60164e85664c4d26f547dfb4
+Author: Damyan Ivanov <[e-mail]>
+Forwarded: yes
+
+--- a/builds/install/arch-specific/linux/firebird-superserver.service.in
++++ b/builds/install/arch-specific/linux/firebird-superserver.service.in
+@@ -2,6 +2,7 @@
+ Description=Firebird Database Server ( SuperServer )
+ After=syslog.target network.target
+ Conflicts=firebird-classic.socket
++Documentation=https://firebirdsql.org/en/firebird-rdbms/
+ 
+ [Service]
+ User=firebird
diff --git a/debian/patches/upstream/systemd-service-stderr.patch b/debian/patches/upstream/systemd-service-stderr.patch
new file mode 100644
index 0000000..b14a560
--- /dev/null
+++ b/debian/patches/upstream/systemd-service-stderr.patch
@@ -0,0 +1,15 @@
+Description: drop StandardError=syslog setting
+ Taken from upstream commit cdf8410db5b8bd264f6621867d0f319053b489a0
+Author: Damyan Ivanov <[e-mail]>
+Forwarded: yes
+
+--- a/builds/install/arch-specific/linux/firebird-superserver.service.in
++++ b/builds/install/arch-specific/linux/firebird-superserver.service.in
+@@ -9,7 +9,6 @@ User=firebird
+ Group=firebird
+ Type=forking
+ ExecStart=@FB_SBINDIR@/fbguard -daemon -forever
+-StandardError=syslog
+ 
+ [Install]
+ WantedBy=multi-user.target
diff --git a/debian/prune-upstream-dfsg.lst b/debian/prune-upstream-dfsg.lst
deleted file mode 100644
index 00f79af..0000000
--- a/debian/prune-upstream-dfsg.lst
+++ /dev/null
@@ -1,19 +0,0 @@
-builds/install/arch-specific/linux/firebird.init.d.suse.in
-builds/install/arch-specific/solaris
-builds/install/arch-specific/solx86gcc/CS/postinstall.in
-builds/install/arch-specific/solx86gcc/CS/postremove.in
-builds/install/arch-specific/solx86gcc/CS/preinstall.in
-doc/README.build.mingw.html
-doc/README.build.msvc.html
-doc/README.build.posix.html
-doc/README.plugins.html
-doc/README.providers.html
-doc/README.SecureRemotePassword.html
-doc/README.wire.compression.html
-doc/Using_OO_API.html
-doc/sql.extensions/README.mapping.html
-extern/SfIO
-extern/zlib
-src/include/firebird/IdlFbInterfaces.h
-src/include/gen/autoconfig.h.in
-src/msgs/templates.sql
diff --git a/debian/repack.sh b/debian/repack.sh
deleted file mode 100644
index 7e9a136..0000000
--- a/debian/repack.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-#
-# Repack upstream source converting from bz2 to gz and
-# removing some debian-supplied libraries and generated
-# files in the process
-#
-# To be called via debian/watch (uscan or uscan --force)
-# or
-#  sh debian/repack.sh --upstream-version VER FILE
-
-set -e
-set -u
-
-usage() {
-    cat <<EOF >& 2
-Usage: $0 --upstream-version VER FILE
-
-            or
-
-       uscan [--force]
-EOF
-}
-
-[ "${1:-}" = "--upstream-version" ] \
-    && [ -n "${2:-}" ] \
-    && [ -n "${3:-}" ] \
-    && [ -z "${4:-}" ] \
-    || usage
-
-TMPDIR=`mktemp -d -p .`
-
-trap "rm -rf $TMPDIR" INT QUIT 0
-
-VER="$2"
-DEB_VER="${VER}.ds4"
-UP_VER="${VER}"
-UPSTREAM_TAR="$3"
-UPSTREAM_DIR=Firebird-${UP_VER}
-ORIG="../firebird3.0_${DEB_VER}.orig.tar.xz"
-ORIG_DIR="firebird3.0-${DEB_VER}.orig"
-
-if [ -e "$ORIG" ]; then
-    echo "$ORIG already exists. Aborting."
-    exit 1
-fi
-
-echo -n "Expanding upstream source tree..."
-if [ "$UPSTREAM_TAR" != "${UPSTREAM_TAR%.bz2}" ]; then
-    tar xjf $UPSTREAM_TAR -C $TMPDIR
-elif [ "$UPSTREAM_TAR" != "${UPSTREAM_TAR%.gz}" ]; then
-    tar xzf $UPSTREAM_TAR -C $TMPDIR
-elif [ "$UPSTREAM_TAR" != "${UPSTREAM_TAR%.xz}" ]; then
-    tar xJf $UPSTREAM_TAR -C $TMPDIR
-else
-    echo "Don't know how to expand $UPSTREAM_TAR" >&2
-    exit 1
-fi
-echo " done."
-
-UPSTREAM_DIR=`ls -1 $TMPDIR`
-
-# clean sources, needlessly supplied by upstream.
-# Debian has packages for them already
-# and generated files
-echo -n "Cleaning upstream sources from unneeded things..."
-for d in icu editline btyacc/test/ftp.y libtommath;
-do
-    echo -n " $d"
-    rm -r $TMPDIR/$UPSTREAM_DIR/extern/$d
-done
-echo " done."
-
-echo -n "Removing bundled boost..."
-rm -r $TMPDIR/$UPSTREAM_DIR/src/include/firebird/impl/boost
-echo " done."
-
-echo -n "Removing source-less database backups..."
-for f in msg metadata help; do
-    rm -vf $TMPDIR/$UPSTREAM_DIR/builds/misc/$f.gbak
-done
-echo " done."
-
-echo Removing files with no license...
-cat debian/prune-upstream-dfsg.lst \
-| while read f; do
-    rm -rv $TMPDIR/$UPSTREAM_DIR/$f
-done
-
-echo -n "Removing generated files..."
-for f in \
-    configure \
-    builds/make.new/config/config.guess \
-    builds/make.new/config/config.h.in \
-    builds/make.new/config/config.sub \
-    builds/make.new/config/install-sh \
-    builds/make.new/config/ltmain.sh \
-    src/include/gen/parse.h \
-    src/include/gen/autoconfig.auto \
-    src/include/gen/ids.h \
-    ;
-do
-    if [ -e $TMPDIR/$UPSTREAM_DIR/$f ]; then
-        rm $TMPDIR/$UPSTREAM_DIR/$f
-        echo " $f"
-    fi
-done
-echo " done."
-
-echo -n "Removing source-less generated files..."
-for f in doc/Firebird-3-QuickStart.pdf doc/ReleaseNotes.pdf; do
-    if [ -e $TMPDIR/$UPSTREAM_DIR/$f ]; then
-        rm $TMPDIR/$UPSTREAM_DIR/$f
-        echo -n " $f"
-    fi
-done
-echo " done."
-
-echo -n "Removing .gitignore files..."
-find $TMPDIR/$UPSTREAM_DIR -name .gitignore -delete
-echo " done."
-
-find "$TMPDIR/$UPSTREAM_DIR" -type d -empty -delete
-
-mv $TMPDIR/$UPSTREAM_DIR $TMPDIR/$ORIG_DIR
-
-echo -n Repackaging into ${ORIG} ...
-tar c -C $TMPDIR $ORIG_DIR | xz > "$ORIG"
-echo " done."
diff --git a/debian/rules b/debian/rules
index 241962a..9a38ccd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,11 +70,12 @@ USFB := /usr/share/firebird/${FB_VER}
 VAR := /var/lib/firebird/${FB_VER}
 RUN := /run/firebird${FB_VER}
 
-export DEB_BUILD_MAINT_OPTIONS := hardening=+bindnow
-export DEB_CXXFLAGS_MAINT_APPEND := -DUCHAR_TYPE=uint16_t -fno-lifetime-dse -fno-strict-aliasing
-export DEB_CFLAGS_MAINT_APPEND := -fno-strict-aliasing
+DEB_BUILD_MAINT_OPTIONS := hardening=+bindnow
+DEB_CXXFLAGS_MAINT_STRIP := -O2
+DEB_CXXFLAGS_MAINT_APPEND := -DUCHAR_TYPE=uint16_t -fno-lifetime-dse -fno-strict-aliasing -O3
+DEB_CFLAGS_MAINT_STRIP := -O2
+DEB_CFLAGS_MAINT_APPEND := -fno-strict-aliasing -O3
 
-DPKG_EXPORT_BUILDFLAGS := 1
 include /usr/share/dpkg/buildflags.mk
 
 confflags += --disable-rpath --with-gpre-cobol \
@@ -171,6 +172,10 @@ ifeq ($(ICU_VER),)
     $(error Unable to determine ICU version)
 endif
 
+override_dh_lintian-arch:
+	dh_lintian
+	sed -i -e "s/TRIPLET/$(shell dpkg-architecture -q DEB_TARGET_MULTIARCH)/g" \
+	    debian/libib-util/usr/share/lintian/overrides/libib-util
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog -p firebird$(FB_VER)-common-doc
 override_dh_installdocs:
diff --git a/debian/watch b/debian/watch
index bc93997..a6e45b0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,9 +4,7 @@
 # Full-site-with-pattern  [Version  [Action]]
 
 version=4
-#opts="dversionmangle=s/(?:\.ds\d+)$//,uversionmangle=s/-\d+//;s/-(?=\D)/~/g,repacksuffix=.ds4" \
-#  http://sf.net/firebird/[Ff]irebird-(3\.0\..*).tar.bz2
-#opts="dversionmangle=s/(?:\.ds\d+)$//,uversionmangle=s/-\d+//;s/-(?=\D)/~/g,repacksuffix=.ds4" \
-#  https://firebirdsql.org/en/firebird-3-0/ .*/[Ff]irebird-(3\.0\.\d+(?:\.\d+)?)(?:-0)?@ARCHIVE_EXT@
 opts="dversionmangle=s/(?:\.ds\d+)$//,uversionmangle=s/-\d+//;s/-(?=\D)/~/g,repacksuffix=.ds4" \
-  https://github.com/FirebirdSQL/firebird/releases .*/[Ff]irebird-(3\.0\.\d+(?:\.\d+)?)(?:-0)?@ARCHIVE_EXT@
+  https://firebirdsql.org/en/firebird-3-0/ .*/[Ff]irebird-(3\.0\.\d+(?:\.\d+)?)(?:-0)?@ARCHIVE_EXT@
+#opts="dversionmangle=s/(?:\.ds\d+)$//,uversionmangle=s/-\d+//;s/-(?=\D)/~/g,repacksuffix=.ds4" \
+#  https://github.com/FirebirdSQL/firebird/releases .*/[Ff]irebird-(3\.0\.\d+(?:\.\d+)?)(?:-0)?@ARCHIVE_EXT@
diff --git a/doc/README.makefiles b/doc/README.makefiles
deleted file mode 100644
index 2b11836..0000000
--- a/doc/README.makefiles
+++ /dev/null
@@ -1,136 +0,0 @@
-PURPOSE :  To explain the makefile system in firebird2.
-
-STATUS:  Still a work in progress (both the makefiles, and this document)
-
-AUTHORS: Mark O'Donohue [e-mail]
-
-COPYRIGHT: All rights retained by authors.
-           For distribution with Firebird source
-           (Someone who knows this legal stuff will update it later)
-
-OVERVIEW
-
-The new makefiles were created to fit in with autoconf, to place the object
-files in seperate directories to the source files and to simplify the build
-process.
-
-It really does rely on using gnu make so that is the best version to use.
-
-
-THE REALLY QUICK INTRO
-
-For linux this is how I do a compile (classic is only one currently)
-
-autoconf
-./configure 
-$cd src
-$make > make.log 2>&1 ; cat make.log | grep -v warning > make2.log ; vi make2.log
-
-For an install checkout 
-
-$make install
-
-it will list your options - but also needs some work.
-
-
-MAKEFILE
-
-Makefiles are found in builds/posix
-
-make.rules
-make.defaults
-make.shared.variables
-
-prefix.xxx (where xxx = platform)
-
-In src/make.new there are a number of Makefile.in.xxx files and some make.xxx 
-
-
-STRUCTURE OF MAKEFILE.IN.XXX
-
-
-Each Makefile.in.xxx has the following somewhere near the top:
-
-include make.defaults
-include make.platform
-include make.rules
-include make.shared.variables
-
-...
-...
-
-
-These are:
-
-make.defaults
-
-This contains default values for macros that it is likely that the user may
-want to override.
-
-
-make.platform
-
-This file is created from the prefix.xxx where xxx=linux/darwin/freebsd etc.  
-It provides a spot for the user to override or repalce macros that have been
-defined in make.defaults.  In addition extra dependancies can be added to
-build extra targets.
-
-
-make.rules 
-
-This contains the default rules for compiling the system components.  Such as
-directory macros CXX etc.  
-
-
-make.shared.variables
-
-This file contains the defintion of macros that are shared across all of the 
-modules.  The only set that are needed are those files that are contained in
-the libgds.a/so library since files from many modules contribute to the library.
-
-
-
-CREATING OBJECT FILES
-
- 
-In the makefiles the object files are of two sorts .o static and .lo 
-which are suitable for shared libraries.  On most systems the source 
-files need to be compiled twice to create both .o and .lo files.  F
-Fortunately the program libtool can help work with this.
-
-The general format of .o file dependancies is:
-
-SERVER_Sources = server.cpp
-SERVER_Objects = $(SERVER_Sources:%.cpp=$(OBJ)/%.o)
-
-
-So the .o files live in $(OBJ) where:
-OBJ = $(ROOT)/gen/$ModuleName 
-
-
-Each Makefile also specifies an AllObjects and Dependancies macro which 
-identified all the objects that this Makefile is to create and the name
-of the dependency files generated for those objects.
-
-AllObjects = $(Alice_Objects) 
-
-
-FILE DEPENDANCIES
-
-Include file dependancy information is automatically generated by the gcc
-compiler.
-
-The gcc compiler has a flag -MMD which will generate in addition to the
-.o file a .d file which contains the dependancy chain of #includes required
-for the program.  These are then edited and stored in the $(OBJ) directory and
-are included in the bottom line of the makefile with
-
-Dependencies = $(All_Objects:.o=.d) 
-
-include $(Dependancies)
-
-PLATFORM SUBDIRS OF JRD
-
-Please, forget about jrd/os/* in makefiles! Pretend that all files from
-there are placed in jrd/ itself. A little trick in make.rules will find
-files for your platform automatically.
diff --git a/doc/WhatsNew b/doc/WhatsNew
index 454f2f1..f50c6f7 100644
--- a/doc/WhatsNew
+++ b/doc/WhatsNew
@@ -1,4 +1,189 @@
   **************************
+  * v3.0.10
+  **************************
+
+    * Improvement #7194
+        Make it possible to avoid fbclient dependency in Pascal programs using firebird.pas
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Improvement #7161
+        Update zlib to 1.2.12
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Improvement #7093
+        Improve indexed lookup speed of strings when the last keys characters are part of collated contractions
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
+    * Improvement #6872
+        Faster execution of indexed STARTING WITH with UNICODE collation
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
+    * Bugfix #7197
+        Segfault in Linux CS after successful detach from a database
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7191
+        gstat fails, but return 0 error code with incorrect databases.conf
+      Contributor(s):
+        Alexey Mochalov <aleksey.mochalov at red-soft.ru>
+
+    * Bugfix #7184
+        gbak output is not being flushed to disk
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7176
+        Incorrect error "Invalid token. Malformed string." with union + blob + non-UTF8 varchar
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
+    * Bugfix #7160
+        Missing checkout in trace manager when performing user mapping may cause server hang
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7158
+        Serious issue with SYSDBA user after a Windows install with EnableLegacyClientAuth
+      Contributor(s):
+        Paul Reeves <preeves at ibphoenix.com>
+
+    * Bugfix #7147
+        Problems with use of big timeout (or no timeout at all) in trace service
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7141
+        Services manager breaks long lines into 1023 bytes portions when using isc_info_svc_line in Service::query()
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7140
+        Wrong select result in case of special sort character
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
+    * Bugfix #7138
+        Problems accessing FB4 database, copied from another host
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7137
+        Optimizer regression: bad plan (HASH instead of JOIN) is chosen for some inner joins
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+    * Bugfix #7135
+        Firebird engine randomly fails when delivering mapping clear to other processes
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7128
+        Incorrect error message with isc_sql_interprete()
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix #7122
+        Invalid state of mapping cache after replacement of database
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7121
+        Mapping error when server tries to use mapping rules from database in full shutdown state
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7106
+        Wrong detection of must-be-delimited user names
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7094
+        Incorrect indexed lookup of strings when the last keys characters are part of collated contractions and there is multi-segment insensitive descending index
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
+
+  **************************
+  * v3.0.9
+  **************************
+
+    * Bugfix #7119
+        Database statistics service could not find existing table(s)
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix #7118
+        Chained JOIN .. USING across the same column names may be optimized badly
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+    * Bugfix #7115
+        Server hangs in trace code when it tries to update mapping cache
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7112
+        Avoid unload of plugins in MacOS due to problematic reload of them
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
+    * Bugfix #7109
+        Content of DB file can be overwritten with zero characters in some (rare) cases
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix #7103
+        FB service hangs and cannot be stopped after several 'DELETE FROM MON$STATEMENTS' being issued in order to stop ES/EDS which waits record for updating
+      Contributor(s):
+        Vlad Khorsun <hvlad at users.sourceforge.net>
+
+    * Bugfix #7084
+        Creating unique constraints on MacOS fails on larger tables
+      Contributor(s):
+        Adriano dos Santos Fernandes <adrianosf at gmail.com>
+
+    * Bugfix #7067
+        Deadlock when using not initialized security database
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7060
+        Deadlock when execute test for CORE-4337
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #7057
+        Client-side positioned updates work wrongly with scrollable cursors
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+    * Bugfix #7056
+        Fetching from a scrollable cursor may overwrite user-specified buffer and corrupt memory
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+    * Bugfix #7043
+        Wrong message when user has no access to /tmp/firebird
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #6966
+        Status vector for ES(<EMPTY_STRING>) is unstable if another execute block with correct statement was executed before
+      Contributor(s):
+        Alex Peshkov <peshkoff at mail.ru>
+
+    * Bugfix #3357
+        Bad execution plan if some stream depends on multiple streams via a function
+      Contributor(s):
+        Dmitry Yemanov <dimitr at firebirdsql.org>
+
+
+  **************************
   * v3.0.8
   **************************
 
diff --git a/examples/dbcrypt/CryptKeyHolder.cpp b/examples/dbcrypt/CryptKeyHolder.cpp
index 1e92481..f69d2a3 100644
--- a/examples/dbcrypt/CryptKeyHolder.cpp
+++ b/examples/dbcrypt/CryptKeyHolder.cpp
@@ -281,7 +281,7 @@ Factory factory;
 
 } // anonymous namespace
 
-extern "C" void FB_DLL_EXPORT FB_PLUGIN_ENTRY_POINT(IMaster* master)
+extern "C" FB_DLL_EXPORT void FB_PLUGIN_ENTRY_POINT(IMaster* master)
 {
 	IPluginManager* pluginManager = master->getPluginManager();
 
diff --git a/examples/dbcrypt/DbCrypt.cpp b/examples/dbcrypt/DbCrypt.cpp
index 3a60e0d..2348528 100644
--- a/examples/dbcrypt/DbCrypt.cpp
+++ b/examples/dbcrypt/DbCrypt.cpp
@@ -268,7 +268,7 @@ Factory factory;
 
 } // anonymous namespace
 
-extern "C" void FB_DLL_EXPORT FB_PLUGIN_ENTRY_POINT(IMaster* master)
+extern "C" FB_DLL_EXPORT void FB_PLUGIN_ENTRY_POINT(IMaster* master)
 {
 	IPluginManager* pluginManager = master->getPluginManager();
 
diff --git a/examples/interfaces/ifaceExamples.h b/examples/interfaces/ifaceExamples.h
index 40b5478..1b55e1e 100644
--- a/examples/interfaces/ifaceExamples.h
+++ b/examples/interfaces/ifaceExamples.h
@@ -38,14 +38,6 @@ typedef int FbSampleAtomic;
 #include <ibase.h>
 #include <firebird/Interface.h>
 
-#if defined(_WIN32)
-#define FB_DLL_EXPORT __declspec(dllexport)
-#elif defined(__APPLE__)
-#define FB_DLL_EXPORT __attribute__((visibility("default")))
-#else
-#define FB_DLL_EXPORT
-#endif
-
 using namespace Firebird;
 
 #define SAMPLES_DIALECT SQL_DIALECT_V6
diff --git a/src/alice/tdr.cpp b/src/alice/tdr.cpp
index 48677ec..80e45df 100644
--- a/src/alice/tdr.cpp
+++ b/src/alice/tdr.cpp
@@ -288,22 +288,22 @@ void TDR_list_limbo(FB_API_HANDLE handle, const TEXT* name, const SINT64 switche
 
     TraNumber id;
    	tdr* trans;
-	UCHAR* ptr = buffer;
-	bool flag = true;
 
-	while (flag)
+	for (Firebird::ClumpletReader p(Firebird::ClumpletReader::InfoResponse, buffer, sizeof(buffer));
+		!p.isEof(); p.moveNext())
 	{
-		const USHORT item = *ptr++;
-		const USHORT length = (USHORT) gds__vax_integer(ptr, 2);
-		ptr += 2;
+		UCHAR item = p.getClumpTag();
+		if (item == isc_info_end)
+			break;
+
+		const USHORT length = (USHORT) p.getClumpLength();
 		switch (item)
 		{
 		case isc_info_limbo:
-			id = isc_portable_integer(ptr, length);
+			id = p.getBigInt();
 			if (switches & (sw_commit | sw_rollback | sw_two_phase | sw_prompt))
 			{
 				TDR_reconnect_multiple(handle, id, name, switches);
-				ptr += length;
 				break;
 			}
 			if (!tdgbl->uSvc->isService())
@@ -326,7 +326,6 @@ void TDR_list_limbo(FB_API_HANDLE handle, const TEXT* name, const SINT64 switche
 				tdgbl->uSvc->putSInt64(isc_spb_single_tra_id_64, id);
 			else
 				tdgbl->uSvc->putSLong(isc_spb_single_tra_id, (SLONG) id);
-			ptr += length;
 			break;
 
 		case isc_info_truncated:
@@ -336,10 +335,6 @@ void TDR_list_limbo(FB_API_HANDLE handle, const TEXT* name, const SINT64 switche
 				// msg 72: More limbo transactions than fit.  Try again
 				// And how it's going to retry with a bigger buffer if the buffer is fixed size?
 			}
-			// fall through
-
-		case isc_info_end:
-			flag = false;
 			break;
 
 		default:
diff --git a/src/auth/AuthDbg.cpp b/src/auth/AuthDbg.cpp
index 377c9df..e66ad2c 100644
--- a/src/auth/AuthDbg.cpp
+++ b/src/auth/AuthDbg.cpp
@@ -38,7 +38,7 @@
 static Firebird::SimpleFactory<Auth::DebugClient> clientFactory;
 static Firebird::SimpleFactory<Auth::DebugServer> serverFactory;
 
-extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
+extern "C" FB_DLL_EXPORT void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
 {
 	Firebird::CachedMasterInterface::set(master);
 
diff --git a/src/auth/SecDbCache.h b/src/auth/SecDbCache.h
index de500ac..d5d0ff2 100644
--- a/src/auth/SecDbCache.h
+++ b/src/auth/SecDbCache.h
@@ -104,6 +104,16 @@ public:
 			(*this)->mutex.enter(FB_FUNCTION);
 		}
 
+		void reset()
+		{
+			if (hasData())
+			{
+				(*this)->mutex.leave();
+				(*this)->close();
+				assign(NULL);
+			}
+		}
+
 		~Instance()
 		{
 			if (hasData())
diff --git a/src/auth/SecureRemotePassword/manage/SrpManagement.cpp b/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
index 2d84776..33de81d 100644
--- a/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+++ b/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
@@ -37,14 +37,6 @@
 #include "../auth/SecureRemotePassword/Message.h"
 #include "../common/classes/auto.h"
 
-#ifndef FB_EXPORTED
-#if defined(DARWIN)
-#define FB_EXPORTED __attribute__((visibility("default")))
-#else
-#define FB_EXPORTED
-#endif // OS choice (DARWIN)
-#endif // FB_EXPORTED
-
 namespace {
 
 const unsigned int INIT_KEY = ((~0) - 1);
@@ -987,7 +979,7 @@ static Firebird::SimpleFactory<Auth::SrpManagement> factory;
 
 } // namespace Auth
 
-extern "C" void FB_EXPORTED FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
+extern "C" FB_DLL_EXPORT void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
 {
 	Firebird::CachedMasterInterface::set(master);
 	Firebird::PluginManagerInterfacePtr()->registerPluginFactory(Firebird::IPluginManager::TYPE_AUTH_USER_MANAGEMENT, Auth::RemotePassword::plugName, &Auth::factory);
diff --git a/src/auth/SecureRemotePassword/server/SrpServer.cpp b/src/auth/SecureRemotePassword/server/SrpServer.cpp
index c572957..fcb86c2 100644
--- a/src/auth/SecureRemotePassword/server/SrpServer.cpp
+++ b/src/auth/SecureRemotePassword/server/SrpServer.cpp
@@ -138,8 +138,11 @@ public:
 		instances->shutdown();
 	}
 
-	static void forceClean(IProvider* p, const char* secDbName)
+	static void forceClean(IProvider* p, CachedSecurityDatabase::Instance& instance)
 	{
+		Firebird::PathName secDbName(instance->secureDbName);
+
+		instance.reset();
 		cleanup();
 
 		ClumpletWriter dpb(ClumpletReader::dpbList, MAX_DPB_SIZE);
@@ -150,13 +153,14 @@ public:
 		dpb.insertString(isc_dpb_config, ParsedList::getNonLoopbackProviders(secDbName));
 
 		Jrd::FbLocalStatus status;
-		RefPtr<IAttachment> att(REF_NO_INCR, p->attachDatabase(&status, secDbName, dpb.getBufferLength(), dpb.getBuffer()));
+		RefPtr<IAttachment> att(REF_NO_INCR,
+			p->attachDatabase(&status, secDbName.c_str(), dpb.getBufferLength(), dpb.getBuffer()));
 		check(&status);
 
 		HANDSHAKE_DEBUG(fprintf(stderr, "Srv SRP: gfix-like attach to sec db %s\n", secDbName));
 	}
 
-	SecurityDatabase(const char* secDbName, ICryptKeyCallback* cryptCallback)
+	SecurityDatabase(CachedSecurityDatabase::Instance& instance, ICryptKeyCallback* cryptCallback)
 		: att(NULL), tra(NULL), stmt(NULL)
 	{
 		Jrd::FbLocalStatus status;
@@ -173,10 +177,10 @@ public:
 			ClumpletWriter dpb(ClumpletReader::dpbList, MAX_DPB_SIZE);
 			dpb.insertByte(isc_dpb_sec_attach, TRUE);
 			dpb.insertString(isc_dpb_user_name, SYSDBA_USER_NAME, fb_strlen(SYSDBA_USER_NAME));
-			dpb.insertString(isc_dpb_config, ParsedList::getNonLoopbackProviders(secDbName));
-			att = p->attachDatabase(&status, secDbName, dpb.getBufferLength(), dpb.getBuffer());
+			dpb.insertString(isc_dpb_config, ParsedList::getNonLoopbackProviders(instance->secureDbName));
+			att = p->attachDatabase(&status, instance->secureDbName, dpb.getBufferLength(), dpb.getBuffer());
 			check(&status);
-			HANDSHAKE_DEBUG(fprintf(stderr, "Srv SRP: attached sec db %s\n", secDbName));
+			HANDSHAKE_DEBUG(fprintf(stderr, "Srv SRP: attached sec db %s\n", instance->secureDbName));
 
 			const UCHAR tpb[] =
 			{
@@ -198,20 +202,20 @@ public:
 				class Cleanup : public SrvCleanup
 				{
 				public:
-					Cleanup(IProvider* p_p, const char* p_secDbName)
-						: p(p_p), secDbName(p_secDbName)
+					Cleanup(IProvider* p_p, CachedSecurityDatabase::Instance& p_instance)
+						: p(p_p), instance(p_instance)
 					{ }
 
 					void cleanup()
 					{
-						forceClean(p, secDbName);
+						forceClean(p, instance);
 					}
 
 				private:
 					IProvider* p;
-					const char* secDbName;
+					CachedSecurityDatabase::Instance& instance;
 				};
-				Cleanup c(p, secDbName);
+				Cleanup c(p, instance);
 
 				checkStatusVectorForMissingTable(status->getErrors(), &c);
 				status_exception::raise(&status);
@@ -310,7 +314,7 @@ int SrpServer::authenticate(CheckStatusWrapper* status, IServerBlock* sb, IWrite
 
 				// Create SecurityDatabase if needed
 				if (!instance->secDb)
-					instance->secDb = FB_NEW SecurityDatabase(instance->secureDbName, cryptCallback);
+					instance->secDb = FB_NEW SecurityDatabase(instance, cryptCallback);
 
 				// Lookup
 				instance->secDb->lookup(messages.param.getData(), messages.data.getData());
diff --git a/src/auth/SecurityDatabase/LegacyManagement.epp b/src/auth/SecurityDatabase/LegacyManagement.epp
index 2157bbc..aebddad 100644
--- a/src/auth/SecurityDatabase/LegacyManagement.epp
+++ b/src/auth/SecurityDatabase/LegacyManagement.epp
@@ -763,7 +763,7 @@ int SecurityDatabaseManagement::execute(Firebird::CheckStatusWrapper* st, Firebi
 // register plugin
 static Firebird::SimpleFactory<Auth::SecurityDatabaseManagement> factory;
 
-extern "C" void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
+extern "C" FB_DLL_EXPORT void FB_PLUGIN_ENTRY_POINT(Firebird::IMaster* master)
 {
 	Firebird::CachedMasterInterface::set(master);
 	Firebird::PluginManagerInterfacePtr()->registerPluginFactory(
diff --git a/src/auth/SecurityDatabase/LegacyServer.cpp b/src/auth/SecurityDatabase/LegacyServer.cpp
index d051b33..ff588f6 100644
--- a/src/auth/SecurityDatabase/LegacyServer.cpp
+++ b/src/auth/SecurityDatabase/LegacyServer.cpp
@@ -423,7 +423,7 @@ void registerLegacyServer(IPluginManager* iPlugin)
 
 #ifdef PLUG_MODULE
 
-extern "C" void FB_EXPORTED FB_PLUGIN_ENTRY_POINT(IMaster* master)
+extern "C" FB_DLL_EXPORT void FB_PLUGIN_ENTRY_POINT(IMaster* master)
 {
 	CachedMasterInterface::set(master);
 
diff --git a/src/burp/backup.epp b/src/burp/backup.epp
index 081987e..06e2730 100644
--- a/src/burp/backup.epp
+++ b/src/burp/backup.epp
@@ -1225,7 +1225,7 @@ void put_asciz( const att_type attribute, const TEXT* string)
 	// We can't honor operating systems that allow longer file names.
 	if (len >= MAX_FILE_NAME_SIZE)
 	{
-		BURP_print(true, 343, SafeArg() << int(attribute) << "put_asciz()" << (MAX_FILE_NAME_SIZE - 1));
+		BURP_print(false, 343, SafeArg() << int(attribute) << "put_asciz()" << (MAX_FILE_NAME_SIZE - 1));
 		// msg 343: text for attribute @1 is too large in @2, truncating to @3 bytes
 		len = MAX_FILE_NAME_SIZE - 1;
 	}
diff --git a/src/common/ThreadStart.cpp b/src/common/ThreadStart.cpp
index 7580564..18c8615 100644
--- a/src/common/ThreadStart.cpp
+++ b/src/common/ThreadStart.cpp
@@ -118,16 +118,17 @@ Thread Thread::start(ThreadEntryPoint* routine, void* arg, int priority_arg, Han
  *
  **************************************/
 	pthread_t thread;
+	pthread_t* p_thread = p_handle ? p_handle : &thread;
 	pthread_attr_t pattr;
 	int state;
 
 #if defined (LINUX) || defined (FREEBSD)
-	if (state = pthread_create(&thread, NULL, THREAD_ENTRYPOINT, THREAD_ARG))
+	if ((state = pthread_create(p_thread, NULL, THREAD_ENTRYPOINT, THREAD_ARG)))
 		Firebird::system_call_failed::raise("pthread_create", state);
 
 	if (!p_handle)
 	{
-		if (state = pthread_detach(thread))
+		if ((state = pthread_detach(*p_thread)))
 			Firebird::system_call_failed::raise("pthread_detach", state);
 	}
 #else
@@ -167,7 +168,7 @@ Thread Thread::start(ThreadEntryPoint* routine, void* arg, int priority_arg, Han
 		if (state)
 			Firebird::system_call_failed::raise("pthread_attr_setdetachstate", state);
 	}
-	state = pthread_create(&thread, &pattr, THREAD_ENTRYPOINT, THREAD_ARG);
+	state = pthread_create(p_thread, &pattr, THREAD_ENTRYPOINT, THREAD_ARG);
 	int state2 = pthread_attr_destroy(&pattr);
 	if (state)
 		Firebird::system_call_failed::raise("pthread_create", state);
@@ -184,10 +185,9 @@ Thread Thread::start(ThreadEntryPoint* routine, void* arg, int priority_arg, Han
 		if (state)
 			 Firebird::system_call_failed::raise("pthread_setcanceltype", state);
 #endif
-		*p_handle = thread;
 	}
 
-	return Thread(thread);
+	return Thread(*p_thread);
 }
 
 void Thread::waitForCompletion(Handle& thread)
@@ -210,7 +210,10 @@ void Thread::kill(Handle& thread)
 ThreadId Thread::getId()
 {
 #ifdef USE_LWP_AS_THREAD_ID
- 	return syscall(SYS_gettid);
+	static __thread int tid = 0;
+	if (!tid)
+		tid = syscall(SYS_gettid);
+	return tid;
 #else
  	return pthread_self();
 #endif
@@ -322,14 +325,14 @@ Thread Thread::start(ThreadEntryPoint* routine, void* arg, int priority_arg, Han
 
 	SetThreadPriority(handle, priority);
 
-	ResumeThread(handle);
-
 	if (p_handle)
 	{
 		*p_handle = handle;
+		ResumeThread(handle);
 	}
 	else
 	{
+		ResumeThread(handle);
 		CloseHandle(handle);
 	}
 
diff --git a/src/common/UtilSvc.cpp b/src/common/UtilSvc.cpp
index 53fdf26..e5f07e3 100644
--- a/src/common/UtilSvc.cpp
+++ b/src/common/UtilSvc.cpp
@@ -56,6 +56,7 @@ namespace {
 	void outputFile(FILE* std, const char* text)
 	{
 		outputFile(std, text, strlen(text));
+		fflush(std);
 	}
 }
 
diff --git a/src/common/classes/ClumpletReader.cpp b/src/common/classes/ClumpletReader.cpp
index c00511e..9ba0f89 100644
--- a/src/common/classes/ClumpletReader.cpp
+++ b/src/common/classes/ClumpletReader.cpp
@@ -666,6 +666,20 @@ void ClumpletReader::moveNext()
 	if (isEof())
 		return;		// no need to raise useless exceptions
 	FB_SIZE_T cs = getClumpletSize(true, true, true);
+
+	switch (kind)
+	{
+	case InfoResponse:
+		switch (getClumpTag())
+		{
+		case isc_info_end:
+		case isc_info_truncated:
+			// terminating clumplet
+			cur_offset = getBufferLength();
+			return;
+		}
+	}
+
 	adjustSpbState();
 	cur_offset += cs;
 }
diff --git a/src/common/classes/RefMutex.h b/src/common/classes/RefMutex.h
index 6c9c919..1d50ae2 100644
--- a/src/common/classes/RefMutex.h
+++ b/src/common/classes/RefMutex.h
@@ -101,7 +101,7 @@ namespace Firebird
 		}
 	};
 
-	template <typename Mtx, typename RefCounted = DefaultRefCounted<Mtx> >
+	template <typename Mtx, template <typename T> class RefCounted = DefaultRefCounted >
 	class EnsureUnlock
 	{
 	public:
@@ -114,14 +114,14 @@ namespace Firebird
 #define FB_LOCKED_FROM NULL
 #endif
 		{
-			RefCounted::addRef(m_mutex);
+			RefCounted<Mtx>::addRef(m_mutex);
 		}
 
 		~EnsureUnlock()
 		{
 			while (m_locked)
 				leave();
-			RefCounted::release(m_mutex);
+			RefCounted<Mtx>::release(m_mutex);
 		}
 
 		void enter()
@@ -155,7 +155,7 @@ namespace Firebird
 	};
 #undef FB_LOCKED_FROM
 
-	typedef EnsureUnlock<Mutex, NotRefCounted<Mutex> > MutexEnsureUnlock;
+	typedef EnsureUnlock<Mutex, NotRefCounted> MutexEnsureUnlock;
 	typedef EnsureUnlock<RefMutex> RefMutexEnsureUnlock;
 
 } // namespace
diff --git a/src/common/classes/XThreadMutex.h b/src/common/classes/XThreadMutex.h
index 464b483..b3329c3 100644
--- a/src/common/classes/XThreadMutex.h
+++ b/src/common/classes/XThreadMutex.h
@@ -89,7 +89,7 @@ private:
 };
 
 typedef RaiiLockGuard<XThreadMutex> XThreadLockGuard;
-typedef EnsureUnlock<XThreadMutex, NotRefCounted<XThreadMutex> > XThreadEnsureUnlock;
+typedef EnsureUnlock<XThreadMutex, NotRefCounted> XThreadEnsureUnlock;
 
 }
 
diff --git a/src/common/classes/array.h b/src/common/classes/array.h
index b5b036c..dba6f62 100644
--- a/src/common/classes/array.h
+++ b/src/common/classes/array.h
@@ -109,6 +109,12 @@ public:
 		ensureCapacity(InitialCapacity);
 	}
 
+	Array(const T* items, const size_type itemsCount)
+		: Storage(), count(0), capacity(this->getStorageSize()), data(this->getStorage())
+	{
+		add(items, itemsCount);
+	}
+
 	Array(const Array<T, Storage>& source)
 		: Storage(), count(0), capacity(this->getStorageSize()), data(this->getStorage())
 	{
diff --git a/src/common/classes/auto.h b/src/common/classes/auto.h
index 0244829..2bdb7b8 100644
--- a/src/common/classes/auto.h
+++ b/src/common/classes/auto.h
@@ -257,30 +257,33 @@ private:
 
 
 template <typename T, typename T2>
-class AutoSetRestore2
+class AutoRestore2
 {
-private:
+protected:
 	typedef T (T2::*Getter)();
 	typedef void (T2::*Setter)(T);
 
 public:
-	AutoSetRestore2(T2* aPointer, Getter aGetter, Setter aSetter, T newValue)
+	AutoRestore2(T2* aPointer, Getter aGetter, Setter aSetter)
 		: pointer(aPointer),
 		  setter(aSetter),
 		  oldValue((aPointer->*aGetter)())
+	{ }
+
+	void set(T newValue)
 	{
-		(aPointer->*aSetter)(newValue);
+		(pointer->*setter)(newValue);
 	}
 
-	~AutoSetRestore2()
+	~AutoRestore2()
 	{
 		(pointer->*setter)(oldValue);
 	}
 
 private:
 	// copying is prohibited
-	AutoSetRestore2(const AutoSetRestore2&);
-	AutoSetRestore2& operator =(const AutoSetRestore2&);
+	AutoRestore2(const AutoRestore2&);
+	AutoRestore2& operator =(const AutoRestore2&);
 
 private:
 	T2* pointer;
@@ -289,6 +292,20 @@ private:
 };
 
 
+template <typename T, typename T2>
+class AutoSetRestore2 : public AutoRestore2<T, T2>
+{
+	typedef typename AutoRestore2<T, T2>::Getter Getter;
+	typedef typename AutoRestore2<T, T2>::Setter Setter;
+public:
+	AutoSetRestore2(T2* aPointer, Getter aGetter, Setter aSetter, T newValue)
+		: AutoRestore2<T, T2>(aPointer, aGetter, aSetter)
+	{
+		this->set(newValue);
+	}
+};
+
+
 // One more typical class for AutoPtr cleanup
 class FileClose
 {
diff --git a/src/common/classes/locks.h b/src/common/classes/locks.h
index 2bbe713..2c79f54 100644
--- a/src/common/classes/locks.h
+++ b/src/common/classes/locks.h
@@ -336,7 +336,7 @@ typedef Mutex Spinlock;
 #endif //WIN_NT
 
 
-// RAII holder
+// RAII holders
 template <typename M>
 class RaiiLockGuard
 {
@@ -369,10 +369,12 @@ private:
 
 typedef RaiiLockGuard<Mutex> MutexLockGuard;
 
-class MutexUnlockGuard
+
+template <typename M>
+class RaiiUnlockGuard
 {
 public:
-	explicit MutexUnlockGuard(Mutex& aLock, const char* aReason)
+	explicit RaiiUnlockGuard(M& aLock, const char* aReason)
 		: lock(&aLock)
 #ifdef DEV_BUILD
 			, saveReason(aReason)
@@ -381,7 +383,7 @@ public:
 		lock->leave();
 	}
 
-	~MutexUnlockGuard()
+	~RaiiUnlockGuard()
 	{
 		try
 		{
@@ -399,15 +401,17 @@ public:
 
 private:
 	// Forbid copying
-	MutexUnlockGuard(const MutexUnlockGuard&);
-	MutexUnlockGuard& operator=(const MutexUnlockGuard&);
+	RaiiUnlockGuard(const RaiiUnlockGuard&);
+	RaiiUnlockGuard& operator=(const RaiiUnlockGuard&);
 
-	Mutex* lock;
+	M* lock;
 #ifdef DEV_BUILD
 	const char* saveReason;
 #endif
 };
 
+typedef RaiiUnlockGuard<Mutex> MutexUnlockGuard;
+
 
 class MutexCheckoutGuard
 {
diff --git a/src/common/common.h b/src/common/common.h
index 58abaaf..af1ec6b 100644
--- a/src/common/common.h
+++ b/src/common/common.h
@@ -244,8 +244,6 @@
 
 #define API_ROUTINE __attribute__((visibility("default")))
 #define API_ROUTINE_VARARG API_ROUTINE
-#define INTERNAL_API_ROUTINE API_ROUTINE
-#define FB_EXPORTED __attribute__((visibility("default")))
 
 #define O_DIRECT F_NOCACHE
 #endif /* Darwin Platforms */
@@ -600,10 +598,6 @@ extern "C" int remove(const char* path);
 #define CLIB_ROUTINE
 #endif
 
-#ifndef FB_EXPORTED
-#define FB_EXPORTED
-#endif
-
 
 /* alignment macros */
 
diff --git a/src/common/config/config.cpp b/src/common/config/config.cpp
index ed96a0d..b34d324 100644
--- a/src/common/config/config.cpp
+++ b/src/common/config/config.cpp
@@ -136,7 +136,7 @@ const Config::ConfigEntry Config::entries[MAX_CONFIG_KEY] =
 	{TYPE_INTEGER,		"CpuAffinityMask",			(ConfigValue) 0},
 	{TYPE_INTEGER,		"TcpRemoteBufferSize",		(ConfigValue) 8192},		// bytes
 	{TYPE_BOOLEAN,		"TcpNoNagle",				(ConfigValue) true},
-	{TYPE_BOOLEAN,		"TcpLoopbackFastPath",      (ConfigValue) true},
+	{TYPE_BOOLEAN,		"TcpLoopbackFastPath",      (ConfigValue) false},
 	{TYPE_INTEGER,		"DefaultDbCachePages",		(ConfigValue) -1},			// pages
 	{TYPE_INTEGER,		"ConnectionTimeout",		(ConfigValue) 180},			// seconds
 	{TYPE_INTEGER,		"DummyPacketInterval",		(ConfigValue) 0},			// seconds
diff --git a/src/common/fb_exception.cpp b/src/common/fb_exception.cpp
index bb55413..a280414 100644
--- a/src/common/fb_exception.cpp
+++ b/src/common/fb_exception.cpp
@@ -202,23 +202,25 @@ const char* LongJump::what() const throw()
 
 // ********************************* system_error ***************************
 
-system_error::system_error(const char* syscall, int error_code) :
+system_error::system_error(const char* syscall, const char* arg, int error_code) :
 	status_exception(), errorCode(error_code)
 {
 	Arg::Gds temp(isc_sys_request);
 	temp << Arg::Str(syscall);
 	temp << SYS_ERR(errorCode);
+	if (arg)
+		temp << Arg::Gds(isc_random) << arg;
 	set_status(temp.value());
 }
 
 void system_error::raise(const char* syscall, int error_code)
 {
-	throw system_error(syscall, error_code);
+	throw system_error(syscall, NULL, error_code);
 }
 
 void system_error::raise(const char* syscall)
 {
-	throw system_error(syscall, getSystemError());
+	throw system_error(syscall, NULL, getSystemError());
 }
 
 int system_error::getSystemError()
@@ -232,8 +234,8 @@ int system_error::getSystemError()
 
 // ********************************* system_call_failed ***************************
 
-system_call_failed::system_call_failed(const char* syscall, int error_code) :
-	system_error(syscall, error_code)
+system_call_failed::system_call_failed(const char* syscall, const char* arg, int error_code) :
+	system_error(syscall, arg, error_code)
 {
 	// NS: something unexpected has happened. Log the error to log file
 	// In the future we may consider terminating the process even in PROD_BUILD
@@ -247,12 +249,23 @@ system_call_failed::system_call_failed(const char* syscall, int error_code) :
 
 void system_call_failed::raise(const char* syscall, int error_code)
 {
-	throw system_call_failed(syscall, error_code);
+	throw system_call_failed(syscall, NULL, error_code);
 }
 
 void system_call_failed::raise(const char* syscall)
 {
-	throw system_call_failed(syscall, getSystemError());
+	throw system_call_failed(syscall, NULL, getSystemError());
+}
+
+
+void system_call_failed::raise(const char* syscall, const char* arg, int error_code)
+{
+	throw system_call_failed(syscall, arg, error_code);
+}
+
+void system_call_failed::raise(const char* syscall, const char* arg)
+{
+	raise(syscall, arg, getSystemError());
 }
 
 // ********************************* fatal_exception *******************************
diff --git a/src/common/intlobj_new.h b/src/common/intlobj_new.h
index 395d725..fb43cf7 100644
--- a/src/common/intlobj_new.h
+++ b/src/common/intlobj_new.h
@@ -57,9 +57,15 @@ typedef USHORT (*pfn_INTL_keylength) (texttype* tt, USHORT len);
 
 /* Types of the keys which may be returned by str2key routine */
 
-#define INTL_KEY_SORT    0 /* Full sort key */
-#define INTL_KEY_PARTIAL 1 /* Starting portion of sort key for equality class */
-#define INTL_KEY_UNIQUE  2 /* Full key for the equality class of the string */
+#define INTL_KEY_SORT           0 /* Full sort key */
+#define INTL_KEY_PARTIAL        1 /* Starting portion of sort key for equality class */
+#define INTL_KEY_UNIQUE         2 /* Full key for the equality class of the string */
+#define INTL_KEY_MULTI_STARTING 3 /* Multiple starting keys */
+
+/* INTL_KEY_MULTI_STARTING format:
+ key ::= { <key_length> <key_bytes> }...
+ key_length ::= <key length least significant byte> <key length most significant byte>
+*/
 
 /* Returned value of INTL_BAD_KEY_LENGTH means that key error happened during
   key construction. When partial key is requested returned string should
@@ -128,6 +134,8 @@ typedef void (*pfn_INTL_tt_destroy) (texttype* tt);
                                       (char, case, accent) which is case-insensitive,
                                       but accent-sensitive */
 
+#define TEXTTYPE_MULTI_STARTING_KEY 8 /* Supports INTL_KEY_MULTI_STARTING */
+
 
 struct texttype
 {
diff --git a/src/common/isc_sync.cpp b/src/common/isc_sync.cpp
index a9c8e7a..98d222b 100644
--- a/src/common/isc_sync.cpp
+++ b/src/common/isc_sync.cpp
@@ -1633,7 +1633,6 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
 					 !SetEndOfFile(file_handle) || !FlushFileBuffers(file_handle))
 			{
 				err = GetLastError();
-				CloseHandle(event_handle);
 				CloseHandle(file_handle);
 
 				if (err == ERROR_USER_MAPPED_FILE)
@@ -1641,10 +1640,14 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
 					if (retry_count < 50)	// 0.5 sec
 						goto retry;
 
+					CloseHandle(event_handle);
 					Arg::Gds(isc_instance_conflict).raise();
 				}
 				else
+				{
+					CloseHandle(event_handle);
 					system_call_failed::raise("SetFilePointer", err);
+				}
 			}
 		}
 
diff --git a/src/common/os/posix/guid.cpp b/src/common/os/posix/guid.cpp
index 0713f49..3e2978b 100644
--- a/src/common/os/posix/guid.cpp
+++ b/src/common/os/posix/guid.cpp
@@ -45,6 +45,9 @@ void GenerateRandomBytes(void* buffer, FB_SIZE_T size)
 {
 	// do not use /dev/random because it may return lesser data than we need.
 	int fd = os_utils::open("/dev/urandom", O_RDONLY);
+	if (fd < 0)
+		Firebird::system_call_failed::raise("open");
+
 	for (FB_SIZE_T offset = 0; offset < size; )
 	{
 		int rc = read(fd, static_cast<char*>(buffer) + offset, size - offset);
diff --git a/src/common/os/posix/os_utils.cpp b/src/common/os/posix/os_utils.cpp
index 404c6d2..23c9cf0 100644
--- a/src/common/os/posix/os_utils.cpp
+++ b/src/common/os/posix/os_utils.cpp
@@ -148,18 +148,18 @@ void createLockDirectory(const char* pathname)
 		if (access(pathname, R_OK | W_OK | X_OK) == 0)
 		{
 			if (stat(pathname, &st) != 0)
-				system_call_failed::raise("stat");
+				system_call_failed::raise("stat", pathname);
 			if (S_ISDIR(st.st_mode))
 				return;
 			// not exactly original meaning, but very close to it
-			system_call_failed::raise("access", ENOTDIR);
+			system_call_failed::raise("mkdir", pathname, ENOTDIR);
 		}
 
 		if (SYSCALL_INTERRUPTED(errno))
 			continue;
 		if (errno == ENOENT)
 			break;
-		system_call_failed::raise("access", ENOTDIR);
+		system_call_failed::raise("access", pathname);
 	}
 
 	Firebird::PathName newname(pathname);
@@ -216,16 +216,16 @@ void createLockDirectory(const char* pathname)
 				if (access(pathname, R_OK | W_OK | X_OK) == 0)
 				{
 					if (stat(pathname, &st) != 0)
-						system_call_failed::raise("stat");
+						system_call_failed::raise("stat", pathname);
 					if (S_ISDIR(st.st_mode))
 						return;
 					// not exactly original meaning, but very close to it
-					system_call_failed::raise("access", ENOTDIR);
+					system_call_failed::raise("stat", pathname, ENOTDIR);
 				}
 
 				if (SYSCALL_INTERRUPTED(errno))
 					continue;
-				system_call_failed::raise("access", ENOTDIR);
+				system_call_failed::raise("access", pathname);
 			}
 
 			return;
diff --git a/src/common/unicode_util.cpp b/src/common/unicode_util.cpp
index eeda6b0..c158cf8 100644
--- a/src/common/unicode_util.cpp
+++ b/src/common/unicode_util.cpp
@@ -186,7 +186,9 @@ public:
 	USet* (U_EXPORT2 *usetOpen)(UChar32 start, UChar32 end);
 
 	void (U_EXPORT2 *ucolClose)(UCollator* coll);
-	int32_t (U_EXPORT2 *ucolGetContractions)(const UCollator* coll, USet* conts, UErrorCode* status);
+	int32_t (U_EXPORT2 *ucolGetContractionsAndExpansions)(const UCollator* coll, USet* contractions, USet* expansions,
+		UBool addPrefixes, UErrorCode* status);
+
 	int32_t (U_EXPORT2 *ucolGetSortKey)(const UCollator* coll, const UChar* source,
 		int32_t sourceLength, uint8_t* result, int32_t resultLength);
 	UCollator* (U_EXPORT2 *ucolOpen)(const char* loc, UErrorCode* status);
@@ -1034,7 +1036,8 @@ UnicodeUtil::ICU* UnicodeUtil::loadICU(const string& icuVersion, const string& c
 			icu->getEntryPoint("uset_open", icu->ucModule, icu->usetOpen);
 
 			icu->getEntryPoint("ucol_close", icu->inModule, icu->ucolClose);
-			icu->getEntryPoint("ucol_getContractions", icu->inModule, icu->ucolGetContractions);
+			icu->getEntryPoint("ucol_getContractionsAndExpansions", icu->inModule,
+				icu->ucolGetContractionsAndExpansions);
 			icu->getEntryPoint("ucol_getSortKey", icu->inModule, icu->ucolGetSortKey);
 			icu->getEntryPoint("ucol_open", icu->inModule, icu->ucolOpen);
 			icu->getEntryPoint("ucol_setAttribute", icu->inModule, icu->ucolSetAttribute);
@@ -1336,10 +1339,6 @@ UnicodeUtil::Utf16Collation* UnicodeUtil::Utf16Collation::create(
 			icu->ucolSetAttribute(compareCollator, UCOL_STRENGTH, UCOL_SECONDARY, &status);
 	}
 
-	USet* contractions = icu->usetOpen(0, 0);
-	// status not verified here.
-	icu->ucolGetContractions(partialCollator, contractions, &status);
-
 	Utf16Collation* obj = FB_NEW Utf16Collation();
 	obj->icu = icu;
 	obj->tt = tt;
@@ -1347,9 +1346,150 @@ UnicodeUtil::Utf16Collation* UnicodeUtil::Utf16Collation::create(
 	obj->compareCollator = compareCollator;
 	obj->partialCollator = partialCollator;
 	obj->sortCollator = sortCollator;
-	obj->contractions = contractions;
-	obj->contractionsCount = icu->usetGetItemCount(contractions);
 	obj->numericSort = isNumericSort;
+	obj->maxContractionsPrefixLength = 0;
+
+	USet* contractions = icu->usetOpen(1, 0);
+	// status not verified here.
+	icu->ucolGetContractionsAndExpansions(partialCollator, contractions, NULL, false, &status);
+
+	int contractionsCount = icu->usetGetItemCount(contractions);
+
+	for (int contractionIndex = 0; contractionIndex < contractionsCount; ++contractionIndex)
+	{
+		UChar strChars[10];
+		UChar32 start, end;
+
+		status = U_ZERO_ERROR;
+		int len = icu->usetGetItem(contractions, contractionIndex, &start, &end, strChars, sizeof(strChars), &status);
+
+		if (len >= 2)
+		{
+			obj->maxContractionsPrefixLength = len - 1 > obj->maxContractionsPrefixLength ?
+				len - 1 : obj->maxContractionsPrefixLength;
+
+			UCHAR key[100];
+			int keyLen = icu->ucolGetSortKey(partialCollator, strChars, len, key, sizeof(key));
+
+			for (int prefixLen = 1; prefixLen < len; ++prefixLen)
+			{
+				const Array<USHORT> str(strChars, prefixLen);
+				SortKeyArray* keySet = obj->contractionsPrefix.get(str);
+
+				if (!keySet)
+				{
+					keySet = obj->contractionsPrefix.put(str);
+
+					UCHAR prefixKey[100];
+					int prefixKeyLen = icu->ucolGetSortKey(partialCollator,
+						strChars, prefixLen, prefixKey, sizeof(prefixKey));
+
+					keySet->add(Array<UCHAR>(prefixKey, prefixKeyLen));
+				}
+
+				keySet->add(Array<UCHAR>(key, keyLen));
+			}
+		}
+	}
+
+	icu->usetClose(contractions);
+
+	ContractionsPrefixMap::Accessor accessor(&obj->contractionsPrefix);
+
+	for (bool found = accessor.getFirst(); found; found = accessor.getNext())
+	{
+		SortKeyArray& keySet = accessor.current()->second;
+
+		if (keySet.getCount() <= 1)
+			continue;
+
+		fb_assert(accessor.current()->first.hasData());
+		USHORT firstCh = accessor.current()->first.front();
+		USHORT lastCh = accessor.current()->first.back();
+
+		if ((firstCh >= 0xFDD0 && firstCh <= 0xFDEF) || UTF_IS_SURROGATE(lastCh))
+		{
+			keySet.clear();
+			keySet.add(Array<UCHAR>());
+			continue;
+		}
+
+		SortKeyArray::iterator firstKeyIt = keySet.begin();
+		SortKeyArray::iterator lastKeyIt = --keySet.end();
+
+		const UCHAR* firstKeyDataIt = firstKeyIt->begin();
+		const UCHAR* lastKeyDataIt = lastKeyIt->begin();
+		const UCHAR* firstKeyDataEnd = firstKeyIt->end();
+		const UCHAR* lastKeyDataEnd = lastKeyIt->end();
+
+		if (*firstKeyDataIt == *lastKeyDataIt)
+		{
+			unsigned common = 0;
+
+			do
+			{
+				++common;
+			} while (++firstKeyDataIt != firstKeyDataEnd && ++lastKeyDataIt != lastKeyDataEnd &&
+				*firstKeyDataIt == *lastKeyDataIt);
+
+			Array<UCHAR> commonKey(firstKeyIt->begin(), common);
+			keySet.clear();
+			keySet.add(commonKey);
+		}
+		else
+		{
+			SortKeyArray::iterator secondKeyIt = ++keySet.begin();
+			const UCHAR* secondKeyDataIt = secondKeyIt->begin();
+			const UCHAR* secondKeyDataEnd = secondKeyIt->end();
+
+			ObjectsArray<Array<UCHAR> > commonKeys;
+			commonKeys.add(*firstKeyIt);
+
+			while (secondKeyIt != keySet.end())
+			{
+				unsigned common = 0;
+
+				while (firstKeyDataIt != firstKeyDataEnd && secondKeyDataIt != secondKeyDataEnd &&
+					*firstKeyDataIt == *secondKeyDataIt)
+				{
+					++common;
+					++firstKeyDataIt;
+					++secondKeyDataIt;
+				}
+
+				unsigned backSize = commonKeys.back()->getCount();
+
+				if (common > backSize)
+					commonKeys.back()->append(secondKeyIt->begin() + backSize, common - backSize);
+				else if (common < backSize)
+				{
+					if (common == 0)
+						commonKeys.push(*secondKeyIt);
+					else
+						commonKeys.back()->resize(common);
+				}
+
+				if (++secondKeyIt != keySet.end())
+				{
+					++firstKeyIt;
+
+					firstKeyDataIt = firstKeyIt->begin();
+					secondKeyDataIt = secondKeyIt->begin();
+
+					firstKeyDataEnd = firstKeyIt->end();
+					secondKeyDataEnd = secondKeyIt->end();
+				}
+			}
+
+			keySet.clear();
+
+			for (ObjectsArray<Array<UCHAR> >::iterator ckIt = commonKeys.begin(); ckIt != commonKeys.end(); ++ckIt)
+				keySet.add(*ckIt);
+		}
+	}
+
+	if (obj->maxContractionsPrefixLength)
+		tt->texttype_flags |= TEXTTYPE_MULTI_STARTING_KEY;
 
 	return obj;
 }
@@ -1357,8 +1497,6 @@ UnicodeUtil::Utf16Collation* UnicodeUtil::Utf16Collation::create(
 
 UnicodeUtil::Utf16Collation::~Utf16Collation()
 {
-	icu->usetClose(contractions);
-
 	icu->ucolClose(compareCollator);
 	icu->ucolClose(partialCollator);
 	icu->ucolClose(sortCollator);
@@ -1403,55 +1541,18 @@ USHORT UnicodeUtil::Utf16Collation::stringToKey(USHORT srcLen, const USHORT* src
 		srcLenLong = pad - src + 1;
 	}
 
+	if (srcLenLong == 0)
+		return 0;
+
 	HalfStaticArray<USHORT, BUFFER_SMALL / 2> buffer;
 	const UCollator* coll = NULL;
 
 	switch (key_type)
 	{
 		case INTL_KEY_PARTIAL:
-		{
+		case INTL_KEY_MULTI_STARTING:
 			coll = partialCollator;
-
-			// Remove last bytes of key if they are start of a contraction
-			// to correctly find in the index.
-			ConversionICU& cIcu(getConversionICU());
-			for (int i = 0; i < contractionsCount; ++i)
-			{
-				UChar str[10];
-				UErrorCode status = U_ZERO_ERROR;
-				int len = icu->usetGetItem(contractions, i, NULL, NULL, str, sizeof(str), &status);
-
-				if (len > SLONG(srcLenLong))
-					len = srcLenLong;
-				else
-					--len;
-
-				// safe cast - alignment not changed
-				if (cIcu.u_strCompare(str, len,
-						reinterpret_cast<const UChar*>(src) + srcLenLong - len, len, true) == 0)
-				{
-					srcLenLong -= len;
-					break;
-				}
-			}
-
-			if (numericSort)
-			{
-				// ASF: Wee need to remove trailing numbers to return sub key that
-				// matches full key. Example: "abc1" becomes "abc" to match "abc10".
-				const USHORT* p = src + srcLenLong - 1;
-
-				for (; p >= src; --p)
-				{
-					if (!(*p >= '0' && *p <= '9'))
-						break;
-				}
-
-				srcLenLong = p - src + 1;
-			}
-
 			break;
-		}
 
 		case INTL_KEY_UNIQUE:
 			coll = compareCollator;
@@ -1469,11 +1570,127 @@ USHORT UnicodeUtil::Utf16Collation::stringToKey(USHORT srcLen, const USHORT* src
 			return INTL_BAD_KEY_LENGTH;
 	}
 
-	if (srcLenLong == 0)
-		return 0;
+	if (key_type == INTL_KEY_MULTI_STARTING)
+	{
+		bool trailingNumbersRemoved = false;
+
+		if (numericSort)
+		{
+			// ASF: Wee need to remove trailing numbers to return sub key that
+			// matches full key. Example: "abc1" becomes "abc" to match "abc10".
+			const USHORT* p = src + srcLenLong - 1;
 
-	return icu->ucolGetSortKey(coll,
+			for (; p >= src; --p)
+			{
+				if (!(*p >= '0' && *p <= '9'))
+					break;
+
+				trailingNumbersRemoved = true;
+			}
+
+			srcLenLong = p - src + 1;
+		}
+
+		UCHAR* originalDst = dst;
+		USHORT originalDstLen = dstLen;
+
+		if (!trailingNumbersRemoved)
+		{
+			for (int i = MIN(maxContractionsPrefixLength, srcLenLong); i > 0; --i)
+			{
+				SortKeyArray* keys = contractionsPrefix.get(Array<USHORT>(src + srcLenLong - i, i));
+
+				if (keys)
+				{
+					UCHAR lastCharKey[BUFFER_TINY];	// sort key for a single character
+					ULONG prefixLen, lastCharKeyLen;
+
+					srcLenLong -= i;
+
+					if (srcLenLong != 0)
+					{
+						prefixLen = icu->ucolGetSortKey(coll,
+							reinterpret_cast<const UChar*>(src), srcLenLong, dst + 2, dstLen - 2);
+
+						lastCharKeyLen = icu->ucolGetSortKey(coll,
+							reinterpret_cast<const UChar*>(src + srcLenLong), i, lastCharKey, sizeof(lastCharKey));
+
+						if (prefixLen == 0 || prefixLen > dstLen - 2 || prefixLen > MAX_USHORT ||
+							lastCharKeyLen == 0)
+						{
+							return INTL_BAD_KEY_LENGTH;
+						}
+
+						fb_assert(dst[2 + prefixLen - 1] == '\0');
+						--prefixLen;
+
+						fb_assert(lastCharKey[lastCharKeyLen - 1] == '\0');
+						--lastCharKeyLen;
+					}
+					else
+						prefixLen = 0;
+
+					bool fallbackToPrefixKey = false;
+
+					for (SortKeyArray::const_iterator keyIt = keys->begin();
+						 keyIt != keys->end();
+						 ++keyIt)
+					{
+						const UCHAR advance = prefixLen && lastCharKeyLen > 1 &&
+							keyIt->hasData() && lastCharKey[0] == keyIt->front() ? 1 : 0;
+
+						if (keyIt->getCount() - advance == 0)
+						{
+							fallbackToPrefixKey = true;
+							break;
+						}
+
+						const ULONG keyLen = prefixLen + keyIt->getCount() - advance;
+
+						if (keyLen > dstLen - 2 || keyLen > MAX_USHORT)
+							return INTL_BAD_KEY_LENGTH;
+
+						dst[0] = UCHAR(keyLen & 0xFF);
+						dst[1] = UCHAR(keyLen >> 8);
+
+						if (dst != originalDst)
+							memcpy(dst + 2, originalDst + 2, prefixLen);
+
+						memcpy(dst + 2 + prefixLen, keyIt->begin() + advance, keyIt->getCount() - advance);
+						dst += 2 + keyLen;
+						dstLen -= 2 + keyLen;
+					}
+
+					if (fallbackToPrefixKey)
+						break;
+
+					return dst - originalDst;
+				}
+			}
+		}
+
+		ULONG keyLen = icu->ucolGetSortKey(coll,
+			reinterpret_cast<const UChar*>(src), srcLenLong, originalDst + 2, originalDstLen - 3);
+
+		if (keyLen == 0 || keyLen > originalDstLen - 3 || keyLen > MAX_USHORT)
+			return INTL_BAD_KEY_LENGTH;
+
+		fb_assert(originalDst[2 + keyLen - 1] == '\0');
+		--keyLen;
+
+		originalDst[0] = UCHAR(keyLen & 0xFF);
+		originalDst[1] = UCHAR(keyLen >> 8);
+
+		return keyLen + 2;
+	}
+
+	const ULONG keyLen = icu->ucolGetSortKey(coll,
 		reinterpret_cast<const UChar*>(src), srcLenLong, dst, dstLen);
+
+	if (keyLen == 0 || keyLen > dstLen || keyLen > MAX_USHORT)
+		return INTL_BAD_KEY_LENGTH;
+
+	return keyLen;
 }
 
 
diff --git a/src/common/unicode_util.h b/src/common/unicode_util.h
index 03d48f9..c3966d3 100644
--- a/src/common/unicode_util.h
+++ b/src/common/unicode_util.h
@@ -30,7 +30,10 @@
 #include "intlobj_new.h"
 #include "../common/IntlUtil.h"
 #include "../common/os/mod_loader.h"
+#include "../common/classes/array.h"
 #include "../common/classes/fb_string.h"
+#include "../common/classes/GenericMap.h"
+#include "../common/classes/objects_array.h"
 
 #undef U_SHOW_CPLUSPLUS_API
 #define U_SHOW_CPLUSPLUS_API 0
@@ -168,6 +171,11 @@ public:
 									  Firebird::IntlUtil::SpecificAttributesMap& specificAttributes,
 									  const Firebird::string& configInfo);
 
+		Utf16Collation()
+			: contractionsPrefix(*getDefaultMemoryPool())
+		{
+		}
+
 		~Utf16Collation();
 
 		USHORT keyLength(USHORT len) const;
@@ -178,6 +186,45 @@ public:
 		ULONG canonical(ULONG srcLen, const USHORT* src, ULONG dstLen, ULONG* dst, const ULONG* exceptions);
 
 	private:
+		template <typename T>
+		class ArrayComparator
+		{
+		public:
+			static bool greaterThan(const Firebird::Array<T>& i1, const Firebird::Array<T>& i2)
+			{
+				FB_SIZE_T minCount = MIN(i1.getCount(), i2.getCount());
+				int cmp = memcmp(i1.begin(), i2.begin(), minCount * sizeof(T));
+
+				if (cmp != 0)
+					return cmp > 0;
+
+				return i1.getCount() > i2.getCount();
+			}
+
+			static bool greaterThan(const Firebird::Array<T>* i1, const Firebird::Array<T>* i2)
+			{
+				return greaterThan(*i1, *i2);
+			}
+		};
+
+		typedef Firebird::SortedObjectsArray<
+					Firebird::Array<UCHAR>,
+					Firebird::InlineStorage<Firebird::Array<UCHAR>*, 3>,
+					Firebird::Array<UCHAR>,
+					Firebird::DefaultKeyValue<const Firebird::Array<UCHAR>*>,
+					ArrayComparator<UCHAR>
+				> SortKeyArray;
+
+		typedef Firebird::GenericMap<
+					Firebird::Pair<
+						Firebird::Full<
+							Firebird::Array<USHORT>,	// UTF-16 string
+							SortKeyArray				// sort keys
+						>
+					>,
+					ArrayComparator<USHORT>
+				> ContractionsPrefixMap;
+
 		static ICU* loadICU(const Firebird::string& collVersion, const Firebird::string& locale,
 			const Firebird::string& configInfo);
 
@@ -190,8 +237,8 @@ public:
 		UCollator* compareCollator;
 		UCollator* partialCollator;
 		UCollator* sortCollator;
-		USet* contractions;
-		int contractionsCount;
+		ContractionsPrefixMap contractionsPrefix;
+		unsigned maxContractionsPrefixLength;	// number of characters
 		bool numericSort;
 	};
 
diff --git a/src/common/utils.cpp b/src/common/utils.cpp
index 303af3f..673188f 100644
--- a/src/common/utils.cpp
+++ b/src/common/utils.cpp
@@ -1600,6 +1600,13 @@ const ISC_STATUS* const origen = v;
 	return false;
 }
 
+inline bool sqlSymbolChar(char c, bool first)
+{
+	if (c & 0x80)
+		return false;
+	return (isdigit(c) && !first) || isalpha(c) || c == '_' || c == '$';
+}
+
 const char* dpbItemUpper(const char* s, FB_SIZE_T l, Firebird::string& buf)
 {
 	if (l && (s[0] == '"' || s[0] == '\''))
@@ -1612,30 +1619,37 @@ const char* dpbItemUpper(const char* s, FB_SIZE_T l, Firebird::string& buf)
 		{
 			if (s[i] == end_quote)
 			{
-				if (++i >= l || s[i] != end_quote)
-					break;		// delimited quote, done processing
+				if (++i >= l)
+				{
+					if (ascii && s[0] == '\'')
+						buf.upper();
+
+					return buf.c_str();
+				}
+
+				if (s[i] != end_quote)
+				{
+					buf.assign(&s[i], l - i);
+					Firebird::fatal_exception::raiseFmt("Invalid text <%s> after quoted string", buf.c_str());
+				}
 
 				// skipped the escape quote, continue processing
 			}
-
-			if (s[i] & 0x80)
+			else if (!sqlSymbolChar(s[i], i == 1))
 				ascii = false;
+
 			buf += s[i];
 		}
 
-		if (ascii && s[0] == '\'')
-			buf.upper();
-
-		return buf.c_str();
+		Firebird::fatal_exception::raiseFmt("Missing terminating quote <%c> in the end of quoted string", s[0]);
 	}
 
 	// non-quoted string - try to uppercase
 	for (FB_SIZE_T i = 0; i < l; ++i)
 	{
-		if (!(s[i] & 0x80))
-			buf += toupper(s[i]);
-		else
+		if (!sqlSymbolChar(s[i], i == 0))
 			return NULL;				// contains non-ascii data
+		buf += toupper(s[i]);
 	}
 
 	return buf.c_str();
diff --git a/src/dsql/DsqlCursor.cpp b/src/dsql/DsqlCursor.cpp
index 4c3fef6..dcb040a 100644
--- a/src/dsql/DsqlCursor.cpp
+++ b/src/dsql/DsqlCursor.cpp
@@ -34,10 +34,10 @@ static const char* const SCRATCH = "fb_cursor_";
 static const ULONG PREFETCH_SIZE = 65536; // 64 KB
 
 DsqlCursor::DsqlCursor(dsql_req* req, ULONG flags)
-	: m_request(req), m_resultSet(NULL), m_flags(flags),
+	: m_request(req), m_message(req->getStatement()->getReceiveMsg()),
+	  m_resultSet(NULL), m_flags(flags),
 	  m_space(req->getPool(), SCRATCH),
-	  m_state(BOS), m_eof(false), m_position(0), m_cachedCount(0),
-	  m_messageSize(req->getStatement()->getReceiveMsg()->msg_length)
+	  m_state(BOS), m_eof(false), m_position(0), m_cachedCount(0)
 {
 	TRA_link_cursor(m_request->req_transaction, this);
 }
@@ -232,9 +232,14 @@ int DsqlCursor::fetchFromCache(thread_db* tdbb, UCHAR* buffer, FB_UINT64 positio
 
 	fb_assert(position < m_cachedCount);
 
-	const FB_UINT64 offset = position * m_messageSize;
-	const FB_UINT64 readBytes = m_space.read(offset, buffer, m_messageSize);
-	fb_assert(readBytes == m_messageSize);
+	UCHAR* const msgBuffer = m_request->req_msg_buffers[m_message->msg_buffer_number];
+
+	const FB_UINT64 offset = position * m_message->msg_length;
+	const FB_UINT64 readBytes = m_space.read(offset, msgBuffer, m_message->msg_length);
+	fb_assert(readBytes == m_message->msg_length);
+
+	m_request->mapInOut(tdbb, true, m_message, NULL, buffer);
+
 	m_position = position;
 	m_state = POSITIONED;
 	return 0;
@@ -244,34 +249,23 @@ bool DsqlCursor::cacheInput(thread_db* tdbb, FB_UINT64 position)
 {
 	fb_assert(!m_eof);
 
-	const ULONG prefetchCount = MAX(PREFETCH_SIZE / m_messageSize, 1);
-	const ULONG prefetchSize = prefetchCount * m_messageSize;
-
-	UCharBuffer messageBuffer;
-	UCHAR* const buffer = messageBuffer.getBuffer(prefetchSize);
+	const ULONG prefetchCount = MAX(PREFETCH_SIZE / m_message->msg_length, 1);
+	const UCHAR* const msgBuffer = m_request->req_msg_buffers[m_message->msg_buffer_number];
 
 	while (position >= m_cachedCount)
 	{
-		ULONG count = 0;
-
-		for (; count < prefetchCount; count++)
+		for (ULONG count = 0; count < prefetchCount; count++)
 		{
-			UCHAR* const ptr = buffer + count * m_messageSize;
-
-			if (!m_request->fetch(tdbb, ptr))
+			if (!m_request->fetch(tdbb, NULL))
 			{
 				m_eof = true;
 				break;
 			}
-		}
 
-		if (count)
-		{
-			const FB_UINT64 offset = m_cachedCount * m_messageSize;
-			const ULONG fetchedSize = count * m_messageSize;
-			const FB_UINT64 writtenBytes = m_space.write(offset, buffer, fetchedSize);
-			fb_assert(writtenBytes == fetchedSize);
-			m_cachedCount += count;
+			const FB_UINT64 offset = m_cachedCount * m_message->msg_length;
+			const FB_UINT64 writtenBytes = m_space.write(offset, msgBuffer, m_message->msg_length);
+			fb_assert(writtenBytes == m_message->msg_length);
+			m_cachedCount++;
 		}
 
 		if (m_eof)
diff --git a/src/dsql/DsqlCursor.h b/src/dsql/DsqlCursor.h
index 04824ff..864a8b3 100644
--- a/src/dsql/DsqlCursor.h
+++ b/src/dsql/DsqlCursor.h
@@ -66,6 +66,7 @@ private:
 	bool cacheInput(thread_db* tdbb, FB_UINT64 position = MAX_UINT64);
 
 	dsql_req* const m_request;
+	const dsql_msg* const m_message;
 	JResultSet* m_resultSet;
 	const ULONG m_flags;
 	TempSpace m_space;
@@ -73,7 +74,6 @@ private:
 	bool m_eof;
 	FB_UINT64 m_position;
 	FB_UINT64 m_cachedCount;
-	ULONG m_messageSize;
 };
 
 } // namespace
diff --git a/src/dsql/dsql.cpp b/src/dsql/dsql.cpp
index 9254249..f13d146 100644
--- a/src/dsql/dsql.cpp
+++ b/src/dsql/dsql.cpp
@@ -80,9 +80,6 @@ using namespace Firebird;
 
 static ULONG	get_request_info(thread_db*, dsql_req*, ULONG, UCHAR*);
 static dsql_dbb*	init(Jrd::thread_db*, Jrd::Attachment*);
-static void		map_in_out(Jrd::thread_db*, dsql_req*, bool, const dsql_msg*, IMessageMetadata*, UCHAR*,
-	const UCHAR* = NULL);
-static USHORT	parse_metadata(dsql_req*, IMessageMetadata*, const Array<dsql_par*>&);
 static dsql_req* prepareRequest(thread_db*, dsql_dbb*, jrd_tra*, ULONG, const TEXT*, USHORT, bool);
 static dsql_req* prepareStatement(thread_db*, dsql_dbb*, jrd_tra*, ULONG, const TEXT*, USHORT, bool);
 static UCHAR*	put_item(UCHAR, const USHORT, const UCHAR*, UCHAR*, const UCHAR* const);
@@ -272,6 +269,12 @@ bool DsqlDmlRequest::fetch(thread_db* tdbb, UCHAR* msgBuffer)
 
 	dsql_msg* message = (dsql_msg*) statement->getReceiveMsg();
 
+	if (delayedFormat && message)
+	{
+		parseMetadata(delayedFormat, message->msg_parameters);
+		delayedFormat = NULL;
+	}
+
 	// Set up things for tracing this call
 	Jrd::Attachment* att = req_dbb->dbb_attachment;
 	TraceDSQLFetch trace(att, this);
@@ -285,13 +288,12 @@ bool DsqlDmlRequest::fetch(thread_db* tdbb, UCHAR* msgBuffer)
 
 	if (eofReached)
 	{
-		delayedFormat = NULL;
 		trace.fetch(true, ITracePlugin::RESULT_SUCCESS);
 		return false;
 	}
 
-	map_in_out(tdbb, this, true, message, delayedFormat, msgBuffer);
-	delayedFormat = NULL;
+	if (msgBuffer)
+		mapInOut(tdbb, true, message, NULL, msgBuffer);
 
 	trace.fetch(false, ITracePlugin::RESULT_SUCCESS);
 	return true;
@@ -679,9 +681,9 @@ void DsqlDmlRequest::execute(thread_db* tdbb, jrd_tra** traHandle,
 
 	const dsql_msg* message = statement->getSendMsg();
 	if (message)
-		map_in_out(tdbb, this, false, message, inMetadata, NULL, inMsg);
+		mapInOut(tdbb, false, message, inMetadata, NULL, inMsg);
 
-	// we need to map_in_out before tracing of execution start to let trace
+	// we need to mapInOut before tracing of execution start to let trace
 	// manager know statement parameters values
 	TraceDSQLExecute trace(req_dbb->dbb_attachment, this);
 
@@ -713,7 +715,7 @@ void DsqlDmlRequest::execute(thread_db* tdbb, jrd_tra** traHandle,
 	}
 
 	if (outMetadata && message)
-		parse_metadata(this, outMetadata, message->msg_parameters);
+		parseMetadata(outMetadata, message->msg_parameters);
 
 	if ((outMsg && message) || isBlock)
 	{
@@ -736,7 +738,7 @@ void DsqlDmlRequest::execute(thread_db* tdbb, jrd_tra** traHandle,
 		JRD_receive(tdbb, req_request, message->msg_number, message->msg_length, msgBuffer);
 
 		if (outMsg)
-			map_in_out(tdbb, this, true, message, NULL, outMsg);
+			mapInOut(tdbb, true, message, NULL, outMsg);
 
 		// if this is a singleton select, make sure there's in fact one record
 
@@ -989,13 +991,12 @@ static dsql_dbb* init(thread_db* tdbb, Jrd::Attachment* attachment)
 
 /**
 
- 	map_in_out
+	mapInOut
 
     @brief	Map data from external world into message or
  	from message to external world.
 
 
-    @param request
     @param toExternal
     @param message
     @param meta
@@ -1003,10 +1004,10 @@ static dsql_dbb* init(thread_db* tdbb, Jrd::Attachment* attachment)
     @param in_dsql_msg_buf
 
  **/
-static void map_in_out(thread_db* tdbb, dsql_req* request, bool toExternal, const dsql_msg* message,
+void dsql_req::mapInOut(thread_db* tdbb, bool toExternal, const dsql_msg* message,
 	IMessageMetadata* meta, UCHAR* dsql_msg_buf, const UCHAR* in_dsql_msg_buf)
 {
-	USHORT count = parse_metadata(request, meta, message->msg_parameters);
+	USHORT count = parseMetadata(meta, message->msg_parameters);
 
 	// Sanity check
 
@@ -1041,7 +1042,7 @@ static void map_in_out(thread_db* tdbb, dsql_req* request, bool toExternal, cons
 			 // Make sure the message given to us is long enough
 
 			dsc desc;
-			if (!request->req_user_descs.get(parameter, desc))
+			if (!req_user_descs.get(parameter, desc))
 				desc.clear();
 
 			/***
@@ -1059,14 +1060,14 @@ static void map_in_out(thread_db* tdbb, dsql_req* request, bool toExternal, cons
 					Arg::Gds(isc_dsql_sqlvar_index) << Arg::Num(parameter->par_index-1));
 			}
 
-			UCHAR* msgBuffer = request->req_msg_buffers[parameter->par_message->msg_buffer_number];
+			UCHAR* msgBuffer = req_msg_buffers[parameter->par_message->msg_buffer_number];
 
 			SSHORT* flag = NULL;
 			dsql_par* const null_ind = parameter->par_null;
 			if (null_ind != NULL)
 			{
 				dsc userNullDesc;
-				if (!request->req_user_descs.get(null_ind, userNullDesc))
+				if (!req_user_descs.get(null_ind, userNullDesc))
 					userNullDesc.clear();
 
 				const ULONG null_offset = (IPTR) userNullDesc.dsc_address;
@@ -1129,7 +1130,7 @@ static void map_in_out(thread_db* tdbb, dsql_req* request, bool toExternal, cons
 			Arg::Gds(isc_dsql_wrong_param_num) << Arg::Num(count) <<Arg::Num(count2));
 	}
 
-	const DsqlCompiledStatement* statement = request->getStatement();
+	const DsqlCompiledStatement* statement = getStatement();
 	const dsql_par* parameter;
 
 	const dsql_par* dbkey;
@@ -1138,7 +1139,7 @@ static void map_in_out(thread_db* tdbb, dsql_req* request, bool toExternal, cons
 	{
 		UCHAR* parentMsgBuffer = statement->getParentRequest() ?
 			statement->getParentRequest()->req_msg_buffers[dbkey->par_message->msg_buffer_number] : NULL;
-		UCHAR* msgBuffer = request->req_msg_buffers[parameter->par_message->msg_buffer_number];
+		UCHAR* msgBuffer = req_msg_buffers[parameter->par_message->msg_buffer_number];
 
 		fb_assert(parentMsgBuffer);
 
@@ -1168,7 +1169,7 @@ static void map_in_out(thread_db* tdbb, dsql_req* request, bool toExternal, cons
 		UCHAR* parentMsgBuffer = statement->getParentRequest() ?
 			statement->getParentRequest()->req_msg_buffers[rec_version->par_message->msg_buffer_number] :
 			NULL;
-		UCHAR* msgBuffer = request->req_msg_buffers[parameter->par_message->msg_buffer_number];
+		UCHAR* msgBuffer = req_msg_buffers[parameter->par_message->msg_buffer_number];
 
 		fb_assert(parentMsgBuffer);
 
@@ -1195,18 +1196,16 @@ static void map_in_out(thread_db* tdbb, dsql_req* request, bool toExternal, cons
 
 /**
 
- 	parse_metadata
+	parseMetadata
 
     @brief	Parse the message of a request.
 
 
-    @param request
     @param meta
     @param parameters_list
 
  **/
-static USHORT parse_metadata(dsql_req* request, IMessageMetadata* meta,
-	const Array<dsql_par*>& parameters_list)
+USHORT dsql_req::parseMetadata(IMessageMetadata* meta, const Array<dsql_par*>& parameters_list)
 {
 	HalfStaticArray<const dsql_par*, 16> parameters;
 
@@ -1280,7 +1279,7 @@ static USHORT parse_metadata(dsql_req* request, IMessageMetadata* meta,
 		if (desc.isText() && desc.getTextType() == ttype_dynamic)
 			desc.setTextType(ttype_none);
 
-		request->req_user_descs.put(parameter, desc);
+		req_user_descs.put(parameter, desc);
 
 		dsql_par* null = parameter->par_null;
 		if (null)
@@ -1291,7 +1290,7 @@ static USHORT parse_metadata(dsql_req* request, IMessageMetadata* meta,
 			desc.dsc_length = sizeof(SSHORT);
 			desc.dsc_address = (UCHAR*)(IPTR) nullOffset;
 
-			request->req_user_descs.put(null, desc);
+			req_user_descs.put(null, desc);
 		}
 	}
 
diff --git a/src/dsql/dsql.h b/src/dsql/dsql.h
index a5f359f..401d891 100644
--- a/src/dsql/dsql.h
+++ b/src/dsql/dsql.h
@@ -573,6 +573,10 @@ public:
 
 	virtual void setDelayedFormat(thread_db* tdbb, Firebird::IMessageMetadata* metadata);
 
+	USHORT parseMetadata(Firebird::IMessageMetadata* meta, const Firebird::Array<dsql_par*>& parameters_list);
+	void mapInOut(Jrd::thread_db* tdbb, bool toExternal, const dsql_msg* message, Firebird::IMessageMetadata* meta,
+		UCHAR* dsql_msg_buf, const UCHAR* in_dsql_msg_buf = NULL);
+
 	static void destroy(thread_db* tdbb, dsql_req* request, bool drop);
 
 private:
diff --git a/src/dsql/pass1.cpp b/src/dsql/pass1.cpp
index 384208e..fcb1cc8 100644
--- a/src/dsql/pass1.cpp
+++ b/src/dsql/pass1.cpp
@@ -2761,16 +2761,11 @@ static void pass1_union_auto_cast(DsqlCompilerScratch* dsqlScratch, ExprNode* in
 					field->length = desc.dsc_length;
 					field->flags = (desc.dsc_flags & DSC_nullable) ? FLD_nullable : 0;
 
-					if (desc.dsc_dtype <= dtype_any_text)
+					if (desc.isText() || desc.isBlob())
 					{
-						field->textType = desc.dsc_sub_type;
-						field->charSetId = INTL_GET_CHARSET(&desc);
-						field->collationId = INTL_GET_COLLATE(&desc);
-					}
-					else if (desc.dsc_dtype == dtype_blob)
-					{
-						field->charSetId = desc.dsc_scale;
-						field->collationId = desc.dsc_flags >> 8;
+						field->textType = desc.getTextType();
+						field->charSetId = desc.getCharSet();
+						field->collationId = desc.getCollation();
 					}
 
 					// Finally copy the descriptors to the root nodes and swap
diff --git a/src/extlib/ib_util.cpp b/src/extlib/ib_util.cpp
index 8f74f5e..ffefb10 100644
--- a/src/extlib/ib_util.cpp
+++ b/src/extlib/ib_util.cpp
@@ -21,19 +21,18 @@
 #include <stdlib.h>
 #include "ib_udf.h"
 #include "firebird.h"
-
-typedef void* VoidPtr;
+#include "ibase.h"
 
 
 // initialized by the engine
 static void* (*allocFunc)(long) = NULL;
 
-extern "C" void FB_EXPORTED ib_util_init(void* (*aAllocFunc)(long))
+extern "C" FB_DLL_EXPORT void ib_util_init(void* (*aAllocFunc)(long))
 {
 	allocFunc = aAllocFunc;
 }
 
-extern "C" VoidPtr FB_EXPORTED ib_util_malloc(long size)
+extern "C" FB_DLL_EXPORT void* ib_util_malloc(long size)
 {
 	return allocFunc ? allocFunc(size) : malloc(size);
 }
diff --git a/src/include/consts_pub.h b/src/include/consts_pub.h
index 6107e09..769a3e3 100644
--- a/src/include/consts_pub.h
+++ b/src/include/consts_pub.h
@@ -123,6 +123,7 @@
 #define isc_dpb_nolinger				  88
 #define isc_dpb_reset_icu				  89
 #define isc_dpb_map_attach                90
+#define isc_dpb_clear_map                 96
 
 /**************************************************/
 /* clumplet tags used inside isc_dpb_address_path */
diff --git a/src/include/fb_exception.h b/src/include/fb_exception.h
index 3551ac4..5847e31 100644
--- a/src/include/fb_exception.h
+++ b/src/include/fb_exception.h
@@ -132,9 +132,11 @@ class system_error : public status_exception
 {
 private:
 	int errorCode;
-public:
-	system_error(const char* syscall, int error_code);
 
+protected:
+	system_error(const char* syscall, const char* arg, int error_code);
+
+public:
 	static void raise(const char* syscall, int error_code);
 	static void raise(const char* syscall);
 
@@ -150,11 +152,14 @@ public:
 // it will call abort() in DEV_BUILD to create core dump
 class system_call_failed : public system_error
 {
-public:
-	system_call_failed(const char* syscall, int error_code);
+protected:
+	system_call_failed(const char* syscall, const char* arg, int error_code);
 
+public:
 	static void raise(const char* syscall, int error_code);
 	static void raise(const char* syscall);
+	static void raise(const char* syscall, const char* arg, int error_code);
+	static void raise(const char* syscall, const char* arg);
 };
 
 class fatal_exception : public status_exception
diff --git a/src/include/firebird.h b/src/include/firebird.h
index 87f0a11..6b8cb18 100644
--- a/src/include/firebird.h
+++ b/src/include/firebird.h
@@ -43,13 +43,6 @@
 #define DEBUG_GDS_ALLOC
 #endif
 
-#if defined(WIN_NT)
-#define FB_DLL_EXPORT __declspec(dllexport)
-#elif defined(DARWIN)
-#define FB_DLL_EXPORT API_ROUTINE
-#else
-#define FB_DLL_EXPORT
-#endif
 //#if defined(SOLX86)
 // this pragmas is used only with gcc 2.95!
 //#define __PRAGMA_REDEFINE_EXTNAME
diff --git a/src/include/firebird/UdrCppEngine.h b/src/include/firebird/UdrCppEngine.h
index 26ef5a0..d9aac7e 100644
--- a/src/include/firebird/UdrCppEngine.h
+++ b/src/include/firebird/UdrCppEngine.h
@@ -43,7 +43,7 @@
 		}	\
 	}	\
 	\
-	extern "C" FB_BOOLEAN* FB_UDR_PLUGIN_ENTRY_POINT(::Firebird::IStatus* status,	\
+	extern "C" FB_DLL_EXPORT FB_BOOLEAN* FB_UDR_PLUGIN_ENTRY_POINT(::Firebird::IStatus* status,	\
 		FB_BOOLEAN* theirUnloadFlag, ::Firebird::IUdrPlugin* udrPlugin)	\
 	{	\
 		::Firebird::Udr::FactoryRegistration::finish(status, udrPlugin);	\
diff --git a/src/include/gen/Firebird.pas b/src/include/gen/Firebird.pas
index 1574458..a891103 100644
--- a/src/include/gen/Firebird.pas
+++ b/src/include/gen/Firebird.pas
@@ -3136,7 +3136,9 @@ type
 		procedure registerTrigger(status: IStatus; name: PAnsiChar; factory: IUdrTriggerFactory); virtual; abstract;
 	end;
 
+{$IFNDEF NO_FBCLIENT}
 	function fb_get_master_interface : IMaster; cdecl; external 'fbclient';
+{$ENDIF}
 
 const
 	isc_dpb_version1 = byte(1);
@@ -3231,6 +3233,7 @@ const
 	isc_dpb_nolinger = byte(88);
 	isc_dpb_reset_icu = byte(89);
 	isc_dpb_map_attach = byte(90);
+	isc_dpb_clear_map = byte(96);
 	isc_dpb_address = byte(1);
 	isc_dpb_addr_protocol = byte(1);
 	isc_dpb_addr_endpoint = byte(2);
diff --git a/src/include/gen/msgs.h b/src/include/gen/msgs.h
index ceddcaa..ed0ae35 100644
--- a/src/include/gen/msgs.h
+++ b/src/include/gen/msgs.h
@@ -688,7 +688,7 @@ Data source : @4"},		/* eds_statement */
 	{335544981, "Floating point overflow in built-in function @1"},		/* sysf_fp_overflow */
 	{335544982, "Floating point overflow in result from UDF @1"},		/* udf_fp_overflow */
 	{335544983, "Invalid floating point value returned by UDF @1"},		/* udf_fp_nan */
-	{335544984, "Database is probably already opened by another engine instance in another Windows session"},		/* instance_conflict */
+	{335544984, "Shared memory area is probably already created by another engine instance in another Windows session"},		/* instance_conflict */
 	{335544985, "No free space found in temporary directories"},		/* out_of_temp_space */
 	{335544986, "Explicit transaction control is not allowed"},		/* eds_expl_tran_ctrl */
 	{335544987, "Use of TRUSTED switches in spb_command_line is prohibited"},		/* no_trusted_spb */
diff --git a/src/include/gen/sql_code.h b/src/include/gen/sql_code.h
index 1ba18ed..2d975f8 100644
--- a/src/include/gen/sql_code.h
+++ b/src/include/gen/sql_code.h
@@ -858,7 +858,7 @@ static const struct {
 	{336003092, -502}, /*  20 dsql_cursor_exists */
 	{336003093, -502}, /*  21 dsql_cursor_rel_ambiguous */
 	{336003094, -502}, /*  22 dsql_cursor_rel_not_found */
-	{336003095, -502}, /*  23 dsql_cursor_not_open */
+	{336003095, -504}, /*  23 dsql_cursor_not_open */
 	{336003096, -607}, /*  24 dsql_type_not_supp_ext_tab */
 	{336003097, -804}, /*  25 dsql_feature_not_supported_ods */
 	{336003098, -660}, /*  26 primary_key_required */
diff --git a/src/intl/charsets/cs_437.h b/src/intl/charsets/cs_437.h
index 9c70b0f..b408d39 100644
--- a/src/intl/charsets/cs_437.h
+++ b/src/intl/charsets/cs_437.h
@@ -3,274 +3,8 @@
 
     Unicode mapping table generated from java mapping and UnicodeData.txt
 
-#
 #    Name:     Cp437 to Unicode table
 #    Unicode version: Java 1.3
-#
-#    Format: Three tab-separated columns
-#        Column #1 is the Cp437 code (in hex)
-#        Column #2 is the Unicode (in hex as 0xXXXX)
-#        Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#    The entries are in Cp437 order
-#
-0x00	0x0000	#NULL
-0x01	0x0001	#START OF HEADING
-0x02	0x0002	#START OF TEXT
-0x03	0x0003	#END OF TEXT
-0x04	0x0004	#END OF TRANSMISSION
-0x05	0x0005	#ENQUIRY
-0x06	0x0006	#ACKNOWLEDGE
-0x07	0x0007	#BELL
-0x08	0x0008	#BACKSPACE
-0x09	0x0009	#CHARACTER TABULATION
-0x0a	0x000a	#LINE FEED (LF)
-0x0b	0x000b	#LINE TABULATION
-0x0c	0x000c	#FORM FEED (FF)
-0x0d	0x000d	#CARRIAGE RETURN (CR)
-0x0e	0x000e	#SHIFT OUT
-0x0f	0x000f	#SHIFT IN
-0x10	0x0010	#DATA LINK ESCAPE
-0x11	0x0011	#DEVICE CONTROL ONE
-0x12	0x0012	#DEVICE CONTROL TWO
-0x13	0x0013	#DEVICE CONTROL THREE
-0x14	0x0014	#DEVICE CONTROL FOUR
-0x15	0x0015	#NEGATIVE ACKNOWLEDGE
-0x16	0x0016	#SYNCHRONOUS IDLE
-0x17	0x0017	#END OF TRANSMISSION BLOCK
-0x18	0x0018	#CANCEL
-0x19	0x0019	#END OF MEDIUM
-0x1a	0x001a	#SUBSTITUTE
-0x1b	0x001b	#ESCAPE
-0x1c	0x001c	#INFORMATION SEPARATOR FOUR
-0x1d	0x001d	#INFORMATION SEPARATOR THREE
-0x1e	0x001e	#INFORMATION SEPARATOR TWO
-0x1f	0x001f	#INFORMATION SEPARATOR ONE
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2a	0x002a	#ASTERISK
-0x2b	0x002b	#PLUS SIGN
-0x2c	0x002c	#COMMA
-0x2d	0x002d	#HYPHEN-MINUS
-0x2e	0x002e	#FULL STOP
-0x2f	0x002f	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3a	0x003a	#COLON
-0x3b	0x003b	#SEMICOLON
-0x3c	0x003c	#LESS-THAN SIGN
-0x3d	0x003d	#EQUALS SIGN
-0x3e	0x003e	#GREATER-THAN SIGN
-0x3f	0x003f	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4a	0x004a	#LATIN CAPITAL LETTER J
-0x4b	0x004b	#LATIN CAPITAL LETTER K
-0x4c	0x004c	#LATIN CAPITAL LETTER L
-0x4d	0x004d	#LATIN CAPITAL LETTER M
-0x4e	0x004e	#LATIN CAPITAL LETTER N
-0x4f	0x004f	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5a	0x005a	#LATIN CAPITAL LETTER Z
-0x5b	0x005b	#LEFT SQUARE BRACKET
-0x5c	0x005c	#REVERSE SOLIDUS
-0x5d	0x005d	#RIGHT SQUARE BRACKET
-0x5e	0x005e	#CIRCUMFLEX ACCENT
-0x5f	0x005f	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6a	0x006a	#LATIN SMALL LETTER J
-0x6b	0x006b	#LATIN SMALL LETTER K
-0x6c	0x006c	#LATIN SMALL LETTER L
-0x6d	0x006d	#LATIN SMALL LETTER M
-0x6e	0x006e	#LATIN SMALL LETTER N
-0x6f	0x006f	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7a	0x007a	#LATIN SMALL LETTER Z
-0x7b	0x007b	#LEFT CURLY BRACKET
-0x7c	0x007c	#VERTICAL LINE
-0x7d	0x007d	#RIGHT CURLY BRACKET
-0x7e	0x007e	#TILDE
-0x7f	0x007f	#DELETE
-0x80	0x00c7	#LATIN CAPITAL LETTER C WITH CEDILLA
-0x81	0x00fc	#LATIN SMALL LETTER U WITH DIAERESIS
-0x82	0x00e9	#LATIN SMALL LETTER E WITH ACUTE
-0x83	0x00e2	#LATIN SMALL LETTER A WITH CIRCUMFLEX
-0x84	0x00e4	#LATIN SMALL LETTER A WITH DIAERESIS
-0x85	0x00e0	#LATIN SMALL LETTER A WITH GRAVE
-0x86	0x00e5	#LATIN SMALL LETTER A WITH RING ABOVE
-0x87	0x00e7	#LATIN SMALL LETTER C WITH CEDILLA
-0x88	0x00ea	#LATIN SMALL LETTER E WITH CIRCUMFLEX
-0x89	0x00eb	#LATIN SMALL LETTER E WITH DIAERESIS
-0x8a	0x00e8	#LATIN SMALL LETTER E WITH GRAVE
-0x8b	0x00ef	#LATIN SMALL LETTER I WITH DIAERESIS
-0x8c	0x00ee	#LATIN SMALL LETTER I WITH CIRCUMFLEX
-0x8d	0x00ec	#LATIN SMALL LETTER I WITH GRAVE
-0x8e	0x00c4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0x8f	0x00c5	#LATIN CAPITAL LETTER A WITH RING ABOVE
-0x90	0x00c9	#LATIN CAPITAL LETTER E WITH ACUTE
-0x91	0x00e6	#LATIN SMALL LETTER AE
-0x92	0x00c6	#LATIN CAPITAL LETTER AE
-0x93	0x00f4	#LATIN SMALL LETTER O WITH CIRCUMFLEX
-0x94	0x00f6	#LATIN SMALL LETTER O WITH DIAERESIS
-0x95	0x00f2	#LATIN SMALL LETTER O WITH GRAVE
-0x96	0x00fb	#LATIN SMALL LETTER U WITH CIRCUMFLEX
-0x97	0x00f9	#LATIN SMALL LETTER U WITH GRAVE
-0x98	0x00ff	#LATIN SMALL LETTER Y WITH DIAERESIS
-0x99	0x00d6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0x9a	0x00dc	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0x9b	0x00a2	#CENT SIGN
-0x9c	0x00a3	#POUND SIGN
-0x9d	0x00a5	#YEN SIGN
-0x9e	0x20a7	#PESETA SIGN
-0x9f	0x0192	#LATIN SMALL LETTER F WITH HOOK
-0xa0	0x00e1	#LATIN SMALL LETTER A WITH ACUTE
-0xa1	0x00ed	#LATIN SMALL LETTER I WITH ACUTE
-0xa2	0x00f3	#LATIN SMALL LETTER O WITH ACUTE
-0xa3	0x00fa	#LATIN SMALL LETTER U WITH ACUTE
-0xa4	0x00f1	#LATIN SMALL LETTER N WITH TILDE
-0xa5	0x00d1	#LATIN CAPITAL LETTER N WITH TILDE
-0xa6	0x00aa	#FEMININE ORDINAL INDICATOR
-0xa7	0x00ba	#MASCULINE ORDINAL INDICATOR
-0xa8	0x00bf	#INVERTED QUESTION MARK
-0xa9	0x2310	#REVERSED NOT SIGN
-0xaa	0x00ac	#NOT SIGN
-0xab	0x00bd	#VULGAR FRACTION ONE HALF
-0xac	0x00bc	#VULGAR FRACTION ONE QUARTER
-0xad	0x00a1	#INVERTED EXCLAMATION MARK
-0xae	0x00ab	#LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xaf	0x00bb	#RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xb0	0x2591	#LIGHT SHADE
-0xb1	0x2592	#MEDIUM SHADE
-0xb2	0x2593	#DARK SHADE
-0xb3	0x2502	#BOX DRAWINGS LIGHT VERTICAL
-0xb4	0x2524	#BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0xb5	0x2561	#BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-0xb6	0x2562	#BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
-0xb7	0x2556	#BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
-0xb8	0x2555	#BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
-0xb9	0x2563	#BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-0xba	0x2551	#BOX DRAWINGS DOUBLE VERTICAL
-0xbb	0x2557	#BOX DRAWINGS DOUBLE DOWN AND LEFT
-0xbc	0x255d	#BOX DRAWINGS DOUBLE UP AND LEFT
-0xbd	0x255c	#BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
-0xbe	0x255b	#BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-0xbf	0x2510	#BOX DRAWINGS LIGHT DOWN AND LEFT
-0xc0	0x2514	#BOX DRAWINGS LIGHT UP AND RIGHT
-0xc1	0x2534	#BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0xc2	0x252c	#BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0xc3	0x251c	#BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0xc4	0x2500	#BOX DRAWINGS LIGHT HORIZONTAL
-0xc5	0x253c	#BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0xc6	0x255e	#BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-0xc7	0x255f	#BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-0xc8	0x255a	#BOX DRAWINGS DOUBLE UP AND RIGHT
-0xc9	0x2554	#BOX DRAWINGS DOUBLE DOWN AND RIGHT
-0xca	0x2569	#BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-0xcb	0x2566	#BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-0xcc	0x2560	#BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-0xcd	0x2550	#BOX DRAWINGS DOUBLE HORIZONTAL
-0xce	0x256c	#BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-0xcf	0x2567	#BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-0xd0	0x2568	#BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-0xd1	0x2564	#BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
-0xd2	0x2565	#BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
-0xd3	0x2559	#BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-0xd4	0x2558	#BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-0xd5	0x2552	#BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-0xd6	0x2553	#BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
-0xd7	0x256b	#BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
-0xd8	0x256a	#BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-0xd9	0x2518	#BOX DRAWINGS LIGHT UP AND LEFT
-0xda	0x250c	#BOX DRAWINGS LIGHT DOWN AND RIGHT
-0xdb	0x2588	#FULL BLOCK
-0xdc	0x2584	#LOWER HALF BLOCK
-0xdd	0x258c	#LEFT HALF BLOCK
-0xde	0x2590	#RIGHT HALF BLOCK
-0xdf	0x2580	#UPPER HALF BLOCK
-0xe0	0x03b1	#GREEK SMALL LETTER ALPHA
-0xe1	0x00df	#LATIN SMALL LETTER SHARP S
-0xe2	0x0393	#GREEK CAPITAL LETTER GAMMA
-0xe3	0x03c0	#GREEK SMALL LETTER PI
-0xe4	0x03a3	#GREEK CAPITAL LETTER SIGMA
-0xe5	0x03c3	#GREEK SMALL LETTER SIGMA
-0xe6	0x00b5	#MICRO SIGN
-0xe7	0x03c4	#GREEK SMALL LETTER TAU
-0xe8	0x03a6	#GREEK CAPITAL LETTER PHI
-0xe9	0x0398	#GREEK CAPITAL LETTER THETA
-0xea	0x03a9	#GREEK CAPITAL LETTER OMEGA
-0xeb	0x03b4	#GREEK SMALL LETTER DELTA
-0xec	0x221e	#INFINITY
-0xed	0x03c6	#GREEK SMALL LETTER PHI
-0xee	0x03b5	#GREEK SMALL LETTER EPSILON
-0xef	0x2229	#INTERSECTION
-0xf0	0x2261	#IDENTICAL TO
-0xf1	0x00b1	#PLUS-MINUS SIGN
-0xf2	0x2265	#GREATER-THAN OR EQUAL TO
-0xf3	0x2264	#LESS-THAN OR EQUAL TO
-0xf4	0x2320	#TOP HALF INTEGRAL
-0xf5	0x2321	#BOTTOM HALF INTEGRAL
-0xf6	0x00f7	#DIVISION SIGN
-0xf7	0x2248	#ALMOST EQUAL TO
-0xf8	0x00b0	#DEGREE SIGN
-0xf9	0x2219	#BULLET OPERATOR
-0xfa	0x00b7	#MIDDLE DOT
-0xfb	0x221a	#SQUARE ROOT
-0xfc	0x207f	#SUPERSCRIPT LATIN SMALL LETTER N
-0xfd	0x00b2	#SUPERSCRIPT TWO
-0xfe	0x25a0	#BLACK SQUARE
-0xff	0x00a0	#NO-BREAK SPACE
-
 
  * The contents of this file are subject to the Interbase Public
  * License Version 1.0 (the "License"); you may not use this file
diff --git a/src/intl/charsets/cs_737.h b/src/intl/charsets/cs_737.h
index 7f34bc7..d569532 100644
--- a/src/intl/charsets/cs_737.h
+++ b/src/intl/charsets/cs_737.h
@@ -3,274 +3,8 @@
 
     Unicode mapping table generated from java mapping and UnicodeData.txt
 
-#
 #    Name:     Cp737 to Unicode table
 #    Unicode version: Java 1.3
-#
-#    Format: Three tab-separated columns
-#        Column #1 is the Cp737 code (in hex)
-#        Column #2 is the Unicode (in hex as 0xXXXX)
-#        Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#    The entries are in Cp737 order
-#
-0x00	0x0000	#NULL
-0x01	0x0001	#START OF HEADING
-0x02	0x0002	#START OF TEXT
-0x03	0x0003	#END OF TEXT
-0x04	0x0004	#END OF TRANSMISSION
-0x05	0x0005	#ENQUIRY
-0x06	0x0006	#ACKNOWLEDGE
-0x07	0x0007	#BELL
-0x08	0x0008	#BACKSPACE
-0x09	0x0009	#CHARACTER TABULATION
-0x0a	0x000a	#LINE FEED (LF)
-0x0b	0x000b	#LINE TABULATION
-0x0c	0x000c	#FORM FEED (FF)
-0x0d	0x000d	#CARRIAGE RETURN (CR)
-0x0e	0x000e	#SHIFT OUT
-0x0f	0x000f	#SHIFT IN
-0x10	0x0010	#DATA LINK ESCAPE
-0x11	0x0011	#DEVICE CONTROL ONE
-0x12	0x0012	#DEVICE CONTROL TWO
-0x13	0x0013	#DEVICE CONTROL THREE
-0x14	0x0014	#DEVICE CONTROL FOUR
-0x15	0x0015	#NEGATIVE ACKNOWLEDGE
-0x16	0x0016	#SYNCHRONOUS IDLE
-0x17	0x0017	#END OF TRANSMISSION BLOCK
-0x18	0x0018	#CANCEL
-0x19	0x0019	#END OF MEDIUM
-0x1a	0x001a	#SUBSTITUTE
-0x1b	0x001b	#ESCAPE
-0x1c	0x001c	#INFORMATION SEPARATOR FOUR
-0x1d	0x001d	#INFORMATION SEPARATOR THREE
-0x1e	0x001e	#INFORMATION SEPARATOR TWO
-0x1f	0x001f	#INFORMATION SEPARATOR ONE
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2a	0x002a	#ASTERISK
-0x2b	0x002b	#PLUS SIGN
-0x2c	0x002c	#COMMA
-0x2d	0x002d	#HYPHEN-MINUS
-0x2e	0x002e	#FULL STOP
-0x2f	0x002f	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3a	0x003a	#COLON
-0x3b	0x003b	#SEMICOLON
-0x3c	0x003c	#LESS-THAN SIGN
-0x3d	0x003d	#EQUALS SIGN
-0x3e	0x003e	#GREATER-THAN SIGN
-0x3f	0x003f	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4a	0x004a	#LATIN CAPITAL LETTER J
-0x4b	0x004b	#LATIN CAPITAL LETTER K
-0x4c	0x004c	#LATIN CAPITAL LETTER L
-0x4d	0x004d	#LATIN CAPITAL LETTER M
-0x4e	0x004e	#LATIN CAPITAL LETTER N
-0x4f	0x004f	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5a	0x005a	#LATIN CAPITAL LETTER Z
-0x5b	0x005b	#LEFT SQUARE BRACKET
-0x5c	0x005c	#REVERSE SOLIDUS
-0x5d	0x005d	#RIGHT SQUARE BRACKET
-0x5e	0x005e	#CIRCUMFLEX ACCENT
-0x5f	0x005f	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6a	0x006a	#LATIN SMALL LETTER J
-0x6b	0x006b	#LATIN SMALL LETTER K
-0x6c	0x006c	#LATIN SMALL LETTER L
-0x6d	0x006d	#LATIN SMALL LETTER M
-0x6e	0x006e	#LATIN SMALL LETTER N
-0x6f	0x006f	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7a	0x007a	#LATIN SMALL LETTER Z
-0x7b	0x007b	#LEFT CURLY BRACKET
-0x7c	0x007c	#VERTICAL LINE
-0x7d	0x007d	#RIGHT CURLY BRACKET
-0x7e	0x007e	#TILDE
-0x7f	0x007f	#DELETE
-0x80	0x0391	#GREEK CAPITAL LETTER ALPHA
-0x81	0x0392	#GREEK CAPITAL LETTER BETA
-0x82	0x0393	#GREEK CAPITAL LETTER GAMMA
-0x83	0x0394	#GREEK CAPITAL LETTER DELTA
-0x84	0x0395	#GREEK CAPITAL LETTER EPSILON
-0x85	0x0396	#GREEK CAPITAL LETTER ZETA
-0x86	0x0397	#GREEK CAPITAL LETTER ETA
-0x87	0x0398	#GREEK CAPITAL LETTER THETA
-0x88	0x0399	#GREEK CAPITAL LETTER IOTA
-0x89	0x039a	#GREEK CAPITAL LETTER KAPPA
-0x8a	0x039b	#GREEK CAPITAL LETTER LAMDA
-0x8b	0x039c	#GREEK CAPITAL LETTER MU
-0x8c	0x039d	#GREEK CAPITAL LETTER NU
-0x8d	0x039e	#GREEK CAPITAL LETTER XI
-0x8e	0x039f	#GREEK CAPITAL LETTER OMICRON
-0x8f	0x03a0	#GREEK CAPITAL LETTER PI
-0x90	0x03a1	#GREEK CAPITAL LETTER RHO
-0x91	0x03a3	#GREEK CAPITAL LETTER SIGMA
-0x92	0x03a4	#GREEK CAPITAL LETTER TAU
-0x93	0x03a5	#GREEK CAPITAL LETTER UPSILON
-0x94	0x03a6	#GREEK CAPITAL LETTER PHI
-0x95	0x03a7	#GREEK CAPITAL LETTER CHI
-0x96	0x03a8	#GREEK CAPITAL LETTER PSI
-0x97	0x03a9	#GREEK CAPITAL LETTER OMEGA
-0x98	0x03b1	#GREEK SMALL LETTER ALPHA
-0x99	0x03b2	#GREEK SMALL LETTER BETA
-0x9a	0x03b3	#GREEK SMALL LETTER GAMMA
-0x9b	0x03b4	#GREEK SMALL LETTER DELTA
-0x9c	0x03b5	#GREEK SMALL LETTER EPSILON
-0x9d	0x03b6	#GREEK SMALL LETTER ZETA
-0x9e	0x03b7	#GREEK SMALL LETTER ETA
-0x9f	0x03b8	#GREEK SMALL LETTER THETA
-0xa0	0x03b9	#GREEK SMALL LETTER IOTA
-0xa1	0x03ba	#GREEK SMALL LETTER KAPPA
-0xa2	0x03bb	#GREEK SMALL LETTER LAMDA
-0xa3	0x03bc	#GREEK SMALL LETTER MU
-0xa4	0x03bd	#GREEK SMALL LETTER NU
-0xa5	0x03be	#GREEK SMALL LETTER XI
-0xa6	0x03bf	#GREEK SMALL LETTER OMICRON
-0xa7	0x03c0	#GREEK SMALL LETTER PI
-0xa8	0x03c1	#GREEK SMALL LETTER RHO
-0xa9	0x03c3	#GREEK SMALL LETTER SIGMA
-0xaa	0x03c2	#GREEK SMALL LETTER FINAL SIGMA
-0xab	0x03c4	#GREEK SMALL LETTER TAU
-0xac	0x03c5	#GREEK SMALL LETTER UPSILON
-0xad	0x03c6	#GREEK SMALL LETTER PHI
-0xae	0x03c7	#GREEK SMALL LETTER CHI
-0xaf	0x03c8	#GREEK SMALL LETTER PSI
-0xb0	0x2591	#LIGHT SHADE
-0xb1	0x2592	#MEDIUM SHADE
-0xb2	0x2593	#DARK SHADE
-0xb3	0x2502	#BOX DRAWINGS LIGHT VERTICAL
-0xb4	0x2524	#BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0xb5	0x2561	#BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-0xb6	0x2562	#BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
-0xb7	0x2556	#BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
-0xb8	0x2555	#BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
-0xb9	0x2563	#BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-0xba	0x2551	#BOX DRAWINGS DOUBLE VERTICAL
-0xbb	0x2557	#BOX DRAWINGS DOUBLE DOWN AND LEFT
-0xbc	0x255d	#BOX DRAWINGS DOUBLE UP AND LEFT
-0xbd	0x255c	#BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
-0xbe	0x255b	#BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-0xbf	0x2510	#BOX DRAWINGS LIGHT DOWN AND LEFT
-0xc0	0x2514	#BOX DRAWINGS LIGHT UP AND RIGHT
-0xc1	0x2534	#BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0xc2	0x252c	#BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0xc3	0x251c	#BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0xc4	0x2500	#BOX DRAWINGS LIGHT HORIZONTAL
-0xc5	0x253c	#BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0xc6	0x255e	#BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-0xc7	0x255f	#BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-0xc8	0x255a	#BOX DRAWINGS DOUBLE UP AND RIGHT
-0xc9	0x2554	#BOX DRAWINGS DOUBLE DOWN AND RIGHT
-0xca	0x2569	#BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-0xcb	0x2566	#BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-0xcc	0x2560	#BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-0xcd	0x2550	#BOX DRAWINGS DOUBLE HORIZONTAL
-0xce	0x256c	#BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-0xcf	0x2567	#BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-0xd0	0x2568	#BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-0xd1	0x2564	#BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
-0xd2	0x2565	#BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
-0xd3	0x2559	#BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-0xd4	0x2558	#BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-0xd5	0x2552	#BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-0xd6	0x2553	#BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
-0xd7	0x256b	#BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
-0xd8	0x256a	#BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-0xd9	0x2518	#BOX DRAWINGS LIGHT UP AND LEFT
-0xda	0x250c	#BOX DRAWINGS LIGHT DOWN AND RIGHT
-0xdb	0x2588	#FULL BLOCK
-0xdc	0x2584	#LOWER HALF BLOCK
-0xdd	0x258c	#LEFT HALF BLOCK
-0xde	0x2590	#RIGHT HALF BLOCK
-0xdf	0x2580	#UPPER HALF BLOCK
-0xe0	0x03c9	#GREEK SMALL LETTER OMEGA
-0xe1	0x03ac	#GREEK SMALL LETTER ALPHA WITH TONOS
-0xe2	0x03ad	#GREEK SMALL LETTER EPSILON WITH TONOS
-0xe3	0x03ae	#GREEK SMALL LETTER ETA WITH TONOS
-0xe4	0x03ca	#GREEK SMALL LETTER IOTA WITH DIALYTIKA
-0xe5	0x03af	#GREEK SMALL LETTER IOTA WITH TONOS
-0xe6	0x03cc	#GREEK SMALL LETTER OMICRON WITH TONOS
-0xe7	0x03cd	#GREEK SMALL LETTER UPSILON WITH TONOS
-0xe8	0x03cb	#GREEK SMALL LETTER UPSILON WITH DIALYTIKA
-0xe9	0x03ce	#GREEK SMALL LETTER OMEGA WITH TONOS
-0xea	0x0386	#GREEK CAPITAL LETTER ALPHA WITH TONOS
-0xeb	0x0388	#GREEK CAPITAL LETTER EPSILON WITH TONOS
-0xec	0x0389	#GREEK CAPITAL LETTER ETA WITH TONOS
-0xed	0x038a	#GREEK CAPITAL LETTER IOTA WITH TONOS
-0xee	0x038c	#GREEK CAPITAL LETTER OMICRON WITH TONOS
-0xef	0x038e	#GREEK CAPITAL LETTER UPSILON WITH TONOS
-0xf0	0x038f	#GREEK CAPITAL LETTER OMEGA WITH TONOS
-0xf1	0x00b1	#PLUS-MINUS SIGN
-0xf2	0x2265	#GREATER-THAN OR EQUAL TO
-0xf3	0x2264	#LESS-THAN OR EQUAL TO
-0xf4	0x03aa	#GREEK CAPITAL LETTER IOTA WITH DIALYTIKA
-0xf5	0x03ab	#GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA
-0xf6	0x00f7	#DIVISION SIGN
-0xf7	0x2248	#ALMOST EQUAL TO
-0xf8	0x00b0	#DEGREE SIGN
-0xf9	0x2219	#BULLET OPERATOR
-0xfa	0x00b7	#MIDDLE DOT
-0xfb	0x221a	#SQUARE ROOT
-0xfc	0x207f	#SUPERSCRIPT LATIN SMALL LETTER N
-0xfd	0x00b2	#SUPERSCRIPT TWO
-0xfe	0x25a0	#BLACK SQUARE
-0xff	0x00a0	#NO-BREAK SPACE
-
 
  * The contents of this file are subject to the Interbase Public
  * License Version 1.0 (the "License"); you may not use this file
diff --git a/src/intl/charsets/cs_775.h b/src/intl/charsets/cs_775.h
index f0eb0bb..d387ff0 100644
--- a/src/intl/charsets/cs_775.h
+++ b/src/intl/charsets/cs_775.h
@@ -3,274 +3,8 @@
 
     Unicode mapping table generated from java mapping and UnicodeData.txt
 
-#
 #    Name:     Cp775 to Unicode table
 #    Unicode version: Java 1.3
-#
-#    Format: Three tab-separated columns
-#        Column #1 is the Cp775 code (in hex)
-#        Column #2 is the Unicode (in hex as 0xXXXX)
-#        Column #3 is the Unicode name (follows a comment sign, '#')
-#
-#    The entries are in Cp775 order
-#
-0x00	0x0000	#NULL
-0x01	0x0001	#START OF HEADING
-0x02	0x0002	#START OF TEXT
-0x03	0x0003	#END OF TEXT
-0x04	0x0004	#END OF TRANSMISSION
-0x05	0x0005	#ENQUIRY
-0x06	0x0006	#ACKNOWLEDGE
-0x07	0x0007	#BELL
-0x08	0x0008	#BACKSPACE
-0x09	0x0009	#CHARACTER TABULATION
-0x0a	0x000a	#LINE FEED (LF)
-0x0b	0x000b	#LINE TABULATION
-0x0c	0x000c	#FORM FEED (FF)
-0x0d	0x000d	#CARRIAGE RETURN (CR)
-0x0e	0x000e	#SHIFT OUT
-0x0f	0x000f	#SHIFT IN
-0x10	0x0010	#DATA LINK ESCAPE
-0x11	0x0011	#DEVICE CONTROL ONE
-0x12	0x0012	#DEVICE CONTROL TWO
-0x13	0x0013	#DEVICE CONTROL THREE
-0x14	0x0014	#DEVICE CONTROL FOUR
-0x15	0x0015	#NEGATIVE ACKNOWLEDGE
-0x16	0x0016	#SYNCHRONOUS IDLE
-0x17	0x0017	#END OF TRANSMISSION BLOCK
-0x18	0x0018	#CANCEL
-0x19	0x0019	#END OF MEDIUM
-0x1a	0x001a	#SUBSTITUTE
-0x1b	0x001b	#ESCAPE
-0x1c	0x001c	#INFORMATION SEPARATOR FOUR
-0x1d	0x001d	#INFORMATION SEPARATOR THREE
-0x1e	0x001e	#INFORMATION SEPARATOR TWO
-0x1f	0x001f	#INFORMATION SEPARATOR ONE
-0x20	0x0020	#SPACE
-0x21	0x0021	#EXCLAMATION MARK
-0x22	0x0022	#QUOTATION MARK
-0x23	0x0023	#NUMBER SIGN
-0x24	0x0024	#DOLLAR SIGN
-0x25	0x0025	#PERCENT SIGN
-0x26	0x0026	#AMPERSAND
-0x27	0x0027	#APOSTROPHE
-0x28	0x0028	#LEFT PARENTHESIS
-0x29	0x0029	#RIGHT PARENTHESIS
-0x2a	0x002a	#ASTERISK
-0x2b	0x002b	#PLUS SIGN
-0x2c	0x002c	#COMMA
-0x2d	0x002d	#HYPHEN-MINUS
-0x2e	0x002e	#FULL STOP
-0x2f	0x002f	#SOLIDUS
-0x30	0x0030	#DIGIT ZERO
-0x31	0x0031	#DIGIT ONE
-0x32	0x0032	#DIGIT TWO
-0x33	0x0033	#DIGIT THREE
-0x34	0x0034	#DIGIT FOUR
-0x35	0x0035	#DIGIT FIVE
-0x36	0x0036	#DIGIT SIX
-0x37	0x0037	#DIGIT SEVEN
-0x38	0x0038	#DIGIT EIGHT
-0x39	0x0039	#DIGIT NINE
-0x3a	0x003a	#COLON
-0x3b	0x003b	#SEMICOLON
-0x3c	0x003c	#LESS-THAN SIGN
-0x3d	0x003d	#EQUALS SIGN
-0x3e	0x003e	#GREATER-THAN SIGN
-0x3f	0x003f	#QUESTION MARK
-0x40	0x0040	#COMMERCIAL AT
-0x41	0x0041	#LATIN CAPITAL LETTER A
-0x42	0x0042	#LATIN CAPITAL LETTER B
-0x43	0x0043	#LATIN CAPITAL LETTER C
-0x44	0x0044	#LATIN CAPITAL LETTER D
-0x45	0x0045	#LATIN CAPITAL LETTER E
-0x46	0x0046	#LATIN CAPITAL LETTER F
-0x47	0x0047	#LATIN CAPITAL LETTER G
-0x48	0x0048	#LATIN CAPITAL LETTER H
-0x49	0x0049	#LATIN CAPITAL LETTER I
-0x4a	0x004a	#LATIN CAPITAL LETTER J
-0x4b	0x004b	#LATIN CAPITAL LETTER K
-0x4c	0x004c	#LATIN CAPITAL LETTER L
-0x4d	0x004d	#LATIN CAPITAL LETTER M
-0x4e	0x004e	#LATIN CAPITAL LETTER N
-0x4f	0x004f	#LATIN CAPITAL LETTER O
-0x50	0x0050	#LATIN CAPITAL LETTER P
-0x51	0x0051	#LATIN CAPITAL LETTER Q
-0x52	0x0052	#LATIN CAPITAL LETTER R
-0x53	0x0053	#LATIN CAPITAL LETTER S
-0x54	0x0054	#LATIN CAPITAL LETTER T
-0x55	0x0055	#LATIN CAPITAL LETTER U
-0x56	0x0056	#LATIN CAPITAL LETTER V
-0x57	0x0057	#LATIN CAPITAL LETTER W
-0x58	0x0058	#LATIN CAPITAL LETTER X
-0x59	0x0059	#LATIN CAPITAL LETTER Y
-0x5a	0x005a	#LATIN CAPITAL LETTER Z
-0x5b	0x005b	#LEFT SQUARE BRACKET
-0x5c	0x005c	#REVERSE SOLIDUS
-0x5d	0x005d	#RIGHT SQUARE BRACKET
-0x5e	0x005e	#CIRCUMFLEX ACCENT
-0x5f	0x005f	#LOW LINE
-0x60	0x0060	#GRAVE ACCENT
-0x61	0x0061	#LATIN SMALL LETTER A
-0x62	0x0062	#LATIN SMALL LETTER B
-0x63	0x0063	#LATIN SMALL LETTER C
-0x64	0x0064	#LATIN SMALL LETTER D
-0x65	0x0065	#LATIN SMALL LETTER E
-0x66	0x0066	#LATIN SMALL LETTER F
-0x67	0x0067	#LATIN SMALL LETTER G
-0x68	0x0068	#LATIN SMALL LETTER H
-0x69	0x0069	#LATIN SMALL LETTER I
-0x6a	0x006a	#LATIN SMALL LETTER J
-0x6b	0x006b	#LATIN SMALL LETTER K
-0x6c	0x006c	#LATIN SMALL LETTER L
-0x6d	0x006d	#LATIN SMALL LETTER M
-0x6e	0x006e	#LATIN SMALL LETTER N
-0x6f	0x006f	#LATIN SMALL LETTER O
-0x70	0x0070	#LATIN SMALL LETTER P
-0x71	0x0071	#LATIN SMALL LETTER Q
-0x72	0x0072	#LATIN SMALL LETTER R
-0x73	0x0073	#LATIN SMALL LETTER S
-0x74	0x0074	#LATIN SMALL LETTER T
-0x75	0x0075	#LATIN SMALL LETTER U
-0x76	0x0076	#LATIN SMALL LETTER V
-0x77	0x0077	#LATIN SMALL LETTER W
-0x78	0x0078	#LATIN SMALL LETTER X
-0x79	0x0079	#LATIN SMALL LETTER Y
-0x7a	0x007a	#LATIN SMALL LETTER Z
-0x7b	0x007b	#LEFT CURLY BRACKET
-0x7c	0x007c	#VERTICAL LINE
-0x7d	0x007d	#RIGHT CURLY BRACKET
-0x7e	0x007e	#TILDE
-0x7f	0x007f	#DELETE
-0x80	0x0106	#LATIN CAPITAL LETTER C WITH ACUTE
-0x81	0x00fc	#LATIN SMALL LETTER U WITH DIAERESIS
-0x82	0x00e9	#LATIN SMALL LETTER E WITH ACUTE
-0x83	0x0101	#LATIN SMALL LETTER A WITH MACRON
-0x84	0x00e4	#LATIN SMALL LETTER A WITH DIAERESIS
-0x85	0x0123	#LATIN SMALL LETTER G WITH CEDILLA
-0x86	0x00e5	#LATIN SMALL LETTER A WITH RING ABOVE
-0x87	0x0107	#LATIN SMALL LETTER C WITH ACUTE
-0x88	0x0142	#LATIN SMALL LETTER L WITH STROKE
-0x89	0x0113	#LATIN SMALL LETTER E WITH MACRON
-0x8a	0x0156	#LATIN CAPITAL LETTER R WITH CEDILLA
-0x8b	0x0157	#LATIN SMALL LETTER R WITH CEDILLA
-0x8c	0x012b	#LATIN SMALL LETTER I WITH MACRON
-0x8d	0x0179	#LATIN CAPITAL LETTER Z WITH ACUTE
-0x8e	0x00c4	#LATIN CAPITAL LETTER A WITH DIAERESIS
-0x8f	0x00c5	#LATIN CAPITAL LETTER A WITH RING ABOVE
-0x90	0x00c9	#LATIN CAPITAL LETTER E WITH ACUTE
-0x91	0x00e6	#LATIN SMALL LETTER AE
-0x92	0x00c6	#LATIN CAPITAL LETTER AE
-0x93	0x014d	#LATIN SMALL LETTER O WITH MACRON
-0x94	0x00f6	#LATIN SMALL LETTER O WITH DIAERESIS
-0x95	0x0122	#LATIN CAPITAL LETTER G WITH CEDILLA
-0x96	0x00a2	#CENT SIGN
-0x97	0x015a	#LATIN CAPITAL LETTER S WITH ACUTE
-0x98	0x015b	#LATIN SMALL LETTER S WITH ACUTE
-0x99	0x00d6	#LATIN CAPITAL LETTER O WITH DIAERESIS
-0x9a	0x00dc	#LATIN CAPITAL LETTER U WITH DIAERESIS
-0x9b	0x00f8	#LATIN SMALL LETTER O WITH STROKE
-0x9c	0x00a3	#POUND SIGN
-0x9d	0x00d8	#LATIN CAPITAL LETTER O WITH STROKE
-0x9e	0x00d7	#MULTIPLICATION SIGN
-0x9f	0x00a4	#CURRENCY SIGN
-0xa0	0x0100	#LATIN CAPITAL LETTER A WITH MACRON
-0xa1	0x012a	#LATIN CAPITAL LETTER I WITH MACRON
-0xa2	0x00f3	#LATIN SMALL LETTER O WITH ACUTE
-0xa3	0x017b	#LATIN CAPITAL LETTER Z WITH DOT ABOVE
-0xa4	0x017c	#LATIN SMALL LETTER Z WITH DOT ABOVE
-0xa5	0x017a	#LATIN SMALL LETTER Z WITH ACUTE
-0xa6	0x201d	#RIGHT DOUBLE QUOTATION MARK
-0xa7	0x00a6	#BROKEN BAR
-0xa8	0x00a9	#COPYRIGHT SIGN
-0xa9	0x00ae	#REGISTERED SIGN
-0xaa	0x00ac	#NOT SIGN
-0xab	0x00bd	#VULGAR FRACTION ONE HALF
-0xac	0x00bc	#VULGAR FRACTION ONE QUARTER
-0xad	0x0141	#LATIN CAPITAL LETTER L WITH STROKE
-0xae	0x00ab	#LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xaf	0x00bb	#RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-0xb0	0x2591	#LIGHT SHADE
-0xb1	0x2592	#MEDIUM SHADE
-0xb2	0x2593	#DARK SHADE
-0xb3	0x2502	#BOX DRAWINGS LIGHT VERTICAL
-0xb4	0x2524	#BOX DRAWINGS LIGHT VERTICAL AND LEFT
-0xb5	0x0104	#LATIN CAPITAL LETTER A WITH OGONEK
-0xb6	0x010c	#LATIN CAPITAL LETTER C WITH CARON
-0xb7	0x0118	#LATIN CAPITAL LETTER E WITH OGONEK
-0xb8	0x0116	#LATIN CAPITAL LETTER E WITH DOT ABOVE
-0xb9	0x2563	#BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-0xba	0x2551	#BOX DRAWINGS DOUBLE VERTICAL
-0xbb	0x2557	#BOX DRAWINGS DOUBLE DOWN AND LEFT
-0xbc	0x255d	#BOX DRAWINGS DOUBLE UP AND LEFT
-0xbd	0x012e	#LATIN CAPITAL LETTER I WITH OGONEK
-0xbe	0x0160	#LATIN CAPITAL LETTER S WITH CARON
-0xbf	0x2510	#BOX DRAWINGS LIGHT DOWN AND LEFT
-0xc0	0x2514	#BOX DRAWINGS LIGHT UP AND RIGHT
-0xc1	0x2534	#BOX DRAWINGS LIGHT UP AND HORIZONTAL
-0xc2	0x252c	#BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-0xc3	0x251c	#BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-0xc4	0x2500	#BOX DRAWINGS LIGHT HORIZONTAL
-0xc5	0x253c	#BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-0xc6	0x0172	#LATIN CAPITAL LETTER U WITH OGONEK
-0xc7	0x016a	#LATIN CAPITAL LETTER U WITH MACRON
-0xc8	0x255a	#BOX DRAWINGS DOUBLE UP AND RIGHT
-0xc9	0x2554	#BOX DRAWINGS DOUBLE DOWN AND RIGHT
-0xca	0x2569	#BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-0xcb	0x2566	#BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-0xcc	0x2560	#BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-0xcd	0x2550	#BOX DRAWINGS DOUBLE HORIZONTAL
-0xce	0x256c	#BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-0xcf	0x017d	#LATIN CAPITAL LETTER Z WITH CARON
-0xd0	0x0105	#LATIN SMALL LETTER A WITH OGONEK
-0xd1	0x010d	#LATIN SMALL LETTER C WITH CARON
-0xd2	0x0119	#LATIN SMALL LETTER E WITH OGONEK
-0xd3	0x0117	#LATIN SMALL LETTER E WITH DOT ABOVE
-0xd4	0x012f	#LATIN SMALL LETTER I WITH OGONEK
-0xd5	0x0161	#LATIN SMALL LETTER S WITH CARON
-0xd6	0x0173	#LATIN SMALL LETTER U WITH OGONEK
-0xd7	0x016b	#LATIN SMALL LETTER U WITH MACRON
-0xd8	0x017e	#LATIN SMALL LETTER Z WITH CARON
-0xd9	0x2518	#BOX DRAWINGS LIGHT UP AND LEFT
-0xda	0x250c	#BOX DRAWINGS LIGHT DOWN AND RIGHT
-0xdb	0x2588	#FULL BLOCK
-0xdc	0x2584	#LOWER HALF BLOCK
-0xdd	0x258c	#LEFT HALF BLOCK
-0xde	0x2590	#RIGHT HALF BLOCK
-0xdf	0x2580	#UPPER HALF BLOCK
-0xe0	0x00d3	#LATIN CAPITAL LETTER O WITH ACUTE
-0xe1	0x00df	#LATIN SMALL LETTER SHARP S
-0xe2	0x014c	#LATIN CAPITAL LETTER O WITH MACRON
-0xe3	0x0143	#LATIN CAPITAL LETTER N WITH ACUTE
-0xe4	0x00f5	#LATIN SMALL LETTER O WITH TILDE
-0xe5	0x00d5	#LATIN CAPITAL LETTER O WITH TILDE
-0xe6	0x00b5	#MICRO SIGN
-0xe7	0x0144	#LATIN SMALL LETTER N WITH ACUTE
-0xe8	0x0136	#LATIN CAPITAL LETTER K WITH CEDILLA
-0xe9	0x0137	#LATIN SMALL LETTER K WITH CEDILLA
-0xea	0x013b	#LATIN CAPITAL LETTER L WITH CEDILLA
-0xeb	0x013c	#LATIN SMALL LETTER L WITH CEDILLA
-0xec	0x0146	#LATIN SMALL LETTER N WITH CEDILLA
-0xed	0x0112	#LATIN CAPITAL LETTER E WITH MACRON
-0xee	0x0145	#LATIN CAPITAL LETTER N WITH CEDILLA
-0xef	0x2019	#RIGHT SINGLE QUOTATION MARK
-0xf0	0x00ad	#SOFT HYPHEN
-0xf1	0x00b1	#PLUS-MINUS SIGN
-0xf2	0x201c	#LEFT DOUBLE QUOTATION MARK
-0xf3	0x00be	#VULGAR FRACTION THREE QUARTERS
-0xf4	0x00b6	#PILCROW SIGN
-0xf5	0x00a7	#SECTION SIGN
-0xf6	0x00f7	#DIVISION SIGN
-0xf7	0x201e	#DOUBLE LOW-9 QUOTATION MARK
-0xf8	0x00b0	#DEGREE SIGN
-0xf9	0x2219	#BULLET OPERATOR
-0xfa	0x00b7	#MIDDLE DOT
-0xfb	0x00b9	#SUPERSCRIPT ONE
-0xfc	0x00b3	#SUPERSCRIPT THREE
-0xfd	0x00b2	#SUPERSCRIPT TWO
-0xfe	0x25a0	#BLACK SQUARE
-0xff	0x00a0	#NO-BREAK SPACE