From 03161338463eb8f29d2b0a16544a6ccb05e5ecf0 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 23 Aug 2023 23:09:09 +0200 Subject: [PATCH 01/27] Revert "Reenable PHP plugins support" Looks like php-embed is not working properly at the moment. This reverts commit 1465126ece99004a1b9aebc9b370b6b63275649a. --- weechat.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/weechat.spec b/weechat.spec index a792689..f32ca4b 100644 --- a/weechat.spec +++ b/weechat.spec @@ -74,8 +74,6 @@ BuildRequires: lua-devel BuildRequires: ncurses-devel BuildRequires: perl-ExtUtils-Embed BuildRequires: perl-devel -BuildRequires: php-embedded -BuildRequires: php-devel BuildRequires: pkgconfig BuildRequires: python3-devel BuildRequires: ruby @@ -128,6 +126,7 @@ sed -i 's/NAMES python3.7/NAMES python%{python3_version}m python%{python3_versio -DPREFIX=%{_prefix} \ -DLIBDIR=%{_libdir} \ -DENABLE_ENCHANT=ON \ + -DENABLE_PHP=OFF \ %if %{with check} -DENABLE_TESTS=ON \ %else @@ -135,6 +134,7 @@ sed -i 's/NAMES python3.7/NAMES python%{python3_version}m python%{python3_versio %endif %if %{with docs} -DENABLE_DOC=ON \ + -DENABLE_DOC_INCOMPLETE=ON \ -DENABLE_MAN=ON \ %else -DENABLE_DOC=OFF \ From 825059c4bff5ebde20d7b1b9b159c2739f081903 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 24 Sep 2023 18:34:39 +0200 Subject: [PATCH 02/27] Update to 4.0.5 --- sources | 2 +- weechat.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 4a123f4..a24c51a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.0.4.tar.xz) = ddd150dad253cf4d9bc96122d2d3951c696b19f796a7cbf159edc258d4b18f1b2544b7b62362e7b59d6b3ff3e756de3ce4aaff83b02d3fe2d1cb614162965efd +SHA512 (weechat-4.0.5.tar.xz) = 3cf082463c29f8dfe118237ac0d46f5606311634ed1db47f3210a9176020c4f1566a6c4274bd33f5d6b5dd796b169f330a2aacd9928a0feb6181ebf9991177ea diff --git a/weechat.spec b/weechat.spec index f32ca4b..1294044 100644 --- a/weechat.spec +++ b/weechat.spec @@ -34,7 +34,7 @@ %endif Name: weechat -Version: 4.0.4 +Version: 4.0.5 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From 0551a8fb90fe01e7231b963e308f5a912a0caf3c Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 15 Oct 2023 23:47:27 +0200 Subject: [PATCH 03/27] Update to 4.1.0 * Reenable tests on s390x, because those work now since https://github.com/weechat/weechat/pull/2021 * Remove unnecessary cmake/FindPython.cmake edit * Unset ENABLE_JAVASCRIPT (and remove v8-devel dependency) since it's off by default --- sources | 2 +- weechat.spec | 17 +---------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/sources b/sources index a24c51a..2a108b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.0.5.tar.xz) = 3cf082463c29f8dfe118237ac0d46f5606311634ed1db47f3210a9176020c4f1566a6c4274bd33f5d6b5dd796b169f330a2aacd9928a0feb6181ebf9991177ea +SHA512 (weechat-4.1.0.tar.xz) = 3978e407eec176f812bc696006e40077bf7f2acc7940223fc6d72d06394133c46bc14a953a20433475a42b673db57b6bc6e5fcb4c04c90d07d46332c34b84711 diff --git a/weechat.spec b/weechat.spec index 1294044..9cadab4 100644 --- a/weechat.spec +++ b/weechat.spec @@ -1,11 +1,6 @@ %if 0%{?fedora} || 0%{?rhel} >= 8 -%ifnarch s390x %bcond_without check %else -# some tests fail on s390x -%bcond_with check -%endif -%else # no cpputest in EL7 %bcond_with check %endif @@ -34,7 +29,7 @@ %endif Name: weechat -Version: 4.0.5 +Version: 4.1.0 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications @@ -81,13 +76,6 @@ BuildRequires: ruby-devel BuildRequires: source-highlight BuildRequires: tcl-devel BuildRequires: libzstd-devel -%ifarch %{ix86} x86_64 %{arm} -# https://bugzilla.redhat.com/show_bug.cgi?id=1338728 -# https://github.com/weechat/weechat/issues/360 -%if 0%{?rhel} && 0%{?rhel} < 8 -BuildRequires: v8-devel -%endif -%endif BuildRequires: zlib-devel %if 0%{?rhel} BuildRequires: cmake3 @@ -118,8 +106,6 @@ This package contains include files and pc file for weechat. find doc/ -type f -name 'CMakeLists.txt' \ -exec sed -i -e 's#${PROJECT_NAME}#%{_doc}#g' '{}' \; -sed -i 's/NAMES python3.7/NAMES python%{python3_version}m python%{python3_version}/' cmake/FindPython.cmake - %build %cmake3 \ @@ -140,7 +126,6 @@ sed -i 's/NAMES python3.7/NAMES python%{python3_version}m python%{python3_versio -DENABLE_DOC=OFF \ -DENABLE_MAN=OFF \ %endif - -DENABLE_JAVASCRIPT=OFF \ -DCA_FILE=/etc/pki/tls/certs/ca-bundle.crt \ %{nil} %cmake3_build From cb8827e43eb2cc083a17e5aac3a7c34b06a6ca89 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 27 Oct 2023 09:18:01 +0200 Subject: [PATCH 04/27] Update to 4.1.1 --- sources | 2 +- weechat.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2a108b9..2b14e39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.1.0.tar.xz) = 3978e407eec176f812bc696006e40077bf7f2acc7940223fc6d72d06394133c46bc14a953a20433475a42b673db57b6bc6e5fcb4c04c90d07d46332c34b84711 +SHA512 (weechat-4.1.1.tar.xz) = 9d6bae5cc0c11cf3d06b0f9e457d01e76d240e8737e683a5c8a1bc89a1102b5ba75b2c59629df9433ba6a5ed42152d4390713618e646089acb7947000d9872d5 diff --git a/weechat.spec b/weechat.spec index 9cadab4..cac1707 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.1.0 +Version: 4.1.1 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From 4a35a60c98de2f4107ce44cd773d70aa8731da19 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 4 Dec 2023 15:56:39 +0100 Subject: [PATCH 05/27] Update to 4.1.2 --- sources | 2 +- weechat.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2b14e39..9e76541 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.1.1.tar.xz) = 9d6bae5cc0c11cf3d06b0f9e457d01e76d240e8737e683a5c8a1bc89a1102b5ba75b2c59629df9433ba6a5ed42152d4390713618e646089acb7947000d9872d5 +SHA512 (weechat-4.1.2.tar.xz) = 9df8b43a7210f06cece1d28fcf8559885a0d5590b5691f63205b215417f132e4d74f4af18b572daae2679d5cf574b61538a7067e03087be10e831fee4f55e115 diff --git a/weechat.spec b/weechat.spec index cac1707..42cde0c 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.1.1 +Version: 4.1.2 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From d497d5657373e92339f202c2c3e69bf266ab5cbe Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 22 Jan 2024 19:31:01 +0100 Subject: [PATCH 06/27] Update to 4.2.1 --- sources | 2 +- weechat.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9e76541..42d71e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.1.2.tar.xz) = 9df8b43a7210f06cece1d28fcf8559885a0d5590b5691f63205b215417f132e4d74f4af18b572daae2679d5cf574b61538a7067e03087be10e831fee4f55e115 +SHA512 (weechat-4.2.1.tar.xz) = e9ed67cd45b374435b05043dd9f085d30f4b429dff1afa82fe5f50522283faa86b5e6909ec1f51af033a612abe5f52f4441433bcc94e59027fc5ccff86e84c62 diff --git a/weechat.spec b/weechat.spec index 42cde0c..02ce12d 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.1.2 +Version: 4.2.1 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From b6dda2165344d57240e0a102961ba320563f887e Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 8 Apr 2024 20:00:40 +0200 Subject: [PATCH 07/27] Update to 4.2.2 --- sources | 2 +- weechat.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 42d71e6..70fb35d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.2.1.tar.xz) = e9ed67cd45b374435b05043dd9f085d30f4b429dff1afa82fe5f50522283faa86b5e6909ec1f51af033a612abe5f52f4441433bcc94e59027fc5ccff86e84c62 +SHA512 (weechat-4.2.2.tar.xz) = cee642ea0fd43763933bb401d40999dff0b1a5260d536d7437cb2188e31f90c8196c6836072be51fa9df7abca5f5aee91a5f99e82852c9268091347d56350032 diff --git a/weechat.spec b/weechat.spec index 02ce12d..5c19866 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.2.1 +Version: 4.2.2 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From 4ef1e94a38def08ca6b656215f7b3e70965d5ae3 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 26 May 2024 11:32:32 +0200 Subject: [PATCH 08/27] Update to 4.3.0 --- ...s-relay-add-missing-string.h-include.patch | 25 ++++++++++ ...elay-fix-HotlistToJson-test-on-s390x.patch | 49 +++++++++++++++++++ ...-tests-scripts-fix-wrong-ifdef-check.patch | 25 ++++++++++ sources | 2 +- weechat-3.4-tests-fPIC.patch | 13 ++--- weechat.spec | 9 +++- 6 files changed, 115 insertions(+), 8 deletions(-) create mode 100644 0001-tests-relay-add-missing-string.h-include.patch create mode 100644 0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch create mode 100644 0001-tests-scripts-fix-wrong-ifdef-check.patch diff --git a/0001-tests-relay-add-missing-string.h-include.patch b/0001-tests-relay-add-missing-string.h-include.patch new file mode 100644 index 0000000..acb022f --- /dev/null +++ b/0001-tests-relay-add-missing-string.h-include.patch @@ -0,0 +1,25 @@ +From 6f774a8e8e316557ddb9b7f03f8037c03cfd6983 Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Sun, 26 May 2024 12:02:05 +0200 +Subject: [PATCH] tests: relay: add missing include + +Fixes build error on Fedora 40. +--- + .../unit/plugins/relay/api/remote/test-relay-remote-network.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/unit/plugins/relay/api/remote/test-relay-remote-network.cpp b/tests/unit/plugins/relay/api/remote/test-relay-remote-network.cpp +index 098b93c50..5e19e0ee0 100644 +--- a/tests/unit/plugins/relay/api/remote/test-relay-remote-network.cpp ++++ b/tests/unit/plugins/relay/api/remote/test-relay-remote-network.cpp +@@ -25,6 +25,7 @@ + + extern "C" + { ++#include + #include + #include "src/core/core-config-file.h" + #include "src/plugins/relay/relay.h" +-- +2.45.1 + diff --git a/0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch b/0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch new file mode 100644 index 0000000..0d3d878 --- /dev/null +++ b/0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch @@ -0,0 +1,49 @@ +From 14187b38342987fa83b90039973d25ffa452870a Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Sun, 26 May 2024 13:18:30 +0200 +Subject: [PATCH] tests: relay: fix HotlistToJson test on s390x + +1: error: Failure in TEST(RelayApiMsg, HotlistToJson) +1: expected <2024-05-26T10:29:37.716512Z> +1: but was <2024-05-26T10:29:37.000000Z> +1: difference starts at position 20 at: +--- + tests/unit/plugins/relay/api/test-relay-api-msg.cpp | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/tests/unit/plugins/relay/api/test-relay-api-msg.cpp b/tests/unit/plugins/relay/api/test-relay-api-msg.cpp +index 696bf1fc8..ffa6945c4 100644 +--- a/tests/unit/plugins/relay/api/test-relay-api-msg.cpp ++++ b/tests/unit/plugins/relay/api/test-relay-api-msg.cpp +@@ -26,6 +26,7 @@ extern "C" + #include + #include + #include ++#include "src/core/core-hdata.h" + #include "src/core/core-util.h" + #include "src/gui/gui-buffer.h" + #include "src/gui/gui-chat.h" +@@ -502,6 +503,7 @@ TEST(RelayApiMsg, HotlistToJson) + { + char str_date[128]; + cJSON *json, *json_obj, *json_count; ++ time_t time_value; + struct timeval tv; + struct tm gm_time; + +@@ -526,9 +528,10 @@ TEST(RelayApiMsg, HotlistToJson) + CHECK(json); + CHECK(cJSON_IsObject (json)); + WEE_CHECK_OBJ_NUM(GUI_HOTLIST_HIGHLIGHT, json, "priority"); +- gmtime_r (&(gui_hotlist->creation_time.tv_sec), &gm_time); ++ time_value = hdata_time (relay_hdata_hotlist, gui_hotlist, "time"); ++ gmtime_r (&time_value, &gm_time); + tv.tv_sec = mktime (&gm_time); +- tv.tv_usec = gui_hotlist->creation_time.tv_usec; ++ tv.tv_usec = hdata_integer (relay_hdata_hotlist, gui_hotlist, "time_usec"); + util_strftimeval (str_date, sizeof (str_date), "%FT%T.%fZ", &tv); + WEE_CHECK_OBJ_STR(str_date, json, "date"); + WEE_CHECK_OBJ_NUM(gui_buffers->id, json, "buffer_id"); +-- +2.45.1 + diff --git a/0001-tests-scripts-fix-wrong-ifdef-check.patch b/0001-tests-scripts-fix-wrong-ifdef-check.patch new file mode 100644 index 0000000..830482f --- /dev/null +++ b/0001-tests-scripts-fix-wrong-ifdef-check.patch @@ -0,0 +1,25 @@ +From 9bd1ea1e5eb06a70ee907c1a10fc0316e0c740ba Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Sun, 26 May 2024 12:21:55 +0200 +Subject: [PATCH] tests: scripts: fix wrong ifdef check + +--- + tests/scripts/test-scripts.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/scripts/test-scripts.cpp b/tests/scripts/test-scripts.cpp +index d8bcc4385..9a71c4140 100644 +--- a/tests/scripts/test-scripts.cpp ++++ b/tests/scripts/test-scripts.cpp +@@ -153,7 +153,7 @@ TEST(Scripts, API) + #ifdef HAVE_JAVASCRIPT + { "javascript", "js" }, + #endif +-#ifdef HAVE_PYTHON ++#ifdef HAVE_PHP + { "php", "php" }, + #endif + { NULL, NULL } +-- +2.45.1 + diff --git a/sources b/sources index 70fb35d..c26c8a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.2.2.tar.xz) = cee642ea0fd43763933bb401d40999dff0b1a5260d536d7437cb2188e31f90c8196c6836072be51fa9df7abca5f5aee91a5f99e82852c9268091347d56350032 +SHA512 (weechat-4.3.0.tar.xz) = d52d04dd3e8a5e0b5f6b626c2ee9e1b400c8605e7102a53b22206ad4caf89f226fd1cfc827072c3ab298967f4d1ba94a97c504cee8e9ecdec8234eabacc63e12 diff --git a/weechat-3.4-tests-fPIC.patch b/weechat-3.4-tests-fPIC.patch index 6cbf7d6..c23e3f1 100644 --- a/weechat-3.4-tests-fPIC.patch +++ b/weechat-3.4-tests-fPIC.patch @@ -1,9 +1,10 @@ -diff -ruN weechat-3.4/tests/CMakeLists.txt weechat-3.4-tests-fPIC/tests/CMakeLists.txt ---- weechat-3.4/tests/CMakeLists.txt 2021-12-17 23:57:32.000000000 -0800 -+++ weechat-3.4-tests-fPIC/tests/CMakeLists.txt 2022-01-14 15:34:23.072801796 -0800 -@@ -22,6 +22,8 @@ - remove_definitions(-DHAVE_CONFIG_H) - include_directories(${CPPUTEST_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 58c74e9..463fd63 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -47,6 +47,8 @@ if(ENABLE_PHP) + add_definitions(-DHAVE_PHP) + endif() +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") + diff --git a/weechat.spec b/weechat.spec index 5c19866..196404a 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.2.2 +Version: 4.3.0 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications @@ -43,6 +43,12 @@ Source: http://weechat.org/files/src/%{name}-%{version}.tar.xz Patch0: weechat-3.4-tests-fPIC.patch # this fails on too many tests, we want to let them finish anyway Patch1: weechat-3.4-disable-memleak-detection.patch +# https://github.com/weechat/weechat/pull/2116 +Patch2: 0001-tests-relay-add-missing-string.h-include.patch +# https://github.com/weechat/weechat/pull/2117 +Patch3: 0001-tests-scripts-fix-wrong-ifdef-check.patch +# https://github.com/weechat/weechat/pull/2118 +Patch4: 0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch BuildRequires: gcc %if %{with check} @@ -53,6 +59,7 @@ BuildRequires: glibc-langpack-en BuildRequires: asciidoctor %endif BuildRequires: ca-certificates +BuildRequires: cjson-devel BuildRequires: cmake BuildRequires: docbook-style-xsl BuildRequires: enchant-devel From 42b1d5567e3d66d179e5a0138041e2eb318b6ee4 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 26 May 2024 15:21:40 +0200 Subject: [PATCH 09/27] Fix i386 build --- ...-fix-return-value-for-hdata_longlong.patch | 38 +++++++++++++++++++ weechat.spec | 2 + 2 files changed, 40 insertions(+) create mode 100644 0001-tcl-fix-return-value-for-hdata_longlong.patch diff --git a/0001-tcl-fix-return-value-for-hdata_longlong.patch b/0001-tcl-fix-return-value-for-hdata_longlong.patch new file mode 100644 index 0000000..2817ef9 --- /dev/null +++ b/0001-tcl-fix-return-value-for-hdata_longlong.patch @@ -0,0 +1,38 @@ +From 4e01c077d6ef6516e00b9e55cbf92a741a1d1239 Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Sun, 26 May 2024 15:19:05 +0200 +Subject: [PATCH] tcl: fix return value for hdata_longlong + +Using API_RETURN_LONG() here breaks tests on i368. +--- + src/plugins/tcl/weechat-tcl-api.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/tcl/weechat-tcl-api.c b/src/plugins/tcl/weechat-tcl-api.c +index 487ad5d97..6bef61433 100644 +--- a/src/plugins/tcl/weechat-tcl-api.c ++++ b/src/plugins/tcl/weechat-tcl-api.c +@@ -125,6 +125,11 @@ + Tcl_SetObjResult (interp, Tcl_NewLongObj (__long)); \ + return TCL_OK; \ + } ++#define API_RETURN_LONGLONG(__longlong) \ ++ { \ ++ Tcl_SetObjResult (interp, Tcl_NewWideIntObj (__longlong)); \ ++ return TCL_OK; \ ++ } + #define API_RETURN_OBJ(__obj) \ + { \ + Tcl_SetObjResult (interp, __obj); \ +@@ -5368,7 +5373,7 @@ API_FUNC(hdata_longlong) + API_STR2PTR(pointer), + name); + +- API_RETURN_LONG(result); ++ API_RETURN_LONGLONG(result); + } + + API_FUNC(hdata_string) +-- +2.45.1 + diff --git a/weechat.spec b/weechat.spec index 196404a..a2aa916 100644 --- a/weechat.spec +++ b/weechat.spec @@ -49,6 +49,8 @@ Patch2: 0001-tests-relay-add-missing-string.h-include.patch Patch3: 0001-tests-scripts-fix-wrong-ifdef-check.patch # https://github.com/weechat/weechat/pull/2118 Patch4: 0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch +# https://github.com/weechat/weechat/pull/2119 +Patch5: 0001-tcl-fix-return-value-for-hdata_longlong.patch BuildRequires: gcc %if %{with check} From 1ad5dcb0e5dce085e45c888db08b15cfead06ad0 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 28 May 2024 08:03:23 +0200 Subject: [PATCH 10/27] Remove unnecessary cmake option Has been removed since v3.2-rc1. --- weechat.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/weechat.spec b/weechat.spec index a2aa916..712ca88 100644 --- a/weechat.spec +++ b/weechat.spec @@ -135,7 +135,6 @@ find doc/ -type f -name 'CMakeLists.txt' \ -DENABLE_DOC=OFF \ -DENABLE_MAN=OFF \ %endif - -DCA_FILE=/etc/pki/tls/certs/ca-bundle.crt \ %{nil} %cmake3_build From c42c7f761a89e9d7324de56aa079c95a552dce25 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Tue, 28 May 2024 08:22:37 +0200 Subject: [PATCH 11/27] Replace local -fPIC patch with an upstrem equivalent --- ...ix-compilation-of-tests-on-Rocky-9.4.patch | 27 +++++++++++++++++++ weechat-3.4-tests-fPIC.patch | 13 --------- weechat.spec | 6 ++--- 3 files changed, 29 insertions(+), 17 deletions(-) create mode 100644 0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch delete mode 100644 weechat-3.4-tests-fPIC.patch diff --git a/0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch b/0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch new file mode 100644 index 0000000..5fa8970 --- /dev/null +++ b/0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch @@ -0,0 +1,27 @@ +From c992a411597b530d45dd03f489b06af9a16aec2f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= +Date: Sun, 26 May 2024 15:41:52 +0200 +Subject: [PATCH] tests: fix compilation of tests on Rocky 9.4 + +--- + tests/CMakeLists.txt | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 58c74e9..2aba8ed 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -22,6 +22,10 @@ enable_language(CXX) + remove_definitions(-DHAVE_CONFIG_H) + include_directories(${CPPUTEST_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}) + ++if(NOT CYGWIN) ++ add_definitions(-fPIC) ++endif() ++ + if(ENABLE_PYTHON) + add_definitions(-DHAVE_PYTHON) + endif() +-- +2.45.1 + diff --git a/weechat-3.4-tests-fPIC.patch b/weechat-3.4-tests-fPIC.patch deleted file mode 100644 index c23e3f1..0000000 --- a/weechat-3.4-tests-fPIC.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 58c74e9..463fd63 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -47,6 +47,8 @@ if(ENABLE_PHP) - add_definitions(-DHAVE_PHP) - endif() - -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") -+ - # unit tests (core) - set(LIB_WEECHAT_UNIT_TESTS_CORE_SRC - unit/core/test-core-arraylist.cpp diff --git a/weechat.spec b/weechat.spec index 712ca88..b0a5287 100644 --- a/weechat.spec +++ b/weechat.spec @@ -37,10 +37,8 @@ URL: http://weechat.org License: GPLv3 Source: http://weechat.org/files/src/%{name}-%{version}.tar.xz -# /usr/bin/ld: CMakeFiles/charset.dir/charset.o: -# relocation R_X86_64_PC32 against symbol `weechat_charset_plugin' -# can not be used when making a shared object; recompile with -fPIC -Patch0: weechat-3.4-tests-fPIC.patch +# https://github.com/weechat/weechat/commit/917054c58 +Patch0: 0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch # this fails on too many tests, we want to let them finish anyway Patch1: weechat-3.4-disable-memleak-detection.patch # https://github.com/weechat/weechat/pull/2116 From 7952962bc02ad01edfd0ff4f31ba121906818e0b Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 31 May 2024 16:13:46 +0200 Subject: [PATCH 12/27] Update to 4.3.1 --- ...-fix-return-value-for-hdata_longlong.patch | 38 -------------- ...ix-compilation-of-tests-on-Rocky-9.4.patch | 27 ---------- ...s-relay-add-missing-string.h-include.patch | 25 ---------- ...elay-fix-HotlistToJson-test-on-s390x.patch | 49 ------------------- ...-tests-scripts-fix-wrong-ifdef-check.patch | 25 ---------- sources | 2 +- weechat-3.4-disable-memleak-detection.patch | 23 --------- weechat.spec | 14 +----- 8 files changed, 2 insertions(+), 201 deletions(-) delete mode 100644 0001-tcl-fix-return-value-for-hdata_longlong.patch delete mode 100644 0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch delete mode 100644 0001-tests-relay-add-missing-string.h-include.patch delete mode 100644 0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch delete mode 100644 0001-tests-scripts-fix-wrong-ifdef-check.patch delete mode 100644 weechat-3.4-disable-memleak-detection.patch diff --git a/0001-tcl-fix-return-value-for-hdata_longlong.patch b/0001-tcl-fix-return-value-for-hdata_longlong.patch deleted file mode 100644 index 2817ef9..0000000 --- a/0001-tcl-fix-return-value-for-hdata_longlong.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4e01c077d6ef6516e00b9e55cbf92a741a1d1239 Mon Sep 17 00:00:00 2001 -From: LuK1337 -Date: Sun, 26 May 2024 15:19:05 +0200 -Subject: [PATCH] tcl: fix return value for hdata_longlong - -Using API_RETURN_LONG() here breaks tests on i368. ---- - src/plugins/tcl/weechat-tcl-api.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/tcl/weechat-tcl-api.c b/src/plugins/tcl/weechat-tcl-api.c -index 487ad5d97..6bef61433 100644 ---- a/src/plugins/tcl/weechat-tcl-api.c -+++ b/src/plugins/tcl/weechat-tcl-api.c -@@ -125,6 +125,11 @@ - Tcl_SetObjResult (interp, Tcl_NewLongObj (__long)); \ - return TCL_OK; \ - } -+#define API_RETURN_LONGLONG(__longlong) \ -+ { \ -+ Tcl_SetObjResult (interp, Tcl_NewWideIntObj (__longlong)); \ -+ return TCL_OK; \ -+ } - #define API_RETURN_OBJ(__obj) \ - { \ - Tcl_SetObjResult (interp, __obj); \ -@@ -5368,7 +5373,7 @@ API_FUNC(hdata_longlong) - API_STR2PTR(pointer), - name); - -- API_RETURN_LONG(result); -+ API_RETURN_LONGLONG(result); - } - - API_FUNC(hdata_string) --- -2.45.1 - diff --git a/0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch b/0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch deleted file mode 100644 index 5fa8970..0000000 --- a/0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c992a411597b530d45dd03f489b06af9a16aec2f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= -Date: Sun, 26 May 2024 15:41:52 +0200 -Subject: [PATCH] tests: fix compilation of tests on Rocky 9.4 - ---- - tests/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 58c74e9..2aba8ed 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -22,6 +22,10 @@ enable_language(CXX) - remove_definitions(-DHAVE_CONFIG_H) - include_directories(${CPPUTEST_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}) - -+if(NOT CYGWIN) -+ add_definitions(-fPIC) -+endif() -+ - if(ENABLE_PYTHON) - add_definitions(-DHAVE_PYTHON) - endif() --- -2.45.1 - diff --git a/0001-tests-relay-add-missing-string.h-include.patch b/0001-tests-relay-add-missing-string.h-include.patch deleted file mode 100644 index acb022f..0000000 --- a/0001-tests-relay-add-missing-string.h-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6f774a8e8e316557ddb9b7f03f8037c03cfd6983 Mon Sep 17 00:00:00 2001 -From: LuK1337 -Date: Sun, 26 May 2024 12:02:05 +0200 -Subject: [PATCH] tests: relay: add missing include - -Fixes build error on Fedora 40. ---- - .../unit/plugins/relay/api/remote/test-relay-remote-network.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/unit/plugins/relay/api/remote/test-relay-remote-network.cpp b/tests/unit/plugins/relay/api/remote/test-relay-remote-network.cpp -index 098b93c50..5e19e0ee0 100644 ---- a/tests/unit/plugins/relay/api/remote/test-relay-remote-network.cpp -+++ b/tests/unit/plugins/relay/api/remote/test-relay-remote-network.cpp -@@ -25,6 +25,7 @@ - - extern "C" - { -+#include - #include - #include "src/core/core-config-file.h" - #include "src/plugins/relay/relay.h" --- -2.45.1 - diff --git a/0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch b/0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch deleted file mode 100644 index 0d3d878..0000000 --- a/0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 14187b38342987fa83b90039973d25ffa452870a Mon Sep 17 00:00:00 2001 -From: LuK1337 -Date: Sun, 26 May 2024 13:18:30 +0200 -Subject: [PATCH] tests: relay: fix HotlistToJson test on s390x - -1: error: Failure in TEST(RelayApiMsg, HotlistToJson) -1: expected <2024-05-26T10:29:37.716512Z> -1: but was <2024-05-26T10:29:37.000000Z> -1: difference starts at position 20 at: ---- - tests/unit/plugins/relay/api/test-relay-api-msg.cpp | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/tests/unit/plugins/relay/api/test-relay-api-msg.cpp b/tests/unit/plugins/relay/api/test-relay-api-msg.cpp -index 696bf1fc8..ffa6945c4 100644 ---- a/tests/unit/plugins/relay/api/test-relay-api-msg.cpp -+++ b/tests/unit/plugins/relay/api/test-relay-api-msg.cpp -@@ -26,6 +26,7 @@ extern "C" - #include - #include - #include -+#include "src/core/core-hdata.h" - #include "src/core/core-util.h" - #include "src/gui/gui-buffer.h" - #include "src/gui/gui-chat.h" -@@ -502,6 +503,7 @@ TEST(RelayApiMsg, HotlistToJson) - { - char str_date[128]; - cJSON *json, *json_obj, *json_count; -+ time_t time_value; - struct timeval tv; - struct tm gm_time; - -@@ -526,9 +528,10 @@ TEST(RelayApiMsg, HotlistToJson) - CHECK(json); - CHECK(cJSON_IsObject (json)); - WEE_CHECK_OBJ_NUM(GUI_HOTLIST_HIGHLIGHT, json, "priority"); -- gmtime_r (&(gui_hotlist->creation_time.tv_sec), &gm_time); -+ time_value = hdata_time (relay_hdata_hotlist, gui_hotlist, "time"); -+ gmtime_r (&time_value, &gm_time); - tv.tv_sec = mktime (&gm_time); -- tv.tv_usec = gui_hotlist->creation_time.tv_usec; -+ tv.tv_usec = hdata_integer (relay_hdata_hotlist, gui_hotlist, "time_usec"); - util_strftimeval (str_date, sizeof (str_date), "%FT%T.%fZ", &tv); - WEE_CHECK_OBJ_STR(str_date, json, "date"); - WEE_CHECK_OBJ_NUM(gui_buffers->id, json, "buffer_id"); --- -2.45.1 - diff --git a/0001-tests-scripts-fix-wrong-ifdef-check.patch b/0001-tests-scripts-fix-wrong-ifdef-check.patch deleted file mode 100644 index 830482f..0000000 --- a/0001-tests-scripts-fix-wrong-ifdef-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9bd1ea1e5eb06a70ee907c1a10fc0316e0c740ba Mon Sep 17 00:00:00 2001 -From: LuK1337 -Date: Sun, 26 May 2024 12:21:55 +0200 -Subject: [PATCH] tests: scripts: fix wrong ifdef check - ---- - tests/scripts/test-scripts.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/scripts/test-scripts.cpp b/tests/scripts/test-scripts.cpp -index d8bcc4385..9a71c4140 100644 ---- a/tests/scripts/test-scripts.cpp -+++ b/tests/scripts/test-scripts.cpp -@@ -153,7 +153,7 @@ TEST(Scripts, API) - #ifdef HAVE_JAVASCRIPT - { "javascript", "js" }, - #endif --#ifdef HAVE_PYTHON -+#ifdef HAVE_PHP - { "php", "php" }, - #endif - { NULL, NULL } --- -2.45.1 - diff --git a/sources b/sources index c26c8a8..2bb51c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.3.0.tar.xz) = d52d04dd3e8a5e0b5f6b626c2ee9e1b400c8605e7102a53b22206ad4caf89f226fd1cfc827072c3ab298967f4d1ba94a97c504cee8e9ecdec8234eabacc63e12 +SHA512 (weechat-4.3.1.tar.xz) = e78fb37f983600340c88d63b5ba4e26febb18184c71da396daf8af6539a09c23656f6c8984d9ccb65cd5ec8fad099c4492111167870fbf9718088e7e9e5f556d diff --git a/weechat-3.4-disable-memleak-detection.patch b/weechat-3.4-disable-memleak-detection.patch deleted file mode 100644 index 1b46a2d..0000000 --- a/weechat-3.4-disable-memleak-detection.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ruN weechat-3.4/tests/tests.cpp weechat-3.4-disable-memleak-detection/tests/tests.cpp ---- weechat-3.4/tests/tests.cpp 2021-12-17 23:57:32.000000000 -0800 -+++ weechat-3.4-disable-memleak-detection/tests/tests.cpp 2022-01-14 16:36:08.330205164 -0800 -@@ -49,6 +49,7 @@ - } - - #include "CppUTest/CommandLineTestRunner.h" -+#include "CppUTest/MemoryLeakWarningPlugin.h" - - #define LOCALE_TESTS "en_US.UTF-8" - -@@ -330,6 +331,11 @@ - return 1; - } - -+ /* this fails on basically every test right now -+ * see https://cpputest.github.io/manual.html#turning-memory-leak-detection-off-and-on -+ */ -+ MemoryLeakWarningPlugin::turnOffNewDeleteOverloads(); -+ - /* clean WeeChat home */ - dir_exec_on_files (WEECHAT_TESTS_HOME, 1, 1, &exec_on_files_cb, NULL); - diff --git a/weechat.spec b/weechat.spec index b0a5287..eea539e 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.3.0 +Version: 4.3.1 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications @@ -37,18 +37,6 @@ URL: http://weechat.org License: GPLv3 Source: http://weechat.org/files/src/%{name}-%{version}.tar.xz -# https://github.com/weechat/weechat/commit/917054c58 -Patch0: 0001-tests-fix-compilation-of-tests-on-Rocky-9.4.patch -# this fails on too many tests, we want to let them finish anyway -Patch1: weechat-3.4-disable-memleak-detection.patch -# https://github.com/weechat/weechat/pull/2116 -Patch2: 0001-tests-relay-add-missing-string.h-include.patch -# https://github.com/weechat/weechat/pull/2117 -Patch3: 0001-tests-scripts-fix-wrong-ifdef-check.patch -# https://github.com/weechat/weechat/pull/2118 -Patch4: 0001-tests-relay-fix-HotlistToJson-test-on-s390x.patch -# https://github.com/weechat/weechat/pull/2119 -Patch5: 0001-tcl-fix-return-value-for-hdata_longlong.patch BuildRequires: gcc %if %{with check} From 74e9fd519964edfa854f8deae4a8deee3d13a12f Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 7 Jun 2024 09:12:13 +0200 Subject: [PATCH 13/27] Update to 4.3.2 --- sources | 2 +- weechat.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 2bb51c6..fb694d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.3.1.tar.xz) = e78fb37f983600340c88d63b5ba4e26febb18184c71da396daf8af6539a09c23656f6c8984d9ccb65cd5ec8fad099c4492111167870fbf9718088e7e9e5f556d +SHA512 (weechat-4.3.2.tar.xz) = 438d76cada9bb870c188b8fe0c8ad45d1d0dc71392ee8d5193c5b3c3424afad4f98bedc9a396b2294c4cb20bce9299e5a4f921525f7f976e5cd1f589a78b2caa diff --git a/weechat.spec b/weechat.spec index eea539e..168f150 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.3.1 +Version: 4.3.2 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From f19dbdee1549a56cd6a0bb7e12c02835d7c27eab Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 7 Jun 2024 10:10:02 +0200 Subject: [PATCH 14/27] Cherry-pick #2132 from upstream Fixes tests in fedora-41-aarch64 chroot environment. --- ...relay_http_parse_header-function-pro.patch | 112 ++++++++++++++++++ weechat.spec | 3 + 2 files changed, 115 insertions(+) create mode 100644 0001-tests-relay-fix-relay_http_parse_header-function-pro.patch diff --git a/0001-tests-relay-fix-relay_http_parse_header-function-pro.patch b/0001-tests-relay-fix-relay_http_parse_header-function-pro.patch new file mode 100644 index 0000000..e867150 --- /dev/null +++ b/0001-tests-relay-fix-relay_http_parse_header-function-pro.patch @@ -0,0 +1,112 @@ +From 44238650bc7aa4de89f1fb63371b1e6c25ea96dd Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Fri, 7 Jun 2024 10:08:40 +0200 +Subject: [PATCH] tests: relay: fix relay_http_parse_header function prototype + +--- + tests/unit/plugins/relay/test-relay-http.cpp | 26 +++++++++++--------- + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/tests/unit/plugins/relay/test-relay-http.cpp b/tests/unit/plugins/relay/test-relay-http.cpp +index f35638e5b..6fe3faea4 100644 +--- a/tests/unit/plugins/relay/test-relay-http.cpp ++++ b/tests/unit/plugins/relay/test-relay-http.cpp +@@ -47,7 +47,8 @@ extern void relay_http_parse_path (const char *url, + char ***paths, int *num_paths, + struct t_hashtable *params); + extern int relay_http_parse_header (struct t_relay_http_request *request, +- const char *header); ++ const char *header, ++ int ws_deflate_allowed); + extern void relay_http_add_to_body (struct t_relay_http_request *request, + char **partial_message); + extern int relay_http_get_auth_status (struct t_relay_client *client); +@@ -478,7 +479,7 @@ TEST(RelayHttp, ParseHeader) + request = relay_http_request_alloc (); + CHECK(request); + relay_http_parse_method_path (request, "GET /api/version"); +- relay_http_parse_header (request, NULL); ++ relay_http_parse_header (request, NULL, 1); + LONGS_EQUAL(RELAY_HTTP_END, request->status); + STRCMP_EQUAL("GET /api/version\n" + "\n", +@@ -489,7 +490,7 @@ TEST(RelayHttp, ParseHeader) + request = relay_http_request_alloc (); + CHECK(request); + relay_http_parse_method_path (request, "GET /api/version"); +- relay_http_parse_header (request, ""); ++ relay_http_parse_header (request, "", 1); + LONGS_EQUAL(RELAY_HTTP_END, request->status); + STRCMP_EQUAL("GET /api/version\n" + "\n", +@@ -500,7 +501,7 @@ TEST(RelayHttp, ParseHeader) + request = relay_http_request_alloc (); + CHECK(request); + relay_http_parse_method_path (request, "GET /api/version"); +- relay_http_parse_header (request, "Test"); ++ relay_http_parse_header (request, "Test", 1); + LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); + STRCMP_EQUAL("GET /api/version\n" + "Test\n", +@@ -511,7 +512,7 @@ TEST(RelayHttp, ParseHeader) + request = relay_http_request_alloc (); + CHECK(request); + relay_http_parse_method_path (request, "GET /api/version"); +- relay_http_parse_header (request, "X-Test: value"); ++ relay_http_parse_header (request, "X-Test: value", 1); + LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); + STRCMP_EQUAL("GET /api/version\n" + "X-Test: value\n", +@@ -523,7 +524,7 @@ TEST(RelayHttp, ParseHeader) + request = relay_http_request_alloc (); + CHECK(request); + relay_http_parse_method_path (request, "GET /api/version"); +- relay_http_parse_header (request, "Accept-Encoding: gzip, zstd, br"); ++ relay_http_parse_header (request, "Accept-Encoding: gzip, zstd, br", 1); + LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); + STRCMP_EQUAL("GET /api/version\n" + "Accept-Encoding: gzip, zstd, br\n", +@@ -540,7 +541,7 @@ TEST(RelayHttp, ParseHeader) + request = relay_http_request_alloc (); + CHECK(request); + relay_http_parse_method_path (request, "GET /api/version"); +- relay_http_parse_header (request, "Content-Length: 123"); ++ relay_http_parse_header (request, "Content-Length: 123", 1); + LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); + STRCMP_EQUAL("GET /api/version\n" + "Content-Length: 123\n", +@@ -555,7 +556,8 @@ TEST(RelayHttp, ParseHeader) + relay_http_parse_method_path (request, "GET /api HTTP/1.1"); + relay_http_parse_header ( + request, +- "Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits"); ++ "Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits", ++ 1); + LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); + STRCMP_EQUAL( + "GET /api HTTP/1.1\n" +@@ -589,8 +591,8 @@ TEST(RelayHttp, AddToBody) + LONGS_EQUAL(RELAY_HTTP_METHOD, request->status); + relay_http_parse_method_path (request, "GET /api/version"); + LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); +- relay_http_parse_header (request, "Content-Length: 10"); +- relay_http_parse_header (request, ""); ++ relay_http_parse_header (request, "Content-Length: 10", 1); ++ relay_http_parse_header (request, "", 1); + LONGS_EQUAL(RELAY_HTTP_BODY, request->status); + LONGS_EQUAL(10, request->content_length); + LONGS_EQUAL(0, request->body_size); +@@ -616,8 +618,8 @@ TEST(RelayHttp, AddToBody) + LONGS_EQUAL(RELAY_HTTP_METHOD, request->status); + relay_http_parse_method_path (request, "GET /api/version"); + LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); +- relay_http_parse_header (request, "Content-Length: 5"); +- relay_http_parse_header (request, ""); ++ relay_http_parse_header (request, "Content-Length: 5", 1); ++ relay_http_parse_header (request, "", 1); + LONGS_EQUAL(RELAY_HTTP_BODY, request->status); + LONGS_EQUAL(5, request->content_length); + LONGS_EQUAL(0, request->body_size); +-- +2.45.2 + diff --git a/weechat.spec b/weechat.spec index 168f150..320c69d 100644 --- a/weechat.spec +++ b/weechat.spec @@ -38,6 +38,9 @@ License: GPLv3 Source: http://weechat.org/files/src/%{name}-%{version}.tar.xz +# https://github.com/weechat/weechat/pull/2132 +Patch0: 0001-tests-relay-fix-relay_http_parse_header-function-pro.patch + BuildRequires: gcc %if %{with check} BuildRequires: cpputest-devel From e9c7e24dc76e4dd9900778fb693a7662798b0a84 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 22 Jun 2024 11:47:25 +0200 Subject: [PATCH 15/27] Update to 4.3.3 --- ...relay_http_parse_header-function-pro.patch | 112 ------------------ sources | 2 +- weechat.spec | 5 +- 3 files changed, 2 insertions(+), 117 deletions(-) delete mode 100644 0001-tests-relay-fix-relay_http_parse_header-function-pro.patch diff --git a/0001-tests-relay-fix-relay_http_parse_header-function-pro.patch b/0001-tests-relay-fix-relay_http_parse_header-function-pro.patch deleted file mode 100644 index e867150..0000000 --- a/0001-tests-relay-fix-relay_http_parse_header-function-pro.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 44238650bc7aa4de89f1fb63371b1e6c25ea96dd Mon Sep 17 00:00:00 2001 -From: LuK1337 -Date: Fri, 7 Jun 2024 10:08:40 +0200 -Subject: [PATCH] tests: relay: fix relay_http_parse_header function prototype - ---- - tests/unit/plugins/relay/test-relay-http.cpp | 26 +++++++++++--------- - 1 file changed, 14 insertions(+), 12 deletions(-) - -diff --git a/tests/unit/plugins/relay/test-relay-http.cpp b/tests/unit/plugins/relay/test-relay-http.cpp -index f35638e5b..6fe3faea4 100644 ---- a/tests/unit/plugins/relay/test-relay-http.cpp -+++ b/tests/unit/plugins/relay/test-relay-http.cpp -@@ -47,7 +47,8 @@ extern void relay_http_parse_path (const char *url, - char ***paths, int *num_paths, - struct t_hashtable *params); - extern int relay_http_parse_header (struct t_relay_http_request *request, -- const char *header); -+ const char *header, -+ int ws_deflate_allowed); - extern void relay_http_add_to_body (struct t_relay_http_request *request, - char **partial_message); - extern int relay_http_get_auth_status (struct t_relay_client *client); -@@ -478,7 +479,7 @@ TEST(RelayHttp, ParseHeader) - request = relay_http_request_alloc (); - CHECK(request); - relay_http_parse_method_path (request, "GET /api/version"); -- relay_http_parse_header (request, NULL); -+ relay_http_parse_header (request, NULL, 1); - LONGS_EQUAL(RELAY_HTTP_END, request->status); - STRCMP_EQUAL("GET /api/version\n" - "\n", -@@ -489,7 +490,7 @@ TEST(RelayHttp, ParseHeader) - request = relay_http_request_alloc (); - CHECK(request); - relay_http_parse_method_path (request, "GET /api/version"); -- relay_http_parse_header (request, ""); -+ relay_http_parse_header (request, "", 1); - LONGS_EQUAL(RELAY_HTTP_END, request->status); - STRCMP_EQUAL("GET /api/version\n" - "\n", -@@ -500,7 +501,7 @@ TEST(RelayHttp, ParseHeader) - request = relay_http_request_alloc (); - CHECK(request); - relay_http_parse_method_path (request, "GET /api/version"); -- relay_http_parse_header (request, "Test"); -+ relay_http_parse_header (request, "Test", 1); - LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); - STRCMP_EQUAL("GET /api/version\n" - "Test\n", -@@ -511,7 +512,7 @@ TEST(RelayHttp, ParseHeader) - request = relay_http_request_alloc (); - CHECK(request); - relay_http_parse_method_path (request, "GET /api/version"); -- relay_http_parse_header (request, "X-Test: value"); -+ relay_http_parse_header (request, "X-Test: value", 1); - LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); - STRCMP_EQUAL("GET /api/version\n" - "X-Test: value\n", -@@ -523,7 +524,7 @@ TEST(RelayHttp, ParseHeader) - request = relay_http_request_alloc (); - CHECK(request); - relay_http_parse_method_path (request, "GET /api/version"); -- relay_http_parse_header (request, "Accept-Encoding: gzip, zstd, br"); -+ relay_http_parse_header (request, "Accept-Encoding: gzip, zstd, br", 1); - LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); - STRCMP_EQUAL("GET /api/version\n" - "Accept-Encoding: gzip, zstd, br\n", -@@ -540,7 +541,7 @@ TEST(RelayHttp, ParseHeader) - request = relay_http_request_alloc (); - CHECK(request); - relay_http_parse_method_path (request, "GET /api/version"); -- relay_http_parse_header (request, "Content-Length: 123"); -+ relay_http_parse_header (request, "Content-Length: 123", 1); - LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); - STRCMP_EQUAL("GET /api/version\n" - "Content-Length: 123\n", -@@ -555,7 +556,8 @@ TEST(RelayHttp, ParseHeader) - relay_http_parse_method_path (request, "GET /api HTTP/1.1"); - relay_http_parse_header ( - request, -- "Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits"); -+ "Sec-WebSocket-Extensions: permessage-deflate; client_max_window_bits", -+ 1); - LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); - STRCMP_EQUAL( - "GET /api HTTP/1.1\n" -@@ -589,8 +591,8 @@ TEST(RelayHttp, AddToBody) - LONGS_EQUAL(RELAY_HTTP_METHOD, request->status); - relay_http_parse_method_path (request, "GET /api/version"); - LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); -- relay_http_parse_header (request, "Content-Length: 10"); -- relay_http_parse_header (request, ""); -+ relay_http_parse_header (request, "Content-Length: 10", 1); -+ relay_http_parse_header (request, "", 1); - LONGS_EQUAL(RELAY_HTTP_BODY, request->status); - LONGS_EQUAL(10, request->content_length); - LONGS_EQUAL(0, request->body_size); -@@ -616,8 +618,8 @@ TEST(RelayHttp, AddToBody) - LONGS_EQUAL(RELAY_HTTP_METHOD, request->status); - relay_http_parse_method_path (request, "GET /api/version"); - LONGS_EQUAL(RELAY_HTTP_HEADERS, request->status); -- relay_http_parse_header (request, "Content-Length: 5"); -- relay_http_parse_header (request, ""); -+ relay_http_parse_header (request, "Content-Length: 5", 1); -+ relay_http_parse_header (request, "", 1); - LONGS_EQUAL(RELAY_HTTP_BODY, request->status); - LONGS_EQUAL(5, request->content_length); - LONGS_EQUAL(0, request->body_size); --- -2.45.2 - diff --git a/sources b/sources index fb694d2..ab4038d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (weechat-4.3.2.tar.xz) = 438d76cada9bb870c188b8fe0c8ad45d1d0dc71392ee8d5193c5b3c3424afad4f98bedc9a396b2294c4cb20bce9299e5a4f921525f7f976e5cd1f589a78b2caa +SHA512 (weechat-4.3.3.tar.xz) = ca6f80b874fa7b1a5e2773b7b05bdd47e6dd9a622e72ce2f876a94d4c6edaa6834cea83a7294dd2acb2c0bc67bc9e731593b33252559bb26290f964911790b1b diff --git a/weechat.spec b/weechat.spec index 320c69d..6951d22 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.3.2 +Version: 4.3.3 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications @@ -38,9 +38,6 @@ License: GPLv3 Source: http://weechat.org/files/src/%{name}-%{version}.tar.xz -# https://github.com/weechat/weechat/pull/2132 -Patch0: 0001-tests-relay-fix-relay_http_parse_header-function-pro.patch - BuildRequires: gcc %if %{with check} BuildRequires: cpputest-devel From 0e274fa550d51bd7100e71eec54f43a192e495bb Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 22 Jun 2024 22:55:22 +0200 Subject: [PATCH 16/27] Use https for source URL --- weechat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weechat.spec b/weechat.spec index 6951d22..e7f7c98 100644 --- a/weechat.spec +++ b/weechat.spec @@ -36,7 +36,7 @@ Group: Applications/Communications URL: http://weechat.org License: GPLv3 -Source: http://weechat.org/files/src/%{name}-%{version}.tar.xz +Source: https://weechat.org/files/src/%{name}-%{version}.tar.xz BuildRequires: gcc %if %{with check} From 5f90452c51ec0e371f9c2edb1877b34335489705 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 22 Jun 2024 22:56:17 +0200 Subject: [PATCH 17/27] Verify source code with GPG --- .gitignore | 1 + A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 | 51 ++++++++++++++++++++++++ sources | 1 + weechat.spec | 4 ++ 4 files changed, 57 insertions(+) create mode 100644 A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 diff --git a/.gitignore b/.gitignore index 61358d3..d629a4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /weechat-*.tar.xz +/weechat-*.tar.xz.asc diff --git a/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 b/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 new file mode 100644 index 0000000..3302ef4 --- /dev/null +++ b/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 @@ -0,0 +1,51 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +xsFNBFCCu4cBEADNDLretQkViqptiL275IKrc+VaGvUAIfFZoNTZHYrBAGCFNU++ +bXMqVxXM6QFhyXDbVSTAbl0gdmMPEQzi3ErtatyMsH3PDhU6mxLjwc61/P2JWNVf +4JGgEaqM/Gb0KEFnOWHGH1IDGMAxCL/duch8D3XrODOxqxCVLn/yFpjCANr9sXfh +V+K05KIvTE3ar8SZjVDH3APmdFYv2KSs01aoR+Zj0MIdJKgBIPUKod8VodH03RTu +ob4I1jocMad56hsMJk3NE179xxDA+DN7muIzv2yY+bw2EId+PhmvArKWgwFOvhmU +TTYNA5UOzC9jvzxVI/4g1ERImXXGdYBX9SllY5hqkk36EFchVAOmLz39zSTUQfIT +S9ugMiH3VudjSinNsn/R5iRvbuO1kHDGL583DT9qDadkXBxoFBgafgoEwiLLPuyH +BLdaZ51fmgvfupt0tP9F0Tcy4xCjz+Fesi3RtXlLJv351KIIbJsy8hNh1tSe/32t +dN4KoaULR2fGu+7NHeZBRk0r7+OjtRaXZWyaYfx4XAKqqdxcDcgYS8vb111JpkFN +/zf2HZtIA7IMUGQrf23O3xUun6voQb14qEMtWS49DxXmBc5g2KITtkpoVBSzHNVO +6aUzpgjeV8bRGTobpVvilz6Af34/gYIsvo0JQ14xB/F7cyaA1e4d6BtzSwARAQAB +zS1XZWVDaGF0IChzaWduaW5nIGtleSkgPHdlYm1hc3RlckB3ZWVjaGF0Lm9yZz7C +wXgEEwECACIFAlCCu4cCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPgv +SxbexAj4JAoP+gMurI1HgmWK7pqO+/Hn5SAMKvHYwtHTpGqdDfponnTW3JgWUm2X +fgvHk5ZAew6a6hbLE73v8LSbepbCM6mzdtqO4FPXV8t+x/qLu3zbi9Q6Fd+bP+2G +ZDfRyZdk1UaeW2wOhwcvP8+kQxBB8gK7kgaD7rWG4CbU1jTQjdpBsibT/iXhszaC +kIe0ExaUYS7B58IbumjH+B3tcwhOW0SKImY5H4DKYAgWQ5/oSOwGf3fp3K2xT05c +MBiywTBBlXmtSY77yA0YxTYi/vIkPOuqKhMwc9Si5Ak4U2NvInGa3WOQoXH5OWYr +Ipe4nzpFMcBt0tMDbErkQsQFVsZE9YrOdoAHvMqn3Dxo99N3vX+CxmziWpzF2V6c +RyqFEFc0IYxABLpKNTgL9WUy+dwMsvuGR6/sob9hE5drJ8YeDEWLGZuVMys4vTvE +ctP+cedxgz2ZTyvWPCaR7k7L5yOvBTIwvYG6pu7utpxVnIpVRDs3hXl3VPNbu4SC +0JpAC0fB77VlOCbI205GTbcFxh82qiyJSZRmZF+tXOlBna7Jq/Fmtdyfh6COi5Tw +EVKzdXc+uBNxmrgkf1AIWaKXP5IdvHs75c+/WW93bjTC2QmUtv3NZG4HPo2NX6G+ +QMkMJOO+vnAQzYo/2BM6s2zCnR8oFKPt3t9ktz992D3PDkYwClKsz+8BzsFNBFCC +u4cBEADWYSdT6uWblZ4T/kiOjwdklcIuNCJhII4bXNlyLjm2xT2AescwQz1MVGO+ +UVIXk6YKYwT3I+CRx/UutTTD8s03yE3Lc5scztdp/S1pEX1ahvVI3elj0+DpQvmo +QB5aOL555LskFDo8dUHng/q17IHonHuGnIK5ufLD/CMvSzIOmL/5PBKyI3TZ21N5 +pz+4PzG0wSMTSQctiSEpccefuXyqBDfaxJVuuE3y/8AZy2hbp6EHjJkGiHE89yXx +rpJkPUv9i8D7M98uoERon6ma7xa/YHh3QROSG+oX8AuExmhbSr9ZkgTbfcehQoZE +pAgTqsxBhPirBnOr1lDAdHv7Zjr2qPG2uezAo1mkC7q6qQqfDJQHYTTOBDsin/TJ +pKma2ZLvY775otAS0nwxwvQAA4LWtJntlMZAZPegrVfre3tzM5V9MSeGME1oFv6L +9MrlpTJbym1kOa4agV+e1/ADEDPHERunyc735PrT1oTYbH5wQpTXPRdgUIFK//++ +6fZy7hO9JW/xdwPTf4FROL4T1tCg/hW/MC7+/rSQZ50Ucf4hgR1QVjudMMPDVqqH +C+9EKE1/pIVn6FNGN0YfPl3/NeV0daMceOZh1+HdBfAcPWuOUOIpUkAt7gAO7hoI +EVMaVFOzdTTufFzohV0volqsAyBHID77h/mjRTgCcynNZryzsQARAQABwsFfBBgB +AgAJBQJQgruHAhsMAAoJEPgvSxbexAj42WYQAIq5zKYsppAy1DeWL8ltmObEjSs/ +j07Er62KBb3jzbzGbjQybcneb29I7knmugPVo/QEnUzwOQHRbzMZ43pkcSiPNmhA +8NMgbldrmzhWC/5ueFwC4zXBEFhAuVwCyX6AlXrGyrxM72ubuCTziVjKB4LtIFfA +EsKRUF2r14U3mcJuSm/+rvJBEdOc0ccRHQznkARc945KOAD/FY1cXHP4Fo7SfT8w +KCGQGn445Lop7rHKhrhZ+6eenPIAcoVUEK1aef57VItcSmT3IAMbrkMZaCX8MEQW +GMdBt/gOfPmkmmGwEvFqkyBoerHYmgaB4SOFwjWgrgMBiuihUGZZfdJviF+NB687 +67/ikvot/ACSOzsB2BslNh6jGPwOUdRE4b/B1CtDm7Ukb+w1RbumQCtO1M64mh9w +bPp8bnjvS5OW1E0gEqZFoXNJPYUV35IubWeOL2+LPltJE5p9nzTtvyXG2aJhlnW5 +SpN7b/OD0wSu0STxdbmUTJ1WFz7P8HhmT1d5cRS8Q/5IjwWJRAyoyY/CBEYjz+Fs +eFF2jvxWceJHsTo7KhKLVAcB5tAqAdbpkbEF65FDzsFQz5Ql+C3TiQaNHRrHyrUl +g/NqrZmPiNTvjp3Mh5yj5e8mkOR/96YuHjF72YWnybVCt5+olFrr9v0+uCJU168O +bZlCOWLXBLOqK0Z0 +=MySb +-----END PGP PUBLIC KEY BLOCK----- diff --git a/sources b/sources index ab4038d..d05a02b 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (weechat-4.3.3.tar.xz) = ca6f80b874fa7b1a5e2773b7b05bdd47e6dd9a622e72ce2f876a94d4c6edaa6834cea83a7294dd2acb2c0bc67bc9e731593b33252559bb26290f964911790b1b +SHA512 (weechat-4.3.3.tar.xz.asc) = 35a348b2dd230c738634acbd77c8ae786296b93b755f1b22b0b8500c5bc2787ab64128aaf51bf755b9ffeefb08ab3f78cd57e6e9403849964ef561b7c850a264 diff --git a/weechat.spec b/weechat.spec index e7f7c98..e1ef775 100644 --- a/weechat.spec +++ b/weechat.spec @@ -37,6 +37,8 @@ URL: http://weechat.org License: GPLv3 Source: https://weechat.org/files/src/%{name}-%{version}.tar.xz +Source1: https://weechat.org/files/src/%{name}-%{version}.tar.xz.asc +Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/A9AB5AB778FA5C3522FD0378F82F4B16DEC408F8 BuildRequires: gcc %if %{with check} @@ -52,6 +54,7 @@ BuildRequires: cmake BuildRequires: docbook-style-xsl BuildRequires: enchant-devel BuildRequires: gettext +BuildRequires: gnupg2 BuildRequires: gnutls-devel %if 0%{?fedora} >= 30 || 0%{?rhel} > 8 BuildRequires: guile22-devel @@ -97,6 +100,7 @@ This package contains include files and pc file for weechat. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n %{name}-%{version} find doc/ -type f -name 'CMakeLists.txt' \ -exec sed -i -e 's#${PROJECT_NAME}#%{_doc}#g' '{}' \; From fb0594db1b7a85e908ce0c90cf17fe72f2a45ea0 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 3 Jul 2024 22:35:40 +0200 Subject: [PATCH 18/27] Update to 4.3.4 --- sources | 4 ++-- weechat.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index d05a02b..67610fb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (weechat-4.3.3.tar.xz) = ca6f80b874fa7b1a5e2773b7b05bdd47e6dd9a622e72ce2f876a94d4c6edaa6834cea83a7294dd2acb2c0bc67bc9e731593b33252559bb26290f964911790b1b -SHA512 (weechat-4.3.3.tar.xz.asc) = 35a348b2dd230c738634acbd77c8ae786296b93b755f1b22b0b8500c5bc2787ab64128aaf51bf755b9ffeefb08ab3f78cd57e6e9403849964ef561b7c850a264 +SHA512 (weechat-4.3.4.tar.xz) = 026684a3ee40eae166820c64cf68fccb27346117b90b617be4d0b10048ea4b3b8454f1020138c71f61598e6127e0426b7ba094d69f4da02fd322d9bd2b06a81b +SHA512 (weechat-4.3.4.tar.xz.asc) = 4e8dbec71852f2d4f1119129e77c7c4256f94af651d01fa21ebb219bcf2488ef57b868335ef22c659ef0d0acb921457561f29e46f021856c8610d1bc559bd9e8 diff --git a/weechat.spec b/weechat.spec index e1ef775..515bf4b 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.3.3 +Version: 4.3.4 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From b081ff397b4bf79d3fc43b1d7e002fd0bda2971d Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 17 Jul 2024 02:13:09 +0200 Subject: [PATCH 19/27] Update to 4.3.5 --- sources | 4 ++-- weechat.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 67610fb..80e7c8a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (weechat-4.3.4.tar.xz) = 026684a3ee40eae166820c64cf68fccb27346117b90b617be4d0b10048ea4b3b8454f1020138c71f61598e6127e0426b7ba094d69f4da02fd322d9bd2b06a81b -SHA512 (weechat-4.3.4.tar.xz.asc) = 4e8dbec71852f2d4f1119129e77c7c4256f94af651d01fa21ebb219bcf2488ef57b868335ef22c659ef0d0acb921457561f29e46f021856c8610d1bc559bd9e8 +SHA512 (weechat-4.3.5.tar.xz) = 39c98a07a410334b423bba5ade36912f3687a17879bd126c740f64bfb24472b324deaa0181ded744002406a7cc50cf9bdb6ae0123f2e6f04754d37d8ce96bc86 +SHA512 (weechat-4.3.5.tar.xz.asc) = 17a2a41e95012295bc3ebfcc71952a638bbeaec2cc5d5ecbd4ef036ebd72cf0ed83b927a1e02c581d31a26ca6f5a21cb227b9ea1af9904a70c22232c7c0c4a1a diff --git a/weechat.spec b/weechat.spec index 515bf4b..7c94274 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.3.4 +Version: 4.3.5 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From fb0d4652a226a6d3db57a3baa7ca061b04ba24f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:15:01 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4411562d303bc04147daa643fef235ef8532d3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 14:45:35 +0200 Subject: [PATCH 21/27] convert GPLv3 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- weechat.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/weechat.spec b/weechat.spec index 7c94274..6b5f11f 100644 --- a/weechat.spec +++ b/weechat.spec @@ -34,7 +34,8 @@ Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications URL: http://weechat.org -License: GPLv3 +# Automatically converted from old format: GPLv3 - review is highly recommended. +License: GPL-3.0-only Source: https://weechat.org/files/src/%{name}-%{version}.tar.xz Source1: https://weechat.org/files/src/%{name}-%{version}.tar.xz.asc From 80b82e8b1eb14b091aba4abb9be3c5e6a17de6b2 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 30 Jul 2024 19:54:23 +0100 Subject: [PATCH 22/27] Build against guile 3.0 --- weechat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weechat.spec b/weechat.spec index 6b5f11f..ebe194a 100644 --- a/weechat.spec +++ b/weechat.spec @@ -58,7 +58,7 @@ BuildRequires: gettext BuildRequires: gnupg2 BuildRequires: gnutls-devel %if 0%{?fedora} >= 30 || 0%{?rhel} > 8 -BuildRequires: guile22-devel +BuildRequires: guile30-devel %else BuildRequires: guile-devel %endif From 0abe07df71c3e4bb8853facd22643383458a97c4 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 2 Aug 2024 15:42:58 +0200 Subject: [PATCH 23/27] Fix guile30-devel build guard It's only available as of Fedora 35. --- weechat.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weechat.spec b/weechat.spec index ebe194a..8d136e1 100644 --- a/weechat.spec +++ b/weechat.spec @@ -57,7 +57,7 @@ BuildRequires: enchant-devel BuildRequires: gettext BuildRequires: gnupg2 BuildRequires: gnutls-devel -%if 0%{?fedora} >= 30 || 0%{?rhel} > 8 +%if 0%{?fedora} >= 35 || 0%{?rhel} > 8 BuildRequires: guile30-devel %else BuildRequires: guile-devel From 3dc8cbea629ba2d8ccd6ddf03810e28f85095692 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 2 Aug 2024 15:44:38 +0200 Subject: [PATCH 24/27] Remove autogenerated license comment --- weechat.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/weechat.spec b/weechat.spec index 8d136e1..e4cbd7f 100644 --- a/weechat.spec +++ b/weechat.spec @@ -34,7 +34,6 @@ Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications URL: http://weechat.org -# Automatically converted from old format: GPLv3 - review is highly recommended. License: GPL-3.0-only Source: https://weechat.org/files/src/%{name}-%{version}.tar.xz From 54f568197d93acbedd74efb6381529022eed4947 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sat, 17 Aug 2024 15:29:22 +0200 Subject: [PATCH 25/27] Update to 4.4.1 --- sources | 4 ++-- weechat.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 80e7c8a..7165576 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (weechat-4.3.5.tar.xz) = 39c98a07a410334b423bba5ade36912f3687a17879bd126c740f64bfb24472b324deaa0181ded744002406a7cc50cf9bdb6ae0123f2e6f04754d37d8ce96bc86 -SHA512 (weechat-4.3.5.tar.xz.asc) = 17a2a41e95012295bc3ebfcc71952a638bbeaec2cc5d5ecbd4ef036ebd72cf0ed83b927a1e02c581d31a26ca6f5a21cb227b9ea1af9904a70c22232c7c0c4a1a +SHA512 (weechat-4.4.1.tar.xz) = 75b1fc21674229f11f9d5d049b663dee77e65529b5dfe62744e7afd0f0854afa4344b56f26d91fe9378ccece932e05e57e9bce4e1d7515d4d26fdffbf2f2a55b +SHA512 (weechat-4.4.1.tar.xz.asc) = 66d80b5233b0a3a8262cfe5db3e91043f33ac426b94ad5bd6f37b32e59b413435d2ca55f3aba9d53f8a1454c43161ab51f31ca02d0eafd83b8e3cea1497a96de diff --git a/weechat.spec b/weechat.spec index e4cbd7f..54b7696 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.3.5 +Version: 4.4.1 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications @@ -141,8 +141,8 @@ find doc/ -type f -name 'CMakeLists.txt' \ %files -f %{name}.lang -%doc AUTHORS.adoc ChangeLog.adoc Contributing.adoc -%doc README.adoc ReleaseNotes.adoc +%doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md +%doc README.md UPGRADING.md %license COPYING %{_bindir}/%{name}-curses %{_bindir}/%{name} From 243fbd37ec2f4e444b9d5b73761fa30923910d35 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Sun, 8 Sep 2024 14:41:57 +0200 Subject: [PATCH 26/27] Update to 4.4.2 --- sources | 4 ++-- weechat.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 7165576..283783a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (weechat-4.4.1.tar.xz) = 75b1fc21674229f11f9d5d049b663dee77e65529b5dfe62744e7afd0f0854afa4344b56f26d91fe9378ccece932e05e57e9bce4e1d7515d4d26fdffbf2f2a55b -SHA512 (weechat-4.4.1.tar.xz.asc) = 66d80b5233b0a3a8262cfe5db3e91043f33ac426b94ad5bd6f37b32e59b413435d2ca55f3aba9d53f8a1454c43161ab51f31ca02d0eafd83b8e3cea1497a96de +SHA512 (weechat-4.4.2.tar.xz) = 1a603a020319d3ee9d27659c71b353dc939a56bc0dc8fabd55e82c74e28bdef8ed749441e7b2377b78598bdf11ec020d6c94a092bf30c86220b61e276cef2293 +SHA512 (weechat-4.4.2.tar.xz.asc) = f2690ffced22e9d27b95d552bc2ee0a92439e71df205933704dd78b99b5c6634ee4b141227ff35c596892d0290b0866d18da6f3a2b5e83c1010ba0aa28b29af1 diff --git a/weechat.spec b/weechat.spec index 54b7696..c34d874 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.4.1 +Version: 4.4.2 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications From 1eb6e6a7a72c5ad321f8d5f917abb9a3357ccbb5 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Wed, 30 Oct 2024 13:39:17 +0100 Subject: [PATCH 27/27] Update to 4.4.3 --- sources | 4 ++-- weechat.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 283783a..6da50a7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (weechat-4.4.2.tar.xz) = 1a603a020319d3ee9d27659c71b353dc939a56bc0dc8fabd55e82c74e28bdef8ed749441e7b2377b78598bdf11ec020d6c94a092bf30c86220b61e276cef2293 -SHA512 (weechat-4.4.2.tar.xz.asc) = f2690ffced22e9d27b95d552bc2ee0a92439e71df205933704dd78b99b5c6634ee4b141227ff35c596892d0290b0866d18da6f3a2b5e83c1010ba0aa28b29af1 +SHA512 (weechat-4.4.3.tar.xz) = 32df8d6021ed63d11646127920197a1f80dfbbec0cdf4e9a282fc789fcd1c270082806c237ab16ebd0c07a94c6d40bc22432211feac638623d6f2a0a59606dcc +SHA512 (weechat-4.4.3.tar.xz.asc) = 5097b0b7d97aac926c72057d51a4ea125ad0edcf7159d275b20ec484127c49d0b58b61fa71a91ce954f87dca47651084243f5440aaee5be315af3376e2b7ef1a diff --git a/weechat.spec b/weechat.spec index c34d874..b1cad61 100644 --- a/weechat.spec +++ b/weechat.spec @@ -29,7 +29,7 @@ %endif Name: weechat -Version: 4.4.2 +Version: 4.4.3 Release: %autorelease Summary: Portable, fast, light and extensible IRC client Group: Applications/Communications