Fix failing get_fqhostname() - bug #405097

Package-Manager: portage-2.1.10.48/cvs/Linux x86_64

4 files changed, 299 insertions, 15 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index 0d40b3caf922..7e28f3570c37 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.241 2012/01/12 07:34:48 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.242 2012/02/21 11:56:50 eras Exp $
+
+*cyrus-sasl-2.1.25-r2 (21 Feb 2012)
+
+  21 Feb 2012; Eray Aslan <eras@gentoo.org> +cyrus-sasl-2.1.25-r2.ebuild,
+  +files/cyrus-sasl-2.1.25-get_fqhostname.patch:
+  Fix failing get_fqhostname() - bug #405097
 
 *cyrus-sasl-2.1.25-r1 (12 Jan 2012)
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index d4065f4c7bd2..b5b7c66a9280 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -28,6 +28,7 @@ AUX cyrus-sasl-2.1.25-autotools_fixes.patch 3926 RMD160 acfabca571aa6b1e11a43aa5
 AUX cyrus-sasl-2.1.25-auxprop.patch 552 RMD160 9ddebea6a4121c4c16ac2c40195a90d0f9406eed SHA1 902a219a3f6f55601b9437e772534cafd53266b6 SHA256 d9f63e60aa664f064755151fb5aa442ed52a3053057b5a63f2d88c937906dc7c
 AUX cyrus-sasl-2.1.25-avoid_pic_overwrite.patch 1076 RMD160 92c643a3525a6a700a7e4292e2291414d2b080cc SHA1 40189113b15a04ace16805b413b73d0a097556ea SHA256 80cb9cf22b0507b503ff0cf6c5946a44eb5c3808e0a77e66d56d5a53e5e76fa7
 AUX cyrus-sasl-2.1.25-fix_heimdal.patch 601 RMD160 fc1f23e054b3b77124b7b52734dee828e9e663d7 SHA1 11c1553122ec6c146d0712ccd4c93b450c56fb4e SHA256 6285b2a9c0b9ab2590a4225ac1eb8d01678e6b0559141c274d4451def65b5283
+AUX cyrus-sasl-2.1.25-get_fqhostname.patch 1638 RMD160 7e255cc4fb60276d709d028e7d937a7d469db0ee SHA1 ac78f08c5d1b9376a2622dfdaab310f8ef3b546f SHA256 72487eb691fd23acf5b5e8e72fe409df89e35d720e5eaafb4c8b0715e34ec1eb
 AUX cyrus-sasl-2.1.25-gssapi.patch 747 RMD160 7d3b222f8af73b121031a5a1d9faf8cc2e365e4d SHA1 a44cb88119447a5a4a3fc636dddffe1ac6c7b842 SHA256 0fc1bab93c3f5e2ead98f1ba480be776640f2e74b1908d8f8fa1936908e8dbec
 AUX cyrus-sasl-2.1.25-lib_before_plugin.patch 776 RMD160 82b3beff62b0d0906373317871cd8d35001eaa2b SHA1 5bb0c541e2a985cf58eab6105b456ca05ba21532 SHA256 278418f8942450bbbfb86672cc88e5d745736d59e601b1435273719069790640
 AUX cyrus-sasl-2.1.25-missing_header.patch 292 RMD160 56af3d258d88c57d32633b631dfbf8263844f700 SHA1 87140ffd2df25bcaf44709be40bcccfc1abcd143 SHA256 a83296e782a6137b0f687491314af7a82a37296729af42ca11d1f3667f7320b3
@@ -48,23 +49,24 @@ EBUILD cyrus-sasl-2.1.23-r4.ebuild 8807 RMD160 4f98323bb919e9e430b234126c802d08c
 EBUILD cyrus-sasl-2.1.23-r5.ebuild 8882 RMD160 af8382e41ac63a672840122a275aa4cb7b658f05 SHA1 2205fded4b4d8a2fa8c94247911729b9a10ab3cd SHA256 ad9d3754b7edd0d6cd43f964f0d79494680b4061dbf3b15d5bb311ad099f4ccb
 EBUILD cyrus-sasl-2.1.23-r6.ebuild 8941 RMD160 901519b9676a850e17ce8cc61f2fafb90b6d45e7 SHA1 2ec206b3e3303f3b2af28c189f0f8657c0f994ce SHA256 ad5361572f4cc9734d07adfb676397ae849ebae14515e5641a606d146cde5975
 EBUILD cyrus-sasl-2.1.25-r1.ebuild 6552 RMD160 ecd693b7b01d76de9e08b7429209743339455d51 SHA1 8eeb1540896936ffbc8de9fcd0171dc467b8ce36 SHA256 1ad6e956c269d1a14d1c67055d01a7057b312cacc3e4232b9f17e9bf42f1e41e
