OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 05-Mar-2007 23:39:15 Branch: HEAD Handle: 2007030522391400 Modified files: openpkg-src/openpkg HISTORY rpmtool rpmtool.8 rpmtool.pod Log: remove dormant code for system user/group addition/removal from rpmtool Summary: Revision Changes Path 1.434 +1 -0 openpkg-src/openpkg/HISTORY 1.54 +2 -286 openpkg-src/openpkg/rpmtool 1.13 +0 -6 openpkg-src/openpkg/rpmtool.8 1.18 +0 -8 openpkg-src/openpkg/rpmtool.pod ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/openpkg/HISTORY ============================================================================ $ cvs diff -u -r1.433 -r1.434 HISTORY --- openpkg-src/openpkg/HISTORY 5 Mar 2007 22:33:08 -0000 1.433 +++ openpkg-src/openpkg/HISTORY 5 Mar 2007 22:39:14 -0000 1.434 @@ -2,6 +2,7 @@ 2007 ==== +20070305 upgrade to rpmtool 1.1.0 remove dormant code for system user/group addition/removal 20070302 upgrade to openpkg-registry 1.1.1 upgrade safety 20070302 upgrade to openpkg-tools 1.4.3 direct access relative path names (identified by leading "./"); minor re fix in 1.4.4 20070226 upgrade to openpkg-tools 1.4.2 direct access absolut path names (identified by leading "/"), download from URLs (including "file://") @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpmtool ============================================================================ $ cvs diff -u -r1.53 -r1.54 rpmtool --- openpkg-src/openpkg/rpmtool 4 Feb 2007 22:57:31 -0000 1.53 +++ openpkg-src/openpkg/rpmtool 5 Mar 2007 22:39:14 -0000 1.54 @@ -25,8 +25,8 @@ prog_path="$0" prog_name="rpmtool" -prog_vers="1.0.2" -prog_date="03-Aug-2001" +prog_vers="1.1.0" +prog_date="05-Mar-2007" if [ $# -eq 0 ]; then echo "$0:Error: invalid command line" 1>&2 @@ -51,9 +51,6 @@ echo ' cppflags [-p <prefix>] [<subdir> ...]' echo ' ldflags [-p <prefix>] [<subdir> ...]' echo ' files [-v] [-o <outfile>] [-r <buildroot>] [<filelist>]' - echo ' user [-c] [-d] [-p <passwd>] [-n <realname>] [-d <homedir>]' - echo ' [-s <shell>] [-u <min-uid>] <username>' - echo ' group [-c] [-d] <groupname> <min-gid> [<username> ...]' echo ' signal [-v] [-t] [-n] [-c] [-d <delay>] [-p <pid>] [-m <pattern>] <sig> [<sig> ...]' echo ' config [-v] [-s] [-a] [-r] [-b <ext>] [-p <tagprefix>] [-t <tagname>] [-i <tagid>] <file>' echo ' msg [-b] [-r] [-t <type>]' @@ -115,26 +112,6 @@ opt_o='' opt_r='' ;; - user ) - str_usage="[-a] [-r] [-p <passwd>] [-n <realname>] [-d <homedir>] [-s <shell>] [-u <min-uid>] <username>" - arg_spec="1=" - opt_spec="a.r.p:n:d:s:u:" - opt_a=no - opt_r=no - opt_p='' - opt_n='' - opt_d='' - opt_s='' - opt_u=1000 - ;; - group ) - str_usage="[-a] [-r] [-g <min-gid>] <groupname> [<username> ...]" - arg_spec="1+" - opt_spec="a.r.g:" - opt_a=no - opt_r=no - opt_g=1000 - ;; signal ) str_usage="[-v] [-t] [-n] [-c] [-d <delay>] [-p <pid>] [-m <pattern>] <sig> [<sig> ...]" arg_spec="1+" @@ -912,267 +889,6 @@ fi ;; - user ) - # calling convention - if [ ".$opt_a" = .no -a ".$opt_r" = .no ]; then - echo "$msgprefix:Error: either -a or -r has to be given" 1>&2 - exit 1 - fi - if [ ".$opt_a" = .yes -a ".$opt_r" = .yes ]; then - echo "$msgprefix:Error: only -a or -r can be given" 1>&2 - exit 1 - fi - user=$1 - - # default values - if [ ".$opt_n" = . ]; then - opt_n="$user" - fi - if [ ".$opt_s" = . ]; then - opt_s=`which false 2>/dev/null` - if [ ".$opt_s" = . ]; then - opt_s="/bin/false" - fi - fi - if [ ".$opt_d" = . ]; then - opt_d="/nowhere" - fi - - # add user - if [ ".$opt_a" = .yes ]; then - case "$platform" in - *:Darwin:*:* ) - exists=`(cat /etc/passwd; nidump passwd .) 2>/dev/null | grep "^$user:"` - ;; - * ) - exists=`grep "^$user:" /etc/passwd` - ;; - esac - if [ ".$exists" != . ]; then - echo "$msgprefix:Error: user \`$user' already exists" 1>&2 - exit 1 - fi - - # seek for next free uid - uid=$opt_u - ok=0 - while [ ".$ok" = .0 ]; do - case "$platform" in - *:Darwin:*:* ) - u_exists=`(cat /etc/passwd; nidump passwd .) 2>/dev/null | grep "^[^:]*:[^:]*:$uid:"` - g_exists=`(cat /etc/group; nidump group .) 2>/dev/null | grep "^[^:]*:[^:]*:$uid:"` - ;; - * ) - u_exists=`grep "^[^:]*:[^:]*:$uid:" /etc/passwd` - g_exists=`grep "^[^:]*:[^:]*:$uid:" /etc/group` - ;; - esac - if [ ".$u_exists" = . -a ".$g_exists" = . ]; then - ok=1 - break - fi - uid=`expr $uid + 1` - done - - # add entry to passwd database - case "$platform" in - *:FreeBSD:[456].*:* | *:NetBSD:1.*:* ) - echo "${user}:*:${uid}:${uid}::0:0:${opt_n}:${opt_d}:${opt_s}" >>/etc/master.passwd - (PATH="$PATH:/usr/sbin"; pwd_mkdb -p /etc/master.passwd) - ;; - *:Linux:2.*:* ) - echo "${user}:*:${uid}:${uid}::${opt_n}:${opt_d}:${opt_s}" >>/etc/passwd - (PATH="$PATH:/usr/sbin"; pwconv) - ;; - *:SunOS:5.*:* ) - echo "${user}:*:${uid}:${uid}:${opt_n}:${opt_d}:${opt_s}" >>/etc/passwd - (PATH="$PATH:/usr/sbin"; pwconv) - ;; - *:OSF1:5.*:* ) - echo "${user}:*:${uid}:${uid}:${opt_n}:${opt_d}:${opt_s}" >>/etc/passwd - (PATH="$PATH:/usr/sbin"; mkpasswd /etc/passwd) - ;; - *:HP-UX:*:* ) - echo "${user}:*:${uid}:${uid}:${opt_n}:${opt_d}:${opt_s}" >>/etc/passwd - ;; - *:IRIX64:6.*:* ) - echo "${user}:*:${uid}:${uid}:${opt_n}:${opt_d}:${opt_s}" >>/etc/passwd - (PATH="$PATH:/usr/sbin"; pwconv) - ;; - *:Darwin:*:* ) - niutil -create . "/users/${user}" - niutil -createprop . "/users/${user}" passwd "*" - niutil -createprop . "/users/${user}" uid "${uid}" - niutil -createprop . "/users/${user}" gid "${uid}" - niutil -createprop . "/users/${user}" realname "${opt_n}" - niutil -createprop . "/users/${user}" home "${opt_d}" - niutil -createprop . "/users/${user}" shell "${opt_s}" - ;; - esac - - # add corresponding entry to group database - case "$platform" in - *:Darwin:*:* ) - niutil -create . "/groups/${user}" - niutil -createprop . "/groups/${user}" gid "${uid}" - niutil -createprop . "/groups/${user}" users "${user}" - ;; - * ) - echo "${user}:*:${uid}:${user}" >>/etc/group - ;; - esac - - # remove user - elif [ ".$opt_r" = .yes ]; then - case "$platform" in - *:Darwin:*:* ) - exists=`(cat /etc/passwd; nidump passwd .) 2>/dev/null | grep "^$user:"` - ;; - * ) - exists=`grep "^$user:" /etc/passwd` - ;; - esac - if [ ".$exists" = . ]; then - echo "$msgprefix:Error: user \`$user' does not exist" 1>&2 - exit 1 - fi - - # remove entry from passwd database - case "$platform" in - *:FreeBSD:[456].*:* | *:NetBSD:1.*:* ) - cp /etc/master.passwd /etc/master.passwd.old - grep -v "^${user}:" /etc/master.passwd.old >/etc/master.passwd - (PATH="$PATH:/usr/sbin"; pwd_mkdb -p /etc/master.passwd) - rm -f /etc/master.passwd.old - ;; - *:Linux:2.*:* | *:SunOS:5.*:* ) - cp /etc/passwd /etc/passwd.old - grep -v "^${user}:" /etc/passwd.old >/etc/passwd - (PATH="$PATH:/usr/sbin"; pwconv) - rm -f /etc/passwd.old - ;; - *:OSF1:5.*:* ) - cp /etc/passwd /etc/passwd.old - grep -v "^${user}:" /etc/passwd.old >/etc/passwd - (PATH="$PATH:/usr/sbin"; mkpasswd /etc/passwd) - rm -f /etc/passwd.old - ;; - *:HP-UX:*:* ) - cp /etc/passwd /etc/passwd.old - grep -v "^${user}:" /etc/passwd.old >/etc/passwd - rm -f /etc/passwd.old - ;; - *:IRIX64:6.*:* ) - cp /etc/passwd /etc/passwd.old - grep -v "^${user}:" /etc/passwd.old >/etc/passwd - (PATH="$PATH:/usr/sbin"; pwconv) - rm -f /etc/passwd.old - ;; - *:Darwin:*:* ) - niutil -destroy . "/users/${user}" - ;; - esac - - # remove corresponding entry from group database - case "$platform" in - *:Darwin:*:* ) - niutil -destroy . "/groups/${user}" - ;; - * ) - cp /etc/group /etc/group.old - grep -v "^${user}:" /etc/group.old >/etc/group - rm -f /etc/group.old - ;; - esac - fi - ;; - - group ) - if [ ".$opt_a" = .no -a ".$opt_r" = .no ]; then - echo "$msgprefix:Error: either -a or -r has to be given" 1>&2 - exit 1 - fi - if [ ".$opt_a" = .yes -a ".$opt_r" = .yes ]; then - echo "$msgprefix:Error: only -a or -r can be given" 1>&2 - exit 1 - fi - group=$1 - - # add group - if [ ".$opt_a" = .yes ]; then - case "$platform" in - *:Darwin:*:* ) - exists=`(cat /etc/group; nidump group .) 2>/dev/null | grep "^$user:"` - ;; - * ) - exists=`grep "^$group:" /etc/group` - ;; - esac - if [ ".$exists" != . ]; then - echo "$msgprefix:Error: group \`$group' already exists" 1>&2 - exit 1 - fi - - # seek for next free gid - gid=$opt_g - ok=0 - while [ ".$ok" = .0 ]; do - case "$platform" in - *:Darwin:*:* ) - exists=`(cat /etc/group; nidump group .) 2>/dev/null | grep "^[^:]*:[^:]*:$gid:"` - ;; - * ) - exists=`grep "^[^:]*:[^:]*:$gid:" /etc/group` - ;; - esac - if [ ".$exists" = . ]; then - ok=1 - break - fi - gid=`expr $gid + 1` - done - - # add corresponding entry to group database - case "$platform" in - *:Darwin:*:* ) - niutil -create . "/groups/${group}" - niutil -createprop . "/groups/${group}" gid "${gid}" - niutil -createprop . "/groups/${group}" users "${group}" - ;; - * ) - echo "${group}:*:${gid}:$*" >>/etc/group - ;; - esac - - # remove group - elif [ ".$opt_r" = .yes ]; then - case "$platform" in - *:Darwin:*:* ) - exists=`(cat /etc/group; nidump group .) 2>/dev/null | grep "^$group:"` - ;; - * ) - exists=`grep "^$group:" /etc/group` - ;; - esac - if [ ".$exists" = . ]; then - echo "$msgprefix:Error: group \`$group' does not exist" 1>&2 - exit 1 - fi - - # remove entry from group database - case "$platform" in - *:Darwin:*:* ) - niutil -destroy . "/groups/${group}" - ;; - * ) - cp /etc/group /etc/group.old - grep -v "^${group}:" /etc/group.old >/etc/group - rm -f /etc/group.old - ;; - esac - fi - ;; - signal ) if [ ".$opt_p" = . -a ".$opt_m" = . ]; then echo "$msgprefix:Error: either option -p or -m has to be specified" 1>&2 @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpmtool.8 ============================================================================ $ cvs diff -u -r1.12 -r1.13 rpmtool.8 --- openpkg-src/openpkg/rpmtool.8 30 Jan 2007 17:36:29 -0000 1.12 +++ openpkg-src/openpkg/rpmtool.8 5 Mar 2007 22:39:14 -0000 1.13 @@ -274,12 +274,6 @@ \& %files -f files .Ve .RE -.IP "\fBuser\fR [\fB\-a\fR] [\fB\-r\fR] [\fB\-p\fR \fIpasswd\fR] [\fB\-n\fR \fIrealname\fR] [\fB\-d\fR \fIhomedir\fR] [\fB\-s\fR \fIshell\fR] [\fB\-u\fR \fImin-uid\fR] \fIusername\fR" 4 -.IX Item "user [-a] [-r] [-p passwd] [-n realname] [-d homedir] [-s shell] [-u min-uid] username" -This adds (\fB\-a\fR) or removes (\fB\-r\fR) the user \fIusername\fR in the system database. -.IP "\fBgroup\fR [\fB\-a\fR] [\fB\-r\fR] [\fB\-g\fR \fImin-gid\fR] \fIgroupname\fR [\fIusername\fR ...]" 4 -.IX Item "group [-a] [-r] [-g min-gid] groupname [username ...]" -This adds (\fB\-a\fR) or removes (\fB\-r\fR) the group \fIgroupname\fR in the system database. .IP "\fBmsg\fR [\fB\-b\fR]" 4 .IX Item "msg [-b]" This displays the contents of \fIstdin\fR as a boxed message. If option @@ . patch -p0 <<'@@ .' Index: openpkg-src/openpkg/rpmtool.pod ============================================================================ $ cvs diff -u -r1.17 -r1.18 rpmtool.pod --- openpkg-src/openpkg/rpmtool.pod 30 Jan 2007 17:36:29 -0000 1.17 +++ openpkg-src/openpkg/rpmtool.pod 5 Mar 2007 22:39:14 -0000 1.18 @@ -168,14 +168,6 @@ %files -f files -=item B<user> [B<-a>] [B<-r>] [B<-p> I<passwd>] [B<-n> I<realname>] [B<-d> I<homedir>] [B<-s> I<shell>] [B<-u> I<min-uid>] I<username> - -This adds (B<-a>) or removes (B<-r>) the user I<username> in the system database. - -=item B<group> [B<-a>] [B<-r>] [B<-g> I<min-gid>] I<groupname> [I<username> ...] - -This adds (B<-a>) or removes (B<-r>) the group I<groupname> in the system database. - =item B<msg> [B<-b>] This displays the contents of F<stdin> as a boxed message. If option @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org