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:   25-Jul-2004 10:09:30
  Branch: OPENPKG_2_1_SOLID                Handle: 2004072509092900

  Modified files:           (Branch: OPENPKG_2_1_SOLID)
    openpkg-src/sudo        sudo.spec

  Log:
    MFC: fix the uid/gid problem at the root and fix one more uid/gid
    incorrect usage

  Summary:
    Revision    Changes     Path
    1.55.4.2    +7  -10     openpkg-src/sudo/sudo.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/sudo/sudo.spec
  ============================================================================
  $ cvs diff -u -r1.55.4.1 -r1.55.4.2 sudo.spec
  --- openpkg-src/sudo/sudo.spec        2 Jul 2004 15:28:05 -0000       1.55.4.1
  +++ openpkg-src/sudo/sudo.spec        25 Jul 2004 08:09:29 -0000      1.55.4.2
  @@ -34,7 +34,7 @@
   Group:        System
   License:      BSD
   Version:      1.6.7p5
  -Release:      2.1.0
  +Release:      2.1.1
   
   #   package options
   %option       with_fsl    yes
  @@ -96,8 +96,8 @@
           --with-logging=file \
   %endif
           --with-sudoers-mode=0400 \
  -        --with-sudoers-uid=0 \
  -        --with-sudoers-gid=%{l_muid} \
  +        --with-sudoers-uid=%{l_suid} \
  +        --with-sudoers-gid=%{l_mgid} \
           --with-sendmail=$true \
           --with-ignore-dot \
   %if "%{with_pam}" == "yes"
  @@ -115,17 +115,14 @@
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/var/sudo
       %{l_shtool} subst \
  -        -e "s;-m 4111;-m 4511;" \
  -        -e "s;-m 0111;-m 0511;" \
  +        -e "s;-M 4111;-M 4511;" \
  +        -e "s;-M 0111;-M 0511;" \
  +        -e "s;-[OG] [^ ]*;;g" \
           Makefile
       %{l_make} %{l_mflags} install \
           prefix=$RPM_BUILD_ROOT%{l_prefix} \
           exec_prefix=$RPM_BUILD_ROOT%{l_prefix} \
  -        sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/sudo \
  -        install_uid=`%{l_shtool} echo -e %u` \
  -        install_gid=`%{l_shtool} echo -e %g` \
  -        sudoers_uid=`%{l_shtool} echo -e %u` \
  -        sudoers_gid=`%{l_shtool} echo -e %g`
  +        sysconfdir=$RPM_BUILD_ROOT%{l_prefix}/etc/sudo
   
       #   install run-command script
       %{l_shtool} mkdir -f -p -m 755 \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to