Merge branch 'master' into ods14-irt-repeat

Author: dyemanov

.github/workflows/increment-build-number.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.FIREBIRD_INC_BUILDNUM }}
           persist-credentials: true

.github/workflows/qa.yml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout firebird-qa
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
           repository: FirebirdSQL/firebird-qa

.github/workflows/trim-trailing-spaces.yml

@@ -17,7 +17,7 @@ jobs:
           - v4.0-release
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ matrix.branch }}
           persist-credentials: false

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

@@ -43,7 +43,7 @@ $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "rm -rf $AndroidDir
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "mkdir $AndroidDir"
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName push gen/$InitialDebugTar $AndroidDir/
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir && tar xvf $InitialDebugTar)"
-$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./common_test --log_level=all && ./libEngine14_test --log_level=all)"
+$ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./common_test --log_level=error && ./libEngine14_test --log_level=error && ./isql_test --log_level=error)"
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName shell "(cd $AndroidDir/firebird && ./AfterUntar.sh)"
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/firebird.msg gen/Release/firebird/
 $ANDROID_HOME/platform-tools/adb -s $AndroidDeviceName pull $AndroidDir/firebird/security6.fdb gen/Release/firebird/

builds/install/arch-specific/darwin/Distribution.xml renamed to builds/install/arch-specific/darwin/Distribution-arm64.xml

@@ -5,6 +5,7 @@
     <license file="License.txt" mime-type="text/plain"/>
     <readme file="Readme.txt" mime-type="text/plain"/>
     <pkg-ref id="com.firebirdsql.Firebird"/>
+	<options hostArchitectures="arm64"/>
     <options customize="never" require-scripts="false"/>
     <choices-outline>
         <line choice="default">

builds/install/arch-specific/darwin/DistributionCS.xml renamed to builds/install/arch-specific/darwin/Distribution-x64.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-gui-script minSpecVersion="1">
-    <title>Firebird Database Server (Classic)</title>
+    <title>Firebird Database Server</title>
     <welcome file="Welcome.txt" mime-type="text/plain"/>
     <license file="License.txt" mime-type="text/plain"/>
+    <readme file="Readme.txt" mime-type="text/plain"/>
     <pkg-ref id="com.firebirdsql.Firebird"/>
+	<options hostArchitectures="x86_64"/>
     <options customize="never" require-scripts="false"/>
     <choices-outline>
         <line choice="default">
@@ -14,5 +16,5 @@
     <choice id="com.firebirdsql.Firebird" visible="false">
         <pkg-ref id="com.firebirdsql.Firebird"/>
     </choice>
-    <pkg-ref id="com.firebirdsql.Firebird" version="2.5.0" onConclusion="none">FirebirdCS.pkg</pkg-ref>
+    <pkg-ref id="com.firebirdsql.Firebird" version="4.0.0" onConclusion="none">Firebird.pkg</pkg-ref>
 </installer-gui-script>

builds/install/arch-specific/darwin/DistributionSS.xml

@@ -58,7 +58,7 @@ package_firebird:
 			$(ROOT)/gen/$(TARGET)/resources/Readme.txt
 	cp ../builds/install/arch-specific/darwin/License.txt \
 			$(ROOT)/gen/$(TARGET)/resources/License.txt
-	cp ../builds/install/arch-specific/darwin/Distribution.xml \
+	cp ../builds/install/arch-specific/darwin/Distribution-$(CpuType).xml \
 			$(ROOT)/gen/$(TARGET)/Distribution.xml
 
 	rm -fr $(TARGET)/packages

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

@@ -1,6 +1,6 @@
 #########################################
 #
-# Firebird version 5.0 configuration file
+# Firebird version 6.0 configuration file
 #
 #########################################
 

builds/install/misc/firebird.conf

@@ -155,7 +155,7 @@ database
 	#   password_env = FB_REPL_PWD
 	# }
 	#
-	# If username_file / password_file is specified, the first non-empty line
+	# If username_file / password_file is specified, the first line
 	# of the provided file is used as the parameter value.
 	#
 	# If username_file or password_file values represent a relative pathname,