diff --git a/HyperKitty-1.3.7.tar.gz b/HyperKitty-1.3.7.tar.gz deleted file mode 100644 index 0a3d82f..0000000 --- a/HyperKitty-1.3.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d74aca3ec30546741ca62339ece72392e298f511d0a89e69bcedbfcdc8102cb -size 2691781 diff --git a/HyperKitty-1.3.8.tar.gz b/HyperKitty-1.3.8.tar.gz new file mode 100644 index 0000000..c578a74 --- /dev/null +++ b/HyperKitty-1.3.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fffccadba2cfe0d4119e9c746639ee46bc0cdae67bbf99c84081d2d0bbd87b8 +size 2556166 diff --git a/fix-elasticsearch8.patch b/fix-elasticsearch8.patch deleted file mode 100644 index 3b896da..0000000 --- a/fix-elasticsearch8.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0e86f9cc40bf05cb819087f1fb0ee56f43968e1b Mon Sep 17 00:00:00 2001 -From: Daniel Garcia Moreno -Date: Thu, 6 Oct 2022 14:01:54 +0200 -Subject: [PATCH] Make it compatible with elasticsearch 8.0.0 - ---- - hyperkitty/tests/views/test_search.py | 10 +++++++++- - tox.ini | 2 +- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/hyperkitty/tests/views/test_search.py b/hyperkitty/tests/views/test_search.py -index ad0e9632..cad76fe6 100644 ---- a/hyperkitty/tests/views/test_search.py -+++ b/hyperkitty/tests/views/test_search.py -@@ -211,10 +211,18 @@ class SearchViewsTestCase(SearchEnabledTestCase): - - # For elasticsearch backend - from elasticsearch import RequestError -+ from elasticsearch import VERSION -+ mayor, _minor, _p = VERSION -+ -+ search_error = "dummy parsing failure" -+ if mayor > 7: -+ class ElasticError: -+ status = search_error -+ search_error = ElasticError - - class CrashingIterator(list): - def __len__(self): -- raise RequestError(400, "dummy parsing failure", {}) -+ raise RequestError(400, search_error, {}) - query = Mock() - - with self.settings(HAYSTACK_CONNECTIONS={ diff --git a/gl-mr300-add-opengraph-metadata.patch b/gl-mr300-add-opengraph-metadata.patch new file mode 100644 index 0000000..661fcec --- /dev/null +++ b/gl-mr300-add-opengraph-metadata.patch @@ -0,0 +1,302 @@ +# Rewritten from upstream .patch to avoid fuzzing +Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/base.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/base.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/base.html +@@ -24,6 +24,11 @@ + {% block additional_stylesheets %} {% endblock %} + {% block head_feed %}{% endblock %} + {% include 'hyperkitty/headers.html' %} ++ ++ {% block additional_og %}{% endblock %} ++ ++ ++ + + + +Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/errors/notimplemented.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/errors/notimplemented.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/errors/notimplemented.html +@@ -7,6 +7,11 @@ + {% trans "Not implemented yet" %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +

{% trans "Not implemented" %}

+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/errors/private.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/errors/private.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/errors/private.html +@@ -7,6 +7,11 @@ + {% trans "Error: private list" %} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/index.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/index.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/index.html +@@ -9,6 +9,11 @@ + {% trans 'Available lists' %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/message.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message.html +@@ -1,12 +1,29 @@ + {% extends "hyperkitty/base.html" %} + {% load i18n %} + {% load hk_generic %} ++{% load gravatar %} + + + {% block head_title %} + {{ message.subject }} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++ ++ ++ ++ ++ ++{% for tag in message.thread.tags.distinct %} ++ ++{% endfor %} ++ ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message_new.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/message_new.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/message_new.html +@@ -8,6 +8,11 @@ + {% trans "Create a new thread" %} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/overview.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/overview.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/overview.html +@@ -4,6 +4,13 @@ + {% load static %} + {% load cache %} + ++{% block additional_og %} ++ ++ ++ ++ ++{% endblock %} ++ + {% block head_title %} + {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} +Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/reattach.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/reattach.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/reattach.html +@@ -9,6 +9,11 @@ + {% trans "Reattach a thread" %} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/search_results.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/search_results.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/search_results.html +@@ -8,6 +8,11 @@ + {% trans "Search results for" %} "{{ query }}"{% if mlist %} - {{ mlist.display_name|default:mlist.name }} {% endif %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/thread.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread.html +@@ -3,12 +3,29 @@ + {% load i18n %} + {% load hk_generic %} + {% load static %} ++{% load gravatar %} + + + {% block head_title %} + {{ subject }} - {{ mlist.display_name|default:mlist.name }} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++ ++ ++ ++ ++ ++{% for tag in thread.tags.distinct %} ++ ++{% endfor %} ++ ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread_list.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/thread_list.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/thread_list.html +@@ -13,6 +13,13 @@ + + {% endblock %} + ++{% block additional_og %} ++ ++ ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_posts.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/user_posts.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_posts.html +@@ -8,6 +8,11 @@ + {% trans "Messages by" %} {{ fullname }}{% if mlist %} - {{ mlist.display_name|default:mlist.name }} {% endif %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +
+Index: HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_profile/base.html +=================================================================== +--- HyperKitty-1.3.8.orig/hyperkitty/templates/hyperkitty/user_profile/base.html ++++ HyperKitty-1.3.8/hyperkitty/templates/hyperkitty/user_profile/base.html +@@ -5,6 +5,11 @@ + {% trans "User posting activity" %} - {{ block.super }} + {% endblock %} + ++{% block additional_og %} ++ ++ ++{% endblock %} ++ + {% block content %} + +