subject:"\[arch\-commits\] Commit in qt\/trunk \(PKGBUILD blacklist\-diginotar\-certs.diff\)"

[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)

2011-12-16 Thread Andrea Scarpino

Date: Friday, December 16, 2011 @ 21:20:08
  Author: andrea
Revision: 145100

upgpkg: qt 4.8.0-1

Upstream release

Modified:
  qt/trunk/PKGBUILD
Deleted:
  qt/trunk/blacklist-diginotar-certs.diff

+
 PKGBUILD   |   24 +++---
 blacklist-diginotar-certs.diff |   89 ---
 2 files changed, 9 insertions(+), 104 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-17 01:36:17 UTC (rev 145099)
+++ PKGBUILD2011-12-17 02:20:08 UTC (rev 145100)
@@ -4,8 +4,8 @@
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.4
-pkgrel=3
+pkgver=4.8.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -17,14 +17,12 @@
 _pkgfqn=${pkgbase}-everywhere-opensource-src-${pkgver}
 source=(http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz;
 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop'
-'blacklist-diginotar-certs.diff')
-md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf'
+'qtconfig.desktop')
+md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
  'fc211414130ab2764132e7370f8e5caa'
  '85179f5e0437514f8639957e1d8baf62'
  'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'd875a2a7639de3bd63dc519c13b4d069')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
 
 build() {
   cd ${srcdir}/${_pkgfqn}
@@ -32,15 +30,10 @@
   export QT4DIR=${srcdir}/${_pkgfqn}
   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-  # FS#24601
-  export CXXFLAGS=$CXXFLAGS -fno-strict-aliasing
+  sed -i s|-O2|${CXXFLAGS}| mkspecs/common/g++-base.conf
+  sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g 
mkspecs/common/gcc-base-unix.conf
+  sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g mkspecs/common/gcc-base.conf
 
-  patch -p1 -i ${srcdir}/blacklist-diginotar-certs.diff
-
-  sed -i s|-O2|$CXXFLAGS| mkspecs/common/g++.conf
-  sed -i /^QMAKE_RPATH/s| -Wl,-rpath,||g mkspecs/common/g++.conf
-  sed -i /^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g mkspecs/common/g++.conf
-
   ./configure -confirm-license -opensource \
 -prefix /usr \
 -docdir /usr/share/doc/qt \
@@ -55,6 +48,7 @@
 -system-sqlite \
 -no-phonon \
 -no-phonon-backend \
+-no-webkit \
 -no-declarative-debug \
 -graphicssystem raster \
 -openssl-linked \

Deleted: blacklist-diginotar-certs.diff
===
--- blacklist-diginotar-certs.diff  2011-12-17 01:36:17 UTC (rev 145099)
+++ blacklist-diginotar-certs.diff  2011-12-17 02:20:08 UTC (rev 145100)
@@ -1,89 +0,0 @@
-diff --git a/src/network/ssl/qsslcertificate.cpp 
b/src/network/ssl/qsslcertificate.cpp
-index 328c5c2..1ae98f4 100644
 a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@ QListQSslCertificate 
QSslCertificatePrivate::certificatesFromDer(const QByteAr
- // 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,
-+04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e, mail.google.com, // 
Comodo
-+f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06, www.google.com, // 
Comodo
-+d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3, login.yahoo.com, // 
Comodo
-+39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29, login.yahoo.com, // 
Comodo
-+3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71, login.yahoo.com, // 
Comodo
-+e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47, login.skype.com, // 
Comodo
-+92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43, addons.mozilla.org, 
// Comodo
-+b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0, login.live.com, // 
Comodo
-+d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0, global trustee, // 
Comodo
-+
-+05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56, *.google.com, // 
leaf certificate issued by DigiNotar
-+0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c, DigiNotar Root CA, 
// DigiNotar root
-+f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49, DigiNotar Services 
CA, // DigiNotar intermediate signed by DigiNotar Root
-+36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38, DigiNotar Services 
1024 CA, // DigiNotar intermediate signed by DigiNotar Root
-+

[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)

2011-10-20 Thread Andrea Scarpino

Date: Thursday, October 20, 2011 @ 19:02:24
  Author: andrea
Revision: 140993

Prepare 4.8

Modified:
  qt/trunk/PKGBUILD
Deleted:
  qt/trunk/blacklist-diginotar-certs.diff

+
 PKGBUILD   |  177 ++-
 blacklist-diginotar-certs.diff |   89 ---
 2 files changed, 82 insertions(+), 184 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-20 22:47:43 UTC (rev 140992)
+++ PKGBUILD2011-10-20 23:02:24 UTC (rev 140993)
@@ -4,138 +4,125 @@
 
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
-pkgver=4.7.4
-pkgrel=3
+pkgver=4.8.0rc1
+_pkgver=4.8.0-rc1
+pkgrel=1
 arch=('i686' 'x86_64')
-url='http://qt.nokia.com/'
+url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
 makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 
'dbus'
 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 
'postgresql-libs'
 'mysql' 'unixodbc' 'cups' 'gtk2')
 options=('!libtool')
-_pkgfqn=qt-everywhere-opensource-src-${pkgver}
-source=(ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz;
+_pkgfqn=${pkgbase}-everywhere-opensource-src-4.8.0
+source=(http://get.qt.nokia.com/qt/source/${pkgbase}-everywhere-opensource-src-${_pkgver}.tar.gz;
 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop'
-'blacklist-diginotar-certs.diff')
-md5sums=('9831cf1dfa8d0689a06c2c54c5c65aaf'
+'qtconfig.desktop')
+md5sums=('3e003b671384df8d1cb77dd6cc804934'
  'fc211414130ab2764132e7370f8e5caa'
  '85179f5e0437514f8639957e1d8baf62'
  'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd'
- 'd875a2a7639de3bd63dc519c13b4d069')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd')
 
 build() {
-   unset QMAKESPEC
-   export QT4DIR=$srcdir/$_pkgfqn
-   export PATH=${QT4DIR}/bin:${PATH}
-   export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
+  cd ${srcdir}/${_pkgfqn}
 
-# FS#24601
-export CXXFLAGS=$CXXFLAGS -fno-strict-aliasing
+  export QT4DIR=${srcdir}/${_pkgfqn}
+  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-   cd $srcdir/$_pkgfqn
+  sed -i s|-O2|${CXXFLAGS}| mkspecs/common/g++-base.conf
+  sed -i /^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g 
mkspecs/common/gcc-base-unix.conf
+  sed -i /^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g mkspecs/common/gcc-base.conf
 
-patch -p1 -i ${srcdir}/blacklist-diginotar-certs.diff
-
-sed -i s|-O2|$CXXFLAGS| mkspecs/common/g++.conf
-   sed -i /^QMAKE_RPATH/s| -Wl,-rpath,||g mkspecs/common/g++.conf
-   sed -i /^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g mkspecs/common/g++.conf
-
-   ./configure -confirm-license -opensource \
-   -prefix /usr \
-   -docdir /usr/share/doc/qt \
-   -plugindir /usr/lib/qt/plugins \
-   -importdir /usr/lib/qt/imports \
-   -datadir /usr/share/qt \
-   -translationdir /usr/share/qt/translations \
-   -sysconfdir /etc \
-   -examplesdir /usr/share/doc/qt/examples \
-   -demosdir /usr/share/doc/qt/demos \
-   -largefile \
-   -plugin-sql-{psql,mysql,sqlite,odbc} \
-   -system-sqlite \
-   -xmlpatterns \
-   -no-phonon \
-   -no-phonon-backend \
-   -svg \
-   -webkit \
-   -script \
-   -scripttools \
-   -system-zlib \
-   -system-libtiff \
-   -system-libpng \
-   -system-libmng \
-   -system-libjpeg \
-   -nomake demos \
-   -nomake examples \
-   -nomake docs \
-   -no-rpath \
-   -openssl-linked \
-   -silent \
-   -optimized-qmake \
-   -dbus \
-   -reduce-relocations \
-   -no-separate-debug-info \
-   -gtkstyle \
-   -opengl \
-   -no-openvg \
-   -glib
-   make
+  ./configure -confirm-license -opensource \
+-prefix /usr \
+-docdir /usr/share/doc/qt \
+-plugindir /usr/lib/qt/plugins \
+-importdir /usr/lib/qt/imports \
+-datadir /usr/share/qt \
+-translationdir /usr/share/qt/translations \
+-sysconfdir /etc \
+-examplesdir /usr/share/doc/qt/examples \
+-demosdir /usr/share/doc/qt/demos \
+-plugin-sql-{psql,mysql,sqlite,odbc} \
+-system-sqlite \
+-no-phonon \
+-no-phonon-backend \
+-no-webkit \
+-no-declarative-debug \
+-graphicssystem raster \
+-openssl-linked \
+-nomake demos \
+-nomake examples \
+-nomake docs \
+-silent \
+-no-rpath \
+-optimized-qmake \
+-reduce-relocations \
+-dbus-linked \
+-no-openvg
+  make
 }

[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)

2011-09-07 Thread Andrea Scarpino

Date: Wednesday, September 7, 2011 @ 12:41:01
  Author: andrea
Revision: 137350

Blacklist DigiNotar certificates

Added:
  qt/trunk/blacklist-diginotar-certs.diff
Modified:
  qt/trunk/PKGBUILD

+
 PKGBUILD   |   10 +++-
 blacklist-diginotar-certs.diff |   89 +++
 2 files changed, 96 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-07 13:58:22 UTC (rev 137349)
+++ PKGBUILD2011-09-07 16:41:01 UTC (rev 137350)
@@ -5,7 +5,7 @@
 pkgbase=qt
 pkgname=('qt' 'qt-private-headers')
 pkgver=4.7.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://qt.nokia.com/'
 license=('GPL3' 'LGPL')
@@ -17,12 +17,14 @@
 _pkgfqn=qt-everywhere-opensource-src-${pkgver}
 source=(ftp://ftp.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz;
 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
-'qtconfig.desktop')
+'qtconfig.desktop'
+'blacklist-diginotar-certs.diff')
 md5sums=('ddf7d83f912cf1283aa066368464fa22'
  'fc211414130ab2764132e7370f8e5caa'
  '85179f5e0437514f8639957e1d8baf62'
  'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd')
+ '6b771c8a81dd90b45e8a79afa0e5bbfd'
+ 'd875a2a7639de3bd63dc519c13b4d069')
 
 build() {
unset QMAKESPEC
@@ -35,6 +37,8 @@
 
cd $srcdir/$_pkgfqn
 
+patch -p1 -i ${srcdir}/blacklist-diginotar-certs.diff
+
 sed -i s|-O2|$CXXFLAGS| mkspecs/common/g++.conf
sed -i /^QMAKE_RPATH/s| -Wl,-rpath,||g mkspecs/common/g++.conf
sed -i /^QMAKE_LFLAGS\s/s|+=|+= $LDFLAGS|g mkspecs/common/g++.conf

Added: blacklist-diginotar-certs.diff
===
--- blacklist-diginotar-certs.diff  (rev 0)
+++ blacklist-diginotar-certs.diff  2011-09-07 16:41:01 UTC (rev 137350)
@@ -0,0 +1,89 @@
+diff --git a/src/network/ssl/qsslcertificate.cpp 
b/src/network/ssl/qsslcertificate.cpp
+index 328c5c2..1ae98f4 100644
+--- a/src/network/ssl/qsslcertificate.cpp
 b/src/network/ssl/qsslcertificate.cpp
+@@ -803,22 +803,47 @@ QListQSslCertificate 
QSslCertificatePrivate::certificatesFromDer(const QByteAr
+ // 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,
++04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e, mail.google.com, // 
Comodo
++f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06, www.google.com, // 
Comodo
++d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3, login.yahoo.com, // 
Comodo
++39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29, login.yahoo.com, // 
Comodo
++3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71, login.yahoo.com, // 
Comodo
++e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47, login.skype.com, // 
Comodo
++92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43, addons.mozilla.org, 
// Comodo
++b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0, login.live.com, // 
Comodo
++d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0, global trustee, // 
Comodo
++
++05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56, *.google.com, // 
leaf certificate issued by DigiNotar
++0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c, DigiNotar Root CA, 
// DigiNotar root
++f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49, DigiNotar Services 
CA, // DigiNotar intermediate signed by DigiNotar Root
++36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38, DigiNotar Services 
1024 CA, // DigiNotar intermediate signed by DigiNotar Root
++0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e, DigiNotar Root CA 
G2, // other DigiNotar Root CA
++a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21, CertiID Enterprise 
Certificate Authority, // DigiNotar intermediate signed by DigiNotar Root CA 
G2
++5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41, DigiNotar Qualified 
CA, // DigiNotar intermediate signed by DigiNotar Root
++
++1184640176,  DigiNotar Services 
1024 CA, // DigiNotar intermediate cross-signed by Entrust
++12525,   DigiNotar Cyber CA, 
// DigiNotar intermediate cross-signed by CyberTrust
++12505,   DigiNotar Cyber CA, 
// DigiNotar

[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)

[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)

[arch-commits] Commit in qt/trunk (PKGBUILD blacklist-diginotar-certs.diff)

3 matches

Site Navigation

Mail list logo

Footer information