- updated patches for 3.3.4

Changed files:
    XFree86-ru_SU.patch -> 1.2
    XFree86-xinitrace.patch -> 1.2

diff --git a/XFree86-ru_SU.patch b/XFree86-ru_SU.patch
index af056168db7f49f8515b507a78792c248762c956..ebaae101005721844190c09d9270b9d9ef5d7795 100644 (file)
--- a/XFree86-ru_SU.patch
+++ b/XFree86-ru_SU.patch
@@ -1,14 +1,11 @@
---- XFree86-3.3.3.1/xc/nls/locale.alias.ru_SU  Tue Jan 26 15:58:06 1999
-+++ XFree86-3.3.3.1/xc/nls/locale.alias        Tue Jan 26 16:00:01 1999
-@@ -214,9 +214,9 @@
- ru                                            ru_RU.ISO8859-5
- ru_RU                                         ru_RU.ISO8859-5
+--- XFree86-3.3.4.orig/xc/nls/locale.alias     Wed Jun  2 09:50:05 1999
++++ XFree86-3.3.4/xc/nls/locale.alias  Sun Aug  8 21:57:30 1999
+@@ -282,7 +282,7 @@
  ru_RU.iso88595                                        ru_RU.ISO8859-5
+ #if defined(INCLUDE_ru_SU)
+ XCOMM ru_SU is redundant now
 -ru_SU                                         ru_RU.ISO8859-5
 +ru_SU                                         ru_RU.KOI8-R
-+ru_SU.KOI8-R                                  ru_RU.KOI8-R
  ru_SU.ISO8859-5                                       ru_RU.ISO8859-5
--ru_SU.KOI8-R                                  ru_RU.KOI8-R
- sh                                            sh_YU.ISO8859-2
- sh_HR.iso88592                                        sh_HR.ISO8859-2
- sh_YU                                         sh_YU.ISO8859-2
+ ru_SU.KOI8-R                                  ru_RU.KOI8-R
+ #endif

diff --git a/XFree86-xinitrace.patch b/XFree86-xinitrace.patch
index 710c9a3ab0223f50beead3b133f8b97f74bcf589..25ccb48013828b7a15001c8e97be475da1df0410 100644 (file)
--- a/XFree86-xinitrace.patch
+++ b/XFree86-xinitrace.patch
@@ -1,6 +1,6 @@
---- XFree86-3.3.3.1/xc/programs/xinit/xinit.c.xinitrace        Tue Jun  8 12:41:23 1999
-+++ XFree86-3.3.3.1/xc/programs/xinit/xinit.c  Tue Jun  8 12:43:39 1999
-@@ -561,22 +561,32 @@
+--- XFree86-3.3.4.orig/xc/programs/xinit/xinit.c       Sun Jun 27 12:32:26 1999
++++ XFree86-3.3.4/xc/programs/xinit/xinit.c    Sun Aug  8 22:28:20 1999
+@@ -596,30 +596,40 @@
                        serverpid = -1;
                        break;
                }
@@ -8,7 +8,7 @@
 -               * kludge to avoid race with TCP, giving server time to
 -               * set his socket options before we try to open it,
 -               * either use the 15 second timeout, or await SIGUSR1.
-+              
++
 +              /* 
 +               * before we try the below kludge, see if we are already
 +               * ready to connect.  Fast CPUs with cached filesystems
@@ -19,30 +19,42 @@
 +               * pbrown@redhat.com - 06/08/1999
                 */
 -              alarm (15);
--              pause ();
++              if (waitforserver() == 0) {
++                      /*
++                       * kludge to avoid race with TCP, giving server time to
++                       * set his socket options before we try to open it,
++                       * either use the 15 second timeout, or await SIGUSR1.
++                       *
++                       * If your machine is substantially slower than 15 seconds,
++                       * you can easily adjust this value.
++                       */
++                      alarm (15);
+ 
+ #ifndef X_NOT_POSIX
+-              sigsuspend(&old);
+-              alarm (0);
+-              sigprocmask(SIG_SETMASK, &old, NULL);
++                      sigsuspend(&old);
++                      alarm (0);
++                      sigprocmask(SIG_SETMASK, &old, NULL);
+ #else
+-              sigpause (old);
 -              alarm (0);
--
-               if (waitforserver() == 0) {
+-              sigsetmask (old);
++                      sigpause (old);
++                      alarm (0);
++                      sigsetmask (old);
+ #endif
+ 
+-              if (waitforserver() == 0) {
 -                      Error("unable to connect to X server\r\n");
 -                      shutdown();
 -                      serverpid = -1;
-+                /*
-+                 * kludge to avoid race with TCP, giving server time to
-+                 * set his socket options before we try to open it,
-+                 * either use the 15 second timeout, or await SIGUSR1.
-+                 *
-+                 * If your machine is substantially slower than 15 seconds,
-+                 * you can easily adjust this value.
-+                 */
-+                alarm (15);
-+                pause ();
-+                alarm (0);
-+
-+                if (waitforserver() == 0) {
-+                  Error("unable to connect to X server\r\n");
-+                  shutdown();
-+                  serverpid = -1;
-+                }
++                      if (waitforserver() == 0) {
++                              Error("unable to connect to X server\r\n");
++                              shutdown();
++                              serverpid = -1;
++                      }
                }
                break;
        }