Compare commits
129 Commits
kdelibs3-3
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
c898fe6ade | ||
|
f552abd54a | ||
|
d30828cbc4 | ||
|
e003ff1f06 | ||
|
88356de30f | ||
|
ee3e63ccca | ||
|
3a63f45466 | ||
|
a01682e69a | ||
|
47c941e4da | ||
|
1b9c8185b3 | ||
|
9fe8730938 | ||
|
41eea6487e | ||
|
7d92d7b924 | ||
|
c17e2ce087 | ||
|
ab3d736ba9 | ||
|
80fb1652f0 | ||
|
4bcc6a628e | ||
|
566cd5a9b4 | ||
|
8985e9f610 | ||
|
0baabbdf03 | ||
|
4a3656c29a | ||
|
f0b0934ee8 | ||
|
633853c445 | ||
|
cbbd3ce82e | ||
|
15481db604 | ||
|
fd6aba6f21 | ||
|
e35aea8f00 | ||
|
96d7b4c7a4 | ||
|
a1cd37ccad | ||
|
ed30d0e49d | ||
|
0d7d7ba013 | ||
|
cf6c60327a | ||
|
e28f8c1fc2 | ||
|
cdf75c236b | ||
|
3e56da0488 | ||
|
20886900e9 | ||
|
a7693674ae | ||
|
70bc974dd8 | ||
|
b932b6f5b1 | ||
|
41b88741c0 | ||
|
b1bed56314 | ||
|
907987379b | ||
|
04a6e0d84b | ||
|
3b65d25203 | ||
|
31d7b324e8 | ||
|
86dd264de6 | ||
|
1a44c61598 | ||
|
84bc05a492 | ||
|
ff1a41519b | ||
|
be2b171832 | ||
|
982fe59ce1 | ||
|
c9ca293207 | ||
|
9e25f93bbf | ||
|
dd03f6a169 | ||
|
cc48cf96b2 | ||
|
d8e5e67689 | ||
|
6241df7ecd | ||
|
773da8d077 | ||
|
2d08dc9c97 | ||
|
c00afba812 | ||
|
3667e1bc9c | ||
|
9362198c21 | ||
|
ecb0b24300 | ||
|
9a3039a031 | ||
|
a7f3ae8b65 | ||
|
28da85f130 | ||
|
0aff25e701 | ||
|
3c56bf76c4 | ||
|
b5d4e68a81 | ||
|
9df7db4556 | ||
|
be4c4bf9e5 | ||
|
6956032596 | ||
|
453f143613 | ||
|
cf44ec3785 | ||
|
8a2c12c525 | ||
|
d018e9bff5 | ||
|
a1b2bd78fe | ||
|
1b5e24127d | ||
|
b8199a3fbd | ||
|
496bfe539d | ||
|
e07258505b | ||
|
98b7647b04 | ||
|
9029b01768 | ||
|
273850ec6a | ||
|
c4e68e89c4 | ||
|
b3e986059a | ||
|
2d6fc0694b | ||
|
912a71c65c | ||
|
4fc0443be3 | ||
|
a827f79f2d | ||
|
21065e34b6 | ||
|
e753913e8e | ||
|
00b0d5c3c2 | ||
|
a7044c955f | ||
|
efaf01f9ae | ||
|
de752c0c72 | ||
|
d07045b303 | ||
|
629dd4ce43 | ||
|
a405c0e049 | ||
|
fcb3f12271 | ||
|
20c92620a7 | ||
|
a38b2ace44 | ||
|
beef214424 | ||
|
96a684b233 | ||
|
e8a9a9baa7 | ||
|
cb927be5c8 | ||
|
d43dd7ec44 | ||
|
ada66a22ac | ||
|
d4f3889cdf | ||
|
6fa4cd24f6 | ||
|
87879c2770 | ||
|
290f55c56b | ||
|
69c377b9de | ||
|
3d48127c62 | ||
|
59e8bfe7e1 | ||
|
32fcc2ab90 | ||
|
e12b7ca7f8 | ||
|
ec2db2477b | ||
|
79734ca9df | ||
|
c79a351025 | ||
|
423d9c535e | ||
|
5e929decd1 | ||
|
e57cb8baa2 | ||
|
2f00ab1598 | ||
|
711cd635b5 | ||
|
175c5f81dd | ||
|
d6a79ae84a | ||
|
8ce9a67bcf | ||
|
1cf2f80ad9 |
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)
|
3
kde.csh
3
kde.csh
@ -12,6 +12,3 @@ if ( -f /etc/sysconfig/prelink ) then
|
||||
endif
|
||||
endif
|
||||
|
||||
## if not using IPv6, speeds DNS operations
|
||||
# if ( ! $?KDE_NO_IPV6 ) setenv KDE_NO_IPV6 1
|
||||
|
||||
|
66
kde3-acinclude.patch
Normal file
66
kde3-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
|
12
kde3-automake-add-missing.patch
Normal file
12
kde3-automake-add-missing.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up kdelibs-3.5.10/admin/cvs.sh.me kdelibs-3.5.10/admin/cvs.sh
|
||||
--- kdelibs-3.5.10/admin/cvs.sh.me 2013-03-07 18:31:59.415038395 +0100
|
||||
+++ kdelibs-3.5.10/admin/cvs.sh 2013-03-07 18:32:26.565020369 +0100
|
||||
@@ -130,7 +130,7 @@ if egrep "^AM_CONFIG_HEADER" configure.i
|
||||
fi
|
||||
|
||||
echo "*** Creating Makefile templates"
|
||||
-$AUTOMAKE || exit 1
|
||||
+$AUTOMAKE --add-missing --copy --force-missing || exit 1
|
||||
|
||||
if test "$UNSERMAKE" = no; then
|
||||
echo "*** Postprocessing Makefile templates"
|
17
kde3-automake-version.patch
Normal file
17
kde3-automake-version.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff -ur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-automake-version/admin/cvs.sh
|
||||
--- kdelibs-3.5.10/admin/cvs.sh 2008-08-19 22:28:39.000000000 +0200
|
||||
+++ kdelibs-3.5.10-automake-version/admin/cvs.sh 2012-06-12 01:24:13.000000000 +0200
|
||||
@@ -63,12 +63,7 @@
|
||||
AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
|
||||
required_automake_version="1.6.1 or newer"
|
||||
case $AUTOMAKE_STRING in
|
||||
- automake*1.5d* | automake*1.5* | automake*1.5-* )
|
||||
- echo "*** YOU'RE USING $AUTOMAKE_STRING."
|
||||
- echo "*** KDE requires automake $required_automake_version"
|
||||
- exit 1
|
||||
- ;;
|
||||
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
|
||||
+ automake*)
|
||||
echo "*** $AUTOMAKE_STRING found."
|
||||
UNSERMAKE=no
|
||||
;;
|
93
kdelibs-3-libidn2.patch
Normal file
93
kdelibs-3-libidn2.patch
Normal file
@ -0,0 +1,93 @@
|
||||
diff -up kdelibs-3.5.10/configure.in.than kdelibs-3.5.10/configure.in
|
||||
--- kdelibs-3.5.10/configure.in.than 2017-06-20 18:02:22.845910412 +0200
|
||||
+++ kdelibs-3.5.10/configure.in 2017-06-20 18:03:09.058172814 +0200
|
||||
@@ -692,10 +692,10 @@ AC_ARG_WITH(libidn,
|
||||
[], with_libidn=check)
|
||||
LIB_IDN=
|
||||
if test "x$with_libidn" != xno; then
|
||||
- AC_CHECK_HEADERS([idna.h punycode.h stringprep.h])
|
||||
- KDE_CHECK_LIB(idn, idna_to_ascii_4i, [
|
||||
+ AC_CHECK_HEADERS([idn2.h])
|
||||
+ KDE_CHECK_LIB(idn2, idn2_to_ascii_4i, [
|
||||
AC_DEFINE_UNQUOTED(HAVE_LIBIDN, 1, [Defined if you have libidn in your system])
|
||||
- LIB_IDN=-lidn
|
||||
+ LIB_IDN=-lidn2
|
||||
])
|
||||
if test "x$with_libidn" != xcheck && test -z "$LIB_IDN"; then
|
||||
AC_MSG_ERROR([--with-libidn was given, but test for libidn failed])
|
||||
diff -up kdelibs-3.5.10/kdecore/configure.in.in.than kdelibs-3.5.10/kdecore/configure.in.in
|
||||
--- kdelibs-3.5.10/kdecore/configure.in.in.than 2017-06-20 17:53:41.544511539 +0200
|
||||
+++ kdelibs-3.5.10/kdecore/configure.in.in 2017-06-20 18:01:27.557989259 +0200
|
||||
@@ -48,10 +48,10 @@ AC_ARG_WITH(libidn,
|
||||
[], with_libidn=check)
|
||||
LIB_IDN=
|
||||
if test "x$with_libidn" != xno; then
|
||||
- AC_CHECK_HEADERS([idna.h punycode.h stringprep.h])
|
||||
- KDE_CHECK_LIB(idn, idna_to_ascii_4i, [
|
||||
+ AC_CHECK_HEADERS([idn2.h])
|
||||
+ KDE_CHECK_LIB(idn2, idn2_to_ascii_4i, [
|
||||
AC_DEFINE_UNQUOTED(HAVE_LIBIDN, 1, [Defined if you have libidn in your system])
|
||||
- LIB_IDN=-lidn
|
||||
+ LIB_IDN=-lidn2
|
||||
])
|
||||
if test "x$with_libidn" != xcheck && test -z "$LIB_IDN"; then
|
||||
AC_MSG_ERROR([--with-libidn was given, but test for libidn failed])
|
||||
diff -up kdelibs-3.5.10/kdecore/network/kresolver.cpp.than kdelibs-3.5.10/kdecore/network/kresolver.cpp
|
||||
--- kdelibs-3.5.10/kdecore/network/kresolver.cpp.than 2017-06-21 12:55:55.733217103 +0200
|
||||
+++ kdelibs-3.5.10/kdecore/network/kresolver.cpp 2017-06-21 13:27:38.956737181 +0200
|
||||
@@ -49,8 +49,8 @@
|
||||
#include <qguardedptr.h>
|
||||
|
||||
// IDN
|
||||
-#ifdef HAVE_IDNA_H
|
||||
-# include <idna.h>
|
||||
+#ifdef HAVE_IDN2_H
|
||||
+# include <idn2.h>
|
||||
#endif
|
||||
|
||||
// KDE
|
||||
@@ -1083,7 +1083,7 @@ static QStringList splitLabels(const QSt
|
||||
|
||||
static QCString ToASCII(const QString& label)
|
||||
{
|
||||
-#ifdef HAVE_IDNA_H
|
||||
+#ifdef HAVE_IDN2_H
|
||||
// We have idna.h, so we can use the idna_to_ascii
|
||||
// function :)
|
||||
|
||||
@@ -1104,7 +1104,7 @@ static QCString ToASCII(const QString& l
|
||||
ucs4[i] = (unsigned long)label[i].unicode();
|
||||
ucs4[i] = 0; // terminate with NUL, just to be on the safe side
|
||||
|
||||
- if (idna_to_ascii_4i(ucs4, label.length(), buf, 0) == IDNA_SUCCESS)
|
||||
+ if (idn2_to_ascii_4i(ucs4, label.length(), buf, 0|IDN2_NFC_INPUT|IDN2_NONTRANSITIONAL) == IDN2_OK)
|
||||
// success!
|
||||
retval = buf;
|
||||
|
||||
@@ -1117,7 +1117,7 @@ static QCString ToASCII(const QString& l
|
||||
|
||||
static QString ToUnicode(const QString& label)
|
||||
{
|
||||
-#ifdef HAVE_IDNA_H
|
||||
+#ifdef HAVE_IDN2_H
|
||||
// We have idna.h, so we can use the idna_to_unicode
|
||||
// function :)
|
||||
|
||||
@@ -1131,7 +1131,7 @@ static QString ToUnicode(const QString&
|
||||
// try the same length for output
|
||||
ucs4_output = new Q_UINT32[outlen = label.length()];
|
||||
|
||||
- idna_to_unicode_44i(ucs4_input, label.length(),
|
||||
+ idn2_to_unicode_44i(ucs4_input, label.length(),
|
||||
ucs4_output, &outlen,
|
||||
0);
|
||||
|
||||
@@ -1141,7 +1141,7 @@ static QString ToUnicode(const QString&
|
||||
delete [] ucs4_output;
|
||||
ucs4_output = new Q_UINT32[outlen];
|
||||
|
||||
- idna_to_unicode_44i(ucs4_input, label.length(),
|
||||
+ idn2_to_unicode_44i(ucs4_input, label.length(),
|
||||
ucs4_output, &outlen,
|
||||
0);
|
||||
}
|
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;
|
||||
}
|
||||
}
|
166
kdelibs-3.5.10-CVE-2013-2074.patch
Normal file
166
kdelibs-3.5.10-CVE-2013-2074.patch
Normal file
@ -0,0 +1,166 @@
|
||||
diff -ur kdelibs-3.5.10/kioslave/http/http.cc kdelibs-3.5.10-CVE-2013-2074/kioslave/http/http.cc
|
||||
--- kdelibs-3.5.10/kioslave/http/http.cc 2008-02-13 10:41:06.000000000 +0100
|
||||
+++ kdelibs-3.5.10-CVE-2013-2074/kioslave/http/http.cc 2013-05-14 17:54:42.000000000 +0200
|
||||
@@ -288,7 +288,7 @@
|
||||
m_bUseProxy = m_proxyURL.isValid();
|
||||
|
||||
kdDebug(7113) << "(" << m_pid << ") Using proxy: " << m_bUseProxy <<
|
||||
- " URL: " << m_proxyURL.url() <<
|
||||
+ " URL: " << m_proxyURL.prettyURL() <<
|
||||
" Realm: " << m_strProxyRealm << endl;
|
||||
}
|
||||
|
||||
@@ -458,7 +458,7 @@
|
||||
|
||||
bool HTTPProtocol::checkRequestURL( const KURL& u )
|
||||
{
|
||||
- kdDebug (7113) << "(" << m_pid << ") HTTPProtocol::checkRequestURL: " << u.url() << endl;
|
||||
+ kdDebug (7113) << "(" << m_pid << ") HTTPProtocol::checkRequestURL: " << u.prettyURL() << endl;
|
||||
|
||||
m_request.url = u;
|
||||
|
||||
@@ -640,7 +640,7 @@
|
||||
|
||||
void HTTPProtocol::listDir( const KURL& url )
|
||||
{
|
||||
- kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::listDir " << url.url()
|
||||
+ kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::listDir " << url.prettyURL()
|
||||
<< endl;
|
||||
|
||||
if ( !checkRequestURL( url ) )
|
||||
@@ -807,7 +807,7 @@
|
||||
|
||||
void HTTPProtocol::davGeneric( const KURL& url, KIO::HTTP_METHOD method )
|
||||
{
|
||||
- kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::davGeneric " << url.url()
|
||||
+ kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::davGeneric " << url.prettyURL()
|
||||
<< endl;
|
||||
|
||||
if ( !checkRequestURL( url ) )
|
||||
@@ -1206,7 +1206,7 @@
|
||||
|
||||
void HTTPProtocol::mkdir( const KURL& url, int )
|
||||
{
|
||||
- kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::mkdir " << url.url()
|
||||
+ kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::mkdir " << url.prettyURL()
|
||||
<< endl;
|
||||
|
||||
if ( !checkRequestURL( url ) )
|
||||
@@ -1228,7 +1228,7 @@
|
||||
|
||||
void HTTPProtocol::get( const KURL& url )
|
||||
{
|
||||
- kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::get " << url.url()
|
||||
+ kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::get " << url.prettyURL()
|
||||
<< endl;
|
||||
|
||||
if ( !checkRequestURL( url ) )
|
||||
@@ -1543,8 +1543,10 @@
|
||||
callError = true;
|
||||
}
|
||||
|
||||
+ // Huh? This looks like inverted logic to me (it doesn't make sense to me as
|
||||
+ // written), but I'm only fixing the CVE now. -- Kevin Kofler
|
||||
if ( !url.isNull() )
|
||||
- url = m_request.url.url();
|
||||
+ url = m_request.url.prettyURL();
|
||||
|
||||
QString action, errorString;
|
||||
KIO::Error kError;
|
||||
@@ -1840,7 +1842,7 @@
|
||||
if ( !checkRequestURL( url ) )
|
||||
continue;
|
||||
|
||||
- kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::multi_get " << url.url() << endl;
|
||||
+ kdDebug(7113) << "(" << m_pid << ") HTTPProtocol::multi_get " << url.prettyURL() << endl;
|
||||
|
||||
m_request.method = HTTP_GET;
|
||||
m_request.path = url.path();
|
||||
@@ -2212,12 +2214,12 @@
|
||||
|
||||
if (bCacheOnly)
|
||||
{
|
||||
- error( ERR_DOES_NOT_EXIST, m_request.url.url() );
|
||||
+ error( ERR_DOES_NOT_EXIST, m_request.url.prettyURL() );
|
||||
return false;
|
||||
}
|
||||
if (bOffline)
|
||||
{
|
||||
- error( ERR_COULD_NOT_CONNECT, m_request.url.url() );
|
||||
+ error( ERR_COULD_NOT_CONNECT, m_request.url.prettyURL() );
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -2891,7 +2893,7 @@
|
||||
errorPage();
|
||||
else
|
||||
{
|
||||
- error(ERR_INTERNAL_SERVER, m_request.url.url());
|
||||
+ error(ERR_INTERNAL_SERVER, m_request.url.prettyURL());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -2931,7 +2933,7 @@
|
||||
errorPage();
|
||||
else
|
||||
{
|
||||
- error(ERR_DOES_NOT_EXIST, m_request.url.url());
|
||||
+ error(ERR_DOES_NOT_EXIST, m_request.url.prettyURL());
|
||||
return false;
|
||||
}
|
||||
m_request.bCachedWrite = false; // Don't put in cache
|
||||
@@ -3584,7 +3586,7 @@
|
||||
KURL u(m_request.url, locationStr);
|
||||
if(!u.isValid())
|
||||
{
|
||||
- error(ERR_MALFORMED_URL, u.url());
|
||||
+ error(ERR_MALFORMED_URL, u.prettyURL());
|
||||
return false;
|
||||
}
|
||||
if ((u.protocol() != "http") && (u.protocol() != "https") &&
|
||||
@@ -3592,7 +3594,7 @@
|
||||
(u.protocol() != "webdavs"))
|
||||
{
|
||||
redirection(u);
|
||||
- error(ERR_ACCESS_DENIED, u.url());
|
||||
+ error(ERR_ACCESS_DENIED, u.prettyURL());
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -3613,10 +3615,10 @@
|
||||
sendMetaData();
|
||||
}
|
||||
|
||||
- kdDebug(7113) << "(" << m_pid << ") request.url: " << m_request.url.url()
|
||||
+ kdDebug(7113) << "(" << m_pid << ") request.url: " << m_request.url.prettyURL()
|
||||
<< endl << "LocationStr: " << locationStr.data() << endl;
|
||||
|
||||
- kdDebug(7113) << "(" << m_pid << ") Requesting redirection to: " << u.url()
|
||||
+ kdDebug(7113) << "(" << m_pid << ") Requesting redirection to: " << u.prettyURL()
|
||||
<< endl;
|
||||
|
||||
// If we're redirected to a http:// url, remember that we're doing webdav...
|
||||
@@ -3832,7 +3834,7 @@
|
||||
if (!m_request.fcache)
|
||||
{
|
||||
m_request.bCachedWrite = false; // Error creating cache entry.
|
||||
- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
|
||||
+ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.prettyURL()<<"!\n";
|
||||
}
|
||||
m_request.expireDate = expireDate;
|
||||
m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
|
||||
@@ -3840,11 +3842,11 @@
|
||||
}
|
||||
|
||||
if (m_request.bCachedWrite && !m_strMimeType.isEmpty())
|
||||
- kdDebug(7113) << "(" << m_pid << ") Cache, adding \"" << m_request.url.url() << "\"" << endl;
|
||||
+ kdDebug(7113) << "(" << m_pid << ") Cache, adding \"" << m_request.url.prettyURL() << "\"" << endl;
|
||||
else if (m_request.bCachedWrite && m_strMimeType.isEmpty())
|
||||
- kdDebug(7113) << "(" << m_pid << ") Cache, pending \"" << m_request.url.url() << "\"" << endl;
|
||||
+ kdDebug(7113) << "(" << m_pid << ") Cache, pending \"" << m_request.url.prettyURL() << "\"" << endl;
|
||||
else
|
||||
- kdDebug(7113) << "(" << m_pid << ") Cache, not adding \"" << m_request.url.url() << "\"" << endl;
|
||||
+ kdDebug(7113) << "(" << m_pid << ") Cache, not adding \"" << m_request.url.prettyURL() << "\"" << endl;
|
||||
return true;
|
||||
}
|
||||
|
38
kdelibs-3.5.10-CVE-2015-7543.patch
Normal file
38
kdelibs-3.5.10-CVE-2015-7543.patch
Normal file
@ -0,0 +1,38 @@
|
||||
diff -ur kdelibs-3.5.10/kinit/lnusertemp.c kdelibs-3.5.10-CVE-2015-7543/kinit/lnusertemp.c
|
||||
--- kdelibs-3.5.10/kinit/lnusertemp.c 2007-05-14 09:52:34.000000000 +0200
|
||||
+++ kdelibs-3.5.10-CVE-2015-7543/kinit/lnusertemp.c 2015-12-10 10:04:02.934321515 +0100
|
||||
@@ -178,7 +178,11 @@
|
||||
if (result == 0) return 0; /* Success */
|
||||
unlink(kde_tmp_dir);
|
||||
strncat(user_tmp_dir, "XXXXXX", PATH_MAX - strlen(user_tmp_dir));
|
||||
+#if 0
|
||||
mktemp(user_tmp_dir); /* We want a directory, not a file, so using mkstemp makes no sense and is wrong */
|
||||
+#else
|
||||
+ if (mkdtemp(user_tmp_dir)==0) return 1; /*JOWENN: isn't that the better solution ?? */
|
||||
+#endif
|
||||
return create_link(kde_tmp_dir, user_tmp_dir);
|
||||
}
|
||||
if ((result == -1) || (!S_ISLNK(stat_buf.st_mode)))
|
||||
@@ -204,14 +208,22 @@
|
||||
if (result == 0) return 0; /* Success */
|
||||
unlink(kde_tmp_dir);
|
||||
strncat(user_tmp_dir, "XXXXXX", PATH_MAX - strlen(user_tmp_dir));
|
||||
+#if 0
|
||||
mktemp(user_tmp_dir); /* We want a directory, not a file, so using mkstemp makes no sense and is wrong */
|
||||
+#else
|
||||
+ if (mkdtemp(user_tmp_dir)==0) return 1; /*JOWENN: isn't that the better solution ?? */
|
||||
+#endif
|
||||
return create_link(kde_tmp_dir, user_tmp_dir);
|
||||
}
|
||||
result = check_tmp_dir(tmp_buf);
|
||||
if (result == 0) return 0; /* Success */
|
||||
unlink(kde_tmp_dir);
|
||||
strncat(user_tmp_dir, "XXXXXX", PATH_MAX - strlen(user_tmp_dir));
|
||||
+#if 0
|
||||
mktemp(user_tmp_dir); /* We want a directory, not a file, so using mkstemp makes no sense and is wrong */
|
||||
+#else
|
||||
+ if (mkdtemp(user_tmp_dir)==0) return 1; /*JOWENN: isn't that the better solution ?? */
|
||||
+#endif
|
||||
return create_link(kde_tmp_dir, user_tmp_dir);
|
||||
}
|
||||
|
48
kdelibs-3.5.10-CVE-2016-6232.patch
Normal file
48
kdelibs-3.5.10-CVE-2016-6232.patch
Normal file
@ -0,0 +1,48 @@
|
||||
From 261a3b7a126b7a1d28e263085b85bf1905eb4c19 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
|
||||
Date: Sun, 23 Oct 2016 10:48:01 +0200
|
||||
Subject: Fix security issue CVE-2016-6232 Based on
|
||||
https://quickgit.kde.org/?p=karchive.git&a=commitdiff&h=0cb243f6
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
|
||||
|
||||
diff --git a/kio/kio/karchive.cpp b/kio/kio/karchive.cpp
|
||||
index b0e0dc6..69e54d1 100644
|
||||
--- a/kio/kio/karchive.cpp
|
||||
+++ b/kio/kio/karchive.cpp
|
||||
@@ -601,6 +601,7 @@ void KArchiveDirectory::addEntry( KArchiveEntry* entry )
|
||||
void KArchiveDirectory::copyTo(const QString& dest, bool recursiveCopy ) const
|
||||
{
|
||||
QDir root;
|
||||
+ const QString destDir(QDir(dest).absPath()); // get directory path without any "." or ".."
|
||||
|
||||
PosSortedPtrList fileList;
|
||||
QMap<int, QString> fileToDir;
|
||||
@@ -620,10 +621,19 @@ void KArchiveDirectory::copyTo(const QString& dest, bool recursiveCopy ) const
|
||||
QValueStack<QString> dirNameStack;
|
||||
|
||||
dirStack.push( this ); // init stack at current directory
|
||||
- dirNameStack.push( dest ); // ... with given path
|
||||
+ dirNameStack.push( destDir ); // ... with given path
|
||||
do {
|
||||
curDir = dirStack.pop();
|
||||
- curDirName = dirNameStack.pop();
|
||||
+
|
||||
+ // extract only to specified folder if it is located within archive's extraction folder
|
||||
+ // otherwise put file under root position in extraction folder
|
||||
+ QString curDirName = dirNameStack.pop();
|
||||
+ if (!QDir(curDirName).absPath().startsWith(destDir)) {
|
||||
+ kdWarning() << "Attempted export into folder" << curDirName
|
||||
+ << "which is outside of the extraction root folder" << destDir << "."
|
||||
+ << "Changing export of contained files to extraction root folder.";
|
||||
+ curDirName = destDir;
|
||||
+ }
|
||||
root.mkdir(curDirName);
|
||||
|
||||
dirEntries = curDir->entries();
|
||||
--
|
||||
cgit v0.10.2
|
||||
|
24
kdelibs-3.5.10-CVE-2017-6410.patch
Normal file
24
kdelibs-3.5.10-CVE-2017-6410.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -ur kdelibs-3.5.10/kio/misc/kpac/script.cpp kdelibs-3.5.10-CVE-2017-6410/kio/misc/kpac/script.cpp
|
||||
--- kdelibs-3.5.10/kio/misc/kpac/script.cpp 2008-02-13 10:41:06.000000000 +0100
|
||||
+++ kdelibs-3.5.10-CVE-2017-6410/kio/misc/kpac/script.cpp 2017-03-04 18:42:29.638992390 +0100
|
||||
@@ -446,10 +446,18 @@
|
||||
if (!findObj.isValid() || !findObj.implementsCall())
|
||||
throw Error( "No such function FindProxyForURL" );
|
||||
|
||||
+ KURL cleanUrl = url;
|
||||
+ cleanUrl.setPass(QString());
|
||||
+ cleanUrl.setUser(QString());
|
||||
+ if (cleanUrl.protocol().lower() == "https") {
|
||||
+ cleanUrl.setPath(QString());
|
||||
+ cleanUrl.setQuery(QString());
|
||||
+ }
|
||||
+
|
||||
Object thisObj;
|
||||
List args;
|
||||
- args.append(String(url.url()));
|
||||
- args.append(String(url.host()));
|
||||
+ args.append(String(cleanUrl.url()));
|
||||
+ args.append(String(cleanUrl.host()));
|
||||
Value retval = findObj.call( exec, thisObj, args );
|
||||
|
||||
if ( exec->hadException() ) {
|
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;
|
11
kdelibs-3.5.10-cups-util-missing-header.patch
Normal file
11
kdelibs-3.5.10-cups-util-missing-header.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c kdelibs-3.5.10-cups-util-missing-header/kdeprint/cups/cupsdconf2/cups-util.c
|
||||
--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c 2007-10-08 11:52:10.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups-util-missing-header/kdeprint/cups/cupsdconf2/cups-util.c 2011-06-17 18:18:56.000000000 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
#include <cups/http.h>
|
||||
#include <cups/cups.h>
|
||||
#include <stdlib.h>
|
||||
+#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <unistd.h>
|
849
kdelibs-3.5.10-cups16.patch
Normal file
849
kdelibs-3.5.10-cups16.patch
Normal file
@ -0,0 +1,849 @@
|
||||
diff -ur kdelibs-3.5.10/kdeprint/configure.in.in kdelibs-3.5.10-cups16/kdeprint/configure.in.in
|
||||
--- kdelibs-3.5.10/kdeprint/configure.in.in 2005-09-10 10:27:43.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/configure.in.in 2012-12-25 16:29:53.000000000 +0100
|
||||
@@ -84,6 +84,13 @@
|
||||
if test "$ac_have_new_cups" = "yes"; then
|
||||
AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
|
||||
fi
|
||||
+
|
||||
+ dnl check if CUPS is at least 1.6
|
||||
+ ac_have_new_cups="no"
|
||||
+ AC_CHECK_CUPS_VERSION(1.06)
|
||||
+ if test "$ac_have_new_cups" = "yes"; then
|
||||
+ AC_DEFINE(HAVE_CUPS_1_6, 1, CUPS is at least version 1.6)
|
||||
+ fi
|
||||
fi
|
||||
fi
|
||||
LDFLAGS="$ac_LDFLAGS_save"
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp kdelibs-3.5.10-cups16/kdeprint/cups/cupsdconf2/cupsdconf.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2005-10-10 17:06:30.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/cups/cupsdconf2/cupsdconf.cpp 2012-12-25 16:34:57.000000000 +0100
|
||||
@@ -629,26 +629,44 @@
|
||||
cups_lang_t* lang = cupsLangDefault();
|
||||
ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang));
|
||||
ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language);
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ippSetOperation(request_, CUPS_GET_PRINTERS);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
request_->request.op.operation_id = CUPS_GET_PRINTERS;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
request_ = cupsDoRequest(http_, request_, "/printers/");
|
||||
if (request_)
|
||||
{
|
||||
QString name;
|
||||
int type(0);
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ipp_attribute_t *attr = ippFirstAttribute(request_);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
ipp_attribute_t *attr = request_->attrs;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
while (attr)
|
||||
{
|
||||
// check new printer (keep only local non-implicit printers)
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ if (!ippGetName(attr))
|
||||
+#else // HAVE_CUPS_1_6
|
||||
if (!attr->name)
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
{
|
||||
if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty())
|
||||
resources_.append(new CupsResource("/printers/"+name));
|
||||
name = "";
|
||||
type = 0;
|
||||
}
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL);
|
||||
+ else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0);
|
||||
+ attr = ippNextAttribute(request_);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text;
|
||||
else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer;
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
if (!(type & CUPS_PRINTER_REMOTE) && !(type & CUPS_PRINTER_IMPLICIT) && !name.isEmpty())
|
||||
resources_.append(new CupsResource("/printers/"+name));
|
||||
@@ -658,26 +676,44 @@
|
||||
request_ = ippNew();
|
||||
ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, cupsLangEncoding(lang));
|
||||
ippAddString(request_, IPP_TAG_OPERATION, IPP_TAG_LANGUAGE, "attributes-natural-language", NULL, lang->language);
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ippSetOperation(request_, CUPS_GET_CLASSES);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
request_->request.op.operation_id = CUPS_GET_CLASSES;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
request_ = cupsDoRequest(http_, request_, "/classes/");
|
||||
if (request_)
|
||||
{
|
||||
QString name;
|
||||
int type(0);
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ipp_attribute_t *attr = ippFirstAttribute(request_);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
ipp_attribute_t *attr = request_->attrs;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
while (attr)
|
||||
{
|
||||
// check new class (keep only local classes)
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ if (!ippGetName(attr))
|
||||
+#else // HAVE_CUPS_1_6
|
||||
if (!attr->name)
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
{
|
||||
if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty())
|
||||
resources_.append(new CupsResource("/classes/"+name));
|
||||
name = "";
|
||||
type = 0;
|
||||
}
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ else if (strcmp(ippGetName(attr), "printer-name") == 0) name = ippGetString(attr, 0, NULL);
|
||||
+ else if (strcmp(ippGetName(attr), "printer-type") == 0) type = ippGetInteger(attr, 0);
|
||||
+ attr = ippNextAttribute(request_);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
else if (strcmp(attr->name, "printer-name") == 0) name = attr->values[0].string.text;
|
||||
else if (strcmp(attr->name, "printer-type") == 0) type = attr->values[0].integer;
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
if (!(type & CUPS_PRINTER_REMOTE) && !name.isEmpty())
|
||||
resources_.append(new CupsResource("/classes/"+name));
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp kdelibs-3.5.10-cups16/kdeprint/cups/ipprequest.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp 2007-10-08 11:52:10.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/cups/ipprequest.cpp 2012-12-25 16:55:53.000000000 +0100
|
||||
@@ -51,6 +51,58 @@
|
||||
kdDebug(500) << "Null request" << endl;
|
||||
return;
|
||||
}
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ kdDebug(500) << "State = 0x" << QString::number(ippGetState(req), 16) << endl;
|
||||
+ kdDebug(500) << "ID = 0x" << QString::number(ippGetRequestId(req), 16) << endl;
|
||||
+ if (answer)
|
||||
+ {
|
||||
+ kdDebug(500) << "Status = 0x" << QString::number(ippGetStatusCode(req), 16) << endl;
|
||||
+ kdDebug(500) << "Status message = " << ippErrorString(ippGetStatusCode(req)) << endl;
|
||||
+ }
|
||||
+ else
|
||||
+ kdDebug(500) << "Operation = 0x" << QString::number(ippGetOperation(req), 16) << endl;
|
||||
+ int minorVersion;
|
||||
+ int majorVersion = ippGetVersion(req, &minorVersion);
|
||||
+ kdDebug(500) << "Version = " << (int)(majorVersion) << "." << (int)(minorVersion) << endl;
|
||||
+ kdDebug(500) << endl;
|
||||
+
|
||||
+ ipp_attribute_t *attr = ippFirstAttribute(req);
|
||||
+ while (attr)
|
||||
+ {
|
||||
+ QString s = QString::fromLatin1("%1 (0x%2) = ").arg(ippGetName(attr)).arg(ippGetValueTag(attr), 0, 16);
|
||||
+ for (int i=0;i<ippGetCount(attr);i++)
|
||||
+ {
|
||||
+ switch (ippGetValueTag(attr))
|
||||
+ {
|
||||
+ case IPP_TAG_INTEGER:
|
||||
+ case IPP_TAG_ENUM:
|
||||
+ s += ("0x"+QString::number(ippGetInteger(attr, i), 16));
|
||||
+ break;
|
||||
+ case IPP_TAG_BOOLEAN:
|
||||
+ s += (ippGetBoolean(attr, i) ? "true" : "false");
|
||||
+ break;
|
||||
+ case IPP_TAG_STRING:
|
||||
+ case IPP_TAG_TEXT:
|
||||
+ case IPP_TAG_NAME:
|
||||
+ case IPP_TAG_KEYWORD:
|
||||
+ case IPP_TAG_URI:
|
||||
+ case IPP_TAG_MIMETYPE:
|
||||
+ case IPP_TAG_NAMELANG:
|
||||
+ case IPP_TAG_TEXTLANG:
|
||||
+ case IPP_TAG_CHARSET:
|
||||
+ case IPP_TAG_LANGUAGE:
|
||||
+ s += ippGetString(attr, i, NULL);
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+ if (i != (ippGetCount(attr)-1))
|
||||
+ s += ", ";
|
||||
+ }
|
||||
+ kdDebug(500) << s << endl;
|
||||
+ attr = ippNextAttribute(req);
|
||||
+ }
|
||||
+#else // HAVE_CUPS_1_6
|
||||
kdDebug(500) << "State = 0x" << QString::number(req->state, 16) << endl;
|
||||
kdDebug(500) << "ID = 0x" << QString::number(req->request.status.request_id, 16) << endl;
|
||||
if (answer)
|
||||
@@ -99,6 +151,7 @@
|
||||
kdDebug(500) << s << endl;
|
||||
attr = attr->next;
|
||||
}
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
|
||||
QString errorString(int status)
|
||||
@@ -177,7 +230,11 @@
|
||||
ipp_attribute_t *attr = ippAddStrings(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL,NULL);
|
||||
int i(0);
|
||||
for (QStringList::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ippSetString(request_, &attr, i, strdup((*it).local8Bit()));
|
||||
+#else // HAVE_CUPS_1_6
|
||||
attr->values[i].string.text = strdup((*it).local8Bit());
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
}
|
||||
|
||||
@@ -193,7 +250,11 @@
|
||||
ipp_attribute_t *attr = ippAddIntegers(request_,(ipp_tag_t)group,(ipp_tag_t)type,name.latin1(),(int)(values.count()),NULL);
|
||||
int i(0);
|
||||
for (QValueList<int>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ippSetInteger(request_, &attr, i, *it);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
attr->values[i].integer = *it;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
}
|
||||
|
||||
@@ -209,19 +270,32 @@
|
||||
ipp_attribute_t *attr = ippAddBooleans(request_,(ipp_tag_t)group,name.latin1(),(int)(values.count()),NULL);
|
||||
int i(0);
|
||||
for (QValueList<bool>::ConstIterator it=values.begin(); it != values.end(); ++it, i++)
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ippSetBoolean(request_, &attr, i, (char)(*it));
|
||||
+#else // HAVE_CUPS_1_6
|
||||
attr->values[i].boolean = (char)(*it);
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
}
|
||||
|
||||
void IppRequest::setOperation(int op)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ippSetOperation(request_, (ipp_op_t)op);
|
||||
+ ippSetRequestId(request_, 1); // 0 is not RFC-compliant, should be at least 1
|
||||
+#else // HAVE_CUPS_1_6
|
||||
request_->request.op.operation_id = (ipp_op_t)op;
|
||||
request_->request.op.request_id = 1; // 0 is not RFC-compliant, should be at least 1
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
|
||||
int IppRequest::status()
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ return (request_ ? ippGetStatusCode(request_) : (connect_ ? cupsLastError() : -2));
|
||||
+#else // HAVE_CUPS_1_6
|
||||
return (request_ ? request_->request.status.status_code : (connect_ ? cupsLastError() : -2));
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
|
||||
QString IppRequest::statusMessage()
|
||||
@@ -248,7 +322,11 @@
|
||||
ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type);
|
||||
if (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ value = ippGetInteger(attr, 0);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
value = attr->values[0].integer;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
return true;
|
||||
}
|
||||
else return false;
|
||||
@@ -260,7 +338,11 @@
|
||||
ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), (ipp_tag_t)type);
|
||||
if (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL));
|
||||
+#else // HAVE_CUPS_1_6
|
||||
value = QString::fromLocal8Bit(attr->values[0].string.text);
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
return true;
|
||||
}
|
||||
else return false;
|
||||
@@ -273,8 +355,13 @@
|
||||
values.clear();
|
||||
if (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ for (int i=0;i<ippGetCount(attr);i++)
|
||||
+ values.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL)));
|
||||
+#else // HAVE_CUPS_1_6
|
||||
for (int i=0;i<attr->num_values;i++)
|
||||
values.append(QString::fromLocal8Bit(attr->values[i].string.text));
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
return true;
|
||||
}
|
||||
else return false;
|
||||
@@ -286,7 +373,11 @@
|
||||
ipp_attribute_t *attr = ippFindAttribute(request_, name.latin1(), IPP_TAG_BOOLEAN);
|
||||
if (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ value = (bool)ippGetBoolean(attr, 0);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
value = (bool)attr->values[0].boolean;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
return true;
|
||||
}
|
||||
else return false;
|
||||
@@ -338,10 +429,18 @@
|
||||
}
|
||||
|
||||
/* No printers found */
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ if ( request_ && ippGetStatusCode(request_) == 0x406 )
|
||||
+#else // HAVE_CUPS_1_6
|
||||
if ( request_ && request_->request.status.status_code == 0x406 )
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
return true;
|
||||
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ if (!request_ || ippGetState(request_) == IPP_ERROR || (ippGetStatusCode(request_) & 0x0F00))
|
||||
+#else // HAVE_CUPS_1_6
|
||||
if (!request_ || request_->state == IPP_ERROR || (request_->request.status.status_code & 0x0F00))
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
return false;
|
||||
|
||||
|
||||
@@ -356,14 +455,88 @@
|
||||
output << "<tr><th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Attribute") << "</font></th>" << endl;
|
||||
output << "<th bgcolor=\"dark blue\"><font color=\"white\">" << i18n("Values") << "</font></th></tr>" << endl;
|
||||
// go to the first attribute of the specified group
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ ipp_attribute_t *attr = ippFirstAttribute(request_);
|
||||
+ while (attr && ippGetGroupTag(attr) != group)
|
||||
+ attr = ippNextAttribute(request_);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
ipp_attribute_t *attr = request_->attrs;
|
||||
while (attr && attr->group_tag != group)
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
// print each attribute
|
||||
- ipp_uchar_t *d;
|
||||
- QCString dateStr;
|
||||
- QDateTime dt;
|
||||
- bool bg(false);
|
||||
+ const ipp_uchar_t *d;
|
||||
+ QCString dateStr;
|
||||
+ QDateTime dt;
|
||||
+ bool bg(false);
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ while (attr && ippGetGroupTag(attr) == group)
|
||||
+ {
|
||||
+ output << " <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n <td><b>" << ippGetName(attr) << "</b></td>\n <td>" << endl;
|
||||
+ bg = !bg;
|
||||
+ for (int i=0; i<ippGetCount(attr); i++)
|
||||
+ {
|
||||
+ switch (ippGetValueTag(attr))
|
||||
+ {
|
||||
+ case IPP_TAG_INTEGER:
|
||||
+ if (ippGetName(attr) && strstr(ippGetName(attr), "time"))
|
||||
+ {
|
||||
+ dt.setTime_t((unsigned int)(ippGetInteger(attr, i)));
|
||||
+ output << dt.toString();
|
||||
+ }
|
||||
+ else
|
||||
+ output << ippGetInteger(attr, i);
|
||||
+ break;
|
||||
+ case IPP_TAG_ENUM:
|
||||
+ output << "0x" << hex << ippGetInteger(attr, i) << dec;
|
||||
+ break;
|
||||
+ case IPP_TAG_BOOLEAN:
|
||||
+ output << (ippGetBoolean(attr, i) ? i18n("True") : i18n("False"));
|
||||
+ break;
|
||||
+ case IPP_TAG_STRING:
|
||||
+ case IPP_TAG_TEXTLANG:
|
||||
+ case IPP_TAG_NAMELANG:
|
||||
+ case IPP_TAG_TEXT:
|
||||
+ case IPP_TAG_NAME:
|
||||
+ case IPP_TAG_KEYWORD:
|
||||
+ case IPP_TAG_URI:
|
||||
+ case IPP_TAG_CHARSET:
|
||||
+ case IPP_TAG_LANGUAGE:
|
||||
+ case IPP_TAG_MIMETYPE:
|
||||
+ output << ippGetString(attr, i, NULL);
|
||||
+ break;
|
||||
+ case IPP_TAG_RESOLUTION:
|
||||
+ int xres;
|
||||
+ int yres;
|
||||
+ ipp_res_t units;
|
||||
+ xres = ippGetResolution(attr, i, &yres, &units);
|
||||
+ output << "( " << xres
|
||||
+ << ", " << yres << " )";
|
||||
+ break;
|
||||
+ case IPP_TAG_RANGE:
|
||||
+ int lowervalue;
|
||||
+ int uppervalue;
|
||||
+ lowervalue = ippGetRange(attr, i, &uppervalue);
|
||||
+ output << "[ " << (lowervalue > 0 ? lowervalue : 1)
|
||||
+ << ", " << (uppervalue > 0 ? uppervalue : 65535) << " ]";
|
||||
+ break;
|
||||
+ case IPP_TAG_DATE:
|
||||
+ d = ippGetDate(attr, i);
|
||||
+ dateStr.sprintf("%.4d-%.2d-%.2d, %.2d:%.2d:%.2d %c%.2d%.2d",
|
||||
+ d[0]*256+d[1], d[2], d[3],
|
||||
+ d[4], d[5], d[6],
|
||||
+ d[8], d[9], d[10]);
|
||||
+ output << dateStr;
|
||||
+ break;
|
||||
+ default:
|
||||
+ continue;
|
||||
+ }
|
||||
+ if (i < ippGetCount(attr)-1)
|
||||
+ output << "<br>";
|
||||
+ }
|
||||
+ output << "</td>\n </tr>" << endl;
|
||||
+ attr = ippNextAttribute(request_);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
while (attr && attr->group_tag == group)
|
||||
{
|
||||
output << " <tr bgcolor=\"" << (bg ? "#ffffd9" : "#ffffff") << "\">\n <td><b>" << attr->name << "</b></td>\n <td>" << endl;
|
||||
@@ -423,6 +596,7 @@
|
||||
}
|
||||
output << "</td>\n </tr>" << endl;
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
// end table
|
||||
output << "</table>" << endl;
|
||||
@@ -438,6 +612,59 @@
|
||||
ipp_attribute_t *attr = first();
|
||||
while (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ if (group != -1 && ippGetGroupTag(attr) != group)
|
||||
+ {
|
||||
+ attr = ippNextAttribute(request_);
|
||||
+ continue;
|
||||
+ }
|
||||
+ QString value;
|
||||
+ for (int i=0; i<ippGetCount(attr); i++)
|
||||
+ {
|
||||
+ switch (ippGetValueTag(attr))
|
||||
+ {
|
||||
+ case IPP_TAG_INTEGER:
|
||||
+ case IPP_TAG_ENUM:
|
||||
+ value.append(QString::number(ippGetInteger(attr, i))).append(",");
|
||||
+ break;
|
||||
+ case IPP_TAG_BOOLEAN:
|
||||
+ value.append((ippGetBoolean(attr, i) ? "true" : "false")).append(",");
|
||||
+ break;
|
||||
+ case IPP_TAG_RANGE:
|
||||
+ int lowervalue;
|
||||
+ int uppervalue;
|
||||
+ lowervalue = ippGetRange(attr, i, &uppervalue);
|
||||
+ if (lowervalue > 0)
|
||||
+ value.append(QString::number(lowervalue));
|
||||
+ if (lowervalue != uppervalue)
|
||||
+ {
|
||||
+ value.append("-");
|
||||
+ if (uppervalue > 0)
|
||||
+ value.append(QString::number(uppervalue));
|
||||
+ }
|
||||
+ value.append(",");
|
||||
+ break;
|
||||
+ case IPP_TAG_STRING:
|
||||
+ case IPP_TAG_TEXT:
|
||||
+ case IPP_TAG_NAME:
|
||||
+ case IPP_TAG_KEYWORD:
|
||||
+ case IPP_TAG_URI:
|
||||
+ case IPP_TAG_MIMETYPE:
|
||||
+ case IPP_TAG_NAMELANG:
|
||||
+ case IPP_TAG_TEXTLANG:
|
||||
+ case IPP_TAG_CHARSET:
|
||||
+ case IPP_TAG_LANGUAGE:
|
||||
+ value.append(QString::fromLocal8Bit(ippGetString(attr, i, NULL))).append(",");
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ if (!value.isEmpty())
|
||||
+ value.truncate(value.length()-1);
|
||||
+ opts[QString::fromLocal8Bit(ippGetName(attr))] = value;
|
||||
+ attr = ippNextAttribute(request_);
|
||||
+#else // HAVE_CUPS_1_6
|
||||
if (group != -1 && attr->group_tag != group)
|
||||
{
|
||||
attr = attr->next;
|
||||
@@ -486,6 +713,7 @@
|
||||
value.truncate(value.length()-1);
|
||||
opts[QString::fromLocal8Bit(attr->name)] = value;
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
}
|
||||
return opts;
|
||||
@@ -542,3 +770,11 @@
|
||||
}
|
||||
#endif
|
||||
}
|
||||
+
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ipp_attribute_t* IppRequest::first()
|
||||
+{ return (request_ ? ippFirstAttribute(request_) : NULL); }
|
||||
+#else // HAVE_CUPS_1_6
|
||||
+ipp_attribute_t* IppRequest::first()
|
||||
+{ return (request_ ? request_->attrs : NULL); }
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/ipprequest.h kdelibs-3.5.10-cups16/kdeprint/cups/ipprequest.h
|
||||
--- kdelibs-3.5.10/kdeprint/cups/ipprequest.h 2005-10-10 17:06:30.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/cups/ipprequest.h 2012-12-25 16:37:50.000000000 +0100
|
||||
@@ -27,6 +27,8 @@
|
||||
|
||||
#include <cups/ipp.h>
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
class IppRequest
|
||||
{
|
||||
public:
|
||||
@@ -72,7 +74,10 @@
|
||||
bool keyword(const QString& name, QStringList& value);
|
||||
bool mime(const QString& name, QString& value);
|
||||
ipp_attribute_t* first();
|
||||
+#ifndef HAVE_CUPS_1_6
|
||||
ipp_attribute_t* last();
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
+ ipp_t* request();
|
||||
QMap<QString,QString> toMap(int group = -1);
|
||||
void setMap(const QMap<QString,QString>& opts);
|
||||
|
||||
@@ -178,11 +183,10 @@
|
||||
inline bool IppRequest::doRequest(const QString& res)
|
||||
{ return doFileRequest(res); }
|
||||
|
||||
-inline ipp_attribute_t* IppRequest::first()
|
||||
-{ return (request_ ? request_->attrs : NULL); }
|
||||
-
|
||||
+#ifndef HAVE_CUPS_1_6
|
||||
inline ipp_attribute_t* IppRequest::last()
|
||||
{ return (request_ ? request_->last : NULL); }
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
|
||||
inline void IppRequest::setHost(const QString& host)
|
||||
{ host_ = host; }
|
||||
@@ -193,4 +197,7 @@
|
||||
inline void IppRequest::dump(int state)
|
||||
{ dump_ = state; }
|
||||
|
||||
+inline ipp_t* IppRequest::request()
|
||||
+{ return request_; }
|
||||
+
|
||||
#endif
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp kdelibs-3.5.10-cups16/kdeprint/cups/kmcupsjobmanager.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/kmcupsjobmanager.cpp 2007-01-15 12:34:19.000000000 +0100
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/cups/kmcupsjobmanager.cpp 2012-12-25 16:34:57.000000000 +0100
|
||||
@@ -36,6 +36,8 @@
|
||||
#include <kdebug.h>
|
||||
#include <kurl.h>
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
KMCupsJobManager::KMCupsJobManager(QObject *parent, const char *name, const QStringList & /*args*/)
|
||||
: KMJobManager(parent,name)
|
||||
{
|
||||
@@ -166,10 +168,79 @@
|
||||
void KMCupsJobManager::parseListAnswer(IppRequest& req, KMPrinter *pr)
|
||||
{
|
||||
ipp_attribute_t *attr = req.first();
|
||||
+ ipp_attribute_t *nextAttr;
|
||||
KMJob *job = new KMJob();
|
||||
QString uri;
|
||||
while (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ QString name(ippGetName(attr));
|
||||
+ if (name == "job-id") job->setId(ippGetInteger(attr, 0));
|
||||
+ else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
|
||||
+ else if (name == "job-name") job->setName(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
|
||||
+ else if (name == "job-state")
|
||||
+ {
|
||||
+ switch (ippGetInteger(attr, 0))
|
||||
+ {
|
||||
+ case IPP_JOB_PENDING:
|
||||
+ job->setState(KMJob::Queued);
|
||||
+ break;
|
||||
+ case IPP_JOB_HELD:
|
||||
+ job->setState(KMJob::Held);
|
||||
+ break;
|
||||
+ case IPP_JOB_PROCESSING:
|
||||
+ job->setState(KMJob::Printing);
|
||||
+ break;
|
||||
+ case IPP_JOB_STOPPED:
|
||||
+ job->setState(KMJob::Error);
|
||||
+ break;
|
||||
+ case IPP_JOB_CANCELLED:
|
||||
+ job->setState(KMJob::Cancelled);
|
||||
+ break;
|
||||
+ case IPP_JOB_ABORTED:
|
||||
+ job->setState(KMJob::Aborted);
|
||||
+ break;
|
||||
+ case IPP_JOB_COMPLETED:
|
||||
+ job->setState(KMJob::Completed);
|
||||
+ break;
|
||||
+ default:
|
||||
+ job->setState(KMJob::Unknown);
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ else if (name == "job-k-octets") job->setSize(ippGetInteger(attr, 0));
|
||||
+ else if (name == "job-originating-user-name") job->setOwner(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
|
||||
+ else if (name == "job-k-octets-completed") job->setProcessedSize(ippGetInteger(attr, 0));
|
||||
+ else if (name == "job-media-sheets") job->setPages(ippGetInteger(attr, 0));
|
||||
+ else if (name == "job-media-sheets-completed") job->setProcessedPages(ippGetInteger(attr, 0));
|
||||
+ else if (name == "job-printer-uri" && !pr->isRemote())
|
||||
+ {
|
||||
+ QString str(ippGetString(attr, 0, NULL));
|
||||
+ int p = str.findRev('/');
|
||||
+ if (p != -1)
|
||||
+ job->setPrinter(str.mid(p+1));
|
||||
+ }
|
||||
+ else if (name == "job-priority")
|
||||
+ {
|
||||
+ job->setAttribute(0, QString::fromLatin1("%1").arg(ippGetInteger(attr, 0), 3));
|
||||
+ }
|
||||
+ else if (name == "job-billing")
|
||||
+ {
|
||||
+ job->setAttributeCount(2);
|
||||
+ job->setAttribute(1, QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
|
||||
+ }
|
||||
+
|
||||
+ nextAttr = ippNextAttribute(req.request());
|
||||
+ if (name.isEmpty() || (!nextAttr))
|
||||
+ {
|
||||
+ if (job->printer().isEmpty())
|
||||
+ job->setPrinter(pr->printerName());
|
||||
+ job->setRemote(pr->isRemote());
|
||||
+ addJob(job); // don't use job after this call !!!
|
||||
+ job = new KMJob();
|
||||
+ }
|
||||
+ attr = nextAttr;
|
||||
+#else // HAVE_CUPS_1_6
|
||||
QString name(attr->name);
|
||||
if (name == "job-id") job->setId(attr->values[0].integer);
|
||||
else if (name == "job-uri") job->setUri(QString::fromLocal8Bit(attr->values[0].string.text));
|
||||
@@ -236,6 +307,7 @@
|
||||
}
|
||||
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
delete job;
|
||||
}
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp kdelibs-3.5.10-cups16/kdeprint/cups/kmcupsmanager.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/kmcupsmanager.cpp 2007-01-15 12:34:19.000000000 +0100
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/cups/kmcupsmanager.cpp 2012-12-25 16:34:57.000000000 +0100
|
||||
@@ -476,9 +476,59 @@
|
||||
void KMCupsManager::processRequest(IppRequest* req)
|
||||
{
|
||||
ipp_attribute_t *attr = req->first();
|
||||
+ ipp_attribute_t *nextAttr;
|
||||
KMPrinter *printer = new KMPrinter();
|
||||
while (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ QString attrname(ippGetName(attr));
|
||||
+ if (attrname == "printer-name")
|
||||
+ {
|
||||
+ QString value = QString::fromLocal8Bit(ippGetString(attr, 0, NULL));
|
||||
+ printer->setName(value);
|
||||
+ printer->setPrinterName(value);
|
||||
+ }
|
||||
+ else if (attrname == "printer-type")
|
||||
+ {
|
||||
+ int value = ippGetInteger(attr, 0);
|
||||
+ printer->setType(0);
|
||||
+ printer->addType(((value & CUPS_PRINTER_CLASS) || (value & CUPS_PRINTER_IMPLICIT) ? KMPrinter::Class : KMPrinter::Printer));
|
||||
+ if ((value & CUPS_PRINTER_REMOTE)) printer->addType(KMPrinter::Remote);
|
||||
+ if ((value & CUPS_PRINTER_IMPLICIT)) printer->addType(KMPrinter::Implicit);
|
||||
+
|
||||
+ // convert printer-type attribute
|
||||
+ printer->setPrinterCap( ( value & CUPS_PRINTER_OPTIONS ) >> 2 );
|
||||
+ }
|
||||
+ else if (attrname == "printer-state")
|
||||
+ {
|
||||
+ switch (ippGetInteger(attr, 0))
|
||||
+ {
|
||||
+ case IPP_PRINTER_IDLE: printer->setState(KMPrinter::Idle); break;
|
||||
+ case IPP_PRINTER_PROCESSING: printer->setState(KMPrinter::Processing); break;
|
||||
+ case IPP_PRINTER_STOPPED: printer->setState(KMPrinter::Stopped); break;
|
||||
+ }
|
||||
+ }
|
||||
+ else if (attrname == "printer-uri-supported")
|
||||
+ {
|
||||
+ printer->setUri(KURL(ippGetString(attr, 0, NULL)));
|
||||
+ }
|
||||
+ else if (attrname == "printer-location")
|
||||
+ {
|
||||
+ printer->setLocation(QString::fromLocal8Bit(ippGetString(attr, 0, NULL)));
|
||||
+ }
|
||||
+ else if (attrname == "printer-is-accepting-jobs")
|
||||
+ {
|
||||
+ printer->setAcceptJobs(ippGetBoolean(attr, 0));
|
||||
+ }
|
||||
+
|
||||
+ nextAttr = ippNextAttribute(req->request());
|
||||
+ if (attrname.isEmpty() || (!nextAttr))
|
||||
+ {
|
||||
+ addPrinter(printer);
|
||||
+ printer = new KMPrinter();
|
||||
+ }
|
||||
+ attr = nextAttr;
|
||||
+#else // HAVE_CUPS_1_6
|
||||
QString attrname(attr->name);
|
||||
if (attrname == "printer-name")
|
||||
{
|
||||
@@ -524,6 +574,7 @@
|
||||
printer = new KMPrinter();
|
||||
}
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
delete printer;
|
||||
}
|
||||
@@ -817,6 +868,7 @@
|
||||
{
|
||||
QStringList list;
|
||||
IppRequest req;
|
||||
+ ipp_attribute_t *nextAttr;
|
||||
req.setOperation(CUPS_GET_DEVICES);
|
||||
if (req.doRequest("/"))
|
||||
{
|
||||
@@ -824,6 +876,24 @@
|
||||
ipp_attribute_t *attr = req.first();
|
||||
while (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ QString attrname(ippGetName(attr));
|
||||
+ if (attrname == "device-info") desc = ippGetString(attr, 0, NULL);
|
||||
+ else if (attrname == "device-make-and-model") printer = ippGetString(attr, 0, NULL);
|
||||
+ else if (attrname == "device-uri") uri = ippGetString(attr, 0, NULL);
|
||||
+ else if ( attrname == "device-class" ) cl = ippGetString(attr, 0, NULL);
|
||||
+ nextAttr = ippNextAttribute(req.request());
|
||||
+ if (attrname.isEmpty() || (!nextAttr))
|
||||
+ {
|
||||
+ if (!uri.isEmpty())
|
||||
+ {
|
||||
+ if (printer == "Unknown") printer = QString::null;
|
||||
+ list << cl << uri << desc << printer;
|
||||
+ }
|
||||
+ uri = desc = printer = cl = QString::null;
|
||||
+ }
|
||||
+ attr = nextAttr;
|
||||
+#else // HAVE_CUPS_1_6
|
||||
QString attrname(attr->name);
|
||||
if (attrname == "device-info") desc = attr->values[0].string.text;
|
||||
else if (attrname == "device-make-and-model") printer = attr->values[0].string.text;
|
||||
@@ -839,6 +909,7 @@
|
||||
uri = desc = printer = cl = QString::null;
|
||||
}
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
}
|
||||
return list;
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp kdelibs-3.5.10-cups16/kdeprint/cups/kmcupsuimanager.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/kmcupsuimanager.cpp 2006-10-01 19:33:43.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/cups/kmcupsuimanager.cpp 2012-12-25 16:34:57.000000000 +0100
|
||||
@@ -60,6 +60,8 @@
|
||||
#include <kaction.h>
|
||||
#include <kmessagebox.h>
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
KMCupsUiManager::KMCupsUiManager(QObject *parent, const char *name, const QStringList & /*args*/)
|
||||
: KMUiManager(parent,name)
|
||||
{
|
||||
@@ -143,6 +145,24 @@
|
||||
ipp_attribute_t *attr = req.first();
|
||||
while (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0)
|
||||
+ {
|
||||
+ if (strncmp(ippGetString(attr, 0, NULL),"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true);
|
||||
+ else if (strncmp(ippGetString(attr, 0, NULL),"parallel",8) == 0) backend->enableBackend(KMWizard::Local,true);
|
||||
+ else if (strncmp(ippGetString(attr, 0, NULL),"serial",6) == 0) backend->enableBackend(KMWizard::Local,true);
|
||||
+ else if (strncmp(ippGetString(attr, 0, NULL),"smb",3) == 0) backend->enableBackend(KMWizard::SMB,true);
|
||||
+ else if (strncmp(ippGetString(attr, 0, NULL),"lpd",3) == 0) backend->enableBackend(KMWizard::LPD,true);
|
||||
+ else if (strncmp(ippGetString(attr, 0, NULL),"usb",3) == 0) backend->enableBackend(KMWizard::Local,true);
|
||||
+ else if (strncmp(ippGetString(attr, 0, NULL),"http",4) == 0 || strncmp(ippGetString(attr, 0, NULL),"ipp",3) == 0)
|
||||
+ {
|
||||
+ backend->enableBackend(KMWizard::IPP,true);
|
||||
+ backend->enableBackend(KMWizard::Custom+1,true);
|
||||
+ }
|
||||
+ else if (strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true);
|
||||
+ }
|
||||
+ attr = ippNextAttribute(req.request());
|
||||
+#else // HAVE_CUPS_1_6
|
||||
if (attr->name && strcmp(attr->name,"device-uri") == 0)
|
||||
{
|
||||
if (strncmp(attr->values[0].string.text,"socket",6) == 0) backend->enableBackend(KMWizard::TCP,true);
|
||||
@@ -159,6 +179,7 @@
|
||||
else if (strncmp(attr->values[0].string.text,"fax",3) == 0) backend->enableBackend(KMWizard::Custom+2,true);
|
||||
}
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
backend->enableBackend(KMWizard::Class, true);
|
||||
backend->enableBackend(KMWizard::Custom+5, true);
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp kdelibs-3.5.10-cups16/kdeprint/cups/kmwfax.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/kmwfax.cpp 2007-01-15 12:34:19.000000000 +0100
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/cups/kmwfax.cpp 2012-12-25 16:34:57.000000000 +0100
|
||||
@@ -30,6 +30,8 @@
|
||||
#include <kiconloader.h>
|
||||
#include <kurl.h>
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
KMWFax::KMWFax(QWidget *parent, const char *name)
|
||||
: KMWizardPage(parent,name)
|
||||
{
|
||||
@@ -55,11 +57,19 @@
|
||||
ipp_attribute_t *attr = req.first();
|
||||
while (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ if (ippGetName(attr) && strcmp(ippGetName(attr),"device-uri") == 0 && strncmp(ippGetString(attr, 0, NULL),"fax",3) == 0)
|
||||
+ {
|
||||
+ m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(ippGetString(attr, 0, NULL)));
|
||||
+ }
|
||||
+ attr = ippNextAttribute(req.request());
|
||||
+#else // HAVE_CUPS_1_6
|
||||
if (attr->name && strcmp(attr->name,"device-uri") == 0 && strncmp(attr->values[0].string.text,"fax",3) == 0)
|
||||
{
|
||||
m_list->insertItem(SmallIcon("blockdevice"),QString::fromLatin1(attr->values[0].string.text));
|
||||
}
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
}
|
||||
}
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp kdelibs-3.5.10-cups16/kdeprint/cups/kmwippselect.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/kmwippselect.cpp 2007-01-15 12:34:19.000000000 +0100
|
||||
+++ kdelibs-3.5.10-cups16/kdeprint/cups/kmwippselect.cpp 2012-12-25 16:34:57.000000000 +0100
|
||||
@@ -29,6 +29,8 @@
|
||||
#include <kdebug.h>
|
||||
#include <kiconloader.h>
|
||||
|
||||
+#include "config.h"
|
||||
+
|
||||
KMWIppSelect::KMWIppSelect(QWidget *parent, const char *name)
|
||||
: KMWizardPage(parent,name)
|
||||
{
|
||||
@@ -83,9 +85,15 @@
|
||||
ipp_attribute_t *attr = req.first();
|
||||
while (attr)
|
||||
{
|
||||
+#ifdef HAVE_CUPS_1_6
|
||||
+ if (ippGetName(attr) && strcmp(ippGetName(attr),"printer-name") == 0)
|
||||
+ m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(ippGetString(attr, 0, NULL)));
|
||||
+ attr = ippNextAttribute(req.request());
|
||||
+#else // HAVE_CUPS_1_6
|
||||
if (attr->name && strcmp(attr->name,"printer-name") == 0)
|
||||
m_list->insertItem(SmallIcon("kdeprint_printer"),QString::fromLatin1(attr->values[0].string.text));
|
||||
attr = attr->next;
|
||||
+#endif // HAVE_CUPS_1_6
|
||||
}
|
||||
m_list->sort();
|
||||
}
|
159
kdelibs-3.5.10-cups20.patch
Normal file
159
kdelibs-3.5.10-cups20.patch
Normal file
@ -0,0 +1,159 @@
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c kdelibs-3.5.10-cups20/kdeprint/cups/cupsdconf2/cups-util.c
|
||||
--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/cups-util.c 2007-10-08 11:52:10.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups20/kdeprint/cups/cupsdconf2/cups-util.c 2014-11-25 21:41:51.000000000 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
char prompt[1024]; /* Prompt string */
|
||||
int digest_tries; /* Number of tries with Digest */
|
||||
static char filename[HTTP_MAX_URI]; /* Local filename */
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
const char *fqdn = 0;
|
||||
#else
|
||||
char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
|
||||
@@ -118,7 +118,7 @@
|
||||
* See if we should retry the current digest password...
|
||||
*/
|
||||
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
|
||||
#else
|
||||
www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
|
||||
@@ -129,7 +129,7 @@
|
||||
/*
|
||||
* Nope - get a password from the user...
|
||||
*/
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
fqdn = cups_server->hostname;
|
||||
#else
|
||||
httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
|
||||
@@ -154,7 +154,7 @@
|
||||
* Got a password; encode it for the server...
|
||||
*/
|
||||
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
|
||||
#else
|
||||
www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
|
||||
@@ -166,7 +166,7 @@
|
||||
*/
|
||||
|
||||
snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
|
||||
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
|
||||
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
|
||||
httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
|
||||
#else
|
||||
httpEncode64(encode, plain);
|
||||
@@ -235,7 +235,7 @@
|
||||
*/
|
||||
|
||||
while ((bytes =
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
httpRead
|
||||
#else
|
||||
httpRead2
|
||||
@@ -265,7 +265,7 @@
|
||||
http_status_t status; /* HTTP status from server */
|
||||
char prompt[1024]; /* Prompt string */
|
||||
int digest_tries; /* Number of tries with Digest */
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
const char *fqdn = 0;
|
||||
#else
|
||||
char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
|
||||
@@ -340,7 +340,7 @@
|
||||
break;
|
||||
}
|
||||
else
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
httpWrite
|
||||
#else
|
||||
httpWrite2
|
||||
@@ -349,7 +349,7 @@
|
||||
|
||||
if (status == HTTP_CONTINUE)
|
||||
{
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
httpWrite
|
||||
#else
|
||||
httpWrite2
|
||||
@@ -380,7 +380,7 @@
|
||||
* See if we should retry the current digest password...
|
||||
*/
|
||||
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
|
||||
#else
|
||||
www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
|
||||
@@ -393,7 +393,7 @@
|
||||
*/
|
||||
|
||||
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
fqdn = cups_server->hostname;
|
||||
#else
|
||||
httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
|
||||
@@ -417,7 +417,7 @@
|
||||
* Got a password; encode it for the server...
|
||||
*/
|
||||
|
||||
-#if CUPS_VERSION_MAJOR - 0 <= 1 && CUPS_VERSION_MINOR - 0 < 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 2)
|
||||
www_authenticate = cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE];
|
||||
#else
|
||||
www_authenticate = httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE );
|
||||
@@ -429,7 +429,7 @@
|
||||
*/
|
||||
|
||||
snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
|
||||
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
|
||||
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
|
||||
httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
|
||||
#else
|
||||
httpEncode64(encode, plain);
|
||||
@@ -511,7 +511,7 @@
|
||||
* See if we are accessing localhost...
|
||||
the struct has changed in newer versions - PiggZ (adam@piggz.co.uk)
|
||||
*/
|
||||
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
|
||||
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
|
||||
if (!httpAddrLocalhost(http))
|
||||
#else
|
||||
if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp kdelibs-3.5.10-cups20/kdeprint/cups/ipprequest.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/ipprequest.cpp 2007-10-08 11:52:10.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups20/kdeprint/cups/ipprequest.cpp 2014-11-25 21:41:51.000000000 +0100
|
||||
@@ -310,7 +310,7 @@
|
||||
}
|
||||
|
||||
#ifdef HAVE_CUPS_NO_PWD_CACHE
|
||||
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2)
|
||||
strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
|
||||
#else
|
||||
httpSetAuthString( HTTP, NULL, cups_authstring.data() );
|
||||
@@ -324,7 +324,7 @@
|
||||
|
||||
request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
|
||||
#ifdef HAVE_CUPS_NO_PWD_CACHE
|
||||
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2
|
||||
+#if CUPS_VERSION_MAJOR < 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR <= 2)
|
||||
cups_authstring = HTTP->authstring;
|
||||
#else
|
||||
cups_authstring = httpGetAuthString( HTTP );
|
||||
@@ -523,7 +523,7 @@
|
||||
cupsFreeOptions(n, options);
|
||||
|
||||
// find an remove that annoying "document-format" attribute
|
||||
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
|
||||
+#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2)
|
||||
ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
|
||||
ippDeleteAttribute(request_, attr);
|
||||
#else
|
11
kdelibs-3.5.10-cups22.patch
Normal file
11
kdelibs-3.5.10-cups22.patch
Normal file
@ -0,0 +1,11 @@
|
||||
diff -ur kdelibs-3.5.10/kdeprint/cups/cupsaddsmb2.cpp kdelibs-3.5.10-cups22/kdeprint/cups/cupsaddsmb2.cpp
|
||||
--- kdelibs-3.5.10/kdeprint/cups/cupsaddsmb2.cpp 2005-10-10 17:06:30.000000000 +0200
|
||||
+++ kdelibs-3.5.10-cups22/kdeprint/cups/cupsaddsmb2.cpp 2016-09-28 19:23:09.264863318 +0200
|
||||
@@ -39,6 +39,7 @@
|
||||
#include <kstdguiitem.h>
|
||||
|
||||
#include <cups/cups.h>
|
||||
+#include <cups/ppd.h>
|
||||
#include <ctype.h>
|
||||
|
||||
CupsAddSmb::CupsAddSmb(QWidget *parent, const char *name)
|
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
|
@ -1,12 +1,12 @@
|
||||
diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp
|
||||
--- kdelibs-3.5.9/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100
|
||||
+++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp 2008-07-02 08:24:37.000000000 +0200
|
||||
diff -ur kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10-drkonqi-plasma5/kdecore/kcrash.cpp
|
||||
--- kdelibs-3.5.10/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100
|
||||
+++ kdelibs-3.5.10-drkonqi-plasma5/kdecore/kcrash.cpp 2017-01-22 23:25:21.373378496 +0100
|
||||
@@ -158,7 +158,7 @@
|
||||
int i = 0;
|
||||
|
||||
// argument 0 has to be drkonqi
|
||||
- argv[i++] = "drkonqi";
|
||||
+ argv[i++] = "/usr/libexec/kde4/drkonqi";
|
||||
+ argv[i++] = "/usr/libexec/drkonqi";
|
||||
|
||||
#if defined Q_WS_X11
|
||||
// start up on the correct display
|
||||
@ -15,7 +15,7 @@ diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcr
|
||||
if(!geteuid() && setuid(getuid()) < 0)
|
||||
_exit(253);
|
||||
- execvp("drkonqi", const_cast< char** >( argv ));
|
||||
+ execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv ));
|
||||
+ execv("/usr/libexec/drkonqi", const_cast< char** >( argv ));
|
||||
_exit(errno);
|
||||
}
|
||||
else
|
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:
|
21
kdelibs-3.5.10-gcc6.patch
Normal file
21
kdelibs-3.5.10-gcc6.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -up kdelibs-3.5.10/kate/part/katebuffer.cpp.than kdelibs-3.5.10/kate/part/katebuffer.cpp
|
||||
--- kdelibs-3.5.10/kate/part/katebuffer.cpp.than 2016-02-16 22:06:01.830197908 +0100
|
||||
+++ kdelibs-3.5.10/kate/part/katebuffer.cpp 2016-02-16 23:33:15.810136589 +0100
|
||||
@@ -42,6 +42,8 @@
|
||||
#include <qcstring.h>
|
||||
#include <qdatetime.h>
|
||||
|
||||
+#include <cmath>
|
||||
+
|
||||
/**
|
||||
* loader block size, load 256 kb at once per default
|
||||
* if file size is smaller, fall back to file size
|
||||
@@ -917,7 +919,7 @@ void KateBuffer::updatePreviousNotEmptyL
|
||||
} while (textLine->firstChar()==-1);
|
||||
kdDebug(13020)<<"updatePreviousNotEmptyLine: updating line:"<<(blk->startLine()+current_line)<<endl;
|
||||
QMemArray<uint> foldingList=textLine->foldingListArray();
|
||||
- while ( (foldingList.size()>0) && ( abs(foldingList[foldingList.size()-2])==1)) {
|
||||
+ while ( (foldingList.size()>0) && ( std::abs(foldingList[foldingList.size()-2])==1)) {
|
||||
foldingList.resize(foldingList.size()-2,QGArray::SpeedOptim);
|
||||
}
|
||||
addIndentBasedFoldingInformation(foldingList,addindent,deindent);
|
12
kdelibs-3.5.10-gcc7.patch
Normal file
12
kdelibs-3.5.10-gcc7.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up kdelibs-3.5.10/kate/part/katebuffer.cpp~ kdelibs-3.5.10/kate/part/katebuffer.cpp
|
||||
--- kdelibs-3.5.10/kate/part/katebuffer.cpp~ 2017-02-21 09:44:34.000000000 +0100
|
||||
+++ kdelibs-3.5.10/kate/part/katebuffer.cpp 2017-02-21 09:48:20.132333343 +0100
|
||||
@@ -919,7 +919,7 @@ void KateBuffer::updatePreviousNotEmptyL
|
||||
} while (textLine->firstChar()==-1);
|
||||
kdDebug(13020)<<"updatePreviousNotEmptyLine: updating line:"<<(blk->startLine()+current_line)<<endl;
|
||||
QMemArray<uint> foldingList=textLine->foldingListArray();
|
||||
- while ( (foldingList.size()>0) && ( std::abs(foldingList[foldingList.size()-2])==1)) {
|
||||
+ while ( (foldingList.size()>0) && ( std::abs((long)foldingList[foldingList.size()-2])==1)) {
|
||||
foldingList.resize(foldingList.size()-2,QGArray::SpeedOptim);
|
||||
}
|
||||
addIndentBasedFoldingInformation(foldingList,addindent,deindent);
|
31
kdelibs-3.5.10-inotify.patch
Normal file
31
kdelibs-3.5.10-inotify.patch
Normal file
@ -0,0 +1,31 @@
|
||||
diff -up kdelibs-3.5.10/kio/kio/kdirwatch.cpp.flock-redefinition kdelibs-3.5.10/kio/kio/kdirwatch.cpp
|
||||
--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp.flock-redefinition 2006-07-22 08:16:37.000000000 +0000
|
||||
+++ kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2011-05-11 14:48:07.000000000 +0000
|
||||
@@ -67,26 +67,7 @@
|
||||
#ifdef HAVE_INOTIFY
|
||||
#include <unistd.h>
|
||||
#include <fcntl.h>
|
||||
-#include <sys/syscall.h>
|
||||
-#include <linux/types.h>
|
||||
-// Linux kernel headers are documented to not compile
|
||||
-#define _S390_BITOPS_H
|
||||
-#include <linux/inotify.h>
|
||||
-
|
||||
-static inline int inotify_init (void)
|
||||
-{
|
||||
- return syscall (__NR_inotify_init);
|
||||
-}
|
||||
-
|
||||
-static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
|
||||
-{
|
||||
- return syscall (__NR_inotify_add_watch, fd, name, mask);
|
||||
-}
|
||||
-
|
||||
-static inline int inotify_rm_watch (int fd, __u32 wd)
|
||||
-{
|
||||
- return syscall (__NR_inotify_rm_watch, fd, wd);
|
||||
-}
|
||||
+#include <sys/inotify.h>
|
||||
|
||||
#ifndef IN_ONLYDIR
|
||||
#define IN_ONLYDIR 0x01000000
|
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
|
21
kdelibs-3.5.10-kde-config_kde-version.patch
Normal file
21
kdelibs-3.5.10-kde-config_kde-version.patch
Normal file
@ -0,0 +1,21 @@
|
||||
diff -up kdelibs-3.5.10/kdecore/kde-config.cpp.in.kde-config_kde-version kdelibs-3.5.10/kdecore/kde-config.cpp.in
|
||||
--- kdelibs-3.5.10/kdecore/kde-config.cpp.in.kde-config_kde-version 2005-09-10 03:27:12.000000000 -0500
|
||||
+++ kdelibs-3.5.10/kdecore/kde-config.cpp.in 2010-01-29 10:30:16.846715263 -0600
|
||||
@@ -20,7 +20,7 @@ static KCmdLineOptions options[] =
|
||||
{ "exec-prefix", I18N_NOOP("Compiled in exec_prefix for KDE libraries"), 0 },
|
||||
{ "libsuffix", I18N_NOOP("Compiled in library path suffix"), 0 },
|
||||
{ "localprefix", I18N_NOOP("Prefix in $HOME used to write files"), 0},
|
||||
- { "version", I18N_NOOP("Compiled in version string for KDE libraries"), 0 },
|
||||
+ { "kde-version", I18N_NOOP("Compiled in version string for KDE libraries"), 0 },
|
||||
{ "types", I18N_NOOP("Available KDE resource types"), 0 },
|
||||
{ "path type", I18N_NOOP("Search path for resource type"), 0 },
|
||||
{ "userpath type", I18N_NOOP("User path: desktop|autostart|trash|document"), 0 },
|
||||
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
|
||||
return 0;
|
||||
}
|
||||
|
||||
- if (args->isSet("version"))
|
||||
+ if (args->isSet("kde-version"))
|
||||
{
|
||||
printf("%s\n", KDE_VERSION_STRING);
|
||||
return 0;
|
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);
|
3336
kdelibs-3.5.10-openssl-1.1.patch
Normal file
3336
kdelibs-3.5.10-openssl-1.1.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,10 +1,13 @@
|
||||
diff -up kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.8/kio/kssl/kopenssl.cc
|
||||
--- kdelibs-3.5.8/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
|
||||
@@ -329,6 +329,17 @@ KConfig *cfg;
|
||||
diff -up kdelibs-3.5.10/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.10/kio/kssl/kopenssl.cc
|
||||
--- kdelibs-3.5.10/kio/kssl/kopenssl.cc.openssl 2006-07-22 03:16:39.000000000 -0500
|
||||
+++ kdelibs-3.5.10/kio/kssl/kopenssl.cc 2009-04-19 16:34:14.000000000 -0500
|
||||
@@ -329,6 +329,20 @@ KConfig *cfg;
|
||||
#ifdef SHLIB_VERSION_NUMBER
|
||||
<< "libssl.so." SHLIB_VERSION_NUMBER
|
||||
#endif
|
||||
+ << "libssl.so.10"
|
||||
+ << "libssl.so.0.9.8k"
|
||||
+ << "libssl.so.8"
|
||||
+ << "libssl.so.0.9.8g"
|
||||
+ << "libssl.so.7"
|
||||
+ << "libssl.so.0.9.8b"
|
||||
@ -19,10 +22,13 @@ diff -up kdelibs-3.5.8/kio/kssl/kopenssl.cc.openssl kdelibs-3.5.8/kio/kssl/kopen
|
||||
<< "libssl.so"
|
||||
<< "libssl.so.0"
|
||||
#endif
|
||||
@@ -346,6 +357,17 @@ KConfig *cfg;
|
||||
@@ -346,6 +360,20 @@ KConfig *cfg;
|
||||
#ifdef SHLIB_VERSION_NUMBER
|
||||
<< "libcrypto.so." SHLIB_VERSION_NUMBER
|
||||
#endif
|
||||
+ << "libcrypto.so.10"
|
||||
+ << "libcrypto.so.0.9.8k"
|
||||
+ << "libcrypto.so.8"
|
||||
+ << "libcrypto.so.0.9.8g"
|
||||
+ << "libcrypto.so.7"
|
||||
+ << "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();
|
||||
|
24
kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
Normal file
24
kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
Normal file
@ -0,0 +1,24 @@
|
||||
diff -up kdelibs-3.5.10/kate/part/katehighlight.cpp.gcc_ftbfs kdelibs-3.5.10/kate/part/katehighlight.cpp
|
||||
--- kdelibs-3.5.10/kate/part/katehighlight.cpp.gcc_ftbfs 2007-05-14 02:52:27.000000000 -0500
|
||||
+++ kdelibs-3.5.10/kate/part/katehighlight.cpp 2010-11-18 11:12:45.453403959 -0600
|
||||
@@ -3225,7 +3225,7 @@ void KateHlManager::getDefaults(uint sch
|
||||
list.append(charAttribute);
|
||||
|
||||
KateAttribute* string = new KateAttribute();
|
||||
- string->setTextColor(QColor::QColor("#D00"));
|
||||
+ string->setTextColor(QColor("#D00"));
|
||||
string->setSelectedTextColor(Qt::red);
|
||||
list.append(string);
|
||||
|
||||
@@ -3242,9 +3242,9 @@ void KateHlManager::getDefaults(uint sch
|
||||
|
||||
KateAttribute* alert = new KateAttribute();
|
||||
alert->setTextColor(Qt::black);
|
||||
- alert->setSelectedTextColor( QColor::QColor("#FCC") );
|
||||
+ alert->setSelectedTextColor( QColor("#FCC") );
|
||||
alert->setBold(true);
|
||||
- alert->setBGColor( QColor::QColor("#FCC") );
|
||||
+ alert->setBGColor( QColor("#FCC") );
|
||||
list.append(alert);
|
||||
|
||||
KateAttribute* functionAttribute = new KateAttribute();
|
12
kdelibs-3.5.10-svgicon-endlessloop.patch
Normal file
12
kdelibs-3.5.10-svgicon-endlessloop.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -up kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp.than kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp
|
||||
--- kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp.than 2016-09-28 16:58:47.881217306 +0200
|
||||
+++ kdelibs-3.5.10/kdecore/svgicons/ksvgiconpainter.cpp 2016-09-28 16:59:20.518989958 +0200
|
||||
@@ -2208,7 +2208,7 @@ void KSVGIconPainter::drawPath(const QSt
|
||||
break;
|
||||
}
|
||||
|
||||
- if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9'))
|
||||
+ if(*ptr == '+' || *ptr == '-' || (*ptr >= '0' && *ptr <= '9') || *ptr == '.')
|
||||
{
|
||||
// there are still coords in this command
|
||||
if(command == 'M')
|
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
|
@ -1,15 +0,0 @@
|
||||
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
|
||||
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
|
||||
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp 2008-08-23 00:59:17.000000000 +0200
|
||||
@@ -71,7 +71,11 @@
|
||||
#include <linux/types.h>
|
||||
// Linux kernel headers are documented to not compile
|
||||
#define _S390_BITOPS_H
|
||||
+#define flock linux_flock
|
||||
+#define flock64 linux_flock64
|
||||
#include <linux/inotify.h>
|
||||
+#undef flock
|
||||
+#undef flock64
|
||||
|
||||
static inline int inotify_init (void)
|
||||
{
|
111
kdelibs-3.5.x-CVE-2011-3365.patch
Normal file
111
kdelibs-3.5.x-CVE-2011-3365.patch
Normal file
@ -0,0 +1,111 @@
|
||||
--- kdelibs-3.5.10/kio/kssl/ksslinfodlg.cc 2007-05-14 09:52:36.000000000 +0200
|
||||
+++ kdelibs-3.5.10/kio/kssl/ksslinfodlg.cc 2011-10-07 20:38:30.000000000 +0200
|
||||
@@ -253,6 +253,14 @@
|
||||
layout->addWidget(new QLabel(i18n("%1 bits used of a %2 bit cipher").arg(usedbits).arg(bits), this), 10, 1);
|
||||
d->m_layout->addMultiCell(layout, 2, 2, 0, 2);
|
||||
|
||||
+ ipl->setTextFormat(Qt::PlainText);
|
||||
+ urlLabel->setTextFormat(Qt::PlainText);
|
||||
+ d->_serialNum->setTextFormat(Qt::PlainText);
|
||||
+ d->_csl->setTextFormat(Qt::PlainText);
|
||||
+ d->_validFrom->setTextFormat(Qt::PlainText);
|
||||
+ d->_validUntil->setTextFormat(Qt::PlainText);
|
||||
+ d->_digest->setTextFormat(Qt::PlainText);
|
||||
+
|
||||
displayCert(cert);
|
||||
}
|
||||
|
||||
@@ -400,32 +408,32 @@
|
||||
if (!(tmp = cert.getValue("O")).isEmpty()) {
|
||||
label = new QLabel(i18n("Organization:"), _frame);
|
||||
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
- new QLabel(tmp, _frame);
|
||||
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
||||
}
|
||||
if (!(tmp = cert.getValue("OU")).isEmpty()) {
|
||||
label = new QLabel(i18n("Organizational unit:"), _frame);
|
||||
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
- new QLabel(tmp, _frame);
|
||||
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
||||
}
|
||||
if (!(tmp = cert.getValue("L")).isEmpty()) {
|
||||
label = new QLabel(i18n("Locality:"), _frame);
|
||||
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
- new QLabel(tmp, _frame);
|
||||
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
||||
}
|
||||
if (!(tmp = cert.getValue("ST")).isEmpty()) {
|
||||
label = new QLabel(i18n("Federal State","State:"), _frame);
|
||||
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
- new QLabel(tmp, _frame);
|
||||
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
||||
}
|
||||
if (!(tmp = cert.getValue("C")).isEmpty()) {
|
||||
label = new QLabel(i18n("Country:"), _frame);
|
||||
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
- new QLabel(tmp, _frame);
|
||||
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
||||
}
|
||||
if (!(tmp = cert.getValue("CN")).isEmpty()) {
|
||||
label = new QLabel(i18n("Common name:"), _frame);
|
||||
label->setAlignment(Qt::AlignLeft | Qt::AlignTop);
|
||||
- new QLabel(tmp, _frame);
|
||||
+ (new QLabel(tmp, _frame))->setTextFormat(Qt::PlainText);
|
||||
}
|
||||
if (!(tmp = cert.getValue("Email")).isEmpty()) {
|
||||
label = new QLabel(i18n("Email:"), _frame);
|
||||
@@ -435,6 +443,7 @@
|
||||
connect(mail, SIGNAL(leftClickedURL(const QString &)), mailCatcher, SLOT(mailClicked(const QString &)));
|
||||
} else {
|
||||
label = new QLabel(tmp, _frame);
|
||||
+ label->setTextFormat(Qt::PlainText);
|
||||
}
|
||||
}
|
||||
if (label && viewport()) {
|
||||
--- kdelibs-3.5.10/kioslave/http/http.cc 2008-02-13 10:41:06.000000000 +0100
|
||||
+++ kdelibs-3.5.10-kio_http-qlabel/kioslave/http/http.cc 2011-10-07 21:09:39.000000000 +0200
|
||||
@@ -183,6 +183,26 @@
|
||||
return sanitizedHeaders.stripWhiteSpace();
|
||||
}
|
||||
|
||||
+static QString htmlEscape(const QString &plain)
|
||||
+{
|
||||
+ QString rich;
|
||||
+ rich.reserve(uint(plain.length() * 1.1));
|
||||
+ for (uint i = 0; i < plain.length(); ++i) {
|
||||
+ if (plain.at(i) == '<')
|
||||
+ rich += "<";
|
||||
+ else if (plain.at(i) == '>')
|
||||
+ rich += ">";
|
||||
+ else if (plain.at(i) == '&')
|
||||
+ rich += "&";
|
||||
+ else if (plain.at(i) == '"')
|
||||
+ rich += """;
|
||||
+ else
|
||||
+ rich += plain.at(i);
|
||||
+ }
|
||||
+ rich.squeeze();
|
||||
+ return rich;
|
||||
+}
|
||||
+
|
||||
|
||||
#define NO_SIZE ((KIO::filesize_t) -1)
|
||||
|
||||
@@ -5173,7 +5193,7 @@
|
||||
info.verifyPath = false;
|
||||
info.digestInfo = m_strAuthorization;
|
||||
info.commentLabel = i18n( "Site:" );
|
||||
- info.comment = i18n("<b>%1</b> at <b>%2</b>").arg( m_strRealm ).arg( m_request.hostname );
|
||||
+ info.comment = i18n("<b>%1</b> at <b>%2</b>").arg( htmlEscape(m_strRealm) ).arg( m_request.hostname );
|
||||
}
|
||||
}
|
||||
else if ( m_responseCode == 407 )
|
||||
@@ -5190,7 +5210,7 @@
|
||||
info.verifyPath = false;
|
||||
info.digestInfo = m_strProxyAuthorization;
|
||||
info.commentLabel = i18n( "Proxy:" );
|
||||
- info.comment = i18n("<b>%1</b> at <b>%2</b>").arg( m_strProxyRealm ).arg( m_proxyURL.host() );
|
||||
+ info.comment = i18n("<b>%1</b> at <b>%2</b>").arg( htmlEscape(m_strProxyRealm) ).arg( m_proxyURL.host() );
|
||||
}
|
||||
}
|
||||
}
|
661
kdelibs3.spec
661
kdelibs3.spec
@ -2,57 +2,27 @@
|
||||
|
||||
%define _default_patch_fuzz 2
|
||||
|
||||
%define distname "Fedora"
|
||||
|
||||
%define kde_settings 1
|
||||
|
||||
%define arts 1
|
||||
%define arts_ev 8:1.5.10
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
%define qt3 qt3
|
||||
%else
|
||||
%define qt3_epoch 1:
|
||||
%define qt3 qt
|
||||
%endif
|
||||
%define qt3_version 3.3.8b
|
||||
%define qt3_ev %{?qt3_epoch}%{qt3_version}
|
||||
# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
|
||||
#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 qt3_docdir %{_docdir}/qt-devel-%{qt3_version}
|
||||
|
||||
%define kde_major_version 3
|
||||
|
||||
%define make_cvs 1
|
||||
%define apidocs 0
|
||||
|
||||
%define apidocs 1
|
||||
# trim changelog included in binary rpms
|
||||
%global _changelog_trimtime %(date +%s -d "1 year ago")
|
||||
|
||||
# We always include this here now because kdeartwork 4 has moved on to
|
||||
# icon-naming-spec names (partially, so the icon theme isn't usable with KDE 4
|
||||
# yet either). Maybe the conditional should be dropped entirely? -- Kevin
|
||||
%define include_crystalsvg 1
|
||||
|
||||
Summary: K Desktop Environment 3 - Libraries
|
||||
Version: 3.5.10
|
||||
Release: 9%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Summary: KDE 3 Libraries
|
||||
Name: kdelibs3
|
||||
Obsoletes: kdelibs < 6:%{version}-%{release}
|
||||
Provides: kdelibs = 6:%{version}-%{release}
|
||||
%else
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
Obsoletes: kdelibs3 < %{version}-%{release}
|
||||
Provides: kdelibs3 = %{version}-%{release}
|
||||
%endif
|
||||
Version: 3.5.10
|
||||
Release: 94%{?dist}
|
||||
|
||||
License: LGPLv2
|
||||
Url: http://www.kde.org/
|
||||
Group: System Environment/Libraries
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
|
||||
Source1: kde.sh
|
||||
@ -62,7 +32,7 @@ Source3: devices.protocol
|
||||
Patch1: kdelibs-3.5.1-xdg-menu.patch
|
||||
Patch2: kdelibs-3.0.0-ndebug.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
|
||||
Patch32: kdelibs-3.2.3-cups.patch
|
||||
Patch33: kdelibs-3.3.2-ppc.patch
|
||||
@ -82,12 +52,26 @@ Patch50: kdelibs-3.5.8-kspell2-no-ispell.patch
|
||||
Patch51: kdelibs-3.5.9-cupsserverbin.patch
|
||||
# initial support for (Only|Not)ShowIn=KDE3
|
||||
Patch52: kdelibs-3.5.9-KDE3.patch
|
||||
# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
|
||||
Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
|
||||
# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
|
||||
Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
|
||||
# use newer/plasma drkonqi in KCrash (#453243)
|
||||
Patch53: kdelibs-3.5.10-drkonqi-plasma5.patch
|
||||
# use inotify_* functions which are defined in glibc-header
|
||||
Patch54: kdelibs-3.5.10-inotify.patch
|
||||
# update the KatePart latex.xml syntax definition to the version from Kile 2.0.3
|
||||
Patch55: kdelibs-3.5.10-latex-syntax-kile-2.0.3.patch
|
||||
# fix ftbfs (#631195)
|
||||
Patch56: kdelibs-3.5.10-qcolor_gcc_ftbfs.patch
|
||||
# fix FTBFS (cups-util.c must include stdio.h, #714133)
|
||||
Patch57: kdelibs-3.5.10-cups-util-missing-header.patch
|
||||
# fix FTBFS with CUPS 2.0 due to bad CUPS_VERSION_MAJOR checks
|
||||
Patch58: kdelibs-3.5.10-cups20.patch
|
||||
Patch59: kdelibs-3.5.10-gcc6.patch
|
||||
# fix endless loop in svgicon
|
||||
Patch60: kdelibs-3.5.10-svgicon-endlessloop.patch
|
||||
# fix FTBFS with gcc7
|
||||
Patch61: kdelibs-3.5.10-gcc7.patch
|
||||
|
||||
# libidn2 support for > f26
|
||||
Patch62: kdelibs-3-libidn2.patch
|
||||
|
||||
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
||||
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
||||
@ -96,42 +80,98 @@ Patch101: kde-3.5-libtool-shlibext.patch
|
||||
# kget ignores simultaneous download limit (kde #101956)
|
||||
Patch103: kdelibs-3.5.0-101956.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
|
||||
# kde4.4 backport
|
||||
Patch111: kdelibs-3.5.10-kde-config_kde-version.patch
|
||||
|
||||
## upstream patches
|
||||
## Trinity backports
|
||||
# build fix for CUPS 1.6 by Timothy Pearson, backported by Kevin Kofler
|
||||
# http://git.trinitydesktop.org/cgit/tdelibs/commit?id=9bc0d2cd9d38750658770e69bf0445dc5162beb7
|
||||
# http://git.trinitydesktop.org/cgit/tdelibs/commit?id=91bf63b43bf4cc9ff640bd3c11549644cef05e6e
|
||||
Patch150: kdelibs-3.5.10-cups16.patch
|
||||
# build fix for CUPS 2.2 by Slávek Banko, backported by Kevin Kofler
|
||||
# http://git.trinitydesktop.org/cgit/tdelibs/commit/?id=52a1b55368ec53b14347996851aca7eb29374397
|
||||
Patch151: kdelibs-3.5.10-cups22.patch
|
||||
# OpenSSL 1.1 support by Slávek Banko (with prerequisite patch by Timothy
|
||||
# Pearson), backported by Kevin Kofler
|
||||
# http://git.trinitydesktop.org/cgit/tdelibs/commit/?id=e757d3d6ae93cf967d54c566e9c003b0f9cc3a9c
|
||||
# http://git.trinitydesktop.org/cgit/tdelibs/commit/?id=e1861cb6811f7bac405ece204407ca46c000a453
|
||||
Patch152: kdelibs-3.5.10-openssl-1.1.patch
|
||||
|
||||
#{?arts:Requires: arts >= %{arts_ev}}
|
||||
#Requires: %{qt3} >= %{qt3_ev}
|
||||
## 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
|
||||
# CVE-2011-3365, input validation failure in KSSL
|
||||
Patch208: kdelibs-3.5.x-CVE-2011-3365.patch
|
||||
# CVE-2013-2074, prints passwords contained in HTTP URLs in error messages
|
||||
Patch209: kdelibs-3.5.10-CVE-2013-2074.patch
|
||||
# CVE-2015-7543 arts,kdelibs3: Use of mktemp(3) allows attacker to hijack the IPC
|
||||
# backport upstream fix (the lnusertemp.c change) from kdelibs 4:
|
||||
# http://commits.kde.org/kdelibs/cc5515ed7ce8884c9b18169158ba29ab2f7a3db7
|
||||
# upstream fix by Joseph Wenninger, rediffed for kdelibs 3.5.10 by Kevin Kofler
|
||||
Patch210: kdelibs-3.5.10-CVE-2015-7543.patch
|
||||
# CVE-2016-6232 - directory traversal vulnerability in KArchive
|
||||
# patch from Trinity (Slávek Banko), based on KF5 fix (Andreas Cord-Landwehr)
|
||||
Patch211: kdelibs-3.5.10-CVE-2016-6232.patch
|
||||
# CVE-2017-6410 - info leak when accessing https when using a malicious PAC file
|
||||
# backport upstream fix (by Albert Astals Cid) from kdelibs 4:
|
||||
# http://commits.kde.org/kdelibs/1804c2fde7bf4e432c6cf5bb8cce5701c7010559
|
||||
Patch212: kdelibs-3.5.10-CVE-2017-6410.patch
|
||||
|
||||
## fixes to common KDE 3 autotools machinery
|
||||
# tweak autoconfigury so that it builds with autoconf 2.64 or 2.65
|
||||
Patch300: kde3-acinclude.patch
|
||||
# remove flawed and obsolete automake version check in admin/cvs.sh
|
||||
Patch301: kde3-automake-version.patch
|
||||
# fix build failure with automake 1.13: add the --add-missing --copy flags
|
||||
# also add --force-missing to get aarch64 support (#925029/#925627)
|
||||
Patch302: kde3-automake-add-missing.patch
|
||||
|
||||
Requires: ca-certificates
|
||||
Requires: hicolor-icon-theme
|
||||
%if %{kde_settings}
|
||||
Requires: kde-settings >= 3.5
|
||||
%endif
|
||||
Requires: kde-filesystem
|
||||
%if "%{name}" != "kdelibs"
|
||||
Requires: kdelibs-common
|
||||
%endif
|
||||
Requires: redhat-menus
|
||||
Requires: shadow-utils
|
||||
#Requires: sudo
|
||||
BuildRequires: sudo
|
||||
Requires(hint): sudo
|
||||
|
||||
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
|
||||
%if 0%{?fedora}
|
||||
%define libkdnssd libkdnssd
|
||||
# omit for now, may contribute to http://bugzilla.redhat.com/441222
|
||||
#Requires: %{libkdnssd}
|
||||
%define BuildRequires: xorg-x11-proto-devel libX11-devel
|
||||
%endif
|
||||
BuildRequires: xorg-x11-proto-devel libX11-devel
|
||||
%define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
|
||||
Requires: iceauth
|
||||
%endif
|
||||
|
||||
Requires(pre): coreutils
|
||||
Requires(post): /sbin/ldconfig
|
||||
Requires(postun): /sbin/ldconfig
|
||||
Requires: hunspell
|
||||
|
||||
BuildRequires: gettext
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: cups-devel cups
|
||||
BuildRequires: %{qt3}-devel %{qt3}-devel-docs
|
||||
%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
|
||||
BuildRequires: arts-devel >= %{arts_ev}
|
||||
BuildRequires: flex >= 2.5.4a-13
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libxslt-devel
|
||||
@ -140,59 +180,52 @@ BuildRequires: openjade
|
||||
BuildRequires: jadetex
|
||||
BuildRequires: docbook-dtd31-sgml
|
||||
BuildRequires: docbook-style-dsssl
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: perl-SGMLSpm
|
||||
BuildRequires: docbook-utils
|
||||
BuildRequires: zlib-devel
|
||||
%if 0%{?fedora} > 26 || 0%{?rhel} > 7
|
||||
BuildRequires: libidn2-devel
|
||||
%else
|
||||
BuildRequires: libidn-devel
|
||||
%endif
|
||||
BuildRequires: audiofile-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: gawk
|
||||
BuildRequires: byacc
|
||||
BuildRequires: libart_lgpl-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: libtiff-devel
|
||||
BuildRequires: libacl-devel libattr-devel
|
||||
%if 0%{?fedora} >= 9
|
||||
BuildRequires: enchant-devel
|
||||
Requires: hunspell
|
||||
%else
|
||||
BuildRequires: aspell-devel
|
||||
%endif
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: openldap-devel
|
||||
BuildRequires: db4-devel
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: glibc-kernheaders
|
||||
%if 0%{?fedora} > 5 || 0%{?rhel} > 4
|
||||
%define _with_libutempter 1
|
||||
BuildRequires: libutempter-devel
|
||||
%if 0%{?fedora} > 25 || 0%{?rhel} > 7
|
||||
BuildRequires: pkgconf-pkg-config
|
||||
%else
|
||||
BuildRequires: utempter
|
||||
BuildRequires: pkgconfig
|
||||
%endif
|
||||
BuildRequires: glibc-kernheaders
|
||||
BuildRequires: libutempter-devel
|
||||
BuildRequires: findutils
|
||||
BuildRequires: jasper-devel
|
||||
BuildRequires: OpenEXR-devel
|
||||
%if %{make_cvs}
|
||||
BuildRequires: automake libtool
|
||||
%endif
|
||||
BuildRequires: chrpath
|
||||
|
||||
%if "%{name}" != "kdelibs" && "%{?apidocs}" != "1"
|
||||
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||
%endif
|
||||
|
||||
%if 0%{?include_crystalsvg}
|
||||
Provides: crystalsvg-icon-theme = 1:%{version}-%{release}
|
||||
Obsoletes: crystalsvg-icon-theme < 1:%{version}-%{release}
|
||||
%else
|
||||
# for bootstrapping kde3, omit Requires: crystalsvg... -- Rex
|
||||
Requires: crystalsvg-icon-theme
|
||||
%endif
|
||||
|
||||
|
||||
%description
|
||||
Libraries for the K Desktop Environment 3:
|
||||
Libraries for KDE 3:
|
||||
KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
|
||||
kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
|
||||
kspell (spelling checker), jscript (javascript), kab (addressbook),
|
||||
@ -201,17 +234,10 @@ kimgio (image manipulation).
|
||||
%package devel
|
||||
Group: Development/Libraries
|
||||
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}
|
||||
Provides: kdelibs-devel = 6:%{version}-%{release}
|
||||
%endif
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: %{qt3}-devel
|
||||
Requires: openssl-devel
|
||||
%{?arts:Requires: arts-devel}
|
||||
Requires: arts-devel
|
||||
%{?libkdnssd:Requires: libkdnssd-devel}
|
||||
%description devel
|
||||
This package includes the header files you will need to compile
|
||||
@ -220,22 +246,17 @@ applications for KDE 3.
|
||||
%package apidocs
|
||||
Group: Development/Documentation
|
||||
Summary: KDE 3 API documentation.
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||
%if "%{name}" == "kdelibs"
|
||||
Provides: kdelibs3-apidocs = %{version}-%{release}
|
||||
%else
|
||||
Obsoletes: kdelibs-apidocs < 6:%{version}-%{release}
|
||||
Provides: kdelibs-apidocs = 6:%{version}-%{release}
|
||||
%endif
|
||||
## to enable rpm's noarch subpkg feature
|
||||
#if 0%{?fedora} > 10
|
||||
#BuildArch: noarch
|
||||
#endif
|
||||
|
||||
Requires: kde-filesystem
|
||||
BuildArch: noarch
|
||||
%description apidocs
|
||||
This package includes the KDE 3 API documentation in HTML
|
||||
format for easy browsing
|
||||
|
||||
%package tools
|
||||
Summary: KDE 3 tools.
|
||||
Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
%description tools
|
||||
This package includes tools kgrantpty and kpac_dhcp_helper.
|
||||
|
||||
%prep
|
||||
%setup -q -n kdelibs-%{version}
|
||||
@ -253,34 +274,63 @@ format for easy browsing
|
||||
%patch38 -p1 -b .cupsdconf2-group
|
||||
%patch39 -p1 -b .kabc-make
|
||||
%patch40 -p1 -b .kdeprint-utf8
|
||||
%{?_with_libutempter:%patch41 -p1 -b .utempter}
|
||||
%patch41 -p1 -b .utempter
|
||||
%patch43 -p1 -b .lang
|
||||
%patch45 -p1 -b .xdg-autostart
|
||||
%patch46 -p1 -b .kate-vhdl
|
||||
%if 0%{?fedora} >= 9
|
||||
%patch48 -p1 -b .kspell
|
||||
%patch49 -p1 -b .kspell2
|
||||
%patch50 -p1 -b .no-ispell
|
||||
%endif
|
||||
%patch51 -p1 -b .cupsserverbin
|
||||
%patch52 -p1 -b .KDE3
|
||||
%if "%{name}" != "kdelibs"
|
||||
%patch53 -p1 -b .drkonqi-kde4
|
||||
%endif
|
||||
%patch54 -p1 -b .flock-redefinition
|
||||
%patch53 -p1 -b .drkonqi-plasma5
|
||||
%patch54 -p1 -b .inotify
|
||||
%patch55 -p1 -b .latex-syntax
|
||||
|
||||
%patch56 -p1 -b .qcolor_gcc_ftbfs
|
||||
%patch57 -p1 -b .cups-util
|
||||
%patch58 -p1 -b .cups20
|
||||
%patch59 -p1 -b .gcc6
|
||||
%patch60 -p1 -b .endless-loop
|
||||
%patch61 -p1 -b .gcc7
|
||||
%if 0%{?fedora} > 26 || 0%{?rhel} > 7
|
||||
%patch62 -p1 -b .libidn2
|
||||
%endif
|
||||
%patch100 -p1 -b .kstandarddirs
|
||||
%patch101 -p1 -b .libtool-shlibext
|
||||
%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
|
||||
%patch111 -p1 -b .kde-config_kde-version
|
||||
|
||||
# upstream patches
|
||||
%patch150 -p1 -b .cups16
|
||||
%patch151 -p1 -b .cups22
|
||||
|
||||
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
||||
# 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
|
||||
%patch208 -p1 -b .CVE-2011-3365
|
||||
%patch209 -p1 -b .CVE-2013-2074
|
||||
%patch210 -p1 -b .CVE-2015-7543
|
||||
%patch211 -p1 -b .CVE-2016-6232
|
||||
%patch212 -p1 -b .CVE-2017-6410
|
||||
|
||||
# must be applied after the ossl-1.x patch (105) and the CVE-2009-2702 fix (205)
|
||||
%patch152 -p1 -b .openssl-1.1
|
||||
|
||||
%patch300 -p1 -b .acinclude
|
||||
%patch301 -p1 -b .automake-version
|
||||
%patch302 -p1 -b .automake-add-missing
|
||||
|
||||
%if %{make_cvs}
|
||||
make -f admin/Makefile.common cvs
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
@ -298,13 +348,16 @@ fi
|
||||
export DO_NOT_COMPILE="libkscreensaver"
|
||||
%endif
|
||||
|
||||
# drop the extra -Werror= flags for C, they break the configure script
|
||||
export CFLAGS="%{optflags}"
|
||||
export CXXFLAGS="%{optflags} -Wno-deprecated-declarations -Wno-narrowing -std=gnu++98"
|
||||
|
||||
%configure \
|
||||
--includedir=%{_includedir}/kde \
|
||||
--disable-rpath \
|
||||
--enable-new-ldflags \
|
||||
--disable-dependency-tracking \
|
||||
%{!?debug: --disable-debug --disable-warnings --enable-final} \
|
||||
%{?debug:--enable-debug --enable-warnings --disable-final} \
|
||||
--disable-new-ldflags \
|
||||
--disable-debug --disable-warnings \
|
||||
--disable-final \
|
||||
--disable-fast-malloc \
|
||||
%if "%{_lib}" == "lib64"
|
||||
--enable-libsuffix="64" \
|
||||
@ -315,22 +368,21 @@ export DO_NOT_COMPILE="libkscreensaver"
|
||||
--enable-sendfile \
|
||||
--with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \
|
||||
--with-alsa \
|
||||
%if 0%{?fedora} >= 9
|
||||
--without-aspell \
|
||||
%else
|
||||
--with-aspell \
|
||||
%endif
|
||||
--without-hspell \
|
||||
--disable-libfam \
|
||||
--enable-dnotify \
|
||||
--enable-inotify \
|
||||
--with-utempter \
|
||||
%{!?arts:--without-arts} \
|
||||
%{?_with_rgbfile} \
|
||||
--with-jasper \
|
||||
--with-openexr \
|
||||
--with-xinerama
|
||||
|
||||
# kill rpath harder, inspired by https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Removing_Rpath
|
||||
# other more standard variants didnt work or caused other problems
|
||||
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' libtool
|
||||
|
||||
%if 0%{?apidocs}
|
||||
doxygen -s -u admin/Doxyfile.global
|
||||
make %{?_smp_mflags} apidox
|
||||
@ -365,14 +417,9 @@ for i in *; do
|
||||
done
|
||||
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 %{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
|
||||
|
||||
# Use hicolor-icon-theme rpm/pkg instead (#178319)
|
||||
@ -391,8 +438,8 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
|
||||
-e "s@%{_libdir}/libpcreposix.la@@g" \
|
||||
-e "s@-lpcreposix@@g" \
|
||||
-e "s@-lpcre@@g" \
|
||||
-e "s@-lidn@@g" \
|
||||
-e "s@%{_libdir}/libidn.la@@g" \
|
||||
-e "s@-lidn2\?@@g" \
|
||||
-e "s@%{_libdir}/libidn2\?.la@@g" \
|
||||
-e "s@-lpng@@g" \
|
||||
-e "s@-ljpeg@@g" \
|
||||
-e "s@%{_libdir}/libjpeg.la@@g" \
|
||||
@ -410,10 +457,11 @@ find $RPM_BUILD_ROOT%{_libdir} -name "*.la" | xargs \
|
||||
rm -f %{buildroot}%{_libdir}/libkdnssd.la
|
||||
%{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
|
||||
|
||||
%if "%{name}" != "kdelibs"
|
||||
# remove conflicts with kdelibs-4
|
||||
rm -f %{buildroot}%{_bindir}/checkXML
|
||||
rm -f %{buildroot}%{_bindir}/ksvgtopng
|
||||
rm -fv %{buildroot}%{_bindir}/kmailservice
|
||||
rm -fv %{buildroot}%{_bindir}/ksvgtopng
|
||||
rm -fv %{buildroot}%{_bindir}/ktelnetservice
|
||||
rm -f %{buildroot}%{_bindir}/kunittestmodrunner
|
||||
rm -f %{buildroot}%{_datadir}/config/kdebug.areas
|
||||
rm -f %{buildroot}%{_datadir}/config/kdebugrc
|
||||
@ -458,26 +506,34 @@ rm -f %{buildroot}%{_docdir}/HTML/en/common/xml.dcl
|
||||
rm -rf %{buildroot}%{_datadir}/locale/all_languages
|
||||
rm -rf %{buildroot}%{_sysconfdir}/xdg/menus/
|
||||
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/Royal.colors
|
||||
rm -f %{buildroot}%{_datadir}/config/colors/Web.colors
|
||||
rm -f %{buildroot}%{_datadir}/config/ksslcalist
|
||||
rm -f %{buildroot}%{_bindir}/preparetips
|
||||
# remove conflicts with kate-4.9.80+
|
||||
rm -fv %{buildroot}%{_datadir}/config/katesyntaxhighlightingrc
|
||||
|
||||
# don't show kresources
|
||||
sed -i -e "s,^OnlyShowIn=KDE;,OnlyShowIn=KDE3;," %{buildroot}%{_datadir}/applications/kde/kresources.desktop
|
||||
|
||||
%endif
|
||||
|
||||
%if 0%{?include_crystalsvg} == 0
|
||||
# remove all crystalsvg icons for now
|
||||
rm -rf %{buildroot}%{_datadir}/icons/crystalsvg/
|
||||
%endif
|
||||
# use ca-certificates' ca-bundle.crt, symlink as what most other
|
||||
# distros do these days (http://bugzilla.redhat.com/521902)
|
||||
if [ -f %{buildroot}%{_datadir}/apps/kssl/ca-bundle.crt -a \
|
||||
-f /etc/pki/tls/certs/ca-bundle.crt ]; then
|
||||
ln -sf /etc/pki/tls/certs/ca-bundle.crt \
|
||||
%{buildroot}%{_datadir}/apps/kssl/ca-bundle.crt
|
||||
fi
|
||||
|
||||
|
||||
%check
|
||||
ERROR=0
|
||||
# verify rpath, or lack thereof
|
||||
if [ ! -z "$(chrpath --list %{buildroot}%{_bindir}/kioexec 2>/dev/null | grep RPATH=)" ]; then
|
||||
echo "ERROR: the end is neigh, rpath has returned!"
|
||||
ERROR=1
|
||||
fi
|
||||
%if 0%{?apidocs}
|
||||
if [ ! -f %{buildroot}%{_docdir}/HTML/en/kdelibs-apidocs/index.html ]; then
|
||||
echo "ERROR: %{_docdir}/HTML/en/kdelibs-apidocs/index.html not generated"
|
||||
@ -487,24 +543,17 @@ fi
|
||||
exit $ERROR
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%if 0%{?include_crystalsvg}
|
||||
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%endif
|
||||
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%if 0%{?include_crystalsvg}
|
||||
touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%endif
|
||||
%{_bindir}/update-desktop-database > /dev/null 2>&1 || :
|
||||
|
||||
|
||||
@ -512,10 +561,13 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%defattr(-,root,root,-)
|
||||
%doc README
|
||||
%doc COPYING.LIB
|
||||
%if 0%{?fedora} < 12 && 0%{?rhel} < 6
|
||||
%config(noreplace) %{_sysconfdir}/profile.d/*
|
||||
%endif
|
||||
%{_bindir}/artsmessage
|
||||
%{_bindir}/cupsdconf
|
||||
%{_bindir}/cupsdoprint
|
||||
%{_bindir}/make_driver_db_cups
|
||||
%{_bindir}/dcop
|
||||
%{_bindir}/dcopclient
|
||||
%{_bindir}/dcopfind
|
||||
@ -552,21 +604,16 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_bindir}/kioexec
|
||||
%{_bindir}/kioslave
|
||||
%{_bindir}/klauncher
|
||||
%{_bindir}/kmailservice
|
||||
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
|
||||
%{_bindir}/ksendbugmail
|
||||
%{_bindir}/kshell
|
||||
%{_bindir}/kstartupconfig
|
||||
%{_bindir}/ktelnetservice
|
||||
%{_bindir}/ktradertest
|
||||
%{_bindir}/kwrapper
|
||||
%{_bindir}/lnusertemp
|
||||
%{_bindir}/make_driver_db_cups
|
||||
%{_bindir}/make_driver_db_lpr
|
||||
%{_bindir}/meinproc
|
||||
%{_bindir}/start_kdeinit
|
||||
%{_bindir}/start_kdeinit_wrapper
|
||||
%attr(4755,root,root) %{_bindir}/kgrantpty
|
||||
%{_libdir}/lib*.so.*
|
||||
%{_libdir}/libkdeinit_*.so
|
||||
%{_libdir}/lib*.la
|
||||
@ -575,8 +622,6 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_datadir}/applications/kde/*.desktop
|
||||
%{_datadir}/apps/*
|
||||
%exclude %{_datadir}/apps/ksgmltools2/
|
||||
%exclude %{_datadir}/apps/kdewidgets/
|
||||
%exclude %{_libdir}/kde3/plugins/designer/kdewidgets.*
|
||||
%config(noreplace) %{_datadir}/config/*
|
||||
%{_datadir}/emoticons/*
|
||||
%{_datadir}/icons/default.kde
|
||||
@ -586,34 +631,14 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_datadir}/servicetypes/*
|
||||
%ghost %{_datadir}/services/ksycoca
|
||||
%{_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/*
|
||||
%endif
|
||||
%if 0%{?include_crystalsvg}
|
||||
%{_datadir}/icons/crystalsvg/
|
||||
%endif
|
||||
|
||||
%files devel
|
||||
%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}/kconfig_compiler
|
||||
%{_bindir}/makekdewidgets
|
||||
%{_datadir}/apps/kdewidgets/
|
||||
%dir %{_libdir}/kde3/plugins/designer
|
||||
%{_libdir}/kde3/plugins/designer/kdewidgets.*
|
||||
%{_datadir}/apps/ksgmltools2/
|
||||
%{_includedir}/kde/
|
||||
%{_libdir}/lib*.so
|
||||
@ -627,8 +652,288 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
%{_docdir}/HTML/en/kdelibs*
|
||||
%endif
|
||||
|
||||
%files tools
|
||||
%attr(4755,root,root) %{_bindir}/kgrantpty
|
||||
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
|
||||
|
||||
%changelog
|
||||
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.5.10-94
|
||||
- Escape macros in %%changelog
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-93
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 3.5.10-92
|
||||
- Rebuilt for switch to libxcrypt
|
||||
|
||||
* Sat Jan 06 2018 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-91
|
||||
- Build against OpenSSL 1.1, patch from Trinity, backported by Kevin Kofler
|
||||
|
||||
* Thu Dec 28 2017 Yaakov Selkowitz <yselkowi@redhat.com> - 3.5.10-90
|
||||
- Fix loading of latest compat-openssl10 (#1529417)
|
||||
- Use ca-certificates' ca-bundle.crt (#521902)
|
||||
|
||||
* Tue Aug 08 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-89
|
||||
- fix libidn dependency removal from .la files (#1479146)
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-88
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-87
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jun 21 2017 Than Ngo <than@redhat.com> - 3.5.10-86
|
||||
- fix build with libidn2
|
||||
|
||||
* Wed May 10 2017 Than Ngo <than@redhat.com> - 3.5.10-85
|
||||
- add support libidn2 for f27
|
||||
|
||||
* Sat Mar 04 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-84
|
||||
- backport fix for CVE-2017-6410 from kdelibs 4 (itself backported from KF5)
|
||||
|
||||
* Mon Feb 27 2017 Than Ngo <than@redhat.com> - 3.5.10-83
|
||||
- devel requires compat-openssl10-devel, fix kdebase3 FTBS
|
||||
|
||||
* Tue Feb 21 2017 Hans de Goede <hdegoede@redhat.com> - 3.5.10-82
|
||||
- Fix gcc7 FTBFS (rhbz#1423808)
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-81
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Jan 23 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-80
|
||||
- backport fix for CVE-2016-6232 from Trinity (itself backported from KF5)
|
||||
|
||||
* Sun Jan 22 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-79
|
||||
- use DrKonqi from Plasma 5 rather than from kde-runtime 4
|
||||
- build against compat-openssl10 for now (F26+)
|
||||
- BuildRequires: pkgconf-pkg-config instead of pkgconfig on F26+
|
||||
|
||||
* Sat Dec 03 2016 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-78
|
||||
- rebuild (jasper)
|
||||
- drop the extra -Werror= flags for C, they break the configure script
|
||||
|
||||
* Wed Sep 28 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-77
|
||||
- backport CUPS 2.2 build fix from Trinity / Slávek Banko
|
||||
|
||||
* Wed Sep 28 2016 Than Ngo <than@redhat.com> - 3.5.10-76
|
||||
- fix bz#1376181, fix endless loop in svgicons
|
||||
|
||||
* Mon Jun 27 2016 Than Ngo <than@redhat.com> - 3.5.10-75
|
||||
- move kpac_dhcp_helper, kpac_dhcp_helper into separate subpackage
|
||||
|
||||
* Tue Feb 16 2016 Than Ngo <than@redhat.com> - 3.5.10-74
|
||||
- fix bz#1307685, FTBFS in rawhide
|
||||
|
||||
* Sun Feb 14 2016 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-73
|
||||
- Add -std=gnu++98 to the CXXFLAGS to fix FTBFS (#1307685)
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-72
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Thu Dec 10 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-71
|
||||
- Backport CVE-2015-7543 fix (Joseph Wenninger) from kdelibs 4 (#1289235)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-70
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu Jun 04 2015 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-69
|
||||
- drop hard Requires: sudo (kdesu can use it, but it's not default)
|
||||
|
||||
* Mon May 04 2015 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-68
|
||||
- rebuild against qt3 with fixed build key (#1218091)
|
||||
|
||||
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.5.10-67
|
||||
- Rebuilt for GCC 5 C++11 ABI change
|
||||
|
||||
* Sun Apr 05 2015 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-66
|
||||
- rebuild (gcc5)
|
||||
|
||||
* Tue Nov 25 2014 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.10-65
|
||||
- fix FTBFS with CUPS 2.0 due to bad CUPS_VERSION_MAJOR checks
|
||||
|
||||
* Tue Nov 25 2014 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-64
|
||||
- rebuild (openexr)
|
||||
|
||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-63
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Wed Aug 13 2014 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-62
|
||||
- kill rpath harder
|
||||
|
||||
* Tue Jul 22 2014 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-61
|
||||
- drop bootstrap
|
||||
|
||||
* Wed Jul 02 2014 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-60.1.bootstrap
|
||||
- bootstrap ppc64le
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-60
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Sun Dec 01 2013 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-59
|
||||
- trim %%changelog
|
||||
|
||||
* Sat Nov 30 2013 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-58
|
||||
- --disable-new-ldflags, fix FTBFS on rawhide
|
||||
|
||||
* Wed Nov 27 2013 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-57
|
||||
- rebuild (openexr)
|
||||
|
||||
* Sun Sep 08 2013 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-56
|
||||
- rebuild (ilmbase/openexr)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-55
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Jul 18 2013 Petr Pisar <ppisar@redhat.com> - 3.5.10-54
|
||||
- Perl 5.18 rebuild
|
||||
|
||||
* Sat May 18 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-53
|
||||
- fix CVE-2013-2074 (passwords in HTTP URLs in error messages, #962001)
|
||||
|
||||
* Mon Apr 01 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-52
|
||||
- use automake --force-missing to get aarch64 support (#925029/#925627)
|
||||
- also use automake --copy (the default is symlinking)
|
||||
|
||||
* Sun Mar 10 2013 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-51
|
||||
- rebuild (OpenEXR)
|
||||
|
||||
* Sat Mar 09 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-50
|
||||
- drop branding hack which breaks kde-config --kde-version
|
||||
|
||||
* Sat Mar 09 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-49
|
||||
- unify KDE 3 autotools fixes between packages
|
||||
|
||||
* Thu Mar 07 2013 Than Ngo <than@redhat.com> - 3.5.10-48
|
||||
- fix build failture
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-47
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Jan 18 2013 Adam Tkac <atkac redhat com> - 3.5.10-46
|
||||
- rebuild due to "jpeg8-ABI" feature drop
|
||||
|
||||
* Tue Dec 25 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.10-45
|
||||
- drop CUPS conditionals, CUPS support must always be built
|
||||
- backport CUPS 1.6 build fixes from Trinity / Timothy Pearson
|
||||
|
||||
* Fri Dec 21 2012 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-44
|
||||
- disable cups support on f19+ (for now, needs lots 'o love)
|
||||
|
||||
* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 3.5.10-43
|
||||
- rebuild against new libjpeg
|
||||
|
||||
* Thu Dec 20 2012 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-42
|
||||
- omit ktelnetservice (in favor of kdelibs4's copy)
|
||||
|
||||
* Thu Dec 06 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.10-41
|
||||
- omit cupsdconf (F19+), FTBFS with the latest CUPS and not worth fixing
|
||||
|
||||
* Tue Dec 04 2012 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-40
|
||||
- kate has a file conflict with kdelibs3 (#883529)
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-39
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Thu Jul 12 2012 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-38
|
||||
- omit kmailservice (in favor of kdelibs4's copy (#773414)
|
||||
|
||||
* Mon Jun 11 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-37
|
||||
- rebuild for fixed GCC (#830618)
|
||||
- remove flawed and obsolete automake version check in admin/cvs.sh
|
||||
|
||||
* Tue May 08 2012 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-36
|
||||
- rebuild (libtiff)
|
||||
|
||||
* Wed Apr 04 2012 Than Ngo <than@redhat.com> - 3.5.10-35
|
||||
- drop apidocs
|
||||
|
||||
* Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 3.5.10-34
|
||||
- Rebuild against PCRE 8.30
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.10-33
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Dec 06 2011 Adam Jackson <ajax@redhat.com> - 3.5.10-32
|
||||
- Rebuild for new libpng
|
||||
|
||||
* Thu Oct 13 2011 Than Ngo <than@redhat.com> - 3.5.10-31
|
||||
- Resolves: bz#743074, CVE-2011-3365, input validation failure in KSSL
|
||||
|
||||
* Fri Jun 17 2011 Kevin Kofler <Kevin@tigcc.ticalc.org> - 3.5.10-30
|
||||
- fix FTBFS (cups-util.c must include stdio.h, #714133)
|
||||
|
||||
* Thu Jun 16 2011 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-29
|
||||
- rebuild
|
||||
|
||||
* Wed May 11 2011 Than Ngo <than@redhat.com> - 3.5.10-28
|
||||
- use inotify_* functions which are defined in glibc-header
|
||||
|
||||
* Tue Mar 15 2011 Than Ngo <than@redhat.com> - 3.5.10-27
|
||||
- drop requiresflag hint, which isn't supported in new rpm
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Thu Nov 18 2010 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-25
|
||||
- FTBFS kdelibs3-3.5.10-24.fc14 (#631195)
|
||||
|
||||
* Thu Jun 10 2010 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-24
|
||||
- drop old Obsoletes/Provides: kdelibs(-devel/-apidocs)
|
||||
- -apidocs: Requires: kde-filesystem
|
||||
|
||||
* Wed Jan 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 3.5.10-23
|
||||
- patch for kde-config --kde-version option (kde#224540)
|
||||
|
||||
* Wed Dec 16 2009 Jaroslav Reznik <jreznik@redhat.com> - 3.5.10-22
|
||||
- Repositioning the KDE Brand (#547361)
|
||||
|
||||
* 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
|
||||
- enable -apidocs
|
||||
|
||||
@ -795,7 +1100,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
* Tue Sep 25 2007 Than Ngo <than@redhat.com> - 6:3.5.7-23
|
||||
- fix rh#243611, autostart from XDG_CONFIG_DIRS
|
||||
|
||||
* Sat Sep 09 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 6:3.5.7-22
|
||||
* Sun Sep 09 2007 Kevin Kofler <Kevin@tigcc.ticalc.org> 6:3.5.7-22
|
||||
- Remove Conflicts: kdelibs4-devel, let kdelibs4 decide whether we conflict
|
||||
(allows using the old /opt/kde4 versions for now)
|
||||
|
||||
@ -871,7 +1176,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
- apply patch to fix locale issue
|
||||
- apply upstream patch to fix kde#146105
|
||||
|
||||
* Thu May 16 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 6:3.5.6-9
|
||||
* Wed May 16 2007 Rex Dieter <rdieter[AT]fedorproject.org> - 6:3.5.6-9
|
||||
- make qtdocdir handling robust
|
||||
- kde_settings=1
|
||||
- Req: -desktop-backgrounds-basic
|
||||
@ -880,13 +1185,13 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
- add correct qt-version to build kde apidocs ,bz#239947
|
||||
- disable kde_settings
|
||||
|
||||
* Thu May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-7
|
||||
* Mon May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-7
|
||||
- BR: +keyutils-libs-devel (until krb5 is fixed, bug #240220)
|
||||
|
||||
* Thu May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-6
|
||||
* Mon May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-6
|
||||
- kde.sh: fix typo/thinko
|
||||
|
||||
* Thu May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-5
|
||||
* Mon May 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.6-5
|
||||
- %%changelog: prune pre-kde3 entries
|
||||
- %%ghost %%{_datadir}/services/ksycoca
|
||||
- omit extraneous .la file references (#178733)
|
||||
@ -996,7 +1301,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
- should have been 6:3.5.3-9 but accidentally built as 6:3.5.3-8.fc6
|
||||
- --disable-libfam and --enable-inotify to get inotify support
|
||||
and to disable gamin/fam usage
|
||||
- add %{?dist} to Release:
|
||||
- add %%{?dist} to Release:
|
||||
|
||||
* Tue Jul 11 2006 Than Ngo <than@redhat.com> 6:3.5.3-8
|
||||
- upstream patches,
|
||||
@ -1490,7 +1795,7 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
* Sun Jan 26 2003 Than Ngo <than@redhat.com> 6:3.1-0.16
|
||||
- use make apidox to create KDE api instead doxygen
|
||||
|
||||
* Thu Jan 24 2003 Than Ngo <than@redhat.com> 6:3.1-0.15
|
||||
* Fri Jan 24 2003 Than Ngo <than@redhat.com> 6:3.1-0.15
|
||||
- use doxygen to create api docs
|
||||
- clean up specfile
|
||||
|
||||
@ -1637,10 +1942,10 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||
* Tue May 28 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-3
|
||||
- Add support for xdg-list icon theme spec
|
||||
|
||||
* Fri May 9 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-1
|
||||
* Thu May 9 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.1-1
|
||||
- 3.0.1
|
||||
|
||||
* Wed May 7 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-12
|
||||
* Tue May 7 2002 Bernhard Rosenkraenzer <bero@redhat.com> 3.0.0-12
|
||||
- Update to KDE_3_0_BRANCH
|
||||
- Do away with the GCC296 define, it's handled automatically
|
||||
|
||||
|
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