commit: 70849917cfde33a862c64bb57665c44e36dad279 Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Mon Jun 24 08:55:56 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 10 09:15:00 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70849917
games-server/crossfire-server: add 1.75.0 Version bump of the server to fix bugs Bug: https://bugs.gentoo.org/734314 Bug: https://bugs.gentoo.org/871441 Bug: https://bugs.gentoo.org/904073 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/37270 Signed-off-by: Sam James <sam <AT> gentoo.org> games-server/crossfire-server/Manifest | 2 + .../crossfire-server-1.75.0.ebuild | 54 ++++++++++++++++++++++ .../files/crossfire-server-1.75.0-format.patch | 11 +++++ 3 files changed, 67 insertions(+) diff --git a/games-server/crossfire-server/Manifest b/games-server/crossfire-server/Manifest index 75068970eb30..83deb5fd6d30 100644 --- a/games-server/crossfire-server/Manifest +++ b/games-server/crossfire-server/Manifest @@ -1,3 +1,5 @@ DIST crossfire-1.71.0.arch.tar.bz2 3462161 BLAKE2B 4f2c7e9619ceca3aafea03a681e59c04e31c954c91b94e4065a6446d537c6f039fe58c04f50fd5eddb8290b9cb93533772c6c7963b526c537bf297f469ad5bb5 SHA512 f9707dc5dab24d0ba74654c6433e016a58ab4e99da5dade6614491eca00736965bb7fd9a24db4188c3409a0479a88bb0ea55282e519ffcbabf23d82e6a5b975e DIST crossfire-1.71.0.maps.tar.bz2 19463076 BLAKE2B a6b1935985d82b53ef1dfd76b91e8d9417f03dceeddbc69154799703597d14d3ffb3dba8cec809345b62e99294ed3adec66cb2c9fae52fface96db8ba75daa7d SHA512 c3940b0a48f1badc14eb81610cfcd4241d140b666b5cb123845dca6ad742a18977ad7ada1d75d738f15f44374896c4dd6047989122257d7cd87362a3af0f97e8 DIST crossfire-1.71.0.tar.bz2 6712638 BLAKE2B 91957fab3f19e52839eadfcb015a2fd8dfc551230fa55dd00254f39608ffbb8648227f3d2a244a609538ee2e426675e6b58dac73cf565554611ccb40d2839873 SHA512 d867f3393cb18ed78158c9a724d386dd642f0193ace86fef592e7bdc80885b7f7ce3c37be34b77d73b31c939d41e533029f2e7dea405c00d7a67aa3baebd146d +DIST crossfire-1.75.0.tar.gz 7199792 BLAKE2B cf9c8f40bfa3970ab28b21694fe85dc2a6849976903f1488fd3d3858927af6a0a47d47f382560f13f0d3d39c28f31c5f9dc55ec4e03cc290a13320c0831f795d SHA512 1e730fcccf302ab72850928a4f16a4b779558db57713fc9d8678f41df6c48139a87e8fda621a931a2a5530da924ab7c5e8a31cfe830b825cf369e743051036f4 +DIST crossfire-maps-1.75.0.tar.gz 33892228 BLAKE2B 47546d19eeb89ed19949a5ed1be4bc545d2347ee64d04fb803a66d7a7657cf3d98233f2fa32c89f5ba884535a7f6cffe2e7385860351334450ea9689cef3b8a0 SHA512 00b7ac1957d85d5f4ea847eaa59a80dda31b0518ecdfd31984349e5d7ca5ac5d526bbb1c7f64a0e5e0d60ec727bfe8f849bad6ad6d36fe570250c7f20c2b1220 diff --git a/games-server/crossfire-server/crossfire-server-1.75.0.ebuild b/games-server/crossfire-server/crossfire-server-1.75.0.ebuild new file mode 100644 index 000000000000..17c9af84474b --- /dev/null +++ b/games-server/crossfire-server/crossfire-server-1.75.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_P="${P/-server/}" +DESCRIPTION="Server for the crossfire clients" +HOMEPAGE="https://crossfire.real-time.com/"; +SRC_URI="https://downloads.sourceforge.net/crossfire/crossfire-server/${PV}/crossfire-${PV}.tar.gz + https://downloads.sourceforge.net/crossfire/crossfire-maps/${PV}/crossfire-maps-${PV}.tar.gz"; +DEPEND="${RDEPEND}" +S="${WORKDIR}/${MY_P}" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="X" +RESTRICT="test" + +RDEPEND=" + net-misc/curl + sys-libs/zlib + virtual/libcrypt:= + X? ( + x11-libs/libXaw + media-libs/libpng:0= + ) +" + +src_prepare() { + default + + # bug #236205 + rm -f "${WORKDIR}"/maps/Info/combine.pl || die +# ln -s "${WORKDIR}"/arch "${S}"/lib || die + + eapply "${FILESDIR}"/${P}-format.patch +} + +src_compile() { + # work around the collect.pl locking + emake -j1 -C lib + emake +} + +src_install() { + default + + keepdir /var/lib/crossfire/{account,datafiles,maps,players,template-maps,unique-items} + + insinto /usr/share/crossfire + doins -r "${WORKDIR}"/maps + + find "${ED}" -name '*.la' -delete || die +} diff --git a/games-server/crossfire-server/files/crossfire-server-1.75.0-format.patch b/games-server/crossfire-server/files/crossfire-server-1.75.0-format.patch new file mode 100644 index 000000000000..f051dc9f48b6 --- /dev/null +++ b/games-server/crossfire-server/files/crossfire-server-1.75.0-format.patch @@ -0,0 +1,11 @@ +--- a/server/c_chat.c 2024-06-24 08:49:34.803705760 -0000 ++++ b/server/c_chat.c 2024-06-24 08:50:21.532557066 -0000 +@@ -651,7 +651,7 @@ + const char *self_reply; + if (emotion > EMOTE_FIRST && emotion < EMOTE_LAST && single_emotes[emotion - 1][0] != NULL) { + self_reply = single_emotes[emotion - 1][0]; +- snprintf(buf2, sizeof(buf2), single_emotes[emotion - 1][1], op->name); ++ snprintf(buf2, sizeof(buf2), "%s", single_emotes[emotion - 1][1], op->name); + } else { + self_reply = "You are a nut."; + snprintf(buf2, sizeof(buf2), "%s dances with glee.", op->name);
