From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- ...us-sasl-2.1.23-gss_c_nt_hostbased_service.patch | 16 --- .../files/cyrus-sasl-2.1.25-as_needed.patch | 27 ----- .../files/cyrus-sasl-2.1.25-autotools_fixes.patch | 114 -------------------- .../files/cyrus-sasl-2.1.25-auxprop.patch | 16 --- .../cyrus-sasl-2.1.25-avoid_pic_overwrite.patch | 27 ----- .../files/cyrus-sasl-2.1.25-fix_heimdal.patch | 27 ----- .../files/cyrus-sasl-2.1.25-missing_header.patch | 10 -- .../cyrus-sasl-2.1.25-saslauthd_libtool.patch | 12 --- .../files/cyrus-sasl-2.1.25-sasldb_al.patch | 14 --- .../files/cyrus-sasl-2.1.25-service_keytabs.patch | 27 ----- .../files/cyrus-sasl-2.1.26-CVE-2013-4122.patch | 116 --------------------- ...26-canonuser-ldapdb-garbage-in-out-buffer.patch | 10 -- ...us-sasl-2.1.26-fix_dovecot_authentication.patch | 90 ---------------- .../files/cyrus-sasl-2.1.26-missing-size_t.patch | 13 --- .../files/cyrus-sasl-2.1.26-send-imap-logout.patch | 48 --------- dev-libs/cyrus-sasl/files/cyrus-sasl.conf | 1 - dev-libs/cyrus-sasl/files/java.README.gentoo | 39 ------- dev-libs/cyrus-sasl/files/pwcheck.rc6 | 20 ---- dev-libs/cyrus-sasl/files/pwcheck.service | 9 -- dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf | 19 ---- dev-libs/cyrus-sasl/files/saslauthd.pam-include | 8 -- dev-libs/cyrus-sasl/files/saslauthd.service | 13 --- dev-libs/cyrus-sasl/files/saslauthd2.rc7 | 20 ---- 23 files changed, 696 deletions(-) delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch delete mode 100644 dev-libs/cyrus-sasl/files/cyrus-sasl.conf delete mode 100644 dev-libs/cyrus-sasl/files/java.README.gentoo delete mode 100644 dev-libs/cyrus-sasl/files/pwcheck.rc6 delete mode 100644 dev-libs/cyrus-sasl/files/pwcheck.service delete mode 100644 dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf delete mode 100644 dev-libs/cyrus-sasl/files/saslauthd.pam-include delete mode 100644 dev-libs/cyrus-sasl/files/saslauthd.service delete mode 100644 dev-libs/cyrus-sasl/files/saslauthd2.rc7 (limited to 'dev-libs/cyrus-sasl/files') diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch deleted file mode 100644 index 9eeab1b42ff9..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.23-gss_c_nt_hostbased_service.patch +++ /dev/null @@ -1,16 +0,0 @@ -Gentoo bug #389349 ---- cmulocal/sasl2.m4 2009-04-28 17:09:13.000000000 +0200 -+++ cmulocal/sasl2.m4 2011-11-02 17:55:24.000000000 +0100 -@@ -217,7 +217,11 @@ - [AC_WARN([Cybersafe define not found])]) - - elif test "$ac_cv_header_gssapi_h" = "yes"; then -- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, -+ AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h, -+ [#include -+ #ifdef GSS_C_NT_HOSTBASED_SERVICE -+ hostbased_service_gss_nt_yes -+ #endif], - [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, - [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])]) - elif test "$ac_cv_header_gssapi_gssapi_h"; then diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch deleted file mode 100644 index 67b48b4a4993..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-as_needed.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Matthias Klose -Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use -it. ---- a/saslauthd/Makefile.am -+++ b/saslauthd/Makefile.am -@@ -16,7 +16,7 @@ EXTRA_saslauthd_sources = getaddrinfo.c - saslauthd_DEPENDENCIES = saslauthd-main.o @LTLIBOBJS@ - saslauthd_LDADD = @SASL_KRB_LIB@ \ - @GSSAPIBASE_LIBS@ @GSSAPI_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ -- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ -+ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ @LTLIBOBJS@ - - testsaslauthd_SOURCES = testsaslauthd.c utils.c - testsaslauthd_LDADD = @LIB_SOCKET@ ---- a/sasldb/Makefile.am -+++ b/sasldb/Makefile.am -@@ -55,8 +55,8 @@ noinst_LIBRARIES = libsasldb.a - - libsasldb_la_SOURCES = allockey.c sasldb.h - EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) --libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) --libsasldb_la_LIBADD = $(SASL_DB_BACKEND) -+libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) -+libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) - - # Prevent make dist stupidity - libsasldb_a_SOURCES = diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch deleted file mode 100644 index 5837921d4f7f..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-autotools_fixes.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -44,6 +44,8 @@ dnl - AC_INIT(lib/saslint.h) - AC_PREREQ([2.54]) - -+AC_CONFIG_MACRO_DIR([cmulocal] [config]) -+ - dnl use ./config.cache as the default cache file. - dnl we require a cache file to successfully configure our build. - if test $cache_file = "/dev/null"; then ---- a/Makefile.am -+++ b/Makefile.am -@@ -43,6 +43,8 @@ AUTOMAKE_OPTIONS = 1.7 - # - ################################################################ - -+ACLOCAL_AMFLAGS = -I cmulocal -I config -+ - if SASLAUTHD - SAD = saslauthd - else ---- a/saslauthd/configure.in -+++ b/saslauthd/configure.in -@@ -1,7 +1,8 @@ - AC_INIT(mechanisms.h) - AC_PREREQ([2.54]) - --AC_CONFIG_AUX_DIR(config) -+AC_CONFIG_MACRO_DIR([../cmulocal] [../config]) -+AC_CONFIG_AUX_DIR([config]) - AC_CANONICAL_HOST - - dnl Should we enable SASLAUTHd at all? -@@ -164,30 +165,30 @@ AC_SUBST(LTLIBOBJS) - - dnl Checks for which function macros exist - AC_MSG_CHECKING(whether $CC implements __func__) --AC_CACHE_VAL(have_func, -+AC_CACHE_VAL(_cv_have_func, - [AC_TRY_LINK([#include ],[printf("%s", __func__);], --have_func=yes, --have_func=no)]) --AC_MSG_RESULT($have_func) --if test "$have_func" = yes; then -+_cv_have_func=yes, -+_cv_have_func=no)]) -+AC_MSG_RESULT($_cv_have_func) -+if test "$_cv_have_func" = yes; then - AC_DEFINE(HAVE_FUNC,[],[Does the compiler understand __func__]) - else - AC_MSG_CHECKING(whether $CC implements __PRETTY_FUNCTION__) -- AC_CACHE_VAL(have_pretty_function, -+ AC_CACHE_VAL(_cv_have_pretty_function, - [AC_TRY_LINK([#include ],[printf("%s", __PRETTY_FUNCTION__);], -- have_pretty_function=yes, -- have_pretty_function=no)]) -- AC_MSG_RESULT($have_pretty_function) -- if test "$have_pretty_function" = yes; then -+ _cv_have_pretty_function=yes, -+ _cv_have_pretty_function=no)]) -+ AC_MSG_RESULT($_cv_have_pretty_function) -+ if test "$_cv_have_pretty_function" = yes; then - AC_DEFINE(HAVE_PRETTY_FUNCTION,[],[Does compiler understand __PRETTY_FUNCTION__]) - else - AC_MSG_CHECKING(whether $CC implements __FUNCTION__) -- AC_CACHE_VAL(have_function, -+ AC_CACHE_VAL(_cv_have_function, - [AC_TRY_LINK([#include ],[printf("%s", __FUNCTION__);], -- have_function=yes, -- have_function=no)]) -- AC_MSG_RESULT($have_function) -- if test "$have_function" = yes; then -+ _cv_have_function=yes, -+ _cv_have_function=no)]) -+ AC_MSG_RESULT($_cv_have_function) -+ if test "$_cv_have_function" = yes; then - AC_DEFINE(HAVE_FUNCTION,[],[Does compiler understand __FUNCTION__]) - fi - fi ---- a/saslauthd/Makefile.am -+++ b/saslauthd/Makefile.am -@@ -1,4 +1,6 @@ - AUTOMAKE_OPTIONS = 1.7 -+ACLOCAL_AMFLAGS = -I ../cmulocal -I ../config -+ - sbin_PROGRAMS = saslauthd testsaslauthd - EXTRA_PROGRAMS = saslcache - ---- a/config/kerberos_v4.m4 -+++ b/config/kerberos_v4.m4 -@@ -89,18 +89,18 @@ AC_DEFUN([SASL_KERBEROS_V4_CHK], [ - dnl if we were ambitious, we would look more aggressively for the - dnl krb4 install - if test -d ${krb4}; then -- AC_CACHE_CHECK(for Kerberos includes, cyrus_krbinclude, [ -+ AC_CACHE_CHECK(for Kerberos includes, cyrus_cv_krbinclude, [ - for krbhloc in include/kerberosIV include/kerberos include - do - if test -f ${krb4}/${krbhloc}/krb.h ; then -- cyrus_krbinclude=${krb4}/${krbhloc} -+ cyrus_cv_krbinclude=${krb4}/${krbhloc} - break - fi - done - ]) - -- if test -n "${cyrus_krbinclude}"; then -- CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}" -+ if test -n "${cyrus_cv_krbinclude}"; then -+ CPPFLAGS="$CPPFLAGS -I${cyrus_cv_krbinclude}" - fi - LDFLAGS="$LDFLAGS -L$krb4/lib" - fi 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 deleted file mode 100644 index a9dd1476d2e6..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-auxprop.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugzilla.cyrusimap.org/show_bug.cgi?id=3590 -https://bugs.gentoo.org/show_bug.cgi?id=392761 - ---- cyrus-sasl-2.1.25/lib/auxprop.c~ 2011-10-20 17:33:46.423015318 +0200 -+++ cyrus-sasl-2.1.25/lib/auxprop.c 2011-10-20 17:48:49.336348654 +0200 -@@ -971,6 +971,10 @@ - } - - if(!found) { -+ /* compatibility with <= 2.1.23, ignore the lack of auxrop plugin */ -+ if (!plist) -+ result = SASL_OK; -+ else - _sasl_log(sparams->utils->conn, SASL_LOG_DEBUG, - "could not find auxprop plugin, was searching for '%s'", - plist ? plist : "[all]"); diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch deleted file mode 100644 index 2e5b1750d00d..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-avoid_pic_overwrite.patch +++ /dev/null @@ -1,27 +0,0 @@ -Author: Fabian Fagerholm -Description: This patch makes sure the non-PIC version of libsasldb.a, which -is created out of non-PIC objects, is not going to overwrite the PIC version, -which is created out of PIC objects. The PIC version is placed in .libs, and -the non-PIC version in the current directory. This ensures that both non-PIC -and PIC versions are available in the correct locations. ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -78,7 +78,7 @@ endif - - libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) - @echo adding static plugins and dependencies -- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) -+ $(AR) cru $@ $(SASL_STATIC_OBJS) - @for i in ./libsasl2.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ - if test ! -f $$i; then continue; fi; . $$i; \ - for j in $$dependency_libs foo; do \ ---- a/sasldb/Makefile.am -+++ b/sasldb/Makefile.am -@@ -63,6 +63,6 @@ libsasldb_a_SOURCES = - EXTRA_libsasldb_a_SOURCES = - - libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) -- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) -+ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC) - - diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch deleted file mode 100644 index abf0df2568c6..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-fix_heimdal.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix compiling against heimdal - ---- sample/server.c 2010-12-01 14:52:55.000000000 +0000 -+++ sample/server.c 2011-11-30 14:54:42.000000000 +0000 -@@ -85,8 +85,10 @@ - - #ifdef HAVE_GSS_GET_NAME_ATTRIBUTE - #include -+#ifndef KRB5_HEIMDAL - #include - #endif -+#endif - - #include "common.h" - ---- plugins/gssapi.c 2011-05-11 19:25:55.000000000 +0000 -+++ plugins/gssapi.c 2011-11-30 14:54:33.000000000 +0000 -@@ -50,6 +50,9 @@ - #else - #include - #endif -+#ifdef KRB5_HEIMDAL -+#include -+#endif - - #ifdef WIN32 - # include diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch deleted file mode 100644 index 597d45a76795..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-missing_header.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- pwcheck/pwcheck_getspnam.c 1999-08-26 19:22:44.000000000 +0300 -+++ pwcheck/pwcheck_getspnam.c 2011-11-30 13:22:24.601023316 +0200 -@@ -24,6 +24,7 @@ - ******************************************************************/ - - #include -+#include - - extern char *crypt(); - diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch deleted file mode 100644 index da1a49f1dd66..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-saslauthd_libtool.patch +++ /dev/null @@ -1,12 +0,0 @@ -Author: Fabian Fagerholm -Description: Enable libtool use. ---- a/saslauthd/configure.in -+++ b/saslauthd/configure.in -@@ -25,6 +25,7 @@ AC_PROG_AWK - AC_PROG_MAKE_SET - AC_PROG_LN_S - AC_PROG_INSTALL -+AC_PROG_LIBTOOL - - dnl Checks for build foo - CMU_C___ATTRIBUTE__ diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch deleted file mode 100644 index 8eff5a8bdd12..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-sasldb_al.patch +++ /dev/null @@ -1,14 +0,0 @@ -Author: Fabian Fagerholm -Description: Fix linking with libsasldb.a when saslauthd is built with sasldb -support. ---- a/saslauthd/configure.in -+++ b/saslauthd/configure.in -@@ -77,7 +77,7 @@ if test "$authsasldb" != no; then - AC_DEFINE(AUTH_SASLDB,[],[Include SASLdb Support]) - SASL_DB_PATH_CHECK() - SASL_DB_CHECK() -- SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al" -+ SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.a" - fi - - AC_ARG_ENABLE(httpform, [ --enable-httpform enable HTTP form authentication [[no]] ], diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch deleted file mode 100644 index 117e8eb88802..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-service_keytabs.patch +++ /dev/null @@ -1,27 +0,0 @@ -Bug #445932 ---- cmulocal/sasl2.m4 2011-09-02 12:58:00.000000000 +0000 -+++ cmulocal/sasl2.m4 2012-12-05 08:37:16.425811319 +0000 -@@ -268,7 +268,11 @@ - - cmu_save_LIBS="$LIBS" - LIBS="$LIBS $GSSAPIBASE_LIBS" -- AC_CHECK_FUNCS(gsskrb5_register_acceptor_identity) -+ AC_CHECK_FUNCS([gsskrb5_register_acceptor_identity], [], -+ [AC_CHECK_FUNCS([krb5_gss_register_acceptor_identity], -+ [AC_CHECK_HEADERS([gssapi/gssapi_krb5.h], -+ [AC_DEFINE([HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY], [1])] -+ )])]) - AC_CHECK_FUNCS(gss_decapsulate_token) - AC_CHECK_FUNCS(gss_encapsulate_token) - AC_CHECK_FUNCS(gss_oid_equal) ---- plugins/gssapi.c 2012-12-05 09:03:31.000220161 +0000 -+++ plugins/gssapi.c 2012-12-05 09:01:55.043380204 +0000 -@@ -50,7 +50,7 @@ - #else - #include - #endif --#ifdef KRB5_HEIMDAL -+#if defined (KRB5_HEIMDAL) || defined (HAVE_GSSAPI_GSSAPI_KRB5_H) - #include - #endif - diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch deleted file mode 100644 index 09c9ce86c9ac..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-CVE-2013-4122.patch +++ /dev/null @@ -1,116 +0,0 @@ -From dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d Mon Sep 17 00:00:00 2001 -From: mancha -Date: Thu, 11 Jul 2013 09:08:07 +0000 -Subject: Handle NULL returns from glibc 2.17+ crypt() - -Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL -(w/ NULL return) if the salt violates specifications. Additionally, -on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords -passed to crypt() fail with EPERM (w/ NULL return). - -When using glibc's crypt(), check return value to avoid a possible -NULL pointer dereference. - -Patch by mancha1@hush.com. ---- -diff --git a/pwcheck/pwcheck_getpwnam.c b/pwcheck/pwcheck_getpwnam.c -index 4b34222..400289c 100644 ---- a/pwcheck/pwcheck_getpwnam.c -+++ b/pwcheck/pwcheck_getpwnam.c -@@ -32,6 +32,7 @@ char *userid; - char *password; - { - char* r; -+ char* crpt_passwd; - struct passwd *pwd; - - pwd = getpwnam(userid); -@@ -41,7 +42,7 @@ char *password; - else if (pwd->pw_passwd[0] == '*') { - r = "Account disabled"; - } -- else if (strcmp(pwd->pw_passwd, crypt(password, pwd->pw_passwd)) != 0) { -+ else if (!(crpt_passwd = crypt(password, pwd->pw_passwd)) || strcmp(pwd->pw_passwd, (const char *)crpt_passwd) != 0) { - r = "Incorrect password"; - } - else { -diff --git a/pwcheck/pwcheck_getspnam.c b/pwcheck/pwcheck_getspnam.c -index 2b11286..6d607bb 100644 ---- a/pwcheck/pwcheck_getspnam.c -+++ b/pwcheck/pwcheck_getspnam.c -@@ -32,13 +32,15 @@ char *userid; - char *password; - { - struct spwd *pwd; -+ char *crpt_passwd; - - pwd = getspnam(userid); - if (!pwd) { - return "Userid not found"; - } - -- if (strcmp(pwd->sp_pwdp, crypt(password, pwd->sp_pwdp)) != 0) { -+ crpt_passwd = crypt(password, pwd->sp_pwdp); -+ if (!crpt_passwd || strcmp(pwd->sp_pwdp, (const char *)crpt_passwd) != 0) { - return "Incorrect password"; - } - else { -diff --git a/saslauthd/auth_getpwent.c b/saslauthd/auth_getpwent.c -index fc8029d..d4ebe54 100644 ---- a/saslauthd/auth_getpwent.c -+++ b/saslauthd/auth_getpwent.c -@@ -77,6 +77,7 @@ auth_getpwent ( - { - /* VARIABLES */ - struct passwd *pw; /* pointer to passwd file entry */ -+ char *crpt_passwd; /* encrypted password */ - int errnum; - /* END VARIABLES */ - -@@ -105,7 +106,8 @@ auth_getpwent ( - } - } - -- if (strcmp(pw->pw_passwd, (const char *)crypt(password, pw->pw_passwd))) { -+ crpt_passwd = crypt(password, pw->pw_passwd); -+ if (!crpt_passwd || strcmp(pw->pw_passwd, (const char *)crpt_passwd)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "DEBUG: auth_getpwent: %s: invalid password", login); - } -diff --git a/saslauthd/auth_shadow.c b/saslauthd/auth_shadow.c -index 677131b..1988afd 100644 ---- a/saslauthd/auth_shadow.c -+++ b/saslauthd/auth_shadow.c -@@ -210,8 +210,8 @@ auth_shadow ( - RETURN("NO Insufficient permission to access NIS authentication database (saslauthd)"); - } - -- cpw = strdup((const char *)crypt(password, sp->sp_pwdp)); -- if (strcmp(sp->sp_pwdp, cpw)) { -+ cpw = crypt(password, sp->sp_pwdp); -+ if (!cpw || strcmp(sp->sp_pwdp, (const char *)cpw)) { - if (flags & VERBOSE) { - /* - * This _should_ reveal the SHADOW_PW_LOCKED prefix to an -@@ -221,10 +221,8 @@ auth_shadow ( - syslog(LOG_DEBUG, "DEBUG: auth_shadow: pw mismatch: '%s' != '%s'", - sp->sp_pwdp, cpw); - } -- free(cpw); - RETURN("NO Incorrect password"); - } -- free(cpw); - - /* - * The following fields will be set to -1 if: -@@ -286,7 +284,7 @@ auth_shadow ( - RETURN("NO Invalid username"); - } - -- if (strcmp(upw->upw_passwd, crypt(password, upw->upw_passwd)) != 0) { -+ if (!(cpw = crypt(password, upw->upw_passwd)) || (strcmp(upw->upw_passwd, (const char *)cpw) != 0)) { - if (flags & VERBOSE) { - syslog(LOG_DEBUG, "auth_shadow: pw mismatch: %s != %s", - password, upw->upw_passwd); --- -cgit v0.9.0.2 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch deleted file mode 100644 index af382181e046..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- cyrus-sasl2.orig/plugins/ldapdb.c -+++ cyrus-sasl2/plugins/ldapdb.c -@@ -406,6 +406,7 @@ ldapdb_canon_server(void *glob_context, - if ( len > out_max ) - len = out_max; - memcpy(out, bvals[0]->bv_val, len); -+ out[len] = '\0'; - *out_ulen = len; - ber_bvecfree(bvals); - } diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch deleted file mode 100644 index 46bbdd1ca1a0..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-fix_dovecot_authentication.patch +++ /dev/null @@ -1,90 +0,0 @@ -Bug #510320 ---- saslauthd/auth_rimap.c 2012-10-12 14:05:48.000000000 +0000 -+++ saslauthd/auth_rimap.c 2014-05-15 05:23:02.000000000 +0000 -@@ -371,7 +371,7 @@ - if ( rc>0 ) { - /* check if there is more to read */ - fd_set perm; -- int fds, ret; -+ int fds, ret, loopc; - struct timeval timeout; - - FD_ZERO(&perm); -@@ -380,6 +380,7 @@ - - timeout.tv_sec = 1; - timeout.tv_usec = 0; -+ loopc = 0; - while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) { - if ( FD_ISSET(s, &perm) ) { - ret = read(s, rbuf+rc, sizeof(rbuf)-rc); -@@ -387,6 +388,14 @@ - rc = ret; - break; - } else { -+ if (ret == 0) { -+ loopc += 1; -+ } else { -+ loopc = 0; -+ } -+ if (loopc > sizeof(rbuf)) { // arbitrary chosen value -+ break; -+ } - rc += ret; - } - } -@@ -484,7 +493,7 @@ - if ( rc>0 ) { - /* check if there is more to read */ - fd_set perm; -- int fds, ret; -+ int fds, ret, loopc; - struct timeval timeout; - - FD_ZERO(&perm); -@@ -493,6 +502,7 @@ - - timeout.tv_sec = 1; - timeout.tv_usec = 0; -+ loopc = 0; - while( select (fds, &perm, NULL, NULL, &timeout ) >0 ) { - if ( FD_ISSET(s, &perm) ) { - ret = read(s, rbuf+rc, sizeof(rbuf)-rc); -@@ -500,6 +510,14 @@ - rc = ret; - break; - } else { -+ if (ret == 0) { -+ loopc += 1; -+ } else { -+ loopc = 0; -+ } -+ if (loopc > sizeof(rbuf)) { // arbitrary chosen value -+ break; -+ } - rc += ret; - } - } ---- lib/checkpw.c 2012-01-27 23:31:36.000000000 +0000 -+++ lib/checkpw.c 2014-05-15 05:19:35.000000000 +0000 -@@ -587,16 +587,14 @@ - /* Timeout. */ - errno = ETIMEDOUT; - return -1; -- case +1: -- if (FD_ISSET(fd, &rfds)) { -- /* Success, file descriptor is readable. */ -- return 0; -- } -- return -1; - case -1: - if (errno == EINTR || errno == EAGAIN) - continue; - default: -+ if (FD_ISSET(fd, &rfds)) { -+ /* Success, file descriptor is readable. */ -+ return 0; -+ } - /* Error catch-all. */ - return -1; - } 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 deleted file mode 100644 index 42f20fb8096b..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-missing-size_t.patch +++ /dev/null @@ -1,13 +0,0 @@ -Gentoo bug #458790 ---- include/sasl.h 2012-10-12 17:05:48.000000000 +0300 -+++ include/sasl.h 2013-02-23 16:56:44.648786268 +0200 -@@ -121,6 +121,9 @@ - #ifndef SASL_H - #define SASL_H 1 - -+/* stddef.h to get size_t defined */ -+#include -+ - /* Keep in sync with win32/common.mak */ - #define SASL_VERSION_MAJOR 2 - #define SASL_VERSION_MINOR 1 diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch deleted file mode 100644 index d8b4b6efc3f8..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- cyrus-sasl2.orig/saslauthd/auth_rimap.c -+++ cyrus-sasl2/saslauthd/auth_rimap.c -@@ -90,6 +90,7 @@ static struct addrinfo *ai = NULL; /* re - service we connect to. */ - #define TAG "saslauthd" /* IMAP command tag */ - #define LOGIN_CMD (TAG " LOGIN ") /* IMAP login command (with tag) */ -+#define LOGOUT_CMD (TAG " LOGOUT ") /* IMAP logout command (with tag)*/ - #define NETWORK_IO_TIMEOUT 30 /* network I/O timeout (seconds) */ - #define RESP_LEN 1000 /* size of read response buffer */ - -@@ -307,10 +308,12 @@ auth_rimap ( - int s=-1; /* socket to remote auth host */ - struct addrinfo *r; /* remote socket address info */ - struct iovec iov[5]; /* for sending LOGIN command */ -+ struct iovec iov2[2]; /* for sending LOGOUT command */ - char *qlogin; /* pointer to "quoted" login */ - char *qpass; /* pointer to "quoted" password */ - char *c; /* scratch pointer */ - int rc; /* return code scratch area */ -+ int rcl; /* return code scratch area */ - char rbuf[RESP_LEN]; /* response read buffer */ - char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV]; - int saved_errno; -@@ -505,6 +508,24 @@ auth_rimap ( - } - } - } -+ -+ /* close remote imap */ -+ iov2[0].iov_base = LOGOUT_CMD; -+ iov2[0].iov_len = sizeof(LOGOUT_CMD) - 1; -+ iov2[1].iov_base = "\r\n"; -+ iov2[1].iov_len = sizeof("\r\n") - 1; -+ -+ if (flags & VERBOSE) { -+ syslog(LOG_DEBUG, "auth_rimap: sending %s%s %s", -+ LOGOUT_CMD, qlogin, qpass); -+ } -+ alarm(NETWORK_IO_TIMEOUT); -+ rcl = retry_writev(s, iov2, 2); -+ alarm(0); -+ if (rcl == -1) { -+ syslog(LOG_WARNING, "auth_rimap: writev logout: %m"); -+ } -+ - (void) close(s); /* we're done with the remote */ - if (rc == -1) { - syslog(LOG_WARNING, "auth_rimap: read (response): %m"); diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl.conf b/dev-libs/cyrus-sasl/files/cyrus-sasl.conf deleted file mode 100644 index d4809f73c8e9..000000000000 --- a/dev-libs/cyrus-sasl/files/cyrus-sasl.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/saslauthd 0755 root root - diff --git a/dev-libs/cyrus-sasl/files/java.README.gentoo b/dev-libs/cyrus-sasl/files/java.README.gentoo deleted file mode 100644 index fb73204ecab1..000000000000 --- a/dev-libs/cyrus-sasl/files/java.README.gentoo +++ /dev/null @@ -1,39 +0,0 @@ -4-Nov-2000 - -Note: this file has been modified to adapt to Gentoo specific. - -class files are installed in - -`java-config -p cyrus-sasl-2` - -to compile programs using it, do: - -javac -classpath $JAVA_HOME/lib/tools.jar:`java-config -p cyrus-sasl-2` .java - -(make sure to substitute your JDK for $JAVA_HOME/lib/tools.jar) - -to run, do - -java -classpath - ----------------------------- -This is a java version of the SASL libraries. It supports all the -mechanisms in the C version and conforms to the internet draft in the -doc/ directory. JNI is used. - -Sample applications exist in the Test/ directory. - -They generally can be run with something like: - -java -debug -classpath -../:$JAVA_HOME/lib/tools.jar:`java-config -p cyrus-sasl-2`:. jimtest -p 2143 -m -KERBEROS_V4 cyrus-dev - -and - -java -debug -classpath -../:$JAVA_HOME/lib/tools.jar:`java-config -p cyrus-sasl-2`:. testserver - - -Any feedback is welcome. - diff --git a/dev-libs/cyrus-sasl/files/pwcheck.rc6 b/dev-libs/cyrus-sasl/files/pwcheck.rc6 deleted file mode 100644 index 7b43c4ea154b..000000000000 --- a/dev-libs/cyrus-sasl/files/pwcheck.rc6 +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need localmount - use logger -} - -start() { - ebegin "Starting sasl pwcheck daemon" - start-stop-daemon --start --quiet --exec /usr/sbin/pwcheck - eend $? -} - -stop() { - ebegin "Stopping sasl pwcheck daemon" - start-stop-daemon --stop --quiet --exec /usr/sbin/pwcheck - eend $? -} diff --git a/dev-libs/cyrus-sasl/files/pwcheck.service b/dev-libs/cyrus-sasl/files/pwcheck.service deleted file mode 100644 index 74ff4859abf7..000000000000 --- a/dev-libs/cyrus-sasl/files/pwcheck.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=SASL pwcheck daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/pwcheck - -[Install] -WantedBy=multi-user.target diff --git a/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf b/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf deleted file mode 100644 index dd487b0edaf1..000000000000 --- a/dev-libs/cyrus-sasl/files/saslauthd-2.1.26.conf +++ /dev/null @@ -1,19 +0,0 @@ -# Config file for /etc/init.d/saslauthd and systemd unit - -# PLEASE READ THIS IF YOU ARE USING SYSTEMD -# Please note that systemd does not expand shell variables -# thus, something like FOO="${FOO} bar" won't work. - -# Specify the authentications mechanism. -# **NOTE** For a list see: saslauthd -v -# Since 2.1.19, add "-r" to options for old behavior, -# ie. reassemble user and realm to user@realm form. -# -# Specify the hostname for remote IMAP server using: -# "-O localhost". -# Specify the number of worker processes to create using: -# "-n ". -# Enable credential cache, set cache size and timeout using: -# "-c -s -t ". -# -SASLAUTHD_OPTS="-a pam" diff --git a/dev-libs/cyrus-sasl/files/saslauthd.pam-include b/dev-libs/cyrus-sasl/files/saslauthd.pam-include deleted file mode 100644 index d50a84946a78..000000000000 --- a/dev-libs/cyrus-sasl/files/saslauthd.pam-include +++ /dev/null @@ -1,8 +0,0 @@ -#%PAM-1.0 - -auth required pam_nologin.so -auth include system-auth - -account include system-auth - -session include system-auth diff --git a/dev-libs/cyrus-sasl/files/saslauthd.service b/dev-libs/cyrus-sasl/files/saslauthd.service deleted file mode 100644 index 1609a651e4e0..000000000000 --- a/dev-libs/cyrus-sasl/files/saslauthd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=SASL Authentication Daemon - -[Service] -Type=forking -PIDFile=/run/saslauthd/saslauthd.pid -EnvironmentFile=/etc/conf.d/saslauthd -ExecStart=/usr/sbin/saslauthd $SASLAUTHD_OPTS -ExecStop=/bin/kill -15 $MAINPID -PrivateTmp=true - -[Install] -WantedBy=multi-user.target diff --git a/dev-libs/cyrus-sasl/files/saslauthd2.rc7 b/dev-libs/cyrus-sasl/files/saslauthd2.rc7 deleted file mode 100644 index 0abeaf6f5702..000000000000 --- a/dev-libs/cyrus-sasl/files/saslauthd2.rc7 +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net -} - -start() { - ebegin "Starting saslauthd" - start-stop-daemon --start --quiet --exec /usr/sbin/saslauthd \ - -- ${SASLAUTHD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping saslauthd" - start-stop-daemon --stop --quiet --pidfile /run/saslauthd/saslauthd.pid - eend $? -} -- cgit v1.2.3