Fix configure.in and unrestrict allowed automake versions #486740 #468556

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

3 files changed, 241 insertions, 23 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 310b360d0421..91281a93490f 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/cyrus-sasl
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.296 2013/09/14 10:41:14 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.297 2014/02/24 05:29:54 patrick Exp $
+
+*cyrus-sasl-2.1.26-r4 (24 Feb 2014)
+
+  24 Feb 2014; Patrick Lauer <patrick@gentoo.org> +cyrus-sasl-2.1.26-r4.ebuild:
+  Fix configure.in and unrestrict allowed automake versions #486740 #468556
 
   14 Sep 2013; Agostino Sarubbo <ago@gentoo.org> cyrus-sasl-2.1.23-r7.ebuild:
   Stable for sparc, wrt bug #476764
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index e7538db096ba..69987d667d54 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX cyrus-sasl-0001_versioned_symbols.patch 914 SHA256 d64669070f4d19d884eaeb7d2b3b66987a714c2dda462bbbc4bcf452b705c3e0 SHA512 83329417818f1a33fb013090024e15786dadfc0fc865e2c6f09addbf8ba51519f171f8d583cd558b2ec98c2ece112a5427f8a6b02b74246cc948fe196a38681c WHIRLPOOL acb76440be9cbbb671d686080ec9478c70773c7a84526f2f1ea8bf4b994b51bb8c32830ba12c4e8c8dcfc973e17a00b847e7f67c39f639c1b1ad825612c989bc
 AUX cyrus-sasl-0002_testsuite.patch 1055 SHA256 d7fff57482c2a9b148296ec680327d0cbd5254ed0a0bc99f46e2dc73758a6abc SHA512 a7ea09cfb76b4c99ca8b1316c547e6168108e11495368453fbc4e4842306727c2e1aafe9d959d195d6eb5262b5e1f91668fc7ac1d24dc6b15149ae162288994e WHIRLPOOL 5b71f60005aeeea61ad403f8a7c8c8379348f22a16780a2ef35fb092ed265191638e859c9faf576e7e06dafe8357960db0b8ba8ff8d8a940731eb8de41f81a2e
 AUX cyrus-sasl-0006_library_mutexes.patch 805 SHA256 c1b955a6e9873284d27a1df62cc8952d5dbca0ea729ba326aa6f8b4ed1a96c6e SHA512 cc1783f97c65a309a11ea91ddb6f4db06590af6a987acd333dbad2da880db36b8401213e8e2cbfdb48bec021ba204f63ac0ffbea7d4dd1fdfe65d1212a062963 WHIRLPOOL 3f9876cc765d5fbce3da495135bf745c6ef6f661088635d7f2f13e60e0f276d52d65bf9ca22cfb640b5bda5d7f93244c13556524056530007aa23e5f4f3a0706
@@ -55,22 +52,6 @@ DIST cyrus-sasl-2.1.23.tar.gz 1613642 SHA256 20efcc4040cbab6e89a636a07dcf5720ee0
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 SHA256 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 WHIRLPOOL bcba17705d5d7ef9a03802d6a0c3a887bba0473605a3a48d2672aeac187193f2488f28ab01bdf659d7a68b94b4c74e36428ca4b5be840fbed2968f1592534b33
 EBUILD cyrus-sasl-2.1.23-r7.ebuild 9000 SHA256 fdb90f669d149cb2c6bf89ed8a1c337039aeffbc7cec1f54fade36ff715a69d0 SHA512 f18cb8c1a5dbc01e4d6560f668eea85e267cd5f62effc41d26c1cb9fdfd94a4e854f5923a4b84c5c8954a0ba32fff09c5696b1b729233035d1c9ffd6e9996197 WHIRLPOOL 6b7e81302fdfcec78f7285b9ce67cb580aea7c300b1586b0986d22a23c9565509055f3104ebc49891e6ecca27a3232a9046ddad400fffe8e60ea0ffa57f8be0e
 EBUILD cyrus-sasl-2.1.26-r3.ebuild 7244 SHA256 f4d4a688a48092cd723490c1064d6f45d47300b615ba18019552a198f05cbfd7 SHA512 e6b2149ac6f78886a9e6f97e9bd8d13b18d79ab7b07a2fa05933d9b6a172fe6ecaad5e3ba837f84e310a2ed45c52cf659f923184b400f4232480fec9c1e27dac WHIRLPOOL 60a34f2bc44da24cd136835eef4009328449074a2f7ec90ce2bcc54f49640fd31662b033d84ba4bb56c8a65105fab32b77c8f102f04fe7c6b2ca317e78419e90
