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

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   08-Jul-2003 16:26:23
  Branch: HEAD                             Handle: 2003070815262101

  Added files:
    openpkg-src/tripwire    fsl.tripwire rc.tripwire
  Modified files:
    openpkg-src/tripwire    tripwire.spec
    openpkg-web             news.txt

  Log:
    add fsl support; at least, apply the template

  Summary:
    Revision    Changes     Path
    1.1         +16 -0      openpkg-src/tripwire/fsl.tripwire
    1.1         +24 -0      openpkg-src/tripwire/rc.tripwire
    1.13        +43 -12     openpkg-src/tripwire/tripwire.spec
    1.5448      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/tripwire/fsl.tripwire
  ============================================================================
  $ cvs diff -u -r0 -r1.1 fsl.tripwire
  --- /dev/null 2003-07-08 16:26:23.000000000 +0200
  +++ fsl.tripwire      2003-07-08 16:26:23.000000000 +0200
  @@ -0,0 +1,16 @@
  +##
  +##  fsl.tripwire -- OSSP fsl configuration
  +##
  +
  +ident (tripwire)/.+ q{
  +    prefix(
  +        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
  +    )
  +    -> {
  +        debug: file(
  +            path="@l_prefix@/var/tripwire/tripwire.log",
  +            append=1, perm=0644
  +        )
  +    }
  +};
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tripwire/rc.tripwire
  ============================================================================
  $ cvs diff -u -r0 -r1.1 rc.tripwire
  --- /dev/null 2003-07-08 16:26:23.000000000 +0200
  +++ rc.tripwire       2003-07-08 16:26:23.000000000 +0200
  @@ -0,0 +1,24 @@
  [EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
  +##
  +##  rc.tripwire -- Run-Commands
  +##
  +
  +%config
  +    tripwire_enable="yes"
  +    tripwire_log_prolog="true"
  +    tripwire_log_epilog="true"
  +    tripwire_log_numfiles="10"
  +    tripwire_log_minsize="1M"
  +    tripwire_log_complevel="9"
  +
  +%daily -u @l_susr@
  +    opServiceEnabled tripwire || exit 0
  +
  +    #   rotate logfile
  +    shtool rotate -f \
  +        -n${tripwire_log_numfiles} -s${tripwire_log_minsize} -d \
  +        -z${tripwire_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  +        -P "${tripwire_log_prolog}" \
  +        -E "${tripwire_log_epilog}" \
  +        @l_prefix@/var/tripwire/tripwire.log
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tripwire/tripwire.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 tripwire.spec
  --- openpkg-src/tripwire/tripwire.spec        7 Jul 2003 11:31:32 -0000       1.12
  +++ openpkg-src/tripwire/tripwire.spec        8 Jul 2003 14:26:22 -0000       1.13
  @@ -23,6 +23,8 @@
   ##  SUCH DAMAGE.
   ##
   
  +#   FIXME: thl fsl does not make it into the binary
  +
   #   package versions
   %define       V_tripwire 2.3.1
   %define       V_lvl      2
  @@ -39,20 +41,29 @@
   Group:        Security
   License:      GPL
   Version:      %{V_openpkg}
  -Release:      20030707
  +Release:      20030708
  +
  +#   package options
  +%option       with_fsl  yes
   
   #   list of sources
   Source0:      
http://osdn.dl.sourceforge.net/sourceforge/tripwire/tripwire-%{V_vendor}.tar.gz
   Source1:      tw.cfg
   Source2:      sparc-solaris.inc
   Source3:      sparc-solaris.mak
  +Source4:      rc.tripwire
  +Source5:      fsl.tripwire
   Patch0:       tripwire.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030114, make, gcc, perl
  -PreReq:       OpenPKG, openpkg >= 20030114
  +BuildPreReq:  OpenPKG, openpkg >= 20030415, make, gcc, perl
  +PreReq:       OpenPKG, openpkg >= 20030415
  +%if "%{with_fsl}" == "yes"
  +BuildPreReq:  fsl
  +PreReq:       fsl
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -102,25 +113,23 @@
       %{l_make} %{l_mflags -O} release \
           CC="%{l_cc}" \
           CFLAGS="%{l_cflags -O}" \
  +        LDFLAGS="%{l_ldflags} %{l_fsl_ldflags}" \
  +        LIBS="%{l_fsl_libs}" \
           CXX="%{l_cxx}" \
           CXXFLAGS="%{l_cxxflags -O} -fpermissive" \
           CPPFLAGS="%{l_cppflags}" \
  -        LDFLAGS="%{l_ldflags}" \
           GMAKE="%{l_make}" \
           SYSPRE="$syspre" \
           STLPORT="No-STLPort"
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -    %{l_shtool} mkdir -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin
  -    %{l_shtool} mkdir -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/etc/tripwire
  -    %{l_shtool} mkdir -p -m 755 \
  +    %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/tripwire \
           $RPM_BUILD_ROOT%{l_prefix}/man/man4 \
           $RPM_BUILD_ROOT%{l_prefix}/man/man5 \
  -        $RPM_BUILD_ROOT%{l_prefix}/man/man8
  -    %{l_shtool} mkdir -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
           $RPM_BUILD_ROOT%{l_prefix}/var/tripwire
   
       for f in bin/*_r/*; do
  @@ -141,7 +150,29 @@
           %{l_shtool} install -c -m 644 \
               $f $RPM_BUILD_ROOT%{l_prefix}/$f
       done
  -    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  +
  +    #   install run-command script
  +    %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
  +    %{l_shtool} install -c -m 755 \
  +        -e 's;@l_prefix@;%{l_prefix};g' \
  +        -e 's;@l_susr@;%{l_susr};g' \
  +        -e 's;@l_rusr@;%{l_rusr};g' \
  +        -e 's;@l_rgrp@;%{l_rgrp};g' \
  +        %{SOURCE rc.tripwire} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  +
  +    #   install OSSP fsl configuration
  +    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/fsl
  +    %{l_shtool} install -c -m 644 \
  +        -e 's;@l_prefix@;%{l_prefix};g' \
  +        %{SOURCE fsl.tripwire} \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
  +
  +    #   determine installation files
  +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  +        %{l_files_std} \
  +        '%not %dir %{l_prefix}/etc/fsl' \
  +        '%config %{l_prefix}/etc/fsl/fsl.tripwire'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5447 -r1.5448 news.txt
  --- openpkg-web/news.txt      8 Jul 2003 14:24:57 -0000       1.5447
  +++ openpkg-web/news.txt      8 Jul 2003 14:26:21 -0000       1.5448
  @@ -1,3 +1,4 @@
  +08-Jul-2003: Upgraded package: P<tripwire-2.3.1.2-20030708>
   08-Jul-2003: Upgraded package: P<xplanet-0.94-20030708>
   08-Jul-2003: Upgraded package: P<xmms-1.2.7-20030708>
   08-Jul-2003: Upgraded package: P<xmame-0.70.1-20030708>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to