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:   02-Jul-2003 14:38:34
  Branch: HEAD                             Handle: 2003070213383202

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

  Log:
    add fsl support

  Summary:
    Revision    Changes     Path
    1.1         +15 -0      openpkg-src/prngd/fsl.prngd
    1.27        +23 -4      openpkg-src/prngd/prngd.spec
    1.2         +16 -0      openpkg-src/prngd/rc.prngd
    1.5152      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/prngd/fsl.prngd
  ============================================================================
  $ cvs diff -u -r0 -r1.1 fsl.prngd
  --- /dev/null 2003-07-02 14:38:34.000000000 +0200
  +++ fsl.prngd 2003-07-02 14:38:34.000000000 +0200
  @@ -0,0 +1,15 @@
  +##
  +##  fsl.prngd -- OSSP fsl configuration
  +##
  +
  +ident (prngd)/.+ q{
  +    prefix(
  +        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
  +    ) 
  +    -> {
  +        debug: file(
  +            path="@l_prefix@/var/prngd/prngd.log",
  +            append=1, perm=0644
  +        )
  +    }
  +};
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/prngd/prngd.spec
  ============================================================================
  $ cvs diff -u -r1.26 -r1.27 prngd.spec
  --- openpkg-src/prngd/prngd.spec      2 Jul 2003 12:17:09 -0000       1.26
  +++ openpkg-src/prngd/prngd.spec      2 Jul 2003 12:38:34 -0000       1.27
  @@ -35,17 +35,25 @@
   Version:      0.9.27
   Release:      20030702
   
  +#   package options
  +%option       with_fsl  yes
  +
   #   list of sources
   Source0:      
ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/related/prngd/prngd-%{version}.tar.gz
   Source1:      prngd.conf
   Source2:      rc.prngd
  +Source3:      fsl.prngd
   Patch0:       prngd.patch
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, gcc
  -PreReq:       OpenPKG, openpkg >= 20020206
  +BuildPreReq:  OpenPKG, openpkg >= 20030415, gcc
  +PreReq:       OpenPKG, openpkg >= 20030415
  +%if "%{with_fsl}" == "yes"
  +BuildPreReq:  fsl
  +PreReq:       fsl
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -69,8 +77,10 @@
   %build
       CC="%{l_cc}"
       CFLAGS="%{l_cflags -O}"
  -    LIBS=""
  -    DEFS="-DRANDSAVENAME=\\\"%{l_prefix}/var/prngd/prngd.seed\\\""
  +    LDFLAGS="%{l_fsl_ldflags}"
  +    LIBS="%{l_fsl_libs}"
  +    DEFS=""
  +    DEFS="$DEFS -DRANDSAVENAME=\\\"%{l_prefix}/var/prngd/prngd.seed\\\""
       DEFS="$DEFS -DCONFIGFILE=\\\"%{l_prefix}/etc/prngd/prngd.conf\\\""
       case "%{l_target}" in
          *-freebsd* ) ;;
  @@ -109,9 +119,18 @@
           -e 's;@l_rgrp@;%{l_rgrp};g' \
           %{SOURCE rc.%{name}} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   
  +    #   OSSP fake syslog library
  +    %{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.%{name}} \
  +        $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.%{name}' \
           '%config %{l_prefix}/etc/prngd/prngd.conf'
   
   %files -f files
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/prngd/rc.prngd
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 rc.prngd
  --- openpkg-src/prngd/rc.prngd        2 Jul 2003 12:17:09 -0000       1.1
  +++ openpkg-src/prngd/rc.prngd        2 Jul 2003 12:38:34 -0000       1.2
  @@ -5,6 +5,11 @@
   
   %config
       prngd_enable="yes"
  +    prngd_log_prolog="true"
  +    prngd_log_epilog="true"
  +    prngd_log_numfiles="10"
  +    prngd_log_minsize="1M"
  +    prngd_log_complevel="9"
   
   %start -p 200 -u @l_susr@
       opServiceEnabled prngd || exit 0
  @@ -13,3 +18,14 @@
   %stop -p 200 -u @l_susr@
       opServiceEnabled prngd || exit 0
       @l_prefix@/sbin/prngd -k -p @l_prefix@/etc/prngd/prngd.pid -m 660 
@l_prefix@/var/prngd/prngd.socket
  +
  +%daily -u @l_susr@
  +    opServiceEnabled prngd || exit 0
  +
  +    #   rotate logfile
  +    shtool rotate -f \
  +        -n${prngd_log_numfiles} -s${prngd_log_minsize} -d \
  +        -z${prngd_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  +        -P "${prngd_log_prolog}" \
  +        -E "${prngd_log_epilog}" \
  +        @l_prefix@/var/prngd/prngd.log
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5151 -r1.5152 news.txt
  --- openpkg-web/news.txt      2 Jul 2003 12:23:49 -0000       1.5151
  +++ openpkg-web/news.txt      2 Jul 2003 12:38:32 -0000       1.5152
  @@ -1,3 +1,4 @@
  +02-Jul-2003: Upgraded package: P<prngd-0.9.27-20030702>
   02-Jul-2003: Upgraded package: P<openpkg-tool-20030702-20030702>
   02-Jul-2003: Upgraded package: P<mico-2.3.10-20030702>
   02-Jul-2003: Upgraded package: P<libmcrypt-2.5.7-20030702>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to