From: Antoine Jacoutot Subject: Re: [update] net/synapse 1.120.0 To: Renaud Allard Cc: ports Date: Wed, 27 Nov 2024 13:28:39 +0100 On Wed, Nov 27, 2024 at 09:56:45AM +0100, Renaud Allard wrote: > > > On 11/27/24 9:51 AM, Stuart Henderson wrote: > > On 2024/11/27 09:40, Renaud Allard wrote: > > > Hello, > > > > > > Here is a diff for net/synapse 1.120.0. > > > Tested on amd64 > > > I made a small change in the README to give instructions on how to update > > > the database in case of schema changes. > > > > +It can be done with a command like this one: > > +doas -u _synapse python \ > > + ${LOCALBASE}/bin/update_synapse_database \ > > + --database-config /var/synapse/homeserver.yaml \ > > + --run-background-updates > > > > > > No package provides a "python" binary, it's either python2 or python3. > > > > Can't this just use the script directly? > > > > +doas -u _synapse ${LOCALBASE}/bin/update_synapse_database \ > > + --database-config /var/synapse/homeserver.yaml \ > > + --run-background-updates > > I have removed plain python command and changed a little bit the comments as > landry@ suggested it wasn't exactly clear and I agree it wasn't. > Index: Makefile > =================================================================== > RCS file: /cvs/ports/net/synapse/Makefile,v > diff -u -p -r1.88 Makefile > --- Makefile 14 Nov 2024 12:38:07 -0000 1.88 > +++ Makefile 27 Nov 2024 08:55:07 -0000 > @@ -1,6 +1,6 @@ > COMMENT = open network for secure, decentralized communication > > -MODPY_EGG_VERSION = 1.119.0 > +MODPY_EGG_VERSION = 1.120.0 > > GH_ACCOUNT = element-hq > GH_PROJECT = synapse > Index: distinfo > =================================================================== > RCS file: /cvs/ports/net/synapse/distinfo,v > diff -u -p -r1.66 distinfo > --- distinfo 14 Nov 2024 12:38:07 -0000 1.66 > +++ distinfo 27 Nov 2024 08:55:07 -0000 > @@ -1,5 +1,5 @@ > SHA256 (cargo/aho-corasick-1.1.3.tar.gz) = jmDTQw06aUeK0Jk/GSONLfl8UHAJpSs8EK3c1/a8uRY= > -SHA256 (cargo/anyhow-1.0.92.tar.gz) = dPNxZtfUigKEuZ3YJGlMJhGccAtTvw0VQM2xR9varxM= > +SHA256 (cargo/anyhow-1.0.93.tar.gz) = TJXBC6CwCgJjYji4FJRkCLEyLVrEdgMm5vuOyVbYV3U= > SHA256 (cargo/arc-swap-1.7.1.tar.gz) = aff4w5BrYrdUzVMmBHiUMWAh3P5aGUyOpSvdlJNKNFc= > SHA256 (cargo/autocfg-1.3.0.tar.gz) = DEtNC9Jb0LdGgcCtIUl2EM4bfJGxAizSHIDG+92UdrA= > SHA256 (cargo/base64-0.21.7.tar.gz) = nSl96xkluJ8szBPXY1+gcU8SyHrc4cdTVrOcqbcXhWc= > @@ -54,8 +54,8 @@ SHA256 (cargo/regex-automata-0.4.8.tar.g > SHA256 (cargo/regex-syntax-0.8.5.tar.gz) = KxXEMYa+Z6T9Y77lDQMDr//O84FJLr4sXYfzJOG4gVw= > SHA256 (cargo/ryu-1.0.18.tar.gz) = 88tboNxDJCzhfemcGA6W25CyNbip/clUPJbSIJEWvZ8= > SHA256 (cargo/scopeguard-1.2.0.tar.gz) = lBQ/N3JRCfksJi7Sz15ZvOdJjAG8wVAte5r+Q5pOn0k= > -SHA256 (cargo/serde-1.0.214.tar.gz) = 9Vwxk6ynHBKteJDxeF0rc+G59joLvDU8CO8m/gP8VrU= > -SHA256 (cargo/serde_derive-1.0.214.tar.gz) = 3lI/eB8JXij6YFzc4PgwfkUcwP0U4utM0umKNVsUd2Y= > +SHA256 (cargo/serde-1.0.215.tar.gz) = ZRPBrQsRqTdtqIjj4LqgB38a7VXBf1DnsjlxNhKfuI8= > +SHA256 (cargo/serde_derive-1.0.215.tar.gz) = rR6Gb4ZpI/JS8FyImYeZMUT7dOciQDRopOvXDDzXVsA= > SHA256 (cargo/serde_json-1.0.132.tar.gz) = 1ya/r/SzICZtOViYkF0OugNFquI7VK7jpzfiYP1G2wM= > SHA256 (cargo/sha1-0.10.6.tar.gz) = 47+Cmi1Rq0pd3xNS2EcMFAytyDAbKuF4nbAj8Bzt1ro= > SHA256 (cargo/sha2-0.10.8.tar.gz) = eT23WtK8r8P/p8aLIV/uJo9TeYLNkB0TL4nGND86Pcg= > @@ -84,9 +84,9 @@ SHA256 (cargo/windows_i686_msvc-0.52.5.t > SHA256 (cargo/windows_x86_64_gnu-0.52.5.tar.gz) = TkJG92ve/wnrSIdaD9Pir2qtp51AnTMBGIbT4VgVF9k= > SHA256 (cargo/windows_x86_64_gnullvm-0.52.5.tar.gz) = hSKY5ILNZ8NW3dlXA4bihitWc8hb1fiN+atoArM0xZY= > SHA256 (cargo/windows_x86_64_msvc-0.52.5.tar.gz) = vsR+W/0b/w7q9ti0hcwQdIkaGXq0Il1QTLehq4iwK/A= > -SHA256 (synapse-1.119.0.tar.gz) = BoBF338TLFdeYwqY9dhURYtOXKFMxTzKIZm4VNVQeLA= > +SHA256 (synapse-1.120.0.tar.gz) = 9YM6nK/jDDiaWpA+tenpFUyK4sRDQ8X8Q+M+J1C9ZEI= > SIZE (cargo/aho-corasick-1.1.3.tar.gz) = 183311 > -SIZE (cargo/anyhow-1.0.92.tar.gz) = 47459 > +SIZE (cargo/anyhow-1.0.93.tar.gz) = 47490 > SIZE (cargo/arc-swap-1.7.1.tar.gz) = 68512 > SIZE (cargo/autocfg-1.3.0.tar.gz) = 16524 > SIZE (cargo/base64-0.21.7.tar.gz) = 82576 > @@ -141,8 +141,8 @@ SIZE (cargo/regex-automata-0.4.8.tar.gz) > SIZE (cargo/regex-syntax-0.8.5.tar.gz) = 357541 > SIZE (cargo/ryu-1.0.18.tar.gz) = 47713 > SIZE (cargo/scopeguard-1.2.0.tar.gz) = 11619 > -SIZE (cargo/serde-1.0.214.tar.gz) = 78523 > -SIZE (cargo/serde_derive-1.0.214.tar.gz) = 56630 > +SIZE (cargo/serde-1.0.215.tar.gz) = 78527 > +SIZE (cargo/serde_derive-1.0.215.tar.gz) = 57092 > SIZE (cargo/serde_json-1.0.132.tar.gz) = 150549 > SIZE (cargo/sha1-0.10.6.tar.gz) = 13517 > SIZE (cargo/sha2-0.10.8.tar.gz) = 26357 > @@ -171,4 +171,4 @@ SIZE (cargo/windows_i686_msvc-0.52.5.tar > SIZE (cargo/windows_x86_64_gnu-0.52.5.tar.gz) = 831539 > SIZE (cargo/windows_x86_64_gnullvm-0.52.5.tar.gz) = 433246 > SIZE (cargo/windows_x86_64_msvc-0.52.5.tar.gz) = 827905 > -SIZE (synapse-1.119.0.tar.gz) = 8813426 > +SIZE (synapse-1.120.0.tar.gz) = 8819007 > Index: modules.inc > =================================================================== > RCS file: /cvs/ports/net/synapse/modules.inc,v > diff -u -p -r1.33 modules.inc > --- modules.inc 14 Nov 2024 12:38:07 -0000 1.33 > +++ modules.inc 27 Nov 2024 08:55:07 -0000 > @@ -1,5 +1,5 @@ > MODCARGO_CRATES += aho-corasick 1.1.3 # Unlicense OR MIT > -MODCARGO_CRATES += anyhow 1.0.92 # MIT OR Apache-2.0 > +MODCARGO_CRATES += anyhow 1.0.93 # MIT OR Apache-2.0 > MODCARGO_CRATES += arc-swap 1.7.1 # MIT OR Apache-2.0 > MODCARGO_CRATES += autocfg 1.3.0 # Apache-2.0 OR MIT > MODCARGO_CRATES += base64 0.21.7 # MIT OR Apache-2.0 > @@ -54,8 +54,8 @@ MODCARGO_CRATES += regex-automata 0.4.8 > MODCARGO_CRATES += regex-syntax 0.8.5 # MIT OR Apache-2.0 > MODCARGO_CRATES += ryu 1.0.18 # Apache-2.0 OR BSL-1.0 > MODCARGO_CRATES += scopeguard 1.2.0 # MIT OR Apache-2.0 > -MODCARGO_CRATES += serde 1.0.214 # MIT OR Apache-2.0 > -MODCARGO_CRATES += serde_derive 1.0.214 # MIT OR Apache-2.0 > +MODCARGO_CRATES += serde 1.0.215 # MIT OR Apache-2.0 > +MODCARGO_CRATES += serde_derive 1.0.215 # MIT OR Apache-2.0 > MODCARGO_CRATES += serde_json 1.0.132 # MIT OR Apache-2.0 > MODCARGO_CRATES += sha1 0.10.6 # MIT OR Apache-2.0 > MODCARGO_CRATES += sha2 0.10.8 # MIT OR Apache-2.0 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/net/synapse/pkg/PLIST,v > diff -u -p -r1.56 PLIST > --- pkg/PLIST 14 Nov 2024 12:38:07 -0000 1.56 > +++ pkg/PLIST 27 Nov 2024 08:55:07 -0000 > @@ -2120,6 +2120,9 @@ lib/python${MODPY_VERSION}/site-packages > lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/88/02_fix_sliding_sync_membership_snapshots_forgotten_column.sql > lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/88/03_add_otk_ts_added_index.sql > lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/88/04_current_state_delta_index.sql > +lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/88/05_drop_old_otks.sql.postgres > +lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/88/05_drop_old_otks.sql.sqlite > +lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/88/05_sliding_sync_room_config_index.sql > lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/ > lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/72/ > lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/72/full.sql.postgres > Index: pkg/README > =================================================================== > RCS file: /cvs/ports/net/synapse/pkg/README,v > diff -u -p -r1.6 README > --- pkg/README 5 Oct 2024 09:24:22 -0000 1.6 > +++ pkg/README 27 Nov 2024 08:55:07 -0000 > @@ -18,6 +18,15 @@ doas -u _synapse \ > -c ${LOCALSTATEDIR}/synapse/homeserver.yaml \ > http://localhost:8008 > > +Updating the database after an upgrade > +====================================== > +On startup, synapse will fail to start if the database schema is too old. > +So, after an upgrade of synapse, you should update the database. > +It can be done with a command like this one: > +doas -u _synapse ${LOCALBASE}/bin/update_synapse_database \ > + --database-config /var/synapse/homeserver.yaml \ > + --run-background-updates > + Should be PREFIX / TRUEPREFIX, not LOCALBASE. -- Antoine