From nobody Mon Jul 31 18:20:50 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RF64j1PPrz4pNpd; Mon, 31 Jul 2023 18:20:57 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [217.70.183.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RF64Q6m4Kz3sH2; Mon, 31 Jul 2023 18:20:54 +0000 (UTC) (envelope-from diizzy@FreeBSD.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 217.70.183.200 is neither permitted nor denied by domain of diizzy@FreeBSD.org) smtp.mailfrom=diizzy@FreeBSD.org; dmarc=none Received: by mail.gandi.net (Postfix) with ESMTPA id 294D620005; Mon, 31 Jul 2023 18:20:50 +0000 (UTC) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Date: Mon, 31 Jul 2023 20:20:50 +0200 From: Daniel Engberg To: Po-Chuan Hsieh Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: c25f0c013e88 - main - databases/libmemcached: Skip libcrypto.pc when using SSL from base system In-Reply-To: <202307091033.369AXqZ7055562@gitrepo.freebsd.org> References: <202307091033.369AXqZ7055562@gitrepo.freebsd.org> Message-ID: X-Sender: diizzy@FreeBSD.org Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-GND-Sasl: daniel.engberg@pyret.net X-Spamd-Result: default: False [-3.37 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.97)[-0.965]; RWL_MAILSPIKE_VERYGOOD(-0.20)[217.70.183.200:from]; MIME_GOOD(-0.10)[text/plain]; RCVD_IN_DNSWL_LOW(-0.10)[217.70.183.200:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_DKIM_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-all@freebsd.org,dev-commits-ports-main@freebsd.org]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:29169, ipnet:217.70.176.0/20, country:FR]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_HAS_DN(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEFALL_USER(0.00)[diizzy]; DMARC_NA(0.00)[freebsd.org]; MID_RHS_MATCH_FROM(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; ARC_NA(0.00)[] X-Rspamd-Queue-Id: 4RF64Q6m4Kz3sH2 X-Spamd-Bar: --- On 2023-07-09 12:33, Po-Chuan Hsieh wrote: > The branch main has been updated by sunpoet: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=c25f0c013e88d84c620b2bb8c56158e9ca7f8bef > > commit c25f0c013e88d84c620b2bb8c56158e9ca7f8bef > Author: Po-Chuan Hsieh > AuthorDate: 2023-07-09 10:17:04 +0000 > Commit: Po-Chuan Hsieh > CommitDate: 2023-07-09 10:17:04 +0000 > > databases/libmemcached: Skip libcrypto.pc when using SSL from base > system > > - Bump PORTREVISION for package change > --- > databases/libmemcached/Makefile | 10 +++++++++- > databases/libmemcached/files/extra-patch-openssl | 11 +++++++++++ > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/databases/libmemcached/Makefile > b/databases/libmemcached/Makefile > index e044f28499fd..71f031d3014f 100644 > --- a/databases/libmemcached/Makefile > +++ b/databases/libmemcached/Makefile > @@ -1,5 +1,6 @@ > PORTNAME= libmemcached > PORTVERSION= 1.1.4 > +PORTREVISION= 1 > CATEGORIES= databases > > MAINTAINER= sunpoet@FreeBSD.org > @@ -44,4 +45,11 @@ MURMUR_CMAKE_BOOL= ENABLE_HASH_MURMUR > SASL_CMAKE_BOOL= ENABLE_SASL > SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 > > -.include > +.include > + > +# Skip libcrypto.pc while using OpenSSL from base system on older > FreeBSD versions which does not skip this file > +.if ${SSL_DEFAULT} == base && > !exists(/usr/libdata/pkgconfig/libcrypto.pc) > +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl > +.endif > + > +.include > diff --git a/databases/libmemcached/files/extra-patch-openssl > b/databases/libmemcached/files/extra-patch-openssl > new file mode 100644 > index 000000000000..bf65fa7f4ece > --- /dev/null > +++ b/databases/libmemcached/files/extra-patch-openssl > @@ -0,0 +1,11 @@ > +--- src/libhashkit/CMakeLists.txt.orig 2023-03-06 08:47:30 UTC > ++++ src/libhashkit/CMakeLists.txt > +@@ -45,7 +45,7 @@ if(ENABLE_OPENSSL_CRYPTO) > + if(OPENSSL_CRYPTO_LIBRARY) > + target_compile_definitions(libhashkit > PRIVATE HAVE_OPENSSL_CRYPTO) > + target_link_libraries(libhashkit PUBLIC > OpenSSL::Crypto) > +- pkgconfig_export(REQUIRES_PRIVATE libcrypto) > ++ pkgconfig_export(REQUIRES_PRIVATE "") > + else() > + message(WARNING "Could not find > OpenSSL::Crypto") > + endif() Hi, Resending as I didn't get a reply last time, I few things I noticed compared to the PR I submitted about this port. -std=gnu++17 is set when unit tests are enabled so USES= compiler:c++11-lang is incorrect Is there a reason why default filenames aren't used for patches? Why are we using flex from base rather from ports? That openssl patch can be improved by doing something like this, https://cgit.freebsd.org/ports/tree/archivers/libarchive/Makefile#n124 Best regards, Daniel