Re: git: 98749c4fe066 - main - security/openssl-devel: Rename to security/openssl30
Date: Fri, 17 Mar 2023 17:33:48 UTC
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