[arch-commits] Commit in kdepimlibs/kde-unstable (PKGBUILD glibc-2.13.patch)

[Andrea Scarpino]

    Date: Friday, January 21, 2011 @ 13:07:45
  Author: andrea
Revision: 107133

Fix bug with glibc 2.13

Added:
  kdepimlibs/kde-unstable/glibc-2.13.patch
Modified:
  kdepimlibs/kde-unstable/PKGBUILD

------------------+
 PKGBUILD         |   10 ++++++++--
 glibc-2.13.patch |   13 +++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-21 15:59:29 UTC (rev 107132)
+++ PKGBUILD	2011-01-21 18:07:45 UTC (rev 107133)
@@ -13,10 +13,16 @@
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap'
         'docbook-xsl')
 install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('14624960410d270077df530d70d34e270260b3c4')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        'glibc-2.13.patch')
+sha1sums=('14624960410d270077df530d70d34e270260b3c4'
+        '0a3888f121b313daaf10c1f48e6fc7d058a89a57')
 
 build() {
+    # Already fixed upstream
+    cd ${srcdir}/${pkgname}-${pkgver}
+    patch -Np0 -i ${srcdir}/glibc-2.13.patch
+
 	cd ${srcdir}
 	mkdir build
 	cd build

Added: glibc-2.13.patch
===================================================================
--- glibc-2.13.patch	                        (rev 0)
+++ glibc-2.13.patch	2011-01-21 18:07:45 UTC (rev 107133)
@@ -0,0 +1,13 @@
+Index: kioslave/imap4/imap4.cpp
+===================================================================
+--- kioslave/imap4/imap4.cpp	(revision 1216162)
++++ kioslave/imap4/imap4.cpp	(revision 1216163)
+@@ -2576,7 +2576,7 @@
+     ssize_t copyLen = (len < readBufferLen) ? len : readBufferLen;
+     memcpy(data, readBuffer, copyLen);
+     readBufferLen -= copyLen;
+-    if (readBufferLen) memcpy(readBuffer, &readBuffer[copyLen], readBufferLen);
++    if (readBufferLen) memmove(readBuffer, &readBuffer[copyLen], readBufferLen);
+     return copyLen;
+   }
+   if (!isConnected()) return 0;