Update KDE to the 3.0.5a distribution. Packages are numbered 3.0.5.1 or

1.0.5.1 accordingly.

Fixes and changes are:

Multiple vulnerabilities.

kdelibs
	KHTML : Fixed several crashes and misrenderings.
	rlogin.protocol: fixed command execution in specially crafted
	urls.

kdebase
	KAddressbook: Don't squeeze columns on startup/properly restore
	column width settings.

kdenetwork
	lisa, reslisa: Fixed several security vulnerabilities.

kdesdk
	Cervisia: Show long lines in diff view always completely.

3 files changed, 51 insertions, 22 deletions

diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index 27561f893c9..ef8660611e3 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2002/12/24 06:10:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/02 09:12:27 skrll Exp $
 
-DISTNAME=	kdeedu-3.0.4
-PKGREVISION=	1
+DISTNAME=	kdeedu-3.0.5a
 CATEGORIES=	misc
 COMMENT=	Edu{tainment,cation} tools for the KDE integrated X11 desktop
 
diff --git a/misc/kdeedu3/distinfo b/misc/kdeedu3/distinfo
index 6b18bc8e640..c75db4c3d8c 100644
--- a/misc/kdeedu3/distinfo
+++ b/misc/kdeedu3/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/10/14 09:13:49 skrll Exp $
+$NetBSD: distinfo,v 1.5 2003/01/02 09:12:27 skrll Exp $
 
-SHA1 (kdeedu-3.0.4.tar.bz2) = f64f1226d8b69d2fd6d407ba441ce95c35072785
-Size (kdeedu-3.0.4.tar.bz2) = 9104479 bytes
+SHA1 (kdeedu-3.0.5a.tar.bz2) = a2f8ab56b0590d11cf0d33a749f2d5a539af5a59
+Size (kdeedu-3.0.5a.tar.bz2) = 9109155 bytes
 SHA1 (patch-aa) = ee916dc502be8b66c3d0a95e3cdec8f787284b9c
-SHA1 (patch-ab) = 38336518e06cd7eb1c48c4a4dbc0667d82858bdf
+SHA1 (patch-ab) = f814ff0a501530d5b17e6450d09b40eecef090ec
diff --git a/misc/kdeedu3/patches/patch-ab b/misc/kdeedu3/patches/patch-ab
index 79b35e0b428..f3e687256e4 100644
--- a/misc/kdeedu3/patches/patch-ab
+++ b/misc/kdeedu3/patches/patch-ab
@@ -1,17 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:20:58 skrll Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/02 09:12:28 skrll Exp $
 
---- kvoctrain/kvoctrain/Makefile.in.orig	Mon May 27 08:01:18 2002
+--- kvoctrain/kvoctrain/Makefile.in.orig	Mon Dec 30 13:25:46 2002
 +++ kvoctrain/kvoctrain/Makefile.in
-@@ -578,7 +578,7 @@
+@@ -590,7 +590,7 @@ distclean-tags:
  
  #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
  #>+ 4
--KDE_DIST=kvoctrain.h kvoctrainview.h kvoctrain.lsm.tpl kvoctrain.dtd x-kvtml.desktop kvoctrain.desktop kv_resource.h rowtable.h 
-+KDE_DIST=kvoctrainview.h kvoctrain.h spotlight2kvtml x-kvtml.desktop kv_resource.h rowtable.h kvoctrain.lsm.tpl kvoctrain.dtd kvoctrain.desktop kvoctrain 
+-KDE_DIST=rowtable.h kvoctrainview.h x-kvtml.desktop kvoctrain.dtd kvoctrain.lsm.tpl kvoctrain.h kv_resource.h kvoctrain.desktop 
++KDE_DIST=rowtable.h kvoctrainview.h kvoctrain.lsm.tpl kvoctrain.h kvoctrain.dtd kvoctrain.desktop x-kvtml.desktop kv_resource.h 
  
  DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
  
