- up to 1.6.15

[packages/env-update.git] / env-update.patch

diff --git a/env-update.patch b/env-update.patch
index 6b74bd27a750fa2a60a7370ad8b63e570b8e7c6e..c72b82451f52bfd9187e73dddff751e509de2931 100644 (file)
--- a/env-update.patch
+++ b/env-update.patch
@@ -1,5 +1,5 @@
---- rc-scripts-1.6.14/sbin/env-update.sh       2004-12-03 05:56:17.000000000 +0200
-+++ rc-scripts-1.6.14.fix/sbin/env-update.sh   2006-03-25 00:49:08.000000000 +0200
+--- rc-scripts-1.6.14.fix/sbin/env-update.sh   2006-03-25 00:49:08.000000000 +0200
++++ rc-scripts-1.6.14/sbin/env-update.sh       2006-09-05 21:24:53.230270433 +0300
 @@ -1,13 +1,13 @@
 -#!/bin/bash
 +#!/bin/sh
@@ -19,9 +19,7 @@
        exit 1
  fi
  
-@@ -15,29 +15,48 @@
- echo "usage: env-update.sh
- 
+@@ -17,27 +17,47 @@
  note:
 -      This utility generates /etc/profile.env and /etc/csh.env
 -      from the contents of /etc/env.d/
@@ -72,6 +70,7 @@
 -      /bin/gawk \
 -              -f /lib/rcscripts/awk/functions.awk \
 -              -f /lib/rcscripts/awk/genenviron.awk
++      umask 002
 +      gawk \
 +              -f /lib/functions.awk \
 +              -f /lib/genenviron.awk
@@ -90,3 +89,23 @@
  
        # Get our environment variables
        SVCDIR = ENVIRON["SVCDIR"]
+--- rc-scripts-1.6.14/src/awk/genenviron.awk   2006-04-30 14:30:43.608236656 +0300
++++ rc-scripts-1.6.14/src/awk/genenviron.awk   2006-09-01 02:12:10.772056818 +0300
+@@ -29,7 +29,7 @@
+               if (x in TMPENVFILES) {
+               
+                       if ((isfile(TMPENVFILES[x])) &&
+-                          (TMPENVFILES[x] !~ /((\.(sh|c|bak))|\~)$/)) {
++                          (TMPENVFILES[x] !~ /((\.(sh|c|bak|rpm(new|save|orig)))|\~)$/)) {
+ 
+                               ENVCOUNT++
+ 
+@@ -160,7 +160,7 @@
+       print "" >> (CSHPROFILE)
+ 
+ 
+-      pipe = "bash " ENVCACHE
++      pipe = "sh " ENVCACHE
+       while ((pipe | getline) > 0) {
+ 
+               sub(/=/, "='")