update to 2.1.2

This release provides the following fixes:

Security fixes:
 KDEsu. The KDEsu which shipped with earlier releases of
  KDE 2 writes a (very) temporary but world-readable file
  with authentication information. A local user can
  potentially abuse this behavior to gain access to the X
  server and, if KDEsu is used to perform tasks that require
  root-access, can result in comprimise of the root account.
Bug fixes:
 kio_http. Fixed problems with "protocol for http://x.y.z
  died unexpectedly" and with proxy authentication with
  Konqueror.
 kparts. Fixed crash in KOffice 1.1 when splitting views.
  khtml. Fixed memory leak in Konqueror. Fixed minor
  HTML rendering problems.
 kcookiejar. Fixed minor problems with HTTP cookies.
  kconfig. Fixed problem with leading/trailing spaces in
  configuration values.
 kdebug. Fixed memory leak in debug output.
  klineedit. Fixed problem with klineedit emitting "return
  pressed" twice.

(The security fix was already dealt with by patches.)

8 files changed, 88 insertions, 190 deletions

diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index dee4f574dfa..03f3f5e17f6 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2001/07/18 22:44:30 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/07 14:32:21 drochner Exp $
 #
 
-DISTNAME=	kdelibs-2.1
-PKGNAME=	${DISTNAME}nb1
+DISTNAME=	kdelibs-2.1.2
 CATEGORIES=	x11 kde
 .include "../../x11/kde2/Makefile.part1"
 COMMENT=	Support libraries for the KDE integrated X11 desktop
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index b33e107fec8..215c00beab4 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.5 2001/07/05 05:53:53 jlam Exp $
+$NetBSD: distinfo,v 1.6 2001/09/07 14:32:21 drochner Exp $
 
-SHA1 (kdelibs-2.1.tar.bz2) = 5941037de8b47fb2d992ae780c28a8583f07d83c
-Size (kdelibs-2.1.tar.bz2) = 5020838 bytes
+SHA1 (kdelibs-2.1.2.tar.bz2) = db4a609b7940764b91d25b8d06e9bcc32518bfd2
+Size (kdelibs-2.1.2.tar.bz2) = 5062952 bytes
 SHA1 (patch-aa) = de413d73ae7a4359e49a4f29f4242017f098a6ea
 SHA1 (patch-ab) = d8fd5a336e7a0c22af4d4bf771c4f96261001b84
 SHA1 (patch-ac) = 11ac5f520e21ff403c6a3d04b61dfbd2d4036fae
-SHA1 (patch-ad) = 0f60efe8a2d22dc8b4e146834af06201657061d3
+SHA1 (patch-ad) = a48738758ab6940a6014c6a8e5ff788f7d509d8f
 SHA1 (patch-ae) = 1eae84672f4f792b7d56d9c958be585f30f9f056
 SHA1 (patch-af) = 542431463c9716001ebf17ea7a3b2506ed83f825
 SHA1 (patch-ag) = 750f4868cd2c81ec0317898ef1761a40016a86a8
@@ -16,11 +16,8 @@ SHA1 (patch-ak) = c79aecd339a37ff169831058273d84b2fec38195
 SHA1 (patch-al) = 0c9849cae46f4a14f5dd3dfcc9864702e471a286
 SHA1 (patch-am) = 57d49c27daebeaef0e32ce3228697c762db35aad
 SHA1 (patch-an) = 504fab95e210f12b078bc13bebeebfe978e710e4
-SHA1 (patch-ao) = a31b01facab240b6bc2a61ff8ddb0b8d1b138451
+SHA1 (patch-ao) = e2479c65833d965c86bff302bc2bb2bfd8846f51
 SHA1 (patch-ap) = 7267b685938e89d571fa80d34049c6f4b0bbd229
 SHA1 (patch-aq) = 4791d42453dfc847c09471b1e392e442a82a8fcd
 SHA1 (patch-ar) = 58a2bd19dfa34fdebefbf0603a1172278403e750
 SHA1 (patch-as) = f7f25bd3510b340195b689e4843e1358f324466a
-SHA1 (patch-at) = 13a753d748f8b13835d9da0c5ec19f94e0a22671
-SHA1 (patch-au) = 74d8ea01753a0f196b440d97693a83e663ec27b4
-SHA1 (patch-av) = 3c40a869827ee4c9a518ce8899f73c6dc7bb2c8f
diff --git a/x11/kdelibs2/patches/patch-ad b/x11/kdelibs2/patches/patch-ad
index 9c78b9cde60..62549f703f4 100644
--- a/x11/kdelibs2/patches/patch-ad
+++ b/x11/kdelibs2/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2001/07/05 05:53:53 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2001/09/07 14:32:21 drochner Exp $
 
 --- configure.orig	Thu Feb 22 13:17:52 2001
 +++ configure
@@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.3 2001/07/05 05:53:53 jlam Exp $
   QT_LDFLAGS=""
  else
 - QT_LDFLAGS="-L$qt_libraries"
-+ QT_LDFLAGS="-L${QTDIR}/lib"			# buildlink.mk
++ QT_LDFLAGS="-L${QTDIR}/lib -Wl,-R$qt_libraries"		# buildlink.mk
   all_libraries="$all_libraries $QT_LDFLAGS"
  fi
  
diff --git a/x11/kdelibs2/patches/patch-ao b/x11/kdelibs2/patches/patch-ao
index 3b7ba8b4189..e55551cebf5 100644
--- a/x11/kdelibs2/patches/patch-ao
+++ b/x11/kdelibs2/patches/patch-ao
@@ -1,8 +1,27 @@
-$NetBSD: patch-ao,v 1.1.1.1 2001/03/14 15:59:45 skrll Exp $
+$NetBSD: patch-ao,v 1.2 2001/09/07 14:32:21 drochner Exp $
 
---- kinit/kinit.cpp.orig	Sun Feb 18 15:27:05 2001
-+++ kinit/kinit.cpp
-@@ -81,7 +81,7 @@
+--- kinit/kinit.cpp.orig	Thu Mar 15 01:38:06 2001
++++ kinit/kinit.cpp	Thu Aug  9 16:12:05 2001
+@@ -64,18 +64,8 @@
+ # include <dlfcn.h>
+ #endif
+ 
+-#ifdef RTLD_GLOBAL
+-# define LTDL_GLOBAL	RTLD_GLOBAL
+-#else
+-# ifdef DL_GLOBAL
+-#  define LTDL_GLOBAL	DL_GLOBAL
+-# else
+-#  define LTDL_GLOBAL	0
+-# endif
+-#endif
+ 
+ 
+-extern int lt_dlopen_flag;
+ static int X11fd = -1;
+ static Display *X11display = 0;
+ static const KInstance *s_instance = 0;
+@@ -96,11 +86,10 @@
    pid_t my_pid;
    int n;
    lt_dlhandle handle;
@@ -11,3 +30,24 @@ $NetBSD: patch-ao,v 1.1.1.1 2001/03/14 15:59:45 skrll Exp $
    char **argv;
    int (*func)(int, char *[]);
    int (*launcher_func)(int);
+-  int lt_dlopen_flag;
+ } d;
+ 
+ extern "C" {
+@@ -228,7 +217,6 @@
+            }
+         }
+      }
+-     lt_dlopen_flag = d.lt_dlopen_flag;
+      if (!d.handle )
+      {
+         d.result = 2; // Try execing
+@@ -993,8 +981,6 @@
+    d.maxname = strlen(argv[0]);
+    d.launcher_pid = 0;
+    d.wrapper = 0;
+-   d.lt_dlopen_flag = lt_dlopen_flag;
+-   lt_dlopen_flag |= LTDL_GLOBAL;
+    init_signals();
+ 
+ 
diff --git a/x11/kdelibs2/patches/patch-at b/x11/kdelibs2/patches/patch-at
deleted file mode 100644
index dff0debf47b..00000000000
--- a/x11/kdelibs2/patches/patch-at
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-at,v 1.1 2001/05/01 09:46:37 skrll Exp $
-
---- kdesu/kdesu_pty.cpp.orig	Sun Feb 18 15:26:55 2001
-+++ kdesu/kdesu_pty.cpp
-@@ -16,15 +16,15 @@
-  */
- 
- 
--#include <config.h>
--
- #ifndef _GNU_SOURCE
- #define _GNU_SOURCE   /* Needed for getpt, ptsname in glibc 2.1.x systems */
- #endif
- 
--#ifndef _XOPEN_SOURCE
-+#if !defined(_XOPEN_SOURCE) && !defined(__osf__)
- #define _XOPEN_SOURCE /* Needed for grantpt, unlockpt in glibc 2.1.x      */
- #endif
-+
-+#include <config.h>
- 
- #include <stdio.h>
- #include <fcntl.h>
diff --git a/x11/kdelibs2/patches/patch-au b/x11/kdelibs2/patches/patch-au
deleted file mode 100644
index 19171c95e00..00000000000
--- a/x11/kdelibs2/patches/patch-au
+++ /dev/null
@@ -1,126 +0,0 @@
-$NetBSD: patch-au,v 1.1 2001/05/01 09:46:37 skrll Exp $
-
---- kdesu/kdesu_stub.c.orig	Sun Feb 18 15:26:55 2001
-+++ kdesu/kdesu_stub.c
-@@ -173,6 +173,7 @@
-     return list;
- }
- 
-+#define BUFSIZE	8192
- 
- /**
-  * The main program
-@@ -180,9 +181,9 @@
- 
- int main()
- {
--    char buf[1024];
--    char command[200], xauthority[200], iceauthority[200];
--    char **host, **auth, *fname;
-+    char buf[BUFSIZE+1];
-+    char xauthority[200], iceauthority[200];
-+    char **host, **auth;
-     int i/*, res, sycoca*/, prio;
-     pid_t pid;
-     FILE *fout;
-@@ -194,7 +195,7 @@
-     {
- 	printf("%s\n", params[i].name);
- 	fflush(stdout);
--	if (fgets(buf, 500, stdin) == 0L) 
-+	if (fgets(buf, BUFSIZE, stdin) == 0L) 
- 	{
- 	    printf("end\n"); fflush(stdout);
- 	    perror("kdesu_stub: fgets()");
-@@ -276,22 +277,34 @@
- 	xsetenv("DISPLAY", params[P_DISPLAY].value);
- 	if (params[P_DISPLAY_AUTH].value[0]) 
- 	{
--	    fname = tmpnam(0L);
--	    fout = fopen(fname, "w");
--	    if (!fout) 
--	    {
--		perror("kdesu_stub: fopen()");
-+           int	fd2;
-+           /*
-+           ** save umask and set to 077, so we create those files only
-+	   ** readable for root. (if someone else could read them, we
-+	   ** are in deep shit).
-+           */
-+	   int oldumask = umask(077);
-+
-+           strcpy(xauthority, "/tmp/xauth.XXXXXXXXXX");
-+	   fd2 = mkstemp(xauthority);
-+	   umask(oldumask);
-+
-+           if (fd2 == -1) {
-+                perror("kdesu_stub: mkstemp()");
-+                exit(1);
-+           } else
-+                close(fd2);
-+           xsetenv("XAUTHORITY", xauthority);
-+
-+	   fout = popen("xauth >/dev/null 2>&1","w");
-+           if (fout == NULL)
-+	   {
-+		perror("kdesu_stub: popen(xauth)");
- 		exit(1);
--	    }
--	    fprintf(fout, "add %s %s\n", params[P_DISPLAY].value,
-+	   }
-+	   fprintf(fout, "add %s %s\n", params[P_DISPLAY].value,
- 		    params[P_DISPLAY_AUTH].value);
--	    fclose(fout);
--	    tmpnam(xauthority);
--	    xsetenv("XAUTHORITY", xauthority);
--	    sprintf(command, "xauth source %s >/dev/null 2>&1", fname);
--	    if (system(command))
--		printf("kdesu_stub: failed to add X authentication");
--	    unlink(fname);
-+	   pclose(fout);
- 	}
-     }
- 
-@@ -305,11 +318,22 @@
- 	auth = xstrsep(params[P_ICE_AUTH].value);
- 	if (host[0]) 
- 	{
--	    fname = tmpnam(0L);
--	    fout = fopen(fname, "w");
--	    if (!fout) 
--	    {
--		perror("kdesu_stub: fopen()");
-+            int fd;
-+	    int	oldumask = umask(077);
-+
-+            strcpy(iceauthority, "/tmp/iceauth.XXXXXXXXXX");
-+            fd = mkstemp(iceauthority);
-+	    umask(oldumask);
-+            if (fd == -1) {
-+                perror("kdesu_stub: mkstemp()");
-+                exit(1);
-+            } else
-+                close(fd);
-+	    xsetenv("ICEAUTHORITY", iceauthority);
-+
-+	    fout = popen("iceauth >/dev/null 2>&1", "w");
-+	    if (!fout) {
-+		perror("kdesu_stub: popen iceauth");
- 		exit(1);
- 	    }
- 	    for (i=0; host[i]; i++)
-@@ -317,13 +341,7 @@
- 	    auth = xstrsep(params[P_DCOP_AUTH].value);
- 	    for (i=0; host[i]; i++)
- 		fprintf(fout, "add DCOP \"\" %s %s\n", host[i], auth[i]);
--	    fclose(fout);
--	    tmpnam(iceauthority);
--	    xsetenv("ICEAUTHORITY", iceauthority);
--	    sprintf(command, "iceauth source %s >/dev/null 2>&1", fname);
--	    if (system(command))
--		printf("kdesu_stub: failed to add DCOP authentication\n");
--	    unlink(fname);
-+	    pclose(fout);
- 	}
-     }
- 
diff --git a/x11/kdelibs2/patches/patch-av b/x11/kdelibs2/patches/patch-av
deleted file mode 100644
index 6b3b572f72f..00000000000
--- a/x11/kdelibs2/patches/patch-av
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-av,v 1.1 2001/05/01 09:46:37 skrll Exp $
-
---- kdesu/client.cpp.orig	Sun Feb 18 15:26:55 2001
-+++ kdesu/client.cpp
-@@ -31,6 +31,7 @@
- 
- #include <kdebug.h>
- #include <kstddirs.h>
-+#include <kapp.h>
- 
- #include "client.h"
- 
-@@ -385,7 +386,9 @@
- 
-     // kdesud only forks to the background after it is accepting
-     // connections.
--    int ret = system(QFile::encodeName(d->daemon));
-+    // We start it via kdeinit to make sure that it doesn't inherit
-+    // any fd's from the parent process.
-+    int ret = kapp->kdeinitExecWait(d->daemon);
-     connect();
-     return ret;
- }
diff --git a/x11/kdelibs2/pkg/PLIST b/x11/kdelibs2/pkg/PLIST
index f0a60d8906c..3993060070c 100644
--- a/x11/kdelibs2/pkg/PLIST
+++ b/x11/kdelibs2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/14 16:00:43 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/09/07 14:32:22 drochner Exp $
 bin/artsc-config
 bin/artscat
 bin/artsd
@@ -16,6 +16,7 @@ bin/kdb2html
 bin/kde-config
 bin/kded
 bin/kdeinit
+bin/kdeinit_shutdown
 bin/kdeinit_wrapper
 bin/kdesu_stub
 bin/kio_http_cache_cleaner
@@ -1247,6 +1248,7 @@ share/kde/icons/hicolor/16x16/actions/bookmark_add.png
 share/kde/icons/hicolor/16x16/actions/bookmark_folder.png
 share/kde/icons/hicolor/16x16/actions/bookmark_toolbar.png
 share/kde/icons/hicolor/16x16/actions/bottom.png
+share/kde/icons/hicolor/16x16/actions/charset.png
 share/kde/icons/hicolor/16x16/actions/colorpicker.png
 share/kde/icons/hicolor/16x16/actions/configure.png
 share/kde/icons/hicolor/16x16/actions/connect_creating.png
@@ -1259,6 +1261,7 @@ share/kde/icons/hicolor/16x16/actions/crop.png
 share/kde/icons/hicolor/16x16/actions/decrypted.png
 share/kde/icons/hicolor/16x16/actions/down.png
 share/kde/icons/hicolor/16x16/actions/edit.png
+share/kde/icons/hicolor/16x16/actions/editclear.png
 share/kde/icons/hicolor/16x16/actions/editcopy.png
 share/kde/icons/hicolor/16x16/actions/editcut.png
 share/kde/icons/hicolor/16x16/actions/editdelete.png
@@ -1288,6 +1291,7 @@ share/kde/icons/hicolor/16x16/actions/goto.png
 share/kde/icons/hicolor/16x16/actions/help.png
 share/kde/icons/hicolor/16x16/actions/history.png
 share/kde/icons/hicolor/16x16/actions/idea.png
+share/kde/icons/hicolor/16x16/actions/locationbar_erase.png
 share/kde/icons/hicolor/16x16/actions/lock.png
 share/kde/icons/hicolor/16x16/actions/mail_forward.png
 share/kde/icons/hicolor/16x16/actions/mail_generic.png
@@ -1303,7 +1307,9 @@ share/kde/icons/hicolor/16x16/actions/openterm.png
 share/kde/icons/hicolor/16x16/actions/previous.png
 share/kde/icons/hicolor/16x16/actions/redo.png
 share/kde/icons/hicolor/16x16/actions/reload.png
+share/kde/icons/hicolor/16x16/actions/revert.png
 share/kde/icons/hicolor/16x16/actions/run.png
+share/kde/icons/hicolor/16x16/actions/spellcheck.png
 share/kde/icons/hicolor/16x16/actions/start.png
 share/kde/icons/hicolor/16x16/actions/stop.png
 share/kde/icons/hicolor/16x16/actions/top.png
@@ -1352,6 +1358,7 @@ share/kde/icons/hicolor/16x16/filesystems/www.png
 share/kde/icons/hicolor/16x16/mimetypes/applix.png
 share/kde/icons/hicolor/16x16/mimetypes/binary.png
 share/kde/icons/hicolor/16x16/mimetypes/binary2.png
+share/kde/icons/hicolor/16x16/mimetypes/colorscm.png
 share/kde/icons/hicolor/16x16/mimetypes/core.png
 share/kde/icons/hicolor/16x16/mimetypes/deb.png
 share/kde/icons/hicolor/16x16/mimetypes/document.png
@@ -1415,6 +1422,7 @@ share/kde/icons/hicolor/22x22/actions/bookmark.png
 share/kde/icons/hicolor/22x22/actions/bookmark_add.png
 share/kde/icons/hicolor/22x22/actions/bottom.png
 share/kde/icons/hicolor/22x22/actions/centrejust.png
+share/kde/icons/hicolor/22x22/actions/charset.png
 share/kde/icons/hicolor/22x22/actions/colorize.png
 share/kde/icons/hicolor/22x22/actions/colorpicker.png
 share/kde/icons/hicolor/22x22/actions/configure.png
@@ -1422,11 +1430,13 @@ share/kde/icons/hicolor/22x22/actions/connect_creating.png
 share/kde/icons/hicolor/22x22/actions/connect_established.png
 share/kde/icons/hicolor/22x22/actions/connect_no.png
 share/kde/icons/hicolor/22x22/actions/contents.png
+share/kde/icons/hicolor/22x22/actions/contents2.png
 share/kde/icons/hicolor/22x22/actions/contexthelp.png
 share/kde/icons/hicolor/22x22/actions/crop.png
 share/kde/icons/hicolor/22x22/actions/decrypted.png
 share/kde/icons/hicolor/22x22/actions/down.png
 share/kde/icons/hicolor/22x22/actions/edit.png
+share/kde/icons/hicolor/22x22/actions/editclear.png
 share/kde/icons/hicolor/22x22/actions/editcopy.png
 share/kde/icons/hicolor/22x22/actions/editcut.png
 share/kde/icons/hicolor/22x22/actions/editdelete.png
@@ -1436,6 +1446,8 @@ share/kde/icons/hicolor/22x22/actions/edittrash.png
 share/kde/icons/hicolor/22x22/actions/encrypted.png
 share/kde/icons/hicolor/22x22/actions/eraser.png
 share/kde/icons/hicolor/22x22/actions/exec.png
+share/kde/icons/hicolor/22x22/actions/exit.png
+share/kde/icons/hicolor/22x22/actions/fileclose.png
 share/kde/icons/hicolor/22x22/actions/filefind.png
 share/kde/icons/hicolor/22x22/actions/filenew.png
 share/kde/icons/hicolor/22x22/actions/fileopen.png
@@ -1503,6 +1515,7 @@ share/kde/icons/hicolor/22x22/actions/kde/0048.png
 share/kde/icons/hicolor/22x22/actions/kde/0049.png
 share/kde/icons/hicolor/22x22/actions/kde/0050.png
 share/kde/icons/hicolor/22x22/actions/leftjust.png
+share/kde/icons/hicolor/22x22/actions/locationbar_erase.png
 share/kde/icons/hicolor/22x22/actions/lock.png
 share/kde/icons/hicolor/22x22/actions/mail_forward.png
 share/kde/icons/hicolor/22x22/actions/mail_generic.png
@@ -1526,6 +1539,7 @@ share/kde/icons/hicolor/22x22/actions/previous.png
 share/kde/icons/hicolor/22x22/actions/queue.png
 share/kde/icons/hicolor/22x22/actions/redo.png
 share/kde/icons/hicolor/22x22/actions/reload.png
+share/kde/icons/hicolor/22x22/actions/revert.png
 share/kde/icons/hicolor/22x22/actions/rightjust.png
 share/kde/icons/hicolor/22x22/actions/run.png
 share/kde/icons/hicolor/22x22/actions/showmenu.png
@@ -1570,13 +1584,19 @@ share/kde/icons/hicolor/32x32/actions/bookmark_folder.png
 share/kde/icons/hicolor/32x32/actions/bookmark_toolbar.png
 share/kde/icons/hicolor/32x32/actions/bottom.png
 share/kde/icons/hicolor/32x32/actions/centrejust.png
+share/kde/icons/hicolor/32x32/actions/charset.png
 share/kde/icons/hicolor/32x32/actions/colorize.png
 share/kde/icons/hicolor/32x32/actions/configure.png
+share/kde/icons/hicolor/32x32/actions/connect_creating.png
+share/kde/icons/hicolor/32x32/actions/connect_established.png
+share/kde/icons/hicolor/32x32/actions/connect_no.png
 share/kde/icons/hicolor/32x32/actions/contents.png
+share/kde/icons/hicolor/32x32/actions/contents2.png
 share/kde/icons/hicolor/32x32/actions/contexthelp.png
 share/kde/icons/hicolor/32x32/actions/decrypted.png
 share/kde/icons/hicolor/32x32/actions/down.png
 share/kde/icons/hicolor/32x32/actions/edit.png
+share/kde/icons/hicolor/32x32/actions/editclear.png
 share/kde/icons/hicolor/32x32/actions/editcopy.png
 share/kde/icons/hicolor/32x32/actions/editcut.png
 share/kde/icons/hicolor/32x32/actions/editdelete.png
@@ -1585,6 +1605,9 @@ share/kde/icons/hicolor/32x32/actions/editshred.png
 share/kde/icons/hicolor/32x32/actions/edittrash.png
 share/kde/icons/hicolor/32x32/actions/encrypted.png
 share/kde/icons/hicolor/32x32/actions/exec.png
+share/kde/icons/hicolor/32x32/actions/exit.png
+share/kde/icons/hicolor/32x32/actions/fileclose.png
+share/kde/icons/hicolor/32x32/actions/filefind.png
 share/kde/icons/hicolor/32x32/actions/filenew.png
 share/kde/icons/hicolor/32x32/actions/fileopen.png
 share/kde/icons/hicolor/32x32/actions/fileprint.png
@@ -1595,6 +1618,7 @@ share/kde/icons/hicolor/32x32/actions/finish.png
 share/kde/icons/hicolor/32x32/actions/folder_new.png
 share/kde/icons/hicolor/32x32/actions/fonts.png
 share/kde/icons/hicolor/32x32/actions/forward.png
+share/kde/icons/hicolor/32x32/actions/frameprint.png
 share/kde/icons/hicolor/32x32/actions/gear.png
 share/kde/icons/hicolor/32x32/actions/gohome.png
 share/kde/icons/hicolor/32x32/actions/goto.png
@@ -1651,6 +1675,7 @@ share/kde/icons/hicolor/32x32/actions/kde/0048.png
 share/kde/icons/hicolor/32x32/actions/kde/0049.png
 share/kde/icons/hicolor/32x32/actions/kde/0050.png
 share/kde/icons/hicolor/32x32/actions/leftjust.png
+share/kde/icons/hicolor/32x32/actions/locationbar_erase.png
 share/kde/icons/hicolor/32x32/actions/lock.png
 share/kde/icons/hicolor/32x32/actions/mail_forward.png
 share/kde/icons/hicolor/32x32/actions/mail_generic.png
@@ -1672,6 +1697,7 @@ share/kde/icons/hicolor/32x32/actions/previous.png
 share/kde/icons/hicolor/32x32/actions/queue.png
 share/kde/icons/hicolor/32x32/actions/redo.png
 share/kde/icons/hicolor/32x32/actions/reload.png
+share/kde/icons/hicolor/32x32/actions/revert.png
 share/kde/icons/hicolor/32x32/actions/rightjust.png
 share/kde/icons/hicolor/32x32/actions/rotate.png
 share/kde/icons/hicolor/32x32/actions/rotate_ccw.png
@@ -1746,6 +1772,7 @@ share/kde/icons/hicolor/32x32/filesystems/zip.png
 share/kde/icons/hicolor/32x32/mimetypes/applix.png
 share/kde/icons/hicolor/32x32/mimetypes/binary.png
 share/kde/icons/hicolor/32x32/mimetypes/binary2.png
+share/kde/icons/hicolor/32x32/mimetypes/colorscm.png
 share/kde/icons/hicolor/32x32/mimetypes/core.png
 share/kde/icons/hicolor/32x32/mimetypes/deb.png
 share/kde/icons/hicolor/32x32/mimetypes/document.png
@@ -1897,6 +1924,7 @@ share/kde/icons/hicolor/48x48/filesystems/zip.png
 share/kde/icons/hicolor/48x48/mimetypes/applix.png
 share/kde/icons/hicolor/48x48/mimetypes/binary.png
 share/kde/icons/hicolor/48x48/mimetypes/binary2.png
+share/kde/icons/hicolor/48x48/mimetypes/colorscm.png
 share/kde/icons/hicolor/48x48/mimetypes/core.png
 share/kde/icons/hicolor/48x48/mimetypes/deb.png
 share/kde/icons/hicolor/48x48/mimetypes/document.png
@@ -1968,6 +1996,7 @@ share/kde/icons/locolor/16x16/actions/bookmark.png
 share/kde/icons/locolor/16x16/actions/bookmark_add.png
 share/kde/icons/locolor/16x16/actions/bookmark_toolbar.png
 share/kde/icons/locolor/16x16/actions/bottom.png
+share/kde/icons/locolor/16x16/actions/charset.png
 share/kde/icons/locolor/16x16/actions/colorize.png
 share/kde/icons/locolor/16x16/actions/colorpicker.png
 share/kde/icons/locolor/16x16/actions/completion.png
@@ -1993,6 +2022,7 @@ share/kde/icons/locolor/16x16/actions/eraser.png
 share/kde/icons/locolor/16x16/actions/exec.png
 share/kde/icons/locolor/16x16/actions/exit.png
 share/kde/icons/locolor/16x16/actions/fileclose.png
+share/kde/icons/locolor/16x16/actions/filefind.png
 share/kde/icons/locolor/16x16/actions/filenew.png
 share/kde/icons/locolor/16x16/actions/fileopen.png
 share/kde/icons/locolor/16x16/actions/fileprint.png
@@ -2005,10 +2035,12 @@ share/kde/icons/locolor/16x16/actions/finish.png
 share/kde/icons/locolor/16x16/actions/flag.png
 share/kde/icons/locolor/16x16/actions/folder_new.png
 share/kde/icons/locolor/16x16/actions/forward.png
+share/kde/icons/locolor/16x16/actions/frameprint.png
 share/kde/icons/locolor/16x16/actions/gear.png
 share/kde/icons/locolor/16x16/actions/gohome.png
 share/kde/icons/locolor/16x16/actions/goto.png
 share/kde/icons/locolor/16x16/actions/help.png
+share/kde/icons/locolor/16x16/actions/history.png
 share/kde/icons/locolor/16x16/actions/idea.png
 share/kde/icons/locolor/16x16/actions/identity.png
 share/kde/icons/locolor/16x16/actions/kde/0001.png
@@ -2088,6 +2120,7 @@ share/kde/icons/locolor/16x16/actions/queue.png
 share/kde/icons/locolor/16x16/actions/redo.png
 share/kde/icons/locolor/16x16/actions/reload.png
 share/kde/icons/locolor/16x16/actions/remove.png
+share/kde/icons/locolor/16x16/actions/revert.png
 share/kde/icons/locolor/16x16/actions/rotate.png
 share/kde/icons/locolor/16x16/actions/rotate_ccw.png
 share/kde/icons/locolor/16x16/actions/rotate_cw.png
@@ -2348,6 +2381,7 @@ share/kde/mimelnk/application/x-tzo.desktop
 share/kde/mimelnk/application/x-zip.desktop
 share/kde/mimelnk/application/x-zoo.desktop
 share/kde/mimelnk/audio/basic.desktop
+share/kde/mimelnk/audio/mpegurl.desktop
 share/kde/mimelnk/audio/vnd.rn-realaudio.desktop
 share/kde/mimelnk/audio/x-adpcm.desktop
 share/kde/mimelnk/audio/x-aiff.desktop