From nobody Mon Feb 12 01:15:11 2024 X-Original-To: dev-commits-ports-all@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 4TY62R2QZcz596XW; Mon, 12 Feb 2024 01:15:11 +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 4TY62R1mGVz4nvR; Mon, 12 Feb 2024 01:15:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707700511; 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=Se7jwHIXWQ5YoVPeaKi9te3lxXC04d4Tedi1LMDG/lc=; b=rf/DQsobQFDPEdWOIpZFwjavXRKSf7IkamOjwPjF6soJ82CSS4OXmvJRtkBR0nvWHRnoFM 93LiBRGiPi6lhnr0h7a5cHQEWB+ouhZ+9cqdq6izOMKluLWeeNKpT+hmwIANme/nkI+opg s0odowLGRfLRk2hqynHyHMmv3+Zr74KBlAinUK1eojMStPj9WfzhF8quViAcZUYTUA+XaO 1YWRog/phkQ0H/qfrsotXe6qBdKJl8yOB1XG8Dv1byI2jRuW1FRb56kkoU2XSHzXs5gPz1 3uLt7O2NSrekHuz5t5yTnnOjonKUejtYejTDtOF1VyhhYm8nqdXcd5aRzRVowg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707700511; a=rsa-sha256; cv=none; b=q/N1ypO/Pg+ghv9YxHS0oOIaiIG8nl3NGmbCE+e6jeIUAGUoZ9SW7EYzfba9dpCkmVJVCe 0nuX7sZplS1O2QmA6Ohjc5QrZ6/KkVj7EXLjr9UL893yUllfPuODuCHn6VHekvkD2LvY/K 5q9C/6OaL7zpZtifrqAEBVm/3kLRo2GE2DEfxd2JnPZQG6of8O0TgCaCEN8sfgf5lOB7nF RnyrZkRSC0kgT2qa8N515YAM+v2LmD5GsgiazhD/CjQ6FgmkJNskdWN+YbmFSa19A8G1Mq v4hicFjYQtry4XAv7iVhYVPx5OgrzDRJbRkt5zpaQ8dYMTQz6i9PiFDFHn2pWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707700511; 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=Se7jwHIXWQ5YoVPeaKi9te3lxXC04d4Tedi1LMDG/lc=; b=s5ouygN/wMpi/+NhgnJodgkLgQnC/RvcO4hzQyTmejRmG3LHZRR9Azl5be9O4dWIcJWe3Z aAOUx2KsuJ1FsqoVCfkcX0ccbsHbofeWWqcJgztpPOTh5gkR8vPvYqXr+F2gs2oC7bftPg fydmMjH27OtVaaQZZiKX33rBn95qE/QmbgQgLS8hvZ2SeQAGg2MyBnWUjkauhHjTpuC0iG o4M0rsc9sKgOiS6rpwqI2SM5IhxiCu9/3sji46U8IH5VUscQSFTxuK9TuACxQjKYkVWTPQ 4Mbax0XOc7LnqKrzN2n1LG3OfswTTV0SHgKOz+XY3Sqt1CrEeEgiP89DcALwqQ== 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 4TY62R0qy6z1M47; Mon, 12 Feb 2024 01:15:11 +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 41C1FB6b048396; Mon, 12 Feb 2024 01:15:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41C1FBag048393; Mon, 12 Feb 2024 01:15:11 GMT (envelope-from git) Date: Mon, 12 Feb 2024 01:15:11 GMT Message-Id: <202402120115.41C1FBag048393@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Jason E. Hale" Subject: git: 6b1f5719dd7a - 2024Q1 - math/readstat: Update to 1.1.9 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 6b1f5719dd7aba9a7e0c34757f2b7ea3a191f6ec Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=6b1f5719dd7aba9a7e0c34757f2b7ea3a191f6ec commit 6b1f5719dd7aba9a7e0c34757f2b7ea3a191f6ec Author: Jason E. Hale AuthorDate: 2024-02-12 00:55:48 +0000 Commit: Jason E. Hale CommitDate: 2024-02-12 01:15:06 +0000 math/readstat: Update to 1.1.9 MFH: 2024Q1 Security: 388eefc0-c93f-11ee-92ce-4ccc6adda413 (cherry picked from commit 013b958d94ac91a14d3d6b2b3db24c1ce88ee7ed) --- math/readstat/Makefile | 8 ++++---- math/readstat/distinfo | 6 +++--- math/readstat/files/patch-src_readstat__bits.h | 11 ---------- math/readstat/files/patch-src_readstat__variable.c | 10 +++------ math/readstat/files/patch-src_sas_ieee.c | 11 +--------- math/readstat/files/patch-src_spss_readstat__por.h | 11 ---------- .../files/patch-src_spss_readstat__sav__read.c | 24 ++++++++++++++++++++++ 7 files changed, 35 insertions(+), 46 deletions(-) diff --git a/math/readstat/Makefile b/math/readstat/Makefile index 6d2174c3f1b6..56d685cbde7f 100644 --- a/math/readstat/Makefile +++ b/math/readstat/Makefile @@ -1,6 +1,5 @@ PORTNAME= readstat -DISTVERSION= 1.1.8 -PORTREVISION= 4 +DISTVERSION= 1.1.9 CATEGORIES= math kde MASTER_SITES= https://github.com/WizardMac/ReadStat/releases/download/v${DISTVERSION}/ @@ -10,9 +9,10 @@ WWW= https://github.com/WizardMac/ReadStat LICENSE= MIT -USES= libtool -HAS_CONFIGURE= yes +USES= cpe libtool +CPE_VENDOR= wizardmac +HAS_CONFIGURE= yes CFLAGS+= -Werror -Wstrict-prototypes .include diff --git a/math/readstat/distinfo b/math/readstat/distinfo index 569b483c82ee..70f4370f596b 100644 --- a/math/readstat/distinfo +++ b/math/readstat/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661500384 -SHA256 (readstat-1.1.8.tar.gz) = b18a0d68059d9665491e53838b3ca89b06c3bdaa3b0a11d4ba87d830b743e178 -SIZE (readstat-1.1.8.tar.gz) = 615498 +TIMESTAMP = 1707695225 +SHA256 (readstat-1.1.9.tar.gz) = 3a232b9e852d10173e2f25da9155afe2e129a30d1fc6c9aac142cdc5cbfe527e +SIZE (readstat-1.1.9.tar.gz) = 617234 diff --git a/math/readstat/files/patch-src_readstat__bits.h b/math/readstat/files/patch-src_readstat__bits.h deleted file mode 100644 index 83dde0c07762..000000000000 --- a/math/readstat/files/patch-src_readstat__bits.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/readstat_bits.h.orig 2023-02-19 12:35:46 UTC -+++ src/readstat_bits.h -@@ -7,7 +7,7 @@ - #undef READSTAT_MACHINE_IS_TWOS_COMPLEMENT - #define READSTAT_MACHINE_IS_TWOS_COMPLEMENT 0 - --int machine_is_little_endian(); -+int machine_is_little_endian(void); - - char ones_to_twos_complement1(char num); - int16_t ones_to_twos_complement2(int16_t num); diff --git a/math/readstat/files/patch-src_readstat__variable.c b/math/readstat/files/patch-src_readstat__variable.c index 4bc2fe0c7ad8..73e615cf5a32 100644 --- a/math/readstat/files/patch-src_readstat__variable.c +++ b/math/readstat/files/patch-src_readstat__variable.c @@ -1,11 +1,7 @@ ---- src/readstat_variable.c.orig 2020-08-25 16:29:50 UTC +--- src/readstat_variable.c.orig 2023-02-20 19:09:20 UTC +++ src/readstat_variable.c -@@ -2,10 +2,10 @@ - #include - #include "readstat.h" - --static readstat_value_t make_blank_value(); -+static readstat_value_t make_blank_value(void); +@@ -5,7 +5,7 @@ static readstat_value_t make_double_value(double dval) + static readstat_value_t make_blank_value(void); static readstat_value_t make_double_value(double dval); -static readstat_value_t make_blank_value() { diff --git a/math/readstat/files/patch-src_sas_ieee.c b/math/readstat/files/patch-src_sas_ieee.c index 40efd45c642b..de19ae677fec 100644 --- a/math/readstat/files/patch-src_sas_ieee.c +++ b/math/readstat/files/patch-src_sas_ieee.c @@ -1,14 +1,5 @@ ---- src/sas/ieee.c.orig 2018-12-15 15:27:55 UTC +--- src/sas/ieee.c.orig 2023-02-20 19:09:20 UTC +++ src/sas/ieee.c -@@ -16,7 +16,7 @@ static void ieee2xpt(unsigned char *ieee, unsigned cha - - #ifndef FLOATREP - #define FLOATREP get_native() --int get_native(); -+int get_native(void); - #endif - - void memreverse(void *intp_void, int l) { @@ -96,7 +96,7 @@ int cnxptiee(const void *from_bytes, int fromtype, voi return(0); } diff --git a/math/readstat/files/patch-src_spss_readstat__por.h b/math/readstat/files/patch-src_spss_readstat__por.h deleted file mode 100644 index 7649ac223461..000000000000 --- a/math/readstat/files/patch-src_spss_readstat__por.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/spss/readstat_por.h.orig 2023-02-19 12:38:04 UTC -+++ src/spss/readstat_por.h -@@ -31,7 +31,7 @@ typedef struct por_ctx_s { - ck_hash_table_t *var_dict; - } por_ctx_t; - --por_ctx_t *por_ctx_init(); -+por_ctx_t *por_ctx_init(void); - void por_ctx_free(por_ctx_t *ctx); - ssize_t por_utf8_encode(const unsigned char *input, size_t input_len, - char *output, size_t output_len, uint16_t lookup[256]); diff --git a/math/readstat/files/patch-src_spss_readstat__sav__read.c b/math/readstat/files/patch-src_spss_readstat__sav__read.c new file mode 100644 index 000000000000..e1dc93a378c3 --- /dev/null +++ b/math/readstat/files/patch-src_spss_readstat__sav__read.c @@ -0,0 +1,24 @@ +From d9b3c922d664d03100b9f37da129b382054ea3b2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=A1bor=20Cs=C3=A1rdi?= +Date: Fri, 9 Feb 2024 18:31:01 -0500 +Subject: [PATCH] Fix a buffer overflow + +It happens if raw_str_used underflows and ends up a very large number, +which is then used as the size of a string. + +Closes #285. + +https://github.com/WizardMac/ReadStat/issues/285 +https://github.com/WizardMac/ReadStat/pull/311 + +--- src/spss/readstat_sav_read.c.orig 2023-01-15 21:33:14 UTC ++++ src/spss/readstat_sav_read.c +@@ -717,7 +717,7 @@ static readstat_error_t sav_process_row(unsigned char + } + if (++offset == col_info->width) { + if (++segment_offset < var_info->n_segments) { +- raw_str_used--; ++ if (raw_str_used > 0) raw_str_used--; + } + offset = 0; + col++;