summaryrefslogtreecommitdiffstats
path: root/opensuse/tdelibs/disable-idn-support.diff
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-08-13 12:58:51 -0400
committerRobert Xu <robxu9@gmail.com>2011-08-13 12:58:51 -0400
commit46130378aea5fff80803409c2573e2ea31472cb9 (patch)
treecb5da908105e6577da7676f84ba9c7fbaba4fb52 /opensuse/tdelibs/disable-idn-support.diff
parent53f2819f9af035a38ca08df1ede9e6cd24aa79ef (diff)
downloadtde-packaging-46130378aea5fff80803409c2573e2ea31472cb9.tar.gz
tde-packaging-46130378aea5fff80803409c2573e2ea31472cb9.zip
add dbus-1-tqt and libdbus-1-tqt-0; add unmodified tdelibs from kdelibs3
Diffstat (limited to 'opensuse/tdelibs/disable-idn-support.diff')
-rw-r--r--opensuse/tdelibs/disable-idn-support.diff34
1 files changed, 34 insertions, 0 deletions
diff --git a/opensuse/tdelibs/disable-idn-support.diff b/opensuse/tdelibs/disable-idn-support.diff
new file mode 100644
index 000000000..37c59bc91
--- /dev/null
+++ b/opensuse/tdelibs/disable-idn-support.diff
@@ -0,0 +1,34 @@
+Index: kdecore/network/kresolver.cpp
+===================================================================
+--- kdecore/network/kresolver.cpp.orig
++++ kdecore/network/kresolver.cpp
+@@ -50,6 +50,7 @@
+
+ // IDN
+ #ifdef HAVE_IDNA_H
++# include <stdlib.h>
+ # include <idna.h>
+ #endif
+
+@@ -1084,6 +1085,10 @@ static QStringList splitLabels(const QSt
+ static QCString ToASCII(const QString& label)
+ {
+ #ifdef HAVE_IDNA_H
++ // We do disable it by default for security reasons for now.
++ if ( getenv("KDE_NO_IPV6") && strcmp( getenv("KDE_NO_IPV6"), "no" ) )
++ return label.latin1();
++
+ // We have idna.h, so we can use the idna_to_ascii
+ // function :)
+
+@@ -1118,6 +1123,10 @@ static QCString ToASCII(const QString& l
+ static QString ToUnicode(const QString& label)
+ {
+ #ifdef HAVE_IDNA_H
++ // We do disable it by default for security reasons for now.
++ if ( getenv("KDE_NO_IPV6") && strcmp( getenv("KDE_NO_IPV6"), "no" ) )
++ return label;
++
+ // We have idna.h, so we can use the idna_to_unicode
+ // function :)
+