OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   22-Jan-2004 18:35:24
  Branch: HEAD                             Handle: 2004012217352202

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

  Log:
    correct inconsistent config input file, mark config files, and prepare
    tmp and log directories for possible user writing (must hack an ugly
    setfacl for this)

  Summary:
    Revision    Changes     Path
    1.13        +14 -2      openpkg-src/ripe-dbase/ripe-dbase.spec
    1.8170      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ripe-dbase/ripe-dbase.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 ripe-dbase.spec
  --- openpkg-src/ripe-dbase/ripe-dbase.spec    27 Dec 2003 22:56:07 -0000      1.12
  +++ openpkg-src/ripe-dbase/ripe-dbase.spec    22 Jan 2004 17:35:24 -0000      1.13
  @@ -35,7 +35,7 @@
   Group:        Database
   License:      RIPE NCC
   Version:      3.2.0
  -Release:      20031227
  +Release:      20040122
   
   #   list of sources
   Source0:      ftp://ftp.ripe.net/ripe/dbase/software/ripe-dbase-%{version}.tar.gz
  @@ -65,6 +65,7 @@
       %setup -q
       %patch -p0
       %{l_shtool} subst \
  +        -e 's;@topdir@/conf;@confdir@;g' \
           -e 's;^RIPADMIN sqlhost,3306,dbuser,dbpsw,RIPADMIN;RIPADMIN 
localhost,3306,root,pwd,RIPADMIN;' \
           -e 's;^UPDSOURCE SAMPLE sqlhost,3306,dbuser,dbpsw,SAMPLEDB 
whois.mydb.net,43001,43004;UPDSOURCE RIPE localhost,3306,root,pwd,RIPEDB 
localhost,43001,43004;' \
           conf/rip.config.sample.in
  @@ -119,7 +120,13 @@
       %{l_shtool} install -c -m 755 %{l_value -s -a} \
           %{SOURCE ripe-dbase-setup.sh} \
           $RPM_BUILD_ROOT%{l_prefix}/sbin/ripe-dbase-setup
  -    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  +        %{l_files_std} \
  +        '%config %{l_prefix}/etc/ripe-dbase/*' \
  +        '%config %attr(0775,%{l_musr},%{l_mgrp}) %{l_prefix}/var/ripe-dbase/tmp' \
  +        '%config %attr(0775,%{l_musr},%{l_mgrp}) 
%{l_prefix}/var/ripe-dbase/log/upd' \
  +        '%config %attr(0775,%{l_musr},%{l_mgrp}) 
%{l_prefix}/var/ripe-dbase/log/forw' \
  +        '%config %attr(0775,%{l_musr},%{l_mgrp}) %{l_prefix}/var/ripe-dbase/log/ack'
   
   %files -f files
   
  @@ -128,6 +135,11 @@
   
   %post
       if [ $1 -eq 1 ]; then
  +#   probably have to set some acls after the fact
  +#   setfacl -m group:ripeadm:rwx $RPM_INSTALL_PREFIX/var/ripe-dbase/tmp \
  +#                                $RPM_INSTALL_PREFIX/var/ripe-dbase/log/upd \
  +#                                $RPM_INSTALL_PREFIX/var/ripe-dbase/log/forw \
  +#                                $RPM_INSTALL_PREFIX/var/ripe-dbase/log/ack
           #   display final hints on initial installation
           ( echo "1. To complete this installation of the RIPE Whois server,"
             echo "   please change all 'pwd' text in the following files:"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.8169 -r1.8170 news.txt
  --- openpkg-web/news.txt      22 Jan 2004 17:20:56 -0000      1.8169
  +++ openpkg-web/news.txt      22 Jan 2004 17:35:22 -0000      1.8170
  @@ -1,3 +1,4 @@
  +22-Jan-2004: Upgraded package: P<ripe-dbase-3.2.0-20040122>
   22-Jan-2004: Upgraded package: P<nessus-tool-2.0.10-20040122>
   22-Jan-2004: Upgraded package: P<nessus-libs-2.0.10-20040122>
   22-Jan-2004: Upgraded package: P<dsh-0.25.1-20040122>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to