summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/cyrus-sasl')
-rw-r--r--dev-libs/cyrus-sasl/ChangeLog8
-rw-r--r--dev-libs/cyrus-sasl/Manifest31
-rw-r--r--dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild242
-rw-r--r--dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch2
4 files changed, 266 insertions, 17 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 96e381046b0d..d252cedbe5b5 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-libs/cyrus-sasl
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.305 2014/08/20 15:45:47 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.306 2014/08/22 11:35:36 eras Exp $
+
+*cyrus-sasl-2.1.26-r9 (22 Aug 2014)
+
+ 22 Aug 2014; Eray Aslan <eras@gentoo.org> +cyrus-sasl-2.1.26-r9.ebuild,
+ files/cyrus-sasl-2.1.26-send-imap-logout.patch:
+ Fix send-imap-logout patch - bug #520486. Thanks to Jeroen Roovers
20 Aug 2014; Eray Aslan <eras@gentoo.org> cyrus-sasl-2.1.26-r3.ebuild:
Fix stable version for >mysql-5.5 as well
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 11d39791b0e4..f136417f0d36 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -40,7 +40,7 @@ AUX cyrus-sasl-2.1.26-CVE-2013-4122.patch 3838 SHA256 39c3c404d6fc0da79c51157c6a
AUX cyrus-sasl-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch 284 SHA256 334c3a2c7f409707026136ef595845f61e971e369035c3b5e3bf284f1e7e6e1d SHA512 f3b789b7dea3f6a51fca6fd1877c81b5f5a3be342fa5c90ddae98a822e0c2a71e8fa582c6cb60c696363aa5cb99db8609cd6b3a91c5d402a0ad1e6124c726f5f WHIRLPOOL 70fb8cbddf81c3dc631c0b9df72d3255590d20ae5d7d1d0ed6ca70548aaef3c48444703821c2a5ccc3b7fec5592584bc843fe5284fa1b0ef40a3446727e0f6eb
AUX cyrus-sasl-2.1.26-fix_dovecot_authentication.patch 2603 SHA256 3edf79a6b1a03c87bef8b41f858ffe32c778288cd22ffc05460c3b8ad2f6393c SHA512 4244015451dfd41443a0cf8b56ae19a1dfb550e374fcdc37dc091a54f73ab36818c25fe96f7837e3ddfe5c7952d309a5b51bedfe0b7c7f1dec8ecf15f067acda WHIRLPOOL da1a5afb7a17e0eb3e7ca7586769a766b994794d3c24a21a88c895b17b0685a06287186b3bba6cce2daf0216ee91c89f79770f205eaa6b7ba844ade263ea134b
AUX cyrus-sasl-2.1.26-missing-size_t.patch 348 SHA256 1821e0f511a3eab2cbefba36b6538a997afad2a4892d1fcbf22847d34e06711e SHA512 026183880caa504af9dda5fb93a6f47a159c7ab6af79463bc512709681dd260489411b8b8da78a9f8cd260b77ae5d1977854a39de80bc48f3a03e3ffa1b09fb2 WHIRLPOOL c71d5e4919577b6c23b1610c3fa695ad035befa9cc1de43867c9e9c17016f681854e734275241dab60271d3bc7198fd633b079ab6f53e6b8bc8ce4c513eff6bd
-AUX cyrus-sasl-2.1.26-send-imap-logout.patch 1897 SHA256 3af4cd230e7a0374a2b581f42372d157ac2e69562e6d7f93be08d26fc6ec6d98 SHA512 076d86d4a3fe0fe94c0b6a112cfeb7e8a5f7cc5172830b4f88b2e5bbb1dbbee186933191736497b269b312a9770b6fa4ab831b3f41f447836d7637541dacc173 WHIRLPOOL 5f36da99554ef1d944a7d2e84f44f499f2fd7f169ae09a0418f5e39d59aae675c765a105d3e31293d345229756c6273242aefc4764d813edc1d884f9a1dfa4bf
+AUX cyrus-sasl-2.1.26-send-imap-logout.patch 1897 SHA256 021289615c690937dacf7bd0d1f23823255d141ea0c7f81a9f98d4d2b42260d4 SHA512 b30a4faea9fb66d8fab95a27b8ec87371d3650c5d2d4475449b8cebb223631d1afe9cdebd8c9b076e77bc3d2e2f5c32b24fe9292db26523212a72754cbff9995 WHIRLPOOL b7348e5300c7584d9bf18421a703a66c348bbb926c569da618876c500c78385b5580cab98c261fb051684ed45f2fb682ca837a0d4beff789f94134801898f0fa
AUX cyrus-sasl.conf 34 SHA256 1d246914153ca86390e7c39aaa9494ce1175d783d3292a8cc5a2d867b816fb7b SHA512 67b9bb97191d091ffc2b8f450ad88a558df304a29651a9a49407c50df0a316666a96e7d1a2ca3ac8ee5e60a58a5d5b618ce963661f4f45049dc6b3ef2cf8099e WHIRLPOOL 671625830fc9df9b44fff4d7fe16a7d7e76c42e8c1cf75cc7a725586aad3f80b98aa5a07ae5dea848833aed6aa02294c2a7b9969f1e708dd6854370a62c5cd23
AUX java.README.gentoo 934 SHA256 aeb733ab6371c1fe50e413e8469dcd11f0750b5afff489408c45f118857fc3fe SHA512 afcecb94e8e8c427b9491fc21312f4bed2a7d4ecedbbec8fec895cf8ca1e747073979f4415e12d8499eadbc29e8d74c6029f7cdfd7a2cb732454faaa19d52dd4 WHIRLPOOL d32cd2cfc9ffab9f791f48e0450c7eeff1b2203e29af8df8b96c4091ca7195cd579e41f38b857ef646eec28a11ea9e7c80aa6cee3f41a58d354b732a6ea15a92
AUX pwcheck.rc6 518 SHA256 3e4999ec0671b21845b12229b48b21a24d7ee73fe27d6b1432f2f26482a0371d SHA512 63be5e3a60a149e935c845816c9999ea4b40ba21e5e47d817ee3a86182a814908343fcf6457d07a982d2abe7182227cd80c6cc876fc88a0b6e143bee7980cbd5 WHIRLPOOL 2104689b50c03b630481c2fc3ecd61e651cb46a40a6a49f146a2c73e985b05931998ecd8d4b3f03585bdbace77653425dd237a2fd51530ee80614536efccf75f
@@ -60,22 +60,23 @@ EBUILD cyrus-sasl-2.1.26-r4.ebuild 7304 SHA256 5cfc9d22b5df08c5764dbc62a9acddf7d
EBUILD cyrus-sasl-2.1.26-r5.ebuild 7243 SHA256 e03e387a42c2df294ac8606850d43aa56d07d7807ccc7effe916d25684fcefef SHA512 ce52378c3d58195fce4f61fb50cfc8b128a3ff92f4de91cca194ba745e3684048484814bb616033ff03048d184649865bd5741c31a2a44cdd63537507ccd7ee1 WHIRLPOOL ecee304416b6031d0ad8cf0c08758c1289d8de6bd3a985bb54eb36535b24e60d096f6ec28c616131929db07eab9895243ee8bb474766077dcdf4a377c1b1aca1
EBUILD cyrus-sasl-2.1.26-r7.ebuild 7735 SHA256 62352c86b10f4a9cedd4ecd8d6d342bb3d56604bdb79030bef525f45939b7c70 SHA512 79bec3b3a85ed8614ff76ccdddc61066fc3d34a6d0c88c2fea784faa3c668b34ad38e612c2790b1c587c96160de25c5e8f245f32404bc08ada50d55a92633ac5 WHIRLPOOL 2c917cfd2a50030993225b3e70c0b4431231b9f0af5e774ad14761d2c1b42a626d5d220401a95dcf85d19ccf9f569899be22690dbec5e731af82e7d9492db252
EBUILD cyrus-sasl-2.1.26-r8.ebuild 7744 SHA256 10fc365838aed7d52b5940e33e9c2fd841c77e1281c271d3d1ee148cdf253760 SHA512 d43c3c90d337ecddc6cba55b07441331f8243fbe3581a92bbc83bf71be6b5a700d38419b479495cdf5076bce42b822393a48a14517e5677fffc210d360fb3347 WHIRLPOOL 96204eaace0e2bfd6cbb12ac8cede044bba6b6662e06cb34c24a509e59386608cdec39ee096e12165eb2df5b0c8f929b83210cdcd48284e40e09b26af73eda6d
-MISC ChangeLog 50081 SHA256 7178b864cef59f83468639f89e208a516d374b495125e62fdf96167356af8ed2 SHA512 f77fe1fa10d6332e1774da70f8d1c027711aaef6b60ea2be24635053ece729bf73c224f73bd24b49fd9490d06d11f1bca40aa739081ea5192f1d9e82890a20d0 WHIRLPOOL 36453461b089e661fdea291814db21f5b2144dfec19146d4623d16cc6857ee40ae7707aff65474d0e9443e994c9191e06cf4c656fca87112f5a104daf995e035
+EBUILD cyrus-sasl-2.1.26-r9.ebuild 7744 SHA256 72f0ffaf4b3c288b5159f62b66d28985941218b784d9820cc220b6ca1dd93933 SHA512 b1239536fc6e8fcb87e013d4dd1570f5c7f9023c8880094232d2e4b51b785aca6df55b0dccf3e8ef7b573e8659d386d47b89bbb2e4b6ff08ee3ea81b00a41b03 WHIRLPOOL 49e0a7c91eb06bd6a772c0ab375dbd1b1c6eec82aef5e7811219775acb6cd56f8011a0c27bb183708415fcf9b32aafb7b77b64227e45ed049f4a0077084acd92
+MISC ChangeLog 50313 SHA256 fcbb19dc564afb4e95e539fa8d03b5ae7c800093da8b8ce13d807ea396abe800 SHA512 52086c00d75a082e7ec247a7fecf65406c20b1f5ca01f8924f132efb63e6caed0c2402b1119909aa865723c8c430700058987b2d4f4b313930ecd28c42f26548 WHIRLPOOL 0ff3add6240b0121292cdc1da843dd3325432da4faacc46916e780f1a7ee9dbf4de52ae0a4ea78ea7cba06643fd037242d0c824192e2a1777e58d41a1365467e
MISC metadata.xml 727 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497 SHA512 8b6c6556dd9adff73a6f0bc40fd8064cae8ce8b45734ab0a30b7611be9f226144403fa0dbcf6d3965bd03e12b7c36848c91937bd8133a5581bd296d741a013c7 WHIRLPOOL 5e24419ac72d0ef8591de06c7ab4d95435234e8d894ee31b2015e6465d15a777919c714aae4e3293e194ccfcb505cf0d77f2565959d5e9ecf41c1cbb7b9ff1c5
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJT9MK2AAoJEHfx8XVYajsfK/wP/jHbBreS8HGkXTJOyqp8xYw6
-yUlpH5hYmK9arnvP4Yh427q569nIITpG4f3fwtwx4EXmO6nPlNPxn1IqyM7aDGqC
-RiuA9QG8e71hjqzc4/0TAi8V0UVoX6y0g/wVEe7EgHlk1eRIfc+V/hOX3odHSz+z
-11sf0V1VRUOkOh9lOAcgbpmh7U6CCDBvCh4SnTcWsqfK/W+Mtgry4MTIHTlqKrWT
-Ap7Kf4vUSSOEmTrpEnYrgsBSmt33tkrfju8aftRAugtJorkznSxj4FewAtPtBr+K
-9B4YAhO1VLXp9zq7081hJmD+0bv9LYFYDWoYzVHm0prM6IFTONV5fqHnwb6S45Nc
-YH5vcpRLwk5jssWDa8et+SlBO66zSV5DUdXZm+UHtzgnovXGgH6ApYcBhm77ixyG
-QodJq7tHVQmUP6W6WGOGyo9aUthuMnpjLxl6eiu58ttBZKBHf38ZyZIDpZXRRZu+
-Ff2BtHIAXS6OifNTko6u1ln+ZJK/Ddvn5eOmHQzuv/C8KY8wiMqfACGBFz4ABm75
-nsJLUjbia0HQf/cTORbo4M8ldXEmu9Ohhaci+REACu5ZjMIomDglVSfZDRPOjatY
-/SnNbxaXUtn9kg/e4a18wORKRIH5V7TlUwnTjmnxrAVKQ6hT/44yKwBm8yQg2ZV8
-ZhQ79C/HvpD76Hk7tk7L
-=IsGp
+iQIcBAEBCAAGBQJT9ysWAAoJEHfx8XVYajsf9j8QALUG44Be6EaMoz543fSMRi1O
+qsVPbSA8CmxUDy6H9jBTF7sI1m7MsHA0nX4Yw71Gv6h7I9BdAkqOqBstdIGa3wGp
+rQX4c2KrWnKFvn+nYWIJH9NAmTPd4HlkCK1ICgBRRKeWFgKNVYBhJXpn06c4rsBY
+t/A0AODQuec2E1PNycG8Lq/fg5clDGZE1dVFNJK5IPxNPsUmP1q8WZy5zEZUP8rA
+p2WPPLcNoWPQQanNFdBnWZtd2kvfGJFWJBTAr/jrNtoW0RvJ7Qjn4lkG4KuBx5UE
+OkkQqno0EaxOl+oiwH2vIYMaQBS8RK1AI33Cb0S4ac5/+0B1zWFwh9M8Fo8pvknz
+CBEzsbt42eKI+71c13B5+MQynQ/mNTxWhAIAz2bkjQa6f1F8ryjqb2j+R2lwoRJP
+0z9tPfxU9nVTE+kFXG8oqfOpB35PkhYbAMr/SWIb/00xGmKoD0K6uQFhHm6F8iSO
+VZqd6wSWbI/2cEm2PXWGyCS+BNAuGkUJvWqXkdo8o3w3JtUzbpSlOnqD1R3jhAMR
+67BHi+n62YrXc1mZoKdNsnpeorNdisZm41Bm8wyvWeQpXD8j3e0PVXU957FYhL3A
+XjkgDUUF6zcrpxA9r5y6ScPXp6hwORG2F5AgEo4G8RZDgJmlXCNFnCdE5g54me/o
+p0sicA5LWRkSdvZxaiiQ
+=FMbx
-----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
new file mode 100644
index 000000000000..e5f2275314f0
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild
@@ -0,0 +1,242 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r9.ebuild,v 1.1 2014/08/22 11:35:36 eras Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="http://cyrusimap.web.cmu.edu/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
+srp ssl static-libs urandom"
+
+DEPEND="net-mail/mailbase
+ 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? ( virtual/mysql )
+ pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
+ postgres? ( dev-db/postgresql-base )
+ sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+ ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/sasl/md5global.h
+)
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.1.25-sasldb_al.patch
+ epatch "${FILESDIR}"/${PN}-2.1.25-saslauthd_libtool.patch
+ epatch "${FILESDIR}"/${PN}-2.1.25-avoid_pic_overwrite.patch
+ epatch "${FILESDIR}"/${PN}-2.1.25-autotools_fixes.patch
+ epatch "${FILESDIR}"/${PN}-2.1.25-as_needed.patch
+ epatch "${FILESDIR}"/${PN}-2.1.25-missing_header.patch
+ epatch "${FILESDIR}"/${PN}-2.1.25-fix_heimdal.patch
+ epatch "${FILESDIR}"/${PN}-2.1.25-auxprop.patch
+ epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
+ epatch "${FILESDIR}"/${PN}-2.1.25-service_keytabs.patch
+ epatch "${FILESDIR}"/${PN}-2.1.26-missing-size_t.patch
+ epatch "${FILESDIR}"/${PN}-2.1.26-CVE-2013-4122.patch
+ epatch "${FILESDIR}"/${PN}-2.1.26-send-imap-logout.patch
+ epatch "${FILESDIR}"/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch
+ epatch "${FILESDIR}"/${PN}-2.1.26-fix_dovecot_authentication.patch
+
+ # 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.in || 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.in || die
+ sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+ saslauthd/configure.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # Java support.
+ multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+ local myconf=()
+
+ # Add authdaemond support (bug #56523).
+ if use authdaemond ; then
+ myconf+=( --with-authdaemond=/var/lib/courier/authdaemon/socket )
+ fi
+
+ # Fix for bug #59634.
+ if ! use ssl ; then
+ myconf+=( --without-des )
+ fi
+
+ if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+ myconf+=( --enable-sql )
+ else
+ myconf+=( --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"
+ myconf+=( --with-dblib=gdbm )
+ elif use berkdb ; then
+ einfo "Building with BerkeleyDB as database backend for your SASLdb"
+ myconf+=(
+ --with-dblib=berkeley
+ --with-bdb-incdir="$(db_includedir)"
+ )
+ else
+ einfo "Building without SASLdb support"
+ myconf+=( --with-dblib=none )
+ fi
+
+ # Use /dev/urandom instead of /dev/random (bug #46038).
+ if use urandom ; then
+ myconf+=( --with-devrandom=/dev/urandom )
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --enable-login \
+ --enable-ntlm \
+ --enable-auth-sasldb \
+ --disable-cmulocal \
+ --disable-krb4 \
+ --enable-otp \
+ --without-sqlite \
+ --with-saslauthd=/run/saslauthd \
+ --with-pwcheck=/run/saslauthd \
+ --with-configdir=/etc/sasl2 \
+ --with-plugindir=/usr/$(get_libdir)/sasl2 \
+ --with-dbpath=/etc/sasl2/sasldb2 \
+ $(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 java javahome ${JAVA_HOME}) \
+ $(multilib_native_use_with mysql mysql /usr) \
+ $(multilib_native_use_with postgres pgsql) \
+ $(use_with sqlite sqlite3 /usr/$(get_libdir)) \
+ $(use_enable srp) \
+ $(use_enable static-libs static) \
+ "${myconf[@]}"
+}
+
+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 "${D}/usr/$(get_libdir)/libjavasasl.so"
+ # hackish, don't wanna dig through makefile
+ rm -Rf "${D}/usr/$(get_libdir)/java"
+ docinto "java"
+ dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+ dodir "/usr/share/doc/${PF}/java/Test"
+ insinto "/usr/share/doc/${PF}/java/Test"
+ doins "${S}"/java/Test/*.java
+ fi
+
+ dosbin saslauthd/testsaslauthd
+ fi
+}
+
+multilib_src_install_all() {
+ keepdir /etc/sasl2
+
+ dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+ newdoc pwcheck/README README.pwcheck
+ dohtml doc/*.html
+
+ docinto "saslauthd"
+ dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+ newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+ 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"
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+ prune_libtool_files --modules
+}
+
+pkg_postinst () {
+ # Generate an empty sasldb2 with correct permissions.
+ if ( use berkdb || use gdbm ) && [[ ! -f "${ROOT}/etc/sasl2/sasldb2" ]] ; then
+ einfo "Generating an empty sasldb2 with correct permissions ..."
+ echo "p" | "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -p login \
+ || die "Failed to generate sasldb2"
+ "${ROOT}/usr/sbin/saslpasswd2" -f "${ROOT}/etc/sasl2/sasldb2" -d login \
+ || die "Failed to delete temp user"
+ chown root:mail "${ROOT}/etc/sasl2/sasldb2" \
+ || die "Failed to chown ${ROOT}/etc/sasl2/sasldb2"
+ chmod 0640 "${ROOT}/etc/sasl2/sasldb2" \
+ || die "Failed to chmod ${ROOT}/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.26-send-imap-logout.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.26-send-imap-logout.patch
index 3bfcfbd2d60b..d8b4b6efc3f8 100644
--- 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
@@ -12,7 +12,7 @@
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[1]; /* for sending LOGOUT 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 */