-MISC ChangeLog 48430 SHA256 615cb435019ad15d12fcff70f0e84300917aef90181e1aa843111ca1528b8f32 SHA512 96faca9e86173a4f430fbc0a421d273865757f4ed7a8f38a73f4521c9ceb8d933e365778c72698fa4bc5acb3d5c0152947fb90b12ba3d64e2b42c3ebc23b8f03 WHIRLPOOL 0535d8844b0a22b0545ea00bc7f505091dc838c9a705e11b18ebc09a8dd649d77f51c9ab0c6bba89773ef5c5fefbd2b72e8f1c967ca0a822ed8b436930405c8e
+EBUILD cyrus-sasl-2.1.26-r4.ebuild 7306 SHA256 7b620becb18c820c926ca413dc42fd787397e949cb6c56b9a5e102e0ef875a44 SHA512 56a2941b39d3c9df5e6bb464f71f6af543cab8721938876b20da68b5fbe69e7ce509a944b6072c9e705f9f4e9d305149799a7a02a5c6379deb773338ef983118 WHIRLPOOL 22c1e5af4abfd1bdb16f4a469f4f0a1797840195d677cc6edf5eb4337d1d86b02365dceb13b156ccf64d6673181e286e65435c8336965feba7e7a3ff362b4553
+MISC ChangeLog 48628 SHA256 cd724802516b03e0d3eb55b00b29499ae8bd7dbc2f89ce53b17fd81c18001e72 SHA512 b89c26055954ecbc11211fc20bbe667a55afd5b0ee4d6c7dfbf14ec445bacf17ad06049c3bd5a230d4e5a518b2ff8da47fa06263608688e81265f1b121595a32 WHIRLPOOL d5eb6cad6bda5fc5341fb0ba18de0ad34b1e80967de87d87e3c3bf7dfa987e53b57d94c78f70ae8d2708da7c05763d17be88a4ef5df4941104db90d053396400
 MISC metadata.xml 727 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497 SHA512 8b6c6556dd9adff73a6f0bc40fd8064cae8ce8b45734ab0a30b7611be9f226144403fa0dbcf6d3965bd03e12b7c36848c91937bd8133a5581bd296d741a013c7 WHIRLPOOL 5e24419ac72d0ef8591de06c7ab4d95435234e8d894ee31b2015e6465d15a777919c714aae4e3293e194ccfcb505cf0d77f2565959d5e9ecf41c1cbb7b9ff1c5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSND1DAAoJELp701BxlEWf6qMQAIoJcz9K5fVeaww1IxdmHx4+
-Ajw+fu3Vjade5BIgUB3+NgwnajS9hCaETlkJGkTrD9RR+PCLJ0frq6DGNzVPePTH
-Nq5QCF8NKoNe+XAMCN6cuMPN+FssAWGVqEa1+omGUF4bXxMgCzotWWVC2yJMnanF
-kTAgEmNTl/QbbvEDQNE6OPyxQZn5IP2YZRp01p9Nc/+go49gbKcfYesULwlaGFzR
-BDlOpF/N/7OsiAdjDVYJMZXT2O73fc3lYOgDpgLa7zQjjYVJiEiu05CAlaL4C+oX
-ywqydUAH2tWxU9DepkbYsGtxxsaSufVBa0fUF+wSQWN+vOgs8LfATQnZud7rX+H4
-Qjiq17fbMiG0yN2zeYddEkiul7KC2zXJh6X6tvE+5qU06zwmIcSKkn63t5DHY/7D
-KFJOIi1krQgHDqX+93iRqcTG0oKZnkeuTuSBbHvyLr0RKQ4Li2jA+Uyj0pG62iP6
-a4p7EMfLSTMU5QYaiKsq4+JVjHD2w/BQLSlsxMz5ID1r+IwfgTX2PvKnSImO95/b
-K8CASbWNVNpgsoNsEhDNzJTA7iKPrWAUmIIRjtWhRvdoo2iUO57SFrHcfGNRf9mp
-bUeQfvPHZvuN2BCXI/LIi341elzT4Wef3GPp+6KKs4mY4HbmF5WPKhqP3zoKQT9y
-mXaBDlD2Zi/GrPDOJSEI
-=YFSQ
------END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild
new file mode 100644
index 000000000000..5c0c3e2964d8
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r4.ebuild
@@ -0,0 +1,232 @@
+# 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-r4.ebuild,v 1.1 2014/02/24 05:29:54 patrick Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib 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-3.2 )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	kerberos? ( virtual/krb5 )
+	openldap? ( net-nds/openldap )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql-base )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? ( dev-libs/openssl )
+	java? ( >=virtual/jdk-1.4 )"
+RDEPEND="${DEPEND}"
+
+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
+
+	# 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
+
+	# Java support.
+	use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+	local myconf
+
+	# Add authdaemond support (bug #56523).
+	if use authdaemond ; then
+		myconf="${myconf} --with-authdaemond=/var/lib/courier/authdaemon/socket"
+	fi
+
+	# Fix for bug #59634.
+	if ! use ssl ; then
+		myconf="${myconf} --without-des"
+	fi
+
+	if use mysql || use postgres || use sqlite ; then
+		myconf="${myconf} --enable-sql"
+	else
+		myconf="${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="${myconf} --with-dblib=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB as database backend for your SASLdb"
+		myconf="${myconf} --with-dblib=berkeley --with-bdb-incdir=$(db_includedir)"
+	else
+		einfo "Building without SASLdb support"
+		myconf="${myconf} --with-dblib=none"
+	fi
+
+	# Use /dev/urandom instead of /dev/random (bug #46038).
+	if use urandom ; then
+		myconf="${myconf} --with-devrandom=/dev/urandom"
+	fi
+
+	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) \
+		$(use_enable sample) \
+		$(use_enable kerberos gssapi) \
+		$(use_enable java) \
+		$(use_with java javahome ${JAVA_HOME}) \
+		$(use_with mysql) \
+		$(use_with postgres pgsql) \
+		$(use_with sqlite sqlite3 /usr/$(get_libdir)) \
+		$(use_enable srp) \
+		$(use_enable static-libs static) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	# Default location for java classes breaks OpenOffice (bug #60769).
+	# Thanks to axxo@gentoo.org for the solution.
+	cd "${S}"
+	if use java ; then
+		jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /etc/sasl2
+
+	if use sample ; then
+		docinto sample
+		dodoc 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
+
+	docinto ""
+	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"
+
+	newsbin "${S}/saslauthd/testsaslauthd" testsaslauthd
+
+	use static-libs || find "${D}"/usr/lib*/sasl2 -name 'lib*.la' -delete
+}
+
+pkg_preinst() {
+	preserve_old_lib /usr/$(get_libdir)/libsasl2.so.2
+}
+
+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"
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2
+}