Hello community, here is the log from the commit of package mozldap for openSUSE:Factory checked in at 2015-02-20 12:01:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozldap (Old) and /work/SRC/openSUSE:Factory/.mozldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozldap" Changes: -------- --- /work/SRC/openSUSE:Factory/mozldap/mozldap.changes 2015-01-09 20:50:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mozldap.new/mozldap.changes 2015-02-20 12:01:31.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 17 16:40:17 UTC 2015 - [email protected] + +- rebased all patches to cleanly apply with fuzz=0 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozldap.spec ++++++ --- /var/tmp/diff_new_pack.tmb04l/_old 2015-02-20 12:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tmb04l/_new 2015-02-20 12:01:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package mozldap # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2009-2011 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties @@ -65,7 +65,6 @@ %package devel Summary: Development libraries and examples for Mozilla LDAP C SDK -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Development/Libraries/Other Requires: %{name}-libs = %{version}-%{release} Requires: mozilla-nspr-devel @@ -77,8 +76,8 @@ %prep %setup -q -%patch0 -p3 -%patch1 -p3 +%patch0 -p1 +%patch1 -p1 %patch2 -p1 %build ++++++ mozldap-6.0.7-fix_typo.patch ++++++ --- /var/tmp/diff_new_pack.tmb04l/_old 2015-02-20 12:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tmb04l/_new 2015-02-20 12:01:32.000000000 +0100 @@ -1,6 +1,8 @@ ---- mozldap-6.0.5.orig/mozilla/directory/c-sdk/ldap/libraries/libssldap/sslerrstrs.h 2006-10-10 14:37:35.000000000 +0100 -+++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/sslerrstrs.h 2013-09-07 16:35:55.767321281 +0100 -@@ -247,7 +247,7 @@ +Index: mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/sslerrstrs.h +=================================================================== +--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/sslerrstrs.h ++++ mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/sslerrstrs.h +@@ -247,7 +247,7 @@ ER3(SSL_ERROR_HANDSHAKE_UNEXPECTED_ALERT "SSL peer was not expecting a handshake message it received.") ER3(SSL_ERROR_DECOMPRESSION_FAILURE_ALERT , (SSL_ERROR_BASE + 60), ++++++ mozldap-6.0.7-replace_mktemp.patch ++++++ --- /var/tmp/diff_new_pack.tmb04l/_old 2015-02-20 12:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tmb04l/_new 2015-02-20 12:01:32.000000000 +0100 @@ -1,7 +1,9 @@ -diff -Ppru mozldap-6.0.7.orig/c-sdk/ldap/clients/tools/ldaptool.h mozldap-6.0.7/c-sdk/ldap/clients/tools/ldaptool.h ---- mozldap-6.0.7.orig/c-sdk/ldap/clients/tools/ldaptool.h 2011-01-06 13:05:39.000000000 +0100 -+++ mozldap-6.0.7/c-sdk/ldap/clients/tools/ldaptool.h 2014-12-17 22:08:44.852233413 +0100 -@@ -69,13 +69,13 @@ +Index: mozldap-6.0.7/c-sdk/ldap/clients/tools/ldaptool.h +=================================================================== +--- mozldap-6.0.7.orig/c-sdk/ldap/clients/tools/ldaptool.h ++++ mozldap-6.0.7/c-sdk/ldap/clients/tools/ldaptool.h +@@ -68,14 +68,14 @@ + #define WIN32_LEAN_AND_MEAN #include <windows.h> extern int getopt (int argc, char *const *argv, const char *optstring); -#include <io.h> /* for _mktemp() */ ++++++ mozldap-6.0.7-support-tls1.1-and-later.patch ++++++ --- /var/tmp/diff_new_pack.tmb04l/_old 2015-02-20 12:01:32.000000000 +0100 +++ /var/tmp/diff_new_pack.tmb04l/_new 2015-02-20 12:01:32.000000000 +0100 @@ -5,10 +5,11 @@ - Support TLS 1.1 and newer using the NSS Version Range APIs. ---- mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/ldapsinit.c.orig 2006-10-10 06:37:35.000000000 -0700 -+++ mozldap-6.0.5/mozilla/directory/c-sdk/ldap/libraries/libssldap/ldapsinit.c 2014-11-03 14:18:59.908337004 -0800 -@@ -59,8 +59,9 @@ - #endif /* OSF1V4D */ +Index: mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/ldapsinit.c +=================================================================== +--- mozldap-6.0.7.orig/c-sdk/ldap/libraries/libssldap/ldapsinit.c ++++ mozldap-6.0.7/c-sdk/ldap/libraries/libssldap/ldapsinit.c +@@ -60,6 +60,7 @@ #include <errno.h> #include <nspr.h> @@ -16,9 +17,7 @@ #include <cert.h> #include <key.h> #include <ssl.h> - #include <sslproto.h> -@@ -70,8 +71,21 @@ - #include <ldap.h> +@@ -71,6 +72,19 @@ #include <ldap_ssl.h> #include <ldappr.h> #include <pk11func.h> @@ -38,9 +37,7 @@ /* * Macro that determines how many SSL options we support. As of June, 2002 - * NSS supports 14 options numbered 1-14 (see nss/ssl.h). We allow some -@@ -247,8 +261,20 @@ - PRLDAPSocketInfo soi; +@@ -248,6 +262,18 @@ ldapssl_connect(const char *hostlist, in LDAPSSLSocketInfo *ssoip = NULL; LDAPSSLSessionInfo *sseip; PRFileDesc *sslfd = NULL; @@ -59,9 +56,7 @@ /* * Determine if secure option is set. Also, clear secure bit in options - * the we pass to the standard connect() function (since it doesn't know -@@ -305,9 +331,18 @@ - if (( sslfd = SSL_ImportFD( NULL, soi.soinfo_prfd )) == NULL ) { +@@ -306,7 +332,16 @@ ldapssl_connect(const char *hostlist, in goto close_socket_and_exit_with_error; } @@ -78,9 +73,7 @@ SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure ) != SECSuccess || ( secure && SSL_ResetHandshake( sslfd, PR_FALSE ) != SECSuccess )) { - goto close_socket_and_exit_with_error; -@@ -515,8 +550,20 @@ - LBER_SOCKET intfd = -1; +@@ -516,6 +551,18 @@ ldaptls_complete(LDAP *ld) int rc = LDAP_LOCAL_ERROR; char *hostlist = NULL; struct lextiof_socket_private *socketargp = NULL; @@ -99,9 +92,7 @@ /* * Get hostlist from LDAP Handle - */ -@@ -580,10 +627,18 @@ - rc = LDAP_LOCAL_ERROR; +@@ -581,8 +628,16 @@ ldaptls_complete(LDAP *ld) goto close_socket_and_exit_with_error; } @@ -118,9 +109,7 @@ SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure ) != SECSuccess || ( secure && SSL_ResetHandshake( sslfd, PR_FALSE ) != SECSuccess ) ) { rc = LDAP_LOCAL_ERROR; - goto close_socket_and_exit_with_error; -@@ -1370,13 +1425,25 @@ - PRLDAPSocketInfo soi; +@@ -1371,11 +1426,23 @@ ldapssl_import_fd ( LDAP *ld, int secure LDAPSSLSocketInfo *ssoip = NULL; LDAPSSLSessionInfo *sseip; PRFileDesc *sslfd = NULL; @@ -148,9 +137,7 @@ * Get hostlist from LDAP Handle */ if ( ldap_get_option(ld, LDAP_OPT_HOST_NAME, &hostlist) < 0 ) { - return( -1 ); -@@ -1431,10 +1498,18 @@ - if (( sslfd = SSL_ImportFD( NULL, soi.soinfo_prfd )) == NULL ) { +@@ -1432,8 +1499,16 @@ ldapssl_import_fd ( LDAP *ld, int secure goto reset_socket_and_exit_with_error; } @@ -168,4 +155,3 @@ SSL_OptionSet( sslfd, SSL_HANDSHAKE_AS_CLIENT, secure ) != SECSuccess || ( secure && SSL_ResetHandshake( sslfd, PR_FALSE ) != SECSuccess )) { - goto reset_socket_and_exit_with_error; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
