Friday, October 29, 2021

Re: backport CVE fixes audio/sox

On 2021/10/28 22:36, Nam Nguyen wrote:
> I prepared a release tarball from a checkout:
> install groff for tbl and nroff
> install autoconf-archive, autoconf and automake
> edit src/Makefile.am append "libsox.sym" to EXTRA_DIST (needed to avoid
> compilation error)
> edit configure.ac: 14.4.3git --> 14.4.2pl20210509
> $ AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.16 autoreconf-2.69 -i
> $ ./configure
> $ gmake dist

I would prefer it if those extra steps were done in the port, either as
a "dist" target to generate the tar, or as steps in the normal build
so that it can use an unmodified archive from git. Alternatively (less
preferred but I would still be ok with it) with comments showing how
to do it. Bsaically so that somebody else wanting to update it doesn't
need to figure it out for themselves.

> Minor bump
> ----------
> Minor increased because check_sym reports new lsx_* symbols. According
> to the top of ${WRKSRC}/src/sox.h, "lsx_" or "LSX_" are internal use,
> but bump it anyways due their visibility. (sox_* are part of the public
> interface.)

ack.

> check_sym: https://namtsui.com/public/sox_sym.txt
>
> Also, datatypes changed in ${WRKSRC}/src/sox.h.
> See:
> https://sourceforge.net/p/sox/code/ci/3518bcd92416e7cf71ee9a863695a518f3de4e52/
> /usr/src/sys/sys/types.h
> /usr/src/sys/sys/stdint.h
> /usr/src/sys/arch/i386/include/_types.h
> /usr/src/sys/sys/limits.h
>
> Based on this, the only difficult one was long --> long long.
>
> -#if LONG_MAX==9223372036854775807 && LONG_MIN==(-9223372036854775807-1)
> -typedef long sox_int64_t;
> -#elif defined(_MSC_VER)
> -typedef __int64 sox_int64_t;
> -#else
> -typedef long long sox_int64_t;
> -

No comments:

Post a Comment