Re: UPDATE: ugrep 7.8.3

On 2026-08-02 5:41 a.m., Volker Schlecht wrote:
> Builds with passing tests on amd64 here - could you explain briefly why
> the two patches can go now?

LZMA was synched upstream and the other is no longer relevant.

> On 8/1/26 7:08 AM, Brad Smith wrote:
>> Here is an update to ugrep 7.8.3.
>>
>> Tested on aarch64, amd64 and i386.
>>
>>
>> ugrep v7.8
>>
>> - improve TUI custom-command option --view to wait for key
>> =C2=A0=C2=A0 press after viewing, by specifying + in --view=3D+COMMAND=
,
>> =C2=A0=C2=A0 such as --view=3D+file to display file type info in the T=
UI
>> =C2=A0=C2=A0 with CTRL-Y (overrides viewing the file contents) #543
>> - update TUI to block ANSI OSC escape codes, such as ESC
>> =C2=A0=C2=A0 ] P n rr gg bb that may hang the terminal according to
>> =C2=A0=C2=A0 Wikipedia
>> - update the ug+ and ugrep+ scripts to end options in
>> =C2=A0=C2=A0 filter commands with --, in case a filename starts
>> =C2=A0=C2=A0 with a - (dash)
>> - improve config parsing to ignore some options that do
>> =C2=A0=C2=A0 not make sense to set in a (local) config file
>> - local config files located in the working directory are
>> =C2=A0=C2=A0 only read when owned by the user running the ug or
>> =C2=A0=C2=A0 ugrep --config process (already implemented in update
>> =C2=A0=C2=A0 7.7)
>>
>> ugrep v7.7.0
>>
>> - support TUI search on slow and incomplete standard input pipes
>> =C2=A0=C2=A0 e.g. from tail -f #540
>> - update options -m (--max-count) and -K (--max-line) to stop
>> =C2=A0=C2=A0 reading input upon reaching the stopping criterium, then =
exit
>> =C2=A0=C2=A0 without draining the standard input pipe like GNU grep #5=
38
>> - improve binary file detection for huge mixed files #537
>> - add new option ./build.sh --disable-avx512 #534
>> - local config files located in the working directory are only
>> =C2=A0=C2=A0 read when owned by the user running the ugrep process
>> - fix lzma 7zip api memory leak
>>
>>
>> Index: Makefile
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> RCS file: /cvs/ports/sysutils/ugrep/Makefile,v
>> retrieving revision 1.59
>> diff -u -p -u -p -r1.59 Makefile
>> --- Makefile=C2=A0=C2=A0=C2=A0 6 Mar 2026 10:22:49 -0000=C2=A0=C2=A0=C2=
=A0 1.59
>> +++ Makefile=C2=A0=C2=A0=C2=A0 1 Aug 2026 04:11:47 -0000
>> @@ -3,7 +3,7 @@ CATEGORIES =3D=C2=A0=C2=A0=C2=A0 textproc sysutils
>> =C2=A0 =C2=A0 GH_ACCOUNT =3D=C2=A0=C2=A0=C2=A0 Genivia
>> =C2=A0 GH_PROJECT =3D=C2=A0=C2=A0=C2=A0 ugrep
>> -GH_TAGNAME =3D=C2=A0=C2=A0=C2=A0 v7.6.0
>> +GH_TAGNAME =3D=C2=A0=C2=A0=C2=A0 v7.8.3
>> =C2=A0 =C2=A0 # BSD
>> =C2=A0 PERMIT_PACKAGE =3D=C2=A0=C2=A0=C2=A0 Yes
>> @@ -15,23 +15,21 @@ WANTLIB +=3D m pcre2-8 z zstd
>> =C2=A0 COMPILER =3D=C2=A0=C2=A0=C2=A0 base-clang ports-gcc
>> =C2=A0 =C2=A0 LIB_DEPENDS =3D=C2=A0=C2=A0=C2=A0 archivers/brotli \
>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 archivers/bzip2 \
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 archivers/lz4 \
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 archivers/xz \
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 archivers/zstd =
\
>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 devel/pcre2
>> =C2=A0 TEST_DEPENDS =3D=C2=A0=C2=A0=C2=A0 shells/bash
>> =C2=A0 -CONFIGURE_STYLE =3D=C2=A0=C2=A0=C2=A0 autoreconf
>> -AUTOCONF_VERSION =3D=C2=A0=C2=A0=C2=A0 2.72
>> -AUTOMAKE_VERSION =3D=C2=A0=C2=A0=C2=A0 1.16
>> -CONFIGURE_ARGS =3D=C2=A0=C2=A0=C2=A0 --disable-avx2 \
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 --=
without-boost-regex
>> +CONFIGURE_STYLE =3D=C2=A0=C2=A0=C2=A0 gnu
>> =C2=A0 -# All amd64 machines support SSE2, but the same is not true of=
 i386
