[Pkg-mysql-commits] r898 - in branches/sid-5.0/debian: . patches

[Sean Finney]

Author: seanius
Date: 2007-07-17 08:36:53 +0000 (Tue, 17 Jul 2007)
New Revision: 898

Removed:
   branches/sid-5.0/debian/patches/70_cpuid_on_i486.dpatch
Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/patches/00list
Log:
patch incorporated upstream

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-07-17 08:28:48 UTC (rev 897)
+++ branches/sid-5.0/debian/changelog	2007-07-17 08:36:53 UTC (rev 898)
@@ -1,6 +1,9 @@
 mysql-dfsg-5.0 (5.0.45-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  [sean finney]
+  * removed patches that are incorporated into the latest release:
+    - 70_cpuid_on_i486.dpatch
 
  -- sean finney <seanius at debian.org>  Tue, 17 Jul 2007 10:12:07 +0200
 

Modified: branches/sid-5.0/debian/patches/00list
===================================================================
--- branches/sid-5.0/debian/patches/00list	2007-07-17 08:28:48 UTC (rev 897)
+++ branches/sid-5.0/debian/patches/00list	2007-07-17 08:36:53 UTC (rev 898)
@@ -8,7 +8,6 @@
 43_scripts__mysql_update__password.dpatch
 44_scripts__mysql_config__libs.dpatch
 45_warn-CLI-passwords.dpatch
-70_cpuid_on_i486.dpatch
 86_PATH_MAX.dpatch
 88_mctype_attrib.dpatch
 89_ndb__staticlib.dpatch

Deleted: branches/sid-5.0/debian/patches/70_cpuid_on_i486.dpatch
===================================================================
--- branches/sid-5.0/debian/patches/70_cpuid_on_i486.dpatch	2007-07-17 08:28:48 UTC (rev 897)
+++ branches/sid-5.0/debian/patches/70_cpuid_on_i486.dpatch	2007-07-17 08:36:53 UTC (rev 898)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99-unnamed.dpatch by  <ch at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes segfault on i486 cpus and clones that do not support the cpuid
-## DP: instruction. The original upstream solution did not work in 
-## DP: multi-threaded applications. Closes: #410474
-
- at DPATCH@
-
---- old/extra/yassl/taocrypt/src/misc.cpp	2007-02-20 12:49:38.000000000 -0500
-+++ new/extra/yassl/taocrypt/src/misc.cpp	2007-04-05 12:29:34.000000000 -0400
-@@ -167,10 +167,10 @@
- #ifdef TAOCRYPT_X86ASM_AVAILABLE
- 
- #ifndef _MSC_VER
--    static jmp_buf s_env;
-+    static sigjmp_buf s_env;
-     static void SigIllHandler(int)
-     {
--        longjmp(s_env, 1);
-+        siglongjmp(s_env, 1);
-     }
- #endif
- 
-@@ -199,7 +199,7 @@
-         return false;
- 
-     bool result = true;
--    if (setjmp(s_env))
-+    if (sigsetjmp(s_env,1))
-         result = false;
-     else 
-         __asm__ __volatile