OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 12-Jan-2004 23:11:54
Branch: HEAD Handle: 2004011222115400
Modified files:
openpkg-src/openpkg HISTORY aux.usrgrp.sh
Log:
fix settings from --[smrn]gid options getting lost
Summary:
Revision Changes Path
1.105 +1 -0 openpkg-src/openpkg/HISTORY
1.10 +12 -8 openpkg-src/openpkg/aux.usrgrp.sh
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.104 -r1.105 HISTORY
--- openpkg-src/openpkg/HISTORY 12 Jan 2004 12:35:29 -0000 1.104
+++ openpkg-src/openpkg/HISTORY 12 Jan 2004 22:11:54 -0000 1.105
@@ -2,6 +2,7 @@
2004
====
+20040112 settings from [smrn]gid options get lost; fix by introducing a temporary
variable
20040112 fix RPM internal handling of %_excludedocs macro
20040107 fix config.cache file handling in building of GNU tar and GNU patch
20040107 downgrade to GNU tar 1.13.25 again because --no-recursion is broken in <=
1.13.92
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/aux.usrgrp.sh
============================================================================
$ cvs diff -u -r1.9 -r1.10 aux.usrgrp.sh
--- openpkg-src/openpkg/aux.usrgrp.sh 15 Jul 2003 10:08:26 -0000 1.9
+++ openpkg-src/openpkg/aux.usrgrp.sh 12 Jan 2004 22:11:54 -0000 1.10
@@ -94,9 +94,10 @@
if [ ".$sgrp" = . ]; then
sgrp=`(id -gn $susr) 2>/dev/null`
if [ ".$sgrp" = . ]; then
- sgid=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null |\
+ tgid=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null |\
grep "^${susr}:" | sed -n -e '1p' | awk -F: '{ print $4; }'`
- if [ ".$sgid" != . ]; then
+ if [ ".$tgid" != . ]; then
+ sgid="${tgid}"
sgrp=`(getent group; cat /etc/group; ypcat group) 2>/dev/null |\
grep ":${sgid}:" | sed -n -e '1p' | awk -F: '{ print $1; }'`
fi
@@ -116,9 +117,10 @@
if [ ".$mgrp" = . ]; then
mgrp=`(id -gn $musr) 2>/dev/null`
if [ ".$mgrp" = . ]; then
- mgid=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null |\
+ tgid=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null |\
grep "^${musr}:" | sed -n -e '1p' | awk -F: '{ print $4; }'`
- if [ ".$mgid" != . ]; then
+ if [ ".$tgid" != . ]; then
+ mgid="${tgid}"
mgrp=`(getent group; cat /etc/group; ypcat group) 2>/dev/null |\
grep ":${mgid}:" | sed -n -e '1p' | awk -F: '{ print $1; }'`
fi
@@ -141,9 +143,10 @@
if [ ".$rgrp" = . ]; then
rgrp=`(id -gn $rusr) 2>/dev/null`
if [ ".$rgrp" = . ]; then
- rgid=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null |\
+ tgid=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null |\
grep "^${rusr}:" | sed -n -e '1p' | awk -F: '{ print $4; }'`
- if [ ".$rgid" != . ]; then
+ if [ ".$tgid" != . ]; then
+ rgid="${tgid}"
rgrp=`(getent group; cat /etc/group; ypcat group) 2>/dev/null |\
grep ":${rgid}:" | sed -n -e '1p' | awk -F: '{ print $1; }'`
fi
@@ -166,9 +169,10 @@
if [ ".$ngrp" = . ]; then
ngrp=`(id -gn $nusr) 2>/dev/null`
if [ ".$ngrp" = . ]; then
- ngid=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null |\
+ tgid=`(getent passwd; cat /etc/passwd; ypcat passwd) 2>/dev/null |\
grep "^${nusr}:" | sed -n -e '1p' | awk -F: '{ print $4; }'`
- if [ ".$ngid" != . ]; then
+ if [ ".$tgid" != . ]; then
+ ngid="${tgid}"
ngrp=`(getent group; cat /etc/group; ypcat group) 2>/dev/null |\
grep ":${ngid}:" | sed -n -e '1p' | awk -F: '{ print $1; }'`
fi
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
