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:   18-Nov-2004 14:03:13
  Branch: HEAD                             Handle: 2004111813031300

  Modified files:
    openpkg-src/openpkg     HISTORY openpkg.spec rc

  Log:
    fix rc(1) command processing for "%cmd -u foo" situations under umask
    027 and similar

  Summary:
    Revision    Changes     Path
    1.223       +1  -0      openpkg-src/openpkg/HISTORY
    1.371       +1  -1      openpkg-src/openpkg/openpkg.spec
    1.58        +5  -4      openpkg-src/openpkg/rc
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/HISTORY
  ============================================================================
  $ cvs diff -u -r1.222 -r1.223 HISTORY
  --- openpkg-src/openpkg/HISTORY       8 Nov 2004 17:07:54 -0000       1.222
  +++ openpkg-src/openpkg/HISTORY       18 Nov 2004 13:03:13 -0000      1.223
  @@ -2,6 +2,7 @@
   2004
   ====
   
  +20041118 fix rc(1) command processing for "%cmd -u foo" situations under 
umask 027 and similar
   20041008 port to MacOS X 10.3.6 by disabling assembly code in gzip
   
   20041004 **** RELEASE AS PART OF OPENPKG 2.2.1 ***
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================================
  $ cvs diff -u -r1.370 -r1.371 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  8 Nov 2004 17:07:54 -0000       1.370
  +++ openpkg-src/openpkg/openpkg.spec  18 Nov 2004 13:03:13 -0000      1.371
  @@ -39,7 +39,7 @@
   #   o any cc(1)
   
   #   the package version/release
  -%define       V_openpkg  20041108
  +%define       V_openpkg  20041118
   
   #   the used software versions
   %define       V_rpm      4.2.1
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/rc
  ============================================================================
  $ cvs diff -u -r1.57 -r1.58 rc
  --- openpkg-src/openpkg/rc    4 Jun 2004 15:25:17 -0000       1.57
  +++ openpkg-src/openpkg/rc    18 Nov 2004 13:03:13 -0000      1.58
  @@ -424,7 +424,7 @@
       fi
   
       #   iterate over all packages (in priority order!) where the command
  -    #   was found n order to execute, print, or evaluate their scripts
  +    #   was found in order to execute, print, or evaluate their scripts
       verbose_pos=0
       for entry in `echo $list | tr ',' '\012' | sort -n`; do
           [ ".$entry" = . ] && continue
  @@ -480,7 +480,7 @@
   
               #   prepare temporary files
               rm -f $tmpfile $outfile $errfile
  -            touch $tmpfile $outfile $errfile
  +            (umask 077; touch $tmpfile $outfile $errfile)
   
               #   generate: optionally enable shell debugging
               if [ ".$debug" = .1 ]; then
  @@ -516,8 +516,9 @@
                   #   execute as different user
                   if [ ".$verbose" = .1 ]; then
                       echo "openpkg:rc:NOTICE: $prefix:$s_name:%$cmd: 
executing as user $s_user"
  -                fi 
  +                fi
                   if [ ".$user" = "[EMAIL PROTECTED]@" -a "[EMAIL PROTECTED]@" 
= ".root" ]; then
  +                    chown $s_user $tmpfile
                       if [ ".$debug" = .1 ]; then
                           su - $s_user -c "PATH=\"$PATH\"; $bash $tmpfile" 
>$outfile
                           rc=$?
  @@ -540,7 +541,7 @@
                   #   execute as current user
                   if [ ".$verbose" = .1 ]; then
                       echo "openpkg:rc:NOTICE: $prefix:$s_name:%$cmd: 
executing as user $user"
  -                fi 
  +                fi
                   if [ ".$debug" = .1 ]; then
                       $bash $tmpfile >$outfile
                       rc=$?
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to