From nobody Wed Jan 03 13:43:07 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4T4rWv62Yrz55v5C; Wed, 3 Jan 2024 13:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4rWv5RbQz4KF1; Wed, 3 Jan 2024 13:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704289387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qfNEc/dd6sLO8PbhPxIyjzua570gsCtMMnxSD11I4g=; b=l8f9IfTqwC7aNbkuOGEAduW3FX3bj0/jl9ZlPP/Qu8HRcwlh9/jngijT9I9RXYcu5tYUEH RPszRrgoFV1llQx1KiwszPJ/+8l4tBoH035s2OHVkU7Y1NGmCsEM1h7FsvdPWHFWMIGjP7 7EOXORUUXWMwyrBEIEIZHkx0wqeykb0cEye6w/CUUdg/P5r2eIowqx9ULN7W48+1Zsxwmx 2Jr9UGUZmJrN8G9BliRrFBE33eSm0muBGgtYmmvoklURK+HeQoXXpal5a16NHPmOOyp6UJ RZ4VBe/PsCyLB/Fhxo37gx+8pX2eDGV7kFQw6JqRr6sEaK1TwWiCLzo959P1gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704289387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9qfNEc/dd6sLO8PbhPxIyjzua570gsCtMMnxSD11I4g=; b=FKCA6miBUquxAYWzuDmz0NSSPGV24mQftxQxv/jhqvd9lOP/mSV1zd6dZDBVWjmnw1GVNK /2gyOmRUMl846MQK5zABEUdrU8uzFywOEs6RgWo7UH1A1hVSZRaay4NTpHTvher9rh/pDX 02w8rOidxf/jSJEhwHCfqjHDR1njWurdRvrXbqRadmABjt6zv4H+mQrvzuDOoSdT85PB1u fqeq+3RLNg0cI2RF8/rpKyA+Y28cdH4b0ShV0iblhI0l2ScV6IJWLSGp/pCm1AuRiW0RF5 qxsS5hNrkbtF7QgQPR3dCODPCR9DFJxfzSAswZlNL0h3Miw9Qter5fCPaZGv/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704289387; a=rsa-sha256; cv=none; b=uckOFCowhLE6eMScOymSsQpyfypqHKbYnQJz9GmpTiuuhtGM2FiSV8BhbPYjq5+K/aSQzG gDSkbkWY5AtD983VzqQQxff3oOFoELdBLypBi+1o37NjnYxUSTXXlmCsbKMhMZ3ejLS/PK 6UErRhrZcpI3yza/Af/iPF/8Q/xUdYY74o8+bYUn0tlzoY8A+LBsT2ETKCGuCEBD8P/a5a 37NThBj3FSvC1aRsEsw4hXPG7OwRz0aZUOQlG6oeghlk1dZwKn9uIrrBTOFVtex60fPqlj Fb05nxAYHP7kOnV5e241o7uN52aYtgMZi5KsRgbE4q4dtbr0zt3yqiuWqcijcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4T4rWv4Vb6zn0c; Wed, 3 Jan 2024 13:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403Dh7pj029279; Wed, 3 Jan 2024 13:43:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403Dh7uN029276; Wed, 3 Jan 2024 13:43:07 GMT (envelope-from git) Date: Wed, 3 Jan 2024 13:43:07 GMT Message-Id: <202401031343.403Dh7uN029276@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: ddacb9107505 - main - games/openbor: update to 7534 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddacb9107505c843c5db2991219da87d7ec113fb Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ddacb9107505c843c5db2991219da87d7ec113fb commit ddacb9107505c843c5db2991219da87d7ec113fb Author: Jan Beich AuthorDate: 2024-01-02 06:34:24 +0000 Commit: Jan Beich CommitDate: 2024-01-03 13:42:52 +0000 games/openbor: update to 7534 Changes: https://github.com/DCurrent/openbor/compare/3caaddd5...3bae1dd7 --- games/openbor/Makefile | 8 ++--- games/openbor/distinfo | 6 ++-- games/openbor/files/patch-openbor.c | 55 ++------------------------------ games/openbor/files/patch-source_utils.c | 8 +++-- 4 files changed, 14 insertions(+), 63 deletions(-) diff --git a/games/openbor/Makefile b/games/openbor/Makefile index 78cd00a1061f..3296ad97e8b4 100644 --- a/games/openbor/Makefile +++ b/games/openbor/Makefile @@ -1,8 +1,8 @@ PORTNAME= openbor # Hint: svn revision is git rev-list --count ${GH_TAGNAME} -PORTVERSION?= 7138 +PORTVERSION?= 7534 .ifndef PKGNAMESUFFIX -PORTREVISION= 2 +PORTREVISION= 0 .endif CATEGORIES= games @@ -37,7 +37,7 @@ PORTSCOUT= ignore:1 USE_GITHUB= yes GH_ACCOUNT= DCurrent -GH_TAGNAME?= 3caaddd5 +GH_TAGNAME?= 3bae1dd7 USES+= cpe gmake pkgconfig sdl .if ${PORTVERSION} < 4433 @@ -45,7 +45,7 @@ USE_CSTD= gnu89 .endif .if ${PORTVERSION} < 4108 USE_SDL= gfx -.elif ${PORTVERSION} < 6639 +.elif ${PORTVERSION} < 6639 || ${PORTVERSION} >= 7416 USE_SDL= gfx2 .else USE_SDL= sdl2 diff --git a/games/openbor/distinfo b/games/openbor/distinfo index d2161a6a074a..a60b48b73da0 100644 --- a/games/openbor/distinfo +++ b/games/openbor/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1626732659 -SHA256 (DCurrent-openbor-7138-3caaddd5_GH0.tar.gz) = 4671f869aeffb0a13fd21171bbccef2dcca5b5b0c8f5a64bf2a921bc7404fac5 -SIZE (DCurrent-openbor-7138-3caaddd5_GH0.tar.gz) = 26900809 +TIMESTAMP = 1704177264 +SHA256 (DCurrent-openbor-7534-3bae1dd7_GH0.tar.gz) = 9ac7c3d9dae326e366c2202d33ffe7cc2ae39aec98fda738964e05467a6ccae1 +SIZE (DCurrent-openbor-7534-3bae1dd7_GH0.tar.gz) = 60292766 diff --git a/games/openbor/files/patch-openbor.c b/games/openbor/files/patch-openbor.c index cec69bb2ff6e..1a946cb4ab9c 100644 --- a/games/openbor/files/patch-openbor.c +++ b/games/openbor/files/patch-openbor.c @@ -1,47 +1,8 @@ -Fix potential crashes found by ASan/Clang/GCC Fix an infinite loop in lcmScriptDeleteMain() ---- openbor.c.orig 2018-07-06 15:13:16 UTC +--- openbor.c.orig 2024-01-02 00:04:19 UTC +++ openbor.c -@@ -6259,17 +6259,17 @@ s_collision_attack *collision_alloc_attack_instance(s_ - // - // Allocate an empty collision attack list. - s_collision_attack **collision_alloc_attack_list() - { - s_collision_attack **result; - size_t alloc_size; - - // Get amount of memory we'll need. -- alloc_size = sizeof(*result); -+ alloc_size = max_collisons * sizeof(*result); - - // Allocate memory and get pointer. - result = malloc(alloc_size); - - // Make sure the list is blank. - memset(result, 0, alloc_size); - - // return result. -@@ -6308,17 +6308,17 @@ s_collision_body *collision_alloc_body_instance(s_coll - // - // Allocate an empty collision attack list. - s_collision_body **collision_alloc_body_list() - { - s_collision_body **result; - size_t alloc_size; - - // Get amount of memory we'll need. -- alloc_size = sizeof(*result); -+ alloc_size = max_collisons * sizeof(*result); - - // Allocate memory and get pointer. - result = malloc(alloc_size); - - // Make sure the list is blank. - memset(result, 0, alloc_size); - - // return result. -@@ -8743,7 +8743,8 @@ size_t lcmScriptCopyBuffer(ArgList *arglist, char *buf +@@ -12499,7 +12499,8 @@ size_t lcmScriptDeleteMain(char **buf) size_t lcmScriptDeleteMain(char **buf) { @@ -51,15 +12,3 @@ Fix an infinite loop in lcmScriptDeleteMain() ptrdiff_t pos = 0; char *newbuf = NULL; -@@ -15920,6 +15921,11 @@ void bar(int x, int y, int value, int maxvalue, s_bars - else - { - return; -+ } -+ -+ if (value < 0) -+ { -+ value = 0; - } - - if (value > maxvalue) diff --git a/games/openbor/files/patch-source_utils.c b/games/openbor/files/patch-source_utils.c index 65fb72c0c7ed..1693b73e8915 100644 --- a/games/openbor/files/patch-source_utils.c +++ b/games/openbor/files/patch-source_utils.c @@ -6,14 +6,16 @@ source/utils.c:303:64: error: member reference base type 'int' is not a structur writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); ~~~~~~~~~~^~~~~~ ---- source/utils.c.orig 2018-07-06 15:13:16 UTC +--- source/utils.c.orig 2024-01-02 00:04:19 UTC +++ source/utils.c -@@ -303,7 +303,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f +@@ -303,9 +303,7 @@ void *checkAlloc(void *ptr, size_t size, const char *f "\n* Shutting Down *\n\n"); writeToLogFile("Out of memory!\n"); writeToLogFile("Allocation of size %i failed in function '%s' at %s:%i.\n", size, func, file, line); -#ifndef WIN +- writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); +-#elif LINUX +#if defined(__GLIBC__) || defined(ANDROID) || defined(VITA) - writeToLogFile("Memory usage at exit: %u\n", mallinfo().arena); + writeToLogFile("Memory usage at exit: %u\n", mallinfo2().arena); #endif borExit(2);