* [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
@ 2011-05-08 19:38 Eray Aslan (eras)
0 siblings, 0 replies; only message in thread
From: Eray Aslan (eras) @ 2011-05-08 19:38 UTC (permalink / raw
To: gentoo-commits
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.
(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_lock_creation_mask.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0016_pid_file_lock_creation_mask.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0016_pid_file_lock_creation_mask.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0016_pid_file_lock_creation_mask.patch
===================================================================
Author: Sam Hocevar <sam@zoy.org>
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);
}
- umask(077);
+ umask(0077);
pid_file_size = strlen(run_path) + sizeof(PID_FILE_LOCK) + 1;
if ((pid_file_lock = malloc(pid_file_size)) == NULL) {
@@ -287,7 +287,7 @@
strlcpy(pid_file_lock, run_path, pid_file_size);
strlcat(pid_file_lock, PID_FILE_LOCK, pid_file_size);
- if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 644)) < 0) {
+ if ((pid_file_lock_fd = open(pid_file_lock, O_CREAT|O_TRUNC|O_RDWR, 0644)) < 0) {
rc = errno;
logger(L_ERR, L_FUNC, "could not open pid lock file: %s", pid_file_lock);
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-sasl/files/cyrus-sasl-0010_maintainer_mode.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0010_maintainer_mode.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0010_maintainer_mode.patch
===================================================================
Author: Fabian Fagerholm <fabbe@debian.org>
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
+AM_MAINTAINER_MODE
+
# and include our config dir scripts
ACLOCAL="$ACLOCAL -I \$(top_srcdir)/config"
1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0002_testsuite.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0002_testsuite.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0002_testsuite.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0002_testsuite.patch
===================================================================
Author: Fabian Fagerholm <fabbe@debian.org>
Description: Rename the testsuite program to sasltestsuite and use /etc/sasldb2
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 = (unsigned) strlen("sasldb");
return SASL_OK;
} else if (!strcmp(option, "sasldb_path")) {
- *result = "./sasldb";
+ *result = "/etc/sasldb2";
if (len)
- *len = (unsigned) strlen("./sasldb");
+ *len = (unsigned) strlen("/etc/sasldb2");
return SASL_OK;
} else if (!strcmp(option, "canon_user_plugin")) {
*result = 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_krb5support_dependency.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0026_drop_krb5support_dependency.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0026_drop_krb5support_dependency.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0026_drop_krb5support_dependency.patch
===================================================================
Author: Roberto C. Sanchez <roberto@connexer.com>
Description: Drop gratuitous dependency on krb5support
--- trunk.orig/aclocal.m4
+++ trunk/aclocal.m4
@@ -2924,9 +2924,6 @@
fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
- # check for libkrb5support first
- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
-
gss_failed=0
AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
--- trunk.orig/cmulocal/sasl2.m4
+++ trunk/cmulocal/sasl2.m4
@@ -110,9 +110,6 @@
fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
- # check for libkrb5support first
- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
-
gss_failed=0
AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${K5SUP} ${LIB_SOCKET})
--- trunk.orig/saslauthd/aclocal.m4
+++ trunk/saslauthd/aclocal.m4
@@ -1333,9 +1333,6 @@
fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
- # check for libkrb5support first
- AC_CHECK_LIB(krb5support,krb5int_getspecific,K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a,,${LIB_SOCKET})
-
gss_failed=0
AC_CHECK_LIB(gssapi_krb5,gss_unwrap,gss_impl="mit",gss_failed=1,
${GSSAPIBASE_LIBS} -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_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-sasl/files/cyrus-sasl-0001_versioned_symbols.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0001_versioned_symbols.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0001_versioned_symbols.patch
===================================================================
Author: Fabian Fagerholm <fabbe@debian.org>
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= @LIB_DOOR@
lib_LTLIBRARIES = libsasl2.la
libsasl2_la_SOURCES = $(common_sources) $(common_headers)
-libsasl2_la_LDFLAGS = -version-info $(sasl_version)
-libsasl2_la_DEPENDENCIES = $(LTLIBOBJS)
+libsasl2_la_LDFLAGS = -version-info $(sasl_version) -Wl,--version-script=$(top_srcdir)/Versions
+libsasl2_la_DEPENDENCIES = $(LTLIBOBJS) $(top_srcdir)/Versions
libsasl2_la_LIBADD = $(LTLIBOBJS) $(SASL_DL_LIB) $(LIB_SOCKET) $(LIB_DOOR) $(LIB_CRYPT)
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_sasl_set_alloc.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0008_one_time_sasl_set_alloc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0008_one_time_sasl_set_alloc.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0008_one_time_sasl_set_alloc.patch
===================================================================
Author: Fabian Fagerholm <fabbe@debian.org>
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=139568
Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=274087
Reference: https://bugzilla.andrew.cmu.edu/show_bug.cgi?id=2525
--- trunk.orig/lib/client.c
+++ trunk/lib/client.c
@@ -202,6 +202,9 @@
{ NULL, NULL }
};
+ /* lock allocation type */
+ _sasl_allocation_locked++;
+
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 = 0;
#define SASL_ENCODEV_EXTRA 4096
@@ -637,6 +638,8 @@
sasl_realloc_t *r,
sasl_free_t *f)
{
+ if (_sasl_allocation_locked++) return;
+
_sasl_allocation_utils.malloc=m;
_sasl_allocation_utils.calloc=c;
_sasl_allocation_utils.realloc=r;
--- trunk.orig/lib/saslint.h
+++ trunk/lib/saslint.h
@@ -300,6 +300,7 @@
extern sasl_allocation_utils_t _sasl_allocation_utils;
extern sasl_mutex_utils_t _sasl_mutex_utils;
+extern int _sasl_allocation_locked;
/*
* checkpw.c
--- trunk.orig/lib/server.c
+++ trunk/lib/server.c
@@ -698,6 +698,9 @@
{ NULL, NULL }
};
+ /* lock allocation type */
+ _sasl_allocation_locked++;
+
/* we require the appname (if present) to be short enough to be a path */
if (appname != NULL && strlen(appname) >= PATH_MAX)
return SASL_BADPARAM;
1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0012_xopen_crypt_prototype.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0012_xopen_crypt_prototype.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0012_xopen_crypt_prototype.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0012_xopen_crypt_prototype.patch
===================================================================
Author: Dann Frazier <dannf@debian.org>
Description: When _XOPEN_SOURCE is defined, the subsequent #include <unistd.h>
will define a correct function prototype for the crypt function. This avoids
segfaults on architectures where the size of a pointer is greater than the size
of an integer (ia64 and amd64 are examples). This may be detected by looking
for build log lines such as the following:
auth_shadow.c:183: warning: implicit declaration of function ‘crypt’
auth_shadow.c:183: warning: cast to pointer from integer of different size
--- trunk.orig/saslauthd/auth_shadow.c
+++ trunk/saslauthd/auth_shadow.c
@@ -1,3 +1,4 @@
+#define _XOPEN_SOURCE
#define PWBUFSZ 256 /***SWB***/
/* 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-sasl/files/cyrus-sasl-0014_avoid_pic_overwrite.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0014_avoid_pic_overwrite.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0014_avoid_pic_overwrite.patch
===================================================================
Author: Fabian Fagerholm <fabbe@debian.org>
Description: This patch makes sure the non-PIC version of libsasldb.a, which
is created out of non-PIC objects, is not going to overwrite the PIC version,
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 @@
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 =
libsasldb.a: libsasldb.la $(SASL_DB_BACKEND_STATIC)
- $(AR) cru .libs/$@ $(SASL_DB_BACKEND_STATIC)
+ $(AR) cru $@ $(SASL_DB_BACKEND_STATIC)
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-sasl/files/cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0011_saslauthd_ac_prog_libtool.patch
===================================================================
Author: Fabian Fagerholm <fabbe@debian.org>
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
dnl Checks for build foo
CMU_C___ATTRIBUTE__
1.1 dev-libs/cyrus-sasl/files/cyrus-sasl-0006_library_mutexes.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0006_library_mutexes.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/cyrus-sasl/files/cyrus-sasl-0006_library_mutexes.patch?rev=1.1&content-type=text/plain
Index: cyrus-sasl-0006_library_mutexes.patch
===================================================================
Author: Fabian Fagerholm <fabbe@debian.org>
Description: Exact description unknown; make sure mutex-related code works.
--- trunk.orig/lib/common.c
+++ trunk/lib/common.c
@@ -771,7 +771,7 @@
result = sasl_canonuser_add_plugin("INTERNAL", internal_canonuser_init);
if(result != SASL_OK) return result;
- if (!free_mutex)
+ if (!free_mutex || free_mutex == 0x1)
free_mutex = sasl_MUTEX_ALLOC();
if (!free_mutex) return SASL_FAIL;
@@ -790,6 +790,11 @@
/* 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 == 0x1)
+ free_mutex = sasl_MUTEX_ALLOC();
+ if (!free_mutex) return SASL_FAIL;
+
result = sasl_MUTEX_LOCK(free_mutex);
if (result!=SASL_OK) return;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-05-08 19:38 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-08 19:38 [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 Eray Aslan (eras)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox