Wed Oct 25 14:53:45 UTC 2006

Author: than

Update of /cvs/dist/rpms/kdelibs/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv14433

Modified Files:
	.cvsignore kdelibs.spec sources 
Added Files:
	kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch 
	kdelibs-3.5.5-kmcupsmanager.patch 
Removed Files:
	kdelibs-3.1-libtool.patch kdelibs-3.5.4-kde#100188.patch 
	kdelibs-3.5.4-kde#106748.patch kdelibs-3.5.4-kde#106812.patch 
	kdelibs-3.5.4-kde#115891.patch kdelibs-3.5.4-kde#119167.patch 
	kdelibs-3.5.4-kde#121528.patch kdelibs-3.5.4-kde#123413.patch 
	kdelibs-3.5.4-kde#123915.patch kdelibs-3.5.4-kde#123941.patch 
	kdelibs-3.5.4-kde#131366.patch kdelibs-3.5.4-kde#131933.patch 
	kdelibs-3.5.4-kde#131979.patch kdelibs-3.5.4-kde#132678.patch 
	kdelibs-3.5.4-kde#133071.patch kdelibs-3.5.4-kde#133401.patch 
	kdelibs-3.5.4-kde#133529.patch kdelibs-3.5.4-kde#133677.patch 
	kdelibs-3.5.4-kde#134118.patch kdelibs-3.5.4-kde#90462.patch 
	kdelibs-3.5.4-kdebug-crash.patch 
	kdelibs-3.5.4-khtml-rendering.patch 
	kdelibs-3.5.4-tango-icon.patch 
Log Message:
3.5.5


kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch:
 render_image.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch ---