>> +.if ${MACHINE_ARCH:Marm}
>> +CONFIGURE_ARGS +=3D=C2=A0=C2=A0=C2=A0 --disable-neon
>> +.endif
>> =C2=A0 .if ${MACHINE_ARCH:Mi386}
>> =C2=A0 CONFIGURE_ARGS +=3D=C2=A0=C2=A0=C2=A0 --disable-sse2
>> =C2=A0 .endif
>> -# All supported armv7/aarch64 have NEON
>> =C2=A0 =C2=A0 USE_GMAKE =3D=C2=A0=C2=A0=C2=A0 Yes
>> =C2=A0 Index: distinfo
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> RCS file: /cvs/ports/sysutils/ugrep/distinfo,v
>> retrieving revision 1.56
>> diff -u -p -u -p -r1.56 distinfo
>> --- distinfo=C2=A0=C2=A0=C2=A0 6 Mar 2026 10:22:49 -0000=C2=A0=C2=A0=C2=
=A0 1.56
>> +++ distinfo=C2=A0=C2=A0=C2=A0 1 Aug 2026 04:11:47 -0000
>> @@ -1,2 +1,2 @@
>> -SHA256 (ugrep-7.6.0.tar.gz) =3D=20
>> r+iL30BiI53yQKqitMeIu0KC9VTe4JggELs9Nu8p4cA=3D
>> -SIZE (ugrep-7.6.0.tar.gz) =3D 7181894
>> +SHA256 (ugrep-7.8.3.tar.gz) =3D=20
>> C92iQ+fcsyMZQ6e3Kz5zz62VvlbCl9BJxgN+8UrgPX4=3D
>> +SIZE (ugrep-7.8.3.tar.gz) =3D 7220051
>> Index: patches/patch-configure_ac
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> RCS file: patches/patch-configure_ac
>> diff -N patches/patch-configure_ac
>> --- patches/patch-configure_ac=C2=A0=C2=A0=C2=A0 6 Mar 2026 10:22:49 -=
0000 1.1
>> +++ /dev/null=C2=A0=C2=A0=C2=A0 1 Jan 1970 00:00:00 -0000
>> @@ -1,34 +0,0 @@
>> -Index: configure.ac
>> ---- configure.ac.orig
>> -+++ configure.ac
>> -@@ -156,15 +156,6 @@ if test "x$cross_compiling" =3D "xyes"; then
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0 [mneon_ok=3Dno])
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if test =
"x$mneon_ok" =3D "xyes"; then
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0 SIMD_FLAGS=3D"-mfpu=3Dneon -DHAVE_NEON"
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 else
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 #=
 this part is a bit iffy,,,
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 C=
XXFLAGS=3D"-march=3Dnative -mfpu=3Dneon"
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 A=
C_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include=20
>> <arm_neon.h>]], [[uint64x2_t n; uint64_t m =3D vgetq_lane_u64(n, 0);]]=
)],
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [mneon_ok=3Dyes],
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [mneon_ok=3Dno])
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 i=
f test "x$mneon_ok" =3D "xyes"; then
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0 SIMD_FLAGS=3D"-march=3Dnative -mfpu=3Dneon -DHAVE_NEON"
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 f=
i
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 CXXFLAGS=
=3D$save_CXXFLAGS
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi
>> -@@ -239,14 +230,6 @@ else
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [mneon_ok=
=3Dno])
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if test "x$mneon_ok"=
 =3D "xyes"; then
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 SIMD_FLA=
GS=3D"-mfpu=3Dneon -DHAVE_NEON"
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 else
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 CXXFLAGS=3D"-=
march=3Dnative -mfpu=3Dneon"
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 AC_RUN_IFELSE=
([AC_LANG_PROGRAM([[#include=20
>> <arm_neon.h>]],[[uint64x2_t n; uint64_t m =3D vgetq_lane_u64(n, 0);]])=
],
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [mn=
eon_ok=3Dyes],
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 [mn=
eon_ok=3Dno])
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if test "x$mn=
eon_ok" =3D "xyes"; then
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 S=
IMD_FLAGS=3D"-march=3Dnative -mfpu=3Dneon -DHAVE_NEON"
>> --=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 CXXFLAGS=3D$save_CXX=
FLAGS
>> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 fi
>> Index: patches/patch-lzma_C_CpuArch_c
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> RCS file: patches/patch-lzma_C_CpuArch_c
>> diff -N patches/patch-lzma_C_CpuArch_c
>> --- patches/patch-lzma_C_CpuArch_c=C2=A0=C2=A0=C2=A0 3 Feb 2024 06:58:=
38 -0000=C2=A0=C2=A0=C2=A0 1.1
>> +++ /dev/null=C2=A0=C2=A0=C2=A0 1 Jan 1970 00:00:00 -0000
>> @@ -1,41 +0,0 @@
>> -Index: lzma/C/CpuArch.c
>> ---- lzma/C/CpuArch.c.orig
>> -+++ lzma/C/CpuArch.c
>> -@@ -757,8 +757,36 @@ BoolInt CPU_IsSupported_SHA1(void) { return=20
>> APPLE_CRYP
>> - BoolInt CPU_IsSupported_SHA2(void) { return=20
>> APPLE_CRYPTO_SUPPORT_VAL; }
>> - BoolInt CPU_IsSupported_AES (void) { return=20
>> APPLE_CRYPTO_SUPPORT_VAL; }
>> -
>> -+#elif defined(__OpenBSD__) // __APPLE__
>> -
>> --#else // __APPLE__
>> -+#include <sys/param.h>
>> -+#include <sys/sysctl.h>
>> -+#include <machine/cpu.h>
>> -+#include <machine/armreg.h>
>> -+
>> -+BoolInt CPU_IsSupported_NEON() { return 1; }
>> -+
>> -+#define MY_HWCAP_CHECK_FUNC_2(name1, name2) \
>> -+=C2=A0 BoolInt CPU_IsSupported_ ## name1() { \
>> -+=C2=A0=C2=A0=C2=A0 int isar0_mib[] =3D { CTL_MACHDEP, CPU_ID_AA64ISA=
R0 }; \
>> -+=C2=A0=C2=A0=C2=A0 size_t len =3D sizeof(uint64_t); \
>> -+=C2=A0=C2=A0=C2=A0 uint64_t cpu_id =3D 0; \
>> -+=C2=A0=C2=A0=C2=A0 if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) =
< 0) \
>> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return 0; \
>> -+=C2=A0=C2=A0=C2=A0 if (ID_AA64ISAR0_ ## name2(cpu_id) >=3D ID_AA64IS=
AR0_## name2=20
>> ##_BASE) \
>> -+=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return 1; \
>> -+=C2=A0=C2=A0=C2=A0 return 0; \
>> -+=C2=A0 }
>> -+
>> -+#define MY_HWCAP_CHECK_FUNC(name) \
>> -+=C2=A0 MY_HWCAP_CHECK_FUNC_2(name, name)
>> -+
>> -+MY_HWCAP_CHECK_FUNC (CRC32)
>> -+MY_HWCAP_CHECK_FUNC (SHA1)
>> -+MY_HWCAP_CHECK_FUNC (SHA2)
>> -+MY_HWCAP_CHECK_FUNC (AES)
>> -+
>> -+#else // __OpenBSD__
>> -
>> - #include <sys/auxv.h>
>> -
>> Index: patches/patch-tests_verify_sh
>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>> RCS file: patches/patch-tests_verify_sh
>> diff -N patches/patch-tests_verify_sh
>> --- /dev/null=C2=A0=C2=A0=C2=A0 1 Jan 1970 00:00:00 -0000
>> +++ patches/patch-tests_verify_sh=C2=A0=C2=A0=C2=A0 1 Aug 2026 04:11:4=
7 -0000
>> @@ -0,0 +1,9 @@
>> +Index: tests/verify.sh
>> +--- tests/verify.sh.orig
>> ++++ tests/verify.sh
>> +@@ -1,4 +1,4 @@
>> +-#!/bin/bash
>> ++#!/usr/local/bin/bash
>> +
>> + UGREP=3D${UGREP_ABS_PATH:-../src/ugrep}
>> + CONFIGH=3D${CONFIGH_ABS_PATH:-../config.h}
>>
>