[rpms/ddnet] exclude-empty-files: Update to 18.5 upstream release

[rpms/ddnet] exclude-empty-files: Update to 18.5 upstream release

[@ 2026-09-03 0:10 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/ddnet
            Branch : exclude-empty-files
            Commit : f67c3e382026401d27e9c522d327b891ee68d9af
            Author : Sérgio M. Basto <sergio@serjux.com>
            Date   : 2024-09-06T01:41:29+01:00
            Stats  : +174/-113 in 6 file(s)
            URL    : https://src.fedoraproject.org/rpms/ddnet/c/f67c3e382026401d27e9c522d327b891ee68d9af?branch=exclude-empty-files

            Log:
            Update to 18.5 upstream release

- Resolves: rhbz#2309033

Upstream tag: 18.5
Upstream commit: bae73629

Commit authored by Packit automation (https://packit.dev/)

---
diff --git a/0002-Unbundle-md5_and_json-parser.patch b/0002-Unbundle-md5_and_json-parser.patch
index 188c112..20d9f15 100644
--- a/0002-Unbundle-md5_and_json-parser.patch
+++ b/0002-Unbundle-md5_and_json-parser.patch
@@ -187,3 +187,14 @@ diff -Naur ddnet-18.0.1-orig/src/test/teehistorian.cpp ddnet-18.0.1/src/test/tee
  #include <engine/server.h>
  #include <engine/shared/config.h>
  #include <game/gamecore.h>
+--- ./src/game/client/components/skins7.cpp.orig	2024-09-06 01:26:34.840618215 +0100
++++ ./src/game/client/components/skins7.cpp	2024-09-06 01:25:40.975705987 +0100
+@@ -5,7 +5,7 @@
+ #include <base/math.h>
+ #include <base/system.h>
+ 
+-#include <engine/external/json-parser/json.h>
++#include <json-parser/json.h>
+ #include <engine/graphics.h>
+ #include <engine/shared/config.h>
+ #include <engine/shared/jsonwriter.h>

diff --git a/0003-format-security.patch b/0003-format-security.patch
deleted file mode 100644
index 1ef8180..0000000
--- a/0003-format-security.patch
+++ /dev/null
@@ -1,107 +0,0 @@
---- ./src/engine/client/client.cpp.orig	2024-06-22 17:11:40.117804025 +0100
-+++ ./src/engine/client/client.cpp	2024-06-22 17:11:46.890791852 +0100
-@@ -3124,7 +3124,7 @@ bool CClient::InitNetworkClient(char *pE
- 					if(g_Config.m_Bindaddr[0])
- 						str_format(pError, ErrorSize, "Could not open the network client, try changing or unsetting the bindaddr '%s'.", g_Config.m_Bindaddr);
- 					else
--						str_format(pError, ErrorSize, "Could not open the network client.");
-+						str_format(pError, ErrorSize, "Could not open the network client.", "");
- 					return false;
- 				}
- 			}
---- ./src/game/client/components/menus_settings.cpp.orig	2024-06-14 05:30:46.000000000 +0100
-+++ ./src/game/client/components/menus_settings.cpp	2024-06-22 21:20:46.054704973 +0100
-@@ -3418,15 +3418,15 @@ void CMenus::RenderSettingsDDNet(CUIRect
- 			}
- 		}
- 		else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
--			str_format(aBuf, sizeof(aBuf), Localize("Updating…"));
-+			str_format(aBuf, sizeof(aBuf), Localize("Updating…"), "");
- 		else if(State == IUpdater::NEED_RESTART)
- 		{
--			str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
-+			str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"), "");
- 			m_NeedRestartUpdate = true;
- 		}
- 		else
- 		{
--			str_format(aBuf, sizeof(aBuf), Localize("No updates available"));
-+			str_format(aBuf, sizeof(aBuf), Localize("No updates available"), "");
- 			UpdaterRect.VSplitLeft(TextRender()->TextWidth(14.0f, aBuf, -1, -1.0f) + 10.0f, &UpdaterRect, &Button);
- 			Button.VSplitLeft(100.0f, &Button, nullptr);
- 			static CButtonContainer s_ButtonUpdate;
---- ./src/game/editor/editor_actions.cpp.orig	2024-06-22 17:40:28.775696370 +0100
-+++ ./src/game/editor/editor_actions.cpp	2024-06-22 21:23:47.440395282 +0100
-@@ -320,7 +320,7 @@ void CEditorActionDeleteQuad::Redo()
- CEditorActionEditQuadPoint::CEditorActionEditQuadPoint(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, std::vector<CPoint> const &vPreviousPoints, std::vector<CPoint> const &vCurrentPoints) :
- 	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_QuadIndex(QuadIndex), m_vPreviousPoints(vPreviousPoints), m_vCurrentPoints(vCurrentPoints)
- {
--	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quad points");
-+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quad points", "");
- }
- 
- void CEditorActionEditQuadPoint::Undo()
-@@ -628,7 +628,7 @@ CEditorActionGroup::CEditorActionGroup(C
- 	if(m_Delete)
- 		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete group %d", m_GroupIndex);
- 	else
--		str_format(m_aDisplayText, sizeof(m_aDisplayText), "New group");
-+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "New group", "");
- }
- 
- void CEditorActionGroup::Undo()
-@@ -1198,7 +1198,7 @@ CEditorActionTileArt::CEditorActionTileA
- 	IEditorAction(pEditor), m_PreviousImageCount(PreviousImageCount), m_vImageIndexMap(vImageIndexMap)
- {
- 	str_copy(m_aTileArtFile, pTileArtFile);
--	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Tile art");
-+	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Tile art", "");
- }
- 
- void CEditorActionTileArt::Undo()
-@@ -1266,7 +1266,7 @@ CEditorCommandAction::CEditorCommandActi
- 	switch(m_Type)
- 	{
- 	case EType::ADD:
--		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Add command");
-+		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Add command", "");
- 		break;
- 	case EType::EDIT:
- 		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit command %d", m_CommandIndex);
---- ./src/game/client/components/menus_start.cpp.orig	2024-06-22 21:28:03.483958586 +0100
-+++ ./src/game/client/components/menus_start.cpp	2024-06-22 21:29:54.126769996 +0100
-@@ -225,12 +225,12 @@ void CMenus::RenderStartMenu(CUIRect Mai
- 	}
- 	else if(State == IUpdater::FAIL)
- 	{
--		str_format(aBuf, sizeof(aBuf), Localize("Update failed! Check log…"));
-+		str_format(aBuf, sizeof(aBuf), Localize("Update failed! Check log…"), "");
- 		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
- 	}
- 	else if(State == IUpdater::NEED_RESTART)
- 	{
--		str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
-+		str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"), "");
- 		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
- 	}
- 	Ui()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_ML);
---- ./src/game/client/components/hud.cpp.orig	2024-06-22 23:00:01.687286685 +0100
-+++ ./src/game/client/components/hud.cpp	2024-06-22 23:02:23.625031148 +0100
-@@ -1620,7 +1620,7 @@ void CHud::RenderRecord()
- 	if(m_ServerRecord > 0.0f)
- 	{
- 		char aBuf[64];
--		str_format(aBuf, sizeof(aBuf), Localize("Server best:"));
-+		str_format(aBuf, sizeof(aBuf), Localize("Server best:"), "");
- 		TextRender()->Text(5, 75, 6, aBuf, -1.0f);
- 		char aTime[32];
- 		str_time_float(m_ServerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
-@@ -1632,7 +1632,7 @@ void CHud::RenderRecord()
- 	if(PlayerRecord > 0.0f)
- 	{
- 		char aBuf[64];
--		str_format(aBuf, sizeof(aBuf), Localize("Personal best:"));
-+		str_format(aBuf, sizeof(aBuf), Localize("Personal best:"), "");
- 		TextRender()->Text(5, 82, 6, aBuf, -1.0f);
- 		char aTime[32];
- 		str_time_float(PlayerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));

diff --git a/8886.diff b/8886.diff
new file mode 100644
index 0000000..f8c4fd7
--- /dev/null
+++ b/8886.diff
@@ -0,0 +1,153 @@
+diff --git a/src/base/system.h b/src/base/system.h
+index dfd636475c8..de2de0346c2 100644
+--- a/src/base/system.h
++++ b/src/base/system.h
+@@ -1236,6 +1236,7 @@ int str_format_int(char *buffer, size_t buffer_size, int value);
+ template<typename... Args>
+ int str_format_opt(char *buffer, int buffer_size, const char *format, Args... args)
+ {
++	static_assert(sizeof...(args) > 0, "Use str_copy instead of str_format without format arguments");
+ 	return str_format(buffer, buffer_size, format, args...);
+ }
+ 
+diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
+index 588fba10549..8f416bc9711 100644
+--- a/src/engine/client/client.cpp
++++ b/src/engine/client/client.cpp
+@@ -3317,7 +3317,7 @@ bool CClient::InitNetworkClient(char *pError, size_t ErrorSize)
+ 					if(g_Config.m_Bindaddr[0])
+ 						str_format(pError, ErrorSize, "Could not open the network client, try changing or unsetting the bindaddr '%s'.", g_Config.m_Bindaddr);
+ 					else
+-						str_format(pError, ErrorSize, "Could not open the network client.");
++						str_copy(pError, "Could not open the network client.", ErrorSize);
+ 					return false;
+ 				}
+ 			}
+diff --git a/src/engine/shared/netban.cpp b/src/engine/shared/netban.cpp
+index 4d1bc705997..0c42f4c326c 100644
+--- a/src/engine/shared/netban.cpp
++++ b/src/engine/shared/netban.cpp
+@@ -490,8 +490,7 @@ void CNetBan::ConBans(IConsole::IResult *pResult, void *pUser)
+ 
+ 	if(NumBans == 0)
+ 	{
+-		str_format(aMsg, sizeof(aMsg), "The ban list is empty.");
+-		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", aMsg);
++		pThis->Console()->Print(IConsole::OUTPUT_LEVEL_STANDARD, "net_ban", "The ban list is empty.");
+ 
+ 		return;
+ 	}
+diff --git a/src/game/client/components/hud.cpp b/src/game/client/components/hud.cpp
+index 903443d672a..42cf8694933 100644
+--- a/src/game/client/components/hud.cpp
++++ b/src/game/client/components/hud.cpp
+@@ -1693,8 +1693,7 @@ void CHud::RenderRecord()
+ 	if(m_ServerRecord > 0.0f)
+ 	{
+ 		char aBuf[64];
+-		str_format(aBuf, sizeof(aBuf), Localize("Server best:"));
+-		TextRender()->Text(5, 75, 6, aBuf, -1.0f);
++		TextRender()->Text(5, 75, 6, Localize("Server best:"), -1.0f);
+ 		char aTime[32];
+ 		str_time_float(m_ServerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+ 		str_format(aBuf, sizeof(aBuf), "%s%s", m_ServerRecord > 3600 ? "" : "   ", aTime);
+@@ -1705,8 +1704,7 @@ void CHud::RenderRecord()
+ 	if(PlayerRecord > 0.0f)
+ 	{
+ 		char aBuf[64];
+-		str_format(aBuf, sizeof(aBuf), Localize("Personal best:"));
+-		TextRender()->Text(5, 82, 6, aBuf, -1.0f);
++		TextRender()->Text(5, 82, 6, Localize("Personal best:"), -1.0f);
+ 		char aTime[32];
+ 		str_time_float(PlayerRecord, TIME_HOURS_CENTISECS, aTime, sizeof(aTime));
+ 		str_format(aBuf, sizeof(aBuf), "%s%s", PlayerRecord > 3600 ? "" : "   ", aTime);
+diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
+index 97e9c685ab5..7044fcc55a7 100644
+--- a/src/game/client/components/menus_settings.cpp
++++ b/src/game/client/components/menus_settings.cpp
+@@ -3310,21 +3310,21 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
+ 			}
+ 		}
+ 		else if(State >= IUpdater::GETTING_MANIFEST && State < IUpdater::NEED_RESTART)
+-			str_format(aBuf, sizeof(aBuf), Localize("Updating…"));
++			str_copy(aBuf, Localize("Updating…");
+ 		else if(State == IUpdater::NEED_RESTART)
+ 		{
+-			str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
+-			m_NeedRestartUpdate = true;
++				str_copy(aBuf, Localize("DDNet Client updated!"));
++				m_NeedRestartUpdate = true;
+ 		}
+ 		else
+ 		{
+-			str_format(aBuf, sizeof(aBuf), Localize("No updates available"));
++			str_copy(aBuf, Localize("No updates available");
+ 			UpdaterRect.VSplitLeft(TextRender()->TextWidth(14.0f, aBuf, -1, -1.0f) + 10.0f, &UpdaterRect, &Button);
+ 			Button.VSplitLeft(100.0f, &Button, nullptr);
+ 			static CButtonContainer s_ButtonUpdate;
+ 			if(DoButton_Menu(&s_ButtonUpdate, Localize("Check now"), 0, &Button))
+ 			{
+-				Client()->RequestDDNetInfo();
++					Client()->RequestDDNetInfo();
+ 			}
+ 		}
+ 		Ui()->DoLabel(&UpdaterRect, aBuf, 14.0f, TEXTALIGN_ML);
+diff --git a/src/game/client/components/menus_start.cpp b/src/game/client/components/menus_start.cpp
+index 8d686afb190..31f3439063a 100644
+--- a/src/game/client/components/menus_start.cpp
++++ b/src/game/client/components/menus_start.cpp
+@@ -240,12 +240,12 @@ void CMenus::RenderStartMenu(CUIRect MainView)
+ 	}
+ 	else if(State == IUpdater::FAIL)
+ 	{
+-		str_format(aBuf, sizeof(aBuf), Localize("Update failed! Check log…"));
++		str_copy(aBuf, Localize("Update failed! Check log…"));
+ 		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
+ 	}
+ 	else if(State == IUpdater::NEED_RESTART)
+ 	{
+-		str_format(aBuf, sizeof(aBuf), Localize("DDNet Client updated!"));
++		str_copy(aBuf, Localize("DDNet Client updated!"));
+ 		TextRender()->TextColor(1.0f, 0.4f, 0.4f, 1.0f);
+ 	}
+ 	Ui()->DoLabel(&VersionUpdate, aBuf, 14.0f, TEXTALIGN_ML);
+diff --git a/src/game/editor/editor_actions.cpp b/src/game/editor/editor_actions.cpp
+index 67f2924bf09..8f67e615707 100644
+--- a/src/game/editor/editor_actions.cpp
++++ b/src/game/editor/editor_actions.cpp
+@@ -320,7 +320,7 @@ void CEditorActionDeleteQuad::Redo()
+ CEditorActionEditQuadPoint::CEditorActionEditQuadPoint(CEditor *pEditor, int GroupIndex, int LayerIndex, int QuadIndex, std::vector<CPoint> const &vPreviousPoints, std::vector<CPoint> const &vCurrentPoints) :
+ 	CEditorActionLayerBase(pEditor, GroupIndex, LayerIndex), m_QuadIndex(QuadIndex), m_vPreviousPoints(vPreviousPoints), m_vCurrentPoints(vCurrentPoints)
+ {
+-	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit quad points");
++	str_copy(m_aDisplayText, "Edit quad points");
+ }
+ 
+ void CEditorActionEditQuadPoint::Undo()
+@@ -628,7 +628,7 @@ CEditorActionGroup::CEditorActionGroup(CEditor *pEditor, int GroupIndex, bool De
+ 	if(m_Delete)
+ 		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Delete group %d", m_GroupIndex);
+ 	else
+-		str_format(m_aDisplayText, sizeof(m_aDisplayText), "New group");
++		str_copy(m_aDisplayText, "New group", sizeof(m_aDisplayText));
+ }
+ 
+ void CEditorActionGroup::Undo()
+@@ -1198,7 +1198,7 @@ CEditorActionTileArt::CEditorActionTileArt(CEditor *pEditor, int PreviousImageCo
+ 	IEditorAction(pEditor), m_PreviousImageCount(PreviousImageCount), m_vImageIndexMap(vImageIndexMap)
+ {
+ 	str_copy(m_aTileArtFile, pTileArtFile);
+-	str_format(m_aDisplayText, sizeof(m_aDisplayText), "Tile art");
++	str_copy(m_aDisplayText, "Tile art");
+ }
+ 
+ void CEditorActionTileArt::Undo()
+@@ -1266,7 +1266,7 @@ CEditorCommandAction::CEditorCommandAction(CEditor *pEditor, EType Type, int *pS
+ 	switch(m_Type)
+ 	{
+ 	case EType::ADD:
+-		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Add command");
++		str_copy(m_aDisplayText, "Add command");
+ 		break;
+ 	case EType::EDIT:
+ 		str_format(m_aDisplayText, sizeof(m_aDisplayText), "Edit command %d", m_CommandIndex);

diff --git a/README.packit b/README.packit
index 8d4e245..00daafb 100644
--- a/README.packit
+++ b/README.packit
@@ -1,3 +1,3 @@
 This repository is maintained by packit.
 https://packit.dev/
-The file was generated using packit 0.99.0.post1.dev18+g4850a935.
+The file was generated using packit 0.100.3.post1.dev13+g92513a8e.

diff --git a/ddnet.spec b/ddnet.spec
index 7210498..4bae783 100644
--- a/ddnet.spec
+++ b/ddnet.spec
@@ -2,8 +2,8 @@
 %bcond_without ninja_build
 
 Name:           ddnet
-Version:        18.4
-Release:        2%{?dist}
+Version:        18.5
+Release:        1%{?dist}
 Summary:        DDraceNetwork, a cooperative racing mod of Teeworlds
 
 # Disabled while can't fix build
@@ -37,10 +37,10 @@ Source0:        https://github.com/ddnet/ddnet/archive/%{version}/%{name}-%{vers
 
 # Disable network lookup test because without internet access tests not pass
 Patch1:         0001-Disabled-network-lookup-test.patch
-
 # Unbundle md5 and json-parser
 Patch2:         0002-Unbundle-md5_and_json-parser.patch
-Patch3:         0003-format-security.patch
+
+Patch3:         8886.diff
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
@@ -177,6 +177,10 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %changelog
+* Mon Sep 02 2024 Packit <hello@packit.dev> - 18.5-1
+- Update to version 18.5
+- Resolves: rhbz#2309033
+
 * Wed Aug 28 2024 Miroslav Suchý <msuchy@redhat.com> - 18.4-2
 - convert license to SPDX
 

diff --git a/sources b/sources
index ce16f81..ad11788 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ddnet-18.4.tar.gz) = 8cf7cb93c8e6f399e2f007f86be1bfee6761cf7e49b1901b90abe904f3f529527f68957c2af8517a96cfb500c6fe10a21e71138a6fc43e7ca5c800024197af31
+SHA512 (ddnet-18.5.tar.gz) = 7cfd7700b79f377ae4d29ff4d9d3ff5d067a696203cd5694cff33b0d9269ba87b192d27774fccc24cf8d2cda7d7e450e8349caa16668196719b20b8eac9bee6f