OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 23-Feb-2003 20:28:36
Branch: HEAD Handle: 2003022319283402
Modified files:
openpkg-src/openpkg openpkg.spec rpmmacros
openpkg-web news.txt
Log:
add more 'getent' support
Summary:
Revision Changes Path
1.137 +2 -2 openpkg-src/openpkg/openpkg.spec
1.31 +8 -8 openpkg-src/openpkg/rpmmacros
1.3424 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.136 -r1.137 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 22 Feb 2003 12:46:00 -0000 1.136
+++ openpkg-src/openpkg/openpkg.spec 23 Feb 2003 19:28:36 -0000 1.137
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 20030222
-%define R_openpkg 20030222
+%define V_openpkg 20030223
+%define R_openpkg 20030223
# the used software versions
%define V_rpm 4.0.2
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.30 -r1.31 rpmmacros
--- openpkg-src/openpkg/rpmmacros 28 Jan 2003 16:43:15 -0000 1.30
+++ openpkg-src/openpkg/rpmmacros 23 Feb 2003 19:28:36 -0000 1.31
@@ -33,26 +33,26 @@
# the *S*uper-user user/group name/id pair
%l_susr @SUSR@
%l_sgrp @SGRP@
-%l_suid %((cat /etc/passwd; ypcat passwd) 2>/dev/null | grep
"^%{l_susr}:" | head -1 | awk -F: '{ print $3; }')
-%l_sgid %((cat /etc/group; ypcat group) 2>/dev/null | grep
"^%{l_sgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_suid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_susr}:" | head -1 | awk -F: '{ print $3; }')
+%l_sgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_sgrp}:" | head -1 | awk -F: '{ print $3; }')
# the *M*anagement user/group name/id pair
%l_musr @MUSR@
%l_mgrp @MGRP@
-%l_muid %((cat /etc/passwd; ypcat passwd) 2>/dev/null | grep
"^%{l_musr}:" | head -1 | awk -F: '{ print $3; }')
-%l_mgid %((cat /etc/group; ypcat group) 2>/dev/null | grep
"^%{l_mgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_muid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_musr}:" | head -1 | awk -F: '{ print $3; }')
+%l_mgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_mgrp}:" | head -1 | awk -F: '{ print $3; }')
# the *R*restricted user/group name/id pair
%l_rusr @RUSR@
%l_rgrp @RGRP@
-%l_ruid %((cat /etc/passwd; ypcat passwd) 2>/dev/null | grep
"^%{l_rusr}:" | head -1 | awk -F: '{ print $3; }')
-%l_rgid %((cat /etc/group; ypcat group) 2>/dev/null | grep
"^%{l_rgrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_ruid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_rusr}:" | head -1 | awk -F: '{ print $3; }')
+%l_rgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_rgrp}:" | head -1 | awk -F: '{ print $3; }')
# the *N*on-privileged user/group name/id pair
%l_nusr @NUSR@
%l_ngrp @NGRP@
-%l_nuid %((cat /etc/passwd; ypcat passwd) 2>/dev/null | grep
"^%{l_nusr}:" | head -1 | awk -F: '{ print $3; }')
-%l_ngid %((cat /etc/group; ypcat group) 2>/dev/null | grep
"^%{l_ngrp}:" | head -1 | awk -F: '{ print $3; }')
+%l_nuid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_nusr}:" | head -1 | awk -F: '{ print $3; }')
+%l_ngid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_ngrp}:" | head -1 | awk -F: '{ print $3; }')
# backward compatibility (openpkg < 20020204)
%l_fsusr %{l_musr}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3423 -r1.3424 news.txt
--- openpkg-web/news.txt 23 Feb 2003 19:24:12 -0000 1.3423
+++ openpkg-web/news.txt 23 Feb 2003 19:28:34 -0000 1.3424
@@ -1,3 +1,4 @@
+23-Feb-2003: Upgraded package: P<openpkg-20030223-20030223>
23-Feb-2003: Upgraded package: P<ifile-1.3.0-20030223>
23-Feb-2003: New package: P<gtk2-2.2.1-20030223>
23-Feb-2003: Upgraded package: P<orbit2-2.6.0-20030223>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
