Merge branch 'dev' into f-server-323

CHANGELOG.md

@@ -24,7 +24,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security ###
 
-## [6.0.0] - 2023-10-17 ##
+## [6.0.1 2023-10-18] ##
+
+### Fixed ###
+* Old passwords table is removed from dumps where it still exists.
+
+## [6.0.0 2023-10-17] ##
+>>>>>>> dev
 
 This is a major update. Switching from integer ids for internal and external use to string ids for the external use while keeping the old integer ids for internal use.
 

doc/conf.py

@@ -28,7 +28,7 @@ author = 'Daniel Hornung'
 # The short X.Y version
 version = '6.0'
 # The full version, including alpha/beta/rc tags
-release = '6.0.0'
+release = '6.0.1'
 
 
 # -- General configuration ---------------------------------------------------

patches/patch20221122-6.0-SNAPSHOT/patch.sh

@@ -25,6 +25,8 @@
 NEW_VERSION="v6.0.0-SNAPSHOT-EXTIDS"
 OLD_VERSION="v5.0.0"
 
+DROP_TABLE_PASSWORDS='DROP TABLE IF EXISTS passwords;'
+
 if [ -z "$UTILSPATH" ]; then
  UTILSPATH="../utils"
 fi
@@ -33,9 +35,11 @@ fi
 
 check_version $OLD_VERSION
 
+mysql_execute "$DROP_TABLE_PASSWORDS"
 mysql_execute_file $PATCH_DIR/create_entity_ids_table.sql
 
 update_version $NEW_VERSION
 
+
 success