diff options
| author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-05-09 20:50:58 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-05-09 20:50:58 -0300 |
| commit | d0d9acab6c54e4af3684a10f70929e548517d0bb (patch) | |
| tree | e55882023ce5b21b188823057f7c8e66b66b8faa /libre/kdelibs-libre | |
| parent | d940a67681beff3d6204cd08d31456dbef3a0cb1 (diff) | |
kde packages: updating packages to 4.10.3 version
Diffstat (limited to 'libre/kdelibs-libre')
| -rw-r--r-- | libre/kdelibs-libre/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/kdelibs-libre/security-fix.patch | 32 |
2 files changed, 42 insertions, 5 deletions
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 5f91616a0..0ebbd68c2 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 183303 2013-04-21 09:43:18Z andrea $ +# $Id: PKGBUILD 184821 2013-05-09 08:05:42Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.10.2 -pkgrel=4 +pkgver=4.10.3 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' @@ -22,10 +22,12 @@ replaces=('kdelibs') conflicts=('kdelibs') install=${_pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" - 'kde-applications-menu.patch' 'qt4.patch' 'khtml-fsdg.diff') -sha1sums=('2f1f455c39fa33cc133db7ec6b3d2dbbabe03c85' + 'kde-applications-menu.patch' 'qt4.patch' + 'security-fix.patch' 'khtml-fsdg.diff') +sha1sums=('aa154998e227121be82f5b04442e908e7dece01b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'ed1f57ee661e5c7440efcaba7e51d2554709701c' + '506562009a667f18481be0d2c5035b181fce38bb' 'a1502a964081ad583a00cf90c56e74bf60121830') build() { @@ -37,6 +39,9 @@ build() { # Don't ask the user to download a plugin, it's probably nonfree. patch -p1 -i "${srcdir}"/khtml-fsdg.diff + # KDEBUG#319428 + patch -p1 -i "${srcdir}"/security-fix.patch + cd ../ mkdir build diff --git a/libre/kdelibs-libre/security-fix.patch b/libre/kdelibs-libre/security-fix.patch new file mode 100644 index 000000000..3d98a47ae --- /dev/null +++ b/libre/kdelibs-libre/security-fix.patch @@ -0,0 +1,32 @@ +commit 65d736dab592bced4410ccfa4699de89f78c96ca +Author: Grégory Oestreicher <greg@kamago.net> +Date: Wed May 8 23:16:00 2013 +0200 + + Don't show passwords contained in HTTP URLs in error messages + BUG: 319428 + +diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp +index 2d139a9..129fc7b 100644 +--- a/kioslave/http/http.cpp ++++ b/kioslave/http/http.cpp +@@ -3056,7 +3056,7 @@ try_again: + ; // Ignore error + } else { + if (!sendErrorPageNotification()) { +- error(ERR_INTERNAL_SERVER, m_request.url.url()); ++ error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl()); + return false; + } + } +@@ -3072,9 +3072,9 @@ try_again: + // Tell that we will only get an error page here. + if (!sendErrorPageNotification()) { + if (m_request.responseCode == 403) +- error(ERR_ACCESS_DENIED, m_request.url.url()); ++ error(ERR_ACCESS_DENIED, m_request.url.prettyUrl()); + else +- error(ERR_DOES_NOT_EXIST, m_request.url.url()); ++ error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl()); + return false; + } + } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) { |