mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-16 01:16:59 +02:00
Merge pull request #2096 from flatcar-linux/krnowak/cyrus-sasl
dev-libs/cyrus-sasl: Move to portage-stable
This commit is contained in:
Krzesimir Nowak
GitHub
commit
e54223895b
5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-libs/cyrus-sasl
vendored
Normal file
5
sdk_container/src/third_party/coreos-overlay/coreos/config/env/dev-libs/cyrus-sasl
vendored
Normal file
@ -0,0 +1,5 @@
|
||||
# Checking if a GSSAPI implementation supports SPNEGO feature involves
|
||||
# running a binary built during the configuration phase. This
|
||||
# obviously won't work in case of cross-compilation, so we state up
|
||||
# front that SPNEGO is supported.
|
||||
export ac_cv_gssapi_supports_spnego=yes
|
||||
@ -1,2 +0,0 @@
|
||||
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
|
||||
@ -1,271 +0,0 @@
|
||||
# Copyright 1999-2021 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
TMPFILES_OPTIONAL=1
|
||||
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"
|
||||
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"
|
||||
IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
|
||||
|
||||
CDEPEND="
|
||||
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}]
|
||||
)
|
||||
java? ( >=virtual/jdk-1.6:= )"
|
||||
|
||||
REQUIRED_USE="ldapdb? ( openldap )"
|
||||
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
selinux? ( sec-policy/selinux-sasl )"
|
||||
|
||||
DEPEND="${CDEPEND}"
|
||||
|
||||
MULTILIB_WRAPPED_HEADERS=(
|
||||
/usr/include/sasl/md5global.h
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${WORKDIR}"/${MY_PATCH_VER}/
|
||||
|
||||
# flatcar changes: cross compile patch from upstream
|
||||
# generate between commit: b672dbec3cf11857421af526546b1c459adc02cd..6fa9efaa08555d12bf82dea39ef8f1ce533f3ef6
|
||||
# these commits are going to be released in 2.1.28
|
||||
"${FILESDIR}"/enable_cross_builds_with_SPNEGO_detection.patch
|
||||
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
java-pkg-opt-2_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# Get rid of the -R switch (runpath_switch for Sun)
|
||||
# >=gcc-4.6 errors out with unknown option
|
||||
sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
|
||||
configure.ac || die
|
||||
|
||||
# Use plugindir for sasldir
|
||||
sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
|
||||
"${S}"/plugins/Makefile.{am,in} || die "sed failed"
|
||||
|
||||
# #486740 #468556
|
||||
sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
|
||||
-e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
|
||||
configure.ac || die
|
||||
|
||||
eautoreconf
|
||||
|
||||
export CC_FOR_BUILD="$(tc-getBUILD_CC)"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
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() {
|
||||
# Java support
|
||||
multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
|
||||
|
||||
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_enable java)
|
||||
$(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
|
||||
|
||||
# flatcar change - set gssapi_supports_spnego to 'yes'
|
||||
# otherwise it fails to configure for cross compilation
|
||||
myeconfargs+=(ac_cv_gssapi_supports_spnego=yes)
|
||||
|
||||
ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
emake
|
||||
|
||||
# Default location for java classes breaks OpenOffice (bug #60769).
|
||||
# Thanks to axxo@gentoo.org for the solution.
|
||||
if multilib_is_native_abi && use java ; then
|
||||
jar -cvf ${PN}.jar -C java $(find java -name "*.class")
|
||||
fi
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# Default location for java classes breaks OpenOffice (bug #60769).
|
||||
if use java; then
|
||||
java-pkg_dojar ${PN}.jar
|
||||
java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
|
||||
# hackish, don't wanna dig through makefile
|
||||
rm -rf "${ED}/usr/$(get_libdir)/java" || die
|
||||
docinto "java"
|
||||
dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
|
||||
insinto "/usr/share/doc/${PF}/java/Test"
|
||||
doins "${S}"/java/Test/*.java
|
||||
fi
|
||||
|
||||
dosbin saslauthd/testsaslauthd
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
doman man/*
|
||||
|
||||
keepdir /etc/sasl2
|
||||
|
||||
# Reset docinto to default value (#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"
|
||||
}
|
||||
@ -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]");
|
||||
@ -1,13 +0,0 @@
|
||||
Gentoo bug #458790
|
||||
--- a/include/sasl.h
|
||||
+++ b/include/sasl.h
|
||||
@@ -121,6 +121,9 @@
|
||||
#ifndef SASL_H
|
||||
#define SASL_H 1
|
||||
|
||||
+/* stddef.h to get size_t defined */
|
||||
+#include <stddef.h>
|
||||
+
|
||||
/* Keep in sync with win32/common.mak */
|
||||
#define SASL_VERSION_MAJOR 2
|
||||
#define SASL_VERSION_MINOR 1
|
||||
@ -1,20 +0,0 @@
|
||||
Description: CVE-2019-19906: Off-by-one in _sasl_add_string function
|
||||
Origin: vendor
|
||||
Bug: https://github.com/cyrusimap/cyrus-sasl/issues/587
|
||||
Bug-Debian: https://bugs.debian.org/947043
|
||||
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-19906
|
||||
Author: Stephan Zeisberg <stephan@srlabs.de>
|
||||
Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
|
||||
Last-Update: 2019-12-19
|
||||
|
||||
--- a/lib/common.c
|
||||
+++ b/lib/common.c
|
||||
@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t
|
||||
|
||||
if (add==NULL) add = "(null)";
|
||||
|
||||
- addlen=strlen(add); /* only compute once */
|
||||
+ addlen=strlen(add)+1; /* only compute once */
|
||||
if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
|
||||
return SASL_NOMEM;
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
Author: Matthias Klose <doko@ubuntu.com>
|
||||
Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use
|
||||
it.
|
||||
--- cyrus-sasl-2.1.27/saslauthd/Makefile.am
|
||||
+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
|
||||
@@ -25,7 +25,7 @@
|
||||
saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL)
|
||||
saslauthd_LDADD = @SASL_KRB_LIB@ \
|
||||
@GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \
|
||||
- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
|
||||
+ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS)
|
||||
|
||||
testsaslauthd_SOURCES = testsaslauthd.c utils.c
|
||||
testsaslauthd_LDADD = @LIB_SOCKET@
|
||||
--- cyrus-sasl-2.1.27/sasldb/Makefile.am
|
||||
+++ cyrus-sasl-2.1.27/sasldb/Makefile.am
|
||||
@@ -54,6 +54,6 @@
|
||||
|
||||
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)
|
||||
libsasldb_la_LDFLAGS = -no-undefined
|
||||
@ -1,31 +0,0 @@
|
||||
--- cyrus-sasl-2.1.27/configure.ac
|
||||
+++ cyrus-sasl-2.1.27/configure.ac
|
||||
@@ -44,6 +44,8 @@
|
||||
|
||||
AC_PREREQ(2.63)
|
||||
|
||||
+AC_CONFIG_MACRO_DIR([config])
|
||||
+
|
||||
dnl
|
||||
dnl REMINDER: When changing the version number here, please also update
|
||||
dnl the values in win32/include/config.h and include/sasl.h as well.
|
||||
--- cyrus-sasl-2.1.27/Makefile.am
|
||||
+++ cyrus-sasl-2.1.27/Makefile.am
|
||||
@@ -44,6 +44,8 @@
|
||||
#
|
||||
################################################################
|
||||
|
||||
+ACLOCAL_AMFLAGS = -I config
|
||||
+
|
||||
if SASLAUTHD
|
||||
SAD = saslauthd
|
||||
else
|
||||
--- cyrus-sasl-2.1.27/saslauthd/Makefile.am
|
||||
+++ cyrus-sasl-2.1.27/saslauthd/Makefile.am
|
||||
@@ -1,4 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.7
|
||||
+ACLOCAL_AMFLAGS = -I ../config
|
||||
+
|
||||
sbin_PROGRAMS = saslauthd testsaslauthd
|
||||
EXTRA_PROGRAMS = saslcache
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
Author: Fabian Fagerholm <fabbe@debian.org>
|
||||
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.
|
||||
--- cyrus-sasl-2.1.27/lib/Makefile.am
|
||||
+++ cyrus-sasl-2.1.27/lib/Makefile.am
|
||||
@@ -98,7 +98,7 @@
|
||||
|
||||
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 ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \
|
||||
if test ! -f $$i; then continue; fi; . $$i; \
|
||||
for j in $$dependency_libs foo; do \
|
||||
@ -1,11 +0,0 @@
|
||||
--- cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
|
||||
+++ cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py
|
||||
@@ -23,7 +23,7 @@
|
||||
from sphinx import addnodes
|
||||
from sphinx.locale import admonitionlabels, _
|
||||
from sphinx.util.osutil import ustrftime
|
||||
-from sphinx.util.compat import docutils_version
|
||||
+#from sphinx.util.compat import docutils_version
|
||||
|
||||
class CyrusManualPageWriter(ManualPageWriter):
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
Gentoo bug #389349
|
||||
--- cyrus-sasl-2.1.27/m4/sasl2.m4
|
||||
+++ cyrus-sasl-2.1.27/m4/sasl2.m4
|
||||
@@ -220,7 +220,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 <gssapi.h>
|
||||
+ #ifdef GSS_C_NT_HOSTBASED_SERVICE
|
||||
+ hostbased_service_gss_nt_yes
|
||||
+ #endif],
|
||||
[AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
|
||||
[Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])])
|
||||
elif test "$ac_cv_header_gssapi_gssapi_h"; then
|
||||
@ -1,53 +0,0 @@
|
||||
auth_rimap: provide naive memmem implementation if missing
|
||||
|
||||
read_response uses memmem, which is not available on e.g. Solaris 10
|
||||
|
||||
Bug: https://github.com/cyrusimap/cyrus-sasl/pull/551
|
||||
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
|
||||
|
||||
--- a/saslauthd/auth_rimap.c
|
||||
+++ b/saslauthd/auth_rimap.c
|
||||
@@ -367,6 +367,32 @@
|
||||
/* END FUNCTION: process_login_reply */
|
||||
|
||||
|
||||
+#ifndef HAVE_MEMMEM
|
||||
+static void *memmem(
|
||||
+ const void *big, size_t big_len,
|
||||
+ const void *little, size_t little_len)
|
||||
+{
|
||||
+ const char *bp = (const char *)big;
|
||||
+ const char *lp = (const char *)little;
|
||||
+ size_t l;
|
||||
+
|
||||
+ if (big_len < little_len || little_len == 0 || big_len == 0)
|
||||
+ return NULL;
|
||||
+
|
||||
+ while (big_len > 0) {
|
||||
+ for (l = 0; l < little_len; l++) {
|
||||
+ if (bp[l] != lp[l])
|
||||
+ break;
|
||||
+ }
|
||||
+ if (l == little_len)
|
||||
+ return (void *)bp;
|
||||
+ bp++;
|
||||
+ }
|
||||
+
|
||||
+ return NULL;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
static int read_response(int s, char *rbuf, int buflen, const char *tag)
|
||||
{
|
||||
int rc = 0;
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1292,7 +1292,7 @@
|
||||
|
||||
#AC_FUNC_MEMCMP
|
||||
#AC_FUNC_VPRINTF
|
||||
-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)
|
||||
+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)
|
||||
|
||||
if test $ac_cv_func_getspnam = yes; then
|
||||
AC_MSG_CHECKING(if getpwnam_r/getspnam_r take 5 arguments)
|
||||
@ -1,18 +0,0 @@
|
||||
https://github.com/cyrusimap/cyrus-sasl/pull/623
|
||||
https://bugs.gentoo.org/775875
|
||||
|
||||
From 5b8075eeba8d0334573689450b07610c176a2618 Mon Sep 17 00:00:00 2001
|
||||
From: orbea <orbea@riseup.net>
|
||||
Date: Wed, 9 Sep 2020 07:29:38 -0700
|
||||
Subject: [PATCH] common: Define the missing crypto_compat_version version.
|
||||
|
||||
--- a/common/Makefile.am
|
||||
+++ b/common/Makefile.am
|
||||
@@ -46,6 +46,7 @@
|
||||
# See <http://www.gnu.org/software/libtool/manual/libtool.html#Versioning>
|
||||
# CURRENT:REVISION:AGE
|
||||
plugin_common_version = 3:0:0
|
||||
+crypto_compat_version = 0:0:0
|
||||
|
||||
AM_CPPFLAGS=-fPIC -I$(top_srcdir)/include -I$(top_builddir)/include
|
||||
|
||||
@ -1 +0,0 @@
|
||||
d /run/saslauthd 0755 root root -
|
||||
@ -1,59 +0,0 @@
|
||||
diff --git a/m4/sasl2.m4 b/m4/sasl2.m4
|
||||
index 56e0504a..098c853a 100644
|
||||
--- a/m4/sasl2.m4
|
||||
+++ b/m4/sasl2.m4
|
||||
@@ -287,6 +287,19 @@ if test "$gssapi" != no; then
|
||||
AC_CHECK_FUNCS(gss_oid_equal)
|
||||
LIBS="$cmu_save_LIBS"
|
||||
|
||||
+ cmu_save_LIBS="$LIBS"
|
||||
+ LIBS="$LIBS $GSSAPIBASE_LIBS"
|
||||
+ if test "$ac_cv_header_gssapi_gssapi_krb5_h" = "yes"; then
|
||||
+ AC_CHECK_DECL(GSS_KRB5_CRED_NO_CI_FLAGS_X,
|
||||
+ [AC_DEFINE(HAVE_GSS_KRB5_CRED_NO_CI_FLAGS_X,1,
|
||||
+ [Define if your GSSAPI implementation supports GSS_KRB5_CRED_NO_CI_FLAGS_X])],,
|
||||
+ [
|
||||
+ AC_INCLUDES_DEFAULT
|
||||
+ #include <gssapi/gssapi_krb5.h>
|
||||
+ ])
|
||||
+ fi
|
||||
+ LIBS="$cmu_save_LIBS"
|
||||
+
|
||||
cmu_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS $GSSAPIBASE_LIBS"
|
||||
AC_CHECK_FUNCS(gss_get_name_attribute)
|
||||
@@ -311,11 +324,12 @@ if test "$gssapi" != no; then
|
||||
[AC_DEFINE(HAVE_GSS_C_SEC_CONTEXT_SASL_SSF,,
|
||||
[Define if your GSSAPI implementation defines GSS_C_SEC_CONTEXT_SASL_SSF])])
|
||||
fi
|
||||
- cmu_save_LIBS="$LIBS"
|
||||
- LIBS="$LIBS $GSSAPIBASE_LIBS"
|
||||
+ LIBS="$cmu_save_LIBS"
|
||||
|
||||
- AC_MSG_CHECKING([for SPNEGO support in GSSAPI libraries])
|
||||
- AC_TRY_RUN([
|
||||
+ AC_CACHE_CHECK([for SPNEGO support in GSSAPI libraries],[ac_cv_gssapi_supports_spnego],[
|
||||
+ cmu_save_LIBS="$LIBS"
|
||||
+ LIBS="$LIBS $GSSAPIBASE_LIBS"
|
||||
+ AC_TRY_RUN([
|
||||
#ifdef HAVE_GSSAPI_H
|
||||
#include <gssapi.h>
|
||||
#else
|
||||
@@ -336,11 +350,12 @@ int main(void)
|
||||
|
||||
return (!have_spnego); // 0 = success, 1 = failure
|
||||
}
|
||||
-],
|
||||
- [ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
|
||||
- AC_MSG_RESULT(yes) ],
|
||||
- AC_MSG_RESULT(no))
|
||||
- LIBS="$cmu_save_LIBS"
|
||||
+],[ac_cv_gssapi_supports_spnego=yes],[ac_cv_gssapi_supports_spnego=no])
|
||||
+ LIBS="$cmu_save_LIBS"
|
||||
+ ])
|
||||
+ AS_IF([test "$ac_cv_gssapi_supports_spnego" = yes],[
|
||||
+ AC_DEFINE(HAVE_GSS_SPNEGO,,[Define if your GSSAPI implementation supports SPNEGO])
|
||||
+ ])
|
||||
|
||||
else
|
||||
AC_MSG_RESULT([disabled])
|
||||
@ -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` <file>.java
|
||||
|
||||
(make sure to substitute your JDK for $JAVA_HOME/lib/tools.jar)
|
||||
|
||||
to run, do
|
||||
|
||||
java -classpath <same path as above> <YourProgram>
|
||||
|
||||
----------------------------
|
||||
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.
|
||||
|
||||
@ -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 $?
|
||||
}
|
||||
@ -1,9 +0,0 @@
|
||||
[Unit]
|
||||
Description=SASL pwcheck daemon
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/sbin/pwcheck
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -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 <N>".
|
||||
# Enable credential cache, set cache size and timeout using:
|
||||
# "-c -s <cache size, like 128> -t <timeout seconds>".
|
||||
#
|
||||
SASLAUTHD_OPTS="-a pam"
|
||||
@ -1,8 +0,0 @@
|
||||
#%PAM-1.0
|
||||
|
||||
auth required pam_nologin.so
|
||||
auth include system-auth
|
||||
|
||||
account include system-auth
|
||||
|
||||
session include system-auth
|
||||
@ -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
|
||||
@ -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 $?
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<use>
|
||||
<flag name="authdaemond">
|
||||
Add Courier-IMAP authdaemond unix socket
|
||||
support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>)
|
||||
</flag>
|
||||
<flag name="openldap">Add ldap support for saslauthd</flag>
|
||||
<flag name="ldapdb">Enable ldapdb plugin</flag>
|
||||
<flag name="sample">Enable sample client and server</flag>
|
||||
<flag name="srp">Enable SRP authentication</flag>
|
||||
<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
|
||||
</use>
|
||||
<upstream>
|
||||
<remote-id type="github">cyrusimap/cyrus-imapd</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -16,9 +16,6 @@ app-eselect/eselect-iptables-20200508
|
||||
# pulled in by app-admin/sudo
|
||||
app-misc/editor-wrapper-4
|
||||
|
||||
# pulled in by dev-libs/cyrus-sasl
|
||||
net-mail/mailbase-1.1
|
||||
|
||||
# elt-patches has a cyclic dependency
|
||||
app-arch/xz-utils-0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user