CVS commit: src/external/bsd/libevent/dist
Module Name:src Committed By: rin Date: Mon Jun 19 03:21:14 UTC 2023 Modified Files: src/external/bsd/libevent/dist: openssl-compat.h Log Message: Cherry-pick upstream fix for LibreSSL. NFC for us at the moment. https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9 Don't define BIO_get_init() for LibreSSL 3.5+ BIO_get_init() is available in LibreSSL 3.5 and later. The BIO type will become opaque, so the existing macro will break the build. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libevent/dist/openssl-compat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/libevent/dist/openssl-compat.h diff -u src/external/bsd/libevent/dist/openssl-compat.h:1.1.1.2 src/external/bsd/libevent/dist/openssl-compat.h:1.2 --- src/external/bsd/libevent/dist/openssl-compat.h:1.1.1.2 Wed Apr 7 02:43:14 2021 +++ src/external/bsd/libevent/dist/openssl-compat.h Mon Jun 19 03:21:14 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: openssl-compat.h,v 1.1.1.2 2021/04/07 02:43:14 christos Exp $ */ +/* $NetBSD: openssl-compat.h,v 1.2 2023/06/19 03:21:14 rin Exp $ */ #ifndef OPENSSL_COMPAT_H #define OPENSSL_COMPAT_H @@ -41,7 +41,8 @@ static inline BIO_METHOD *BIO_meth_new(i #endif /* (OPENSSL_VERSION_NUMBER < 0x1010L) || \ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070L) */ -#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070L +#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070L && \ + LIBRESSL_VERSION_NUMBER < 0x3050L #define BIO_get_init(b) (b)->init #endif
CVS commit: src/external/bsd/libevent/dist
Module Name:src Committed By: rin Date: Mon Jun 19 03:21:14 UTC 2023 Modified Files: src/external/bsd/libevent/dist: openssl-compat.h Log Message: Cherry-pick upstream fix for LibreSSL. NFC for us at the moment. https://github.com/libevent/libevent/commit/883630f76cbf512003b81de25cd96cb75c6cf0f9 Don't define BIO_get_init() for LibreSSL 3.5+ BIO_get_init() is available in LibreSSL 3.5 and later. The BIO type will become opaque, so the existing macro will break the build. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/libevent/dist/openssl-compat.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/bsd/libevent/dist
Joerg Sonnenberger wrote: Which 15 changes in src/external are you talking about? Some of them were only Makefile changes, so trimmed from the list; src/crypto/external/bsd/openssh Message-Id: 20110825153701.1ff6b17...@cvs.netbsd.org Message-Id: 20110829210854.ee03417...@cvs.netbsd.org Message-Id: 20110916153601.9b20817...@cvs.netbsd.org Message-Id: 20110916153618.7009617...@cvs.netbsd.org src/external/bsd/file (after I sent my previous email) Message-Id: 20110917104653.247c917...@cvs.netbsd.org src/external/bsd/flex Message-Id: 20110827183603.d4dcd17...@cvs.netbsd.org src/external/bsd/libarchive Message-Id: 20110916162736.e81bf17...@cvs.netbsd.org src/external/bsd/libevent Message-Id: 20110916160903.c409c17...@cvs.netbsd.org src/external/bsd/libpcap Message-Id: 20110916160925.83e7d17...@cvs.netbsd.org src/external/bsd/tmux Message-Id: 20110825164151.6308017...@cvs.netbsd.org src/external/historical/nawk Message-Id: 20110916160947.6659f17...@cvs.netbsd.org Most of them are either to pieces already heavily modified (OpenSSH), Does that stop feeding changes back? very rarely updated (libpcap) Does that stop feeding changes back? or where it is hard to impossible to get any chances included (nawk, byacc). Why is that? In this case I am going to talk with upstream. In light of your previous message, it wasn't obvious if you were also doing that. Cheers, Simon.
Re: CVS commit: src/external/bsd/libevent/dist
On Sat, Sep 17, 2011 at 11:17:51AM +1000, Simon Burge wrote: Joerg Sonnenberger wrote: Module Name:src Committed By: joerg Date: Fri Sep 16 16:09:03 UTC 2011 Modified Files: src/external/bsd/libevent/dist: log.h Log Message: Use __dead Has this and the other 15 or so changes you've made to src/external in the last month all been feed back to the relative maintainers? Which 15 changes in src/external are you talking about? Most of them are either to pieces already heavily modified (OpenSSH), very rarely updated (libpcap) or where it is hard to impossible to get any chances included (nawk, byacc). In this case I am going to talk with upstream. Joerg
Re: CVS commit: src/external/bsd/libevent/dist
Joerg Sonnenberger wrote: Module Name: src Committed By: joerg Date: Fri Sep 16 16:09:03 UTC 2011 Modified Files: src/external/bsd/libevent/dist: log.h Log Message: Use __dead Has this and the other 15 or so changes you've made to src/external in the last month all been feed back to the relative maintainers? From: Joerg Sonnenberger jo...@britannica.bec.de To: source-chan...@netbsd.org Cc: source-changes-d@NetBSD.org Subject: Re: CVS commit: src/external/bsd/mdocml Date: Wed, 17 Aug 2011 23:28:05 +0200 Could you please stop randomly changing 3rd party code without contacting the maintainer? Joerg Cheers, Simon.
