commit:     fb49d510b860364896096c1ae2ac7b4bfe236b60
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  6 11:55:55 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep  6 11:55:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb49d510

dev-libs/cyrus-sasl: drop 2.1.28-r2, 2.1.28-r3

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 dev-libs/cyrus-sasl/Manifest                       |   1 -
 dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild    | 221 ---------------------
 dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild    | 218 --------------------
 ...yrus-sasl-2.1.28-fix-configure-time-check.patch |  50 -----
 4 files changed, 490 deletions(-)

diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index bfa6547d559e..e6f246ba2943 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,3 +1,2 @@
-DIST cyrus-sasl-2.1.27-r6-patches.tar.bz2 5169 BLAKE2B 
43a2f0db4a8589ec1cde7807b31a93459eacb04d27ba36751a69dd5f4e669d1b28342194b0e1a5382e281a52a35e88168877b54065cfba01b9bd33e87fbd23f1
 SHA512 
41c4ca7c8f7b79e03faf5d826a6ff0ed398137239b93fb0046ccbf385f6ddeab2b9fb2f51d7a263dc74626e5fdbefb28615a1ee22aabe57ed57f10a52d382797
 DIST cyrus-sasl-2.1.28-r3-patches.tar.xz 4244 BLAKE2B 
113da9bb58cce3643269fca88ea8d700aa20226d9536427c9068ef7b43499c2b78cbcb233d8db2418d84136c7edd629cc05f52b31cdfddfcb529f9a9fcb4effb
 SHA512 
0cccbb27646dc118fbeea64b0cb688f312df97b31fced8c18d5230764cd5e2f0d48806bd2f5524aeddd02e8933cd835fb6f67dd3fbc1b0abfd1a3e1f0f53cf8a
 DIST cyrus-sasl-2.1.28.tar.gz 4034803 BLAKE2B 
6cca8c26cebb9c2ee5d539c43797d30b6309a476ec4233225789978e1d7315c4ea5d2abbc7f5464be0f3c0de5fd9212706b43fbc92f40b76cd0b1013cc00f823
 SHA512 
db15af9079758a9f385457a79390c8a7cd7ea666573dace8bf4fb01bb4b49037538d67285727d6a70ad799d2e2318f265c9372e2427de9371d626a1959dd6f78

diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild 
b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild
deleted file mode 100644
index 38733ce427bc..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r2.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools edos2unix flag-o-matic multilib multilib-minimal pam 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"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv 
~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres 
sample selinux sqlite srp ssl static-libs urandom"
-REQUIRED_USE="ldapdb? ( openldap )"
-
-DEPEND="net-mail/mailbase
-       virtual/libcrypt:=
-       authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-       berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-       gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-       kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-       openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
-       mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
-       pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
-       postgres? ( dev-db/postgresql:* )
-       sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-       ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-       selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-       "${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.25-auxprop.patch
-       "${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
-       
"${WORKDIR}"/${MY_PATCH_VER}/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
-       "${FILESDIR}"/cyrus-sasl-2.1.28-fix-configure-time-check.patch
-)
-
-src_prepare() {
-       default
-
-       # Use plugindir for sasldir
-       # https://github.com/cyrusimap/cyrus-sasl/issues/339 (I think)
-       sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-               "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-       # bug #486740 and bug #468556 (dropped AM_CONFIG_HEADER sed in 2.1.28)
-       sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' configure.ac 
|| die
-
-       eautoreconf
-}
-
-src_configure() {
-       export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-       append-flags -fno-strict-aliasing
-
-       if [[ ${CHOST} == *-solaris* ]] ; then
-               # getpassphrase is defined in /usr/include/stdlib.h
-               append-cppflags -DHAVE_GETPASSPHRASE
-       else
-               # this horrendously breaks things on Solaris
-               append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED 
-D_BSD_SOURCE -DLDAP_DEPRECATED
-               # replaces BSD_SOURCE (bug #579218)
-               append-cppflags -D_DEFAULT_SOURCE
-       fi
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myeconfargs=(
-               --enable-login
-               --enable-ntlm
-               --enable-auth-sasldb
-               --disable-cmulocal
-               --disable-krb4
-               --disable-macos-framework
-               --enable-otp
-               --without-sqlite
-               --with-saslauthd="${EPREFIX}"/run/saslauthd
-               --with-pwcheck="${EPREFIX}"/run/saslauthd
-               --with-configdir="${EPREFIX}"/etc/sasl2
-               --with-plugindir="${EPREFIX}/usr/$(get_libdir)/sasl2"
-               --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-               --with-sphinx-build=no
-               $(use_with ssl openssl)
-               $(use_with pam)
-               $(use_with openldap ldap)
-               $(use_enable ldapdb)
-               $(multilib_native_use_enable sample)
-               $(use_enable kerberos gssapi)
-               $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-               $(multilib_native_use_with postgres pgsql 
"${EPREFIX}/usr/$(get_libdir)/postgresql")
-               $(use_with sqlite sqlite3 "${EPREFIX}/usr/$(get_libdir)")
-               $(use_enable srp)
-               $(use_enable static-libs static)
-
-               # Add authdaemond support (bug #56523).
-               $(usex authdaemond 
--with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-               # Fix for bug #59634.
-               $(usex ssl '' --without-des)
-
-               # Use /dev/urandom instead of /dev/random (bug #46038).
-               $(usex urandom --with-devrandom=/dev/urandom '')
-       )
-
-       if use sqlite || { multilib_is_native_abi && { use mysql || use 
postgres; }; } ; then
-               myeconfargs+=( --enable-sql )
-       else
-               myeconfargs+=( --disable-sql )
-       fi
-
-       # Default to GDBM if both 'gdbm' and 'berkdb' are present.
-       if use gdbm ; then
-               einfo "Building with GNU DB as database backend for your SASLdb"
-               myeconfargs+=( --with-dblib=gdbm )
-       elif use berkdb ; then
-               einfo "Building with BerkeleyDB as database backend for your 
SASLdb"
-               myeconfargs+=(
-                       --with-dblib=berkeley
-                       --with-bdb-incdir="$(db_includedir)"
-               )
-       else
-               einfo "Building without SASLdb support"
-               myeconfargs+=( --with-dblib=none )
-       fi
-
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-       default
-
-       if multilib_is_native_abi; then
-               if use sample ; then
-                       docinto sample
-                       dodoc "${S}"/sample/*.c
-                       exeinto /usr/share/doc/${P}/sample
-                       doexe sample/client sample/server
-               fi
-
-               dosbin saslauthd/testsaslauthd
-       fi
-}
-
-multilib_src_install_all() {
-       doman man/*
-
-       keepdir /etc/sasl2
-
-       # Reset docinto to default value (bug #674296)
-       docinto
-       dodoc AUTHORS ChangeLog doc/legacy/TODO
-       newdoc pwcheck/README README.pwcheck
-
-       newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
-       edos2unix "${ED}"/usr/share/doc/${PF}/release-notes
-
-       docinto html
-       dodoc doc/html/*.html
-
-       if use pam; then
-               newpamd "${FILESDIR}"/saslauthd.pam-include saslauthd
-       fi
-
-       newinitd "${FILESDIR}"/pwcheck.rc6 pwcheck
-       systemd_dounit "${FILESDIR}"/pwcheck.service
-
-       newinitd "${FILESDIR}"/saslauthd2.rc7 saslauthd
-       newconfd "${FILESDIR}"/saslauthd-${SASLAUTHD_CONF_VER}.conf saslauthd
-       systemd_dounit "${FILESDIR}"/saslauthd.service
-       dotmpfiles "${FILESDIR}"/${PN}.conf
-
-       # The get_modname bit is important: do not remove the .la files on
-       # platforms where the lib isn't called .so for cyrus searches the .la to
-       # figure out what the name is supposed to be instead
-       if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-               find "${ED}" -name "*.la" -delete || die
-       fi
-}
-
-pkg_postinst() {
-       tmpfiles_process ${PN}.conf
-
-       # Generate an empty sasldb2 with correct permissions.
-       if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" 
]] ; then
-               einfo "Generating an empty sasldb2 with correct permissions ..."
-
-               echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f 
"${EROOT}/etc/sasl2/sasldb2" -p login \
-                       || die "Failed to generate sasldb2"
-
-               "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" 
-d login \
-                       || die "Failed to delete temp user"
-
-               chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-               chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-       fi
-
-       if use authdaemond ; then
-               elog "You need to add a user running a service using Courier's"
-               elog "authdaemon to the 'mail' group. For example, do:"
-               elog "  gpasswd -a postfix mail"
-               elog "to add the 'postfix' user to the 'mail' group."
-       fi
-
-       elog "pwcheck and saslauthd home directories have moved to:"
-       elog "  /run/saslauthd, using tmpfiles.d"
-}

diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild 
b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild
deleted file mode 100644
index 2c1eac083d19..000000000000
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.28-r3.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools edos2unix flag-o-matic multilib multilib-minimal pam db-use 
systemd toolchain-funcs tmpfiles
-
-SASLAUTHD_CONF_VER="2.1.26"
-MY_PATCH_VER="${PN}-2.1.28-r3-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.xz";
-
-LICENSE="BSD-with-attribution"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
-IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres 
sample selinux sqlite srp ssl static-libs urandom"
-REQUIRED_USE="ldapdb? ( openldap )"
-
-DEPEND="net-mail/mailbase
-       virtual/libcrypt:=
-       authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
-       berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
-       gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-       kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-       openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
-       mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
-       pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
-       postgres? ( dev-db/postgresql:* )
-       sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
-       ssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-       selinux? ( sec-policy/selinux-sasl )"
-
-MULTILIB_WRAPPED_HEADERS=(
-       /usr/include/sasl/md5global.h
-)
-
-PATCHES=(
-       "${WORKDIR}"/${MY_PATCH_VER}/
-)
-
-src_prepare() {
-       default
-
-       # Use plugindir for sasldir
-       # https://github.com/cyrusimap/cyrus-sasl/issues/339 (I think)
-       sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
-               "${S}"/plugins/Makefile.{am,in} || die "sed failed"
-
-       # bug #486740 and bug #468556 (dropped AM_CONFIG_HEADER sed in 2.1.28)
-       sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' configure.ac 
|| die
-
-       eautoreconf
-}
-
-src_configure() {
-       export CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-       append-flags -fno-strict-aliasing
-
-       if [[ ${CHOST} == *-solaris* ]] ; then
-               # getpassphrase is defined in /usr/include/stdlib.h
-               append-cppflags -DHAVE_GETPASSPHRASE
-       else
-               # this horrendously breaks things on Solaris
-               append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED 
-D_BSD_SOURCE -DLDAP_DEPRECATED
-               # replaces BSD_SOURCE (bug #579218)
-               append-cppflags -D_DEFAULT_SOURCE
-       fi
-
-       multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-       local myeconfargs=(
-               --enable-login
-               --enable-ntlm
-               --enable-auth-sasldb
-               --disable-cmulocal
-               --disable-krb4
-               --disable-macos-framework
-               --enable-otp
-               --without-sqlite
-               --with-saslauthd="${EPREFIX}"/run/saslauthd
-               --with-pwcheck="${EPREFIX}"/run/saslauthd
-               --with-configdir="${EPREFIX}"/etc/sasl2
-               --with-plugindir="${EPREFIX}/usr/$(get_libdir)/sasl2"
-               --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
-               --with-sphinx-build=no
-               $(use_with ssl openssl)
-               $(use_with pam)
-               $(use_with openldap ldap)
-               $(use_enable ldapdb)
-               $(multilib_native_use_enable sample)
-               $(use_enable kerberos gssapi)
-               $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
-               $(multilib_native_use_with postgres pgsql 
"${EPREFIX}/usr/$(get_libdir)/postgresql")
-               $(use_with sqlite sqlite3 "${EPREFIX}/usr/$(get_libdir)")
-               $(use_enable srp)
-               $(use_enable static-libs static)
-
-               # Add authdaemond support (bug #56523).
-               $(usex authdaemond 
--with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
-
-               # Fix for bug #59634.
-               $(usex ssl '' --without-des)
-
-               # Use /dev/urandom instead of /dev/random (bug #46038).
-               $(usex urandom --with-devrandom=/dev/urandom '')
-       )
-
-       if use sqlite || { multilib_is_native_abi && { use mysql || use 
postgres; }; } ; then
-               myeconfargs+=( --enable-sql )
-       else
-               myeconfargs+=( --disable-sql )
-       fi
-
-       # Default to GDBM if both 'gdbm' and 'berkdb' are present.
-       if use gdbm ; then
-               einfo "Building with GNU DB as database backend for your SASLdb"
-               myeconfargs+=( --with-dblib=gdbm )
-       elif use berkdb ; then
-               einfo "Building with BerkeleyDB as database backend for your 
SASLdb"
-               myeconfargs+=(
-                       --with-dblib=berkeley
-                       --with-bdb-incdir="$(db_includedir)"
-               )
-       else
-               einfo "Building without SASLdb support"
-               myeconfargs+=( --with-dblib=none )
-       fi
-
-       ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-       default
-
-       if multilib_is_native_abi; then
-               if use sample ; then
-                       docinto sample
-                       dodoc "${S}"/sample/*.c
-                       exeinto /usr/share/doc/${P}/sample
-                       doexe sample/client sample/server
-               fi
-
-               dosbin saslauthd/testsaslauthd
-       fi
-}
-
-multilib_src_install_all() {
-       doman man/*
-
-       keepdir /etc/sasl2
-
-       # Reset docinto to default value (bug #674296)
-       docinto
-       dodoc AUTHORS ChangeLog doc/legacy/TODO
-       newdoc pwcheck/README README.pwcheck
-
-       newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
-       edos2unix "${ED}"/usr/share/doc/${PF}/release-notes
-
-       docinto html
-       dodoc doc/html/*.html
-
-       if use pam; then
-               newpamd "${FILESDIR}"/saslauthd.pam-include saslauthd
-       fi
-
-       newinitd "${FILESDIR}"/pwcheck.rc6 pwcheck
-       systemd_dounit "${FILESDIR}"/pwcheck.service
-
-       newinitd "${FILESDIR}"/saslauthd2.rc7 saslauthd
-       newconfd "${FILESDIR}"/saslauthd-${SASLAUTHD_CONF_VER}.conf saslauthd
-       systemd_dounit "${FILESDIR}"/saslauthd.service
-       dotmpfiles "${FILESDIR}"/${PN}.conf
-
-       # The get_modname bit is important: do not remove the .la files on
-       # platforms where the lib isn't called .so for cyrus searches the .la to
-       # figure out what the name is supposed to be instead
-       if ! use static-libs && [[ $(get_modname) == .so ]] ; then
-               find "${ED}" -name "*.la" -delete || die
-       fi
-}
-
-pkg_postinst() {
-       tmpfiles_process ${PN}.conf
-
-       # Generate an empty sasldb2 with correct permissions.
-       if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" 
]] ; then
-               einfo "Generating an empty sasldb2 with correct permissions ..."
-
-               echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f 
"${EROOT}/etc/sasl2/sasldb2" -p login \
-                       || die "Failed to generate sasldb2"
-
-               "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" 
-d login \
-                       || die "Failed to delete temp user"
-
-               chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
-               chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
-                       || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
-       fi
-
-       if use authdaemond ; then
-               elog "You need to add a user running a service using Courier's"
-               elog "authdaemon to the 'mail' group. For example, do:"
-               elog "  gpasswd -a postfix mail"
-               elog "to add the 'postfix' user to the 'mail' group."
-       fi
-
-       elog "pwcheck and saslauthd home directories have moved to:"
-       elog "  /run/saslauthd, using tmpfiles.d"
-}

diff --git 
a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch 
b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch
deleted file mode 100644
index 873dac53fe03..000000000000
--- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.28-fix-configure-time-check.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/cyrusimap/cyrus-sasl/pull/709
-
-From 399625c3413c313e93432d0f5907350722b861c7 Mon Sep 17 00:00:00 2001
-From: Sam James <s...@gentoo.org>
-Date: Wed, 23 Feb 2022 00:45:15 +0000
-Subject: [PATCH] Fix <time.h> check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We're conditionally including based on HAVE_TIME_H in a bunch of places,
-but we're not actually checking for time.h, so that's never going to be 
defined.
-
-While at it, add in a missing include in the cram plugin.
-
-This fixes a bunch of implicit declaration warnings:
-```
- * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of 
function ‘time’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of 
function ‘clock’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of 
function ‘time’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/lib/saslutil.c:280:3: warning: implicit declaration of 
function ‘time’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/lib/saslutil.c:364:41: warning: implicit declaration of 
function ‘clock’ [-Wimplicit-function-declaration]
- * cyrus-sasl-2.1.28/plugins/cram.c:132:7: warning: implicit declaration of 
function ‘time’ [-Wimplicit-function-declaration]
-```
-
-Signed-off-by: Sam James <s...@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -1290,7 +1290,7 @@ AC_CHECK_HEADERS_ONCE([sys/time.h])
- 
- AC_HEADER_DIRENT
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h 
strings.h sys/file.h sys/time.h syslog.h unistd.h inttypes.h sys/uio.h 
sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
-+AC_CHECK_HEADERS(crypt.h des.h dlfcn.h fcntl.h limits.h malloc.h paths.h 
strings.h sys/file.h sys/time.h syslog.h time.h unistd.h inttypes.h sys/uio.h 
sys/param.h sysexits.h stdarg.h varargs.h krb5.h)
- 
- IPv6_CHECK_SS_FAMILY()
- IPv6_CHECK_SA_LEN()
---- a/plugins/cram.c
-+++ b/plugins/cram.c
-@@ -53,6 +53,10 @@
- #endif
- #include <fcntl.h>
- 
-+#ifdef HAVE_TIME_H
-+#include <time.h>
-+#endif
-+
- #include <sasl.h>
- #include <saslplug.h>
- #include <saslutil.h>

Reply via email to