-@@ -712,7 +712,7 @@
+@@ -724,7 +724,7 @@ uninstall-info: uninstall-info-recursive
  
  install-data-local:
  	$(mkinstalldirs) $(DESTDIR)$(kde_bindir)
@@ -20,12 +20,42 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:20:58 skrll Exp $
  	$(mkinstalldirs) $(DESTDIR)$(kde_appsdir)/Edutainment/
  	$(INSTALL_DATA) $(srcdir)/kvoctrain.desktop $(DESTDIR)$(kde_appsdir)/Edutainment/kvoctrain.desktop
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/
-@@ -839,7 +839,7 @@
- 	-rm -f  kvoctrain_meta_unload.cpp
- 
- #>+ 11
--kvoctrain.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kva_io.cpp $(srcdir)/kvoctrain.cpp $(srcdir)/kvoctrainview.cpp $(srcdir)/rowtable.cpp $(srcdir)/main.cpp $(srcdir)/kva_init.cpp $(srcdir)/kva_config.cpp $(srcdir)/kva_header.cpp $(srcdir)/kva_clip.cpp $(srcdir)/kva_query.cpp kvoctrain_meta_unload.cpp   kvoctrainview.moc rowtable.moc kvoctrain.moc 
-+kvoctrain.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kva_io.cpp $(srcdir)/kvoctrain.cpp $(srcdir)/kvoctrainview.cpp $(srcdir)/rowtable.cpp $(srcdir)/main.cpp $(srcdir)/kva_init.cpp $(srcdir)/kva_config.cpp $(srcdir)/kva_header.cpp $(srcdir)/kva_clip.cpp $(srcdir)/kva_query.cpp $(srcdir)/kvoctrain_meta_unload.cpp   kvoctrainview.moc rowtable.moc kvoctrain.moc 
- 	@echo 'creating kvoctrain.all_cpp.cpp ...'; \
- 	rm -f kvoctrain.all_cpp.files kvoctrain.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kvoctrain.all_cpp.final; \
+@@ -808,10 +808,6 @@ messages-local:
+ .NOEXPORT:
+ 
+ #>+ 3
+-kvoctrain.moc: $(srcdir)/kvoctrain.h
+-	$(MOC) $(srcdir)/kvoctrain.h -o kvoctrain.moc
+-
+-#>+ 3
+ kvoctrainview.moc: $(srcdir)/kvoctrainview.h
+ 	$(MOC) $(srcdir)/kvoctrainview.h -o kvoctrainview.moc
+ 
+@@ -820,8 +816,12 @@ rowtable.moc: $(srcdir)/rowtable.h
+ 	$(MOC) $(srcdir)/rowtable.h -o rowtable.moc
+ 
+ #>+ 3
++kvoctrain.moc: $(srcdir)/kvoctrain.h
++	$(MOC) $(srcdir)/kvoctrain.h -o kvoctrain.moc
++
++#>+ 3
+ clean-metasources:
+-	-rm -f  kvoctrain.moc kvoctrainview.moc rowtable.moc
++	-rm -f  kvoctrainview.moc rowtable.moc kvoctrain.moc
+ 
+ #>+ 2
+ docs-am:
+@@ -870,9 +870,9 @@ kde-rpo-clean:
+ 	-rm -f *.rpo
+ 
+ #>+ 7
+-kvoctrain.o: kvoctrain.moc 
+-rowtable.lo: rowtable.moc 
+ rowtable.o: rowtable.moc 
+-kvoctrain.lo: kvoctrain.moc 
+-kvoctrainview.lo: kvoctrainview.moc 
+ kvoctrainview.o: kvoctrainview.moc 
++rowtable.lo: rowtable.moc 
++kvoctrain.o: kvoctrain.moc 
++kvoctrainview.lo: kvoctrainview.moc 
++kvoctrain.lo: kvoctrain.moc