Accepting request 26308 from home:jengelh:branches:Base:System

Copy from home:jengelh:branches:Base:System/bash via accept of submit request 26308 revision 2. Request was accepted with message: reviewed OBS-URL: https://build.opensuse.org/request/show/26308 OBS-URL: https://build.opensuse.org/package/show/Base:System/bash?expand=0&rev=16
2009-12-14 22:28:55 +00:00
parent b3ea211513
commit 00b5524e84
4 changed files with 67 additions and 87 deletions
--- a/bash-4.0-security.patch
+++ b/bash-4.0-security.patch
@@ -1,85 +1,43 @@
-Index: variables.c
-===================================================================
--- variables.c.orig
-+++ variables.c
-@@ -1203,6 +1203,7 @@ init_seconds_var ()
-   return v;      
- }
-      
-+#if !defined(linux)
- /* The random number seed.  You can change this by setting RANDOM. */
- static unsigned long rseed = 1;
+--- variables.c
+++ variables.c	2009-12-04 09:31:06.579929599 +0000
+@@ -1216,6 +1216,7 @@ static unsigned long rseed = 1;
 static int last_random_value;
-@@ -1256,6 +1257,24 @@ seedrand ()
+ static int seeded_subshell = 0;
+ 
+#if !defined(linux)
+ /* A linear congruential random number generator based on the example
+    one in the ANSI C standard.  This one isn't very good, but a more
+    complicated one is overkill. */
+@@ -1264,6 +1265,32 @@ seedrand ()
   sbrand (tv.tv_sec ^ tv.tv_usec ^ getpid ());
 }
 
 +#else
-+
-+static int last_sbrand_pid;
-+
-+static int brand ()
+/* Use ISO C Random Number Functions of the glibc */
+static int
+brand (void)
 +{
-+  return random() & 32767;
-+}
-+
-+static void sbrand (unsigned long seed)
-+{
-+  srandom(seed);
+  if (rseed == 0)
+    seedrand ();
+  return rand() & 32767;
 +}
 +
 +static void
-+seedrand () {}
+sbrand (unsigned long seed)
+{
+  rseed = seed;
+  srand(seed);
+}
+
+static void
+seedrand (void)
+{
+  struct timeval tv;
+  gettimeofday (&tv, NULL);
+  srand (tv.tv_sec ^ tv.tv_usec ^ getpid ());
+}
 +#endif
 +
 static SHELL_VAR *
 assign_random (self, value, unused, key)
      SHELL_VAR *self;
-@@ -1264,8 +1283,10 @@ assign_random (self, value, unused, key)
-      char *key;
- {
-   sbrand (strtoul (value, (char **)NULL, 10));
-+#if !defined(linux)
-   if (subshell_environment)
-     seeded_subshell = getpid ();
-+#endif
-   return (self);
- }
- 
-@@ -1274,6 +1295,7 @@ get_random_number ()
- {
-   int rv, pid;
- 
-+#if !defined(linux)
-   /* Reset for command and process substitution. */
-   pid = getpid ();
-   if (subshell_environment && seeded_subshell != pid)
-@@ -1285,6 +1307,18 @@ get_random_number ()
-   do
-     rv = brand ();
-   while (rv == last_random_value);
-+#else
-+  if (subshell_environment)
-+    {
-+      int mypid = getpid();
-+      if (mypid != last_sbrand_pid)
-+	{
-+	  last_sbrand_pid = mypid;
-+	  sbrand (mypid + NOW);
-+	}
-+    }
-+  rv = brand();
-+#endif
-   return rv;
- }
- 
-@@ -1296,7 +1330,9 @@ get_random (var)
-   char *p;
- 
-   rv = get_random_number ();
-+#if !defined(linux)
-   last_random_value = rv;
-+#endif
-   p = itos (rv);
- 
-   FREE (value_cell (var));