Date: Fri, 17 Mar 2023 13:33:48 -0400 From: Adam Weinberger <adamw@adamw.org> To: Bernard Spil <brnrd@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 98749c4fe066 - main - security/openssl-devel: Rename to security/openssl30 Message-ID: <CAP7rwcg4L1FZ4iTdKps8LxM5JQ6e_==89Vhtk63jDcfcBJ%2BQaw@mail.gmail.com> In-Reply-To: <01000186e2138789-48987302-71f1-466d-b9f0-09c3e7e8ca72-000000@email.amazonses.com> References: <202303141825.32EIPEk8054602@gitrepo.freebsd.org> <01000186e2138789-48987302-71f1-466d-b9f0-09c3e7e8ca72-000000@email.amazonses.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Tue, Mar 14, 2023 at 5:42 PM Colin Percival <cperciva@tarsnap.com> wrote: > Need to update reverse dependencies, e.g. > > make_index: /usr/ports/net-im/signal-desktop: no entry for > /usr/ports/security/openssl-devel > > Colin Percival > > On 3/14/23 11:25, Bernard Spil wrote: > > The branch main has been updated by brnrd: > > > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=98749c4fe066dc63be565d071f5167557da57404 > > > > commit 98749c4fe066dc63be565d071f5167557da57404 > > Author: Bernard Spil <brnrd@FreeBSD.org> > > AuthorDate: 2023-03-14 18:19:53 +0000 > > Commit: Bernard Spil <brnrd@FreeBSD.org> > > CommitDate: 2023-03-14 18:19:53 +0000 > > > > security/openssl-devel: Rename to security/openssl30 > > > > * Align with the upstream "release" status > > * Avoid confusion with OpenSSL 3.1 > > > > Reported by: ngie > > Differential Revision: https://reviews.freebsd.org/D38938 > > --- > > MOVED | 1 > + > > UPDATING | 7 > +++++++ > > security/Makefile | 2 > +- > > security/{openssl-devel => openssl30}/Makefile | 0 > > security/{openssl-devel => openssl30}/distinfo | 0 > > security/{openssl-devel => openssl30}/files/extra-patch-ktls | 0 > > .../files/extra-patch-util_find-doc-nits | 0 > > .../files/patch-Configurations_10-main.conf | 0 > > security/{openssl-devel => openssl30}/files/patch-Configure | 0 > > security/{openssl-devel => openssl30}/files/patch-crypto_ppccap.c | 0 > > .../files/patch-crypto_threads__pthread.c | 0 > > .../files/patch-util_perl_OpenSSL_config.pm | 0 > > security/{openssl-devel => openssl30}/pkg-descr | 0 > > security/{openssl-devel => openssl30}/pkg-plist | 0 > > security/{openssl-devel => openssl30}/version.mk | 0 > > 15 files changed, 9 insertions(+), 1 deletion(-) > > > > diff --git a/MOVED b/MOVED > > index 3e2353017644..0a36dd1737a0 100644 > > --- a/MOVED > > +++ b/MOVED > > @@ -17788,3 +17788,4 @@ databases/postgresql10-server||2023-03-07|Has > expired: PostgreSQL 10 has reached > > audio/ximp3||2023-03-09|Has expired: Abandonware and obsolete, uses > old decoder library and no ID3v2 support > > devel/libpthread-stubs||2023-03-12|No consumers left and never > supported pthread stubs in libc on FreeBSD > > multimedia/mkvtoolnix-nox11|multimedia/mkvtoolnix@nogui|2023-03-13|Converted > to flavor > > +security/openssl-devel|security/openssl30|2023-03-14|3.0 is not devel, > prevent confusion with 3.1 > > diff --git a/UPDATING b/UPDATING > > index 2def2788a33b..9da7fb0406b6 100644 > > --- a/UPDATING > > +++ b/UPDATING > > @@ -5,6 +5,13 @@ they are unavoidable. > > You should get into the habit of checking this file for changes each > time > > you update your ports collection, before attempting any port upgrades. > > > > +20230314: > > + AFFECTS: users of security/openssl-devel > > + AUTHOR: brnrd@FreeBSD.org > > + > > + Users using DEFAULT_VERSIONS=ssl=openssl-devel must update their > > + configuration to DEFAULT_VERSIUONS=ssl=openssl30 or openssl31. > > + > > 20230313: > > AFFECTS: users of databases/sqlite3 > > AUTHOR: fuz@FreeBSD.org > > diff --git a/security/Makefile b/security/Makefile > > index 715197e17fc3..5cd3c04e9c30 100644 > > --- a/security/Makefile > > +++ b/security/Makefile > > @@ -410,8 +410,8 @@ > > SUBDIR += openssh-askpass > > SUBDIR += openssh-portable > > SUBDIR += openssl > > + SUBDIR += openssl30 > > SUBDIR += openssl-agent > > - SUBDIR += openssl-devel > > SUBDIR += openssl-quictls > > SUBDIR += openssl-unsafe > > SUBDIR += openssl_tpm_engine > > diff --git a/security/openssl-devel/Makefile > b/security/openssl30/Makefile > > similarity index 100% > > rename from security/openssl-devel/Makefile > > rename to security/openssl30/Makefile > > diff --git a/security/openssl-devel/distinfo > b/security/openssl30/distinfo > > similarity index 100% > > rename from security/openssl-devel/distinfo > > rename to security/openssl30/distinfo > > diff --git a/security/openssl-devel/files/extra-patch-ktls > b/security/openssl30/files/extra-patch-ktls > > similarity index 100% > > rename from security/openssl-devel/files/extra-patch-ktls > > rename to security/openssl30/files/extra-patch-ktls > > diff --git a/security/openssl-devel/files/extra-patch-util_find-doc-nits > b/security/openssl30/files/extra-patch-util_find-doc-nits > > similarity index 100% > > rename from security/openssl-devel/files/extra-patch-util_find-doc-nits > > rename to security/openssl30/files/extra-patch-util_find-doc-nits > > diff --git > a/security/openssl-devel/files/patch-Configurations_10-main.conf > b/security/openssl30/files/patch-Configurations_10-main.conf > > similarity index 100% > > rename from > security/openssl-devel/files/patch-Configurations_10-main.conf > > rename to security/openssl30/files/patch-Configurations_10-main.conf > > diff --git a/security/openssl-devel/files/patch-Configure > b/security/openssl30/files/patch-Configure > > similarity index 100% > > rename from security/openssl-devel/files/patch-Configure > > rename to security/openssl30/files/patch-Configure > > diff --git a/security/openssl-devel/files/patch-crypto_ppccap.c > b/security/openssl30/files/patch-crypto_ppccap.c > > similarity index 100% > > rename from security/openssl-devel/files/patch-crypto_ppccap.c > > rename to security/openssl30/files/patch-crypto_ppccap.c > > diff --git > a/security/openssl-devel/files/patch-crypto_threads__pthread.c > b/security/openssl30/files/patch-crypto_threads__pthread.c > > similarity index 100% > > rename from security/openssl-devel/files/patch-crypto_threads__pthread.c > > rename to security/openssl30/files/patch-crypto_threads__pthread.c > > diff --git a/security/openssl-devel/files/patch-util_perl_OpenSSL_ > config.pm b/security/openssl30/files/patch-util_perl_OpenSSL_config.pm > > similarity index 100% > > rename from security/openssl-devel/files/patch-util_perl_OpenSSL_ > config.pm > > rename to security/openssl30/files/patch-util_perl_OpenSSL_config.pm > > diff --git a/security/openssl-devel/pkg-descr > b/security/openssl30/pkg-descr > > similarity index 100% > > rename from security/openssl-devel/pkg-descr > > rename to security/openssl30/pkg-descr > > diff --git a/security/openssl-devel/pkg-plist > b/security/openssl30/pkg-plist > > similarity index 100% > > rename from security/openssl-devel/pkg-plist > > rename to security/openssl30/pkg-plist > > diff --git a/security/openssl-devel/version.mk b/security/openssl30/ > version.mk > > similarity index 100% > > rename from security/openssl-devel/version.mk > > rename to security/openssl30/version.mk > Hi Bernard, I'm getting build failures for cmake-core with openssl30 and openssl31, which prevents me from dogfooding much of the tree against 30/31. Are you familiar with these errors? Do you have an idea for what I could do about it? This is with default openssl options. [ 38%] Linking C static library libcmcurl.a [ 38%] Built target cmcurl [ 38%] Building C object Utilities/cmcurl/CMakeFiles/curltest.dir/curltest.c.o [ 39%] Linking C executable curltest ld: error: undefined symbol: EVP_PKEY_id >>> referenced by openssl.c >>> openssl.c.o:(Curl_ossl_certchain) in archive lib/libcmcurl.a >>> referenced by openssl.c >>> openssl.c.o:(cert_stuff) in archive lib/libcmcurl.a ld: error: undefined symbol: SSL_get_peer_certificate >>> referenced by openssl.c >>> openssl.c.o:(ossl_connect_common) in archive lib/libcmcurl.a >>> referenced by openssl.c >>> openssl.c.o:(ossl_connect_common) in archive lib/libcmcurl.a cc: error: linker command failed with exit code 1 (use -v to see invocation) --- Utilities/cmcurl/curltest --- *** [Utilities/cmcurl/curltest] Error code 1 make[3]: stopped in /wrkdirs/usr/ports/devel/cmake-core/work/cmake-3.25.1 # Adam -- Adam Weinberger adamw@adamw.org https://www.adamw.org [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><div class="gmail_default" style="font-family:arial,sans-serif">On Tue, Mar 14, 2023 at 5:42 PM Colin Percival <<a href="mailto:cperciva@tarsnap.com">cperciva@tarsnap.com</a>> wrote:</div></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Need to update reverse dependencies, e.g.<br> <br> make_index: /usr/ports/net-im/signal-desktop: no entry for <br> /usr/ports/security/openssl-devel<br> <br> Colin Percival<br> <br> On 3/14/23 11:25, Bernard Spil wrote:<br> > The branch main has been updated by brnrd:<br> > <br> > URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=98749c4fe066dc63be565d071f5167557da57404" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=98749c4fe066dc63be565d071f5167557da57404</a><br>; > <br> > commit 98749c4fe066dc63be565d071f5167557da57404<br> > Author: Bernard Spil <brnrd@FreeBSD.org><br> > AuthorDate: 2023-03-14 18:19:53 +0000<br> > Commit: Bernard Spil <brnrd@FreeBSD.org><br> > CommitDate: 2023-03-14 18:19:53 +0000<br> > <br> > security/openssl-devel: Rename to security/openssl30<br> > <br> > * Align with the upstream "release" status<br> > * Avoid confusion with OpenSSL 3.1<br> > <br> > Reported by: ngie<br> > Differential Revision: <a href="https://reviews.freebsd.org/D38938" rel="noreferrer" target="_blank">https://reviews.freebsd.org/D38938</a><br>; > ---<br> > MOVED | 1 +<br> > UPDATING | 7 +++++++<br> > security/Makefile | 2 +-<br> > security/{openssl-devel => openssl30}/Makefile | 0<br> > security/{openssl-devel => openssl30}/distinfo | 0<br> > security/{openssl-devel => openssl30}/files/extra-patch-ktls | 0<br> > .../files/extra-patch-util_find-doc-nits | 0<br> > .../files/patch-Configurations_10-main.conf | 0<br> > security/{openssl-devel => openssl30}/files/patch-Configure | 0<br> > security/{openssl-devel => openssl30}/files/patch-crypto_ppccap.c | 0<br> > .../files/patch-crypto_threads__pthread.c | 0<br> > .../files/patch-util_perl_OpenSSL_config.pm | 0<br> > security/{openssl-devel => openssl30}/pkg-descr | 0<br> > security/{openssl-devel => openssl30}/pkg-plist | 0<br> > security/{openssl-devel => openssl30}/<a href="http://version.mk" rel="noreferrer" target="_blank">version.mk</a> | 0<br> > 15 files changed, 9 insertions(+), 1 deletion(-)<br> > <br> > diff --git a/MOVED b/MOVED<br> > index 3e2353017644..0a36dd1737a0 100644<br> > --- a/MOVED<br> > +++ b/MOVED<br> > @@ -17788,3 +17788,4 @@ databases/postgresql10-server||2023-03-07|Has expired: PostgreSQL 10 has reached<br> > audio/ximp3||2023-03-09|Has expired: Abandonware and obsolete, uses old decoder library and no ID3v2 support<br> > devel/libpthread-stubs||2023-03-12|No consumers left and never supported pthread stubs in libc on FreeBSD<br> > multimedia/mkvtoolnix-nox11|multimedia/mkvtoolnix@nogui|2023-03-13|Converted to flavor<br> > +security/openssl-devel|security/openssl30|2023-03-14|3.0 is not devel, prevent confusion with 3.1<br> > diff --git a/UPDATING b/UPDATING<br> > index 2def2788a33b..9da7fb0406b6 100644<br> > --- a/UPDATING<br> > +++ b/UPDATING<br> > @@ -5,6 +5,13 @@ they are unavoidable.<br> > You should get into the habit of checking this file for changes each time<br> > you update your ports collection, before attempting any port upgrades.<br> > <br> > +20230314:<br> > + AFFECTS: users of security/openssl-devel<br> > + AUTHOR: brnrd@FreeBSD.org<br> > +<br> > + Users using DEFAULT_VERSIONS=ssl=openssl-devel must update their<br> > + configuration to DEFAULT_VERSIUONS=ssl=openssl30 or openssl31.<br> > +<br> > 20230313:<br> > AFFECTS: users of databases/sqlite3<br> > AUTHOR: fuz@FreeBSD.org<br> > diff --git a/security/Makefile b/security/Makefile<br> > index 715197e17fc3..5cd3c04e9c30 100644<br> > --- a/security/Makefile<br> > +++ b/security/Makefile<br> > @@ -410,8 +410,8 @@<br> > SUBDIR += openssh-askpass<br> > SUBDIR += openssh-portable<br> > SUBDIR += openssl<br> > + SUBDIR += openssl30<br> > SUBDIR += openssl-agent<br> > - SUBDIR += openssl-devel<br> > SUBDIR += openssl-quictls<br> > SUBDIR += openssl-unsafe<br> > SUBDIR += openssl_tpm_engine<br> > diff --git a/security/openssl-devel/Makefile b/security/openssl30/Makefile<br> > similarity index 100%<br> > rename from security/openssl-devel/Makefile<br> > rename to security/openssl30/Makefile<br> > diff --git a/security/openssl-devel/distinfo b/security/openssl30/distinfo<br> > similarity index 100%<br> > rename from security/openssl-devel/distinfo<br> > rename to security/openssl30/distinfo<br> > diff --git a/security/openssl-devel/files/extra-patch-ktls b/security/openssl30/files/extra-patch-ktls<br> > similarity index 100%<br> > rename from security/openssl-devel/files/extra-patch-ktls<br> > rename to security/openssl30/files/extra-patch-ktls<br> > diff --git a/security/openssl-devel/files/extra-patch-util_find-doc-nits b/security/openssl30/files/extra-patch-util_find-doc-nits<br> > similarity index 100%<br> > rename from security/openssl-devel/files/extra-patch-util_find-doc-nits<br> > rename to security/openssl30/files/extra-patch-util_find-doc-nits<br> > diff --git a/security/openssl-devel/files/patch-Configurations_10-main.conf b/security/openssl30/files/patch-Configurations_10-main.conf<br> > similarity index 100%<br> > rename from security/openssl-devel/files/patch-Configurations_10-main.conf<br> > rename to security/openssl30/files/patch-Configurations_10-main.conf<br> > diff --git a/security/openssl-devel/files/patch-Configure b/security/openssl30/files/patch-Configure<br> > similarity index 100%<br> > rename from security/openssl-devel/files/patch-Configure<br> > rename to security/openssl30/files/patch-Configure<br> > diff --git a/security/openssl-devel/files/patch-crypto_ppccap.c b/security/openssl30/files/patch-crypto_ppccap.c<br> > similarity index 100%<br> > rename from security/openssl-devel/files/patch-crypto_ppccap.c<br> > rename to security/openssl30/files/patch-crypto_ppccap.c<br> > diff --git a/security/openssl-devel/files/patch-crypto_threads__pthread.c b/security/openssl30/files/patch-crypto_threads__pthread.c<br> > similarity index 100%<br> > rename from security/openssl-devel/files/patch-crypto_threads__pthread.c<br> > rename to security/openssl30/files/patch-crypto_threads__pthread.c<br> > diff --git a/security/openssl-devel/files/patch-util_perl_OpenSSL_<a href="http://config.pm" target="_blank">config.pm</a> b/security/openssl30/files/patch-util_perl_OpenSSL_<a href="http://config.pm" target="_blank">config.pm</a><br> > similarity index 100%<br> > rename from security/openssl-devel/files/patch-util_perl_OpenSSL_<a href="http://config.pm" target="_blank">config.pm</a><br> > rename to security/openssl30/files/patch-util_perl_OpenSSL_<a href="http://config.pm" target="_blank">config.pm</a><br> > diff --git a/security/openssl-devel/pkg-descr b/security/openssl30/pkg-descr<br> > similarity index 100%<br> > rename from security/openssl-devel/pkg-descr<br> > rename to security/openssl30/pkg-descr<br> > diff --git a/security/openssl-devel/pkg-plist b/security/openssl30/pkg-plist<br> > similarity index 100%<br> > rename from security/openssl-devel/pkg-plist<br> > rename to security/openssl30/pkg-plist<br> > diff --git a/security/openssl-devel/<a href="http://version.mk" rel="noreferrer" target="_blank">version.mk</a> b/security/openssl30/<a href="http://version.mk" rel="noreferrer" target="_blank">version.mk</a><br> > similarity index 100%<br> > rename from security/openssl-devel/<a href="http://version.mk" rel="noreferrer" target="_blank">version.mk</a><br> > rename to security/openssl30/<a href="http://version.mk" rel="noreferrer" target="_blank">version.mk</a><br></blockquote><div><br></div><div style="font-family:arial,sans-serif" class="gmail_default">Hi Bernard,<br></div><div style="font-family:arial,sans-serif" class="gmail_default"><br></div><div style="font-family:arial,sans-serif" class="gmail_default">I'm getting build failures for cmake-core with openssl30 and openssl31, which prevents me from dogfooding much of the tree against 30/31. Are you familiar with these errors? Do you have an idea for what I could do about it? This is with default openssl options.</div><div style="font-family:arial,sans-serif" class="gmail_default"><br></div><div style="font-family:arial,sans-serif" class="gmail_default"> [ 38%] Linking C static library libcmcurl.a<br> [ 38%] Built target cmcurl<br> [ 38%] Building C object Utilities/cmcurl/CMakeFiles/curltest.dir/curltest.c.o<br> [ 39%] Linking C executable curltest</div></div> ld: error: undefined symbol: EVP_PKEY_id<br> >>> referenced by openssl.c<br> >>> openssl.c.o:(Curl_ossl_certchain) in archive lib/libcmcurl.a<br> >>> referenced by openssl.c<br> >>> openssl.c.o:(cert_stuff) in archive lib/libcmcurl.a<br> ld: error: undefined symbol: SSL_get_peer_certificate<br> >>> referenced by openssl.c<br> >>> openssl.c.o:(ossl_connect_common) in archive lib/libcmcurl.a<br> >>> referenced by openssl.c<br><div> >>> openssl.c.o:(ossl_connect_common) in archive lib/libcmcurl.a</div><div> cc: error: linker command failed with exit code 1 (use -v to see invocation)<br> --- Utilities/cmcurl/curltest ---<br> *** [Utilities/cmcurl/curltest] Error code 1<br><br> make[3]: stopped in /wrkdirs/usr/ports/devel/cmake-core/work/cmake-3.25.1</div><div><br></div><div><div style="font-family:arial,sans-serif" class="gmail_default"># Adam</div><br></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>Adam Weinberger</div><div><a href="mailto:adamw@adamw.org" target="_blank">adamw@adamw.org</a></div><div><a href="https://www.adamw.org" target="_blank">https://www.adamw.org</a></div></div></div></div></div></div>;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAP7rwcg4L1FZ4iTdKps8LxM5JQ6e_==89Vhtk63jDcfcBJ%2BQaw>