Update package version to 1.33.6

| datasource      | package             | from  | to    |
| --------------- | ------------------- | ----- | ----- |
| github-releases | syncthing/syncthing | 2.0.4 | 2.0.5 |

CHANGELOG

@@ -584,3 +584,72 @@
 [1.31.0]
 * checklist added to manifest
 
+[1.32.0]
+* Update syncthing to 2.0.0
+* [Full Changelog](https://github.com/syncthing/syncthing/releases/tag/v2.0.0)
+* Database backend switched from LevelDB to SQLite. There is a migration on first launch which can be lengthy for larger setups. The new database is easier to understand and maintain and, hopefully, less buggy.
+* The logging format has changed to use structured log entries (a message plus several key-value pairs). Additionally, we can now control the log level per package, and a new log level WARNING has been inserted between INFO and ERROR (which was previously known as WARNING...). The INFO level has become more verbose, indicating the sync actions taken by Syncthing. A new command line flag `--log-level` sets the default log level for all packages, and the `STTRACE` environment variable and GUI has been updated to set log levels per package. The `--verbose` and `--logflags` command line options have been removed and will be ignored if given.
+* Deleted items are no longer kept forever in the database, instead they are forgotten after six months. If your use case require deletes to take effect after more than a six month delay, set the `--db-delete-retention-interval` command line option or corresponding environment variable to zero, or a longer time interval of your choosing.
+* Modernised command line options parsing. Old single-dash long options are no longer supported, e.g. `-home` must be given as `--home`. Some options have been renamed, others have become subcommands. All serve options are now also accepted as environment variables. See `syncthing --help` and `syncthing serve --help` for details.
+* Rolling hash detection of shifted data is no longer supported as this effectively never helped. Instead, scanning and syncing is faster and more efficient without it.
+* A "default folder" is no longer created on first startup.
+* Multiple connections are now used by default between v2 devices. The new default value is to use three connections: one for index metadata and two for data exchange.
+* The following platforms unfortunately no longer get prebuilt binaries for download at syncthing.net and on GitHub, due to complexities related to cross compilation with SQLite:
+* fix(db): handle large numbers of blocks in update by [@calmh](https://github.com/calmh) in https://github.com/syncthing/syncthing/pull/10025
+* fix(syncthing): make directory flags global for all commands by [@calmh](https://github.com/calmh) in https://github.com/syncthing/syncthing/pull/10028
+
+[1.32.1]
+* Update syncthing to 2.0.1
+* [Full Changelog](https://github.com/syncthing/syncthing/releases/tag/v2.0.1)
+
+[1.32.2]
+* Update syncthing to 2.0.2
+* [Full Changelog](https://github.com/syncthing/syncthing/releases/tag/v2.0.2)
+* Database backend switched from LevelDB to SQLite. There is a migration on first launch which can be lengthy for larger setups. The new database is easier to understand and maintain and, hopefully, less buggy.
+* The logging format has changed to use structured log entries (a message plus several key-value pairs). Additionally, we can now control the log level per package, and a new log level WARNING has been inserted between INFO and ERROR (which was previously known as WARNING...). The INFO level has become more verbose, indicating the sync actions taken by Syncthing. A new command line flag `--log-level` sets the default log level for all packages, and the `STTRACE` environment variable and GUI has been updated to set log levels per package. The `--verbose` and `--logflags` command line options have been removed and will be ignored if given.
+* Deleted items are no longer kept forever in the database, instead they are forgotten after fifteen months. If your use case require deletes to take effect after more than a fifteen month delay, set the `--db-delete-retention-interval` command line option or corresponding environment variable to zero, or a longer time interval of your choosing.
+* Modernised command line options parsing. Old single-dash long options are no longer supported, e.g. `-home` must be given as `--home`. Some options have been renamed, others have become subcommands. All serve options are now also accepted as environment variables. See  `syncthing --help` and `syncthing serve --help` for details.
+* Rolling hash detection of shifted data is no longer supported as this effectively never helped. Instead, scanning and syncing is faster and more efficient without it.
+* A "default folder" is no longer created on first startup.
+* Multiple connections are now used by default between v2 devices. The new default value is to use three connections: one for index metadata and two for data exchange.
+* The following platforms unfortunately no longer get prebuilt binaries for download at syncthing.net and on GitHub, due to complexities related to cross compilation with SQLite:
+* The handling of conflict resolution involving deleted files has changed. A delete can now be the winning outcome of conflict resolution, resulting in the deleted file being moved to a conflict copy.
+* build: remove netgo and osusergo build tags (fixes [#10251](https://github.com/syncthing/syncthing/issues/10251)) by [@calmh](https://github.com/calmh) in https://github.com/syncthing/syncthing/pull/10256
+
+[1.33.3]
+* Fix checklist
+
+[1.33.4]
+* Update syncthing to 2.0.3
+* [Full Changelog](https://github.com/syncthing/syncthing/releases/tag/v2.0.3)
+* Database backend switched from LevelDB to SQLite. There is a migration on first launch which can be lengthy for larger setups. The new database is easier to understand and maintain and, hopefully, less buggy.
+* The logging format has changed to use structured log entries (a message plus several key-value pairs). Additionally, we can now control the log level per package, and a new log level WARNING has been inserted between INFO and ERROR (which was previously known as WARNING...). The INFO level has become more verbose, indicating the sync actions taken by Syncthing. A new command line flag `--log-level` sets the default log level for all packages, and the `STTRACE` environment variable and GUI has been updated to set log levels per package. The `--verbose` and `--logflags` command line options have been removed and will be ignored if given.
+* Deleted items are no longer kept forever in the database, instead they are forgotten after fifteen months. If your use case require deletes to take effect after more than a fifteen month delay, set the `--db-delete-retention-interval` command line option or corresponding environment variable to zero, or a longer time interval of your choosing.
+* Modernised command line options parsing. Old single-dash long options are no longer supported, e.g. `-home` must be given as `--home`. Some options have been renamed, others have become subcommands. All serve options are now also accepted as environment variables. See  `syncthing --help` and `syncthing serve --help` for details.
+* Rolling hash detection of shifted data is no longer supported as this effectively never helped. Instead, scanning and syncing is faster and more efficient without it.
+* A "default folder" is no longer created on first startup.
+* Multiple connections are now used by default between v2 devices. The new default value is to use three connections: one for index metadata and two for data exchange.
+* The following platforms unfortunately no longer get prebuilt binaries for download at syncthing.net and on GitHub, due to complexities related to cross compilation with SQLite:
+* The handling of conflict resolution involving deleted files has changed. A delete can now be the winning outcome of conflict resolution, resulting in the deleted file being moved to a conflict copy.
+* fix(cmd): restore --version flag for compatibility by [@acolomb](https://github.com/acolomb) in https://github.com/syncthing/syncthing/pull/10269
+
+[1.33.5]
+* Update syncthing to 2.0.4
+* [Full Changelog](https://github.com/syncthing/syncthing/releases/tag/v2.0.4)
+* fix(cmd): only start temporary API server during migration if it's enabled by [@pixelspark](https://github.com/pixelspark) in https://github.com/syncthing/syncthing/pull/10284
+* fix(model): consider MaxFolderConcurrency when calculating number of hashers by [@tomasz1986](https://github.com/tomasz1986) in https://github.com/syncthing/syncthing/pull/10285
+
+[1.33.6]
+* Update syncthing to 2.0.5
+* [Full Changelog](https://github.com/syncthing/syncthing/releases/tag/v2.0.5)
+* Database backend switched from LevelDB to SQLite. There is a migration on first launch which can be lengthy for larger setups. The new database is easier to understand and maintain and, hopefully, less buggy.
+* The logging format has changed to use structured log entries (a message plus several key-value pairs). Additionally, we can now control the log level per package, and a new log level WARNING has been inserted between INFO and ERROR (which was previously known as WARNING...). The INFO level has become more verbose, indicating the sync actions taken by Syncthing. A new command line flag `--log-level` sets the default log level for all packages, and the `STTRACE` environment variable and GUI has been updated to set log levels per package. The `--verbose` and `--logflags` command line options have been removed and will be ignored if given.
+* Deleted items are no longer kept forever in the database, instead they are forgotten after fifteen months. If your use case require deletes to take effect after more than a fifteen month delay, set the `--db-delete-retention-interval` command line option or corresponding environment variable to zero, or a longer time interval of your choosing.
+* Modernised command line options parsing. Old single-dash long options are no longer supported, e.g. `-home` must be given as `--home`. Some options have been renamed, others have become subcommands. All serve options are now also accepted as environment variables. See  `syncthing --help` and `syncthing serve --help` for details.
+* Rolling hash detection of shifted data is no longer supported as this effectively never helped. Instead, scanning and syncing is faster and more efficient without it.
+* A "default folder" is no longer created on first startup.
+* Multiple connections are now used by default between v2 devices. The new default value is to use three connections: one for index metadata and two for data exchange.
+* The following platforms unfortunately no longer get prebuilt binaries for download at syncthing.net and on GitHub, due to complexities related to cross compilation with SQLite:
+* The handling of conflict resolution involving deleted files has changed. A delete can now be the winning outcome of conflict resolution, resulting in the deleted file being moved to a conflict copy.
+* fix(db): only vacuum database on startup when a migration script was actually run by [@pixelspark](https://github.com/pixelspark) in https://github.com/syncthing/syncthing/pull/10339
+

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG",
   "tagline": "Decentralized file synchronization",
-  "version": "1.31.0",
-  "upstreamVersion": "1.30.0",
+  "version": "1.33.6",
+  "upstreamVersion": "2.0.5",
   "healthCheckPath": "/healthcheck",
   "httpPort": 8000,
   "addons": {
@@ -15,7 +15,8 @@
   },
   "checklist": {
     "change-default-password": {
-      "message": "Change the admin password immediately."
+      "message": "Change the admin password immediately.",
+      "sso": false
     }
   },
   "tcpPorts": {

Dockerfile

@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # renovate: datasource=github-releases depName=syncthing/syncthing versioning=semver extractVersion=^v(?<version>.+)$
-ARG SYNCTHING_VERSION=1.30.0
+ARG SYNCTHING_VERSION=2.0.5
 
 RUN wget https://github.com/syncthing/syncthing/releases/download/v${SYNCTHING_VERSION}/syncthing-linux-amd64-v${SYNCTHING_VERSION}.tar.gz -O - | tar -xz -C /app/code --strip-components=1
 

start.sh

@@ -6,8 +6,8 @@ mkdir -p /app/data/config /app/data/folders /run/syncthing
 
 # if this if the first run, generate a useful config
 if [[ ! -f /app/data/config/config.xml ]]; then
-    echo "=> Generating config"
-    STNODEFAULTFOLDER=1 /app/code/syncthing --generate="/app/data/config"
+    echo "==> Generating config"
+    STNODEFAULTFOLDER=1 /app/code/syncthing generate --home="/app/data/config"
 
     # The password value (changeme) was determined by reading config.xml and setting value in the GUI
     # urAccepted is 0 for not decided, -1 for no reporting
@@ -31,12 +31,11 @@ if [[ -n ${CLOUDRON_LDAP_HOST:-} ]]; then
         /app/data/config/config.xml
 fi
 
-
 # Set the listenAddress and the gui enabled to make sure user doesnt lock themselves  out by accident.
 sed -e "s,<listenAddress>.*</listenAddress>,<listenAddress>tcp://:${SYNC_PORT}</listenAddress>," -i /app/data/config/config.xml
 sed -e 's,<gui .*>,<gui enabled="true" tls="false" debugging="false">,' -i /app/data/config/config.xml
 
 chown -R cloudron:cloudron /app/data /run/syncthing
 
-echo "Starting supervisor"
+echo "==> Starting supervisor"
 exec /usr/bin/supervisord --configuration /etc/supervisor/supervisord.conf --nodaemon -i syncthing

supervisor/syncthing.conf

@@ -3,7 +3,7 @@ priority=20
 environment=HOME=/app/data/folders,STNOUPGRADE=1
 ; -no-browser opens up the browser (for desktop app preumably)
 ; auditfile "-" means log to stdout
-command=/app/code/syncthing -gui-address=127.0.0.1:3000 -home=/app/data/config -no-browser -auditfile=-
+command=/app/code/syncthing serve --gui-address=127.0.0.1:3000 --home=/app/data/config --no-browser --auditfile=-
 user=cloudron
 autostart=true
 autorestart=true

test/package-lock.json

@@ -9,10 +9,10 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^138.0.1",
+        "chromedriver": "^140.0.0",
         "expect.js": "^0.3.1",
-        "mocha": "^11.7.1",
-        "selenium-webdriver": "^4.34.0"
+        "mocha": "^11.7.2",
+        "selenium-webdriver": "^4.35.0"
       }
     },
     "node_modules/@bazel/runfiles": {
@@ -305,9 +305,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "138.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-138.0.1.tgz",
-      "integrity": "sha512-QS/Z1qB2OpKsPUlJjkfKmpf9lGw6ObB0dX5+dP3M0gdtbu80TUnS+EjXbtu6YkbMfr2/Qt8IfOONrawNW1GwhA==",
+      "version": "140.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-140.0.0.tgz",
+      "integrity": "sha512-mv41C2fi4YX27muRMWP035HJUnKatu7gMJqBcVD1tSmufWDxDy0m38YaieKG3pa2aAIYNVhlXqiOnHkvnqNMcw==",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -992,9 +992,9 @@
       }
     },
     "node_modules/mocha": {
-      "version": "11.7.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz",
-      "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
+      "version": "11.7.2",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.2.tgz",
+      "integrity": "sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==",
       "license": "MIT",
       "dependencies": {
         "browser-stdout": "^1.3.1",
@@ -1260,9 +1260,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.34.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.34.0.tgz",
-      "integrity": "sha512-zGfQFcsASAv3KrYzYh+iw4fFqB7iZAgHW7BU6rRz7isK1i1X4x3LvjmZad4bUUgHDwTnAhlqTzDh21byB+zHMg==",
+      "version": "4.35.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.35.0.tgz",
+      "integrity": "sha512-Baaeiuyu7BIIsSYf0SI7Mi55gsNmdI00KM0Hcofw1RnAY+0QEVpdh5yAxueDxgTZS8vcbGZFU0NJ6Qc1riIrLg==",
       "funding": [
         {
           "type": "github",
@@ -1873,9 +1873,9 @@
       }
     },
     "chromedriver": {
-      "version": "138.0.1",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-138.0.1.tgz",
-      "integrity": "sha512-QS/Z1qB2OpKsPUlJjkfKmpf9lGw6ObB0dX5+dP3M0gdtbu80TUnS+EjXbtu6YkbMfr2/Qt8IfOONrawNW1GwhA==",
+      "version": "140.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-140.0.0.tgz",
+      "integrity": "sha512-mv41C2fi4YX27muRMWP035HJUnKatu7gMJqBcVD1tSmufWDxDy0m38YaieKG3pa2aAIYNVhlXqiOnHkvnqNMcw==",
       "requires": {
         "@testim/chrome-version": "^1.1.4",
         "axios": "^1.7.4",
@@ -2339,9 +2339,9 @@
       "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw=="
     },
     "mocha": {
-      "version": "11.7.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz",
-      "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
+      "version": "11.7.2",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.2.tgz",
+      "integrity": "sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==",
       "requires": {
         "browser-stdout": "^1.3.1",
         "chokidar": "^4.0.1",
@@ -2548,9 +2548,9 @@
       "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "selenium-webdriver": {
-      "version": "4.34.0",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.34.0.tgz",
-      "integrity": "sha512-zGfQFcsASAv3KrYzYh+iw4fFqB7iZAgHW7BU6rRz7isK1i1X4x3LvjmZad4bUUgHDwTnAhlqTzDh21byB+zHMg==",
+      "version": "4.35.0",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.35.0.tgz",
+      "integrity": "sha512-Baaeiuyu7BIIsSYf0SI7Mi55gsNmdI00KM0Hcofw1RnAY+0QEVpdh5yAxueDxgTZS8vcbGZFU0NJ6Qc1riIrLg==",
       "requires": {
         "@bazel/runfiles": "^6.3.1",
         "jszip": "^3.10.1",

test/package.json

@@ -9,9 +9,9 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "chromedriver": "^138.0.1",
+    "chromedriver": "^140.0.0",
     "expect.js": "^0.3.1",
-    "mocha": "^11.7.1",
-    "selenium-webdriver": "^4.34.0"
+    "mocha": "^11.7.2",
+    "selenium-webdriver": "^4.35.0"
   }
 }