Date: Friday, November 27, 2009 @ 20:40:00 Author: andrea Revision: 59820
updated trunk PKGBUILDs to 4.3.4 Modified: kdelibs/trunk/PKGBUILD Deleted: kdelibs/trunk/CVE-2009-0689.patch kdelibs/trunk/fix-glibc-2.11.patch ----------------------+ CVE-2009-0689.patch | 13 --- PKGBUILD | 28 ++------ fix-glibc-2.11.patch | 165 ------------------------------------------------- 3 files changed, 9 insertions(+), 197 deletions(-) Deleted: CVE-2009-0689.patch =================================================================== --- CVE-2009-0689.patch 2009-11-28 01:35:26 UTC (rev 59819) +++ CVE-2009-0689.patch 2009-11-28 01:40:00 UTC (rev 59820) @@ -1,13 +0,0 @@ -Index: kjs/dtoa.cpp -=================================================================== ---- kjs/dtoa.cpp (Revision 1052099) -+++ kjs/dtoa.cpp (Revision 1052100) -@@ -457,7 +457,7 @@ - #define FREE_DTOA_LOCK(n) /*nothing*/ - #endif - --#define Kmax 15 -+#define Kmax (sizeof(size_t) << 3) - - struct - Bigint { Modified: PKGBUILD =================================================================== --- PKGBUILD 2009-11-28 01:35:26 UTC (rev 59819) +++ PKGBUILD 2009-11-28 01:40:00 UTC (rev 59820) @@ -2,38 +2,28 @@ # Maintainer: Pierre Schmitz <pie...@archlinux.de> pkgname=kdelibs -pkgver=4.3.3 -pkgrel=2 +pkgver=4.3.4 +pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') depends=('qt' 'shared-mime-info' 'hal' 'xz-utils' 'heimdal' - 'enchant' 'jasper' 'openexr' 'strigi>=0.7.0' 'libxtst' - 'giflib' 'soprano>=2.3.0' 'ca-certificates' 'xdg-utils') + 'enchant' 'jasper' 'openexr' 'strigi' 'libxtst' + 'giflib' 'soprano' 'ca-certificates' 'xdg-utils') makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' 'hspell' 'libxslt') replaces=('arts') install='kdelibs.install' source=(http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2 - 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch' - 'CVE-2009-0689.patch' - 'fix-glibc-2.11.patch') -md5sums=('20fd3793d9d23088ecb1d5aed0254216' + 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch') +md5sums=('4bd639bae91df0f4c5d1ae54c90f83c9' '280f34ee159845f8902c31bd499254fc' '0f214b222bfb0327e7a2b6fb13756895' - '18ea42696a7f41332a092d6ead7efc6a' - 'ec70af24f769f17082a9ab69dc1e24e9' - 'ed737b0b9d14f6f13d150121f088290c') + '18ea42696a7f41332a092d6ead7efc6a') build() { - cd $srcdir/${pkgname}-${pkgver} + cd ${srcdir}/${pkgname}-${pkgver} - # see http://securityreason.com/it_news/0/0x31 - # will be fixed in 4.3.4 - patch -p0 -i $srcdir/CVE-2009-0689.patch || return 1 - # see https://bugs.kde.org/show_bug.cgi?id=213223 - patch -p0 -i ${srcdir}/fix-glibc-2.11.patch || return 1 - # avoid file conflict with gnome-menu patch -p1 -i $srcdir/kde-applications-menu.patch # add Archlinux menu entry @@ -41,7 +31,7 @@ # add syntax highlightning for PKGBUILD and .install files patch -p1 -i $srcdir/abs-syntax-highlight.patch - cd .. + cd ${srcdir} mkdir build cd build cmake ../${pkgname}-${pkgver} \ Deleted: fix-glibc-2.11.patch =================================================================== --- fix-glibc-2.11.patch 2009-11-28 01:35:26 UTC (rev 59819) +++ fix-glibc-2.11.patch 2009-11-28 01:40:00 UTC (rev 59820) @@ -1,165 +0,0 @@ -Index: kdecore/fakes.c -=================================================================== ---- kdecore/fakes.c (revision 1046198) -+++ kdecore/fakes.c (revision 1046199) -@@ -31,7 +31,7 @@ - - - #define KDE_open open --#define KDE_mkdir mkdir -+#define KDE_mkdir mkdir - - - #ifndef HAVE_SETENV -@@ -39,10 +39,15 @@ - #ifdef HAVE_ALLOCA_H - #include <alloca.h> - #endif -- -+#ifdef HAVE_STRING_H - #include <string.h> -+#endif -+#ifdef HAVE_STDLIB_H - #include <stdlib.h> -+#endif -+#ifdef HAVE_UNISTD_H - #include <unistd.h> -+#endif - - KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) { - int i; -@@ -67,11 +72,18 @@ - #ifdef HAVE_ALLOCA_H - #include <alloca.h> - #endif -- -+#ifdef HAVE_STRING_H - #include <string.h> -+#endif -+#ifdef HAVE_STDLIB_H - #include <stdlib.h> -+#endif -+#ifdef HAVE_ERRNO_H - #include <errno.h> -+#endif -+#ifdef HAVE_UNISTD_H - #include <unistd.h> -+#endif - - #ifndef environ - extern char ** environ; -@@ -154,24 +166,32 @@ - { - srand48(seed); - } --#endif -+#endif /* !HAVE_RANDOM */ - - #ifndef HAVE_SETEUID - int seteuid(uid_t euid) - { - return setreuid(-1, euid); /* Well, if you have neither you are in trouble :) */ - } --#endif -+#endif /* !HAVE_SETEUID */ - - #ifndef HAVE_MKSTEMPS -+#ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> -+#endif - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif - #include <fcntl.h> -+#ifdef HAVE_STRING_H - #include <string.h> -+#endif -+#ifdef HAVE_STRINGS_H - #include <strings.h> -+#endif -+#ifdef HAVE_STDLIB_H - #include <stdlib.h> -+#endif - - /* this is based on code taken from the GNU libc, distributed under the LGPL license */ - -@@ -244,12 +264,14 @@ - { - return mkstemps( _template, 0 ); - } --#endif -+#endif /* !HAVE_MKSTEMP */ - - #ifndef HAVE_MKDTEMP - - #ifndef HAVE_MKSTEMPS -+#ifdef HAVE_SYS_TYPES_H - #include <sys/types.h> -+#endif - #ifdef HAVE_SYS_STAT_H - #include <sys/stat.h> - #endif -@@ -306,13 +328,18 @@ - value += 7777; - - if (!KDE_mkdir(_template,0700)) -- return _template; -+ return _template; - } - return 0; - } - #endif /* !HAVE_MKDTEMP */ - - #ifndef HAVE_STRLCPY -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#endif -+ - KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize) - { - unsigned long len, ret = strlen(s); -@@ -325,12 +352,17 @@ - } - } else - memcpy(d, s, ret + 1); -- -+ - return ret; - } -+#endif /* !HAVE_STRLCPY */ -+ -+#ifndef HAVE_STRLCAT -+ -+#ifdef HAVE_STRING_H -+#include <string.h> - #endif - --#ifndef HAVE_STRLCAT - KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize) - { - char *cp; -@@ -350,7 +382,7 @@ - - return ret; - } --#endif -+#endif /* !HAVE_STRLCAT */ - - #ifndef HAVE_STRCASESTR - /* -@@ -450,7 +482,7 @@ - ret0: - return 0; - } --#endif -+#endif /* !HAVE_STRCASESTR */ - - #ifndef HAVE_TRUNC - -@@ -467,4 +499,4 @@ - { - return x < 0 ? -floor(-x) : floor(x); - } --#endif -+#endif /* !HAVE_TRUNC */