[arch-commits] Commit in kwebkitpart/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sun Dec 6 23:14:45 UTC 2015
Date: Monday, December 7, 2015 @ 00:14:45
Author: bpiotrowski
Revision: 253071
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
kwebkitpart/repos/staging-i686/
kwebkitpart/repos/staging-i686/PKGBUILD
(from rev 253070, kwebkitpart/trunk/PKGBUILD)
kwebkitpart/repos/staging-i686/kwebkitpart.install
(from rev 253070, kwebkitpart/trunk/kwebkitpart.install)
kwebkitpart/repos/staging-i686/sanitize-input.patch
(from rev 253070, kwebkitpart/trunk/sanitize-input.patch)
kwebkitpart/repos/staging-x86_64/
kwebkitpart/repos/staging-x86_64/PKGBUILD
(from rev 253070, kwebkitpart/trunk/PKGBUILD)
kwebkitpart/repos/staging-x86_64/kwebkitpart.install
(from rev 253070, kwebkitpart/trunk/kwebkitpart.install)
kwebkitpart/repos/staging-x86_64/sanitize-input.patch
(from rev 253070, kwebkitpart/trunk/sanitize-input.patch)
-------------------------------------+
staging-i686/PKGBUILD | 40 ++++++++++++++++++++++++++++++
staging-i686/kwebkitpart.install | 11 ++++++++
staging-i686/sanitize-input.patch | 45 ++++++++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 40 ++++++++++++++++++++++++++++++
staging-x86_64/kwebkitpart.install | 11 ++++++++
staging-x86_64/sanitize-input.patch | 45 ++++++++++++++++++++++++++++++++++
6 files changed, 192 insertions(+)
Copied: kwebkitpart/repos/staging-i686/PKGBUILD (from rev 253070, kwebkitpart/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-12-06 23:14:45 UTC (rev 253071)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kwebkitpart
+pkgver=1.3.4
+pkgrel=4
+pkgdesc="A WebKit browser component for KDE"
+url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+# Generate using kde releaseme scripts
+source=("https://sources.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ 'sanitize-input.patch')
+md5sums=('0a3e176a7c24f00e22c92a7b105585f8'
+ 'f9ae9520069ffac4c5da1f408fd4bbdf')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/sanitize-input.patch
+
+ sed -i '/add_subdirectory(kdelauncher)/d' CMakeLists.txt
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kwebkitpart/repos/staging-i686/kwebkitpart.install (from rev 253070, kwebkitpart/trunk/kwebkitpart.install)
===================================================================
--- staging-i686/kwebkitpart.install (rev 0)
+++ staging-i686/kwebkitpart.install 2015-12-06 23:14:45 UTC (rev 253071)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kwebkitpart/repos/staging-i686/sanitize-input.patch (from rev 253070, kwebkitpart/trunk/sanitize-input.patch)
===================================================================
--- staging-i686/sanitize-input.patch (rev 0)
+++ staging-i686/sanitize-input.patch 2015-12-06 23:14:45 UTC (rev 253071)
@@ -0,0 +1,45 @@
+From: Albert Astals Cid <aacid at kde.org>
+Date: Thu, 13 Nov 2014 14:06:01 +0000
+Subject: Sanitize html
+X-Git-Url: http://quickgit.kde.org/?p=kwebkitpart.git&a=commitdiff&h=641aa7c75631084260ae89aecbdb625e918c6689
+---
+Sanitize html
+
+As discussed by the security team
+---
+
+
+--- a/src/webpage.cpp
++++ b/src/webpage.cpp
+@@ -226,23 +226,26 @@
+ doc += QL1S( "<h3>" );
+ doc += i18n( "Details of the Request:" );
+ doc += QL1S( "</h3><ul><li>" );
+- doc += i18n( "URL: %1", reqUrl.url() );
++ // escape URL twice: once for i18n, and once for HTML.
++ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
+ doc += QL1S( "</li><li>" );
+
+ const QString protocol (reqUrl.protocol());
+ if ( !protocol.isNull() ) {
+- doc += i18n( "Protocol: %1", protocol );
++ // escape protocol twice: once for i18n, and once for HTML.
++ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
+ doc += QL1S( "</li><li>" );
+ }
+
+ doc += i18n( "Date and Time: %1",
+ KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
+ doc += QL1S( "</li><li>" );
+- doc += i18n( "Additional Information: %1" , text );
++ // escape text twice: once for i18n, and once for HTML.
++ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
+ doc += QL1S( "</li></ul><h3>" );
+ doc += i18n( "Description:" );
+ doc += QL1S( "</h3><p>" );
+- doc += description;
++ doc += Qt::escape( description );
+ doc += QL1S( "</p>" );
+
+ if ( causes.count() ) {
+
Copied: kwebkitpart/repos/staging-x86_64/PKGBUILD (from rev 253070, kwebkitpart/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-06 23:14:45 UTC (rev 253071)
@@ -0,0 +1,40 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kwebkitpart
+pkgver=1.3.4
+pkgrel=4
+pkgdesc="A WebKit browser component for KDE"
+url="https://projects.kde.org/projects/extragear/base/kwebkitpart/"
+arch=('i686' 'x86_64')
+license=('LGPL')
+depends=('kdelibs')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+# Generate using kde releaseme scripts
+source=("https://sources.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
+ 'sanitize-input.patch')
+md5sums=('0a3e176a7c24f00e22c92a7b105585f8'
+ 'f9ae9520069ffac4c5da1f408fd4bbdf')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/sanitize-input.patch
+
+ sed -i '/add_subdirectory(kdelauncher)/d' CMakeLists.txt
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kwebkitpart/repos/staging-x86_64/kwebkitpart.install (from rev 253070, kwebkitpart/trunk/kwebkitpart.install)
===================================================================
--- staging-x86_64/kwebkitpart.install (rev 0)
+++ staging-x86_64/kwebkitpart.install 2015-12-06 23:14:45 UTC (rev 253071)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kwebkitpart/repos/staging-x86_64/sanitize-input.patch (from rev 253070, kwebkitpart/trunk/sanitize-input.patch)
===================================================================
--- staging-x86_64/sanitize-input.patch (rev 0)
+++ staging-x86_64/sanitize-input.patch 2015-12-06 23:14:45 UTC (rev 253071)
@@ -0,0 +1,45 @@
+From: Albert Astals Cid <aacid at kde.org>
+Date: Thu, 13 Nov 2014 14:06:01 +0000
+Subject: Sanitize html
+X-Git-Url: http://quickgit.kde.org/?p=kwebkitpart.git&a=commitdiff&h=641aa7c75631084260ae89aecbdb625e918c6689
+---
+Sanitize html
+
+As discussed by the security team
+---
+
+
+--- a/src/webpage.cpp
++++ b/src/webpage.cpp
+@@ -226,23 +226,26 @@
+ doc += QL1S( "<h3>" );
+ doc += i18n( "Details of the Request:" );
+ doc += QL1S( "</h3><ul><li>" );
+- doc += i18n( "URL: %1", reqUrl.url() );
++ // escape URL twice: once for i18n, and once for HTML.
++ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
+ doc += QL1S( "</li><li>" );
+
+ const QString protocol (reqUrl.protocol());
+ if ( !protocol.isNull() ) {
+- doc += i18n( "Protocol: %1", protocol );
++ // escape protocol twice: once for i18n, and once for HTML.
++ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
+ doc += QL1S( "</li><li>" );
+ }
+
+ doc += i18n( "Date and Time: %1",
+ KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
+ doc += QL1S( "</li><li>" );
+- doc += i18n( "Additional Information: %1" , text );
++ // escape text twice: once for i18n, and once for HTML.
++ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
+ doc += QL1S( "</li></ul><h3>" );
+ doc += i18n( "Description:" );
+ doc += QL1S( "</h3><p>" );
+- doc += description;
++ doc += Qt::escape( description );
+ doc += QL1S( "</p>" );
+
+ if ( causes.count() ) {
+
More information about the arch-commits
mailing list