Slackware 13.37slackware-13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!

4 files changed, 22 insertions, 339 deletions

diff --git a/source/l/mpfr/mpfr.SlackBuild b/source/l/mpfr/mpfr.SlackBuild
index 808cbdacb..a96001cd1 100755
--- a/source/l/mpfr/mpfr.SlackBuild
+++ b/source/l/mpfr/mpfr.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,6 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+PKGNAM=mpfr
 VERSION=${VERSION:-$(echo mpfr-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 BUILD=${BUILD:-1}
 
@@ -67,12 +68,16 @@ rm -rf mpfr-$VERSION
 tar xvf $CWD/mpfr-$VERSION.tar.?z* || exit 1
 cd mpfr-$VERSION
 chown -R root:root .
-for file in $CWD/patches/* ; do
-  ( zcat $file 2> /dev/null | patch -p1 --verbose --batch 2> /dev/null || exit 1 )
-  if [ ! $? = 0 ]; then
-    exit 1
-  fi
-done
+
+if [ ! -z "$(ls $CWD/patches/* 2> /dev/null)" ]; then
+  for file in $CWD/patches/* ; do
+    ( zcat $file 2> /dev/null | patch -p1 --verbose --batch 2> /dev/null || exit 1 )
+    if [ ! $? = 0 ]; then
+      exit 1
+    fi
+  done
+fi
+
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
@@ -81,7 +86,7 @@ CFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/mpfr-$VERSION \
   --enable-static=yes \
   --enable-shared=yes \
-  $ARCH-slackware-linux
+  --build=$ARCH-slackware-linux
 
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -97,10 +102,18 @@ gzip -9 $PKG/usr/info/*
 
 mkdir -p $PKG/usr/doc/mpfr-$VERSION
 cp -a \
-  AUTHORS BUGS COPYING COPYING.LIB FAQ.html INSTALL NEWS README TODO VERSION \
+  AUTHORS BUGS COPYING* FAQ.html INSTALL NEWS README* TODO VERSION \
   examples \
   $PKG/usr/doc/mpfr-$VERSION
 
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+  DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+  touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/source/l/mpfr/patches/patch01 b/source/l/mpfr/patches/patch01
deleted file mode 100644
index 2721517c4..000000000
--- a/source/l/mpfr/patches/patch01
+++ /dev/null
@@ -1,184 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2009-12-07 13:37:12.000000000 +0000
-@@ -0,0 +1 @@
-+sin_cos_underflow
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2009-12-07 13:37:12.000000000 +0000
-@@ -1 +1 @@
--2.4.2
-+2.4.2-p1
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2009-12-07 13:37:12.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2"
-+#define MPFR_VERSION_STRING "2.4.2-p1"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/sin_cos.c mpfr-2.4.2-b/sin_cos.c
---- mpfr-2.4.2-a/sin_cos.c	2009-11-30 02:43:09.000000000 +0000
-+++ mpfr-2.4.2-b/sin_cos.c	2009-12-07 13:37:12.000000000 +0000
-@@ -82,17 +82,19 @@
-       if (y != x)
-         /* y and x differ, thus we can safely try to compute y first */
-         {
--          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0, rnd_mode,
--                                            { inexy = _inexact;
--                                              goto small_input; });
-+          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+            y, x, -2 * expx, 2, 0, rnd_mode,
-+            { inexy = _inexact;
-+              goto small_input; });
-           if (0)
-             {
-             small_input:
-               /* we can go here only if we can round sin(x) */
--              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
--                                                1, 0, rnd_mode,
--                                                { inexz = _inexact;
--                                                  goto end; });
-+              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+                z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
-+                { inexz = _inexact;
-+                  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
-+                  goto end; });
-             }
- 
-           /* if we go here, one of the two MPFR_FAST_COMPUTE_IF_SMALL_INPUT
-@@ -101,18 +103,19 @@
-       else /* y and x are the same variable: try to compute z first, which
-               necessarily differs */
-         {
--          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (z, __gmpfr_one, -2 * expx,
--                                            1, 0, rnd_mode,
--                                            { inexz = _inexact;
--                                              goto small_input2; });
-+          MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+            z, __gmpfr_one, -2 * expx, 1, 0, rnd_mode,
-+            { inexz = _inexact;
-+              goto small_input2; });
-           if (0)
-             {
-             small_input2:
-               /* we can go here only if we can round cos(x) */
--              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (y, x, -2 * expx, 2, 0,
--                                                rnd_mode,
--                                                { inexy = _inexact;
--                                                  goto end; });
-+              MPFR_FAST_COMPUTE_IF_SMALL_INPUT (
-+                y, x, -2 * expx, 2, 0, rnd_mode,
-+                { inexy = _inexact;
-+                  MPFR_SAVE_EXPO_UPDATE_FLAGS (expo, __gmpfr_flags);
-+                  goto end; });
-             }
-         }
-       m += 2 * (-expx);
-@@ -207,7 +210,6 @@
-   mpfr_clear (xr);
- 
-  end:
--  /* FIXME: update the underflow flag if need be. */
-   MPFR_SAVE_EXPO_FREE (expo);
-   mpfr_check_range (y, inexy, rnd_mode);
-   mpfr_check_range (z, inexz, rnd_mode);
-diff -Naurd mpfr-2.4.2-a/tests/tsin_cos.c mpfr-2.4.2-b/tests/tsin_cos.c
---- mpfr-2.4.2-a/tests/tsin_cos.c	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/tests/tsin_cos.c	2009-12-07 13:37:12.000000000 +0000
-@@ -382,23 +382,56 @@
- consistency (void)
- {
-   mpfr_t x, s1, s2, c1, c2;
-+  mp_exp_t emin, emax;
-   mp_rnd_t rnd;
-+  unsigned int flags_sin, flags_cos, flags, flags_before, flags_ref;
-+  int inex_sin, inex_cos, inex, inex_ref;
-   int i;
- 
-+  emin = mpfr_get_emin ();
-+  emax = mpfr_get_emax ();
-+
-   for (i = 0; i <= 10000; i++)
-     {
-       mpfr_init2 (x, MPFR_PREC_MIN + (randlimb () % 8));
-       mpfr_inits2 (MPFR_PREC_MIN + (randlimb () % 8), s1, s2, c1, c2,
-                    (mpfr_ptr) 0);
--      tests_default_random (x, 256, -5, 50);
--      rnd = RND_RAND ();
--      mpfr_sin (s1, x, rnd);
--      mpfr_cos (c1, x, rnd);
--      mpfr_sin_cos (s2, c2, x, rnd);
--      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)))
-+      if (i < 8 * GMP_RND_MAX)
-         {
--          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,\nx = ",
--                  mpfr_print_rnd_mode (rnd));
-+          int j = i / GMP_RND_MAX;
-+          if (j & 1)
-+            mpfr_set_emin (MPFR_EMIN_MIN);
-+          mpfr_set_si (x, (j & 2) ? 1 : -1, GMP_RNDN);
-+          mpfr_set_exp (x, mpfr_get_emin ());
-+          rnd = (mpfr_rnd_t) (i % GMP_RND_MAX);
-+          flags_before = 0;
-+          if (j & 4)
-+            mpfr_set_emax (-17);
-+        }
-+      else
-+        {
-+          tests_default_random (x, 256, -5, 50);
-+          rnd = RND_RAND ();
-+          flags_before = (randlimb () & 1) ?
-+            (unsigned int) (MPFR_FLAGS_ALL ^ MPFR_FLAGS_ERANGE) :
-+            (unsigned int) 0;
-+        }
-+      __gmpfr_flags = flags_before;
-+      inex_sin = mpfr_sin (s1, x, rnd);
-+      flags_sin = __gmpfr_flags;
-+      __gmpfr_flags = flags_before;
-+      inex_cos = mpfr_cos (c1, x, rnd);
-+      flags_cos = __gmpfr_flags;
-+      __gmpfr_flags = flags_before;
-+      inex = !!mpfr_sin_cos (s2, c2, x, rnd);
-+      flags = __gmpfr_flags;
-+      inex_ref = inex_sin || inex_cos;
-+      flags_ref = flags_sin | flags_cos;
-+      if (!(mpfr_equal_p (s1, s2) && mpfr_equal_p (c1, c2)) ||
-+          inex != inex_ref || flags != flags_ref)
-+        {
-+          printf ("mpfr_sin_cos and mpfr_sin/mpfr_cos disagree on %s,"
-+                  " i = %d\nx = ", mpfr_print_rnd_mode (rnd), i);
-           mpfr_dump (x);
-           printf ("s1 = ");
-           mpfr_dump (s1);
-@@ -408,9 +441,16 @@
-           mpfr_dump (c1);
-           printf ("c2 = ");
-           mpfr_dump (c2);
-+          printf ("inex_sin = %d, inex_cos = %d, inex = %d (expected %d)\n",
-+                  inex_sin, inex_cos, inex, inex_ref);
-+          printf ("flags_sin = 0x%x, flags_cos = 0x%x, "
-+                  "flags = 0x%x (expected 0x%x)\n",
-+                  flags_sin, flags_cos, flags, flags_ref);
-           exit (1);
-         }
-       mpfr_clears (x, s1, s2, c1, c2, (mpfr_ptr) 0);
-+      mpfr_set_emin (emin);
-+      mpfr_set_emax (emax);
-     }
- }
- 
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2009-12-07 13:37:12.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2";
-+  return "2.4.2-p1";
- }
diff --git a/source/l/mpfr/patches/patch02 b/source/l/mpfr/patches/patch02
deleted file mode 100644
index fa85d8ef3..000000000
--- a/source/l/mpfr/patches/patch02
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2009-12-18 12:03:30.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2009-12-18 12:05:19.000000000 +0000
-@@ -0,0 +1 @@
-+longlong.h
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2009-12-18 12:05:09.000000000 +0000
-@@ -1 +1 @@
--2.4.2-p1
-+2.4.2-p2
-diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h
---- mpfr-2.4.2-a/mpfr-longlong.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr-longlong.h	2009-12-18 12:04:29.000000000 +0000
-@@ -1011,7 +1011,15 @@
- #endif /* __m88000__ */
- 
- #if defined (__mips) && W_TYPE_SIZE == 32
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UDItype _r;							\
-+    _r = (UDItype) u * v;						\
-+    (w1) = _r >> 32;							\
-+    (w0) = (USItype) _r;						\
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
- #else
-@@ -1024,7 +1032,16 @@
- #endif /* __mips */
- 
- #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
--#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
-+#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4)
-+typedef unsigned int UTItype __attribute__ ((mode (TI)));
-+#define umul_ppmm(w1, w0, u, v) \
-+  do {									\
-+    UTItype _r;							\
-+    _r = (UTItype) u * v;						\
-+    (w1) = _r >> 64;							\
-+    (w0) = (UDItype) _r;						\
-+  } while (0)
-+#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7
- #define umul_ppmm(w1, w0, u, v) \
-   __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
- #else
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2009-12-18 12:05:09.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2-p1"
-+#define MPFR_VERSION_STRING "2.4.2-p2"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-12-07 13:37:12.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2009-12-18 12:05:09.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2-p1";
-+  return "2.4.2-p2";
- }
diff --git a/source/l/mpfr/patches/patch03 b/source/l/mpfr/patches/patch03
deleted file mode 100644
index 3ce4952f2..000000000
--- a/source/l/mpfr/patches/patch03
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naurd mpfr-2.4.2-a/PATCHES mpfr-2.4.2-b/PATCHES
---- mpfr-2.4.2-a/PATCHES	2010-01-11 15:27:18.000000000 +0000
-+++ mpfr-2.4.2-b/PATCHES	2010-01-11 15:30:31.000000000 +0000
-@@ -0,0 +1 @@
-+gmp5
-diff -Naurd mpfr-2.4.2-a/VERSION mpfr-2.4.2-b/VERSION
---- mpfr-2.4.2-a/VERSION	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/VERSION	2010-01-11 15:29:40.000000000 +0000
-@@ -1 +1 @@
--2.4.2-p2
-+2.4.2-p3
-diff -Naurd mpfr-2.4.2-a/configure mpfr-2.4.2-b/configure
---- mpfr-2.4.2-a/configure	2009-11-30 02:44:35.000000000 +0000
-+++ mpfr-2.4.2-b/configure	2010-01-11 15:28:56.000000000 +0000
-@@ -20449,6 +20449,9 @@
- main ()
- {
- 
-+#ifndef BITS_PER_MP_LIMB
-+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+#endif
-   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
-          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
- 
-diff -Naurd mpfr-2.4.2-a/configure.in mpfr-2.4.2-b/configure.in
---- mpfr-2.4.2-a/configure.in	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/configure.in	2009-11-30 02:43:08.000000000 +0000
-@@ -424,6 +424,9 @@
- #include "gmp.h"
- #include "gmp-impl.h"
- ]], [[
-+#ifndef BITS_PER_MP_LIMB
-+#define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+#endif
-   return BITS_PER_MP_LIMB == BYTES_PER_MP_LIMB * CHAR_BIT
-          && sizeof(mp_limb_t) == BYTES_PER_MP_LIMB ? 0 : 1;
- ]])], [AC_MSG_RESULT(yes)], [
-diff -Naurd mpfr-2.4.2-a/mpfr-impl.h mpfr-2.4.2-b/mpfr-impl.h
---- mpfr-2.4.2-a/mpfr-impl.h	2009-11-30 02:43:08.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr-impl.h	2010-01-11 15:28:01.000000000 +0000
-@@ -65,6 +65,12 @@
- # ifndef __GMP_IMPL_H__
- #  include "gmp-impl.h"
- # endif
-+# ifndef BITS_PER_MP_LIMB
-+#  define BITS_PER_MP_LIMB GMP_LIMB_BITS
-+# endif
-+#ifndef mpn_sqr_n
-+# define mpn_sqr_n mpn_sqr
-+#endif
- # ifdef MPFR_NEED_LONGLONG_H
- #  include "longlong.h"
- # endif
-diff -Naurd mpfr-2.4.2-a/mpfr.h mpfr-2.4.2-b/mpfr.h
---- mpfr-2.4.2-a/mpfr.h	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/mpfr.h	2010-01-11 15:29:40.000000000 +0000
-@@ -27,7 +27,7 @@
- #define MPFR_VERSION_MAJOR 2
- #define MPFR_VERSION_MINOR 4
- #define MPFR_VERSION_PATCHLEVEL 2
--#define MPFR_VERSION_STRING "2.4.2-p2"
-+#define MPFR_VERSION_STRING "2.4.2-p3"
- 
- /* Macros dealing with MPFR VERSION */
- #define MPFR_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
-diff -Naurd mpfr-2.4.2-a/version.c mpfr-2.4.2-b/version.c
---- mpfr-2.4.2-a/version.c	2009-12-18 12:05:09.000000000 +0000
-+++ mpfr-2.4.2-b/version.c	2010-01-11 15:29:40.000000000 +0000
-@@ -25,5 +25,5 @@
- const char *
- mpfr_get_version (void)
- {
--  return "2.4.2-p2";
-+  return "2.4.2-p3";
- }