head 1.4; access; symbols pkgsrc-2017Q3:1.3.0.60 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.56 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.54 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.52 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.50 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.48 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.46 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.44 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.42 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.40 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.38 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.36 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.34 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.32 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.30 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.28 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.26 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.24 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.22 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.20 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.18 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.16 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.14 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.12 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.10 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.8 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.6 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.4 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.2 pkgsrc-2009Q4:1.2.0.46 pkgsrc-2009Q4-base:1.2 pkgsrc-2008Q4:1.2.0.44 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.42 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.40 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.38 pkgsrc-2008Q2-base:1.2 pkgsrc-2008Q1:1.2.0.36 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.34 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.32 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.30 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.28 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.26 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 netbsd-1-6:1.1.1.1.0.4 netbsd-1-6-RELEASE-base:1.1 pkgviews:1.1.1.1.0.6 pkgviews-base:1.1 buildlink2-base:1.1.1.1 buildlink2:1.1.1.1.0.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2017.09.26.10.27.03; author wiz; state dead; branches; next 1.3; commitid 9ARpkXTuh9Wg2H8A; 1.3 date 2010.10.25.19.30.04; author markd; state Exp; branches 1.3.2.1; next 1.2; 1.2 date 2003.01.20.10.03.51; author skrll; state dead; branches; next 1.1; 1.1 date 2002.06.05.08.58.03; author skrll; state Exp; branches 1.1.1.1; next ; 1.3.2.1 date 2010.10.25.19.30.04; author tron; state dead; branches; next 1.3.2.2; 1.3.2.2 date 2010.10.26.11.09.49; author tron; state Exp; branches; next ; 1.1.1.1 date 2002.06.05.08.58.03; author skrll; state Exp; branches 1.1.1.1.2.1; next ; 1.1.1.1.2.1 date 2002.06.05.08.58.03; author jlam; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2002.06.23.18.46.30; author jlam; state Exp; branches; next ; desc @@ 1.4 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-ae,v 1.3 2010/10/25 19:30:04 markd Exp $ Fix for CVE-2010-3704 --- kpdf/xpdf/fofi/FoFiType1.cc.orig 2007-05-14 07:39:30.000000000 +0000 +++ kpdf/xpdf/fofi/FoFiType1.cc @@@@ -18,6 +18,14 @@@@ #include "FoFiEncodings.h" #include "FoFiType1.h" +#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__) +# define likely(x) __builtin_expect((x), 1) +# define unlikely(x) __builtin_expect((x), 0) +#else +# define likely(x) (x) +# define unlikely(x) (x) +#endif + //------------------------------------------------------------------------ // FoFiType1 //------------------------------------------------------------------------ @@@@ -224,7 +232,7 @@@@ void FoFiType1::parse() { code = code * 8 + (*p2 - '0'); } } - if (code < 256) { + if (likely(code < 256 && code >= 0)) { for (p = p2; *p == ' ' || *p == '\t'; ++p) ; if (*p == '/') { ++p; @ 1.3 log @Fixes for CVE-2010-3702 and CVE-2010-3704 via the patches for xpdf. @ text @d1 1 a1 1 $NetBSD$ @ 1.3.2.1 log @file patch-ae was added on branch pkgsrc-2010Q3 on 2010-10-26 11:09:49 +0000 @ text @d1 30 @ 1.3.2.2 log @Pullup ticket #3259 - requested by markd graphics/kdegraphics3: security patch Revisions pulled up: - graphics/kdegraphics3/Makefile 1.88 - graphics/kdegraphics3/distinfo 1.52 - graphics/kdegraphics3/patches/patch-ad 1.8 - graphics/kdegraphics3/patches/patch-ae 1.3 --- Module Name: pkgsrc Committed By: markd Date: Mon Oct 25 19:30:05 UTC 2010 Modified Files: pkgsrc/graphics/kdegraphics3: Makefile distinfo Added Files: pkgsrc/graphics/kdegraphics3/patches: patch-ad patch-ae Log Message: Fixes for CVE-2010-3702 and CVE-2010-3704 via the patches for xpdf. @ text @a0 30 $NetBSD$ Fix for CVE-2010-3704 --- kpdf/xpdf/fofi/FoFiType1.cc.orig 2007-05-14 07:39:30.000000000 +0000 +++ kpdf/xpdf/fofi/FoFiType1.cc @@@@ -18,6 +18,14 @@@@ #include "FoFiEncodings.h" #include "FoFiType1.h" +#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__) +# define likely(x) __builtin_expect((x), 1) +# define unlikely(x) __builtin_expect((x), 0) +#else +# define likely(x) (x) +# define unlikely(x) (x) +#endif + //------------------------------------------------------------------------ // FoFiType1 //------------------------------------------------------------------------ @@@@ -224,7 +232,7 @@@@ void FoFiType1::parse() { code = code * 8 + (*p2 - '0'); } } - if (code < 256) { + if (likely(code < 256 && code >= 0)) { for (p = p2; *p == ' ' || *p == '\t'; ++p) ; if (*p == '/') { ++p; @ 1.2 log @The result of my recent KDE fiddlings - Build all packages with a --disable-static libtool. This is how the packages should be built and means that we don't get a load of useless static libraries. - Use x11/kde3/files/foo_main.cpp instead of creating N copies with patches. - Some other PLIST fixes - Fix PR 19848. kspell doesn't find dictionaries. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1 2002/06/05 08:58:03 skrll Exp $ d3 15 a17 26 --- kview/kview_main.cpp.orig Wed Jun 5 09:01:42 2002 +++ kview/kview_main.cpp @@@@ -0,0 +1,28 @@@@ +/* + * + * Copyright (c) 2001 Nick Hudson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +extern "C" int kdemain(int, char* []); d19 12 a30 4 +int main( int argc, char* argv[] ) +{ + return kdemain(argc, argv); +} @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @Initial import of a kdegraphics3 pkg. @ text @@ 1.1.1.1.2.1 log @file patch-ae was added on branch buildlink2 on 2002-06-23 18:46:30 +0000 @ text @d1 33 @ 1.1.1.1.2.2 log @Merge from pkgsrc-current to buildlink2 branch. @ text @a0 33 $NetBSD: patch-ae,v 1.1.1.1.2.1 2002/06/23 18:46:30 jlam Exp $ --- kview/kview_main.cpp.orig Wed Jun 5 09:01:42 2002 +++ kview/kview_main.cpp @@@@ -0,0 +1,28 @@@@ +/* + * + * Copyright (c) 2001 Nick Hudson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +extern "C" int kdemain(int, char* []); + +int main( int argc, char* argv[] ) +{ + return kdemain(argc, argv); +} @