[cyrus-sasl] Revert "Do not leak memory memory leak in plugin_common.c ..." (#1202364)

Jakub Jelen jjelen at fedoraproject.org
Mon Mar 16 16:14:33 UTC 2015


commit 29eb7eb1fbd884506c6ecea11065d0c1cdbd5978
Author: Jakub Jelen <jjelen at redhat.com>
Date:   Mon Mar 16 16:59:59 2015 +0100

    Revert "Do not leak memory memory leak in plugin_common.c ..." (#1202364)
    
    This reverts commit c11ac22f930aa0468e8b030b39d0d15ca2b0cda6.

 cyrus-sasl-2.1.26-leak-callback-plugin_common.patch | 12 ------------
 cyrus-sasl.spec                                     |  7 ++-----
 2 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index 1992730..441e421 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -56,10 +56,8 @@ Patch52: cyrus-sasl-2.1.26-config-error.patch
 Patch53: cyrus-sasl-2.1.26-prefer-SCRAM-SHA-1-over-PLAIN.patch
 # Do not leak memory in sample server (#852755)
 Patch54: cyrus-sasl-2.1.26-sample-leak.patch
-# Do not leak memory memory leak in plugin_common.c for password callback (#1191183)
-Patch55: cyrus-sasl-2.1.26-leak-callback-plugin_common.patch
 # Document ability to run saslauthd unprivileged (#1189203)
-Patch56: cyrus-sasl-2.1.26-saslauthd-user.patch
+Patch55: cyrus-sasl-2.1.26-saslauthd-user.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: autoconf, automake, libtool, gdbm-devel, groff
@@ -205,8 +203,7 @@ chmod -x include/*.h
 %patch52 -p1 -b .configerr
 %patch53 -p1 -b .sha1vsplain
 %patch54 -p1 -b .leak
-%patch55 -p1 -b .password-callback
-%patch56 -p1 -b .man-unprivileged
+%patch55 -p1 -b .man-unprivileged
 
 
 %build


More information about the scm-commits mailing list