summary refs log tree commit diff
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@mailbox.org>2017-02-18 13:40:22 -0600
committerThomas Tuegel <ttuegel@mailbox.org>2017-02-24 16:49:02 -0600
commit43d306c2f5fe7338e030f6283b4186fbb7c53672 (patch)
tree6d81a752b139e779021f6073e303e9c337a4947c
parent9d6bfacc850114ca1bbdedc2630c72f59acad767 (diff)
downloadnixlib-43d306c2f5fe7338e030f6283b4186fbb7c53672.tar
nixlib-43d306c2f5fe7338e030f6283b4186fbb7c53672.tar.gz
nixlib-43d306c2f5fe7338e030f6283b4186fbb7c53672.tar.bz2
nixlib-43d306c2f5fe7338e030f6283b4186fbb7c53672.tar.lz
nixlib-43d306c2f5fe7338e030f6283b4186fbb7c53672.tar.xz
nixlib-43d306c2f5fe7338e030f6283b4186fbb7c53672.tar.zst
nixlib-43d306c2f5fe7338e030f6283b4186fbb7c53672.zip
Remove kde4.rekonq and dependencies
- No upstream activity
- Known vulnerabilities
-rw-r--r--pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff33
-rw-r--r--pkgs/applications/networking/browsers/kwebkitpart/default.nix25
-rw-r--r--pkgs/applications/networking/browsers/rekonq/default.nix26
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix7
5 files changed, 0 insertions, 92 deletions
diff --git a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
deleted file mode 100644
index 0c65e68f2167..000000000000
--- a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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() ) {
diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix
deleted file mode 100644
index 1cbffdd25446..000000000000
--- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }:
-
-stdenv.mkDerivation rec {
-  name = "kwebkitpart-${version}";
-  version = "1.3.3";
-
-  src = fetchgit {
-    url = git://anongit.kde.org/kwebkitpart;
-    rev = "refs/tags/v${version}";
-    sha256 = "13vfv88njml7x67a37ymmlv9qs30fkmvkq0278lp7llmvp5qnxcj";
-  };
-
-  patches = [ ./CVE-2014-8600.diff ];
-
-  buildInputs = [ kdelibs ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.phreedom ];
-    description = "A WebKit KPart for Konqueror, Akregator and other KDE applications";
-    homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart;
-  };
-}
diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
deleted file mode 100644
index 70aa648ccc50..000000000000
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kde4, shared_desktop_ontologies, qca2, qoauth }:
-
-assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
-
-stdenv.mkDerivation rec {
-  name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0
-
-  src = fetchurl {
-    url = "mirror://sourceforge/rekonq/${name}.tar.xz";
-    sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079";
-  };
-
-  buildInputs = [ kde4.kdelibs qca2 qoauth ];
-
-  nativeBuildInputs = [
-    automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies
-  ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.urkud ];
-    description = "KDE Webkit browser";
-    homepage = https://rekonq.kde.org/;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index db48e0769b3d..841eb75e905f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -96,7 +96,6 @@ doNotDisplayTwice rec {
   quake3game = ioquake3; # added 2016-01-14
   qwt6 = qt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
-  rekonqWrapper = rekonq; # added 2015-01
   rssglx = rss-glx; #added 2015-03-25
   rubygems = throw "deprecated 2016-03-02: rubygems is now bundled with ruby";
   rustUnstable = rustNightly; # added 2016-11-29
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97082218feed..62da5f8bbe58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16758,11 +16758,6 @@ with pkgs;
 
         psi = callPackage ../applications/networking/instant-messengers/psi { };
 
-        rekonq-unwrapped = callPackage ../applications/networking/browsers/rekonq { };
-        rekonq = wrapFirefox rekonq-unwrapped { };
-
-        kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { };
-
         semnotes = callPackage ../applications/misc/semnotes { };
 
         telepathy = callPackage ../applications/networking/instant-messengers/telepathy/kde {};
@@ -17884,8 +17879,6 @@ with pkgs;
   };
   vimprobable2 = wrapFirefox vimprobable2-unwrapped { };
 
-  inherit (kde4) rekonq;
-
   vimb-unwrapped = callPackage ../applications/networking/browsers/vimb {
     webkit = webkitgtk2;
   };