Stefan Hagen writes:
> Stuart Henderson wrote:
>> On 2021/07/03 15:43, Nam Nguyen wrote:
>>> - Since maintaining this many patches is clunky, should we consider
>>> mirroring the latest git checkout?
>>
>> I don't have any feel for what shape the upstream code is in, though
>> that is often safer than taking a big set of patches and hoping that
>> they don't rely on something else that was committed but not picked up
>> in the patches.. Other OS must have this problem too, it would be really
>> helpful if there was a newer release that everyone could move to, rather
>> than separately wrangling patches.
>
> Hmm, upstream considers git master the "best version":
>
> https://sourceforge.net/p/sox/mailman/message/37254884/
>
> What about mirroring the latest git checkout at the start of the OpenBSD
> release cycle, so it's tested well over the next months?
>
> Best Regards,
> Stefan
Here is a diff implementing sdk@'s suggestion to mirror git. This leaves
the port in a better state security-wise and can hold us over until the
next sox release.
This diff:
- mirrors git checkout as a release tarball
- bumps library minor to 4.1 because of addition of symbols
- removes iconv from WANTLIB and LIB_DEPENDS as reported by make
port-lib-depends-check
- renames CONFIGURE_ARGS
- compile extras target during do-test
- removes upstreamed patches
Release tarball
---------------
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
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.)
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