diff options
| author | Branko Grubic <branko.grubic@gmail.com> | 2010-08-22 11:48:14 -0400 |
|---|---|---|
| committer | Erik Hanson <erik@slackbuilds.org> | 2010-08-23 00:53:39 -0500 |
| commit | c296eed454562fb628fa663ddcb71f7d8e5d28fa (patch) | |
| tree | c55f48094e88fa98f7bf4b357533ccce81844bd1 /network/rekonq | |
| parent | f25c8bcb4a863c7f6d5dec4a079f257a3edd5ba3 (diff) | |
network/rekonq: Updated for version 0.5.0.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'network/rekonq')
| -rw-r--r-- | network/rekonq/rekonq-CVE-2010-2536-fix.patch | 16 | ||||
| -rw-r--r-- | network/rekonq/rekonq.SlackBuild | 17 | ||||
| -rw-r--r-- | network/rekonq/rekonq.info | 2 | ||||
| -rw-r--r-- | network/rekonq/slack-desc | 2 |
4 files changed, 28 insertions, 9 deletions
diff --git a/network/rekonq/rekonq-CVE-2010-2536-fix.patch b/network/rekonq/rekonq-CVE-2010-2536-fix.patch new file mode 100644 index 000000000000..c9dce8e357f6 --- /dev/null +++ b/network/rekonq/rekonq-CVE-2010-2536-fix.patch @@ -0,0 +1,16 @@ +diff --git a/src/webpage.cpp b/src/webpage.cpp +index a63940b..ea2add6 100644 +--- a/src/webpage.cpp ++++ b/src/webpage.cpp +@@ -577,8 +577,8 @@ QString WebPage::errorPage(QNetworkReply *reply) + return QString("Couldn't open the rekonqinfo.html file"); + } + +- QString title = i18n("Error loading: %1", reply->url().toString()); +- QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery); ++ QString title = i18n("There was a problem while loading the page"); ++ QString urlString = reply->url().toString(QUrl::RemoveUserInfo | QUrl::RemoveQuery | QUrl::RemovePath); + + QString iconPath = QString("file://") + KIconLoader::global()->iconPath("dialog-warning" , KIconLoader::Small); + iconPath.replace(QL1S("16"), QL1S("128")); + diff --git a/network/rekonq/rekonq.SlackBuild b/network/rekonq/rekonq.SlackBuild index 7a0e25fad28f..f5435663b035 100644 --- a/network/rekonq/rekonq.SlackBuild +++ b/network/rekonq/rekonq.SlackBuild @@ -4,10 +4,10 @@ # Written by Branko Grubic <branko.grubic@gmail.com> -PRGNAM=rekonq -VERSION=${VERSION:-0.5.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} +PRGNAM=rekonq +VERSION=${VERSION:-0.5.0} +BUILD=${BUILD:-2} +TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -18,9 +18,9 @@ if [ -z "$ARCH" ]; then fi CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} +TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -36,7 +36,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -51,6 +51,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +## patch to fix Multiple cross-site scripting (XSS) vulnerabilities (CVE-2010-2536) +patch -p1 <$CWD/rekonq-CVE-2010-2536-fix.patch + mkdir -p build cd build cmake .. \ diff --git a/network/rekonq/rekonq.info b/network/rekonq/rekonq.info index 7700a0cad61f..2629986a3db5 100644 --- a/network/rekonq/rekonq.info +++ b/network/rekonq/rekonq.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Branko Grubic" EMAIL="branko.grubic@gmail.com" -APPROVED="rworkman" +APPROVED="dsomero" diff --git a/network/rekonq/slack-desc b/network/rekonq/slack-desc index 9ea6a1b6e603..bc9c3ecca346 100644 --- a/network/rekonq/slack-desc +++ b/network/rekonq/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| rekonq: rekonq (KDE browser based on Webkit) rekonq: rekonq: rekonq is a KDE browser based on Webkit. Its code is based on |