1 files changed, 0 insertions, 91 deletions
diff --git a/packages/overlays/matrix-synapse/patches/0020-start_for_complement.sh-use-more-shell-builtins-1829.patch b/packages/overlays/matrix-synapse/patches/0020-start_for_complement.sh-use-more-shell-builtins-1829.patch
deleted file mode 100644
index 1f45cdc..0000000
--- a/packages/overlays/matrix-synapse/patches/0020-start_for_complement.sh-use-more-shell-builtins-1829.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 7be6c711d4a57f990003613c0b9715e3ac1502cb Mon Sep 17 00:00:00 2001
-From: Andrew Ferrazzutti <andrewf@element.io>
-Date: Wed, 30 Apr 2025 11:53:15 -0400
-Subject: [PATCH 20/74] start_for_complement.sh: use more shell builtins
- (#18293)
-
-Avoid calling external tools when shell builtins suffice.
-
-### Pull Request Checklist
-
-<!-- Please read
-https://element-hq.github.io/synapse/latest/development/contributing_guide.html
-before submitting your pull request -->
-
-* [x] Pull request is based on the develop branch
-* [x] Pull request includes a [changelog
-file](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#changelog).
-The entry should:
-- Be a short description of your change which makes sense to users.
-"Fixed a bug that prevented receiving messages from other servers."
-instead of "Moved X method from `EventStore` to `EventWorkerStore`.".
- - Use markdown where necessary, mostly for `code blocks`.
- - End with either a period (.) or an exclamation mark (!).
- - Start with a capital letter.
-- Feel free to credit yourself, by adding a sentence "Contributed by
-@github_username." or "Contributed by [Your Name]." to the end of the
-entry.
-* [x] [Code
-style](https://element-hq.github.io/synapse/latest/code_style.html) is
-correct
-(run the
-[linters](https://element-hq.github.io/synapse/latest/development/contributing_guide.html#run-the-linters))
-
----------
-
-Co-authored-by: Quentin Gliech <quenting@element.io>
----
- changelog.d/18293.docker | 1 +
- docker/complement/conf/start_for_complement.sh | 11 +++++------
- 2 files changed, 6 insertions(+), 6 deletions(-)
- create mode 100644 changelog.d/18293.docker
-
-diff --git a/changelog.d/18293.docker b/changelog.d/18293.docker
-new file mode 100644
-index 0000000000..df47a68bfe
---- /dev/null
-+++ b/changelog.d/18293.docker
-@@ -0,0 +1 @@
-+In start_for_complement.sh, replace some external program calls with shell builtins.
-diff --git a/docker/complement/conf/start_for_complement.sh b/docker/complement/conf/start_for_complement.sh
-index 59b30e2051..a5e06396e2 100755
---- a/docker/complement/conf/start_for_complement.sh
-+++ b/docker/complement/conf/start_for_complement.sh
-@@ -9,7 +9,7 @@ echo " Args: $*"
- echo " Env: SYNAPSE_COMPLEMENT_DATABASE=$SYNAPSE_COMPLEMENT_DATABASE SYNAPSE_COMPLEMENT_USE_WORKERS=$SYNAPSE_COMPLEMENT_USE_WORKERS SYNAPSE_COMPLEMENT_USE_ASYNCIO_REACTOR=$SYNAPSE_COMPLEMENT_USE_ASYNCIO_REACTOR"
-
- function log {
-- d=$(date +"%Y-%m-%d %H:%M:%S,%3N")
-+ d=$(printf '%(%Y-%m-%d %H:%M:%S)T,%.3s\n' ${EPOCHREALTIME/./ })
- echo "$d $*"
- }
-
-@@ -103,12 +103,11 @@ fi
- # Note that both the key and certificate are in PEM format (not DER).
-
- # First generate a configuration file to set up a Subject Alternative Name.
--cat > /conf/server.tls.conf <<EOF
-+echo "\
- .include /etc/ssl/openssl.cnf
-
- [SAN]
--subjectAltName=DNS:${SERVER_NAME}
--EOF
-+subjectAltName=DNS:${SERVER_NAME}" > /conf/server.tls.conf
-
- # Generate an RSA key
- openssl genrsa -out /conf/server.tls.key 2048
-@@ -123,8 +122,8 @@ openssl x509 -req -in /conf/server.tls.csr \
- -out /conf/server.tls.crt -extfile /conf/server.tls.conf -extensions SAN
-
- # Assert that we have a Subject Alternative Name in the certificate.
--# (grep will exit with 1 here if there isn't a SAN in the certificate.)
--openssl x509 -in /conf/server.tls.crt -noout -text | grep DNS:
-+# (the test will exit with 1 here if there isn't a SAN in the certificate.)
-+[[ $(openssl x509 -in /conf/server.tls.crt -noout -text) == *DNS:* ]]
-
- export SYNAPSE_TLS_CERT=/conf/server.tls.crt
- export SYNAPSE_TLS_KEY=/conf/server.tls.key
---
-2.49.0
-
|
