diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:44:47 -0300 |
| commit | c3b94090a6330f678ade2f767e76ab7802d3463e (patch) | |
| tree | e3d2321dce46bfdbc070fcee19e2852566510fe8 /community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch | |
| parent | 652c41cc5fd8dc5f23ef6a6c93f488911e1054c7 (diff) | |
| parent | 33feb015eb09eee76827f359e685fce981d88111 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/chmsee/PKGBUILD
community/flumotion/PKGBUILD
community/gnash/PKGBUILD
community/kadu/PKGBUILD
community/mythplugins/PKGBUILD
community/performous/PKGBUILD
community/sleuthkit/PKGBUILD
community/virtualbox/PKGBUILD
community/wbar/PKGBUILD
core/attr/PKGBUILD
core/binutils/PKGBUILD
core/heimdal/PKGBUILD
core/sqlite3/PKGBUILD
extra/acpid/PKGBUILD
extra/apache-ant/PKGBUILD
extra/aria2/PKGBUILD
extra/boost/PKGBUILD
extra/bs/PKGBUILD
extra/bzr/PKGBUILD
extra/cvsps/PKGBUILD
extra/dosbox/PKGBUILD
extra/ettercap-gtk/PKGBUILD
extra/fetchmail/PKGBUILD
extra/gnome-desktop-sharp/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gptfdisk/PKGBUILD
extra/gqmpeg/PKGBUILD
extra/gstreamer0.10-base/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/gtk-theme-switch2/PKGBUILD
extra/icecast/PKGBUILD
extra/kdeedu/PKGBUILD
extra/kmldonkey/PKGBUILD
extra/kmplayer/PKGBUILD
extra/libbtctl/PKGBUILD
extra/libftdi/PKGBUILD
extra/liborigin2/PKGBUILD
extra/libpst/PKGBUILD
extra/libx86/PKGBUILD
extra/lsdvd/PKGBUILD
extra/mc/PKGBUILD
extra/monotone/PKGBUILD
extra/multitail/PKGBUILD
extra/nbsmtp/PKGBUILD
extra/nickle/PKGBUILD
extra/nppangband/PKGBUILD
extra/numlockx/PKGBUILD
extra/pidgin/PKGBUILD
extra/poppler/PKGBUILD
extra/python-gtkglext/PKGBUILD
extra/scim/PKGBUILD
extra/socat/PKGBUILD
extra/speedcrunch/PKGBUILD
extra/transmission/PKGBUILD
extra/vbetool/PKGBUILD
extra/vlc/PKGBUILD
extra/xchat-gnome/xchat-gnome.install
libre/kernel26-libre/PKGBUILD
libre/pacman/PKGBUILD
libre/xchat-gnome-libre/PKGBUILD
libre/xchat-gnome-libre/gtk2-2.20.patch
libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
libre/xchat-gnome-libre/xchat-gnome.install
multilib/nspluginwrapper/PKGBUILD
testing/libgweather/libgweather.install
testing/mesa/PKGBUILD
Diffstat (limited to 'community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch')
| -rw-r--r-- | community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch new file mode 100644 index 000000000..e4e480e82 --- /dev/null +++ b/community/autofs/0002-autofs-5.0.5-remove-ERR_remove_state-openssl-call.patch @@ -0,0 +1,59 @@ +From 205c305922cdbded91ff8fadbaad7959bdb497bc Mon Sep 17 00:00:00 2001 +From: Ian Kent <raven@themaw.net> +Date: Wed, 11 Aug 2010 09:33:09 +0800 +Subject: [PATCH 2/2] autofs-5.0.5 - remove ERR_remove_state() openssl call + +autofs should never have had to use ERR_remove_state() so remove that call. + +Lukas: Resolve a conflict in "CHANGELOG" that occured due to cherry +picking Kerberos related patches from the 5.0.6 development branch. + +Conflicts: + + CHANGELOG + +Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de> +--- + CHANGELOG | 4 ++++ + modules/lookup_ldap.c | 12 +----------- + 2 files changed, 5 insertions(+), 11 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index e734cb3..1a20a81 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,3 +1,7 @@ ++??/??/20?? autofs-5.0.6 ++----------------------- ++- remove ERR_remove_state() openssl call. ++ + 03/09/2009 autofs-5.0.5 + ----------------------- + - fix dumb libxml2 check +diff --git a/modules/lookup_ldap.c b/modules/lookup_ldap.c +index 2ecf5fe..1221c2c 100644 +--- a/modules/lookup_ldap.c ++++ b/modules/lookup_ldap.c +@@ -168,18 +168,8 @@ int unbind_ldap_connection(unsigned logopt, LDAP *ldap, struct lookup_context *c + int rv; + + #ifdef WITH_SASL +- /* +- * The OpenSSL library can't handle having its message and error +- * string database loaded multiple times and segfaults if the +- * TLS environment is not reset at the right times. As there +- * is no ldap_stop_tls call in the openldap library we have +- * to do the job ourselves, here and in lookup_done when the +- * module is closed. +- */ +- if (ctxt->use_tls == LDAP_TLS_RELEASE) { +- ERR_remove_state(0); ++ if (ctxt->use_tls == LDAP_TLS_RELEASE) + ctxt->use_tls = LDAP_TLS_INIT; +- } + autofs_sasl_unbind(ctxt); + #endif + +-- +1.7.5.1 + |