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:   01-Jan-2004 20:19:07
  Branch: HEAD                             Handle: 2004010119190502

  Modified files:
    openpkg-src/openpkg     HISTORY openpkg.spec
    openpkg-web             news.txt

  Log:
    start using the global file /etc/openpkg to register all OpenPKG
    instances on a system

  Summary:
    Revision    Changes     Path
    1.101       +5  -0      openpkg-src/openpkg/HISTORY
    1.257       +27 -1      openpkg-src/openpkg/openpkg.spec
    1.7939      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/HISTORY
  ============================================================================
  $ cvs diff -u -r1.100 -r1.101 HISTORY
  --- openpkg-src/openpkg/HISTORY       28 Dec 2003 11:37:24 -0000      1.100
  +++ openpkg-src/openpkg/HISTORY       1 Jan 2004 19:19:07 -0000       1.101
  @@ -1,4 +1,9 @@
   
  +2004
  +====
  +
  +20040101 start using the global file /etc/openpkg to register all OpenPKG instances 
on a system
  +
   2003
   ====
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================================
  $ cvs diff -u -r1.256 -r1.257 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec  28 Dec 2003 11:37:24 -0000      1.256
  +++ openpkg-src/openpkg/openpkg.spec  1 Jan 2004 19:19:07 -0000       1.257
  @@ -39,7 +39,7 @@
   #   o any cc(1)
   
   #   the package version/release
  -%define       V_openpkg  20031228
  +%define       V_openpkg  20040101
   
   #   the used software versions
   %define       V_rpm      4.2.1
  @@ -1126,6 +1126,15 @@
       [ ".$prefix" = . ] && prefix="%{l_prefix}"
       prefix=`echo "$prefix" | sed -e 's;//*;/;g' -e 's;/$;;'`
   
  +    #   register the OpenPKG instance in /etc/openpkg
  +    registry="/etc/openpkg"
  +    exists=`cat $registry 2>/dev/null | egrep "^ *${prefix} *\$"`
  +    if [ ".$exists" = . ]; then
  +        ( umask 022
  +          echo "${prefix}" >>$registry
  +        ) 2>/dev/null || true
  +    fi
  +
       #   determine user/group ids
       for class in s m r n; do
           eval "xusr=\"\$${class}usr\""
  @@ -1722,6 +1731,23 @@
       s=`(uname -s) 2>/dev/null` || s='Unknown'
       r=`(uname -r) 2>/dev/null` || r='0.0'
       plid="${s}/${r}"
  +
  +    #   unregister the OpenPKG instance in /etc/openpkg
  +    registry="/etc/openpkg"
  +    exists=`cat $registry 2>/dev/null | egrep "^ *${prefix} *\$"`
  +    if [ ".$exists" != . ]; then
  +        if [ ".$cusr" != ".root" ]; then
  +            echo "openpkg:WARNING: skipping unregistering of $prefix in $registry" 
1>&2
  +            echo "openpkg:WARNING: (would require root-privileges)" 1>&2
  +        else
  +            cp $registry $registry.bak && \
  +            egrep -v "^ *${prefix} *\$" $registry.bak >$registry
  +            rm -f $registry.bak >/dev/null 2>&1
  +            if [ ".`cat $registry`" = . ]; then
  +                rm -f $registry >/dev/null 2>&1
  +            fi
  +        fi
  +    fi
   
       #   remove entry in /etc/shells
       shell="${prefix}/lib/openpkg/bash"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7938 -r1.7939 news.txt
  --- openpkg-web/news.txt      1 Jan 2004 19:17:56 -0000       1.7938
  +++ openpkg-web/news.txt      1 Jan 2004 19:19:05 -0000       1.7939
  @@ -1,3 +1,4 @@
  +01-Jan-2004: Upgraded package: P<openpkg-20040101-20040101>
   01-Jan-2004: Upgraded package: P<rsync-2.6.0-20040101>
   01-Jan-2004: Upgraded package: P<perl-ldap-20040101-20040101>
   01-Jan-2004: Upgraded package: P<openssh-3.7.1p2-20040101>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to