head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.8
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.6
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.4
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.2
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2010Q1:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2010.06.02.10.14.15;	author markd;	state dead;
branches;
next	1.1;

1.1
date	2010.05.16.21.21.39;	author markd;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2010.05.16.21.21.39;	author tron;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2010.05.17.06.35.07;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to KDE SC 4.4.4

* Several bugs in filename sorting in the Dolphin file manager have been
  fixed
* Issues with encoded filenames in ZIP archives have been fixed
* A number of bugs in games, such as KMines, KNetwalk and LSkat and
  KSpaceDuel have been fixed
The changelog lists more
@
text
@$NetBSD: patch-bb,v 1.1 2010/05/16 21:21:39 markd Exp $

--- kget/transfer-plugins/metalink/metalink.h.orig	2009-11-13 10:58:48.000000000 +0000
+++ kget/transfer-plugins/metalink/metalink.h
@@@@ -81,7 +81,7 @@@@ class Metalink : public Transfer
 
     private Q_SLOTS:
         void metalinkInit(const KUrl &url = KUrl(), const QByteArray &data = QByteArray());
-        void filesSelected();
+        void fileDlgFinished(int result);
         void totalSizeChanged(KIO::filesize_t size);
         void processedSizeChanged();
         void speedChanged();
@


1.1
log
@Fix from KDE security advisory 20100513-1.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-bb was added on branch pkgsrc-2010Q1 on 2010-05-17 06:35:07 +0000
@
text
@d1 13
@


1.1.2.2
log
@Pullup ticket #3118 - requested by markd
net/kdenetwork4: security patch

Revisions pulled up:
- net/kdenetwork4/Makefile			1.10 via patch
- net/kdenetwork4/distinfo			1.9 via patch
- net/kdenetwork4/patches/patch-ba		1.1 via patch
- net/kdenetwork4/patches/patch-bb		1.1 via patch
---
Subject: CVS commit: pkgsrc/net/kdenetwork4
Date: Monday 17 May 2010, 09:21:39
From: Mark Davies <markd@@netbsd.org>
To: pkgsrc-changes@@netbsd.org

Module Name:	pkgsrc
Committed By:	markd
Date:		Sun May 16 21:21:39 UTC 2010

Modified Files:
	pkgsrc/net/kdenetwork4: Makefile distinfo
Added Files:
	pkgsrc/net/kdenetwork4/patches: patch-ba patch-bb patch-bc patch-bd

Log Message:
Fix from KDE security advisory 20100513-1.
@
text
@a0 27
$NetBSD$

--- kget/transfer-plugins/metalink/metalinker.h.orig	2008-01-04 23:59:18.000000000 +0000
+++ kget/transfer-plugins/metalink/metalinker.h
@@@@ -1,6 +1,7 @@@@
 /* This file is part of the KDE project
 
    Copyright (C) 2007 Manolo Valdes <nolis71cu@@gmail.com>
+   Copyright (C) 2010 Matthias Fuchs <mat69@@gmx.net>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public
@@@@ -18,6 +19,14 @@@@ class MlinkFileData
 {
     public:
         MlinkFileData() {}
+
+        /**
+         * Controlls if the name attribute is valid, i.e. it is not empty and
+         * does not contain any directory traversal directives or information
+         * In case of faulty fileNames the MlinkFile gets discarded
+         */
+        bool isValidNameAttribute() const;
+
         QString fileName;
         QString md5;
         QString sha256;
@