--- kdelibs-3.3.5/khtml/rendering/render_image.cpp.orig	2006-10-16 20:46:19.000000000 +0200
+++ kdelibs-3.3.5/khtml/rendering/render_image.cpp	2006-10-16 20:47:15.000000000 +0200
@@ -266,7 +266,8 @@
         if ( (cWidth != intrinsicWidth() ||  cHeight != intrinsicHeight()) &&
              pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
         {
-            if (resizeCache.isNull() && cWidth && cHeight && intrinsicWidth() && intrinsicHeight())
+            if (resizeCache.isNull() && cWidth > 0 && cHeight > 0 && intrinsicWidth() && intrinsicHeight()
+                    && cWidth < 4096 && cHeight < 4096)
             {
                 QRect scaledrect(i->valid_rect());
 //                 kdDebug(6040) << "time elapsed: " << dt->elapsed() << endl;

kdelibs-3.5.5-kmcupsmanager.patch:
 kmcupsmanager.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.5-kmcupsmanager.patch ---
--- kdelibs/kdeprint/cups/kmcupsmanager.cpp	2006/09/20 15:38:41	586782
+++ kdelibs/kdeprint/cups/kmcupsmanager.cpp	2006/10/10 12:34:30	594190
@@ -920,7 +920,7 @@
 	kdDebug(500) << "Checking for update possible" << endl;
 	delete m_socket;
         m_socket = new KNetwork::KBufferedSocket;
-	m_socket->setTimeout( 1 );
+	m_socket->setTimeout( 1500 );
 	connect( m_socket, SIGNAL( connected(const KResolverEntry&) ), 
                 SLOT( slotConnectionSuccess() ) );
 	connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) );
@@ -958,7 +958,7 @@
 
 void KMCupsManager::slotAsyncConnect()
 {
-	kdDebug(500) << "Starting async connect" << endl;
+	kdDebug(500) << "Starting async connect to " << CupsInfos::self()->hostaddr() << endl;
 	//m_socket->startAsyncConnect();
         if (CupsInfos::self()->host().startsWith("/"))
             m_socket->connect( QString(), CupsInfos::self()->host());


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-6/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore	8 Aug 2006 10:21:02 -0000	1.37
+++ .cvsignore	25 Oct 2006 14:53:42 -0000	1.38
@@ -12,3 +12,4 @@
 kdelibs-3.5.2.tar.bz2
 kdelibs-3.5.3.tar.bz2
 kdelibs-3.5.4.tar.bz2
+kdelibs-3.5.5.tar.bz2


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-6/kdelibs.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- kdelibs.spec	1 Oct 2006 21:07:21 -0000	1.196
+++ kdelibs.spec	25 Oct 2006 14:53:42 -0000	1.197
@@ -8,16 +8,15 @@
 %define cups_epoch 1
 
 %define qt_version 3.3.6
-%define arts_version 1.5.4
+%define arts_version 1.5.5
 %define kde_major_version 3
 
 %define qtdocdir %{_docdir}/qt-devel-%{qt_version}
 
 %define make_cvs 0
-%define arts 1
 
-Version: 3.5.4
-Release: 10%{?dist}
+Version: 3.5.5
+Release: 0.1%{?dist}
 Summary: K Desktop Environment - Libraries
 Name: kdelibs
 Url: http://www.kde.org/
@@ -37,7 +36,6 @@
 Patch15: kdelibs-3.4.91-buildroot.patch
 Patch16: kdelibs-3.1-ssl-krb5.patch
 Patch20: kdelibs-3.3.92-defaultstyle.patch
-Patch24: kdelibs-3.1-libtool.patch
 Patch32: kdelibs-3.2.3-cups.patch
 Patch33: kdelibs-3.3.2-ppc.patch
 Patch34: kdelibs-3.4.0-qtdoc.patch
@@ -48,32 +46,12 @@
 Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
 
 # upstream patches
-Patch100: kdelibs-3.5.4-kde#131933.patch
-Patch101: kdelibs-3.5.4-kde#131366.patch
-Patch102: kdelibs-3.5.4-kde#106812.patch
-Patch103: kdelibs-3.5.4-kde#90462.patch
-Patch104: kdelibs-3.5.4-kde#121528.patch
-Patch105: kdelibs-3.5.4-kde#123413.patch
-Patch106: kdelibs-3.5.4-kde#133529.patch
-Patch107: kdelibs-3.5.4-kdebug-crash.patch
-Patch108: kdelibs-3.5.4-tango-icon.patch
-Patch109: kdelibs-3.5.4-kde#133677.patch
-Patch110: kdelibs-3.5.4-kde#123941.patch
-Patch111: kdelibs-3.5.4-kde#132678.patch
-Patch112: kdelibs-3.5.4-khtml-rendering.patch
-Patch113: kdelibs-3.5.4-kde#134118.patch
-Patch114: kdelibs-3.5.4-kde#133401.patch
-Patch115: kdelibs-3.5.4-kde#131979.patch
-Patch116: kdelibs-3.5.4-kde#115891.patch
-Patch117: kdelibs-3.5.4-kde#123915.patch
-Patch118: kdelibs-3.5.4-kde#100188.patch
-Patch119: kdelibs-3.5.4-kde#119167.patch
-Patch120: kdelibs-3.5.4-kde#106748.patch
-Patch121: kdelibs-3.5.4-kde#133071.patch
+Patch100: kdelibs-3.5.5-kmcupsmanager.patch
+
+# security fixes
+Patch500: kdelibs-3.3.5-khtml-overflow-CVE-2006-4811.patch
 
-%if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
-%endif
 Requires: qt >= %{qt_epoch}:%{qt_version}
 Requires: cups-libs >= %{cups_epoch}:1.1.12
 Requires: iceauth
@@ -107,9 +85,7 @@
 BuildRequires: docbook-utils
 BuildRequires: zlib-devel
 BuildRequires: libidn-devel
-%if %{arts}
 BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}
-%endif
 BuildRequires: audiofile-devel
 BuildRequires: openssl-devel
 BuildRequires: perl
@@ -147,9 +123,7 @@
 Summary: Header files and documentation for compiling KDE applications.
 Requires: qt-devel >= %{qt_epoch}:%{qt_version}
 Requires: %{name} = %{epoch}:%{version}-%{release}
-%if %{arts}
 Requires: arts-devel
-%endif
 Requires: libart_lgpl-devel
 Requires: libxslt-devel
 Requires: libjpeg-devel
@@ -190,7 +164,6 @@
 %patch15 -p1 -b .buildroot
 %patch16 -p1 -b .ssl-krb5
 %patch20 -p1 -b .defaultstyle
-%patch24 -p1 -b .libtool
 %patch32 -p1 -b .cups
 %patch33 -p1 -b .ppc
 %patch34 -p1 -b .qtdoc
@@ -201,28 +174,10 @@
 %patch40 -p1 -b .kdeprint-utf8
 
 # upstream pathces
-%patch100 -p0 -b .kde#131933
-%patch101 -p0 -b .kde#131366
-%patch102 -p0 -b .kde#106812
-%patch103 -p0 -b .kde#90462
-%patch104 -p0 -b .kde#121528
-%patch105 -p0 -b .kde#123413
-%patch106 -p0 -b .kde#133529
-%patch107 -p0 -b .kdebug-crash
-%patch108 -p0 -b .tango-icontheme
-%patch109 -p0 -b .kde#133677
-%patch110 -p0 -b .kde#123941
-%patch111 -p0 -b .kde#132678
-%patch112 -p0 -b .khtml-rendering
-%patch113 -p0 -b .kde#134118
-%patch114 -p0 -b .kde#133401
-%patch115 -p0 -b .kde#131979
-%patch116 -p0 -b .kde#115891
-%patch117 -p0 -b .kde#123915
-%patch118 -p0 -b .kde#100188
-%patch119 -p0 -b .kde#119167
-%patch120 -p0 -b .kde#106748
-%patch121 -p0 -b .kde#133071
+%patch100 -p1 -b .kmcupsmanager
+
+# security fixes
+%patch500 -p1 -b .CVE-2006-4811
 
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -255,9 +210,6 @@
    --with-xinerama \
    --disable-gcc-hidden-visibility \
    --enable-pie \
-%if %{arts} == 0
-   --without-arts \
-%endif
    --with-distribution="$VERSION" \
    --with-alsa \
    --includedir=%{_includedir}/kde \
@@ -413,7 +365,7 @@
 %attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
 %attr(4755,root,root) %{_bindir}/kgrantpty
 %{_libdir}/lib*.so.*
-%{_libdir}/libkdeinit_*
+%{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.la
 %{_libdir}/kde3
 %{_datadir}/applications
@@ -439,7 +391,7 @@
 %{_includedir}/kde
 %{_libdir}/lib*.so
 %{_libdir}/lib*.a
-%exclude %{_libdir}/libkdeinit_*
+%exclude %{_libdir}/libkdeinit_*.so
 
 %files apidocs
 %defattr(-,root,root)
@@ -447,6 +399,9 @@
 %doc %{_docdir}/HTML/en/kdelibs*
 
 %changelog
+* Wed Oct 25 2006 Than Ngo <than at redhat.com> 6:3.5.5-0.1
+- update to 3.5.5
+
 * Sun Oct 01 2006 Than Ngo <than at redhat.com> 6:3.5.4-10
 - fix utf8 issue in kdeprint
 - fix #178320,#198828, follow menu-spec


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/FC-6/sources,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sources	8 Aug 2006 10:21:03 -0000	1.48
+++ sources	25 Oct 2006 14:53:42 -0000	1.49
@@ -1 +1 @@
-979d056ca0e21c12caed270126e60e3e  kdelibs-3.5.4.tar.bz2
+2cba792e3b0a766431b837c8ef924117  kdelibs-3.5.5.tar.bz2


--- kdelibs-3.1-libtool.patch DELETED ---


--- kdelibs-3.5.4-kde#100188.patch DELETED ---


--- kdelibs-3.5.4-kde#106748.patch DELETED ---


--- kdelibs-3.5.4-kde#106812.patch DELETED ---


--- kdelibs-3.5.4-kde#115891.patch DELETED ---


--- kdelibs-3.5.4-kde#119167.patch DELETED ---


--- kdelibs-3.5.4-kde#121528.patch DELETED ---


--- kdelibs-3.5.4-kde#123413.patch DELETED ---


--- kdelibs-3.5.4-kde#123915.patch DELETED ---


--- kdelibs-3.5.4-kde#123941.patch DELETED ---


--- kdelibs-3.5.4-kde#131366.patch DELETED ---


--- kdelibs-3.5.4-kde#131933.patch DELETED ---


--- kdelibs-3.5.4-kde#131979.patch DELETED ---


--- kdelibs-3.5.4-kde#132678.patch DELETED ---


--- kdelibs-3.5.4-kde#133071.patch DELETED ---


--- kdelibs-3.5.4-kde#133401.patch DELETED ---


--- kdelibs-3.5.4-kde#133529.patch DELETED ---


--- kdelibs-3.5.4-kde#133677.patch DELETED ---


--- kdelibs-3.5.4-kde#134118.patch DELETED ---


--- kdelibs-3.5.4-kde#90462.patch DELETED ---


--- kdelibs-3.5.4-kdebug-crash.patch DELETED ---


--- kdelibs-3.5.4-khtml-rendering.patch DELETED ---


--- kdelibs-3.5.4-tango-icon.patch DELETED ---


