diff --git a/gl-mr635-empty_attachment.patch b/gl-mr635-empty_attachment.patch deleted file mode 100644 index 0eff3e5..0000000 --- a/gl-mr635-empty_attachment.patch +++ /dev/null @@ -1,31 +0,0 @@ -From eb67c2fc470b88385f63435a826d73b32fc3c226 Mon Sep 17 00:00:00 2001 -From: Mark Sapiro -Date: Mon, 15 Jul 2024 17:44:59 -0700 -Subject: [PATCH] Return null bytes for empty attachment get_content. - ---- - hyperkitty/models/email.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/hyperkitty/models/email.py b/hyperkitty/models/email.py -index 651694e5..12732a93 100644 ---- a/hyperkitty/models/email.py -+++ b/hyperkitty/models/email.py -@@ -329,12 +329,12 @@ class Attachment(models.Model): - if self.content is not None: - return bytes(self.content) - if folder is None: -- return "" -+ return b'' - filepath = os.path.join(folder, str(self.counter)) - if not os.path.exists(filepath): - logger.error("Could not find local attachment %s for email %s", - self.counter, self.email.id) -- return "" -+ return b'' - with open(filepath, "rb") as f: - content = f.read() - return content --- -GitLab - diff --git a/hyperkitty-1.3.11.tar.gz b/hyperkitty-1.3.11.tar.gz deleted file mode 100644 index 2672818..0000000 --- a/hyperkitty-1.3.11.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86c54993ff7ddda783b956a0032a0e6c1761be0707bb8489fbd3e4a1ade16acc -size 2251003 diff --git a/hyperkitty-1.3.12.tar.gz b/hyperkitty-1.3.12.tar.gz new file mode 100644 index 0000000..4846ee8 --- /dev/null +++ b/hyperkitty-1.3.12.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:deb582937ec5bc9ea9c1d5d86bfb76a4da429b60e1fea6fd6964e7c667cf161d +size 2231630 diff --git a/hyperkitty-1.3.12.tar.gz.asc b/hyperkitty-1.3.12.tar.gz.asc new file mode 100644 index 0000000..afd0c7d --- /dev/null +++ b/hyperkitty-1.3.12.tar.gz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEEVB6gRIRTOU/3eg7MnZsroGHQpnwFAmbueWwACgkQnZsroGHQ +pnxsWRAAzB3qp5jEdyUzUI28ptQFdFPQrYfOESVGTwsYzQ88/MxDGnbjhcbs4Ch6 +OGt/xATlxbIeiO1fYIYryBO/ZyP3JiwC6PUTaHYnGFGi9rEgJKqaAg2JC10fKBsA +EOKd/Rda9RONZTf54BvODpGl8OgUXGPqblr/xuaddewGfn3pcCiVD3juND8Eromz +U4smsonht08F64jaWGO5Ki2sPaUrXIYfKJdzUMCC5GTwRQLafPEgomamrgfBMcwa +G5LyZt6DXHGEBf0gQKtdR5ixKv4Y6Hk4l2U0NKT3gi5fb6YRF9ftXBZGlRpGEVrj +58xLL4B41ltisf4S5xvZbHidhfvD1hnSpp2RDZtocjkozfk5y71wOSpCZ1/Py19l +keS8Dh4ey90R121+8fa9SBTowIZW3cD4IxlmcJwfNPsuy6wHCv8SJx2I91eiN6rA +z3XTIhk30VFLky7qDLDodH5KucQop0jF+TbvqtJ45HTb4HV30Fx+5eYJMSW5eQAR +SjuYnJih2T/n3o07mRxqhpl9awpdhhLyVsKTevqBLCFES/pmSpwun+bX++JLx4kg +trIVqVYYi+4uUyF7EH0ixOOYVmCx9rJzdLXyX8c9BxKp23zcQcWsxffZzwNpa0N2 +9BpT9w/Vn6wdoKqzsyen6CXgRSDVv9kpgpLZtJ85Y6PfcwroJnY= +=R3Fq +-----END PGP SIGNATURE----- diff --git a/python-HyperKitty.changes b/python-HyperKitty.changes index 0aa6876..fcc1bca 100644 --- a/python-HyperKitty.changes +++ b/python-HyperKitty.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Sep 21 12:05:35 UTC 2024 - Andreas Schneider + +- Update to version 1.3.12 + * https://gitlab.com/mailman/hyperkitty/-/blob/1.3.12/doc/news.rst + or packaged news.rst +- Removed gl-mr635-empty_attachment.patch + ------------------------------------------------------------------- Wed Sep 11 18:35:28 UTC 2024 - Andreas Schneider diff --git a/python-HyperKitty.spec b/python-HyperKitty.spec index 93c480b..49c4f16 100644 --- a/python-HyperKitty.spec +++ b/python-HyperKitty.spec @@ -64,16 +64,14 @@ %define plainpython python Name: python-HyperKitty -Version: 1.3.11 +Version: 1.3.12 Release: 0 Summary: A web interface to access GNU Mailman v3 archives License: GPL-3.0-only URL: https://gitlab.com/mailman/hyperkitty # -Source0: https://gitlab.com/mailman/hyperkitty/-/archive/1.3.11/hyperkitty-1.3.11.tar.gz -# The release links give 404 for this release :-( -#Source0: https://gitlab.com/mailman/hyperkitty/-/releases/%{version}/downloads/hyperkitty-%{version}.tar.gz -#Source1: https://gitlab.com/mailman/hyperkitty/-/releases/%{version}/downloads/hyperkitty-%{version}.tar.gz.asc +Source0: https://gitlab.com/mailman/hyperkitty/-/releases/%{version}/downloads/hyperkitty-%{version}.tar.gz +Source1: https://gitlab.com/mailman/hyperkitty/-/releases/%{version}/downloads/hyperkitty-%{version}.tar.gz.asc Source2: python-HyperKitty.keyring Source3: python-HyperKitty-rpmlintrc # @@ -94,8 +92,6 @@ Patch0: hyperkitty-settings.patch Patch98: gl-mr300-add-opengraph-metadata.patch # PATCH-FIX-UPSTREAM gl-mr470-introduce-feed-filtering.patch gl#mailman/hyperkitty#470 Patch99: gl-mr470-introduce-feed-filtering.patch -# PATCH-FIX-UPSTREAM gl-mr635-empty_attachment.patch gl#mailman/hyperkitty#635 -Patch100: gl-mr635-empty_attachment.patch # BuildRequires: %{python_module Django >= %{django_min_version} with %python-Django < %{django_max_version}} BuildRequires: %{python_module Whoosh} @@ -361,7 +357,7 @@ fi %service_del_postun %{hyperkitty_services} %files -n %{hyperkitty_pkgname} -%doc AUTHORS.txt README.rst example_project +%doc AUTHORS.txt README.rst doc/news.rst example_project %license COPYING.txt %{mypython_sitelib}/hyperkitty %{mypython_sitelib}/hyperkitty-%{version}*-info