[Firebird-checkins] SF.net SVN: firebird:[62803] firebird/trunk

[<ale...@us...>]

Revision: 62803
          http://sourceforge.net/p/firebird/code/62803
Author:   alexpeshkoff
Date:     2016-01-11 14:23:35 +0000 (Mon, 11 Jan 2016)
Log Message:
-----------
Fixed CORE-4996: Need some SECURITY2.FDB --> SECURITY3.FDB upgrade feature, placed new files into linux package

Modified Paths:
--------------
    firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in
    firebird/trunk/src/misc/upgrade/v3.0/security_database.txt

Modified: firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in
===================================================================
--- firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in	2016-01-11 13:46:41 UTC (rev 62802)
+++ firebird/trunk/builds/install/arch-specific/linux/makeInstallImage.sh.in	2016-01-11 14:23:35 UTC (rev 62803)
@@ -140,7 +140,7 @@
     		  @FB_SAMPLEDIR@ @FB_SAMPLEDBDIR@ @FB_HELPDIR@ @FB_INTLDIR@ @FB_MISCDIR@ @FB_SECDBDIR@ @FB_MSGDIR@ @FB_LOGDIR@ \
     		  @FB_GUARDDIR@ @FB_PLUGDIR@"
 
-	for i in ib_udf metadata security; do
+	for i in security; do
 		makeDirs @FB_MISCDIR@/upgrade/$i
 	done
 
@@ -293,9 +293,7 @@
 
 	#misc
     cp $BuildRootDir/src/misc/intl.sql							${TargetDir}@FB_MISCDIR@
-    cp $BuildRootDir/src/misc/upgrade/v2/ib_udf*				${TargetDir}@FB_MISCDIR@/upgrade/ib_udf
-    cp $BuildRootDir/src/misc/upgrade/v2/security_database*		${TargetDir}@FB_MISCDIR@/upgrade/security
-    cp $BuildRootDir/src/misc/upgrade/v2.1/metadata_charset*	${TargetDir}@FB_MISCDIR@/upgrade/metadata
+    cp $BuildRootDir/src/misc/upgrade/v3.0/security_database*	${TargetDir}@FB_MISCDIR@/upgrade/security
     cp $BuildRootDir/gen/install/misc/firebird.xinetd			${TargetDir}@FB_MISCDIR@
 	cp $BuildRootDir/gen/install/misc/firebird.init.d.*			${TargetDir}@FB_MISCDIR@
 	cp $BuildRootDir/gen/install/misc/rc.config.firebird		${TargetDir}@FB_MISCDIR@

Modified: firebird/trunk/src/misc/upgrade/v3.0/security_database.txt
===================================================================
--- firebird/trunk/src/misc/upgrade/v3.0/security_database.txt	2016-01-11 13:46:41 UTC (rev 62802)
+++ firebird/trunk/src/misc/upgrade/v3.0/security_database.txt	2016-01-11 14:23:35 UTC (rev 62803)
@@ -1,4 +1,4 @@
-*** How to migrate existaing users from firebird 2.X to firebird 3? ***
+*** How to migrate existing users from firebird 2.X to firebird 3? ***
 
 Firebird 3 is using new method to validate users on the server.
 Direct upgrade of security database is therefore impossible.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.