- updated for 4.6.0

Changed files:
    XFree86-elfloader-linux-non-exec-stack.patch -> 1.2

diff --git a/XFree86-elfloader-linux-non-exec-stack.patch b/XFree86-elfloader-linux-non-exec-stack.patch
index a9fc6f191ab5ab28dbe1db27489b9feff267e8a5..1b5bac7b3cfcec99853e207e233ac0cc29fd4dde 100644 (file)
--- a/XFree86-elfloader-linux-non-exec-stack.patch
+++ b/XFree86-elfloader-linux-non-exec-stack.patch
@@ -1,41 +1,39 @@
-diff -urN xc-old/programs/Xserver/hw/xfree86/loader/elfloader.c xc/programs/Xserver/hw/xfree86/loader/elfloader.c
---- xc-old/programs/Xserver/hw/xfree86/loader/elfloader.c      2003-11-02 03:16:18.000000000 -0500
-+++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c  2003-11-02 03:21:53.000000000 -0500
-@@ -921,7 +921,7 @@
+--- xc/programs/Xserver/hw/xfree86/loader/elfloader.c.orig     2006-04-08 19:53:39.000000000 +0200
++++ xc/programs/Xserver/hw/xfree86/loader/elfloader.c  2007-05-01 08:40:52.720051459 +0200
+@@ -1168,7 +1168,7 @@
            ErrorF("ELFCreateGOT() Unable to reallocate memory!!!!\n");
            return FALSE;
        }
--#   if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
-+#   if defined(linux) || defined(__OpenBSD__)
+-#   if defined(linux) && defined(__ia64__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#   if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
        {
            unsigned long page_size = getpagesize();
            unsigned long round;
-@@ -2761,10 +2761,16 @@
+@@ -3351,10 +3351,16 @@
        elffile->lsection[j].size = SecSize(i);
        elffile->lsection[j].flags = flags;
        switch (SecType(i)) {
--#ifdef __OpenBSD__
-+#if defined(linux) || defined(__OpenBSD__)
+-#if defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
        case SHT_PROGBITS:
 -          mprotect(elffile->lsection[j].saddr, SecSize(i),
--                   PROT_READ | PROT_WRITE | PROT_EXEC);
-+       {
-+           unsigned long page_size = getpagesize();
-+       unsigned long round;
++      {
++          unsigned long page_size = getpagesize();
++          unsigned long round;
 +
-+       round = (unsigned long)elffile->lsection[j].saddr & (page_size -1);
-+       mprotect( (char *)elffile->lsection[j].saddr - round,
-+            SecSize(i) + round, PROT_READ|PROT_WRITE|PROT_EXEC);
-+       }
++          round = (unsigned long)elffile->lsection[j].saddr & (page_size -1);
++          mprotect( (char*)elffile->lsection[j].saddr - round, SecSize(i) + round,
+                    PROT_READ | PROT_WRITE | PROT_EXEC);
++      }
            break;
  #endif
        case SHT_SYMTAB:
-@@ -2959,7 +2965,7 @@
+@@ -3556,7 +3562,7 @@
        ErrorF("Unable to allocate ELF sections\n");
        return NULL;
      }
--#  if defined(linux) && defined(__ia64__) || defined(__OpenBSD__)
-+#  if defined(linux) || defined(__OpenBSD__)
+-#  if defined(linux) && defined(__ia64__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#  if defined(linux) || defined(__OpenBSD__) || defined(__NetBSD__)
      {
        unsigned long page_size = getpagesize();
        unsigned long round;