pidgin/pidgin

Merge with no conflicts.
release-2.x.y
2014-01-13, Mark Doliner
3214e5d99b41
Parents c03eefbf89a86ac5c88ccffa
Children 4577ec83135a
Merge with no conflicts.
4 files changed, 33 insertions(+), 2 deletions(-)
  • +4 -1
    ChangeLog
  • +1 -1
    libpurple/win32/global.mak
  • +27 -0
    share/ca-certs/Entrust.net_2048.pem
  • +1 -0
    share/ca-certs/Makefile.am
    • --- a/ChangeLog Mon Jan 13 18:09:59 2014 -0800
    +++ b/ChangeLog Mon Jan 13 19:50:26 2014 -0800
    @@ -30,7 +30,10 @@
    * Fix Tcl scripts. (#15520)
    * Fix crash-on-startup when ASLR is always on. (#15521)
    * Updates to dependencies:
    - * NSS 3.15.3 and NSPR 4.10.2
    + * NSS 3.15.4 and NSPR 4.10.2
    +
    + AIM:
    + * Fix untrusted certificate error.
    AIM and ICQ:
    * Fix a possible crash when receiving a malformed message in a Direct IM
    --- a/libpurple/win32/global.mak Mon Jan 13 18:09:59 2014 -0800
    +++ b/libpurple/win32/global.mak Mon Jan 13 19:50:26 2014 -0800
    @@ -17,7 +17,7 @@
    BONJOUR_TOP ?= $(WIN32_DEV_TOP)/Bonjour_SDK
    LIBXML2_TOP ?= $(WIN32_DEV_TOP)/libxml2-2.9.0
    MEANWHILE_TOP ?= $(WIN32_DEV_TOP)/meanwhile-1.0.2_daa3
    -NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.15.3-nspr-4.10.2
    +NSS_TOP ?= $(WIN32_DEV_TOP)/nss-3.15.4-nspr-4.10.2
    PERL_LIB_TOP ?= $(WIN32_DEV_TOP)/perl-5.10.0
    SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-toolkit-1.1.10
    TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/share/ca-certs/Entrust.net_2048.pem Mon Jan 13 19:50:26 2014 -0800
    @@ -0,0 +1,27 @@
    +-----BEGIN CERTIFICATE-----
    +MIIEnzCCBAigAwIBAgIERp6RGjANBgkqhkiG9w0BAQUFADCBwzELMAkGA1UEBhMC
    +VVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MTswOQYDVQQLEzJ3d3cuZW50cnVzdC5u
    +ZXQvQ1BTIGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMc
    +KGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDE6MDgGA1UEAxMxRW50cnVzdC5u
    +ZXQgU2VjdXJlIFNlcnZlciBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wOTAz
    +MjMxNTE4MjdaFw0xOTAzMjMxNTQ4MjdaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5l
    +dDFAMD4GA1UECxQ3d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkg
    +cmVmLiAobGltaXRzIGxpYWIuKTElMCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5u
    +ZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQgQ2VydGlmaWNhdGlvbiBB
    +dXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
    +rU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
    +Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3ed
    +Vc3kw37XamSrhRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4
    +LeksyZB2ZnuU4q941mVTXTzWnLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5
    +CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUiVBcAkCaTvA5JaJG/+EfTnZVCwQ5N
    +328mz8MYIWJmQ3DW1cAH4QIDAQABo4IBJzCCASMwDgYDVR0PAQH/BAQDAgEGMA8G
    +A1UdEwEB/wQFMAMBAf8wMwYIKwYBBQUHAQEEJzAlMCMGCCsGAQUFBzABhhdodHRw
    +Oi8vb2NzcC5lbnRydXN0Lm5ldDAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3Js
    +LmVudHJ1c3QubmV0L3NlcnZlcjEuY3JsMDsGA1UdIAQ0MDIwMAYEVR0gADAoMCYG
    +CCsGAQUFBwIBFhpodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NQUzAdBgNVHQ4EFgQU
    +VeSB0RGAvtiJuQijMfmhJAkWuXAwHwYDVR0jBBgwFoAU8BdiE1U9s/8KAGv7UISX
    +8+1i0BowGQYJKoZIhvZ9B0EABAwwChsEVjcuMQMCAIEwDQYJKoZIhvcNAQEFBQAD
    +gYEAj2WiMI4mq4rsNRaY6QPwjRdfvExsAvZ0UuDCxh/O8qYRDKixDk2Ei3E277M1
    +RfPB+JbFi1WkzGuDFiAy2r77r5u3n+F+hJ+ePFCnP1zCvouGuAiS7vhCKw0T43aF
    +SApKv9ClOwqwVLht4wj5NI0LjosSzBcaM4eVyJ4K3FBTF3s=
    +-----END CERTIFICATE-----
    --- a/share/ca-certs/Makefile.am Mon Jan 13 18:09:59 2014 -0800
    +++ b/share/ca-certs/Makefile.am Mon Jan 13 19:50:26 2014 -0800
    @@ -7,6 +7,7 @@
    Deutsche_Telekom_Root_CA_2.pem \
    DigiCertHighAssuranceEVRootCA.pem \
    Entrust.net_Secure_Server_CA.pem \
    + Entrust.net_2048.pem \
    Equifax_Secure_CA.pem \
    Equifax_Secure_Global_eBusiness_CA-1.pem \
    Go_Daddy_Class_2_CA.pem \