diff -Nru pidgin-2.7.3/debian/changelog pidgin-2.7.3/debian/changelog --- pidgin-2.7.3/debian/changelog 2010-11-03 05:22:02.000000000 +0800 +++ pidgin-2.7.3/debian/changelog 2010-11-19 21:01:28.000000000 +0800 @@ -1,3 +1,10 @@ +pidgin (1:2.7.3-1ubuntu3.2) maverick-proposed; urgency=low + + * debian/patches/workaround-msn-ssl-failure.patch: Workaround SSL + connectivity issues with MSN (LP: #676972) + + -- Chow Loong Jin Fri, 19 Nov 2010 21:01:27 +0800 + pidgin (1:2.7.3-1ubuntu3.1) maverick-security; urgency=low * SECURITY UPDATE: denial of service via base64 decoding (LP: #666998) diff -Nru pidgin-2.7.3/debian/patches/workaround-msn-ssl-failure.patch pidgin-2.7.3/debian/patches/workaround-msn-ssl-failure.patch --- pidgin-2.7.3/debian/patches/workaround-msn-ssl-failure.patch 1970-01-01 07:30:00.000000000 +0730 +++ pidgin-2.7.3/debian/patches/workaround-msn-ssl-failure.patch 2010-11-19 20:59:59.000000000 +0800 @@ -0,0 +1,122 @@ +Description: Fix MSN connectivity (SSL certificate error) +Origin: commit:cd236baf6d00f3e1561a40974ce1828b793ea187 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pidgin/+bug/676972 +Bug: http://developer.pidgin.im/ticket/12906 +Applied-Upstream: commit:cd236baf6d00f3e1561a40974ce1828b793ea187 +Index: pidgin-2.7.5/share/ca-certs/Microsoft_Internet_Authority_2010.pem +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pidgin-2.7.5/share/ca-certs/Microsoft_Internet_Authority_2010.pem 2010-11-19 20:49:51.002339949 +0800 +@@ -0,0 +1,30 @@ ++-----BEGIN CERTIFICATE----- ++MIIFEjCCBHugAwIBAgIEBydiAjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQGEwJV ++UzEYMBYGA1UEChMPR1RFIENvcnBvcmF0aW9uMScwJQYDVQQLEx5HVEUgQ3liZXJU ++cnVzdCBTb2x1dGlvbnMsIEluYy4xIzAhBgNVBAMTGkdURSBDeWJlclRydXN0IEds ++b2JhbCBSb290MB4XDTEwMDQxNDE4MTIyNloXDTE4MDQxNDE4MTIxNFowJzElMCMG ++A1UEAxMcTWljcm9zb2Z0IEludGVybmV0IEF1dGhvcml0eTCCAiIwDQYJKoZIhvcN ++AQEBBQADggIPADCCAgoCggIBAL30zSelStiQGduyCntgpE6PDpijnHxQduuzSoyf ++GLDnmsUrgoYJKKwREjIm9Rnq8LhnaMUG/fQZrtkToNCBJwimeZwE9UgyLjYfq2sm ++7KFDtJ2AsEkD6oJJXwUTxaCDX+Eq9AQZS37I2oi8tV0DvHhWoel/xWrvtv8dAVm3 ++H1NaX8b4kW3FfUOTGHRF7RW6snzIOjQUHqpj9+XUS8gjK4dplROZCRTvegEgTrfG ++SEGuyYcBKdnChzh/tkKk8LLOLf20TFfwqNbLTvpfXf25+wncFoVk5XGc1fEzlzhn ++Lpu8FzYFfhA2f37rmFpbHK2l5wkQfflKL7OPNxXWb7lbN9y3n3+OZn8jXO0Sf4wH ++8P4Z+bg0Q3uy6oX7jKmq3/2RDSz1+6+XifEGiq9J9jwuI/ZEFiWREeIjw8qFVUkq ++yCGvfREmhrAoRbqH7jYTgdVLRxqO2wnx0ZcpUBQymQnj8sDnU49r9PoTXDyN7lSZ ++DydHTjwS848SF0bwiWpFs7U8DHdFBC+9vrWemDwFO7tBOYQgvHkE1kLNPonp53o3 ++SRC0zJ8kXCOmSG7749TuISmT5P2AGhs6bMH369nUTb7xEfaijkIkoU9ptdJoFInZ ++n5DYH54b5m1kJSm2NEOkW/UN63QGfp/xY9xFp3w6mlxrc9jDWASOiG8T0ObQ383E ++Cg4HAgMBAAGjggF3MIIBczASBgNVHRMBAf8ECDAGAQH/AgEBMFsGA1UdIARUMFIw ++SAYJKwYBBAGxPgEAMDswOQYIKwYBBQUHAgEWLWh0dHA6Ly9jeWJlcnRydXN0Lm9t ++bmlyb290LmNvbS9yZXBvc2l0b3J5LmNmbTAGBgRVHSAAMA4GA1UdDwEB/wQEAwIB ++hjCBiQYDVR0jBIGBMH+heaR3MHUxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9HVEUg ++Q29ycG9yYXRpb24xJzAlBgNVBAsTHkdURSBDeWJlclRydXN0IFNvbHV0aW9ucywg ++SW5jLjEjMCEGA1UEAxMaR1RFIEN5YmVyVHJ1c3QgR2xvYmFsIFJvb3SCAgGlMEUG ++A1UdHwQ+MDwwOqA4oDaGNGh0dHA6Ly93d3cucHVibGljLXRydXN0LmNvbS9jZ2kt ++YmluL0NSTC8yMDE4L2NkcC5jcmwwHQYDVR0OBBYEFDMh8Mv+oqBEkt72OzPYXwFL ++l3hdMA0GCSqGSIb3DQEBBQUAA4GBACtI85T7RMWTatZN/rQTThImF8qyWqsJuVak ++b39XnmSy9eTTNe9jZcvlLBWc7874KsWSZCtJPjw2bL0Ym2Rnlz/taNAWwRM88lGg ++V94kzjWraZBOKww6+bTxgPptAHmmOpaZTjpuVNCjWW6LHZVJu5XYdbjhEjOsXCe7 ++y1Vx1frt ++-----END CERTIFICATE----- +Index: pidgin-2.7.5/share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ pidgin-2.7.5/share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem 2010-11-19 20:49:51.002339949 +0800 +@@ -0,0 +1,35 @@ ++-----BEGIN CERTIFICATE----- ++MIIGEzCCA/ugAwIBAgIKYQMzNgAFAAAAMDANBgkqhkiG9w0BAQUFADAnMSUwIwYD ++VQQDExxNaWNyb3NvZnQgSW50ZXJuZXQgQXV0aG9yaXR5MB4XDTEwMDUxOTIyMTMz ++MFoXDTE0MDUxOTIyMjMzMFowgYsxEzARBgoJkiaJk/IsZAEZFgNjb20xGTAXBgoJ ++kiaJk/IsZAEZFgltaWNyb3NvZnQxFDASBgoJkiaJk/IsZAEZFgRjb3JwMRcwFQYK ++CZImiZPyLGQBGRYHcmVkbW9uZDEqMCgGA1UEAxMhTWljcm9zb2Z0IFNlY3VyZSBT ++ZXJ2ZXIgQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA ++6p9fkQvNGYJfkeqr9Yso2Iv1HOCRybzNAhBQIrc4ClzPcQxYLYhsqLg8M2P5c508 ++6cN57fL+ycvDbiTiPEJw2F+3W/ebX/Unb3gA65Zdt2/P5EEE8LtDvW9fJg+3jjdB ++E1RnG5AAJzi4GsOWbRwxNTVJxUYe53OkygMReUGBr9OORqLFvgBTBbk4nLdgKbPK ++UpqSxVMntkENQPgvm+eBSRpaaqhPccfobYG+J+/J1saSKxDkNjVACNBNcP1wmyAc ++s7nfdZ0rd9DEzWpx71pYC/lwhYgFiW1mkjCrr4g519QtC5aceCSvAKvPCT4TrmvD ++4OHPYH+LU9wC0POwhhHevQIDAQABo4IB2jCCAdYwEgYDVR0TAQH/BAgwBgEB/wIB ++ADAdBgNVHQ4EFgQUCELj204RZvO1CMVA21V8M0YRgzgwCwYDVR0PBAQDAgGGMBIG ++CSsGAQQBgjcVAQQFAgMIAAgwIwYJKwYBBAGCNxUCBBYEFH6KwpxaMozCcaLZT3Vw ++96kb9pQFMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMB8GA1UdIwQYMBaAFDMh ++8Mv+oqBEkt72OzPYXwFLl3hdMIGjBgNVHR8EgZswgZgwgZWggZKggY+GNmh0dHA6 ++Ly9tc2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL21zd3d3KDUpLmNy ++bIY0aHR0cDovL2NybC5taWNyb3NvZnQuY29tL3BraS9tc2NvcnAvY3JsL21zd3d3 ++KDUpLmNybIYfaHR0cDovL2NvcnBwa2kvY3JsL21zd3d3KDUpLmNybDB5BggrBgEF ++BQcBAQRtMGswPAYIKwYBBQUHMAKGMGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9w ++a2kvbXNjb3JwL21zd3d3KDUpLmNydDArBggrBgEFBQcwAoYfaHR0cDovL2NvcnBw ++a2kvYWlhL21zd3d3KDUpLmNydDANBgkqhkiG9w0BAQUFAAOCAgEAj8LRXO8UEXcX ++Ywc8THxo2v6GSuIgzD+wJz3R4qzIi0im5Fn3OgatfVLx9mVhliEirmi+L3reswz1 ++6cXd+GWCXctsPgw3EXQVCXhVvSYSu9aVdNO89XYJKmrfNsSOVtUfIN9/gjDXQ6to ++IotqWsWb0J2NCwxQhX7MWoAHiwNOv71fbFYPBaniVMOl01JcX00L3QX4URIDIW+c ++bJeYKsHBEby9G67741dfTx8AnuKkUdP3rAk3WKUJIdFy0LLBi9tN3BPRVFhNK8Ct +++lMZNbEVqEJkt+3HH6V5qA041FC/9Fr/L+m/P3045fsgDNRO4C8dRXr7KC8xSG/M ++blxoQvrqyAsBMOwQJkI4I6nDGbjZcBpoLJLLn3PmzP8zI+7bXrV/BVg/UMUcCBj0 ++6y9iqlP3oc3e4+uCHBpna6FMp2hxQNFlO0EYnEnjcfvrTYOT00fmZELLtjUc+zQO ++oSj7jKGnHwEoUeVxlDec3EFbfH7pLCNnlJ1z319AeaONlTDMUxcIvFCG8/wQGYH8 ++9Fpu89yimnV7w6ygUe0ytljfT46RU2rSqhtd5lO4iaOeiaHjKeCzbOsazG9aqsLi ++9h5FKe/WwkOxO60+JvyBl1xI/WJZNJLJ+7mh10IF+xn2fjL7KTTVh2blBB3IPhD6 ++pnj1Hn3eGjp4fNwqcQajLW8FVSOLkO8= ++-----END CERTIFICATE----- +Index: pidgin-2.7.5/pidgin/win32/nsis/pidgin-installer.nsi +=================================================================== +--- pidgin-2.7.5.orig/pidgin/win32/nsis/pidgin-installer.nsi 2010-11-19 20:48:12.722015962 +0800 ++++ pidgin-2.7.5/pidgin/win32/nsis/pidgin-installer.nsi 2010-11-19 20:49:51.002339949 +0800 +@@ -541,7 +541,9 @@ + Delete "$INSTDIR\ca-certs\Go_Daddy_Class_2_CA.pem" + Delete "$INSTDIR\ca-certs\GTE_CyberTrust_Global_Root.pem" + Delete "$INSTDIR\ca-certs\Microsoft_Internet_Authority.pem" ++ Delete "$INSTDIR\ca-certs\Microsoft_Internet_Authority_2010.pem" + Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority.pem" ++ Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority_2010.pem" + Delete "$INSTDIR\ca-certs\StartCom_Certification_Authority.pem" + Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem" + Delete "$INSTDIR\ca-certs\Thawte_Premium_Server_CA.pem" +Index: pidgin-2.7.5/share/ca-certs/Makefile.am +=================================================================== +--- pidgin-2.7.5.orig/share/ca-certs/Makefile.am 2010-11-19 20:48:12.682015963 +0800 ++++ pidgin-2.7.5/share/ca-certs/Makefile.am 2010-11-19 20:49:51.012339983 +0800 +@@ -22,7 +22,9 @@ + EXTRA_CERTS = \ + AOL_Member_CA.pem \ + Microsoft_Internet_Authority.pem \ ++ Microsoft_Internet_Authority_2010.pem \ + Microsoft_Secure_Server_Authority.pem \ ++ Microsoft_Secure_Server_Authority_2010.pem \ + VeriSign_Class3_Extended_Validation_CA.pem \ + VeriSign_International_Server_Class_3_CA.pem + +Index: pidgin-2.7.5/share/ca-certs/Makefile.in +=================================================================== +--- pidgin-2.7.5.orig/share/ca-certs/Makefile.in 2010-11-19 20:51:30.702647966 +0800 ++++ pidgin-2.7.5/share/ca-certs/Makefile.in 2010-11-19 20:51:58.532722639 +0800 +@@ -345,7 +345,9 @@ + EXTRA_CERTS = \ + AOL_Member_CA.pem \ + Microsoft_Internet_Authority.pem \ ++ Microsoft_Internet_Authority_2010.pem \ + Microsoft_Secure_Server_Authority.pem \ ++ Microsoft_Secure_Server_Authority_2010.pem \ + VeriSign_Class3_Extended_Validation_CA.pem \ + VeriSign_International_Server_Class_3_CA.pem +