[arch-commits] Commit in kio-extras/repos (10 files)

Andrea Scarpino andrea at archlinux.org
Fri Nov 14 13:09:10 UTC 2014


    Date: Friday, November 14, 2014 @ 14:09:09
  Author: andrea
Revision: 226236

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kio-extras/repos/extra-i686/PKGBUILD
    (from rev 226235, kio-extras/trunk/PKGBUILD)
  kio-extras/repos/extra-i686/kio-extras.install
    (from rev 226235, kio-extras/trunk/kio-extras.install)
  kio-extras/repos/extra-i686/sanitize-input.patch
    (from rev 226235, kio-extras/trunk/sanitize-input.patch)
  kio-extras/repos/extra-x86_64/PKGBUILD
    (from rev 226235, kio-extras/trunk/PKGBUILD)
  kio-extras/repos/extra-x86_64/kio-extras.install
    (from rev 226235, kio-extras/trunk/kio-extras.install)
  kio-extras/repos/extra-x86_64/sanitize-input.patch
    (from rev 226235, kio-extras/trunk/sanitize-input.patch)
Deleted:
  kio-extras/repos/extra-i686/PKGBUILD
  kio-extras/repos/extra-i686/kio-extras.install
  kio-extras/repos/extra-x86_64/PKGBUILD
  kio-extras/repos/extra-x86_64/kio-extras.install

-----------------------------------+
 /PKGBUILD                         |   94 ++++++++++++++++++++++++++++++++++++
 /kio-extras.install               |   22 ++++++++
 extra-i686/PKGBUILD               |   42 ----------------
 extra-i686/kio-extras.install     |   11 ----
 extra-i686/sanitize-input.patch   |   31 +++++++++++
 extra-x86_64/PKGBUILD             |   42 ----------------
 extra-x86_64/kio-extras.install   |   11 ----
 extra-x86_64/sanitize-input.patch |   31 +++++++++++
 8 files changed, 178 insertions(+), 106 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-11-14 13:08:23 UTC (rev 226235)
+++ extra-i686/PKGBUILD	2014-11-14 13:09:09 UTC (rev 226236)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-
-pkgname=kio-extras
-pkgver=5.1.1
-pkgrel=1
-pkgdesc="Additional components to increase the functionality of KIO"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/kio-extras'
-license=('LGPL')
-depends=('kdelibs4support' 'khtml' 'kdnssd' 'libssh' 'smbclient' 'exiv2' 'openexr' 'openslp')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python')
-options=('!buildflags')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz")
-md5sums=('831fb9bc8960932233cf6042f6097751')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  # conflicts with kdebase-runtime
-  rm "$pkgdir"/usr/lib/libmolletnetwork.so
-  mv "$pkgdir"/usr/share/config.kcfg/jpegcreatorsettings{,5}.kcfg
-}
-

Copied: kio-extras/repos/extra-i686/PKGBUILD (from rev 226235, kio-extras/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-11-14 13:09:09 UTC (rev 226236)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+
+pkgname=kio-extras
+pkgver=5.1.1
+pkgrel=2
+pkgdesc="Additional components to increase the functionality of KIO"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/kio-extras'
+license=('LGPL')
+depends=('kdelibs4support' 'khtml' 'kdnssd' 'libssh' 'smbclient' 'exiv2' 'openexr' 'openslp')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python')
+options=('!buildflags')
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
+        'sanitize-input.patch')
+md5sums=('831fb9bc8960932233cf6042f6097751'
+         '6462465f886decd5c7706d09bc71b2b8')
+
+prepare() {
+  mkdir -p build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/sanitize-input.patch
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_INSTALL_DIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  # conflicts with kdebase-runtime
+  rm "$pkgdir"/usr/lib/libmolletnetwork.so
+  mv "$pkgdir"/usr/share/config.kcfg/jpegcreatorsettings{,5}.kcfg
+}
+

