[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728
Fathi Boudra
fabo at alioth.debian.org
Sat Jun 11 11:42:59 UTC 2011
The following commit has been merged in the experimental-snapshots branch:
commit 4a8a038ee02e11481bc57af264b2aac9fc9ad364
Author: Fathi Boudra <fabo at debian.org>
Date: Sat May 7 14:34:41 2011 +0300
Remove blacklist_fraudulent_comodo_certificates.diff - stolen upstream
Refresh patches
---
debian/changelog | 2 +
debian/patches/94_armv6_uname_entry.diff | 6 +-
debian/patches/95_neon_flags.patch | 8 +-
.../blacklist_fraudulent_comodo_certificates.diff | 85 --------------------
debian/patches/powerpcspe.diff | 2 +-
debian/patches/series | 1 -
debian/patches/sh.diff | 2 +-
...CC-intrinsics-for-armv6-atomic-operations.patch | 7 +--
8 files changed, 11 insertions(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e1dba14..4093e93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
qt4-x11 (4:4.7.3-1) UNRELEASED; urgency=low
* New upstream release.
+ * Remove patches:
+ - blacklist_fraudulent_comodo_certificates.diff - stolen upstream
-- Fathi Boudra <fabo at debian.org> Wed, 04 May 2011 13:08:38 +0300
diff --git a/debian/patches/94_armv6_uname_entry.diff b/debian/patches/94_armv6_uname_entry.diff
index f8f215b..4e53ac7 100644
--- a/debian/patches/94_armv6_uname_entry.diff
+++ b/debian/patches/94_armv6_uname_entry.diff
@@ -1,9 +1,9 @@
Description: Add armv6 uname entry for armhf
---
---- a/configure 2011-03-10 15:25:58.000000000 +0200
-+++ b/configure 2011-03-11 10:40:13.837312856 +0200
-@@ -182,6 +182,9 @@
+--- a/configure
++++ b/configure
+@@ -182,6 +182,9 @@ case $DPKG_ARCH in
armel)
UNAME_MACHINE="armv5tel"
;;
diff --git a/debian/patches/95_neon_flags.patch b/debian/patches/95_neon_flags.patch
index 882ac22..46982ac 100644
--- a/debian/patches/95_neon_flags.patch
+++ b/debian/patches/95_neon_flags.patch
@@ -1,11 +1,9 @@
## Description: add some description
## Origin/Author: add some origin or author
## Bug: bug URL
-Index: qt4-x11-4.7.2/src/gui/gui.pro
-===================================================================
---- qt4-x11-4.7.2.orig/src/gui/gui.pro 2011-03-06 21:41:47.058276259 +0200
-+++ qt4-x11-4.7.2/src/gui/gui.pro 2011-03-06 21:38:16.569232507 +0200
-@@ -65,9 +65,9 @@
+--- a/src/gui/gui.pro
++++ b/src/gui/gui.pro
+@@ -65,9 +65,9 @@ symbian {
neon:*-g++* {
DEFINES += QT_HAVE_NEON
HEADERS += $$NEON_HEADERS
diff --git a/debian/patches/blacklist_fraudulent_comodo_certificates.diff b/debian/patches/blacklist_fraudulent_comodo_certificates.diff
deleted file mode 100644
index 0142822..0000000
--- a/debian/patches/blacklist_fraudulent_comodo_certificates.diff
+++ /dev/null
@@ -1,85 +0,0 @@
-Origin: http://labs.qt.nokia.com/2011/03/29/security-advisory-fraudulent-certificates/
-Description: This patch blacklists a set of fraudulent ssl certificates.
---- a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -219,17 +219,19 @@
- Returns true if this certificate is valid; otherwise returns
- false.
-
-- Note: Currently, this function only checks that the current
-+ Note: Currently, this function checks that the current
- data-time is within the date-time range during which the
-- certificate is considered valid. No other checks are
-- currently performed.
-+ certificate is considered valid, and checks that the
-+ certificate is not in a blacklist of fraudulent certificates.
-
- \sa isNull()
- */
- bool QSslCertificate::isValid() const
- {
- const QDateTime currentTime = QDateTime::currentDateTime();
-- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter;
-+ return currentTime >= d->notValidBefore &&
-+ currentTime <= d->notValidAfter &&
-+ ! QSslCertificatePrivate::isBlacklisted(*this);
- }
-
- /*!
-@@ -778,6 +780,30 @@
- return certificates;
- }
-
-+// These certificates are known to be fraudulent and were created during the comodo
-+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
-+static const char *certificate_blacklist[] = {
-+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
-+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
-+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
-+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
-+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
-+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
-+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
-+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
-+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+ 0
-+};
-+
-+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
-+{
-+ for (int a = 0; certificate_blacklist[a] != 0; a++) {
-+ if (certificate.serialNumber() == certificate_blacklist[a])
-+ return true;
-+ }
-+ return false;
-+}
-+
- #ifndef QT_NO_DEBUG_STREAM
- QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
- {
---- a/src/network/ssl/qsslcertificate_p.h
-+++ b/src/network/ssl/qsslcertificate_p.h
-@@ -96,6 +96,7 @@
- static QSslCertificate QSslCertificate_from_X509(X509 *x509);
- static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1);
- static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1);
-+ static bool isBlacklisted(const QSslCertificate &certificate);
-
- friend class QSslSocketBackendPrivate;
-
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -810,6 +810,13 @@
- X509 *x509 = q_SSL_get_peer_certificate(ssl);
- configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
- q_X509_free(x509);
-+ if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
-+ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+ q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+ emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+ plainSocket->disconnectFromHost();
-+ return false;
-+ }
-
- // Start translating errors.
- QList<QSslError> errors;
diff --git a/debian/patches/powerpcspe.diff b/debian/patches/powerpcspe.diff
index 18385db..214efa3 100644
--- a/debian/patches/powerpcspe.diff
+++ b/debian/patches/powerpcspe.diff
@@ -7,7 +7,7 @@ Last-Update: 2011-04-27
--- a/configure
+++ b/configure
-@@ -3013,7 +3013,7 @@
+@@ -3013,7 +3013,7 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
CFG_HOST_ARCH=x86_64
fi
;;
diff --git a/debian/patches/series b/debian/patches/series
index 769dc6a..eabb715 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
# upstream patches
-blacklist_fraudulent_comodo_certificates.diff
# qt-copy patches
0195-compositing-properties.diff
diff --git a/debian/patches/sh.diff b/debian/patches/sh.diff
index 94a4598..484faad 100644
--- a/debian/patches/sh.diff
+++ b/debian/patches/sh.diff
@@ -7,7 +7,7 @@ Last-Update: 2011-04-27
--- a/configure
+++ b/configure
-@@ -3053,6 +3053,12 @@
+@@ -3053,6 +3053,12 @@ if [ -z "${CFG_HOST_ARCH}" ]; then
;;
esac
;;
diff --git a/debian/patches/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch b/debian/patches/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
index e7f7597..e5ca14d 100644
--- a/debian/patches/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
+++ b/debian/patches/x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
@@ -7,11 +7,9 @@ Subject: [PATCH] Use GCC intrinsics for armv6 atomic operations
src/corelib/arch/qatomic_armv6.h | 146 +++++++------------------------------
1 files changed, 28 insertions(+), 118 deletions(-)
-diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h
-index 53f7907..7dfc002 100644
--- a/src/corelib/arch/qatomic_armv6.h
+++ b/src/corelib/arch/qatomic_armv6.h
-@@ -104,155 +104,65 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
+@@ -104,155 +104,65 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint
inline bool QBasicAtomicInt::ref()
{
@@ -195,6 +193,3 @@ index 53f7907..7dfc002 100644
}
#else
---
-1.7.0.4
-
--
Qt 4 packaging
More information about the pkg-kde-commits
mailing list