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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0A30C158086 for ; Mon, 22 Nov 2021 09:57:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4EA6EE0848; Mon, 22 Nov 2021 09:57:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22BD0E0848 for ; Mon, 22 Nov 2021 09:57:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CC8334303D for ; Mon, 22 Nov 2021 09:57:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4CAD88E for ; Mon, 22 Nov 2021 09:57:38 +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: <1637575048.5ce7b15739d29a94773324e1295020c059f978ab.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cyrus-sasl/, dev-libs/cyrus-sasl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/cyrus-sasl/Manifest dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch X-VCS-Directories: dev-libs/cyrus-sasl/ dev-libs/cyrus-sasl/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5ce7b15739d29a94773324e1295020c059f978ab X-VCS-Branch: master Date: Mon, 22 Nov 2021 09:57:38 +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: 63c1c481-17f3-4e12-bb68-172577349aa3 X-Archives-Hash: ffe6b74735f7b5e6e44c03b4c76d6b2d commit: 5ce7b15739d29a94773324e1295020c059f978ab Author: Sam James gentoo org> AuthorDate: Mon Nov 22 09:57:02 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Nov 22 09:57:28 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ce7b157 dev-libs/cyrus-sasl: switch to patchset for -r6 files/ was getting too large for the repository. Signed-off-by: Sam James gentoo.org> dev-libs/cyrus-sasl/Manifest | 1 + dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild | 16 ++------ .../files/cyrus-sasl-2.1.27-autoconf-2.71.patch | 45 ---------------------- 3 files changed, 4 insertions(+), 58 deletions(-) diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest index 843afea7db80..da2a2265fd42 100644 --- a/dev-libs/cyrus-sasl/Manifest +++ b/dev-libs/cyrus-sasl/Manifest @@ -1 +1,2 @@ +DIST cyrus-sasl-2.1.27-r6-patches.tar.bz2 5169 BLAKE2B 43a2f0db4a8589ec1cde7807b31a93459eacb04d27ba36751a69dd5f4e669d1b28342194b0e1a5382e281a52a35e88168877b54065cfba01b9bd33e87fbd23f1 SHA512 41c4ca7c8f7b79e03faf5d826a6ff0ed398137239b93fb0046ccbf385f6ddeab2b9fb2f51d7a263dc74626e5fdbefb28615a1ee22aabe57ed57f10a52d382797 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild index 3f20ae795401..99c0c56d8889 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r6.ebuild @@ -6,11 +6,12 @@ EAPI=7 inherit edos2unix flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles SASLAUTHD_CONF_VER="2.1.26" - +MY_PATCH_VER="${PN}-2.1.27-r6-patches" DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" HOMEPAGE="https://www.cyrusimap.org/sasl/" #SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_PATCH_VER}.tar.bz2" LICENSE="BSD-with-attribution" SLOT="2" @@ -47,18 +48,7 @@ MULTILIB_WRAPPED_HEADERS=( ) PATCHES=( - "${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch" - "${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch" - "${FILESDIR}/${PN}-2.1.27-as_needed.patch" - "${FILESDIR}/${PN}-2.1.25-auxprop.patch" - "${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch" - "${FILESDIR}/${PN}-2.1.26-missing-size_t.patch" - "${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch" - "${FILESDIR}/${PN}-2.1.27-memmem.patch" - "${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch" - "${FILESDIR}/${PN}-2.1.27-slibtool.patch" - "${FILESDIR}/${PN}-2.1.27-db_gdbm-fix-gdbm_errno-overlay-from-gdbm_close.patch" - "${FILESDIR}/${PN}-2.1.27-autoconf-2.71.patch" + "${WORKDIR}"/${MY_PATCH_VER}/ ) pkg_setup() { diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch deleted file mode 100644 index b346cd7e5002..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autoconf-2.71.patch +++ /dev/null @@ -1,45 +0,0 @@ -https://bugs.gentoo.org/825342 - -commit 5664c3f535289ce9efb513a2897991b5c436bb44 -Author: Pavel Raiskup -Date: Thu Apr 1 17:26:28 2021 +0200 - - configure.ac: properly quote macro arguments - - Autoconf 2.70+ is more picky about the quotation (even though with - previous versions the arguments should have been quoted, too). When we - don't quote macros inside the AC_CACHE_VAL macro - some of the Autoconf - initialization is wrongly ordered in ./configure script and we keep - seeing bugs like: - - ./configure: line 2165: ac_fn_c_try_run: command not found - - Original report: https://bugzilla.redhat.com/1943013 - - Signed-off-by: Pavel Raiskup - ---- a/configure.ac -+++ b/configure.ac -@@ -213,7 +213,8 @@ if test $sasl_cv_uscore = yes; then - AC_MSG_CHECKING(whether dlsym adds the underscore for us) - cmu_save_LIBS="$LIBS" - LIBS="$LIBS $SASL_DL_LIB" -- AC_CACHE_VAL(sasl_cv_dlsym_adds_uscore,AC_TRY_RUN( [ -+ AC_CACHE_VAL([sasl_cv_dlsym_adds_uscore], -+ [AC_TRY_RUN([ - #include - #include - #include -@@ -221,9 +222,9 @@ void foo() { int i=0;} - int main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY); - if(self) { ptr1=dlsym(self,"foo"); ptr2=dlsym(self,"_foo"); - if(ptr1 && !ptr2) exit(0); } exit(1); } --], [sasl_cv_dlsym_adds_uscore=yes], sasl_cv_dlsym_adds_uscore=no -- AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, [], [Do we need a leading _ for dlsym?]), -- AC_MSG_WARN(cross-compiler, we'll do our best))) -+], [sasl_cv_dlsym_adds_uscore=yes], [sasl_cv_dlsym_adds_uscore=no -+ AC_DEFINE(DLSYM_NEEDS_UNDERSCORE, [], [Do we need a leading _ for dlsym?])], -+ [AC_MSG_WARN(cross-compiler, we'll do our best)])]) - LIBS="$cmu_save_LIBS" - AC_MSG_RESULT($sasl_cv_dlsym_adds_uscore) -