packages: kde4-kdelibs/kde4-kdelibs-glibc-2.11.patch (NEW) - glibc 2.11 pat...

cactus cactus at pld-linux.org
Sat Nov 14 16:37:10 CET 2009


Author: cactus                       Date: Sat Nov 14 15:37:10 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- glibc 2.11 patch - upstream

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs-glibc-2.11.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-glibc-2.11.patch
diff -u /dev/null packages/kde4-kdelibs/kde4-kdelibs-glibc-2.11.patch:1.1
--- /dev/null	Sat Nov 14 16:37:10 2009
+++ packages/kde4-kdelibs/kde4-kdelibs-glibc-2.11.patch	Sat Nov 14 16:37:05 2009
@@ -0,0 +1,163 @@
+--- trunk/KDE/kdelibs/kdecore/fakes.c	2009/10/31 22:24:52	1043164
++++ trunk/KDE/kdelibs/kdecore/fakes.c	2009/11/06 19:59:40	1045794
+@@ -31,7 +31,7 @@
+ 
+ 
+ #define KDE_open open
+-#define KDE_mkdir mkdir 
++#define KDE_mkdir mkdir
+ 
+ 
+ #ifndef HAVE_SETENV
+@@ -39,10 +39,15 @@
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif
+-
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+ 
+ KDECORE_EXPORT int setenv(const char *name, const char *value, int overwrite) {
+     int i;
+@@ -67,11 +72,18 @@
+ #ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
+ #endif
+-
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
++#ifdef HAVE_ERRNO_H
+ #include <errno.h>
++#endif
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+ 
+ #ifndef environ
+ extern char ** environ;
+@@ -154,24 +166,32 @@
+ {
+     srand48(seed);
+ }
+-#endif
++#endif /* !HAVE_RANDOM */
+ 
+ #ifndef HAVE_SETEUID
+ int seteuid(uid_t euid)
+ {
+     return setreuid(-1, euid); /* Well, if you have neither you are in trouble :) */
+ }
+-#endif
++#endif /* !HAVE_SETEUID */
+ 
+ #ifndef HAVE_MKSTEMPS
++#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+ #include <fcntl.h>
++#ifdef HAVE_STRING_H
+ #include <string.h>
++#endif
++#ifdef HAVE_STRINGS_H
+ #include <strings.h>
++#endif
++#ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
++#endif
+ 
+ /* this is based on code taken from the GNU libc, distributed under the LGPL license */
+ 
+@@ -244,12 +264,14 @@
+ {
+   return mkstemps( _template, 0 );
+ }
+-#endif
++#endif /* !HAVE_MKSTEMP */
+ 
+ #ifndef HAVE_MKDTEMP
+ 
+ #ifndef HAVE_MKSTEMPS
++#ifdef HAVE_SYS_TYPES_H
+ #include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_STAT_H
+ #include <sys/stat.h>
+ #endif
+@@ -306,13 +328,18 @@
+       value += 7777;
+ 
+       if (!KDE_mkdir(_template,0700))
+-	return _template;	
++	return _template;
+     }
+     return 0;
+ }
+ #endif /* !HAVE_MKDTEMP */
+ 
+ #ifndef HAVE_STRLCPY
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
+ {
+     unsigned long len, ret = strlen(s);
+@@ -325,12 +352,17 @@
+         }
+     } else
+ 	memcpy(d, s, ret + 1);
+-	
++
+     return ret;
+ }
+-#endif
++#endif /* !HAVE_STRLCPY */
+ 
+ #ifndef HAVE_STRLCAT
++
++#ifdef HAVE_STRING_H
++#include <string.h>
++#endif
++
+ KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
+ {
+     char *cp;
+@@ -350,7 +382,7 @@
+ 
+     return ret;
+ }
+-#endif
++#endif /* !HAVE_STRLCAT */
+ 
+ #ifndef HAVE_STRCASESTR
+ /*
+@@ -450,7 +482,7 @@
+ ret0:
+   return 0;
+ }
+-#endif
++#endif /* !HAVE_STRCASESTR */
+ 
+ #ifndef HAVE_TRUNC
+ 
+@@ -467,4 +499,4 @@
+ {
+        return x < 0 ? -floor(-x) : floor(x);
+ }
+-#endif
++#endif /* !HAVE_TRUNC */
================================================================


More information about the pld-cvs-commit mailing list