From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QJ9o7-0002Di-7j for garchives@archives.gentoo.org; Sun, 08 May 2011 19:38:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB2391C059; Sun, 8 May 2011 19:38:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 860631C04F for ; Sun, 8 May 2011 19:38:15 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E1AF1B4063 for ; Sun, 8 May 2011 19:38:14 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2282) id 3E8B420054; Sun, 8 May 2011 19:38:13 +0000 (UTC) From: "Eray Aslan (eras)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, eras@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/cyrus-sasl/files: cyrus-sasl-0016_pid_file_lock_creation_mask.patch cyrus-sasl-0010_maintainer_mode.patch cyrus-sasl-0002_testsuite.patch cyrus-sasl-0026_drop_krb5support_dependency.patch cyrus-sasl-0001_versioned_symbols.patch cyrus-sasl-0008_one_time_sasl_set_alloc.patch cyrus-sasl-0012_xopen_crypt_prototype.patch cyrus-sasl-0014_avoid_pic_overwrite.patch cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch cyrus-sasl-0006_library_mutexes.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: cyrus-sasl-0016_pid_file_lock_creation_mask.patch cyrus-sasl-0010_maintainer_mode.patch cyrus-sasl-0002_testsuite.patch cyrus-sasl-0026_drop_krb5support_dependency.patch cyrus-sasl-0001_versioned_symbols.patch cyrus-sasl-0008_one_time_sasl_set_alloc.patch cyrus-sasl-0012_xopen_crypt_prototype.patch cyrus-sasl-0014_avoid_pic_overwrite.patch cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch cyrus-sasl-0006_library_mutexes.patch X-VCS-Directories: dev-libs/cyrus-sasl/files X-VCS-Committer: eras X-VCS-Committer-Name: Eray Aslan Content-Type: text/plain; charset=utf8 Message-Id: <20110508193813.3E8B420054@flycatcher.gentoo.org> Date: Sun, 8 May 2011 19:38:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: eef3a4afc3dbe79c7c2648d28d4ffccb eras 11/05/08 19:38:13 Added: cyrus-sasl-0016_pid_file_lock_creation_mask.patch cyrus-sasl-0010_maintainer_mode.patch cyrus-sasl-0002_testsuite.patch cyrus-sasl-0026_drop_krb5support_dependency.patch cyrus-sasl-0001_versioned_symbols.patch cyrus-sasl-0008_one_time_sasl_set_alloc.patch cyrus-sasl-0012_xopen_crypt_prototype.patch cyrus-sasl-0014_avoid_pic_overwrite.patch cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch cyrus-sasl-0006_library_mutexes.patch Log: Drop sqlite USE flag bug #245072. Drop pg_config from configure script bug #296391. Cherry pick and add debian patches. EAPI bump. =20 (Portage version: 2.1.9.47/cvs/Linux x86_64) Revision Changes Path 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0016_pid_file_l= ock_creation_mask.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0016_pid_file_lock_creation_mask.patch?rev=3D1.1&view=3D= markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0016_pid_file_lock_creation_mask.patch?rev=3D1.1&conte= nt-type=3Dtext/plain Index: cyrus-sasl-0016_pid_file_lock_creation_mask.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Sam Hocevar Description: pid_file_lock is created with a mask of 644 instead of 0644.= This patch fixes this octal/decimal confusion as well as the (harmless) one in= the previous umask() call. --- trunk.orig/saslauthd/saslauthd-main.c +++ trunk/saslauthd/saslauthd-main.c @@ -276,7 +276,7 @@ exit(1); } =20 - umask(077); + umask(0077); =20 pid_file_size =3D strlen(run_path) + sizeof(PID_FILE_LOCK) + 1; if ((pid_file_lock =3D malloc(pid_file_size)) =3D=3D NULL) { @@ -287,7 +287,7 @@ strlcpy(pid_file_lock, run_path, pid_file_size); strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size); =20 - if ((pid_file_lock_fd =3D open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 6= 44)) < 0) { + if ((pid_file_lock_fd =3D open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0= 644)) < 0) { rc =3D errno; logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_loc= k); logger(L_ERR, L_FUNC, "open: %s", strerror(rc)); 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0010_maintainer= _mode.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0010_maintainer_mode.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0010_maintainer_mode.patch?rev=3D1.1&content-type=3Dte= xt/plain Index: cyrus-sasl-0010_maintainer_mode.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Fabian Fagerholm Description: Enable maintainer mode to avoid auto* problems. --- trunk.orig/configure.in +++ trunk/configure.in @@ -62,6 +62,8 @@ AM_INIT_AUTOMAKE(cyrus-sasl, 2.1.23) CMU_INIT_AUTOMAKE =20 +AM_MAINTAINER_MODE + # and include our config dir scripts ACLOCAL=3D"$ACLOCAL -I \$(top_srcdir)/config" =20 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0002_testsuite.= patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0002_testsuite.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0002_testsuite.patch?rev=3D1.1&content-type=3Dtext/pla= in Index: cyrus-sasl-0002_testsuite.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Fabian Fagerholm Description: Rename the testsuite program to sasltestsuite and use /etc/s= asldb2 instead of ./sasldb as default path for the sasldb database file. --- trunk.orig/utils/testsuite.c +++ trunk/utils/testsuite.c @@ -464,9 +464,9 @@ *len =3D (unsigned) strlen("sasldb"); return SASL_OK; } else if (!strcmp(option, "sasldb_path")) { - *result =3D "./sasldb"; + *result =3D "/etc/sasldb2"; if (len) - *len =3D (unsigned) strlen("./sasldb"); + *len =3D (unsigned) strlen("/etc/sasldb2"); return SASL_OK; } else if (!strcmp(option, "canon_user_plugin")) { *result =3D cu_plugin; @@ -2925,7 +2925,7 @@ void usage(void) { printf("Usage:\n" \ - " testsuite [-g name] [-s seed] [-r tests] -a -M\n" \ + " sasltestsuite [-g name] [-s seed] [-r tests] -a -M\n" \ " g -- gssapi service name to use (default: host)\n" \ " r -- # of random tests to do (default: 25)\n" \ " a -- do all corruption tests (and ignores random ones unless -r= specified)\n" \ 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0026_drop_krb5s= upport_dependency.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0026_drop_krb5support_dependency.patch?rev=3D1.1&view=3D= markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0026_drop_krb5support_dependency.patch?rev=3D1.1&conte= nt-type=3Dtext/plain Index: cyrus-sasl-0026_drop_krb5support_dependency.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Roberto C. Sanchez Description: Drop gratuitous dependency on krb5support --- trunk.orig/aclocal.m4 +++ trunk/aclocal.m4 @@ -2924,9 +2924,6 @@ fi =20 if test "$gss_impl" =3D "auto" -o "$gss_impl" =3D "mit"; then - # check for libkrb5support first - AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=3D-lkrb5support K= 5SUPSTATIC=3D$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) - gss_failed=3D0 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl=3D"mit",gss_failed=3D1, ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lco= m_err ${K5SUP} ${LIB_SOCKET}) --- trunk.orig/cmulocal/sasl2.m4 +++ trunk/cmulocal/sasl2.m4 @@ -110,9 +110,6 @@ fi =20 if test "$gss_impl" =3D "auto" -o "$gss_impl" =3D "mit"; then - # check for libkrb5support first - AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=3D-lkrb5support K= 5SUPSTATIC=3D$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) - gss_failed=3D0 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl=3D"mit",gss_failed=3D1, ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lco= m_err ${K5SUP} ${LIB_SOCKET}) --- trunk.orig/saslauthd/aclocal.m4 +++ trunk/saslauthd/aclocal.m4 @@ -1333,9 +1333,6 @@ fi =20 if test "$gss_impl" =3D "auto" -o "$gss_impl" =3D "mit"; then - # check for libkrb5support first - AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=3D-lkrb5support K= 5SUPSTATIC=3D$gssapi_dir/libkrb5support.a,,${LIB_SOCKET}) - gss_failed=3D0 AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl=3D"mit",gss_failed=3D1, ${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lco= m_err ${K5SUP} ${LIB_SOCKET}) 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0001_versioned_= symbols.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0001_versioned_symbols.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0001_versioned_symbols.patch?rev=3D1.1&content-type=3D= text/plain Index: cyrus-sasl-0001_versioned_symbols.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Fabian Fagerholm Use versioned symbols for libsasl2. diff --git a/lib/Makefile.am b/lib/Makefile.am index e09fe6e..e74c507 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -61,8 +61,8 @@ LIB_DOOR=3D @LIB_DOOR@ lib_LTLIBRARIES =3D libsasl2.la =20 libsasl2_la_SOURCES =3D $(common_sources) $(common_headers) -libsasl2_la_LDFLAGS =3D -version-info $(sasl_version) -libsasl2_la_DEPENDENCIES =3D $(LTLIBOBJS) +libsasl2_la_LDFLAGS =3D -version-info $(sasl_version) -Wl,--version-scri= pt=3D$(top_srcdir)/Versions +libsasl2_la_DEPENDENCIES =3D $(LTLIBOBJS) $(top_srcdir)/Versions libsasl2_la_LIBADD =3D $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_D= OOR) $(LIB_CRYPT) =20 if MACOSX new file mode 100644 index 0000000..ff7190d --- /dev/null +++ b/Versions @@ -0,0 +1,6 @@ +SASL2 { + global: + sasl_*; prop_*; auxprop_plugin_info; _sasl_MD5*; +}; + +HIDDEN { local: __*; _rest*; _save*; *; }; 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0008_one_time_s= asl_set_alloc.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0008_one_time_sasl_set_alloc.patch?rev=3D1.1&view=3Dma= rkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0008_one_time_sasl_set_alloc.patch?rev=3D1.1&content-t= ype=3Dtext/plain Index: cyrus-sasl-0008_one_time_sasl_set_alloc.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Fabian Fagerholm Description: Make sasl_set_alloc a one-time function. This patch will divert all allocations to whomever called sasl_set_alloc first, hopefully that will be the application. If not, we sure *hope* the library doing stupid things has sane sasl_set_alloc semantics... It will also deny any futher tries to sasl_set_alloc after one of the _init functions are called. This patch was introduced and works fine in SASL 1.5, and no applications started behaving in insane ways, so chances are it will also work with SASL 2.1 Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D139568 Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D274087 Reference: https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=3D2525 --- trunk.orig/lib/client.c +++ trunk/lib/client.c @@ -202,6 +202,9 @@ { NULL, NULL } }; =20 + /* lock allocation type */ + _sasl_allocation_locked++; + =20 if(_sasl_client_active) { /* We're already active, just increase our refcount */ /* xxx do something with the callback structure? */ --- trunk.orig/lib/common.c +++ trunk/lib/common.c @@ -107,6 +107,7 @@ (sasl_realloc_t *) &realloc, (sasl_free_t *) &free }; +int _sasl_allocation_locked =3D 0; =20 #define SASL_ENCODEV_EXTRA 4096 =20 @@ -637,6 +638,8 @@ sasl_realloc_t *r, sasl_free_t *f) { + if (_sasl_allocation_locked++) return; + _sasl_allocation_utils.malloc=3Dm; _sasl_allocation_utils.calloc=3Dc; _sasl_allocation_utils.realloc=3Dr; --- trunk.orig/lib/saslint.h +++ trunk/lib/saslint.h @@ -300,6 +300,7 @@ =20 extern sasl_allocation_utils_t _sasl_allocation_utils; extern sasl_mutex_utils_t _sasl_mutex_utils; +extern int _sasl_allocation_locked; =20 /* * checkpw.c --- trunk.orig/lib/server.c +++ trunk/lib/server.c @@ -698,6 +698,9 @@ { NULL, NULL } }; =20 + /* lock allocation type */ + _sasl_allocation_locked++; + /* we require the appname (if present) to be short enough to be a pa= th */ if (appname !=3D NULL && strlen(appname) >=3D PATH_MAX) return SASL_BADPARAM; 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0012_xopen_cryp= t_prototype.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0012_xopen_crypt_prototype.patch?rev=3D1.1&view=3Dmark= up plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0012_xopen_crypt_prototype.patch?rev=3D1.1&content-typ= e=3Dtext/plain Index: cyrus-sasl-0012_xopen_crypt_prototype.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Dann Frazier Description: When _XOPEN_SOURCE is defined, the subsequent #include will define a correct function prototype for the crypt function. This av= oids segfaults on architectures where the size of a pointer is greater than th= e size of an integer (ia64 and amd64 are examples). This may be detected by loo= king for build log lines such as the following: auth_shadow.c:183: warning: implicit declaration of function =E2=80=98cry= pt=E2=80=99 auth_shadow.c:183: warning: cast to pointer from integer of different siz= e --- trunk.orig/saslauthd/auth_shadow.c +++ trunk/saslauthd/auth_shadow.c @@ -1,3 +1,4 @@ +#define _XOPEN_SOURCE #define PWBUFSZ 256 /***SWB***/ =20 /* MODULE: auth_shadow */ 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0014_avoid_pic_= overwrite.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0014_avoid_pic_overwrite.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0014_avoid_pic_overwrite.patch?rev=3D1.1&content-type=3D= text/plain Index: cyrus-sasl-0014_avoid_pic_overwrite.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Fabian Fagerholm Description: This patch makes sure the non-PIC version of libsasldb.a, wh= ich is created out of non-PIC objects, is not going to overwrite the PIC vers= ion, 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. --- trunk.orig/lib/Makefile.am +++ trunk/lib/Makefile.am @@ -76,7 +76,7 @@ =20 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 ../sasldb/libsasldb.la ../plugins/lib*.la; do \ if test ! -f $$i; then continue; fi; . $$i; \ for j in $$dependency_libs foo; do \ --- trunk.orig/sasldb/Makefile.am +++ trunk/sasldb/Makefile.am @@ -63,6 +63,6 @@ EXTRA_libsasldb_a_SOURCES =3D =20 libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC) - $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC) + $(AR) cru $@ $(SASL_DB_BACKEND_STATIC) =20 =20 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0011_saslauthd_= ac_prog_libtool.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch?rev=3D1.1&view=3D= markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch?rev=3D1.1&content= -type=3Dtext/plain Index: cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Fabian Fagerholm Description: Enable libtool use. --- trunk.orig/saslauthd/configure.in +++ trunk/saslauthd/configure.in @@ -25,6 +25,7 @@ AC_PROG_MAKE_SET AC_PROG_LN_S AC_PROG_INSTALL +AC_PROG_LIBTOOL =20 dnl Checks for build foo CMU_C___ATTRIBUTE__ 1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0006_library_mu= texes.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0006_library_mutexes.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sas= l/files/cyrus-sasl-0006_library_mutexes.patch?rev=3D1.1&content-type=3Dte= xt/plain Index: cyrus-sasl-0006_library_mutexes.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Author: Fabian Fagerholm Description: Exact description unknown; make sure mutex-related code work= s. --- trunk.orig/lib/common.c +++ trunk/lib/common.c @@ -771,7 +771,7 @@ result =3D sasl_canonuser_add_plugin("INTERNAL", internal_canonuser_= init); if(result !=3D SASL_OK) return result; =20 =20 - if (!free_mutex) + if (!free_mutex || free_mutex =3D=3D 0x1) free_mutex =3D sasl_MUTEX_ALLOC(); if (!free_mutex) return SASL_FAIL; =20 @@ -790,6 +790,11 @@ =20 /* serialize disposes. this is necessary because we can't dispose of conn->mutex if someone else is locked on it */ + + if (!free_mutex || free_mutex =3D=3D 0x1) + free_mutex =3D sasl_MUTEX_ALLOC(); + if (!free_mutex) return SASL_FAIL; + result =3D sasl_MUTEX_LOCK(free_mutex); if (result!=3DSASL_OK) return; =20