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:   11-Aug-2003 12:13:37
  Branch: HEAD                             Handle: 2003081111133501

  Added files:
    openpkg-src/sophie      sophie.sh
  Modified files:
    openpkg-src/sophie      sophie.spec
    openpkg-web             news.txt

  Log:
    make sure it finds the libsavi.so

  Summary:
    Revision    Changes     Path
    1.1         +4  -0      openpkg-src/sophie/sophie.sh
    1.2         +17 -12     openpkg-src/sophie/sophie.spec
    1.6122      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/sophie/sophie.sh
  ============================================================================
  $ cvs diff -u -r0 -r1.1 sophie.sh
  --- /dev/null 2003-08-11 12:13:36.000000000 +0200
  +++ sophie.sh 2003-08-11 12:13:37.000000000 +0200
  @@ -0,0 +1,4 @@
  +#!/bin/sh
  +LD_LIBRARY_PATH="@l_prefix@/lib/sav:${LD_LIBRARY_PATH:-/usr/lib}"
  +export LD_LIBRARY_PATH
  +exec @l_prefix@/libexec/sophie/sophie ${1+"$@"}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sophie/sophie.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 sophie.spec
  --- openpkg-src/sophie/sophie.spec    5 Aug 2003 13:00:35 -0000       1.1
  +++ openpkg-src/sophie/sophie.spec    11 Aug 2003 10:13:36 -0000      1.2
  @@ -33,7 +33,7 @@
   Group:        System
   License:      GPL
   Version:      3.03
  -Release:      20030805
  +Release:      20030811
   
   #   package options
   %option       with_fsl yes
  @@ -44,12 +44,13 @@
   Source2:      rc.sophie
   Source3:      sophie.cfg
   Source4:      sophie.savi
  +Source5:      sophie.sh
   Patch0:       sophie.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, make, gcc, sav
  +BuildPreReq:  OpenPKG, openpkg >= 20030103, sav, make, gcc
   PreReq:       OpenPKG, openpkg >= 20030103, sav
   %if "%{with_fsl}" == "yes"
   BuildPreReq:  fsl >= 1.0.6
  @@ -60,18 +61,16 @@
   
   %description
       Sophie is a daemon which uses the libsavi library from Sophos
  -    Anti-Virus.
  -
  -    On startup, Sophie initializes SAVI (Sophos Anti-Virus Interface),
  -    loads virus patterns into memory, opens local UNIX domain socket,
  -    and waits for someone to connect and instructs it which path to
  -    scan. Since it is loaded in RAM, scanning is very fast. Of course,
  -    speed of scanning also depends on SAVI settings and size of the
  -    file.
  +    Anti-Virus. On startup, Sophie initializes SAVI (Sophos Anti-Virus
  +    Interface), loads virus patterns into memory, opens local UNIX
  +    domain socket, and waits for someone to connect and instructs it
  +    which path to scan. Since it is loaded in RAM, scanning is very
  +    fast. Of course, speed of scanning also depends on SAVI settings and
  +    size of the file.
   
   %prep
       %setup -q
  -    %patch0 -p1
  +    %patch -p1
       %{l_shtool} subst %{l_value -s -a} \
           sophie.c \
           sophie_init.c
  @@ -81,6 +80,8 @@
           sophie.h
   
   %build
  +    LD_LIBRARY_PATH="%{l_prefix}/lib/sav:${LD_LIBRARY_PATH-/usr/lib}"
  +    export LD_LIBRARY_PATH
       CC="%{l_cc}" \
       CXX="%{l_cxx}" \
       CFLAGS="%{l_cflags -O}" \
  @@ -102,10 +103,14 @@
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d \
           $RPM_BUILD_ROOT%{l_prefix}/etc/sophie \
           $RPM_BUILD_ROOT%{l_prefix}/man/man8 \
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/sophie \
           $RPM_BUILD_ROOT%{l_prefix}/var/sophie
       %{l_shtool} install -c -s -m 755 \
           sophie \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin/
  +        $RPM_BUILD_ROOT%{l_prefix}/libexec/sophie/
  +    %{l_shtool} install -c -m 755 %{l_value -s -a} \
  +        %{SOURCE sophie.sh} \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/sophie
       %{l_shtool} install -c -m 644 %{l_value -s -a} \
           %{SOURCE fsl.sophie} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/fsl/
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.6121 -r1.6122 news.txt
  --- openpkg-web/news.txt      11 Aug 2003 10:11:02 -0000      1.6121
  +++ openpkg-web/news.txt      11 Aug 2003 10:13:35 -0000      1.6122
  @@ -1,3 +1,4 @@
  +11-Aug-2003: Upgraded package: P<sophie-3.03-20030811>
   11-Aug-2003: Upgraded package: P<xine-lib-1rc0a-20030811>
   11-Aug-2003: Upgraded package: P<mplayer-0.90-20030811>
   11-Aug-2003: Upgraded package: P<monit-3.2-20030811>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to