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 Date: 28-Jan-2003 17:44:24
Branch: OPENPKG_1_STABLE Handle: 2003012816442301
Modified files: (Branch: OPENPKG_1_STABLE)
openpkg-src/openpkg openpkg.boot openpkg.spec rpmmacros
Log:
MFC: fix typo
Summary:
Revision Changes Path
1.17.2.1 +1 -1 openpkg-src/openpkg/openpkg.boot
1.127.2.2 +15 -15 openpkg-src/openpkg/openpkg.spec
1.29.2.1 +1 -1 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.boot
============================================================================
$ cvs diff -u -r1.17 -r1.17.2.1 openpkg.boot
--- openpkg-src/openpkg/openpkg.boot 14 Jan 2003 20:28:16 -0000 1.17
+++ openpkg-src/openpkg/openpkg.boot 28 Jan 2003 16:44:23 -0000 1.17.2.1
@@ -16,7 +16,7 @@
# Also keep in mind that lots of tricks are played here in order to
# perform all the steps without having to touch the real installation
# location. That is the whole procedure can (and should) be performed
-# by a non-priviledged user and no access to the real installation
+# by a non-privileged user and no access to the real installation
# location filesystem location.
me="openpkg.boot"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.127.2.1 -r1.127.2.2 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 18 Jan 2003 14:13:29 -0000 1.127.2.1
+++ openpkg-src/openpkg/openpkg.spec 28 Jan 2003 16:44:24 -0000 1.127.2.2
@@ -39,8 +39,8 @@
# o any cc(1)
# the package version and release
-%define V_openpkg 1.20030114
-%define R_openpkg 1.20030114
+%define V_openpkg 1.20030128
+%define R_openpkg 1.20030128
# the used software versions
%define V_rpm 4.0.2
@@ -849,7 +849,7 @@
# always performed for upgrades and because it doesn't harm!
#[ ".$1" != .1 ] && exit 0
- # this procedure is only usable with root priviledges
+ # this procedure is only usable with root privileges
# (for non-root installations it is not required at all)
cusr=`(id -un) 2>/dev/null ||\
(id | sed -e 's;^[^(]*(\([^)]*\)).*;\1;') 2>/dev/null ||\
@@ -928,7 +928,7 @@
if [ ".$exists" = . ]; then
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping addition of $shell to /etc/shells" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
echo "${shell}" >>/etc/shells
fi
@@ -938,7 +938,7 @@
for req in "superuser:${susr}:${suid}:${sgrp}:${sgid}" \
"management:${musr}:${muid}:${mgrp}:${mgid}" \
"restricted:${rusr}:${ruid}:${rgrp}:${rgid}" \
- "non-priviledged:${nusr}:${nuid}:${ngrp}:${ngid}"; do
+ "non-privileged:${nusr}:${nuid}:${ngrp}:${ngid}"; do
# split request into class/usr/uid/grp/gid
OIFS="$IFS"; IFS=":"; set -- $req; IFS="$OIFS"
class="$1"; usr="$2"; uid="$3"; grp="$4"; gid="$5"
@@ -948,7 +948,7 @@
if [ ".$exists" = . ]; then
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping creation of OpenPKG $class user
$usr" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
# add entry to passwd database
realname="${prefix} OpenPKG ($class)"
@@ -991,7 +991,7 @@
if [ ".$exists" = . ]; then
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping creation of OpenPKG $class group
$grp" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
# add entry to group database
file=/etc/group
@@ -1007,7 +1007,7 @@
name=`echo "$prefix" | sed -e 's;/;;g'`
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping creation of system run-command hooks" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
case "$plid" in
FreeBSD/* )
@@ -1194,7 +1194,7 @@
# create the cron transfer entries
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping creation of system cron hooks" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
case "$plid" in
FreeBSD/* | Linux/* )
@@ -1295,7 +1295,7 @@
if [ ".$exists" != . ]; then
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping deletion of $shell from /etc/shells"
1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
cp /etc/shells /etc/shells.bak && \
grep -v "^${shell}" /etc/shells.bak >/etc/shells
@@ -1306,7 +1306,7 @@
for req in "super-user:%{l_susr}:%{l_suid}:%{l_sgrp}:%{l_sgid}" \
"management:%{l_musr}:%{l_muid}:%{l_mgrp}:%{l_mgid}" \
"restricted:%{l_rusr}:%{l_ruid}:%{l_rgrp}:%{l_rgid}" \
- "non-priviledged:%{l_nusr}:%{l_nuid}:%{l_ngrp}:%{l_ngid}"; do
+ "non-privileged:%{l_nusr}:%{l_nuid}:%{l_ngrp}:%{l_ngid}"; do
# split request into class/usr/uid/grp/gid
OIFS="$IFS"; IFS=":"; set -- $req; IFS="$OIFS"
class="$1"; usr="$2"; uid="$3"; grp="$4"; gid="$5"
@@ -1316,7 +1316,7 @@
if [ ".$exists" != . ]; then
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping deletion of OpenPKG $class user
$usr" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
elif [ ".$usr" = ".root" ]; then
echo "openpkg:WARNING: skipping deletion of OpenPKG $class user
$usr" 1>&2
echo "openpkg:WARNING: (would remove system standard user)" 1>&2
@@ -1350,7 +1350,7 @@
if [ ".$exists" = . ]; then
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping deletion of OpenPKG $class group
$grp" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
elif [ ".$usr" = ".root" ] || [ ".$grp" = ".root" ] || [ ".$grp" =
".wheel" ]; then
echo "openpkg:WARNING: skipping deletion of OpenPKG $class group
$grp" 1>&2
echo "openpkg:WARNING: (would remove system standard group)" 1>&2
@@ -1366,7 +1366,7 @@
name=`echo "$prefix" | sed -e 's;/;;g'`
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping deletion of system run-command hooks" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
case "$plid" in
FreeBSD/* )
@@ -1437,7 +1437,7 @@
# remove the cron transfer entries
if [ ".$cusr" != ".root" ]; then
echo "openpkg:WARNING: skipping deletion of system cron hooks" 1>&2
- echo "openpkg:WARNING: (would require root-priviledges)" 1>&2
+ echo "openpkg:WARNING: (would require root-privileges)" 1>&2
else
case "$plid" in
FreeBSD/* | Linux/* )
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.29 -r1.29.2.1 rpmmacros
--- openpkg-src/openpkg/rpmmacros 8 Jan 2003 14:31:38 -0000 1.29
+++ openpkg-src/openpkg/rpmmacros 28 Jan 2003 16:44:24 -0000 1.29.2.1
@@ -48,7 +48,7 @@
%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; }')
-# the *N*on-priviledged user/group name/id pair
+# 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; }')
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
