| 1 |
commit: 2f807113037587cd4572a79022313e7f66858e4e |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 20 10:58:18 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 1 16:05:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f807113 |
| 7 |
|
| 8 |
dev-libs/cyrus-sasl: Bump to version 2.1.27 |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/10454 |
| 12 |
Closes: https://bugs.gentoo.org/592528 |
| 13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-libs/cyrus-sasl/Manifest | 1 + |
| 16 |
dev-libs/cyrus-sasl/cyrus-sasl-2.1.27.ebuild | 251 +++++++++++++++++++++ |
| 17 |
.../files/cyrus-sasl-2.1.27-as_needed.patch | 25 ++ |
| 18 |
.../files/cyrus-sasl-2.1.27-autotools_fixes.patch | 31 +++ |
| 19 |
.../cyrus-sasl-2.1.27-avoid_pic_overwrite.patch | 17 ++ |
| 20 |
.../files/cyrus-sasl-2.1.27-doc_build_fix.patch | 11 + |
| 21 |
...us-sasl-2.1.27-gss_c_nt_hostbased_service.patch | 16 ++ |
| 22 |
7 files changed, 352 insertions(+) |
| 23 |
|
| 24 |
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest |
| 25 |
index 2d6baa82c81..5a11cc2bfeb 100644 |
| 26 |
--- a/dev-libs/cyrus-sasl/Manifest |
| 27 |
+++ b/dev-libs/cyrus-sasl/Manifest |
| 28 |
@@ -1 +1,2 @@ |
| 29 |
DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0 |
| 30 |
+DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b |
| 31 |
|
| 32 |
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27.ebuild |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..09fe5b51147 |
| 35 |
--- /dev/null |
| 36 |
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27.ebuild |
| 37 |
@@ -0,0 +1,251 @@ |
| 38 |
+# Copyright 1999-2018 Gentoo Authors |
| 39 |
+# Distributed under the terms of the GNU General Public License v2 |
| 40 |
+ |
| 41 |
+EAPI=6 |
| 42 |
+ |
| 43 |
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd eapi7-ver |
| 44 |
+ |
| 45 |
+SASLAUTHD_CONF_VER="2.1.26" |
| 46 |
+ |
| 47 |
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)" |
| 48 |
+HOMEPAGE="https://www.cyrusimap.org/sasl/" |
| 49 |
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz" |
| 50 |
+ |
| 51 |
+LICENSE="BSD-with-attribution" |
| 52 |
+SLOT="2" |
| 53 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 54 |
+IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom" |
| 55 |
+ |
| 56 |
+CDEPEND=" |
| 57 |
+ net-mail/mailbase |
| 58 |
+ authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) |
| 59 |
+ berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] ) |
| 60 |
+ gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] ) |
| 61 |
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
| 62 |
+ openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] ) |
| 63 |
+ mysql? ( virtual/mysql ) |
| 64 |
+ pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] ) |
| 65 |
+ postgres? ( dev-db/postgresql:* ) |
| 66 |
+ sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] ) |
| 67 |
+ ssl? ( |
| 68 |
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) |
| 69 |
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] ) |
| 70 |
+ ) |
| 71 |
+ java? ( >=virtual/jdk-1.6:= )" |
| 72 |
+ |
| 73 |
+RDEPEND=" |
| 74 |
+ ${CDEPEND} |
| 75 |
+ selinux? ( sec-policy/selinux-sasl )" |
| 76 |
+ |
| 77 |
+DEPEND="${CDEPEND} |
| 78 |
+ dev-perl/Pod-POM-View-Restructured |
| 79 |
+ dev-python/sphinx" |
| 80 |
+ |
| 81 |
+MULTILIB_WRAPPED_HEADERS=( |
| 82 |
+ /usr/include/sasl/md5global.h |
| 83 |
+) |
| 84 |
+ |
| 85 |
+PATCHES=( |
| 86 |
+ "${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch" |
| 87 |
+ "${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch" |
| 88 |
+ "${FILESDIR}/${PN}-2.1.27-as_needed.patch" |
| 89 |
+ "${FILESDIR}/${PN}-2.1.25-auxprop.patch" |
| 90 |
+ "${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch" |
| 91 |
+ "${FILESDIR}/${PN}-2.1.26-missing-size_t.patch" |
| 92 |
+ "${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch" |
| 93 |
+) |
| 94 |
+ |
| 95 |
+pkg_setup() { |
| 96 |
+ java-pkg-opt-2_pkg_setup |
| 97 |
+} |
| 98 |
+ |
| 99 |
+src_prepare() { |
| 100 |
+ default |
| 101 |
+ |
| 102 |
+ # Get rid of the -R switch (runpath_switch for Sun) |
| 103 |
+ # >=gcc-4.6 errors out with unknown option |
| 104 |
+ sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \ |
| 105 |
+ configure.ac || die |
| 106 |
+ |
| 107 |
+ # Use plugindir for sasldir |
| 108 |
+ sed -i '/^sasldir =/s:=.*:= $(plugindir):' \ |
| 109 |
+ "${S}"/plugins/Makefile.{am,in} || die "sed failed" |
| 110 |
+ |
| 111 |
+ # #486740 #468556 |
| 112 |
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \ |
| 113 |
+ -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \ |
| 114 |
+ configure.ac || die |
| 115 |
+ |
| 116 |
+ eautoreconf |
| 117 |
+} |
| 118 |
+ |
| 119 |
+src_configure() { |
| 120 |
+ append-flags -fno-strict-aliasing |
| 121 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 122 |
+ # getpassphrase is defined in /usr/include/stdlib.h |
| 123 |
+ append-cppflags -DHAVE_GETPASSPHRASE |
| 124 |
+ else |
| 125 |
+ # this horrendously breaks things on Solaris |
| 126 |
+ append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED |
| 127 |
+ fi |
| 128 |
+ |
| 129 |
+ multilib-minimal_src_configure |
| 130 |
+} |
| 131 |
+ |
| 132 |
+multilib_src_configure() { |
| 133 |
+ # Java support. |
| 134 |
+ multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}" |
| 135 |
+ |
| 136 |
+ local myeconfargs=( |
| 137 |
+ --enable-login |
| 138 |
+ --enable-ntlm |
| 139 |
+ --enable-auth-sasldb |
| 140 |
+ --disable-cmulocal |
| 141 |
+ --disable-krb4 |
| 142 |
+ --disable-macos-framework |
| 143 |
+ --enable-otp |
| 144 |
+ --without-sqlite |
| 145 |
+ --with-saslauthd="${EPREFIX}"/run/saslauthd |
| 146 |
+ --with-pwcheck="${EPREFIX}"/run/saslauthd |
| 147 |
+ --with-configdir="${EPREFIX}"/etc/sasl2 |
| 148 |
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2 |
| 149 |
+ --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2 |
| 150 |
+ $(use_with ssl openssl) |
| 151 |
+ $(use_with pam) |
| 152 |
+ $(use_with openldap ldap) |
| 153 |
+ $(use_enable ldapdb) |
| 154 |
+ $(multilib_native_use_enable sample) |
| 155 |
+ $(use_enable kerberos gssapi) |
| 156 |
+ $(multilib_native_use_enable java) |
| 157 |
+ $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr) |
| 158 |
+ $(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql) |
| 159 |
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir)) |
| 160 |
+ $(use_enable srp) |
| 161 |
+ $(use_enable static-libs static) |
| 162 |
+ |
| 163 |
+ # Add authdaemond support (bug #56523). |
| 164 |
+ $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '') |
| 165 |
+ |
| 166 |
+ # Fix for bug #59634. |
| 167 |
+ $(usex ssl '' --without-des) |
| 168 |
+ |
| 169 |
+ # Use /dev/urandom instead of /dev/random (bug #46038). |
| 170 |
+ $(usex urandom --with-devrandom=/dev/urandom '') |
| 171 |
+ ) |
| 172 |
+ |
| 173 |
+ if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then |
| 174 |
+ myeconfargs+=( --enable-sql ) |
| 175 |
+ else |
| 176 |
+ myeconfargs+=( --disable-sql ) |
| 177 |
+ fi |
| 178 |
+ |
| 179 |
+ # Default to GDBM if both 'gdbm' and 'berkdb' are present. |
| 180 |
+ if use gdbm ; then |
| 181 |
+ einfo "Building with GNU DB as database backend for your SASLdb" |
| 182 |
+ myeconfargs+=( --with-dblib=gdbm ) |
| 183 |
+ elif use berkdb ; then |
| 184 |
+ einfo "Building with BerkeleyDB as database backend for your SASLdb" |
| 185 |
+ myeconfargs+=( |
| 186 |
+ --with-dblib=berkeley |
| 187 |
+ --with-bdb-incdir="$(db_includedir)" |
| 188 |
+ ) |
| 189 |
+ else |
| 190 |
+ einfo "Building without SASLdb support" |
| 191 |
+ myeconfargs+=( --with-dblib=none ) |
| 192 |
+ fi |
| 193 |
+ |
| 194 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 195 |
+} |
| 196 |
+ |
| 197 |
+multilib_src_compile() { |
| 198 |
+ emake |
| 199 |
+ |
| 200 |
+ # Default location for java classes breaks OpenOffice (bug #60769). |
| 201 |
+ # Thanks to axxo@g.o for the solution. |
| 202 |
+ if multilib_is_native_abi && use java ; then |
| 203 |
+ jar -cvf ${PN}.jar -C java $(find java -name "*.class") |
| 204 |
+ fi |
| 205 |
+} |
| 206 |
+ |
| 207 |
+multilib_src_install() { |
| 208 |
+ default |
| 209 |
+ |
| 210 |
+ if multilib_is_native_abi; then |
| 211 |
+ if use sample ; then |
| 212 |
+ docinto sample |
| 213 |
+ dodoc "${S}"/sample/*.c |
| 214 |
+ exeinto /usr/share/doc/${P}/sample |
| 215 |
+ doexe sample/client sample/server |
| 216 |
+ fi |
| 217 |
+ |
| 218 |
+ # Default location for java classes breaks OpenOffice (bug #60769). |
| 219 |
+ if use java; then |
| 220 |
+ java-pkg_dojar ${PN}.jar |
| 221 |
+ java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)" |
| 222 |
+ # hackish, don't wanna dig through makefile |
| 223 |
+ rm -rf "${ED}/usr/$(get_libdir)/java" || die |
| 224 |
+ docinto "java" |
| 225 |
+ dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/* |
| 226 |
+ dodir "/usr/share/doc/${PF}/java/Test" |
| 227 |
+ insinto "/usr/share/doc/${PF}/java/Test" |
| 228 |
+ doins "${S}"/java/Test/*.java |
| 229 |
+ fi |
| 230 |
+ |
| 231 |
+ dosbin saslauthd/testsaslauthd |
| 232 |
+ fi |
| 233 |
+} |
| 234 |
+ |
| 235 |
+multilib_src_install_all() { |
| 236 |
+ keepdir /etc/sasl2 |
| 237 |
+ |
| 238 |
+ dodoc AUTHORS ChangeLog doc/legacy/TODO |
| 239 |
+ newdoc pwcheck/README README.pwcheck |
| 240 |
+ |
| 241 |
+ newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes |
| 242 |
+ edos2unix ${ED%/}/usr/share/doc/${PF}/release-notes |
| 243 |
+ |
| 244 |
+ docinto html |
| 245 |
+ dodoc doc/html/*.html |
| 246 |
+ |
| 247 |
+ newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd |
| 248 |
+ |
| 249 |
+ newinitd "${FILESDIR}/pwcheck.rc6" pwcheck |
| 250 |
+ systemd_dounit "${FILESDIR}/pwcheck.service" |
| 251 |
+ |
| 252 |
+ newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd |
| 253 |
+ newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd |
| 254 |
+ systemd_dounit "${FILESDIR}/saslauthd.service" |
| 255 |
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.conf" |
| 256 |
+ |
| 257 |
+ # The get_modname bit is important: do not remove the .la files on |
| 258 |
+ # platforms where the lib isn't called .so for cyrus searches the .la to |
| 259 |
+ # figure out what the name is supposed to be instead |
| 260 |
+ if ! use static-libs && [[ $(get_modname) == .so ]] ; then |
| 261 |
+ find "${ED}" -name "*.la" -delete || die |
| 262 |
+ fi |
| 263 |
+} |
| 264 |
+ |
| 265 |
+pkg_postinst () { |
| 266 |
+ # Generate an empty sasldb2 with correct permissions. |
| 267 |
+ if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then |
| 268 |
+ einfo "Generating an empty sasldb2 with correct permissions ..." |
| 269 |
+ echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \ |
| 270 |
+ || die "Failed to generate sasldb2" |
| 271 |
+ "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \ |
| 272 |
+ || die "Failed to delete temp user" |
| 273 |
+ chown root:mail "${EROOT}/etc/sasl2/sasldb2" \ |
| 274 |
+ || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2" |
| 275 |
+ chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \ |
| 276 |
+ || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2" |
| 277 |
+ fi |
| 278 |
+ |
| 279 |
+ if use authdaemond ; then |
| 280 |
+ elog "You need to add a user running a service using Courier's" |
| 281 |
+ elog "authdaemon to the 'mail' group. For example, do:" |
| 282 |
+ elog " gpasswd -a postfix mail" |
| 283 |
+ elog "to add the 'postfix' user to the 'mail' group." |
| 284 |
+ fi |
| 285 |
+ |
| 286 |
+ elog "pwcheck and saslauthd home directories have moved to:" |
| 287 |
+ elog " /run/saslauthd, using tmpfiles.d" |
| 288 |
+} |
| 289 |
|
| 290 |
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch |
| 291 |
new file mode 100644 |
| 292 |
index 00000000000..7cd9e151fbb |
| 293 |
--- /dev/null |
| 294 |
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-as_needed.patch |
| 295 |
@@ -0,0 +1,25 @@ |
| 296 |
+Author: Matthias Klose <doko@××××××.com> |
| 297 |
+Desription: Fix FTBFS, add $(SASL_DB_LIB) as dependency to libsasldb, and use |
| 298 |
+it. |
| 299 |
+--- cyrus-sasl-2.1.27/saslauthd/Makefile.am |
| 300 |
++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am |
| 301 |
+@@ -25,7 +25,7 @@ |
| 302 |
+ saslauthd_DEPENDENCIES = saslauthd-main.o $(LTLIBOBJS_FULL) |
| 303 |
+ saslauthd_LDADD = @SASL_KRB_LIB@ \ |
| 304 |
+ @GSSAPIBASE_LIBS@ @LIB_CRYPT@ @LIB_SIA@ \ |
| 305 |
+- @LIB_SOCKET@ @SASL_DB_LIB@ @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS) |
| 306 |
++ @LIB_SOCKET@ ../sasldb/libsasldb.la @LIB_PAM@ @LDAP_LIBS@ $(LTLIBOBJS_FULL) $(CRYPTO_COMPAT_OBJS) $(LIBSASLDB_OBJS) |
| 307 |
+ |
| 308 |
+ testsaslauthd_SOURCES = testsaslauthd.c utils.c |
| 309 |
+ testsaslauthd_LDADD = @LIB_SOCKET@ |
| 310 |
+--- cyrus-sasl-2.1.27/sasldb/Makefile.am |
| 311 |
++++ cyrus-sasl-2.1.27/sasldb/Makefile.am |
| 312 |
+@@ -54,6 +54,6 @@ |
| 313 |
+ |
| 314 |
+ libsasldb_la_SOURCES = allockey.c sasldb.h |
| 315 |
+ EXTRA_libsasldb_la_SOURCES = $(extra_common_sources) |
| 316 |
+-libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) |
| 317 |
+-libsasldb_la_LIBADD = $(SASL_DB_BACKEND) |
| 318 |
++libsasldb_la_DEPENDENCIES = $(SASL_DB_BACKEND) $(SASL_DB_LIB) |
| 319 |
++libsasldb_la_LIBADD = $(SASL_DB_BACKEND) $(SASL_DB_LIB) |
| 320 |
+ libsasldb_la_LDFLAGS = -no-undefined |
| 321 |
|
| 322 |
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch |
| 323 |
new file mode 100644 |
| 324 |
index 00000000000..2ce971efc5b |
| 325 |
--- /dev/null |
| 326 |
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-autotools_fixes.patch |
| 327 |
@@ -0,0 +1,31 @@ |
| 328 |
+--- cyrus-sasl-2.1.27/configure.ac |
| 329 |
++++ cyrus-sasl-2.1.27/configure.ac |
| 330 |
+@@ -44,6 +44,8 @@ |
| 331 |
+ |
| 332 |
+ AC_PREREQ(2.63) |
| 333 |
+ |
| 334 |
++AC_CONFIG_MACRO_DIR([config]) |
| 335 |
++ |
| 336 |
+ dnl |
| 337 |
+ dnl REMINDER: When changing the version number here, please also update |
| 338 |
+ dnl the values in win32/include/config.h and include/sasl.h as well. |
| 339 |
+--- cyrus-sasl-2.1.27/Makefile.am |
| 340 |
++++ cyrus-sasl-2.1.27/Makefile.am |
| 341 |
+@@ -44,6 +44,8 @@ |
| 342 |
+ # |
| 343 |
+ ################################################################ |
| 344 |
+ |
| 345 |
++ACLOCAL_AMFLAGS = -I config |
| 346 |
++ |
| 347 |
+ if SASLAUTHD |
| 348 |
+ SAD = saslauthd |
| 349 |
+ else |
| 350 |
+--- cyrus-sasl-2.1.27/saslauthd/Makefile.am |
| 351 |
++++ cyrus-sasl-2.1.27/saslauthd/Makefile.am |
| 352 |
+@@ -1,4 +1,6 @@ |
| 353 |
+ AUTOMAKE_OPTIONS = 1.7 |
| 354 |
++ACLOCAL_AMFLAGS = -I ../config |
| 355 |
++ |
| 356 |
+ sbin_PROGRAMS = saslauthd testsaslauthd |
| 357 |
+ EXTRA_PROGRAMS = saslcache |
| 358 |
+ |
| 359 |
|
| 360 |
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch |
| 361 |
new file mode 100644 |
| 362 |
index 00000000000..c331039e2f1 |
| 363 |
--- /dev/null |
| 364 |
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-avoid_pic_overwrite.patch |
| 365 |
@@ -0,0 +1,17 @@ |
| 366 |
+Author: Fabian Fagerholm <fabbe@××××××.org> |
| 367 |
+Description: This patch makes sure the non-PIC version of libsasldb.a, which |
| 368 |
+is created out of non-PIC objects, is not going to overwrite the PIC version, |
| 369 |
+which is created out of PIC objects. The PIC version is placed in .libs, and |
| 370 |
+the non-PIC version in the current directory. This ensures that both non-PIC |
| 371 |
+and PIC versions are available in the correct locations. |
| 372 |
+--- cyrus-sasl-2.1.27/lib/Makefile.am |
| 373 |
++++ cyrus-sasl-2.1.27/lib/Makefile.am |
| 374 |
+@@ -98,7 +98,7 @@ |
| 375 |
+ |
| 376 |
+ libsasl2.a: libsasl2.la $(SASL_STATIC_OBJS) |
| 377 |
+ @echo adding static plugins and dependencies |
| 378 |
+- $(AR) cru .libs/$@ $(SASL_STATIC_OBJS) |
| 379 |
++ $(AR) cru $@ $(SASL_STATIC_OBJS) |
| 380 |
+ @for i in ./libsasl2.la ../common/libplugin_common.la ../sasldb/libsasldb.la ../plugins/lib*.la; do \ |
| 381 |
+ if test ! -f $$i; then continue; fi; . $$i; \ |
| 382 |
+ for j in $$dependency_libs foo; do \ |
| 383 |
|
| 384 |
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch |
| 385 |
new file mode 100644 |
| 386 |
index 00000000000..bdd02f77966 |
| 387 |
--- /dev/null |
| 388 |
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-doc_build_fix.patch |
| 389 |
@@ -0,0 +1,11 @@ |
| 390 |
+--- cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py |
| 391 |
++++ cyrus-sasl-2.1.27/docsrc/exts/sphinxlocal/writers/manpage.py |
| 392 |
+@@ -23,7 +23,7 @@ |
| 393 |
+ from sphinx import addnodes |
| 394 |
+ from sphinx.locale import admonitionlabels, _ |
| 395 |
+ from sphinx.util.osutil import ustrftime |
| 396 |
+-from sphinx.util.compat import docutils_version |
| 397 |
++#from sphinx.util.compat import docutils_version |
| 398 |
+ |
| 399 |
+ class CyrusManualPageWriter(ManualPageWriter): |
| 400 |
+ |
| 401 |
|
| 402 |
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch |
| 403 |
new file mode 100644 |
| 404 |
index 00000000000..c585cb158e1 |
| 405 |
--- /dev/null |
| 406 |
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-gss_c_nt_hostbased_service.patch |
| 407 |
@@ -0,0 +1,16 @@ |
| 408 |
+Gentoo bug #389349 |
| 409 |
+--- cyrus-sasl-2.1.27/m4/sasl2.m4 |
| 410 |
++++ cyrus-sasl-2.1.27/m4/sasl2.m4 |
| 411 |
+@@ -220,7 +220,11 @@ |
| 412 |
+ [AC_WARN([Cybersafe define not found])]) |
| 413 |
+ |
| 414 |
+ elif test "$ac_cv_header_gssapi_h" = "yes"; then |
| 415 |
+- AC_EGREP_HEADER(GSS_C_NT_HOSTBASED_SERVICE, gssapi.h, |
| 416 |
++ AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h, |
| 417 |
++ [#include <gssapi.h> |
| 418 |
++ #ifdef GSS_C_NT_HOSTBASED_SERVICE |
| 419 |
++ hostbased_service_gss_nt_yes |
| 420 |
++ #endif], |
| 421 |
+ [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,, |
| 422 |
+ [Define if your GSSAPI implementation defines GSS_C_NT_HOSTBASED_SERVICE])]) |
| 423 |
+ elif test "$ac_cv_header_gssapi_gssapi_h"; then |
Archives