+EBUILD cyrus-sasl-2.1.25-r2.ebuild 6539 RMD160 dca914bd59530b46f7279e7ae0b931d2597a1129 SHA1 2224974727a36d5c77089c63e5a0d82f0c2ad578 SHA256 609908ae58f175eec8803c21b2107044a435016b99c1b8ccb987068aeebf79e8
 EBUILD cyrus-sasl-2.1.25.ebuild 6508 RMD160 58847e08212e983dae166bf9c098a91322370bde SHA1 6c41cf8714fb99c26373536185aaf4af4b0623da SHA256 29adcbd150b3bc73918a5fae7ab1bc81412f756122a6d76913579a3c5934c425
-MISC ChangeLog 40552 RMD160 bb0cd14886a585a4205bb0081d85b85be04ed48a SHA1 b6f4a0b4e46c25757f1179243585f03659a7f43d SHA256 49367e12f34bc810467c2edc395872f8eb4075cf2dbcdc2d422e3d66f92a599d
+MISC ChangeLog 40758 RMD160 fa5f4efc53f8e88d6c3cff618341f9d521983792 SHA1 ef4b57a57160a2b90527ef8cef7fa1d4eaa8c14c SHA256 6a72d387c9257c3a0e42d1a864166ad3716b34f8ec58f84cdb766e3ffa58fc28
 MISC metadata.xml 727 RMD160 c94e4a8f524c7d59bf22d538ee9f795ce41e33b6 SHA1 197a872854c2e307c7e19f9fa2f22492a7781b22 SHA256 6b9f368b484972e833084dba4aedf70c09767b816b57cb43a7c0945b8b11b497
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJPDo0eAAoJEHfx8XVYajsfOZcP/2nDwzKrTuv1CKeutDWNnIPP
-DUCTvKv7Gu4wHNDEm1LF9aEXYMReYIeC8T4RlCAGLQjSKl5+mWHb+mRq53pQB2ql
-kbee2pzLH8A0xglMT1uRu3799hRrnLOL6XcLhIM+Nm68Lbo4+23AT8boSRaO7RHT
-EZqTBccUBh4ZqKq1hV5n/bQqkenz3SYLZj6SLY7FxmHpko2caNkAmkiixxidMrSJ
-SaQ4WA+QJ1bHKZKAndf8tlBexOHfMC9k0zTngC5wboAxZ0Z17NaFjrkJLlWYndMk
-82philVBgi511H3/ifLNstzGBeWjGkxJna1KD9+jDD3ZV8cTgCrd5wYvqpKdAoVy
-uo+fGWw0JFFtN0wQTS763IT1+S6PwMCGtbjHhTQkCLdqFrj/Y0eZjHmfbU7RzYUE
-hg3ga7Y6NdQtcpx7BvYCmdBN3CsdpR/SF8OhU4JAx9ijsErJHtl3XUp9UEaqgxOz
-k8+xbJyQKnnLG6IjdrAqYNZZynJ5diTmGPNeKce9QUlGUjtl/7n800aQZWaXPtug
-6CZE3jJIbszcDmtEHM2WaS55YXvFnU+dG3qX80YntVdlC4OJ7X4J1b+lL50t6PJk
-xSo1ay/Fyjl0uMrvla5tJkJ5kzUGG+qY15ur/y28MximCzo/tueFVNJWa3ZwptCV
-KwSklgF7zZI2WFNgTJ6E
-=36UM
+iQIcBAEBCAAGBQJPQ4aIAAoJEHfx8XVYajsfLDgP/RCwSDOcMvFDKERMNnFPBGLA
+F8puDiDA/a6eEXm0/Tz7xSjUcBxIqr/qnS+TkghEhzgWoN2w6NwN64acizPLif8T
+OsWeBTE9hRYcvjs/HGGumNXjCKnmhI9vWs6j9uBsFgkv8LNKcSHTEDBHOqYH7VHQ
+NxmEDIm0i1CB41s/wbj7utdEuWRhvjdcHpBnHJdQjeYDPJoi767jBbLvZcBsw9v5
+JYDLiKiMrsluwX7aZkS+pFcr/abS7MKyK8VZoEzMu7k/aHRDTEDvQ/h1+jJQvIxY
+AlLZ+0WTenc4gnKSrWNITSxiC0k+uXffXQSGzDcfRm2N1wn38oDTlENu3OLfGNms
+1nd5R5FZHbZTJ40Y/yzGPSqWvpXCccWZNCBMvIvPXpjoJdcO6f8aK1m+L/KeVw7c
+0iwixioDaJeKci7q7uFLpEJDc9DsmakECyaq0RhkDVqc/RpI5lTSWXFZ1sBUOdAB
+3xgUeZzWaNbmX1KaGc3PV8NY67lbjUMMLjhKNnYF7yCsG3ukLk1TruKd9ao+iWTq
+7YAwC255/dnWLWq5z2xBU9ZlfvvJGDX+/k2k7Zec9t80DS8PLeqCW19PZBEx9pT7
+hoZijFEaI9XWR3GfpG5ZQklf9T6EClMAz88XHNVi4u4H7K6WfK/pxqouGwZj4tkc
+mIgxEKbJafyRTgWUY9av
+=Umna
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
new file mode 100644
index 000000000000..7c3fde47829d
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.25-r2.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2012 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.25-r2.ebuild,v 1.1 2012/02/21 11:56:50 eras Exp $
+
+EAPI=4
+inherit eutils flag-o-matic multilib autotools pam java-pkg-opt-2 db-use
+
+SASLAUTHD_CONF_VER="2.1.21"
+
+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="as-is"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb openldap mysql pam postgres sample sqlite
+srp ssl static-libs urandom"
+
+DEPEND="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}"/${P}-sasldb_al.patch
+	epatch "${FILESDIR}"/${P}-saslauthd_libtool.patch
+	epatch "${FILESDIR}"/${P}-avoid_pic_overwrite.patch
+	epatch "${FILESDIR}"/${P}-autotools_fixes.patch
+	epatch "${FILESDIR}"/${P}-as_needed.patch
+	epatch "${FILESDIR}"/${P}-missing_header.patch
+	epatch "${FILESDIR}"/${P}-gssapi.patch
+	epatch "${FILESDIR}"/${P}-lib_before_plugin.patch
+	epatch "${FILESDIR}"/${P}-fix_heimdal.patch
+	epatch "${FILESDIR}"/${P}-auxprop.patch
+	epatch "${FILESDIR}"/${PN}-2.1.23-gss_c_nt_hostbased_service.patch
+	epatch "${FILESDIR}"/${PN}-2.1.23+db-5.0.patch
+	epatch "${FILESDIR}"/${P}-get_fqhostname.patch
+
+	# Use plugindir for sasldir
+	sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+		"${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+	AT_M4DIR="${S}/cmulocal ${S}/config" 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 ; 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=/var/lib/sasl2 \
+		--with-pwcheck=/var/lib/sasl2 \
+		--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
+
+	# Add testsaslauthd (bug #58768).
+	cd "${S}/saslauthd"
+	emake testsaslauthd
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir /var/lib/sasl2 /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
+
+	newinitd "${FILESDIR}/saslauthd2.rc6" saslauthd
+	newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+
+	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.0.23
+}
+
+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
+
+	preserve_old_lib_notify /usr/$(get_libdir)/libsasl2.so.2.0.23
+}
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch
new file mode 100644
index 000000000000..68fb75bc85b5
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.25-get_fqhostname.patch
@@ -0,0 +1,61 @@
+https://bugzilla.cyrusimap.org/show_bug.cgi?id=3589
+Gentoo bug #405097
+--- cyrus-sasl-2.1.25/lib/saslutil.c.orig	2011-10-21 13:59:59.354462366 +0200
++++ cyrus-sasl-2.1.25/lib/saslutil.c	2011-10-21 14:10:55.849675881 +0200
+@@ -555,32 +555,44 @@
+ 		  NULL,		/* don't care abour service/port */
+ 		  &hints,
+ 		  &result) != 0) {
+-	/* errno on Unix, WSASetLastError on Windows are already done by the function */
+-	return (-1);
++        if (abort_if_no_fqdn) {
++	    /* errno on Unix, WSASetLastError on Windows are already done by the function */
++	    return (-1);
++	} else {
++	    goto LOWERCASE;
++	}
+     }
+ 
+-    if (abort_if_no_fqdn && (result == NULL || result->ai_canonname == NULL)) {
++    if (result == NULL || result->ai_canonname == NULL) {
+ 	freeaddrinfo (result);
++        if (abort_if_no_fqdn) {
+ #ifdef WIN32
+-	WSASetLastError (WSANO_DATA);
++	    WSASetLastError (WSANO_DATA);
+ #elif defined(ENODATA)
+-	errno = ENODATA;
++	    errno = ENODATA;
+ #elif defined(EADDRNOTAVAIL)
+-	errno = EADDRNOTAVAIL;
++	    errno = EADDRNOTAVAIL;
+ #endif
+-	return (-1);
++	    return (-1);
++	} else {
++	    goto LOWERCASE;
++	}
+     }
+ 
+-    if (abort_if_no_fqdn && strchr (result->ai_canonname, '.') == NULL) {
++    if (strchr (result->ai_canonname, '.') == NULL) {
+ 	freeaddrinfo (result);
++        if (abort_if_no_fqdn) {
+ #ifdef WIN32
+-	WSASetLastError (WSANO_DATA);
++	    WSASetLastError (WSANO_DATA);
+ #elif defined(ENODATA)
+-	errno = ENODATA;
++	    errno = ENODATA;
+ #elif defined(EADDRNOTAVAIL)
+-	errno = EADDRNOTAVAIL;
++	    errno = EADDRNOTAVAIL;
+ #endif
+-	return (-1);
++	    return (-1);
++	} else {
++	    goto LOWERCASE;
++	}
+     }
+ 
+