head	1.3;
access;
symbols
	pkgsrc-2017Q3:1.2.0.70
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.66
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.64
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.62
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.60
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.58
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.56
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.54
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.52
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.50
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.48
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.46
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.2.0.44
	pkgsrc-2014Q3-base:1.2
	pkgsrc-2014Q2:1.2.0.42
	pkgsrc-2014Q2-base:1.2
	pkgsrc-2014Q1:1.2.0.40
	pkgsrc-2014Q1-base:1.2
	pkgsrc-2013Q4:1.2.0.38
	pkgsrc-2013Q4-base:1.2
	pkgsrc-2013Q3:1.2.0.36
	pkgsrc-2013Q3-base:1.2
	pkgsrc-2013Q2:1.2.0.34
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2013Q1:1.2.0.32
	pkgsrc-2013Q1-base:1.2
	pkgsrc-2012Q4:1.2.0.30
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2012Q3:1.2.0.28
	pkgsrc-2012Q3-base:1.2
	pkgsrc-2012Q2:1.2.0.26
	pkgsrc-2012Q2-base:1.2
	pkgsrc-2012Q1:1.2.0.24
	pkgsrc-2012Q1-base:1.2
	pkgsrc-2011Q4:1.2.0.22
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q3:1.2.0.20
	pkgsrc-2011Q3-base:1.2
	pkgsrc-2011Q2:1.2.0.18
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2011Q1:1.2.0.16
	pkgsrc-2011Q1-base:1.2
	pkgsrc-2010Q4:1.2.0.14
	pkgsrc-2010Q4-base:1.2
	pkgsrc-2010Q3:1.2.0.12
	pkgsrc-2010Q3-base:1.2
	pkgsrc-2010Q2:1.2.0.10
	pkgsrc-2010Q2-base:1.2
	pkgsrc-2010Q1:1.2.0.8
	pkgsrc-2010Q1-base:1.2
	pkgsrc-2009Q4:1.2.0.6
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2009Q3:1.2.0.4
	pkgsrc-2009Q3-base:1.2
	pkgsrc-2009Q2:1.2.0.2
	pkgsrc-2009Q2-base:1.2
	pkgsrc-2009Q1:1.1.0.22
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.20
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.18
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.16
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.14
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.12
	pkgsrc-2008Q1:1.1.0.10
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.8
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.6
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.4
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.2
	pkgsrc-2007Q1-base:1.1;
locks; strict;
comment	@# @;


1.3
date	2017.09.26.10.27.22;	author wiz;	state dead;
branches;
next	1.2;
commitid	9ARpkXTuh9Wg2H8A;

1.2
date	2009.05.20.01.00.40;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	2007.04.06.12.44.38;	author markd;	state Exp;
branches;
next	;


desc
@@


1.3
log
@*: remove qt3 and the packages using it, including KDE3

Announced in https://mail-index.netbsd.org/pkgsrc-users/2017/09/10/msg025556.html
@
text
@$NetBSD: patch-ar,v 1.2 2009/05/20 01:00:40 wiz Exp $

--- src/tools/qstring.cpp.orig	2007-02-02 14:01:05.000000000 +0000
+++ src/tools/qstring.cpp
@@@@ -1362,7 +1362,7 @@@@ QT_STATIC_CONST_IMPL QChar QChar::nbsp((
 QStringData* QString::makeSharedNull()
 {
     QString::shared_null = new QStringData;
-#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX)
+#if defined( Q_OS_MAC ) || defined(Q_OS_SOLARIS) || defined(Q_OS_HPUX) || defined(Q_OS_AIX) || defined(Q_OS_NETBSD)
     QString *that = const_cast<QString *>(&QString::null);
     that->d = QString::shared_null;
 #endif
@@@@ -5805,6 +5805,7 @@@@ QString QString::fromUtf8( const char* u
     result.setLength( len ); // worst case
     QChar *qch = (QChar *)result.unicode();
     uint uc = 0;
+    uint min_uc = 0;
     int need = 0;
     int error = -1;
     uchar ch;
@@@@ -5822,6 +5823,12 @@@@ QString QString::fromUtf8( const char* u
 			unsigned short low = uc%0x400 + 0xdc00;
 			*qch++ = QChar(high);
 			*qch++ = QChar(low);
+		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
+			// overlong seqence, UTF16 surrogate or BOM
+                        i = error;
+                        qch = addOne(qch, result);
+                        *qch++ = QChar(0xdbff);
+                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
 		    } else {
 			*qch++ = uc;
 		    }
@@@@ -5844,14 +5851,17 @@@@ QString QString::fromUtf8( const char* u
 		uc = ch & 0x1f;
 		need = 1;
 		error = i;
+		min_uc = 0x80;
 	    } else if ((ch & 0xf0) == 0xe0) {
 		uc = ch & 0x0f;
 		need = 2;
 		error = i;
+		min_uc = 0x800;
 	    } else if ((ch&0xf8) == 0xf0) {
 		uc = ch & 0x07;
 		need = 3;
 		error = i;
+		min_uc = 0x10000;
 	    } else {
 	        // Error
                 qch = addOne(qch, result);
@


1.2
log
@Apply patch reported by Gary Duzan in PR 37347 to fix finance/kmymoney2
after ld.elf_so fix from December 2007.

Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD: patch-ar,v 1.1 2007/04/06 12:44:38 markd Exp $
@


1.1
log
@Fix for CVE-2007-0242. Bump PKGREVISION.
@
text
@d1 1
a1 1
$NetBSD$
d3 1
a3 1
--- src/tools/qstring.cpp
d5 10
a14 1
@@@@ -5805,6 +5805,7 @@@@
d22 1
a22 1
@@@@ -5822,6 +5823,12 @@@@
d35 1
a35 1
@@@@ -5844,14 +5851,17 @@@@
@