Deleted: extra-i686/kio-extras.install
===================================================================
--- extra-i686/kio-extras.install	2014-11-14 13:08:23 UTC (rev 226235)
+++ extra-i686/kio-extras.install	2014-11-14 13:09:09 UTC (rev 226236)
@@ -1,11 +0,0 @@
-post_install() {
-    update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kio-extras/repos/extra-i686/kio-extras.install (from rev 226235, kio-extras/trunk/kio-extras.install)
===================================================================
--- extra-i686/kio-extras.install	                        (rev 0)
+++ extra-i686/kio-extras.install	2014-11-14 13:09:09 UTC (rev 226236)
@@ -0,0 +1,11 @@
+post_install() {
+    update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kio-extras/repos/extra-i686/sanitize-input.patch (from rev 226235, kio-extras/trunk/sanitize-input.patch)
===================================================================
--- extra-i686/sanitize-input.patch	                        (rev 0)
+++ extra-i686/sanitize-input.patch	2014-11-14 13:09:09 UTC (rev 226236)
@@ -0,0 +1,31 @@
+From: Martin Sandsmark <martin.sandsmark at kde.org>
+Date: Thu, 13 Nov 2014 12:42:49 +0000
+Subject: Sanitize path
+X-Git-Url: http://quickgit.kde.org/?p=kio-extras.git&a=commitdiff&h=13155c8eb71d1c946bea21c38ea0f8ca7c7013cd
+---
+Sanitize path
+
+Reviewed at security at kde.org
+---
+
+
+--- a/bookmarks/kio_bookmarks.cpp
++++ b/bookmarks/kio_bookmarks.cpp
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ 
+ #include <qregexp.h>
++#include <qtextdocument.h>
+ #include <qurlquery.h>
+ 
+ #include <kapplication.h>
+@@ -198,7 +199,7 @@
+     echoImage(regexp.cap(1), regexp.cap(2), QUrlQuery(url).queryItemValue("size"));
+   } else {
+     echoHead();
+-    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
++    echo("<p class=\"message\">" + i18n("Wrong request: %1", Qt::escape(url.toDisplayString())) + "</p>");
+   }
+   finished();
+ }
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-11-14 13:08:23 UTC (rev 226235)
+++ extra-x86_64/PKGBUILD	2014-11-14 13:09:09 UTC (rev 226236)
@@ -1,42 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-
-pkgname=kio-extras
-pkgver=5.1.1
-pkgrel=1
-pkgdesc="Additional components to increase the functionality of KIO"
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/kio-extras'
-license=('LGPL')
-depends=('kdelibs4support' 'khtml' 'kdnssd' 'libssh' 'smbclient' 'exiv2' 'openexr' 'openslp')
-makedepends=('extra-cmake-modules' 'kdoctools' 'python')
-options=('!buildflags')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz")
-md5sums=('831fb9bc8960932233cf6042f6097751')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DLIB_INSTALL_DIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-
-  # conflicts with kdebase-runtime
-  rm "$pkgdir"/usr/lib/libmolletnetwork.so
-  mv "$pkgdir"/usr/share/config.kcfg/jpegcreatorsettings{,5}.kcfg
-}
-

Copied: kio-extras/repos/extra-x86_64/PKGBUILD (from rev 226235, kio-extras/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-11-14 13:09:09 UTC (rev 226236)
@@ -0,0 +1,47 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+
+pkgname=kio-extras
+pkgver=5.1.1
+pkgrel=2
+pkgdesc="Additional components to increase the functionality of KIO"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/kio-extras'
+license=('LGPL')
+depends=('kdelibs4support' 'khtml' 'kdnssd' 'libssh' 'smbclient' 'exiv2' 'openexr' 'openslp')
+makedepends=('extra-cmake-modules' 'kdoctools' 'python')
+options=('!buildflags')
+install="${pkgname}.install"
+source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
+        'sanitize-input.patch')
+md5sums=('831fb9bc8960932233cf6042f6097751'
+         '6462465f886decd5c7706d09bc71b2b8')
+
+prepare() {
+  mkdir -p build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i "${srcdir}"/sanitize-input.patch
+}
+
+build() {
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_INSTALL_DIR=lib \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+
+  # conflicts with kdebase-runtime
+  rm "$pkgdir"/usr/lib/libmolletnetwork.so
+  mv "$pkgdir"/usr/share/config.kcfg/jpegcreatorsettings{,5}.kcfg
+}
+

Deleted: extra-x86_64/kio-extras.install
===================================================================
--- extra-x86_64/kio-extras.install	2014-11-14 13:08:23 UTC (rev 226235)
+++ extra-x86_64/kio-extras.install	2014-11-14 13:09:09 UTC (rev 226236)
@@ -1,11 +0,0 @@
-post_install() {
-    update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}

Copied: kio-extras/repos/extra-x86_64/kio-extras.install (from rev 226235, kio-extras/trunk/kio-extras.install)
===================================================================
--- extra-x86_64/kio-extras.install	                        (rev 0)
+++ extra-x86_64/kio-extras.install	2014-11-14 13:09:09 UTC (rev 226236)
@@ -0,0 +1,11 @@
+post_install() {
+    update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}

Copied: kio-extras/repos/extra-x86_64/sanitize-input.patch (from rev 226235, kio-extras/trunk/sanitize-input.patch)
===================================================================
--- extra-x86_64/sanitize-input.patch	                        (rev 0)
+++ extra-x86_64/sanitize-input.patch	2014-11-14 13:09:09 UTC (rev 226236)
@@ -0,0 +1,31 @@
+From: Martin Sandsmark <martin.sandsmark at kde.org>
+Date: Thu, 13 Nov 2014 12:42:49 +0000
+Subject: Sanitize path
+X-Git-Url: http://quickgit.kde.org/?p=kio-extras.git&a=commitdiff&h=13155c8eb71d1c946bea21c38ea0f8ca7c7013cd
+---
+Sanitize path
+
+Reviewed at security at kde.org
+---
+
+
+--- a/bookmarks/kio_bookmarks.cpp
++++ b/bookmarks/kio_bookmarks.cpp
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ 
+ #include <qregexp.h>
++#include <qtextdocument.h>
+ #include <qurlquery.h>
+ 
+ #include <kapplication.h>
+@@ -198,7 +199,7 @@
+     echoImage(regexp.cap(1), regexp.cap(2), QUrlQuery(url).queryItemValue("size"));
+   } else {
+     echoHead();
+-    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
++    echo("<p class=\"message\">" + i18n("Wrong request: %1", Qt::escape(url.toDisplayString())) + "</p>");
+   }
+   finished();
+ }
+


More information about the arch-commits mailing list