From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A228013835A for ; Mon, 3 May 2021 18:46:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05B03E08BD; Mon, 3 May 2021 18:46:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E47F7E08BD for ; Mon, 3 May 2021 18:46:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11329340B9B for ; Mon, 3 May 2021 18:46:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0371474C for ; Mon, 3 May 2021 18:46:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1620067535.4694004c280b13ecc163de94aa67bd92a83af7b4.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntp/files/, net-misc/ntp/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch net-misc/ntp/ntp-4.2.8_p15.ebuild X-VCS-Directories: net-misc/ntp/ net-misc/ntp/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4694004c280b13ecc163de94aa67bd92a83af7b4 X-VCS-Branch: master Date: Mon, 3 May 2021 18:46:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b2d3eeb1-3519-4fac-b913-491a3c443a86 X-Archives-Hash: 79478e8e5e309afa797f4ad179e66b41 commit: 4694004c280b13ecc163de94aa67bd92a83af7b4 Author: Sam James gentoo org> AuthorDate: Mon May 3 18:31:07 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 3 18:45:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4694004c net-misc/ntp: drop obsolete LibreSSL patch, restore no-SSL patch Signed-off-by: Sam James gentoo.org> net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch | 16 ---------------- net-misc/ntp/ntp-4.2.8_p15.ebuild | 1 + 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch b/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch deleted file mode 100644 index 182fcefe88b..00000000000 --- a/net-misc/ntp/files/ntp-4.2.8_p12-libressl-2.8.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- ntp-4.2.8p12.orig/include/libssl_compat.h 2018-12-08 01:14:58.434733497 +0000 -+++ ntp-4.2.8p12/include/libssl_compat.h 2018-12-08 01:42:04.479474757 +0000 -@@ -107,10 +107,13 @@ - - #define OpenSSL_version_num SSLeay - #define OpenSSL_version SSLeay_version -+ -+# if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L - #define X509_get0_notBefore X509_get_notBefore - #define X509_getm_notBefore X509_get_notBefore - #define X509_get0_notAfter X509_get_notAfter - #define X509_getm_notAfter X509_get_notAfter -+#endif /* !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x20800000L */ - - /* ----------------------------------------------------------------- */ - #endif /* OPENSSL_VERSION_NUMBER < v1.1.0 */ diff --git a/net-misc/ntp/ntp-4.2.8_p15.ebuild b/net-misc/ntp/ntp-4.2.8_p15.ebuild index 32042db3bd5..0809ce703a5 100644 --- a/net-misc/ntp/ntp-4.2.8_p15.ebuild +++ b/net-misc/ntp/ntp-4.2.8_p15.ebuild @@ -44,6 +44,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}"/${PN}-4.2.8-ipc-caps.patch #533966 "${FILESDIR}"/${PN}-4.2.8-sntp-test-pthreads.patch #563922 + "${FILESDIR}"/${PN}-4.2.8_p10-fix-build-wo-ssl-or-libressl.patch "${FILESDIR}"/${PN}-4.2.8_p14-add_cap_ipc_lock.patch #711530 "${FILESDIR}"/${PN}-4.2.8_p15-gcc10.patch #759409 )