- Fix tmpnam() issue

- Fix typo. mkstemps() -> mkstemp()

3 files changed, 89 insertions, 8 deletions

diff --git a/x11/kdelibs2/files/patch-kcharsets.cpp b/x11/kdelibs2/files/patch-kcharsets.cpp
index d54e999a1014..9d31d51c46fd 100644
--- a/x11/kdelibs2/files/patch-kcharsets.cpp
+++ b/x11/kdelibs2/files/patch-kcharsets.cpp
@@ -1,5 +1,5 @@
---- kdecore/kcharsets.cpp.orig	Mon Nov 20 16:41:35 2000
-+++ kdecore/kcharsets.cpp	Mon Nov 20 16:44:34 2000
+--- kdecore/kcharsets.cpp.orig	Mon Oct 16 19:06:25 2000
++++ kdecore/kcharsets.cpp	Wed Nov 22 14:30:14 2000
 @@ -66,7 +66,7 @@
      "set-gbk",
      "set-zh",
@@ -28,14 +28,11 @@
      QFont::TSCII,
      QFont::Unicode,
      QFont::Unicode,
-@@ -552,8 +552,9 @@
+@@ -552,6 +552,7 @@
  	case QFont::Set_Zh:
  	    return "set-gbk";
      case QFont::Set_Zh_TW:
 +	return "cns11643.1986-*";
      case QFont::Set_Big5:
--	return "big5-0";
-+	return "big5";
+ 	return "big5-0";
      case QFont::AnyCharSet:
-     default:
-         break;
diff --git a/x11/kdelibs2/files/patch-kdesu_stub.c b/x11/kdelibs2/files/patch-kdesu_stub.c
new file mode 100644
index 000000000000..c538fcedb635
--- /dev/null
+++ b/x11/kdelibs2/files/patch-kdesu_stub.c
@@ -0,0 +1,84 @@
+--- kdesu/kdesu_stub.c.orig	Wed Nov 22 10:10:17 2000
++++ kdesu/kdesu_stub.c	Wed Nov 22 10:31:12 2000
+@@ -276,9 +276,17 @@
+ 	xsetenv("DISPLAY", params[P_DISPLAY].value);
+ 	if (params[P_DISPLAY_AUTH].value[0]) 
+ 	{
++#ifdef HAVE_MKSTEMP
++            int fd;
++            strcpy(fname, "/tmp/kdesu.XXXXXXXX");
++	    fout = fdopen(fd, "w");
++	    fd = mkstemp(fname);
++	    if (fd == -1 || fout == NULL)
++#else
+ 	    fname = tmpnam(0L);
+ 	    fout = fopen(fname, "w");
+ 	    if (!fout) 
++#endif
+ 	    {
+ 		perror("kdesu_stub: fopen()");
+ 		exit(1);
+@@ -286,7 +294,22 @@
+ 	    fprintf(fout, "add %s %s\n", params[P_DISPLAY].value,
+ 		    params[P_DISPLAY_AUTH].value);
+ 	    fclose(fout);
++#ifdef HAVE_MKSTEMP
++	    strcpy(xauthority, "/tmp/xauth.XXXXXXXX");
++	    {
++		int fd;
++		fd = mkstemp(xauthority);
++		if (fd == -1)
++		{
++		    perror("kdesu_stub: mkstemp()");
++		    exit(1);
++                }
++		else
++		    close(fd);
++            }
++#else
+ 	    tmpnam(xauthority);
++#endif
+ 	    xsetenv("XAUTHORITY", xauthority);
+ 	    sprintf(command, "xauth source %s >/dev/null 2>&1", fname);
+ 	    if (system(command))
+@@ -305,9 +328,17 @@
+ 	auth = xstrsep(params[P_ICE_AUTH].value);
+ 	if (host[0]) 
+ 	{
++#ifdef HAVE_MKSTEMP
++	    int fd;
++	    strcpy(fname, "/tmp/kdesu.XXXXXXXX");
++	    fd = mkstemp(fname);
++	    fout = fdopen(fd, "w");
++	    if (fd == -1 || fout == NULL)
++#else
+ 	    fname = tmpnam(0L);
+ 	    fout = fopen(fname, "w");
+ 	    if (!fout) 
++#endif
+ 	    {
+ 		perror("kdesu_stub: fopen()");
+ 		exit(1);
+@@ -318,7 +349,22 @@
+ 	    for (i=0; host[i]; i++)
+ 		fprintf(fout, "add DCOP \"\" %s %s\n", host[i], auth[i]);
+ 	    fclose(fout);
++#ifdef HAVE_MKSTEMP
++	    strcpy(iceauthority, "/tmp/iceauth.XXXXXXXX");
++	    {
++		int fd; 
++		fd = mkstemp(iceauthority);
++		if (fd == -1)
++		{
++		    perror("kdesu_stub: mkstemp()");
++		    exit(1);
++                }
++		else
++		    close(fd);
++            }
++#else
+ 	    tmpnam(iceauthority);
++#endif
+ 	    xsetenv("ICEAUTHORITY", iceauthority);
+ 	    sprintf(command, "iceauth source %s >/dev/null 2>&1", fname);
+ 	    if (system(command))
diff --git a/x11/kdelibs2/files/patch-midfile.cc b/x11/kdelibs2/files/patch-midfile.cc
index 44fcd6f7d367..c0ff4ff3e9f5 100644
--- a/x11/kdelibs2/files/patch-midfile.cc
+++ b/x11/kdelibs2/files/patch-midfile.cc
@@ -6,7 +6,7 @@
    }
 +#ifdef HAVE_MKSTEMP
 +  strcpy(tmpname,"/tmp/KMid.XXXXXXXX");
-+  int fd=mkstemps(tmpname);
++  int fd=mkstemp(tmpname);
 +  if (fd<0)
 +  {
 +    pclose(infile);