Compare commits
16 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
607ed2193f | ||
|
1df98c3a46 | ||
|
48e9e7c76b | ||
|
c4483e310c | ||
|
f839870217 | ||
|
ed3eeab5ea | ||
|
70a8d1a23d | ||
|
1603fda542 | ||
|
5970d0098a | ||
|
6c47a767a1 | ||
|
1cee48288d | ||
|
9202d57183 | ||
|
3e2fa01661 | ||
|
ab40659848 | ||
|
7accb8c3aa | ||
|
711b45cf49 |
0
.cvsignore → .gitignore
vendored
0
.cvsignore → .gitignore
vendored
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
|||||||
# Makefile for source rpm: kdelibs3
|
|
||||||
# $Id$
|
|
||||||
NAME := kdelibs3
|
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
|
||||||
|
|
||||||
define find-makefile-common
|
|
||||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
|
||||||
|
|
||||||
ifeq ($(MAKEFILE_COMMON),)
|
|
||||||
# attept a checkout
|
|
||||||
define checkout-makefile-common
|
|
||||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(MAKEFILE_COMMON)
|
|
66
arts-acinclude.patch
Normal file
66
arts-acinclude.patch
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
2009-12-10 Stepan Kasal <skasal@redhat.com>
|
||||||
|
|
||||||
|
The change of implementation of AC_REQUIRE in 2.64 caused a regression
|
||||||
|
in the arts project.
|
||||||
|
This can be fixed by shuffling some macro calls.
|
||||||
|
|
||||||
|
I suppose that most of this patch will not be needed with a future
|
||||||
|
release of Autoconf.
|
||||||
|
But the last chunk of this patch is a real bug in this source and
|
||||||
|
should go upstream.
|
||||||
|
|
||||||
|
--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200
|
||||||
|
+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100
|
||||||
|
@@ -3081,8 +3081,18 @@
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
|
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
|
||||||
|
+[
|
||||||
|
+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||||
|
+ CFLAGS=" $CFLAGS"
|
||||||
|
+ AC_PROG_CC
|
||||||
|
+ CXXFLAGS=" $CXXFLAGS"
|
||||||
|
+ AC_PROG_CXX
|
||||||
|
+])
|
||||||
|
+
|
||||||
|
AC_DEFUN([AC_CHECK_COMPILERS],
|
||||||
|
[
|
||||||
|
+ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
|
||||||
|
AC_ARG_ENABLE(debug,
|
||||||
|
AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
|
||||||
|
[
|
||||||
|
@@ -3141,11 +3151,6 @@
|
||||||
|
[kde_use_profiling="no"]
|
||||||
|
)
|
||||||
|
|
||||||
|
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||||
|
- CFLAGS=" $CFLAGS"
|
||||||
|
-
|
||||||
|
- AC_PROG_CC
|
||||||
|
-
|
||||||
|
AC_PROG_CPP
|
||||||
|
|
||||||
|
if test "$GCC" = "yes"; then
|
||||||
|
@@ -3174,10 +3179,6 @@
|
||||||
|
LDFLAGS=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
- CXXFLAGS=" $CXXFLAGS"
|
||||||
|
-
|
||||||
|
- AC_PROG_CXX
|
||||||
|
-
|
||||||
|
KDE_CHECK_FOR_BAD_COMPILER
|
||||||
|
|
||||||
|
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
|
||||||
|
@@ -3503,8 +3504,8 @@
|
||||||
|
AC_REQUIRE([AC_LIBTOOL_DLOPEN])
|
||||||
|
AC_REQUIRE([KDE_CHECK_LIB64])
|
||||||
|
|
||||||
|
-AC_OBJEXT
|
||||||
|
-AC_EXEEXT
|
||||||
|
+AC_REQUIRE([AC_OBJEXT])
|
||||||
|
+AC_REQUIRE([AC_EXEEXT])
|
||||||
|
|
||||||
|
AM_PROG_LIBTOOL
|
||||||
|
AC_LIBTOOL_CXX
|
62
kdelibs-3.5.10-CVE-2009-2702.patch
Normal file
62
kdelibs-3.5.10-CVE-2009-2702.patch
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
diff -pruN kdelibs-3.5.4.orig/kio/kssl/kopenssl.cc kdelibs-3.5.4/kio/kssl/kopenssl.cc
|
||||||
|
--- kdelibs-3.5.4.orig/kio/kssl/kopenssl.cc 2009-08-31 20:50:12.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.4/kio/kssl/kopenssl.cc 2009-08-31 21:46:47.000000000 +0200
|
||||||
|
@@ -196,6 +196,7 @@ static int (*K_X509_NAME_add_entry_by_tx
|
||||||
|
static X509_NAME *(*K_X509_NAME_new)() = 0L;
|
||||||
|
static int (*K_X509_REQ_set_subject_name)(X509_REQ*,X509_NAME*) = 0L;
|
||||||
|
static unsigned char *(*K_ASN1_STRING_data)(ASN1_STRING*) = 0L;
|
||||||
|
+static int (*K_ASN1_STRING_length)(ASN1_STRING*) = 0L;
|
||||||
|
static STACK_OF(SSL_CIPHER) *(*K_SSL_get_ciphers)(const SSL *ssl) = 0L;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
@@ -498,6 +499,7 @@ KConfig *cfg;
|
||||||
|
K_X509_NAME_new = (X509_NAME *(*)()) _cryptoLib->symbol("X509_NAME_new");
|
||||||
|
K_X509_REQ_set_subject_name = (int (*)(X509_REQ*,X509_NAME*)) _cryptoLib->symbol("X509_REQ_set_subject_name");
|
||||||
|
K_ASN1_STRING_data = (unsigned char *(*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_data");
|
||||||
|
+ K_ASN1_STRING_length = (int (*)(ASN1_STRING*)) _cryptoLib->symbol("ASN1_STRING_length");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1549,6 +1551,13 @@ unsigned char *KOpenSSLProxy::ASN1_STRIN
|
||||||
|
return 0L;
|
||||||
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
+int KOpenSSLProxy::ASN1_STRING_length(ASN1_STRING *x) {
|
||||||
|
+ if (K_ASN1_STRING_length) return (K_ASN1_STRING_length)(x);
|
||||||
|
+ return 0L;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
STACK_OF(SSL_CIPHER) *KOpenSSLProxy::SSL_get_ciphers(const SSL* ssl) {
|
||||||
|
if (K_SSL_get_ciphers) return (K_SSL_get_ciphers)(ssl);
|
||||||
|
return 0L;
|
||||||
|
diff -pruN kdelibs-3.5.4.orig/kio/kssl/kopenssl.h kdelibs-3.5.4/kio/kssl/kopenssl.h
|
||||||
|
--- kdelibs-3.5.4.orig/kio/kssl/kopenssl.h 2006-07-22 10:16:39.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.4/kio/kssl/kopenssl.h 2009-08-31 21:46:47.000000000 +0200
|
||||||
|
@@ -622,6 +622,11 @@ public:
|
||||||
|
unsigned char *ASN1_STRING_data(ASN1_STRING *x);
|
||||||
|
|
||||||
|
/*
|
||||||
|
+ * ASN1_STRING_length
|
||||||
|
+ */
|
||||||
|
+ int ASN1_STRING_length(ASN1_STRING *x);
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
int OBJ_obj2nid(ASN1_OBJECT *o);
|
||||||
|
diff -pruN kdelibs-3.5.4.orig/kio/kssl/ksslcertificate.cc kdelibs-3.5.4/kio/kssl/ksslcertificate.cc
|
||||||
|
--- kdelibs-3.5.4.orig/kio/kssl/ksslcertificate.cc 2006-01-19 18:06:12.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.4/kio/kssl/ksslcertificate.cc 2009-08-31 21:54:38.000000000 +0200
|
||||||
|
@@ -1099,7 +1099,9 @@ QStringList KSSLCertificate::subjAltName
|
||||||
|
}
|
||||||
|
|
||||||
|
QString s = (const char *)d->kossl->ASN1_STRING_data(val->d.ia5);
|
||||||
|
- if (!s.isEmpty()) {
|
||||||
|
+ if (!s.isEmpty() &&
|
||||||
|
+ /* skip subjectAltNames with embedded NULs */
|
||||||
|
+ s.length() == d->kossl->ASN1_STRING_length(val->d.ia5)) {
|
||||||
|
rc += s;
|
||||||
|
}
|
||||||
|
}
|
13
kdelibs-3.5.10-assert.patch
Normal file
13
kdelibs-3.5.10-assert.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
--- kdelibs-3.5.10/kio/kio/karchive.cpp.orig 2009-12-09 18:40:26.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10/kio/kio/karchive.cpp 2009-12-09 18:41:14.000000000 +0100
|
||||||
|
@@ -588,7 +588,9 @@
|
||||||
|
|
||||||
|
void KArchiveDirectory::addEntry( KArchiveEntry* entry )
|
||||||
|
{
|
||||||
|
- Q_ASSERT( !entry->name().isEmpty() );
|
||||||
|
+ if( entry->name().isEmpty() )
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
if( m_entries[ entry->name() ] ) {
|
||||||
|
kdWarning() << "KArchiveDirectory::addEntry: directory " << name()
|
||||||
|
<< " has entry " << entry->name() << " already" << endl;
|
42
kdelibs-3.5.10-cve-2009-1698.patch
Normal file
42
kdelibs-3.5.10-cve-2009-1698.patch
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
diff -ur kdelibs-3.5.10/khtml/css/cssparser.cpp kdelibs-3.5.10-cve-2009-1698/khtml/css/cssparser.cpp
|
||||||
|
--- kdelibs-3.5.10/khtml/css/cssparser.cpp 2007-01-15 12:34:04.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10-cve-2009-1698/khtml/css/cssparser.cpp 2009-07-26 05:46:39.000000000 +0200
|
||||||
|
@@ -1344,6 +1344,14 @@
|
||||||
|
if ( args->size() != 1)
|
||||||
|
return false;
|
||||||
|
Value *a = args->current();
|
||||||
|
+ if (a->unit != CSSPrimitiveValue::CSS_IDENT) {
|
||||||
|
+ isValid=false;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ if (qString(a->string)[0] == '-') {
|
||||||
|
+ isValid=false;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
parsedValue = new CSSPrimitiveValueImpl(domString(a->string), CSSPrimitiveValue::CSS_ATTR);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
@@ -1396,7 +1404,8 @@
|
||||||
|
|
||||||
|
CounterImpl *counter = new CounterImpl;
|
||||||
|
Value *i = args->current();
|
||||||
|
-// if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
|
||||||
|
+ if (i->unit != CSSPrimitiveValue::CSS_IDENT) goto invalid;
|
||||||
|
+ if (qString(i->string)[0] == '-') goto invalid;
|
||||||
|
counter->m_identifier = domString(i->string);
|
||||||
|
if (counters) {
|
||||||
|
i = args->next();
|
||||||
|
diff -ur kdelibs-3.5.10/khtml/css/css_valueimpl.cpp kdelibs-3.5.10-cve-2009-1698/khtml/css/css_valueimpl.cpp
|
||||||
|
--- kdelibs-3.5.10/khtml/css/css_valueimpl.cpp 2006-07-22 10:16:49.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.10-cve-2009-1698/khtml/css/css_valueimpl.cpp 2009-07-26 05:45:36.000000000 +0200
|
||||||
|
@@ -736,7 +736,9 @@
|
||||||
|
text = getValueName(m_value.ident);
|
||||||
|
break;
|
||||||
|
case CSSPrimitiveValue::CSS_ATTR:
|
||||||
|
- // ###
|
||||||
|
+ text = "attr(";
|
||||||
|
+ text += DOMString( m_value.string );
|
||||||
|
+ text += ")";
|
||||||
|
break;
|
||||||
|
case CSSPrimitiveValue::CSS_COUNTER:
|
||||||
|
text = "counter(";
|
13
kdelibs-3.5.10-cve-2009-1725.patch
Normal file
13
kdelibs-3.5.10-cve-2009-1725.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: khtml/html/htmltokenizer.cpp
|
||||||
|
===================================================================
|
||||||
|
--- khtml/html/htmltokenizer.cpp (revision 1002163)
|
||||||
|
+++ khtml/html/htmltokenizer.cpp (revision 1002164)
|
||||||
|
@@ -736,7 +736,7 @@
|
||||||
|
#ifdef TOKEN_DEBUG
|
||||||
|
kdDebug( 6036 ) << "unknown entity!" << endl;
|
||||||
|
#endif
|
||||||
|
- checkBuffer(10);
|
||||||
|
+ checkBuffer(11);
|
||||||
|
// ignore the sequence, add it to the buffer as plaintext
|
||||||
|
*dest++ = '&';
|
||||||
|
for(unsigned int i = 0; i < cBufferPos; i++)
|
30
kdelibs-3.5.10-cve-2009-2537-select-length.patch
Normal file
30
kdelibs-3.5.10-cve-2009-2537-select-length.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
diff -ur kdelibs-3.5.10/khtml/ecma/kjs_html.cpp kdelibs-3.5.10-cve-2009-2537-select-length/khtml/ecma/kjs_html.cpp
|
||||||
|
--- kdelibs-3.5.10/khtml/ecma/kjs_html.cpp 2008-02-13 10:41:09.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10-cve-2009-2537-select-length/khtml/ecma/kjs_html.cpp 2009-07-26 04:54:52.000000000 +0200
|
||||||
|
@@ -62,6 +62,9 @@
|
||||||
|
|
||||||
|
#include <kdebug.h>
|
||||||
|
|
||||||
|
+// CVE-2009-2537 (vendors agreed on max 10000 elements)
|
||||||
|
+#define MAX_SELECT_LENGTH 10000
|
||||||
|
+
|
||||||
|
namespace KJS {
|
||||||
|
|
||||||
|
KJS_DEFINE_PROTOTYPE_WITH_PROTOTYPE(HTMLDocumentProto, DOMDocumentProto)
|
||||||
|
@@ -2550,8 +2553,14 @@
|
||||||
|
case SelectValue: { select.setValue(str); return; }
|
||||||
|
case SelectLength: { // read-only according to the NS spec, but webpages need it writeable
|
||||||
|
Object coll = Object::dynamicCast( getSelectHTMLCollection(exec, select.options(), select) );
|
||||||
|
- if ( coll.isValid() )
|
||||||
|
- coll.put(exec,"length",value);
|
||||||
|
+
|
||||||
|
+ if ( coll.isValid() ) {
|
||||||
|
+ if (value.toInteger(exec) >= MAX_SELECT_LENGTH) {
|
||||||
|
+ Object err = Error::create(exec, RangeError);
|
||||||
|
+ exec->setException(err);
|
||||||
|
+ } else
|
||||||
|
+ coll.put(exec, "length", value);
|
||||||
|
+ }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// read-only: form
|
635
kdelibs-3.5.10-dtoa.patch
Normal file
635
kdelibs-3.5.10-dtoa.patch
Normal file
@ -0,0 +1,635 @@
|
|||||||
|
diff -up kdelibs-3.5.10/kjs/dtoa.cpp.orig kdelibs-3.5.10/kjs/dtoa.cpp
|
||||||
|
--- kdelibs-3.5.10/kjs/dtoa.cpp.orig 2009-12-09 18:32:22.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10/kjs/dtoa.cpp 2009-12-09 18:32:36.000000000 +0100
|
||||||
|
@@ -174,9 +174,10 @@
|
||||||
|
#undef CONST
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#include "dtoa.h"
|
||||||
|
#include <config.h>
|
||||||
|
|
||||||
|
-#include "stdlib.h"
|
||||||
|
+#include "global.h"
|
||||||
|
|
||||||
|
#ifdef WORDS_BIGENDIAN
|
||||||
|
#define IEEE_MC68k
|
||||||
|
@@ -184,7 +185,6 @@
|
||||||
|
#define IEEE_8087
|
||||||
|
#endif
|
||||||
|
#define INFNAN_CHECK
|
||||||
|
-#include "dtoa.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@@ -196,22 +196,19 @@ typedef unsigned Long ULong;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
-#include "stdio.h"
|
||||||
|
+#include <stdio.h>
|
||||||
|
#define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#include "string.h"
|
||||||
|
+#include <stdlib.h>
|
||||||
|
+#include <string.h>
|
||||||
|
|
||||||
|
#ifdef USE_LOCALE
|
||||||
|
-#include "locale.h"
|
||||||
|
+#include <locale.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef MALLOC
|
||||||
|
-#ifdef KR_headers
|
||||||
|
-extern char *MALLOC();
|
||||||
|
-#else
|
||||||
|
extern void *MALLOC(size_t);
|
||||||
|
-#endif
|
||||||
|
#else
|
||||||
|
#define MALLOC malloc
|
||||||
|
#endif
|
||||||
|
@@ -233,7 +230,7 @@ static double private_mem[PRIVATE_mem],
|
||||||
|
#define IEEE_Arith
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#include "errno.h"
|
||||||
|
+#include <errno.h>
|
||||||
|
|
||||||
|
#ifdef Bad_float_h
|
||||||
|
|
||||||
|
@@ -260,25 +257,29 @@ static double private_mem[PRIVATE_mem],
|
||||||
|
#define DBL_MAX 1.7014118346046923e+38
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#ifndef LONG_MAX
|
||||||
|
+#define LONG_MAX 2147483647
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#else /* ifndef Bad_float_h */
|
||||||
|
-#include "float.h"
|
||||||
|
+#include <float.h>
|
||||||
|
#endif /* Bad_float_h */
|
||||||
|
|
||||||
|
#ifndef __MATH_H__
|
||||||
|
-#include "math.h"
|
||||||
|
+#include <math.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#define strtod kjs_strtod
|
||||||
|
+#define dtoa kjs_dtoa
|
||||||
|
+#define freedtoa kjs_freedtoa
|
||||||
|
+
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CONST
|
||||||
|
-#ifdef KR_headers
|
||||||
|
-#define CONST /* blank */
|
||||||
|
-#else
|
||||||
|
#define CONST const
|
||||||
|
#endif
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
#if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
|
||||||
|
Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
|
||||||
|
@@ -286,37 +287,19 @@ Exactly one of IEEE_8087, IEEE_MC68k, VA
|
||||||
|
|
||||||
|
typedef union { double d; ULong L[2]; } U;
|
||||||
|
|
||||||
|
-#ifdef YES_ALIAS
|
||||||
|
-#define dval(x) x
|
||||||
|
+#define dval(x) (x).d
|
||||||
|
#ifdef IEEE_8087
|
||||||
|
-#define word0(x) ((ULong *)&x)[1]
|
||||||
|
-#define word1(x) ((ULong *)&x)[0]
|
||||||
|
+#define word0(x) (x).L[1]
|
||||||
|
+#define word1(x) (x).L[0]
|
||||||
|
#else
|
||||||
|
-#define word0(x) ((ULong *)&x)[0]
|
||||||
|
-#define word1(x) ((ULong *)&x)[1]
|
||||||
|
-#endif
|
||||||
|
-#else
|
||||||
|
-#ifdef IEEE_8087
|
||||||
|
-#define word0(x) ((U*)&x)->L[1]
|
||||||
|
-#define word1(x) ((U*)&x)->L[0]
|
||||||
|
-#else
|
||||||
|
-#define word0(x) ((U*)&x)->L[0]
|
||||||
|
-#define word1(x) ((U*)&x)->L[1]
|
||||||
|
-#endif
|
||||||
|
-#define dval(x) ((U*)&x)->d
|
||||||
|
+#define word0(x) (x).L[0]
|
||||||
|
+#define word1(x) (x).L[1]
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* The following definition of Storeinc is appropriate for MIPS processors.
|
||||||
|
* An alternative that might be better on some machines is
|
||||||
|
- * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
|
||||||
|
*/
|
||||||
|
-#if defined(IEEE_8087) + defined(VAX)
|
||||||
|
-#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
|
||||||
|
-((unsigned short *)a)[0] = (unsigned short)c, a++)
|
||||||
|
-#else
|
||||||
|
-#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
|
||||||
|
-((unsigned short *)a)[1] = (unsigned short)c, a++)
|
||||||
|
-#endif
|
||||||
|
+#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
|
||||||
|
|
||||||
|
/* #define P DBL_MANT_DIG */
|
||||||
|
/* Ten_pmax = floor(P*log(2)/log(5)) */
|
||||||
|
@@ -440,11 +423,7 @@ typedef union { double d; ULong L[2]; }
|
||||||
|
#ifdef RND_PRODQUOT
|
||||||
|
#define rounded_product(a,b) a = rnd_prod(a, b)
|
||||||
|
#define rounded_quotient(a,b) a = rnd_quot(a, b)
|
||||||
|
-#ifdef KR_headers
|
||||||
|
-extern double rnd_prod(), rnd_quot();
|
||||||
|
-#else
|
||||||
|
extern double rnd_prod(double, double), rnd_quot(double, double);
|
||||||
|
-#endif
|
||||||
|
#else
|
||||||
|
#define rounded_product(a,b) a *= b
|
||||||
|
#define rounded_quotient(a,b) a /= b
|
||||||
|
@@ -457,11 +436,7 @@ extern double rnd_prod(double, double),
|
||||||
|
#define Pack_32
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#ifdef KR_headers
|
||||||
|
-#define FFFFFFFF ((((unsigned long)0xffff)<<16)|(unsigned long)0xffff)
|
||||||
|
-#else
|
||||||
|
#define FFFFFFFF 0xffffffffUL
|
||||||
|
-#endif
|
||||||
|
|
||||||
|
#ifdef NO_LONG_LONG
|
||||||
|
#undef ULLong
|
||||||
|
@@ -487,7 +462,7 @@ extern double rnd_prod(double, double),
|
||||||
|
#define FREE_DTOA_LOCK(n) /*nothing*/
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#define Kmax 15
|
||||||
|
+#define Kmax (sizeof(size_t) << 3)
|
||||||
|
|
||||||
|
struct
|
||||||
|
Bigint {
|
||||||
|
@@ -502,11 +477,7 @@ Bigint {
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
Balloc
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (k) int k;
|
||||||
|
-#else
|
||||||
|
(int k)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
int x;
|
||||||
|
Bigint *rv;
|
||||||
|
@@ -525,7 +496,7 @@ Balloc
|
||||||
|
#else
|
||||||
|
len = (sizeof(Bigint) + (x-1)*sizeof(ULong) + sizeof(double) - 1)
|
||||||
|
/sizeof(double);
|
||||||
|
- if (pmem_next - private_mem + len <= PRIVATE_mem) {
|
||||||
|
+ if (pmem_next - private_mem + len <= (unsigned)PRIVATE_mem) {
|
||||||
|
rv = (Bigint*)pmem_next;
|
||||||
|
pmem_next += len;
|
||||||
|
}
|
||||||
|
@@ -542,11 +513,7 @@ Balloc
|
||||||
|
|
||||||
|
static void
|
||||||
|
Bfree
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (v) Bigint *v;
|
||||||
|
-#else
|
||||||
|
(Bigint *v)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
if (v) {
|
||||||
|
ACQUIRE_DTOA_LOCK(0);
|
||||||
|
@@ -561,11 +528,7 @@ y->wds*sizeof(Long) + 2*sizeof(int))
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
multadd
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (b, m, a) Bigint *b; int m, a;
|
||||||
|
-#else
|
||||||
|
(Bigint *b, int m, int a) /* multiply by m and add a */
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
int i, wds;
|
||||||
|
#ifdef ULLong
|
||||||
|
@@ -587,7 +550,7 @@ multadd
|
||||||
|
#ifdef ULLong
|
||||||
|
y = *x * (ULLong)m + carry;
|
||||||
|
carry = y >> 32;
|
||||||
|
- *x++ = y & FFFFFFFF;
|
||||||
|
+ *x++ = (ULong)y & FFFFFFFF;
|
||||||
|
#else
|
||||||
|
#ifdef Pack_32
|
||||||
|
xi = *x;
|
||||||
|
@@ -610,7 +573,7 @@ multadd
|
||||||
|
Bfree(b);
|
||||||
|
b = b1;
|
||||||
|
}
|
||||||
|
- b->x[wds++] = carry;
|
||||||
|
+ b->x[wds++] = (ULong)carry;
|
||||||
|
b->wds = wds;
|
||||||
|
}
|
||||||
|
return b;
|
||||||
|
@@ -618,11 +581,7 @@ multadd
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
s2b
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (s, nd0, nd, y9) CONST char *s; int nd0, nd; ULong y9;
|
||||||
|
-#else
|
||||||
|
(CONST char *s, int nd0, int nd, ULong y9)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
Bigint *b;
|
||||||
|
int i, k;
|
||||||
|
@@ -656,11 +615,7 @@ s2b
|
||||||
|
|
||||||
|
static int
|
||||||
|
hi0bits
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (x) register ULong x;
|
||||||
|
-#else
|
||||||
|
(register ULong x)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
register int k = 0;
|
||||||
|
|
||||||
|
@@ -690,11 +645,7 @@ hi0bits
|
||||||
|
|
||||||
|
static int
|
||||||
|
lo0bits
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (y) ULong *y;
|
||||||
|
-#else
|
||||||
|
(ULong *y)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
register int k;
|
||||||
|
register ULong x = *y;
|
||||||
|
@@ -738,11 +689,7 @@ lo0bits
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
i2b
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (i) int i;
|
||||||
|
-#else
|
||||||
|
(int i)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
Bigint *b;
|
||||||
|
|
||||||
|
@@ -754,11 +701,7 @@ i2b
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
mult
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (a, b) Bigint *a, *b;
|
||||||
|
-#else
|
||||||
|
(Bigint *a, Bigint *b)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
Bigint *c;
|
||||||
|
int k, wa, wb, wc;
|
||||||
|
@@ -801,10 +744,10 @@ mult
|
||||||
|
do {
|
||||||
|
z = *x++ * (ULLong)y + *xc + carry;
|
||||||
|
carry = z >> 32;
|
||||||
|
- *xc++ = z & FFFFFFFF;
|
||||||
|
+ *xc++ = (ULong)z & FFFFFFFF;
|
||||||
|
}
|
||||||
|
while(x < xae);
|
||||||
|
- *xc = carry;
|
||||||
|
+ *xc = (ULong)carry;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
@@ -866,11 +809,7 @@ mult
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
pow5mult
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (b, k) Bigint *b; int k;
|
||||||
|
-#else
|
||||||
|
(Bigint *b, int k)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
Bigint *b1, *p5, *p51;
|
||||||
|
int i;
|
||||||
|
@@ -923,11 +862,7 @@ pow5mult
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
lshift
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (b, k) Bigint *b; int k;
|
||||||
|
-#else
|
||||||
|
(Bigint *b, int k)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
int i, k1, n, n1;
|
||||||
|
Bigint *b1;
|
||||||
|
@@ -983,11 +918,7 @@ lshift
|
||||||
|
|
||||||
|
static int
|
||||||
|
cmp
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (a, b) Bigint *a, *b;
|
||||||
|
-#else
|
||||||
|
(Bigint *a, Bigint *b)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
ULong *xa, *xa0, *xb, *xb0;
|
||||||
|
int i, j;
|
||||||
|
@@ -1017,11 +948,7 @@ cmp
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
diff
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (a, b) Bigint *a, *b;
|
||||||
|
-#else
|
||||||
|
(Bigint *a, Bigint *b)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
Bigint *c;
|
||||||
|
int i, wa, wb;
|
||||||
|
@@ -1064,13 +991,13 @@ diff
|
||||||
|
do {
|
||||||
|
y = (ULLong)*xa++ - *xb++ - borrow;
|
||||||
|
borrow = y >> 32 & (ULong)1;
|
||||||
|
- *xc++ = y & FFFFFFFF;
|
||||||
|
+ *xc++ = (ULong)y & FFFFFFFF;
|
||||||
|
}
|
||||||
|
while(xb < xbe);
|
||||||
|
while(xa < xae) {
|
||||||
|
y = *xa++ - borrow;
|
||||||
|
borrow = y >> 32 & (ULong)1;
|
||||||
|
- *xc++ = y & FFFFFFFF;
|
||||||
|
+ *xc++ = (ULong)y & FFFFFFFF;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
#ifdef Pack_32
|
||||||
|
@@ -1111,15 +1038,12 @@ diff
|
||||||
|
|
||||||
|
static double
|
||||||
|
ulp
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (x) double x;
|
||||||
|
-#else
|
||||||
|
- (double x)
|
||||||
|
-#endif
|
||||||
|
+ (double dx)
|
||||||
|
{
|
||||||
|
register Long L;
|
||||||
|
- double a;
|
||||||
|
+ U x, a;
|
||||||
|
|
||||||
|
+ dval(x) = dx;
|
||||||
|
L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
|
||||||
|
#ifndef Avoid_Underflow
|
||||||
|
#ifndef Sudden_Underflow
|
||||||
|
@@ -1153,15 +1077,11 @@ ulp
|
||||||
|
|
||||||
|
static double
|
||||||
|
b2d
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (a, e) Bigint *a; int *e;
|
||||||
|
-#else
|
||||||
|
(Bigint *a, int *e)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
ULong *xa, *xa0, w, y, z;
|
||||||
|
int k;
|
||||||
|
- double d;
|
||||||
|
+ U d;
|
||||||
|
#ifdef VAX
|
||||||
|
ULong d0, d1;
|
||||||
|
#else
|
||||||
|
@@ -1223,12 +1143,9 @@ b2d
|
||||||
|
|
||||||
|
static Bigint *
|
||||||
|
d2b
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (d, e, bits) double d; int *e, *bits;
|
||||||
|
-#else
|
||||||
|
- (double d, int *e, int *bits)
|
||||||
|
-#endif
|
||||||
|
+ (double dd, int *e, int *bits)
|
||||||
|
{
|
||||||
|
+ U d;
|
||||||
|
Bigint *b;
|
||||||
|
int de, k;
|
||||||
|
ULong *x, y, z;
|
||||||
|
@@ -1237,6 +1154,9 @@ d2b
|
||||||
|
#endif
|
||||||
|
#ifdef VAX
|
||||||
|
ULong d0, d1;
|
||||||
|
+#endif
|
||||||
|
+ dval(d) = dd;
|
||||||
|
+#ifdef VAX
|
||||||
|
d0 = word0(d) >> 16 | word0(d) << 16;
|
||||||
|
d1 = word1(d) >> 16 | word1(d) << 16;
|
||||||
|
#else
|
||||||
|
@@ -1361,13 +1281,9 @@ d2b
|
||||||
|
|
||||||
|
static double
|
||||||
|
ratio
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (a, b) Bigint *a, *b;
|
||||||
|
-#else
|
||||||
|
(Bigint *a, Bigint *b)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
- double da, db;
|
||||||
|
+ U da, db;
|
||||||
|
int k, ka, kb;
|
||||||
|
|
||||||
|
dval(da) = b2d(a, &ka);
|
||||||
|
@@ -1453,11 +1369,7 @@ static CONST double tinytens[] = { 1e-16
|
||||||
|
|
||||||
|
static int
|
||||||
|
match
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (sp, t) char **sp, *t;
|
||||||
|
-#else
|
||||||
|
(CONST char **sp, CONST char *t)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
int c, d;
|
||||||
|
CONST char *s = *sp;
|
||||||
|
@@ -1475,11 +1387,7 @@ match
|
||||||
|
#ifndef No_Hex_NaN
|
||||||
|
static void
|
||||||
|
hexnan
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (rvp, sp) double *rvp; CONST char **sp;
|
||||||
|
-#else
|
||||||
|
- (double *rvp, CONST char **sp)
|
||||||
|
-#endif
|
||||||
|
+ (U *rvp, CONST char **sp)
|
||||||
|
{
|
||||||
|
ULong c, x[2];
|
||||||
|
CONST char *s;
|
||||||
|
@@ -1528,12 +1436,8 @@ hexnan
|
||||||
|
#endif /* INFNAN_CHECK */
|
||||||
|
|
||||||
|
double
|
||||||
|
-kjs_strtod
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (s00, se) CONST char *s00; char **se;
|
||||||
|
-#else
|
||||||
|
+strtod
|
||||||
|
(CONST char *s00, char **se)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
#ifdef Avoid_Underflow
|
||||||
|
int scale;
|
||||||
|
@@ -1541,7 +1445,8 @@ kjs_strtod
|
||||||
|
int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
|
||||||
|
e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
|
||||||
|
CONST char *s, *s0, *s1;
|
||||||
|
- double aadj, aadj1, adj, rv, rv0;
|
||||||
|
+ double aadj, aadj1, adj;
|
||||||
|
+ U aadj2, rv, rv0;
|
||||||
|
Long L;
|
||||||
|
ULong y, z;
|
||||||
|
Bigint *bb = NULL, *bb1 = NULL, *bd = NULL, *bd0 = NULL, *bs = NULL, *delta = NULL;
|
||||||
|
@@ -2302,7 +2207,9 @@ kjs_strtod
|
||||||
|
aadj = z;
|
||||||
|
aadj1 = dsign ? aadj : -aadj;
|
||||||
|
}
|
||||||
|
- word0(aadj1) += (2*P+1)*Exp_msk1 - y;
|
||||||
|
+ dval(aadj2) = aadj1;
|
||||||
|
+ word0(aadj2) += (2*P+1)*Exp_msk1 - y;
|
||||||
|
+ aadj1 = dval(aadj2);
|
||||||
|
}
|
||||||
|
adj = aadj1 * ulp(dval(rv));
|
||||||
|
dval(rv) += adj;
|
||||||
|
@@ -2419,11 +2326,7 @@ kjs_strtod
|
||||||
|
|
||||||
|
static int
|
||||||
|
quorem
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (b, S) Bigint *b, *S;
|
||||||
|
-#else
|
||||||
|
(Bigint *b, Bigint *S)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
int n;
|
||||||
|
ULong *bx, *bxe, q, *sx, *sxe;
|
||||||
|
@@ -2461,7 +2364,7 @@ quorem
|
||||||
|
carry = ys >> 32;
|
||||||
|
y = *bx - (ys & FFFFFFFF) - borrow;
|
||||||
|
borrow = y >> 32 & (ULong)1;
|
||||||
|
- *bx++ = y & FFFFFFFF;
|
||||||
|
+ *bx++ = (ULong)y & FFFFFFFF;
|
||||||
|
#else
|
||||||
|
#ifdef Pack_32
|
||||||
|
si = *sx++;
|
||||||
|
@@ -2502,7 +2405,7 @@ quorem
|
||||||
|
carry = ys >> 32;
|
||||||
|
y = *bx - (ys & FFFFFFFF) - borrow;
|
||||||
|
borrow = y >> 32 & (ULong)1;
|
||||||
|
- *bx++ = y & FFFFFFFF;
|
||||||
|
+ *bx++ = (ULong)y & FFFFFFFF;
|
||||||
|
#else
|
||||||
|
#ifdef Pack_32
|
||||||
|
si = *sx++;
|
||||||
|
@@ -2540,11 +2443,7 @@ quorem
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static char *
|
||||||
|
-#ifdef KR_headers
|
||||||
|
-rv_alloc(i) int i;
|
||||||
|
-#else
|
||||||
|
rv_alloc(int i)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
int j, k, *r;
|
||||||
|
|
||||||
|
@@ -2563,11 +2462,7 @@ rv_alloc(int i)
|
||||||
|
}
|
||||||
|
|
||||||
|
static char *
|
||||||
|
-#ifdef KR_headers
|
||||||
|
-nrv_alloc(s, rve, n) char *s, **rve; int n;
|
||||||
|
-#else
|
||||||
|
nrv_alloc(CONST char *s, char **rve, int n)
|
||||||
|
-#endif
|
||||||
|
{
|
||||||
|
char *rv, *t;
|
||||||
|
|
||||||
|
@@ -2585,11 +2480,7 @@ nrv_alloc(CONST char *s, char **rve, int
|
||||||
|
*/
|
||||||
|
|
||||||
|
void
|
||||||
|
-#ifdef KR_headers
|
||||||
|
-kjs_freedtoa(s) char *s;
|
||||||
|
-#else
|
||||||
|
-kjs_freedtoa(char *s)
|
||||||
|
-#endif
|
||||||
|
+freedtoa(char *s)
|
||||||
|
{
|
||||||
|
Bigint *b = (Bigint *)((int *)s - 1);
|
||||||
|
b->maxwds = 1 << (b->k = *(int*)b);
|
||||||
|
@@ -2635,13 +2526,8 @@ kjs_freedtoa(char *s)
|
||||||
|
*/
|
||||||
|
|
||||||
|
char *
|
||||||
|
-kjs_dtoa
|
||||||
|
-#ifdef KR_headers
|
||||||
|
- (d, mode, ndigits, decpt, sign, rve)
|
||||||
|
- double d; int mode, ndigits, *decpt, *sign; char **rve;
|
||||||
|
-#else
|
||||||
|
- (double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
|
||||||
|
-#endif
|
||||||
|
+dtoa
|
||||||
|
+ (double dd, int mode, int ndigits, int *decpt, int *sign, char **rve)
|
||||||
|
{
|
||||||
|
/* Arguments ndigits, decpt, sign are similar to those
|
||||||
|
of ecvt and fcvt; trailing zeros are suppressed from
|
||||||
|
@@ -2686,7 +2572,8 @@ kjs_dtoa
|
||||||
|
ULong x;
|
||||||
|
#endif
|
||||||
|
Bigint *b, *b1, *delta, *mlo = NULL, *mhi, *S;
|
||||||
|
- double d2, ds, eps;
|
||||||
|
+ U d, d2, eps;
|
||||||
|
+ double ds;
|
||||||
|
char *s, *s0;
|
||||||
|
#ifdef Honor_FLT_ROUNDS
|
||||||
|
int rounding;
|
||||||
|
@@ -2697,11 +2584,12 @@ kjs_dtoa
|
||||||
|
|
||||||
|
#ifndef MULTIPLE_THREADS
|
||||||
|
if (dtoa_result) {
|
||||||
|
- kjs_freedtoa(dtoa_result);
|
||||||
|
+ freedtoa(dtoa_result);
|
||||||
|
dtoa_result = 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ dval(d) = dd;
|
||||||
|
if (word0(d) & Sign_bit) {
|
||||||
|
/* set sign for everything, including 0's and NaNs */
|
||||||
|
*sign = 1;
|
||||||
|
@@ -2966,7 +2854,8 @@ kjs_dtoa
|
||||||
|
if (dval(d) > 0.5 + dval(eps))
|
||||||
|
goto bump_up;
|
||||||
|
else if (dval(d) < 0.5 - dval(eps)) {
|
||||||
|
- while(*--s == '0');
|
||||||
|
+ while(*--s == '0')
|
||||||
|
+ ;
|
||||||
|
s++;
|
||||||
|
goto ret1;
|
||||||
|
}
|
||||||
|
@@ -3285,7 +3174,8 @@ kjs_dtoa
|
||||||
|
#ifdef Honor_FLT_ROUNDS
|
||||||
|
trimzeros:
|
||||||
|
#endif
|
||||||
|
- while(*--s == '0');
|
||||||
|
+ while(*--s == '0')
|
||||||
|
+ ;
|
||||||
|
s++;
|
||||||
|
}
|
||||||
|
ret:
|
134
kdelibs-3.5.10-kabc.patch
Normal file
134
kdelibs-3.5.10-kabc.patch
Normal file
@ -0,0 +1,134 @@
|
|||||||
|
--- kdelibs-3.5.10/kabc/scripts/field.src.cpp.orig 2009-12-09 18:51:15.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10/kabc/scripts/field.src.cpp 2009-12-09 18:51:54.000000000 +0100
|
||||||
|
@@ -36,7 +36,7 @@
|
||||||
|
const QString &app = QString::null )
|
||||||
|
: mFieldId( fieldId ), mCategory( category ), mLabel( label ),
|
||||||
|
mKey( key ), mApp( app ) {}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
enum FieldId
|
||||||
|
{
|
||||||
|
CustomField,
|
||||||
|
@@ -45,11 +45,11 @@
|
||||||
|
|
||||||
|
int fieldId() { return mFieldId; }
|
||||||
|
int category() { return mCategory; }
|
||||||
|
-
|
||||||
|
+
|
||||||
|
QString label() { return mLabel; }
|
||||||
|
QString key() { return mKey; }
|
||||||
|
QString app() { return mApp; }
|
||||||
|
-
|
||||||
|
+
|
||||||
|
private:
|
||||||
|
int mFieldId;
|
||||||
|
int mCategory;
|
||||||
|
@@ -184,6 +184,8 @@
|
||||||
|
return a.phoneNumber( PhoneNumber::Pager ).number();
|
||||||
|
case FieldImpl::HomeAddressStreet:
|
||||||
|
return a.address( Address::Home ).street();
|
||||||
|
+ case FieldImpl::HomeAddressPostOfficeBox:
|
||||||
|
+ return a.address( Address::Home ).postOfficeBox();
|
||||||
|
case FieldImpl::HomeAddressLocality:
|
||||||
|
return a.address( Address::Home ).locality();
|
||||||
|
case FieldImpl::HomeAddressRegion:
|
||||||
|
@@ -196,6 +198,8 @@
|
||||||
|
return a.address( Address::Home ).label();
|
||||||
|
case FieldImpl::BusinessAddressStreet:
|
||||||
|
return a.address( Address::Work ).street();
|
||||||
|
+ case FieldImpl::BusinessAddressPostOfficeBox:
|
||||||
|
+ return a.address( Address::Work ).postOfficeBox();
|
||||||
|
case FieldImpl::BusinessAddressLocality:
|
||||||
|
return a.address( Address::Work ).locality();
|
||||||
|
case FieldImpl::BusinessAddressRegion:
|
||||||
|
@@ -266,6 +270,13 @@
|
||||||
|
a.insertAddress( address );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
+ case FieldImpl::HomeAddressPostOfficeBox:
|
||||||
|
+ {
|
||||||
|
+ KABC::Address address = a.address( Address::Home );
|
||||||
|
+ address.setPostOfficeBox( value );
|
||||||
|
+ a.insertAddress( address );
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
case FieldImpl::HomeAddressLocality:
|
||||||
|
{
|
||||||
|
KABC::Address address = a.address( Address::Home );
|
||||||
|
@@ -308,6 +319,13 @@
|
||||||
|
a.insertAddress( address );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
+ case FieldImpl::BusinessAddressPostOfficeBox:
|
||||||
|
+ {
|
||||||
|
+ KABC::Address address = a.address( Address::Work );
|
||||||
|
+ address.setPostOfficeBox( value );
|
||||||
|
+ a.insertAddress( address );
|
||||||
|
+ return true;
|
||||||
|
+ }
|
||||||
|
case FieldImpl::BusinessAddressLocality:
|
||||||
|
{
|
||||||
|
KABC::Address address = a.address( Address::Work );
|
||||||
|
@@ -438,7 +456,7 @@
|
||||||
|
const Field::List &fields )
|
||||||
|
{
|
||||||
|
QValueList<int> fieldIds;
|
||||||
|
-
|
||||||
|
+
|
||||||
|
int custom = 0;
|
||||||
|
Field::List::ConstIterator it;
|
||||||
|
for( it = fields.begin(); it != fields.end(); ++it ) {
|
||||||
|
@@ -452,7 +470,7 @@
|
||||||
|
QString::number( custom++ ), customEntry );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
cfg->writeEntry( identifier, fieldIds );
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -460,7 +478,7 @@
|
||||||
|
{
|
||||||
|
KConfig *cfg = KGlobal::config();
|
||||||
|
KConfigGroupSaver( cfg, "KABCFields" );
|
||||||
|
-
|
||||||
|
+
|
||||||
|
return restoreFields( cfg, identifier );
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -485,7 +503,7 @@
|
||||||
|
}
|
||||||
|
fields.append( new Field( f ) );
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+
|
||||||
|
return fields;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -496,7 +514,7 @@
|
||||||
|
if ( !sameId ) return false;
|
||||||
|
|
||||||
|
if ( mImpl->fieldId() != FieldImpl::CustomField ) return true;
|
||||||
|
-
|
||||||
|
+
|
||||||
|
return mImpl->key() == field->mImpl->key();
|
||||||
|
}
|
||||||
|
|
||||||
|
--- kdelibs-3.5.10/kabc/scripts/entrylist.orig 2009-12-09 18:48:40.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10/kabc/scripts/entrylist 2009-12-09 18:50:42.000000000 +0100
|
||||||
|
@@ -29,6 +29,7 @@
|
||||||
|
|
||||||
|
#Address address
|
||||||
|
LF,home address street,,QString,homeAddressStreet,Address|Personal
|
||||||
|
+LF,home address post office box,,QString,homeAddressPostOfficeBox,Address|Personal
|
||||||
|
LF,home address city,,QString,homeAddressLocality,Address|Personal
|
||||||
|
LF,home address state,,QString,homeAddressRegion,Address|Personal
|
||||||
|
LF,home address zip code,,QString,homeAddressPostalCode,Address|Personal
|
||||||
|
@@ -36,6 +37,7 @@
|
||||||
|
LF,home address label,,QString,homeAddressLabel,Address|Personal
|
||||||
|
|
||||||
|
LF,business address street,,QString,businessAddressStreet,Address|Organization
|
||||||
|
+LF,business address post office box,,QString,businessAddressPostOfficeBox,Address|Organization
|
||||||
|
LF,business address city,,QString,businessAddressLocality,Address|Organization
|
||||||
|
LF,business address state,,QString,businessAddressRegion,Address|Organization
|
||||||
|
LF,business address zip code,,QString,businessAddressPostalCode,Address|Organization
|
47
kdelibs-3.5.10-kio.patch
Normal file
47
kdelibs-3.5.10-kio.patch
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
--- kdelibs-3.5.10/kio/kio/kzip.cpp.orig 2009-12-09 18:42:47.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10/kio/kio/kzip.cpp 2009-12-09 18:45:43.000000000 +0100
|
||||||
|
@@ -1051,6 +1051,20 @@
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
+bool KZip::writeDir(const QString& name, const QString& user, const QString& group)
|
||||||
|
+{
|
||||||
|
+ // Zip files have no explicit directories, they are implicitly created during extraction time
|
||||||
|
+ // when file entries have paths in them.
|
||||||
|
+ // However, to support empty directories, we must create a dummy file entry which ends with '/'.
|
||||||
|
+ QString dirName = name;
|
||||||
|
+ if (!name.endsWith("/"))
|
||||||
|
+ dirName = dirName.append('/');
|
||||||
|
+
|
||||||
|
+ mode_t perm = 040755;
|
||||||
|
+ time_t the_time = time(0);
|
||||||
|
+ return writeFile(dirName, user, group, 0, perm, the_time, the_time, the_time, 0);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
// Doesn't need to be reimplemented anymore. Remove for KDE-4.0
|
||||||
|
bool KZip::writeFile( const QString& name, const QString& user, const QString& group, uint size, const char* data )
|
||||||
|
{
|
||||||
|
@@ -1114,7 +1128,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
// delete entries in the filelist with the same filename as the one we want
|
||||||
|
- // to save, so that we don´t have duplicate file entries when viewing the zip
|
||||||
|
+ // to save, so that we don�t have duplicate file entries when viewing the zip
|
||||||
|
// with konqi...
|
||||||
|
// CAUTION: the old file itself is still in the zip and won't be removed !!!
|
||||||
|
QPtrListIterator<KZipFileEntry> it( d->m_fileList );
|
||||||
|
diff -up kdelibs-3.5.10/kio/kio/kzip.h.orig kdelibs-3.5.10/kio/kio/kzip.h
|
||||||
|
--- kdelibs-3.5.10/kio/kio/kzip.h.orig 2009-12-09 19:35:42.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10/kio/kio/kzip.h 2009-12-09 19:35:48.000000000 +0100
|
||||||
|
@@ -191,10 +191,7 @@ protected:
|
||||||
|
/// Closes the archive
|
||||||
|
virtual bool closeArchive();
|
||||||
|
|
||||||
|
- /**
|
||||||
|
- * @internal Not needed for zip
|
||||||
|
- */
|
||||||
|
- virtual bool writeDir( const QString& name, const QString& user, const QString& group) { Q_UNUSED(name); Q_UNUSED(user); Q_UNUSED(group); return true; }
|
||||||
|
+ virtual bool writeDir(const QString& name, const QString& user, const QString& group);
|
||||||
|
// TODO(BIC) uncomment and make virtual for KDE 4.
|
||||||
|
// bool writeDir( const QString& name, const QString& user, const QString& group,
|
||||||
|
// mode_t perm, time_t atime, time_t mtime, time_t ctime );
|
45
kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
Normal file
45
kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
Index: xmlhttprequest.cpp
|
||||||
|
===================================================================
|
||||||
|
--- khtml/ecma/xmlhttprequest.cpp (revision 954808)
|
||||||
|
+++ khtml/ecma/xmlhttprequest.cpp (working copy)
|
||||||
|
@@ -342,17 +342,17 @@
|
||||||
|
{
|
||||||
|
aborted = false;
|
||||||
|
|
||||||
|
+ const QString protocol = url.protocol().lower();
|
||||||
|
+ // Abandon the request when the protocol is other than "http",
|
||||||
|
+ // instead of blindly doing a KIO::get on other protocols like file:/.
|
||||||
|
+ if (!protocol.startsWith("http") && !protocol.startsWith("webdav"))
|
||||||
|
+ {
|
||||||
|
+ abort();
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (method == "post") {
|
||||||
|
- QString protocol = url.protocol().lower();
|
||||||
|
|
||||||
|
- // Abondon the request when the protocol is other than "http",
|
||||||
|
- // instead of blindly changing it to a "get" request.
|
||||||
|
- if (!protocol.startsWith("http") && !protocol.startsWith("webdav"))
|
||||||
|
- {
|
||||||
|
- abort();
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
// FIXME: determine post encoding correctly by looking in headers
|
||||||
|
// for charset.
|
||||||
|
QByteArray buf;
|
||||||
|
@@ -763,11 +763,11 @@
|
||||||
|
if (obj.isValid() && obj.inherits(&DOMDocument::info)) {
|
||||||
|
DOM::Node docNode = static_cast<KJS::DOMDocument *>(obj.imp())->toNode();
|
||||||
|
DOM::DocumentImpl *doc = static_cast<DOM::DocumentImpl *>(docNode.handle());
|
||||||
|
-
|
||||||
|
+
|
||||||
|
try {
|
||||||
|
body = doc->toString().string();
|
||||||
|
// FIXME: also need to set content type, including encoding!
|
||||||
|
-
|
||||||
|
+
|
||||||
|
} catch(DOM::DOMException& e) {
|
||||||
|
Object err = Error::create(exec, GeneralError, "Exception serializing document");
|
||||||
|
exec->setException(err);
|
@ -1,10 +1,12 @@
|
|||||||
diff -up kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.8/kio/kssl/kopenssl.cc
|
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.10/kio/kssl/kopenssl.cc
|
||||||
--- kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl 2006-07-22 03:16:39.000000000 -0500
|
--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.openssl 2006-07-22 03:16:39.000000000 -0500
|
||||||
+++ kdelibs-3.5.8/kio/kssl/kopenssl.cc 2007-12-04 08:13:44.000000000 -0600
|
+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-04-19 16:34:14.000000000 -0500
|
||||||
@@ -329,6 +329,17 @@ KConfig *cfg;
|
@@ -329,6 +329,19 @@ KConfig *cfg;
|
||||||
#ifdef SHLIB_VERSION_NUMBER
|
#ifdef SHLIB_VERSION_NUMBER
|
||||||
<< "libssl.so." SHLIB_VERSION_NUMBER
|
<< "libssl.so." SHLIB_VERSION_NUMBER
|
||||||
#endif
|
#endif
|
||||||
|
+ << "libssl.so.0.9.8k"
|
||||||
|
+ << "libssl.so.8"
|
||||||
+ << "libssl.so.0.9.8g"
|
+ << "libssl.so.0.9.8g"
|
||||||
+ << "libssl.so.7"
|
+ << "libssl.so.7"
|
||||||
+ << "libssl.so.0.9.8b"
|
+ << "libssl.so.0.9.8b"
|
||||||
@ -19,10 +21,12 @@ diff -up kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.8/kio/kssl/kopen
|
|||||||
<< "libssl.so"
|
<< "libssl.so"
|
||||||
<< "libssl.so.0"
|
<< "libssl.so.0"
|
||||||
#endif
|
#endif
|
||||||
@@ -346,6 +357,17 @@ KConfig *cfg;
|
@@ -346,6 +359,19 @@ KConfig *cfg;
|
||||||
#ifdef SHLIB_VERSION_NUMBER
|
#ifdef SHLIB_VERSION_NUMBER
|
||||||
<< "libcrypto.so." SHLIB_VERSION_NUMBER
|
<< "libcrypto.so." SHLIB_VERSION_NUMBER
|
||||||
#endif
|
#endif
|
||||||
|
+ << "libcrypto.so.0.9.8k"
|
||||||
|
+ << "libcrypto.so.8"
|
||||||
+ << "libcrypto.so.0.9.8g"
|
+ << "libcrypto.so.0.9.8g"
|
||||||
+ << "libcrypto.so.7"
|
+ << "libcrypto.so.7"
|
||||||
+ << "libcrypto.so.0.9.8b"
|
+ << "libcrypto.so.0.9.8b"
|
180
kdelibs-3.5.10-ossl-1.x.patch
Normal file
180
kdelibs-3.5.10-ossl-1.x.patch
Normal file
@ -0,0 +1,180 @@
|
|||||||
|
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.cc
|
||||||
|
--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.ossl-1.x 2009-09-04 23:10:53.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-09-04 23:10:53.000000000 +0200
|
||||||
|
@@ -96,9 +96,14 @@ static int (*K_BIO_write) (BIO *b, cons
|
||||||
|
static int (*K_PEM_ASN1_write_bio) (int (*)(),const char *,BIO *,char *,
|
||||||
|
const EVP_CIPHER *,unsigned char *,int ,
|
||||||
|
pem_password_cb *, void *) = 0L;
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+static int (*K_ASN1_item_i2d_fp)(ASN1_ITEM *,FILE *,unsigned char *) = 0L;
|
||||||
|
+static ASN1_ITEM *K_NETSCAPE_X509_it = 0L;
|
||||||
|
+#else
|
||||||
|
static ASN1_METHOD* (*K_X509_asn1_meth) (void) = 0L;
|
||||||
|
static int (*K_ASN1_i2d_fp)(int (*)(),FILE *,unsigned char *) = 0L;
|
||||||
|
static int (*K_i2d_ASN1_HEADER)(ASN1_HEADER *, unsigned char **) = 0L;
|
||||||
|
+#endif
|
||||||
|
static int (*K_X509_print_fp) (FILE *, X509*) = 0L;
|
||||||
|
static int (*K_i2d_PKCS12) (PKCS12*, unsigned char**) = 0L;
|
||||||
|
static int (*K_i2d_PKCS12_fp) (FILE *, PKCS12*) = 0L;
|
||||||
|
@@ -430,9 +435,14 @@ KConfig *cfg;
|
||||||
|
K_BIO_ctrl = (long (*) (BIO *,int,long,void *)) _cryptoLib->symbol("BIO_ctrl");
|
||||||
|
K_BIO_write = (int (*) (BIO *b, const void *data, int len)) _cryptoLib->symbol("BIO_write");
|
||||||
|
K_PEM_ASN1_write_bio = (int (*)(int (*)(), const char *,BIO*, char*, const EVP_CIPHER *, unsigned char *, int, pem_password_cb *, void *)) _cryptoLib->symbol("PEM_ASN1_write_bio");
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+ K_ASN1_item_i2d_fp = (int (*)(ASN1_ITEM *, FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_item_i2d_fp");
|
||||||
|
+ K_NETSCAPE_X509_it = (ASN1_ITEM *) _cryptoLib->symbol("NETSCAPE_X509_it");
|
||||||
|
+#else
|
||||||
|
K_X509_asn1_meth = (ASN1_METHOD* (*)(void)) _cryptoLib->symbol("X509_asn1_meth");
|
||||||
|
K_ASN1_i2d_fp = (int (*)(int (*)(), FILE*, unsigned char *)) _cryptoLib->symbol("ASN1_i2d_fp");
|
||||||
|
K_i2d_ASN1_HEADER = (int (*)(ASN1_HEADER *, unsigned char **)) _cryptoLib->symbol("i2d_ASN1_HEADER");
|
||||||
|
+#endif
|
||||||
|
K_X509_print_fp = (int (*)(FILE*, X509*)) _cryptoLib->symbol("X509_print_fp");
|
||||||
|
K_i2d_PKCS12 = (int (*)(PKCS12*, unsigned char**)) _cryptoLib->symbol("i2d_PKCS12");
|
||||||
|
K_i2d_PKCS12_fp = (int (*)(FILE *, PKCS12*)) _cryptoLib->symbol("i2d_PKCS12_fp");
|
||||||
|
@@ -594,7 +604,7 @@ KConfig *cfg;
|
||||||
|
K_SSL_set_session = (int (*)(SSL*,SSL_SESSION*)) _sslLib->symbol("SSL_set_session");
|
||||||
|
K_d2i_SSL_SESSION = (SSL_SESSION* (*)(SSL_SESSION**,unsigned char**, long)) _sslLib->symbol("d2i_SSL_SESSION");
|
||||||
|
K_i2d_SSL_SESSION = (int (*)(SSL_SESSION*,unsigned char**)) _sslLib->symbol("i2d_SSL_SESSION");
|
||||||
|
- K_SSL_get_ciphers = (STACK *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
|
||||||
|
+ K_SSL_get_ciphers = (STACK_OF(SSL_CIPHER) *(*)(const SSL*)) _sslLib->symbol("SSL_get_ciphers");
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@@ -982,7 +992,13 @@ int KOpenSSLProxy::PEM_write_bio_X509(BI
|
||||||
|
else return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
-
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+int KOpenSSLProxy::ASN1_i2d_fp(FILE *out,unsigned char *x) {
|
||||||
|
+ if (K_ASN1_item_i2d_fp && K_NETSCAPE_X509_it)
|
||||||
|
+ return (K_ASN1_item_i2d_fp)(K_NETSCAPE_X509_it, out, x);
|
||||||
|
+ else return -1;
|
||||||
|
+}
|
||||||
|
+#else
|
||||||
|
ASN1_METHOD *KOpenSSLProxy::X509_asn1_meth(void) {
|
||||||
|
if (K_X509_asn1_meth) return (K_X509_asn1_meth)();
|
||||||
|
else return 0L;
|
||||||
|
@@ -994,7 +1010,7 @@ int KOpenSSLProxy::ASN1_i2d_fp(FILE *out
|
||||||
|
return (K_ASN1_i2d_fp)((int (*)())K_i2d_ASN1_HEADER, out, x);
|
||||||
|
else return -1;
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
int KOpenSSLProxy::X509_print(FILE *fp, X509 *x) {
|
||||||
|
if (K_X509_print_fp) return (K_X509_print_fp)(fp, x);
|
||||||
|
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x kdelibs-3.5.10/kio/kssl/kopenssl.h
|
||||||
|
--- kdelibs-3.5.10/kio/kssl/kopenssl.h.ossl-1.x 2006-07-22 10:16:39.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.10/kio/kssl/kopenssl.h 2009-09-04 23:10:53.000000000 +0200
|
||||||
|
@@ -48,6 +48,9 @@ class KOpenSSLProxyPrivate;
|
||||||
|
#include <openssl/stack.h>
|
||||||
|
#include <openssl/bn.h>
|
||||||
|
#undef crypt
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+#define STACK _STACK
|
||||||
|
+#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <kstaticdeleter.h>
|
||||||
|
@@ -446,12 +449,12 @@ public:
|
||||||
|
*/
|
||||||
|
int PEM_write_bio_X509(BIO *bp, X509 *x);
|
||||||
|
|
||||||
|
-
|
||||||
|
+#if OPENSSL_VERSION_NUMBER < 0x10000000L
|
||||||
|
/*
|
||||||
|
* X509_asn1_meth - used for netscape output
|
||||||
|
*/
|
||||||
|
ASN1_METHOD *X509_asn1_meth();
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* ASN1_i2d_fp - used for netscape output
|
||||||
|
@@ -531,6 +534,9 @@ public:
|
||||||
|
*/
|
||||||
|
void sk_free(STACK *s);
|
||||||
|
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+ void sk_free(void *s) { return sk_free(reinterpret_cast<STACK*>(s)); }
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Number of elements in the stack
|
||||||
|
@@ -543,6 +549,9 @@ public:
|
||||||
|
*/
|
||||||
|
char *sk_value(STACK *s, int n);
|
||||||
|
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+ char *sk_value(void *s, int n) { return sk_value(reinterpret_cast<STACK*>(s), n); }
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Create a new stack
|
||||||
|
@@ -555,6 +564,9 @@ public:
|
||||||
|
*/
|
||||||
|
int sk_push(STACK *s, char *d);
|
||||||
|
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+ int sk_push(void *s, void *d) { return sk_push(reinterpret_cast<STACK*>(s), reinterpret_cast<char*>(d)); }
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Duplicate the stack
|
||||||
|
diff -up kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc
|
||||||
|
--- kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc.ossl-1.x 2005-10-10 17:05:44.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.10/kio/kssl/ksmimecrypto.cc 2009-09-04 23:10:53.000000000 +0200
|
||||||
|
@@ -87,7 +87,7 @@ KSMIMECryptoPrivate::KSMIMECryptoPrivate
|
||||||
|
|
||||||
|
|
||||||
|
STACK_OF(X509) *KSMIMECryptoPrivate::certsToX509(QPtrList<KSSLCertificate> &certs) {
|
||||||
|
- STACK_OF(X509) *x509 = sk_new(NULL);
|
||||||
|
+ STACK_OF(X509) *x509 = reinterpret_cast<STACK_OF(X509)*>(sk_new(NULL));
|
||||||
|
KSSLCertificate *cert = certs.first();
|
||||||
|
while(cert) {
|
||||||
|
sk_X509_push(x509, cert->getCert());
|
||||||
|
diff -up kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x kdelibs-3.5.10/kio/kssl/ksslcertificate.cc
|
||||||
|
--- kdelibs-3.5.10/kio/kssl/ksslcertificate.cc.ossl-1.x 2006-01-19 18:06:12.000000000 +0100
|
||||||
|
+++ kdelibs-3.5.10/kio/kssl/ksslcertificate.cc 2009-09-04 23:10:53.000000000 +0200
|
||||||
|
@@ -1003,17 +1003,31 @@ return qba;
|
||||||
|
QByteArray KSSLCertificate::toNetscape() {
|
||||||
|
QByteArray qba;
|
||||||
|
#ifdef KSSL_HAVE_SSL
|
||||||
|
-ASN1_HEADER ah;
|
||||||
|
-ASN1_OCTET_STRING os;
|
||||||
|
-KTempFile ktf;
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+ NETSCAPE_X509 nx;
|
||||||
|
+ ASN1_OCTET_STRING hdr;
|
||||||
|
+#else
|
||||||
|
+ ASN1_HEADER ah;
|
||||||
|
+ ASN1_OCTET_STRING os;
|
||||||
|
+#endif
|
||||||
|
+ KTempFile ktf;
|
||||||
|
|
||||||
|
- os.data = (unsigned char *)NETSCAPE_CERT_HDR;
|
||||||
|
- os.length = strlen(NETSCAPE_CERT_HDR);
|
||||||
|
- ah.header = &os;
|
||||||
|
- ah.data = (char *)getCert();
|
||||||
|
- ah.meth = d->kossl->X509_asn1_meth();
|
||||||
|
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||||||
|
+ hdr.data = (unsigned char *)NETSCAPE_CERT_HDR;
|
||||||
|
+ hdr.length = strlen(NETSCAPE_CERT_HDR);
|
||||||
|
+ nx.header = &hdr;
|
||||||
|
+ nx.cert = getCert();
|
||||||
|
+
|
||||||
|
+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&nx);
|
||||||
|
+#else
|
||||||
|
+ os.data = (unsigned char *)NETSCAPE_CERT_HDR;
|
||||||
|
+ os.length = strlen(NETSCAPE_CERT_HDR);
|
||||||
|
+ ah.header = &os;
|
||||||
|
+ ah.data = (char *)getCert();
|
||||||
|
+ ah.meth = d->kossl->X509_asn1_meth();
|
||||||
|
|
||||||
|
- d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
|
||||||
|
+ d->kossl->ASN1_i2d_fp(ktf.fstream(),(unsigned char *)&ah);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
ktf.close();
|
||||||
|
|
20
kdelibs-3.5.4-CVE-2009-1687.patch
Normal file
20
kdelibs-3.5.4-CVE-2009-1687.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- kdelibs-3.5.4/kjs/collector.cpp.CVE-2009-1687 2009-06-17 15:07:33.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.4/kjs/collector.cpp 2009-06-20 00:42:48.000000000 +0200
|
||||||
|
@@ -23,6 +23,7 @@
|
||||||
|
|
||||||
|
#include "value.h"
|
||||||
|
#include "internal.h"
|
||||||
|
+#include <limits.h>
|
||||||
|
|
||||||
|
#ifndef MAX
|
||||||
|
#define MAX(a,b) ((a) > (b) ? (a) : (b))
|
||||||
|
@@ -119,6 +120,9 @@
|
||||||
|
// didn't find one, need to allocate a new block
|
||||||
|
|
||||||
|
if (heap.usedBlocks == heap.numBlocks) {
|
||||||
|
+ static const size_t maxNumBlocks = ULONG_MAX / sizeof(CollectorBlock*) / GROWTH_FACTOR;
|
||||||
|
+ if (heap.numBlocks > maxNumBlocks)
|
||||||
|
+ return 0L;
|
||||||
|
heap.numBlocks = MAX(MIN_ARRAY_SIZE, heap.numBlocks * GROWTH_FACTOR);
|
||||||
|
heap.blocks = (CollectorBlock **)realloc(heap.blocks, heap.numBlocks * sizeof(CollectorBlock *));
|
||||||
|
}
|
545
kdelibs-3.5.4-CVE-2009-1690.patch
Normal file
545
kdelibs-3.5.4-CVE-2009-1690.patch
Normal file
@ -0,0 +1,545 @@
|
|||||||
|
--- kdelibs-3.5.4/khtml/html/RefPtr.h.CVE-2009-1690 2009-06-17 14:19:00.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.4/khtml/html/RefPtr.h 2009-06-17 14:19:00.000000000 +0200
|
||||||
|
@@ -0,0 +1,202 @@
|
||||||
|
+// -*- mode: c++; c-basic-offset: 4 -*-
|
||||||
|
+/*
|
||||||
|
+ * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
|
||||||
|
+ *
|
||||||
|
+ * This library is free software; you can redistribute it and/or
|
||||||
|
+ * modify it under the terms of the GNU Library General Public
|
||||||
|
+ * License as published by the Free Software Foundation; either
|
||||||
|
+ * version 2 of the License, or (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * This library is distributed in the hope that it will be useful,
|
||||||
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
+ * Library General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU Library General Public License
|
||||||
|
+ * along with this library; see the file COPYING.LIB. If not, write to
|
||||||
|
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||||
|
+ * Boston, MA 02110-1301, USA.
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#ifndef WTF_RefPtr_h
|
||||||
|
+#define WTF_RefPtr_h
|
||||||
|
+
|
||||||
|
+#include <algorithm>
|
||||||
|
+#include "AlwaysInline.h"
|
||||||
|
+
|
||||||
|
+namespace WTF {
|
||||||
|
+
|
||||||
|
+ enum PlacementNewAdoptType { PlacementNewAdopt };
|
||||||
|
+
|
||||||
|
+ template <typename T> class PassRefPtr;
|
||||||
|
+
|
||||||
|
+ enum HashTableDeletedValueType { HashTableDeletedValue };
|
||||||
|
+
|
||||||
|
+ template <typename T> class RefPtr {
|
||||||
|
+ public:
|
||||||
|
+ RefPtr() : m_ptr(0) { }
|
||||||
|
+ RefPtr(T* ptr) : m_ptr(ptr) { if (ptr) ptr->ref(); }
|
||||||
|
+ RefPtr(const RefPtr& o) : m_ptr(o.m_ptr) { if (T* ptr = m_ptr) ptr->ref(); }
|
||||||
|
+ // see comment in PassRefPtr.h for why this takes const reference
|
||||||
|
+ template <typename U> RefPtr(const PassRefPtr<U>&);
|
||||||
|
+
|
||||||
|
+ // Special constructor for cases where we overwrite an object in place.
|
||||||
|
+ RefPtr(PlacementNewAdoptType) { }
|
||||||
|
+
|
||||||
|
+ // Hash table deleted values, which are only constructed and never copied or destroyed.
|
||||||
|
+ RefPtr(HashTableDeletedValueType) : m_ptr(hashTableDeletedValue()) { }
|
||||||
|
+ bool isHashTableDeletedValue() const { return m_ptr == hashTableDeletedValue(); }
|
||||||
|
+
|
||||||
|
+ ~RefPtr() { if (T* ptr = m_ptr) ptr->deref(); }
|
||||||
|
+
|
||||||
|
+ template <typename U> RefPtr(const RefPtr<U>& o) : m_ptr(o.get()) { if (T* ptr = m_ptr) ptr->ref(); }
|
||||||
|
+
|
||||||
|
+ T* get() const { return m_ptr; }
|
||||||
|
+
|
||||||
|
+ void clear() { if (T* ptr = m_ptr) ptr->deref(); m_ptr = 0; }
|
||||||
|
+ PassRefPtr<T> release() { PassRefPtr<T> tmp = adoptRef(m_ptr); m_ptr = 0; return tmp; }
|
||||||
|
+
|
||||||
|
+ T& operator*() const { return *m_ptr; }
|
||||||
|
+ ALWAYS_INLINE T* operator->() const { return m_ptr; }
|
||||||
|
+
|
||||||
|
+ bool operator!() const { return !m_ptr; }
|
||||||
|
+
|
||||||
|
+ // This conversion operator allows implicit conversion to bool but not to other integer types.
|
||||||
|
+ typedef T* RefPtr::*UnspecifiedBoolType;
|
||||||
|
+ operator UnspecifiedBoolType() const { return m_ptr ? &RefPtr::m_ptr : 0; }
|
||||||
|
+
|
||||||
|
+ RefPtr& operator=(const RefPtr&);
|
||||||
|
+ RefPtr& operator=(T*);
|
||||||
|
+ RefPtr& operator=(const PassRefPtr<T>&);
|
||||||
|
+ template <typename U> RefPtr& operator=(const RefPtr<U>&);
|
||||||
|
+ template <typename U> RefPtr& operator=(const PassRefPtr<U>&);
|
||||||
|
+
|
||||||
|
+ void swap(RefPtr&);
|
||||||
|
+
|
||||||
|
+ private:
|
||||||
|
+ static T* hashTableDeletedValue() { return reinterpret_cast<T*>(-1); }
|
||||||
|
+
|
||||||
|
+ T* m_ptr;
|
||||||
|
+ };
|
||||||
|
+
|
||||||
|
+ template <typename T> template <typename U> inline RefPtr<T>::RefPtr(const PassRefPtr<U>& o)
|
||||||
|
+ : m_ptr(o.releaseRef())
|
||||||
|
+ {
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T> inline RefPtr<T>& RefPtr<T>::operator=(const RefPtr<T>& o)
|
||||||
|
+ {
|
||||||
|
+ T* optr = o.get();
|
||||||
|
+ if (optr)
|
||||||
|
+ optr->ref();
|
||||||
|
+ T* ptr = m_ptr;
|
||||||
|
+ m_ptr = optr;
|
||||||
|
+ if (ptr)
|
||||||
|
+ ptr->deref();
|
||||||
|
+ return *this;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T> template <typename U> inline RefPtr<T>& RefPtr<T>::operator=(const RefPtr<U>& o)
|
||||||
|
+ {
|
||||||
|
+ T* optr = o.get();
|
||||||
|
+ if (optr)
|
||||||
|
+ optr->ref();
|
||||||
|
+ T* ptr = m_ptr;
|
||||||
|
+ m_ptr = optr;
|
||||||
|
+ if (ptr)
|
||||||
|
+ ptr->deref();
|
||||||
|
+ return *this;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T> inline RefPtr<T>& RefPtr<T>::operator=(T* optr)
|
||||||
|
+ {
|
||||||
|
+ if (optr)
|
||||||
|
+ optr->ref();
|
||||||
|
+ T* ptr = m_ptr;
|
||||||
|
+ m_ptr = optr;
|
||||||
|
+ if (ptr)
|
||||||
|
+ ptr->deref();
|
||||||
|
+ return *this;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T> inline RefPtr<T>& RefPtr<T>::operator=(const PassRefPtr<T>& o)
|
||||||
|
+ {
|
||||||
|
+ T* ptr = m_ptr;
|
||||||
|
+ m_ptr = o.releaseRef();
|
||||||
|
+ if (ptr)
|
||||||
|
+ ptr->deref();
|
||||||
|
+ return *this;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T> template <typename U> inline RefPtr<T>& RefPtr<T>::operator=(const PassRefPtr<U>& o)
|
||||||
|
+ {
|
||||||
|
+ T* ptr = m_ptr;
|
||||||
|
+ m_ptr = o.releaseRef();
|
||||||
|
+ if (ptr)
|
||||||
|
+ ptr->deref();
|
||||||
|
+ return *this;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <class T> inline void RefPtr<T>::swap(RefPtr<T>& o)
|
||||||
|
+ {
|
||||||
|
+ std::swap(m_ptr, o.m_ptr);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <class T> inline void swap(RefPtr<T>& a, RefPtr<T>& b)
|
||||||
|
+ {
|
||||||
|
+ a.swap(b);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T, typename U> inline bool operator==(const RefPtr<T>& a, const RefPtr<U>& b)
|
||||||
|
+ {
|
||||||
|
+ return a.get() == b.get();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T, typename U> inline bool operator==(const RefPtr<T>& a, U* b)
|
||||||
|
+ {
|
||||||
|
+ return a.get() == b;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T, typename U> inline bool operator==(T* a, const RefPtr<U>& b)
|
||||||
|
+ {
|
||||||
|
+ return a == b.get();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T, typename U> inline bool operator!=(const RefPtr<T>& a, const RefPtr<U>& b)
|
||||||
|
+ {
|
||||||
|
+ return a.get() != b.get();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T, typename U> inline bool operator!=(const RefPtr<T>& a, U* b)
|
||||||
|
+ {
|
||||||
|
+ return a.get() != b;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T, typename U> inline bool operator!=(T* a, const RefPtr<U>& b)
|
||||||
|
+ {
|
||||||
|
+ return a != b.get();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T, typename U> inline RefPtr<T> static_pointer_cast(const RefPtr<U>& p)
|
||||||
|
+ {
|
||||||
|
+ return RefPtr<T>(static_cast<T*>(p.get()));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T, typename U> inline RefPtr<T> const_pointer_cast(const RefPtr<U>& p)
|
||||||
|
+ {
|
||||||
|
+ return RefPtr<T>(const_cast<T*>(p.get()));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template <typename T> inline T* getPtr(const RefPtr<T>& p)
|
||||||
|
+ {
|
||||||
|
+ return p.get();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+} // namespace WTF
|
||||||
|
+
|
||||||
|
+using WTF::RefPtr;
|
||||||
|
+using WTF::static_pointer_cast;
|
||||||
|
+using WTF::const_pointer_cast;
|
||||||
|
+
|
||||||
|
+#endif // WTF_RefPtr_h
|
||||||
|
--- kdelibs-3.5.4/khtml/html/htmlparser.cpp.CVE-2009-1690 2006-07-22 10:16:43.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.4/khtml/html/htmlparser.cpp 2009-06-17 11:51:15.000000000 +0200
|
||||||
|
@@ -199,7 +199,6 @@
|
||||||
|
|
||||||
|
form = 0;
|
||||||
|
map = 0;
|
||||||
|
- head = 0;
|
||||||
|
end = false;
|
||||||
|
isindex = 0;
|
||||||
|
|
||||||
|
@@ -616,8 +615,7 @@
|
||||||
|
case ID_BASE:
|
||||||
|
if(!head) {
|
||||||
|
head = new HTMLHeadElementImpl(document);
|
||||||
|
- e = head;
|
||||||
|
- insertNode(e);
|
||||||
|
+ insertNode(head.get());
|
||||||
|
handled = true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
@@ -839,7 +837,7 @@
|
||||||
|
case ID_HEAD:
|
||||||
|
if(!head && current->id() == ID_HTML) {
|
||||||
|
head = new HTMLHeadElementImpl(document);
|
||||||
|
- n = head;
|
||||||
|
+ n = head.get();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ID_BODY:
|
||||||
|
@@ -1679,12 +1677,12 @@
|
||||||
|
head = new HTMLHeadElementImpl(document);
|
||||||
|
HTMLElementImpl *body = doc()->body();
|
||||||
|
int exceptioncode = 0;
|
||||||
|
- doc()->firstChild()->insertBefore(head, body, exceptioncode);
|
||||||
|
+ doc()->firstChild()->insertBefore(head.get(), body, exceptioncode);
|
||||||
|
if ( exceptioncode ) {
|
||||||
|
#ifdef PARSER_DEBUG
|
||||||
|
kdDebug( 6035 ) << "creation of head failed!!!!" << endl;
|
||||||
|
#endif
|
||||||
|
- delete head;
|
||||||
|
+ delete head.get();
|
||||||
|
head = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
--- kdelibs-3.5.4/khtml/html/Platform.h.CVE-2009-1690 2009-06-17 14:19:07.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.4/khtml/html/Platform.h 2009-06-17 14:19:07.000000000 +0200
|
||||||
|
@@ -0,0 +1,218 @@
|
||||||
|
+/* -*- mode: c++; c-basic-offset: 4 -*- */
|
||||||
|
+/*
|
||||||
|
+ * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
|
||||||
|
+ *
|
||||||
|
+ * Redistribution and use in source and binary forms, with or without
|
||||||
|
+ * modification, are permitted provided that the following conditions
|
||||||
|
+ * are met:
|
||||||
|
+ * 1. Redistributions of source code must retain the above copyright
|
||||||
|
+ * notice, this list of conditions and the following disclaimer.
|
||||||
|
+ * 2. Redistributions in binary form must reproduce the above copyright
|
||||||
|
+ * notice, this list of conditions and the following disclaimer in the
|
||||||
|
+ * documentation and/or other materials provided with the distribution.
|
||||||
|
+ *
|
||||||
|
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
||||||
|
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
||||||
|
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
|
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||||
|
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
||||||
|
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#ifndef WTF_Platform_h
|
||||||
|
+#define WTF_Platform_h
|
||||||
|
+
|
||||||
|
+/* Force KDE build here in our tree... */
|
||||||
|
+#ifndef BUILDING_KDE__
|
||||||
|
+#define BUILDING_KDE__ 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* PLATFORM handles OS, operating environment, graphics API, and CPU */
|
||||||
|
+#define PLATFORM(WTF_FEATURE) (defined( WTF_PLATFORM_##WTF_FEATURE ) && WTF_PLATFORM_##WTF_FEATURE)
|
||||||
|
+#define COMPILER(WTF_FEATURE) (defined( WTF_COMPILER_##WTF_FEATURE ) && WTF_COMPILER_##WTF_FEATURE)
|
||||||
|
+#define HAVE(WTF_FEATURE) (defined( HAVE_##WTF_FEATURE ) && HAVE_##WTF_FEATURE)
|
||||||
|
+#define USE(WTF_FEATURE) (defined( WTF_USE_##WTF_FEATURE ) && WTF_USE_##WTF_FEATURE)
|
||||||
|
+#define ENABLE(WTF_FEATURE) (defined( ENABLE_##WTF_FEATURE ) && ENABLE_##WTF_FEATURE)
|
||||||
|
+
|
||||||
|
+/* Operating systems - low-level dependencies */
|
||||||
|
+
|
||||||
|
+/* PLATFORM(DARWIN) */
|
||||||
|
+/* Operating system level dependencies for Mac OS X / Darwin that should */
|
||||||
|
+/* be used regardless of operating environment */
|
||||||
|
+#ifdef __APPLE__
|
||||||
|
+#define WTF_PLATFORM_DARWIN 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* PLATFORM(WIN_OS) */
|
||||||
|
+/* Operating system level dependencies for Windows that should be used */
|
||||||
|
+/* regardless of operating environment */
|
||||||
|
+#if defined(WIN32) || defined(_WIN32)
|
||||||
|
+#define WTF_PLATFORM_WIN_OS 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* PLATFORM(UNIX) */
|
||||||
|
+/* Operating system level dependencies for Unix-like systems that */
|
||||||
|
+/* should be used regardless of operating environment */
|
||||||
|
+/* (includes PLATFORM(DARWIN)) */
|
||||||
|
+#if defined(__APPLE__) \
|
||||||
|
+ || defined(unix) \
|
||||||
|
+ || defined(__unix) \
|
||||||
|
+ || defined(__unix__) \
|
||||||
|
+ || defined (__NetBSD__) \
|
||||||
|
+ || defined(_AIX)
|
||||||
|
+#define WTF_PLATFORM_UNIX 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* PLATFORM(SOLARIS_OS) */
|
||||||
|
+/* Operating system level dependencies for Sun (Open)Solaris 10. */
|
||||||
|
+/* Studio 12 on Solaris defines __SunOS; gcc defines __sun__; */
|
||||||
|
+/* Both compilers define __sun and sun. */
|
||||||
|
+#if defined(__sun) || defined(sun)
|
||||||
|
+#define WTF_PLATFORM_SOLARIS_OS 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* Operating environments */
|
||||||
|
+
|
||||||
|
+/* I made the BUILDING_KDE__ macro up for the KDE build system to define */
|
||||||
|
+
|
||||||
|
+/* PLATFORM(KDE) */
|
||||||
|
+/* PLATFORM(MAC) */
|
||||||
|
+/* PLATFORM(WIN) */
|
||||||
|
+#if BUILDING_KDE__
|
||||||
|
+#define WTF_PLATFORM_KDE 1
|
||||||
|
+#elif PLATFORM(DARWIN)
|
||||||
|
+#define WTF_PLATFORM_MAC 1
|
||||||
|
+#elif PLATFORM(WIN_OS)
|
||||||
|
+#define WTF_PLATFORM_WIN 1
|
||||||
|
+#endif
|
||||||
|
+#if defined(BUILDING_GDK__)
|
||||||
|
+#define WTF_PLATFORM_GDK 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+/* CPU */
|
||||||
|
+
|
||||||
|
+/* PLATFORM(PPC) */
|
||||||
|
+#if defined(__ppc__) \
|
||||||
|
+ || defined(__PPC__) \
|
||||||
|
+ || defined(__powerpc__) \
|
||||||
|
+ || defined(__powerpc) \
|
||||||
|
+ || defined(__POWERPC__) \
|
||||||
|
+ || defined(_M_PPC) \
|
||||||
|
+ || defined(__PPC)
|
||||||
|
+#define WTF_PLATFORM_PPC 1
|
||||||
|
+#define WTF_PLATFORM_BIG_ENDIAN 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* PLATFORM(PPC64) */
|
||||||
|
+#if defined(__ppc64__) \
|
||||||
|
+ || defined(__PPC64__)
|
||||||
|
+#define WTF_PLATFORM_PPC64 1
|
||||||
|
+#define WTF_PLATFORM_BIG_ENDIAN 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if defined(arm)
|
||||||
|
+#define WTF_PLATFORM_ARM 1
|
||||||
|
+#if defined(__ARMEB__)
|
||||||
|
+#define WTF_PLATFORM_BIG_ENDIAN 1
|
||||||
|
+#elif !defined(__ARM_EABI__) && !defined(__ARMEB__)
|
||||||
|
+#define WTF_PLATFORM_MIDDLE_ENDIAN 1
|
||||||
|
+#endif
|
||||||
|
+#if !defined(__ARM_EABI__)
|
||||||
|
+#define WTF_PLATFORM_FORCE_PACK 1
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* PLATFORM(X86) */
|
||||||
|
+#if defined(__i386__) \
|
||||||
|
+ || defined(i386) \
|
||||||
|
+ || defined(_M_IX86) \
|
||||||
|
+ || defined(_X86_) \
|
||||||
|
+ || defined(__THW_INTEL)
|
||||||
|
+#define WTF_PLATFORM_X86 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* PLATFORM(X86_64) */
|
||||||
|
+#if defined(__x86_64__) \
|
||||||
|
+ || defined(__ia64__)
|
||||||
|
+#define WTF_PLATFORM_X86_64 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* PLATFORM(SPARC) */
|
||||||
|
+#if defined(sparc)
|
||||||
|
+#define WTF_PLATFORM_SPARC 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* Compiler */
|
||||||
|
+
|
||||||
|
+/* COMPILER(CWP) */
|
||||||
|
+#if defined(__MWERKS__)
|
||||||
|
+#define WTF_COMPILER_CWP 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* COMPILER(MSVC) */
|
||||||
|
+#if defined(_MSC_VER)
|
||||||
|
+#define WTF_COMPILER_MSVC 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* COMPILER(GCC) */
|
||||||
|
+#if defined(__GNUC__)
|
||||||
|
+#define WTF_COMPILER_GCC 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* COMPILER(SUNPRO) */
|
||||||
|
+#if defined(__SUNPRO_CC)
|
||||||
|
+#define WTF_COMPILER_SUNPRO 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* COMPILER(BORLAND) */
|
||||||
|
+/* not really fully supported - is this relevant any more? */
|
||||||
|
+#if defined(__BORLANDC__)
|
||||||
|
+#define WTF_COMPILER_BORLAND 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* COMPILER(CYGWIN) */
|
||||||
|
+/* not really fully supported - is this relevant any more? */
|
||||||
|
+#if defined(__CYGWIN__)
|
||||||
|
+#define WTF_COMPILER_CYGWIN 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* multiple threads only supported on Mac for now */
|
||||||
|
+#if PLATFORM(MAC)
|
||||||
|
+#ifndef WTF_USE_MULTIPLE_THREADS
|
||||||
|
+#define WTF_USE_MULTIPLE_THREADS 1
|
||||||
|
+#endif
|
||||||
|
+#ifndef WTF_USE_BINDINGS
|
||||||
|
+#define WTF_USE_BINDINGS 1
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* for Unicode, KDE uses Qt, everything else uses ICU */
|
||||||
|
+#if PLATFORM(KDE) || PLATFORM(QT)
|
||||||
|
+#define WTF_USE_QT4_UNICODE 1
|
||||||
|
+#elif PLATFORM(SYMBIAN)
|
||||||
|
+#define WTF_USE_SYMBIAN_UNICODE 1
|
||||||
|
+#else
|
||||||
|
+#define WTF_USE_ICU_UNICODE 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if PLATFORM(MAC)
|
||||||
|
+#define WTF_PLATFORM_CF 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if PLATFORM(WIN)
|
||||||
|
+#define WTF_USE_WININET 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if PLATFORM(GDK)
|
||||||
|
+#define WTF_USE_CURL 1
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+/* ENABLE macro defaults */
|
||||||
|
+
|
||||||
|
+#endif /* WTF_Platform_h */
|
||||||
|
--- kdelibs-3.5.4/khtml/html/AlwaysInline.h.CVE-2009-1690 2009-06-17 14:18:52.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.4/khtml/html/AlwaysInline.h 2009-06-17 13:56:36.000000000 +0200
|
||||||
|
@@ -0,0 +1,49 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright (C) 2005, 2007 Apple Inc. All rights reserved.
|
||||||
|
+ *
|
||||||
|
+ * This library is free software; you can redistribute it and/or
|
||||||
|
+ * modify it under the terms of the GNU Library General Public
|
||||||
|
+ * License as published by the Free Software Foundation; either
|
||||||
|
+ * version 2 of the License, or (at your option) any later version.
|
||||||
|
+ *
|
||||||
|
+ * This library is distributed in the hope that it will be useful,
|
||||||
|
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
+ * Library General Public License for more details.
|
||||||
|
+ *
|
||||||
|
+ * You should have received a copy of the GNU Library General Public License
|
||||||
|
+ * along with this library; see the file COPYING.LIB. If not, write to
|
||||||
|
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||||
|
+ * Boston, MA 02110-1301, USA.
|
||||||
|
+ *
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include "html/Platform.h"
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+#ifndef ALWAYS_INLINE
|
||||||
|
+#if COMPILER(GCC) && defined(NDEBUG) && __GNUC__ > 3
|
||||||
|
+#define ALWAYS_INLINE inline __attribute__ ((__always_inline__))
|
||||||
|
+#elif COMPILER(MSVC) && defined(NDEBUG)
|
||||||
|
+#define ALWAYS_INLINE __forceinline
|
||||||
|
+#else
|
||||||
|
+#define ALWAYS_INLINE inline
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#ifndef ALWAYS_INLINE_INTO
|
||||||
|
+#if COMPILER(GCC) && defined(NDEBUG) && ((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || __GNUC__ > 4)
|
||||||
|
+#define ALWAYS_INLINE_INTO __attribute__ ((__flatten__))
|
||||||
|
+#else
|
||||||
|
+#define ALWAYS_INLINE_INTO
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+#ifndef NEVER_INLINE
|
||||||
|
+#if COMPILER(GCC) && __GNUC__ > 3
|
||||||
|
+#define NEVER_INLINE __attribute__ ((__noinline__))
|
||||||
|
+#else
|
||||||
|
+#define NEVER_INLINE
|
||||||
|
+#endif
|
||||||
|
+#endif
|
||||||
|
--- kdelibs-3.5.4/khtml/html/htmlparser.h.CVE-2009-1690 2005-10-10 17:06:04.000000000 +0200
|
||||||
|
+++ kdelibs-3.5.4/khtml/html/htmlparser.h 2009-06-17 14:42:27.000000000 +0200
|
||||||
|
@@ -38,10 +38,10 @@
|
||||||
|
#include <qdatetime.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-
|
||||||
|
#include "dom/dom_string.h"
|
||||||
|
#include "xml/dom_nodeimpl.h"
|
||||||
|
#include "html/html_documentimpl.h"
|
||||||
|
+#include "html/RefPtr.h"
|
||||||
|
|
||||||
|
class KHTMLView;
|
||||||
|
class HTMLStackElem;
|
||||||
|
@@ -148,7 +148,7 @@
|
||||||
|
/*
|
||||||
|
* the head element. Needed for crappy html which defines <base> after </head>
|
||||||
|
*/
|
||||||
|
- DOM::HTMLHeadElementImpl *head;
|
||||||
|
+ RefPtr<DOM::HTMLHeadElementImpl> head;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* a possible <isindex> element in the head. Compatibility hack for
|
214
kdelibs3.spec
214
kdelibs3.spec
@ -4,29 +4,20 @@
|
|||||||
|
|
||||||
%define distname "Fedora"
|
%define distname "Fedora"
|
||||||
|
|
||||||
|
%if 0%{?rhel}
|
||||||
|
%define distname "EL"
|
||||||
|
%endif
|
||||||
|
|
||||||
%define kde_settings 1
|
%define kde_settings 1
|
||||||
|
|
||||||
%define arts 1
|
|
||||||
%define arts_ev 8:1.5.10
|
%define arts_ev 8:1.5.10
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
|
||||||
%define qt3 qt3
|
%define qt3 qt3
|
||||||
%else
|
|
||||||
%define qt3_epoch 1:
|
|
||||||
%define qt3 qt
|
|
||||||
%endif
|
|
||||||
%define qt3_version 3.3.8b
|
%define qt3_version 3.3.8b
|
||||||
%define qt3_ev %{?qt3_epoch}%{qt3_version}
|
%define qt3_ev %{?qt3_epoch}%{qt3_version}
|
||||||
# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
|
%define qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
|
||||||
#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
|
|
||||||
%define qt3_ver %{qt3_version}
|
|
||||||
# fix this?... -- Rex
|
|
||||||
%define qt3_docdir %{_docdir}/qt-devel-%{qt3_ver}
|
|
||||||
|
|
||||||
%define kde_major_version 3
|
%define kde_major_version 3
|
||||||
|
|
||||||
%define make_cvs 1
|
|
||||||
|
|
||||||
%define apidocs 1
|
%define apidocs 1
|
||||||
|
|
||||||
# We always include this here now because kdeartwork 4 has moved on to
|
# We always include this here now because kdeartwork 4 has moved on to
|
||||||
@ -36,18 +27,11 @@
|
|||||||
|
|
||||||
Summary: K Desktop Environment 3 - Libraries
|
Summary: K Desktop Environment 3 - Libraries
|
||||||
Version: 3.5.10
|
Version: 3.5.10
|
||||||
Release: 9%{?dist}
|
Release: 21%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
|
||||||
Name: kdelibs3
|
Name: kdelibs3
|
||||||
Obsoletes: kdelibs < 6:%{version}-%{release}
|
Obsoletes: kdelibs < 6:%{version}-%{release}
|
||||||
Provides: kdelibs = 6:%{version}-%{release}
|
Provides: kdelibs = 6:%{version}-%{release}
|
||||||
%else
|
|
||||||
Name: kdelibs
|
|
||||||
Epoch: 6
|
|
||||||
Obsoletes: kdelibs3 < %{version}-%{release}
|
|
||||||
Provides: kdelibs3 = %{version}-%{release}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
License: LGPLv2
|
License: LGPLv2
|
||||||
Url: http://www.kde.org/
|
Url: http://www.kde.org/
|
||||||
@ -62,7 +46,7 @@ Source3: devices.protocol
|
|||||||
Patch1: kdelibs-3.5.1-xdg-menu.patch
|
Patch1: kdelibs-3.5.1-xdg-menu.patch
|
||||||
Patch2: kdelibs-3.0.0-ndebug.patch
|
Patch2: kdelibs-3.0.0-ndebug.patch
|
||||||
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
||||||
Patch5: kdelibs-3.5.7-openssl.patch
|
Patch5: kdelibs-3.5.10-openssl.patch
|
||||||
Patch15: kdelibs-3.4.91-buildroot.patch
|
Patch15: kdelibs-3.4.91-buildroot.patch
|
||||||
Patch32: kdelibs-3.2.3-cups.patch
|
Patch32: kdelibs-3.2.3-cups.patch
|
||||||
Patch33: kdelibs-3.3.2-ppc.patch
|
Patch33: kdelibs-3.3.2-ppc.patch
|
||||||
@ -96,42 +80,59 @@ Patch101: kde-3.5-libtool-shlibext.patch
|
|||||||
# kget ignores simultaneous download limit (kde #101956)
|
# kget ignores simultaneous download limit (kde #101956)
|
||||||
Patch103: kdelibs-3.5.0-101956.patch
|
Patch103: kdelibs-3.5.0-101956.patch
|
||||||
Patch104: kdelibs-3.5.10-gcc44.patch
|
Patch104: kdelibs-3.5.10-gcc44.patch
|
||||||
|
Patch105: kdelibs-3.5.10-ossl-1.x.patch
|
||||||
|
Patch106: kdelibs-3.5.10-kio.patch
|
||||||
|
Patch107: kdelibs-3.5.10-assert.patch
|
||||||
|
Patch108: kdelibs-3.5.10-dtoa.patch
|
||||||
|
Patch109: kdelibs-3.5.10-kabc.patch
|
||||||
|
Patch110: arts-acinclude.patch
|
||||||
|
|
||||||
## upstream patches
|
## security fixes
|
||||||
|
# fix CVE-2009-2537 - select length DoS
|
||||||
|
Patch200: kdelibs-3.5.10-cve-2009-2537-select-length.patch
|
||||||
|
# fix CVE-2009-1725 - crash, possible ACE in numeric character references
|
||||||
|
Patch201: kdelibs-3.5.10-cve-2009-1725.patch
|
||||||
|
# fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free)
|
||||||
|
Patch202: kdelibs-3.5.4-CVE-2009-1687.patch
|
||||||
|
# fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
|
||||||
|
Patch203: kdelibs-3.5.4-CVE-2009-1690.patch
|
||||||
|
# fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
|
||||||
|
Patch204: kdelibs-3.5.10-cve-2009-1698.patch
|
||||||
|
# fix CVE-2009-2702 - ssl incorrect verification of SSL certificate with NUL in subjectAltName
|
||||||
|
Patch205: kdelibs-3.5.10-CVE-2009-2702.patch
|
||||||
|
# fix oCERT-2009-015 - unrestricted XMLHttpRequest access to local URLs
|
||||||
|
Patch206: kdelibs-3.5.10-oCERT-2009-015-xmlhttprequest.patch
|
||||||
|
# CVE-2009-3736, libltdl may load and execute code from a library in the current directory
|
||||||
|
Patch207: libltdl-CVE-2009-3736.patch
|
||||||
|
|
||||||
#{?arts:Requires: arts >= %{arts_ev}}
|
|
||||||
#Requires: %{qt3} >= %{qt3_ev}
|
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
%if %{kde_settings}
|
%if %{kde_settings}
|
||||||
Requires: kde-settings >= 3.5
|
Requires: kde-settings >= 3.5
|
||||||
%endif
|
%endif
|
||||||
Requires: kde-filesystem
|
Requires: kde-filesystem
|
||||||
%if "%{name}" != "kdelibs"
|
|
||||||
Requires: kdelibs-common
|
Requires: kdelibs-common
|
||||||
%endif
|
|
||||||
Requires: redhat-menus
|
Requires: redhat-menus
|
||||||
Requires: shadow-utils
|
Requires: shadow-utils
|
||||||
BuildRequires: sudo
|
BuildRequires: sudo
|
||||||
Requires(hint): sudo
|
Requires(hint): sudo
|
||||||
|
|
||||||
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
|
%if 0%{?fedora}
|
||||||
%define libkdnssd libkdnssd
|
%define libkdnssd libkdnssd
|
||||||
# omit for now, may contribute to http://bugzilla.redhat.com/441222
|
%endif
|
||||||
#Requires: %{libkdnssd}
|
|
||||||
%define BuildRequires: xorg-x11-proto-devel libX11-devel
|
%define BuildRequires: xorg-x11-proto-devel libX11-devel
|
||||||
%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
|
%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
|
||||||
Requires: iceauth
|
Requires: iceauth
|
||||||
%endif
|
|
||||||
|
|
||||||
Requires(pre): coreutils
|
Requires(pre): coreutils
|
||||||
Requires(post): /sbin/ldconfig
|
Requires(post): /sbin/ldconfig
|
||||||
Requires(postun): /sbin/ldconfig
|
Requires(postun): /sbin/ldconfig
|
||||||
|
Requires: hunspell
|
||||||
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
BuildRequires: cups-devel cups
|
BuildRequires: cups-devel cups
|
||||||
BuildRequires: %{qt3}-devel %{qt3}-devel-docs
|
BuildRequires: %{qt3}-devel %{qt3}-devel-docs
|
||||||
%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
|
BuildRequires: arts-devel >= %{arts_ev}
|
||||||
BuildRequires: flex >= 2.5.4a-13
|
BuildRequires: flex >= 2.5.4a-13
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: libxslt-devel
|
BuildRequires: libxslt-devel
|
||||||
@ -153,30 +154,18 @@ BuildRequires: libart_lgpl-devel
|
|||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: libtiff-devel
|
BuildRequires: libtiff-devel
|
||||||
BuildRequires: libacl-devel libattr-devel
|
BuildRequires: libacl-devel libattr-devel
|
||||||
%if 0%{?fedora} >= 9
|
|
||||||
BuildRequires: enchant-devel
|
BuildRequires: enchant-devel
|
||||||
Requires: hunspell
|
|
||||||
%else
|
|
||||||
BuildRequires: aspell-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
BuildRequires: openldap-devel
|
BuildRequires: openldap-devel
|
||||||
BuildRequires: db4-devel
|
BuildRequires: db4-devel
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: glibc-kernheaders
|
BuildRequires: glibc-kernheaders
|
||||||
%if 0%{?fedora} > 5 || 0%{?rhel} > 4
|
|
||||||
%define _with_libutempter 1
|
|
||||||
BuildRequires: libutempter-devel
|
BuildRequires: libutempter-devel
|
||||||
%else
|
|
||||||
BuildRequires: utempter
|
|
||||||
%endif
|
|
||||||
BuildRequires: findutils
|
BuildRequires: findutils
|
||||||
BuildRequires: jasper-devel
|
BuildRequires: jasper-devel
|
||||||
BuildRequires: OpenEXR-devel
|
BuildRequires: OpenEXR-devel
|
||||||
%if %{make_cvs}
|
|
||||||
BuildRequires: automake libtool
|
BuildRequires: automake libtool
|
||||||
%endif
|
|
||||||
|
|
||||||
%if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
|
%if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
|
||||||
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||||
@ -201,17 +190,12 @@ kimgio (image manipulation).
|
|||||||
%package devel
|
%package devel
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Summary: Header files and documentation for compiling KDE 3 applications.
|
Summary: Header files and documentation for compiling KDE 3 applications.
|
||||||
%if "%{name}" == "kdelibs"
|
|
||||||
Obsoletes: kdelibs3-devel < %{version}-%{release}
|
|
||||||
Provides: kdelibs3-devel = %{version}-%{release}
|
|
||||||
%else
|
|
||||||
Obsoletes: kdelibs-devel < 6:%{version}-%{release}
|
Obsoletes: kdelibs-devel < 6:%{version}-%{release}
|
||||||
Provides: kdelibs-devel = 6:%{version}-%{release}
|
Provides: kdelibs-devel = 6:%{version}-%{release}
|
||||||
%endif
|
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
|
||||||
Requires: %{qt3}-devel
|
Requires: %{qt3}-devel
|
||||||
Requires: openssl-devel
|
Requires: openssl-devel
|
||||||
%{?arts:Requires: arts-devel}
|
Requires: arts-devel
|
||||||
%{?libkdnssd:Requires: libkdnssd-devel}
|
%{?libkdnssd:Requires: libkdnssd-devel}
|
||||||
%description devel
|
%description devel
|
||||||
This package includes the header files you will need to compile
|
This package includes the header files you will need to compile
|
||||||
@ -221,16 +205,9 @@ applications for KDE 3.
|
|||||||
Group: Development/Documentation
|
Group: Development/Documentation
|
||||||
Summary: KDE 3 API documentation.
|
Summary: KDE 3 API documentation.
|
||||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||||
%if "%{name}" == "kdelibs"
|
|
||||||
Provides: kdelibs3-apidocs = %{version}-%{release}
|
|
||||||
%else
|
|
||||||
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||||
Provides: kdelibs-apidocs = 6:%{version}-%{release}
|
Provides: kdelibs-apidocs = 6:%{version}-%{release}
|
||||||
%endif
|
BuildArch: noarch
|
||||||
## to enable rpm's noarch subpkg feature
|
|
||||||
#if 0%{?fedora} > 10
|
|
||||||
#BuildArch: noarch
|
|
||||||
#endif
|
|
||||||
|
|
||||||
%description apidocs
|
%description apidocs
|
||||||
This package includes the KDE 3 API documentation in HTML
|
This package includes the KDE 3 API documentation in HTML
|
||||||
@ -253,34 +230,44 @@ format for easy browsing
|
|||||||
%patch38 -p1 -b .cupsdconf2-group
|
%patch38 -p1 -b .cupsdconf2-group
|
||||||
%patch39 -p1 -b .kabc-make
|
%patch39 -p1 -b .kabc-make
|
||||||
%patch40 -p1 -b .kdeprint-utf8
|
%patch40 -p1 -b .kdeprint-utf8
|
||||||
%{?_with_libutempter:%patch41 -p1 -b .utempter}
|
%patch41 -p1 -b .utempter
|
||||||
%patch43 -p1 -b .lang
|
%patch43 -p1 -b .lang
|
||||||
%patch45 -p1 -b .xdg-autostart
|
%patch45 -p1 -b .xdg-autostart
|
||||||
%patch46 -p1 -b .kate-vhdl
|
%patch46 -p1 -b .kate-vhdl
|
||||||
%if 0%{?fedora} >= 9
|
|
||||||
%patch48 -p1 -b .kspell
|
%patch48 -p1 -b .kspell
|
||||||
%patch49 -p1 -b .kspell2
|
%patch49 -p1 -b .kspell2
|
||||||
%patch50 -p1 -b .no-ispell
|
%patch50 -p1 -b .no-ispell
|
||||||
%endif
|
|
||||||
%patch51 -p1 -b .cupsserverbin
|
%patch51 -p1 -b .cupsserverbin
|
||||||
%patch52 -p1 -b .KDE3
|
%patch52 -p1 -b .KDE3
|
||||||
%if "%{name}" != "kdelibs"
|
|
||||||
%patch53 -p1 -b .drkonqi-kde4
|
%patch53 -p1 -b .drkonqi-kde4
|
||||||
%endif
|
|
||||||
%patch54 -p1 -b .flock-redefinition
|
%patch54 -p1 -b .flock-redefinition
|
||||||
%patch55 -p1 -b .latex-syntax
|
%patch55 -p1 -b .latex-syntax
|
||||||
|
|
||||||
%patch100 -p1 -b .kstandarddirs
|
%patch100 -p1 -b .kstandarddirs
|
||||||
%patch101 -p1 -b .libtool-shlibext
|
%patch101 -p1 -b .libtool-shlibext
|
||||||
%patch104 -p1 -b .gcc44
|
%patch104 -p1 -b .gcc44
|
||||||
|
%patch105 -p1 -b .ossl-1.x
|
||||||
|
%patch106 -p1 -b .kio
|
||||||
|
%patch107 -p1 -b .assert
|
||||||
|
%patch108 -p1 -b .alias
|
||||||
|
%patch109 -p1 -b .kabc
|
||||||
|
%patch110 -p1 -b .autoconf
|
||||||
|
|
||||||
# upstream patches
|
# security fixes
|
||||||
|
%patch200 -p1 -b .cve-2009-2537
|
||||||
|
%patch201 -p0 -b .cve-2009-1725
|
||||||
|
%patch202 -p1 -b .cve-2009-1687
|
||||||
|
%patch203 -p1 -b .cve-2009-1690
|
||||||
|
%patch204 -p1 -b .cve-2009-1698
|
||||||
|
%patch205 -p1 -b .cve-2009-2702
|
||||||
|
%patch206 -p0 -b .oCERT-2009-015-xmlhttprequest
|
||||||
|
%patch207 -p1 -b .CVE-2009-3736
|
||||||
|
|
||||||
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
||||||
|
|
||||||
%if %{make_cvs}
|
# hack/fix for newer automake
|
||||||
make -f admin/Makefile.common cvs
|
sed -iautomake -e 's|automake\*1.10\*|automake\*1.1[0-5]\*|' admin/cvs.sh
|
||||||
%endif
|
make -f admin/Makefile.common cvs
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -315,17 +302,12 @@ export DO_NOT_COMPILE="libkscreensaver"
|
|||||||
--enable-sendfile \
|
--enable-sendfile \
|
||||||
--with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
|
--with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
|
||||||
--with-alsa \
|
--with-alsa \
|
||||||
%if 0%{?fedora} >= 9
|
|
||||||
--without-aspell \
|
--without-aspell \
|
||||||
%else
|
|
||||||
--with-aspell \
|
|
||||||
%endif
|
|
||||||
--without-hspell \
|
--without-hspell \
|
||||||
--disable-libfam \
|
--disable-libfam \
|
||||||
--enable-dnotify \
|
--enable-dnotify \
|
||||||
--enable-inotify \
|
--enable-inotify \
|
||||||
--with-utempter \
|
--with-utempter \
|
||||||
%{!?arts:--without-arts} \
|
|
||||||
%{?_with_rgbfile} \
|
%{?_with_rgbfile} \
|
||||||
--with-jasper \
|
--with-jasper \
|
||||||
--with-openexr \
|
--with-openexr \
|
||||||
@ -365,14 +347,9 @@ for i in *; do
|
|||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
%if 0%{?fedora} < 12 && 0%{?rhel} < 6
|
||||||
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
|
install -p -m 644 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
|
||||||
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
|
install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
|
||||||
|
|
||||||
%if "%{name}" == "kdelibs"
|
|
||||||
# menus
|
|
||||||
mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
|
|
||||||
mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
|
|
||||||
%{buildroot}%{_sysconfdir}/xdg/menus/kde-applications.menu
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Use hicolor-icon-theme rpm/pkg instead (#178319)
|
# Use hicolor-icon-theme rpm/pkg instead (#178319)
|
||||||
@ -410,7 +387,6 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
|
|||||||
rm -f %{buildroot}%{_libdir}/libkdnssd.la
|
rm -f %{buildroot}%{_libdir}/libkdnssd.la
|
||||||
%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
|
%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
|
||||||
|
|
||||||
%if "%{name}" != "kdelibs"
|
|
||||||
# remove conflicts with kdelibs-4
|
# remove conflicts with kdelibs-4
|
||||||
rm -f %{buildroot}%{_bindir}/checkXML
|
rm -f %{buildroot}%{_bindir}/checkXML
|
||||||
rm -f %{buildroot}%{_bindir}/ksvgtopng
|
rm -f %{buildroot}%{_bindir}/ksvgtopng
|
||||||
@ -458,7 +434,7 @@ rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
|
|||||||
rm -rf %{buildroot}%{_datadir}/locale/all_languages
|
rm -rf %{buildroot}%{_datadir}/locale/all_languages
|
||||||
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
|
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
|
||||||
rm -rf %{buildroot}%{_datadir}/autostart/
|
rm -rf %{buildroot}%{_datadir}/autostart/
|
||||||
rm -r %{buildroot}%{_datadir}/config/colors/40.colors
|
rm -f %{buildroot}%{_datadir}/config/colors/40.colors
|
||||||
rm -f %{buildroot}%{_datadir}/config/colors/Rainbow.colors
|
rm -f %{buildroot}%{_datadir}/config/colors/Rainbow.colors
|
||||||
rm -f %{buildroot}%{_datadir}/config/colors/Royal.colors
|
rm -f %{buildroot}%{_datadir}/config/colors/Royal.colors
|
||||||
rm -f %{buildroot}%{_datadir}/config/colors/Web.colors
|
rm -f %{buildroot}%{_datadir}/config/colors/Web.colors
|
||||||
@ -468,8 +444,6 @@ rm -f %{buildroot}%{_bindir}/preparetips
|
|||||||
# don't show kresources
|
# don't show kresources
|
||||||
sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
||||||
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if 0%{?include_crystalsvg} == 0
|
%if 0%{?include_crystalsvg} == 0
|
||||||
# remove all crystalsvg icons for now
|
# remove all crystalsvg icons for now
|
||||||
rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
|
rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
|
||||||
@ -512,7 +486,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
%doc README
|
%doc README
|
||||||
%doc COPYING.LIB
|
%doc COPYING.LIB
|
||||||
|
%if 0%{?fedora} < 12 && 0%{?rhel} < 6
|
||||||
%config(noreplace) %{_sysconfdir}/profile.d/*
|
%config(noreplace) %{_sysconfdir}/profile.d/*
|
||||||
|
%endif
|
||||||
%{_bindir}/artsmessage
|
%{_bindir}/artsmessage
|
||||||
%{_bindir}/cupsdconf
|
%{_bindir}/cupsdconf
|
||||||
%{_bindir}/cupsdoprint
|
%{_bindir}/cupsdoprint
|
||||||
@ -575,8 +551,6 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||||||
%{_datadir}/applications/kde/*.desktop
|
%{_datadir}/applications/kde/*.desktop
|
||||||
%{_datadir}/apps/*
|
%{_datadir}/apps/*
|
||||||
%exclude %{_datadir}/apps/ksgmltools2/
|
%exclude %{_datadir}/apps/ksgmltools2/
|
||||||
%exclude %{_datadir}/apps/kdewidgets/
|
|
||||||
%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
|
|
||||||
%config(noreplace) %{_datadir}/config/*
|
%config(noreplace) %{_datadir}/config/*
|
||||||
%{_datadir}/emoticons/*
|
%{_datadir}/emoticons/*
|
||||||
%{_datadir}/icons/default.kde
|
%{_datadir}/icons/default.kde
|
||||||
@ -586,34 +560,16 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||||||
%{_datadir}/servicetypes/*
|
%{_datadir}/servicetypes/*
|
||||||
%ghost %{_datadir}/services/ksycoca
|
%ghost %{_datadir}/services/ksycoca
|
||||||
%{_docdir}/HTML/en/kspell
|
%{_docdir}/HTML/en/kspell
|
||||||
%if "%{name}" == "kdelibs"
|
|
||||||
%{_sysconfdir}/xdg/menus/*.menu
|
|
||||||
%{_datadir}/autostart/*
|
|
||||||
# include also the conflicting file in kdelibs fedora < 9
|
|
||||||
%{_docdir}/HTML/en/common
|
|
||||||
%{_datadir}/locale/all_languages
|
|
||||||
%else
|
|
||||||
%{_docdir}/HTML/en/common/*
|
%{_docdir}/HTML/en/common/*
|
||||||
%endif
|
|
||||||
%if 0%{?include_crystalsvg}
|
%if 0%{?include_crystalsvg}
|
||||||
%{_datadir}/icons/crystalsvg/
|
%{_datadir}/icons/crystalsvg/
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-,root,root,-)
|
%defattr(-,root,root,-)
|
||||||
# include also the conflicting file in kdelibs-devel fedora < 9
|
|
||||||
%if "%{name}" == "kdelibs"
|
|
||||||
%{_bindir}/checkXML
|
|
||||||
%{_bindir}/ksvgtopng
|
|
||||||
%{_bindir}/kunittestmodrunner
|
|
||||||
%{_bindir}/preparetips
|
|
||||||
%endif
|
|
||||||
%{_bindir}/dcopidl*
|
%{_bindir}/dcopidl*
|
||||||
%{_bindir}/kconfig_compiler
|
%{_bindir}/kconfig_compiler
|
||||||
%{_bindir}/makekdewidgets
|
%{_bindir}/makekdewidgets
|
||||||
%{_datadir}/apps/kdewidgets/
|
|
||||||
%dir %{_libdir}/kde3/plugins/designer
|
|
||||||
%{_libdir}/kde3/plugins/designer/kdewidgets.*
|
|
||||||
%{_datadir}/apps/ksgmltools2/
|
%{_datadir}/apps/ksgmltools2/
|
||||||
%{_includedir}/kde/
|
%{_includedir}/kde/
|
||||||
%{_libdir}/lib*.so
|
%{_libdir}/lib*.so
|
||||||
@ -629,6 +585,54 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Dec 07 2009 Than Ngo <than@redhat.com> - 3.5.10-21
|
||||||
|
- fix security issues in libltdl bundle within kdelibs CVE-2009-3736
|
||||||
|
- backport upstream patches
|
||||||
|
- patch autoconfigury to build with autoconf >= 2.64 (Stepan Kasal)
|
||||||
|
|
||||||
|
|
||||||
|
* Mon Nov 2 2009 Lukáš Tinkl <ltinkl@redhat.com> - 3.5.10-20
|
||||||
|
- fix unrestricted XMLHttpRequest access to local URLs (oCERT-2009-015), #532428
|
||||||
|
|
||||||
|
* Mon Sep 28 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-19
|
||||||
|
- Conflicts with kde-settings (#526109)
|
||||||
|
|
||||||
|
* Mon Sep 28 2009 Than Ngo <than@redhat.com> - 3.5.10-18
|
||||||
|
- rhel cleanup
|
||||||
|
|
||||||
|
* Wed Sep 23 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-17
|
||||||
|
- move /etc/profile.d/kde.(sh|csh) to kde-settings (F-12+)
|
||||||
|
|
||||||
|
* Fri Sep 04 2009 Than Ngo <than@redhat.com> - 3.5.10-16
|
||||||
|
- openssl-1.0 build fixes
|
||||||
|
|
||||||
|
* Fri Sep 04 2009 Than Ngo <than@redhat.com> - 3.5.10-15
|
||||||
|
- fix for CVE-2009-2702
|
||||||
|
|
||||||
|
* Thu Sep 03 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-14
|
||||||
|
- kde.(sh|csh): drop KDE_IS_PRELINKED (workaround bug #515539)
|
||||||
|
|
||||||
|
* Sun Jul 26 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-13
|
||||||
|
- fix CVE-2009-2537 - select length DoS
|
||||||
|
- fix CVE-2009-1725 - crash, possible ACE in numeric character references
|
||||||
|
- fix CVE-2009-1690 - crash, possible ACE in KHTML (<head> use-after-free)
|
||||||
|
- fix CVE-2009-1687 - possible ACE in KJS (FIXME: still crashes?)
|
||||||
|
- fix CVE-2009-1698 - crash, possible ACE in CSS style attribute handling
|
||||||
|
|
||||||
|
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Jul 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-12
|
||||||
|
- FTBFS kdelibs3-3.5.10-11.fc11 (#511571)
|
||||||
|
- -devel: Requires: %%{name}%%_isa ...
|
||||||
|
|
||||||
|
* Sun Apr 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-11
|
||||||
|
- update openssl patch (for 0.9.8k)
|
||||||
|
|
||||||
|
* Thu Apr 16 2009 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-10
|
||||||
|
- move designer plugins to runtime (#487622)
|
||||||
|
- make -apidocs noarch
|
||||||
|
|
||||||
* Mon Mar 02 2009 Than Ngo <than@redhat.com> - 3.5.10-9
|
* Mon Mar 02 2009 Than Ngo <than@redhat.com> - 3.5.10-9
|
||||||
- enable -apidocs
|
- enable -apidocs
|
||||||
|
|
||||||
|
90
libltdl-CVE-2009-3736.patch
Normal file
90
libltdl-CVE-2009-3736.patch
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
diff -up arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 arts-1.5.10/libltdl/ltdl.c
|
||||||
|
--- arts-1.5.10/libltdl/ltdl.c.CVE-2009-3736 2008-08-19 22:18:38.000000000 +0200
|
||||||
|
+++ arts-1.5.10/libltdl/ltdl.c 2009-12-08 16:02:38.000000000 +0100
|
||||||
|
@@ -1454,9 +1454,10 @@ lt_dlexit ()
|
||||||
|
}
|
||||||
|
|
||||||
|
static int
|
||||||
|
-tryall_dlopen (handle, filename)
|
||||||
|
+tryall_dlopen (handle, filename, useloader)
|
||||||
|
lt_dlhandle *handle;
|
||||||
|
const char *filename;
|
||||||
|
+ const char *useloader;
|
||||||
|
{
|
||||||
|
lt_dlhandle cur;
|
||||||
|
lt_dlloader *loader;
|
||||||
|
@@ -1514,6 +1515,11 @@ tryall_dlopen (handle, filename)
|
||||||
|
|
||||||
|
while (loader)
|
||||||
|
{
|
||||||
|
+ if (useloader && strcmp(loader->loader_name, useloader))
|
||||||
|
+ {
|
||||||
|
+ loader = loader->next;
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
lt_user_data data = loader->dlloader_data;
|
||||||
|
|
||||||
|
cur->module = loader->module_open (data, filename);
|
||||||
|
@@ -1556,7 +1562,7 @@ find_module (handle, dir, libdir, dlname
|
||||||
|
/* try to open the old library first; if it was dlpreopened,
|
||||||
|
we want the preopened version of it, even if a dlopenable
|
||||||
|
module is available */
|
||||||
|
- if (old_name && tryall_dlopen(handle, old_name) == 0)
|
||||||
|
+ if (old_name && tryall_dlopen(handle, old_name, "dlpreload") == 0)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
@@ -1579,7 +1585,7 @@ find_module (handle, dir, libdir, dlname
|
||||||
|
}
|
||||||
|
|
||||||
|
sprintf (filename, "%s/%s", libdir, dlname);
|
||||||
|
- error = (tryall_dlopen (handle, filename) != 0);
|
||||||
|
+ error = (tryall_dlopen (handle, filename, NULL) != 0);
|
||||||
|
LT_DLFREE (filename);
|
||||||
|
|
||||||
|
if (!error)
|
||||||
|
@@ -1611,7 +1617,7 @@ find_module (handle, dir, libdir, dlname
|
||||||
|
strcat(filename, objdir);
|
||||||
|
strcat(filename, dlname);
|
||||||
|
|
||||||
|
- error = tryall_dlopen (handle, filename) != 0;
|
||||||
|
+ error = tryall_dlopen (handle, filename, NULL) != 0;
|
||||||
|
LT_DLFREE (filename);
|
||||||
|
if (!error)
|
||||||
|
{
|
||||||
|
@@ -1634,7 +1640,7 @@ find_module (handle, dir, libdir, dlname
|
||||||
|
}
|
||||||
|
strcat(filename, dlname);
|
||||||
|
|
||||||
|
- error = (tryall_dlopen (handle, filename) != 0);
|
||||||
|
+ error = (tryall_dlopen (handle, filename, NULL) != 0);
|
||||||
|
LT_DLFREE (filename);
|
||||||
|
if (!error)
|
||||||
|
{
|
||||||
|
@@ -1749,7 +1755,7 @@ find_file (basename, search_path, pdir,
|
||||||
|
strcpy(filename+lendir, basename);
|
||||||
|
if (handle)
|
||||||
|
{
|
||||||
|
- if (tryall_dlopen (handle, filename) == 0)
|
||||||
|
+ if (tryall_dlopen (handle, filename, NULL) == 0)
|
||||||
|
{
|
||||||
|
result = (lt_ptr) handle;
|
||||||
|
goto cleanup;
|
||||||
|
@@ -2063,7 +2069,7 @@ lt_dlopen (filename)
|
||||||
|
/* lt_dlclose()ing yourself is very bad! Disallow it. */
|
||||||
|
LT_DLSET_FLAG (handle, LT_DLRESIDENT_FLAG);
|
||||||
|
|
||||||
|
- if (tryall_dlopen (&newhandle, 0) != 0)
|
||||||
|
+ if (tryall_dlopen (&newhandle, 0, NULL) != 0)
|
||||||
|
{
|
||||||
|
LT_DLFREE (handle);
|
||||||
|
return 0;
|
||||||
|
@@ -2368,7 +2374,7 @@ lt_dlopen (filename)
|
||||||
|
#ifdef LTDL_SYSSEARCHPATH
|
||||||
|
&& !find_file (basename, sys_search_path, 0, &newhandle)
|
||||||
|
#endif
|
||||||
|
- )) && tryall_dlopen (&newhandle, filename))
|
||||||
|
+ )) && tryall_dlopen (&newhandle, filename, NULL))
|
||||||
|
{
|
||||||
|
LT_DLFREE (handle);
|
||||||
|
goto cleanup;
|
Loading…
Reference in New Issue
Block a user