Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cyrus-sasl/, dev-libs/cyrus-sasl/files/
Date: Wed, 23 Feb 2022 02:19:16
Message-Id: 1645580900.65be5f298d5fc6b98119d01e946f0708fd40cde7.sam@gentoo
1 commit: 65be5f298d5fc6b98119d01e946f0708fd40cde7
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 23 01:48:06 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 23 01:48:20 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65be5f29
7
8 dev-libs/cyrus-sasl: drop 2.1.27-r4
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild | 268 ---------------------
13 .../files/cyrus-sasl-2.1.25-auxprop.patch | 16 --
14 .../files/cyrus-sasl-2.1.26-missing-size_t.patch | 13 -
15 .../files/cyrus-sasl-2.1.27-CVE-2019-19906.patch | 20 --
16 .../files/cyrus-sasl-2.1.27-as_needed.patch | 25 --
17 .../files/cyrus-sasl-2.1.27-autotools_fixes.patch | 31 ---
18 .../cyrus-sasl-2.1.27-avoid_pic_overwrite.patch | 17 --
19 .../files/cyrus-sasl-2.1.27-doc_build_fix.patch | 11 -
20 ...us-sasl-2.1.27-gss_c_nt_hostbased_service.patch | 16 --
21 .../files/cyrus-sasl-2.1.27-memmem.patch | 53 ----
22 .../files/cyrus-sasl-2.1.27-slibtool.patch | 18 --
23 11 files changed, 488 deletions(-)
24
25 diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
26 deleted file mode 100644
27 index 670450a576e0..000000000000
28 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
29 +++ /dev/null
30 @@ -1,268 +0,0 @@
31 -# Copyright 1999-2021 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -inherit edos2unix flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd toolchain-funcs tmpfiles
37 -
38 -SASLAUTHD_CONF_VER="2.1.26"
39 -
40 -DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
41 -HOMEPAGE="https://www.cyrusimap.org/sasl/"
42 -#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
43 -SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
44 -
45 -LICENSE="BSD-with-attribution"
46 -SLOT="2"
47 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
48 -IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
49 -
50 -CDEPEND="
51 - net-mail/mailbase
52 - virtual/libcrypt:=
53 - authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
54 - berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
55 - gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
56 - kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
57 - openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
58 - mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
59 - pam? ( >=sys-libs/pam-0-r1[${MULTILIB_USEDEP}] )
60 - postgres? ( dev-db/postgresql:* )
61 - sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
62 - ssl? (
63 - >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
64 - )
65 - java? ( >=virtual/jdk-1.6:= )"
66 -
67 -REQUIRED_USE="ldapdb? ( openldap )"
68 -
69 -RDEPEND="
70 - ${CDEPEND}
71 - selinux? ( sec-policy/selinux-sasl )"
72 -
73 -DEPEND="${CDEPEND}"
74 -
75 -MULTILIB_WRAPPED_HEADERS=(
76 - /usr/include/sasl/md5global.h
77 -)
78 -
79 -PATCHES=(
80 - "${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
81 - "${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
82 - "${FILESDIR}/${PN}-2.1.27-as_needed.patch"
83 - "${FILESDIR}/${PN}-2.1.25-auxprop.patch"
84 - "${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
85 - "${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
86 - "${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
87 - "${FILESDIR}/${PN}-2.1.27-memmem.patch"
88 - "${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
89 - "${FILESDIR}/${PN}-2.1.27-slibtool.patch"
90 -)
91 -
92 -pkg_setup() {
93 - java-pkg-opt-2_pkg_setup
94 -}
95 -
96 -src_prepare() {
97 - default
98 -
99 - # Get rid of the -R switch (runpath_switch for Sun)
100 - # >=gcc-4.6 errors out with unknown option
101 - sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
102 - configure.ac || die
103 -
104 - # Use plugindir for sasldir
105 - sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
106 - "${S}"/plugins/Makefile.{am,in} || die "sed failed"
107 -
108 - # #486740 #468556
109 - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
110 - -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
111 - configure.ac || die
112 -
113 - eautoreconf
114 -
115 - export CC_FOR_BUILD="$(tc-getBUILD_CC)"
116 -}
117 -
118 -src_configure() {
119 - append-flags -fno-strict-aliasing
120 -
121 - if [[ ${CHOST} == *-solaris* ]] ; then
122 - # getpassphrase is defined in /usr/include/stdlib.h
123 - append-cppflags -DHAVE_GETPASSPHRASE
124 - else
125 - # this horrendously breaks things on Solaris
126 - append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
127 - # replaces BSD_SOURCE (bug #579218)
128 - append-cppflags -D_DEFAULT_SOURCE
129 - fi
130 -
131 - multilib-minimal_src_configure
132 -}
133 -
134 -multilib_src_configure() {
135 - # Java support
136 - multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
137 -
138 - local myeconfargs=(
139 - --enable-login
140 - --enable-ntlm
141 - --enable-auth-sasldb
142 - --disable-cmulocal
143 - --disable-krb4
144 - --disable-macos-framework
145 - --enable-otp
146 - --without-sqlite
147 - --with-saslauthd="${EPREFIX}"/run/saslauthd
148 - --with-pwcheck="${EPREFIX}"/run/saslauthd
149 - --with-configdir="${EPREFIX}"/etc/sasl2
150 - --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
151 - --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
152 - --with-sphinx-build=no
153 - $(use_with ssl openssl)
154 - $(use_with pam)
155 - $(use_with openldap ldap)
156 - $(use_enable ldapdb)
157 - $(multilib_native_use_enable sample)
158 - $(use_enable kerberos gssapi)
159 - $(multilib_native_use_enable java)
160 - $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
161 - $(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
162 - $(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
163 - $(use_enable srp)
164 - $(use_enable static-libs static)
165 -
166 - # Add authdaemond support (bug #56523).
167 - $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
168 -
169 - # Fix for bug #59634.
170 - $(usex ssl '' --without-des)
171 -
172 - # Use /dev/urandom instead of /dev/random (bug #46038).
173 - $(usex urandom --with-devrandom=/dev/urandom '')
174 - )
175 -
176 - if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
177 - myeconfargs+=( --enable-sql )
178 - else
179 - myeconfargs+=( --disable-sql )
180 - fi
181 -
182 - # Default to GDBM if both 'gdbm' and 'berkdb' are present.
183 - if use gdbm ; then
184 - einfo "Building with GNU DB as database backend for your SASLdb"
185 - myeconfargs+=( --with-dblib=gdbm )
186 - elif use berkdb ; then
187 - einfo "Building with BerkeleyDB as database backend for your SASLdb"
188 - myeconfargs+=(
189 - --with-dblib=berkeley
190 - --with-bdb-incdir="$(db_includedir)"
191 - )
192 - else
193 - einfo "Building without SASLdb support"
194 - myeconfargs+=( --with-dblib=none )
195 - fi
196 -
197 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
198 -}
199 -
200 -multilib_src_compile() {
201 - emake
202 -
203 - # Default location for java classes breaks OpenOffice (bug #60769).
204 - # Thanks to axxo@g.o for the solution.
205 - if multilib_is_native_abi && use java ; then
206 - jar -cvf ${PN}.jar -C java $(find java -name "*.class")
207 - fi
208 -}
209 -
210 -multilib_src_install() {
211 - default
212 -
213 - if multilib_is_native_abi; then
214 - if use sample ; then
215 - docinto sample
216 - dodoc "${S}"/sample/*.c
217 - exeinto /usr/share/doc/${P}/sample
218 - doexe sample/client sample/server
219 - fi
220 -
221 - # Default location for java classes breaks OpenOffice (bug #60769).
222 - if use java; then
223 - java-pkg_dojar ${PN}.jar
224 - java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
225 - # hackish, don't wanna dig through makefile
226 - rm -rf "${ED}/usr/$(get_libdir)/java" || die
227 - docinto "java"
228 - dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
229 - insinto "/usr/share/doc/${PF}/java/Test"
230 - doins "${S}"/java/Test/*.java
231 - fi
232 -
233 - dosbin saslauthd/testsaslauthd
234 - fi
235 -}
236 -
237 -multilib_src_install_all() {
238 - doman man/*
239 -
240 - keepdir /etc/sasl2
241 -
242 - # Reset docinto to default value (#674296)
243 - docinto
244 - dodoc AUTHORS ChangeLog doc/legacy/TODO
245 - newdoc pwcheck/README README.pwcheck
246 -
247 - newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
248 - edos2unix "${ED}/usr/share/doc/${PF}/release-notes"
249 -
250 - docinto html
251 - dodoc doc/html/*.html
252 -
253 - if use pam; then
254 - newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
255 - fi
256 -
257 - newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
258 - systemd_dounit "${FILESDIR}/pwcheck.service"
259 -
260 - newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
261 - newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
262 - systemd_dounit "${FILESDIR}/saslauthd.service"
263 - dotmpfiles "${FILESDIR}/${PN}.conf"
264 -
265 - # The get_modname bit is important: do not remove the .la files on
266 - # platforms where the lib isn't called .so for cyrus searches the .la to
267 - # figure out what the name is supposed to be instead
268 - if ! use static-libs && [[ $(get_modname) == .so ]] ; then
269 - find "${ED}" -name "*.la" -delete || die
270 - fi
271 -}
272 -
273 -pkg_postinst() {
274 - tmpfiles_process ${PN}.conf
275 -
276 - # Generate an empty sasldb2 with correct permissions.
277 - if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
278 - einfo "Generating an empty sasldb2 with correct permissions ..."
279 - echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
280 - || die "Failed to generate sasldb2"
281 - "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
282 - || die "Failed to delete temp user"
283 - chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
284 - || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
285 - chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
286 - || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
287 - fi
288 -
289 - if use authdaemond ; then
290 - elog "You need to add a user running a service using Courier's"
291 - elog "authdaemon to the 'mail' group. For example, do:"
292 - elog " gpasswd -a postfix mail"
293 - elog "to add the 'postfix' user to the 'mail' group."
294 - fi
295 -
296 - elog "pwcheck and saslauthd home directories have moved to:"
297 - elog " /run/saslauthd, using tmpfiles.d"
298 -}
299
300 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch
301 deleted file mode 100644
302 index a9dd1476d2e6..000000000000
303 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch
304 +++ /dev/null
305 @@ -1,16 +0,0 @@
306 -https://bugzilla.cyrusimap.org/show_bug.cgi?id=3590
307 -https://bugs.gentoo.org/show_bug.cgi?id=392761
308 -
309 ---- cyrus-sasl-2.1.25/lib/auxprop.c~ 2011-10-20 17:33:46.423015318 +0200
310 -+++ cyrus-sasl-2.1.25/lib/auxprop.c 2011-10-20 17:48:49.336348654 +0200
311 -@@ -971,6 +971,10 @@
312 - }
313 -
314 - if(!found) {
315 -+ /* compatibility with <= 2.1.23, ignore the lack of auxrop plugin */
316 -+ if (!plist)
317 -+ result = SASL_OK;
318 -+ else
319 - _sasl_log(sparams->utils->conn, SASL_LOG_DEBUG,
320 - "could not find auxprop plugin, was searching for '%s'",
321 - plist ? plist : "[all]");
322
323 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch
324 deleted file mode 100644
325 index 0177b52567f2..000000000000
326 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch
327 +++ /dev/null
328 @@ -1,13 +0,0 @@
329 -Gentoo bug #458790
330 ---- a/include/sasl.h
331 -+++ b/include/sasl.h
332 -@@ -121,6 +121,9 @@
333 - #ifndef SASL_H
334 - #define SASL_H 1
335 -
336 -+/* stddef.h to get size_t defined */
337 -+#include <stddef.h>
338 -+
339 - /* Keep in sync with win32/common.mak */
340 - #define SASL_VERSION_MAJOR 2
341 - #define SASL_VERSION_MINOR 1
342
343 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch
344 deleted file mode 100644
345 index 82b9e1fb6dbe..000000000000
346 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-CVE-2019-19906.patch
347 +++ /dev/null
348 @@ -1,20 +0,0 @@
349 -Description: CVE-2019-19906: Off-by-one in _sasl_add_string function
350 -Origin: vendor
351 -Bug: https://github.com/cyrusimap/cyrus-sasl/issues/587
352 -Bug-Debian: https://bugs.debian.org/947043
353 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-19906
354 -Author: Stephan Zeisberg <stephan@××××××.de>
355 -Reviewed-by: Salvatore Bonaccorso <carnil@××××××.org>
356 -Last-Update: 2019-12-19
357 -
358 ---- a/lib/common.c
359 -+++ b/lib/common.c
360 -@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t
361 -
362 - if (add==NULL) add = "(null)";
363 -
364 -- addlen=strlen(add); /* only compute once */
365 -+ addlen=strlen(add)+1; /* only compute once */
366 - if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
367 - return SASL_NOMEM;
368 -
369
370 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch
371 deleted file mode 100644
372 index 7cd9e151fbb7..000000000000
373 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch
374 +++ /dev/null
375 @@ -1,25 +0,0 @@
376 -Author: Matthias Klose <doko@××××××.com>
377 -Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
378 -it.
379 ---- cyrus-sasl-2.1.27/saslauthd/Makefile.am
380 -+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
381 -@@ -25,7 +25,7 @@
382 - saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL)
383 - saslauthd_LDADD = @SASL_KRB_LIB@ \
384 - @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
385 -- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
386 -+ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
387 -
388 - testsaslauthd_SOURCES = testsaslauthd.c utils.c
389 - testsaslauthd_LDADD = @LIB_SOCKET@
390 ---- cyrus-sasl-2.1.27/sasldb/Makefile.am
391 -+++ cyrus-sasl-2.1.27/sasldb/Makefile.am
392 -@@ -54,6 +54,6 @@
393 -
394 - libsasldb_la_SOURCES = allockey.c sasldb.h
395 - EXTRA_libsasldb_la_SOURCES = $(extra_common_sources)
396 --libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND)
397 --libsasldb_la_LIBADD = $(SASL_DB_BACKEND)
398 -+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
399 -+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB)
400 - libsasldb_la_LDFLAGS = -no-undefined
401
402 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch
403 deleted file mode 100644
404 index 2ce971efc5b5..000000000000
405 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch
406 +++ /dev/null
407 @@ -1,31 +0,0 @@
408 ---- cyrus-sasl-2.1.27/configure.ac
409 -+++ cyrus-sasl-2.1.27/configure.ac
410 -@@ -44,6 +44,8 @@
411 -
412 - AC_PREREQ(2.63)
413 -
414 -+AC_CONFIG_MACRO_DIR([config])
415 -+
416 - dnl
417 - dnl REMINDER: When changing the version number here, please also update
418 - dnl the values in win32/include/config.h and include/sasl.h as well.
419 ---- cyrus-sasl-2.1.27/Makefile.am
420 -+++ cyrus-sasl-2.1.27/Makefile.am
421 -@@ -44,6 +44,8 @@
422 - #
423 - ################################################################
424 -
425 -+ACLOCAL_AMFLAGS = -I config
426 -+
427 - if SASLAUTHD
428 - SAD = saslauthd
429 - else
430 ---- cyrus-sasl-2.1.27/saslauthd/Makefile.am
431 -+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
432 -@@ -1,4 +1,6 @@
433 - AUTOMAKE_OPTIONS = 1.7
434 -+ACLOCAL_AMFLAGS = -I ../config
435 -+
436 - sbin_PROGRAMS = saslauthd testsaslauthd
437 - EXTRA_PROGRAMS = saslcache
438 -
439
440 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
441 deleted file mode 100644
442 index c331039e2f16..000000000000
443 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch
444 +++ /dev/null
445 @@ -1,17 +0,0 @@
446 -Author: Fabian Fagerholm <fabbe@××××××.org>
447 -Description: This patch makes sure the non-PIC version of libsasldb.a, which
448 -is created out of non-PIC objects, is not going to overwrite the PIC version,
449 -which is created out of PIC objects. The PIC version is placed in .libs, and
450 -the non-PIC version in the current directory. This ensures that both non-PIC
451 -and PIC versions are available in the correct locations.
452 ---- cyrus-sasl-2.1.27/lib/Makefile.am
453 -+++ cyrus-sasl-2.1.27/lib/Makefile.am
454 -@@ -98,7 +98,7 @@
455 -
456 - libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS)
457 - @echo adding static plugins and dependencies
458 -- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS)
459 -+ $(AR) cru $@ $(SASL_STATIC_OBJS)
460 - @for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
461 - if test ! -f $$i; then continue; fi; . $$i; \
462 - for j in $$dependency_libs foo; do \
463
464 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch
465 deleted file mode 100644
466 index bdd02f779660..000000000000
467 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch
468 +++ /dev/null
469 @@ -1,11 +0,0 @@
470 ---- cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
471 -+++ cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
472 -@@ -23,7 +23,7 @@
473 - from sphinx import addnodes
474 - from sphinx.locale import admonitionlabels, _
475 - from sphinx.util.osutil import ustrftime
476 --from sphinx.util.compat import docutils_version
477 -+#from sphinx.util.compat import docutils_version
478 -
479 - class CyrusManualPageWriter(ManualPageWriter):
480 -
481
482 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
483 deleted file mode 100644
484 index c585cb158e15..000000000000
485 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch
486 +++ /dev/null
487 @@ -1,16 +0,0 @@
488 -Gentoo bug #389349
489 ---- cyrus-sasl-2.1.27/m4/sasl2.m4
490 -+++ cyrus-sasl-2.1.27/m4/sasl2.m4
491 -@@ -220,7 +220,11 @@
492 - [AC_WARN([Cybersafe define not found])])
493 -
494 - elif test "$ac_cv_header_gssapi_h" = "yes"; then
495 -- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h,
496 -+ AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
497 -+ [#include <gssapi.h>
498 -+ #ifdef GSS_C_NT_HOSTBASED_SERVICE
499 -+ hostbased_service_gss_nt_yes
500 -+ #endif],
501 - [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
502 - [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])
503 - elif test "$ac_cv_header_gssapi_gssapi_h"; then
504
505 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-memmem.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-memmem.patch
506 deleted file mode 100644
507 index 158529dcb5f5..000000000000
508 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-memmem.patch
509 +++ /dev/null
510 @@ -1,53 +0,0 @@
511 -auth_rimap: provide naive memmem implementation if missing
512 -
513 -read_response uses memmem, which is not available on e.g. Solaris 10
514 -
515 -Bug: https://github.com/cyrusimap/cyrus-sasl/pull/551
516 -Signed-off-by: Fabian Groffen <grobian@g.o>
517 -
518 ---- a/saslauthd/auth_rimap.c
519 -+++ b/saslauthd/auth_rimap.c
520 -@@ -367,6 +367,32 @@
521 - /* END FUNCTION: process_login_reply */
522 -
523 -
524 -+#ifndef HAVE_MEMMEM
525 -+static void *memmem(
526 -+ const void *big, size_t big_len,
527 -+ const void *little, size_t little_len)
528 -+{
529 -+ const char *bp = (const char *)big;
530 -+ const char *lp = (const char *)little;
531 -+ size_t l;
532 -+
533 -+ if (big_len < little_len || little_len == 0 || big_len == 0)
534 -+ return NULL;
535 -+
536 -+ while (big_len > 0) {
537 -+ for (l = 0; l < little_len; l++) {
538 -+ if (bp[l] != lp[l])
539 -+ break;
540 -+ }
541 -+ if (l == little_len)
542 -+ return (void *)bp;
543 -+ bp++;
544 -+ }
545 -+
546 -+ return NULL;
547 -+}
548 -+#endif
549 -+
550 - static int read_response(int s, char *rbuf, int buflen, const char *tag)
551 - {
552 - int rc = 0;
553 ---- a/configure.ac
554 -+++ b/configure.ac
555 -@@ -1292,7 +1292,7 @@
556 -
557 - #AC_FUNC_MEMCMP
558 - #AC_FUNC_VPRINTF
559 --AC_CHECK_FUNCS(gethostname getdomainname getpwnam getspnam gettimeofday inet_aton memcpy mkdir select socket strchr strdup strerror strspn strstr strtol jrand48 getpassphrase asprintf strlcat strlcpy)
560 -+AC_CHECK_FUNCS(gethostname getdomainname getpwnam getspnam gettimeofday inet_aton memcpy memmem mkdir select socket strchr strdup strerror strspn strstr strtol jrand48 getpassphrase asprintf strlcat strlcpy)
561 -
562 - if test $ac_cv_func_getspnam = yes; then
563 - AC_MSG_CHECKING(if getpwnam_r/getspnam_r take 5 arguments)
564
565 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch
566 deleted file mode 100644
567 index 81198cb87f0d..000000000000
568 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch
569 +++ /dev/null
570 @@ -1,18 +0,0 @@
571 -https://github.com/cyrusimap/cyrus-sasl/pull/623
572 -https://bugs.gentoo.org/775875
573 -
574 -From 5b8075eeba8d0334573689450b07610c176a2618 Mon Sep 17 00:00:00 2001
575 -From: orbea <orbea@××××××.net>
576 -Date: Wed, 9 Sep 2020 07:29:38 -0700
577 -Subject: [PATCH] common: Define the missing crypto_compat_version version.
578 -
579 ---- a/common/Makefile.am
580 -+++ b/common/Makefile.am
581 -@@ -46,6 +46,7 @@
582 - # See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
583 - # CURRENT:REVISION:AGE
584 - plugin_common_version = 3:0:0
585 -+crypto_compat_version = 0:0:0
586 -
587 - AM_CPPFLAGS=-fPIC -I$(top_srcdir)/include -I$(top_builddir)/include
588 -