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:   03-Jul-2003 15:54:29
  Branch: HEAD                             Handle: 2003070314542801

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

  Log:
    add fsl support

  Summary:
    Revision    Changes     Path
    1.1         +15 -0      openpkg-src/scponly/fsl.scponly
    1.1         +23 -0      openpkg-src/scponly/rc.scponly
    1.24        +41 -5      openpkg-src/scponly/scponly.spec
    1.5187      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/scponly/fsl.scponly
  ============================================================================
  $ cvs diff -u -r0 -r1.1 fsl.scponly
  --- /dev/null 2003-07-03 15:54:29.000000000 +0200
  +++ fsl.scponly       2003-07-03 15:54:29.000000000 +0200
  @@ -0,0 +1,15 @@
  +##
  +##  fsl.scponly -- OSSP fsl configuration
  +##
  +
  +ident (scponly)/.+ q{
  +    prefix(
  +        prefix="%b %d %H:%M:%S %N <%L> $1[%P]: "
  +    ) 
  +    -> {
  +        debug: file(
  +            path="@l_prefix@/var/scponly/scponly.log",
  +            append=1, perm=0644
  +        )
  +    }
  +};
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/scponly/rc.scponly
  ============================================================================
  $ cvs diff -u -r0 -r1.1 rc.scponly
  --- /dev/null 2003-07-03 15:54:29.000000000 +0200
  +++ rc.scponly        2003-07-03 15:54:29.000000000 +0200
  @@ -0,0 +1,23 @@
  [EMAIL PROTECTED]@/lib/openpkg/bash @l_prefix@/etc/rc
  +##
  +##  rc.scponly -- Run-Commands
  +##
  +
  +%config
  +    scponly_enable="yes"
  +    scponly_log_prolog="true"
  +    scponly_log_epilog="true"
  +    scponly_log_numfiles="10"
  +    scponly_log_minsize="1M"
  +    scponly_log_complevel="9"
  +
  +%daily -u @l_susr@
  +    opServiceEnabled scponly || exit 0
  +
  +    #   rotate logfile
  +    shtool rotate -f \
  +        -n${scponly_log_numfiles} -s${scponly_log_minsize} -d \
  +        -z${scponly_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  +        -P "${scponly_log_prolog}" \
  +        -E "${scponly_log_epilog}" \
  +        @l_prefix@/var/scponly/scponly.log
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/scponly/scponly.spec
  ============================================================================
  $ cvs diff -u -r1.23 -r1.24 scponly.spec
  --- openpkg-src/scponly/scponly.spec  30 Apr 2003 12:46:49 -0000      1.23
  +++ openpkg-src/scponly/scponly.spec  3 Jul 2003 13:54:29 -0000       1.24
  @@ -33,16 +33,25 @@
   Group:        Network
   License:      MIT-style
   Version:      3.8
  -Release:      20030430
  +Release:      20030703
  +
  +#   package options
  +%option       with_fsl  yes
   
   #   list of sources
   Source0:      http://www.sublimation.org/scponly/scponly-%{version}.tgz
  +Source1:      rc.scponly
  +Source2:      fsl.scponly
   
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20020206, make, gcc
  -PreReq:       OpenPKG, openpkg >= 20020206, openssh
  +BuildPreReq:  OpenPKG, openpkg >= 20030415, make, gcc
  +PreReq:       OpenPKG, openpkg >= 20030415, openssh
  +%if "%{with_fsl}" == "yes"
  +BuildPreReq:  fsl
  +PreReq:       fsl
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -54,6 +63,7 @@
   
   %prep
       %setup -q
  +    %{l_shtool} subst -e 's;${DEFS}\(.*\)$;${DEFS} @[EMAIL PROTECTED] @LIBS@;' 
Makefile.in
   
   %build
       ( echo 
"ac_cv_path_scponly_PROG_SFTP_SERVER=%{l_prefix}/libexec/openssh/sftp-server"
  @@ -62,15 +72,19 @@
       ) >config.cache
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
  +    LDFLAGS="%{l_fsl_ldflags}" \
  +    LIBS="%{l_fsl_libs}" \
       ./configure \
           --cache-file=./config.cache \
           --prefix=%{l_prefix} \
  -        --enable-rsync
  +        --enable-rsync \
  +        PACKAGE_NAME=scponly
       %{l_make} %{l_mflags -O} all debuglevel
   
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/var/%{name} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/scponly \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/man/man8
  @@ -80,7 +94,29 @@
           scponly.8 $RPM_BUILD_ROOT%{l_prefix}/man/man8/
       %{l_shtool} install -c -m 644 \
           debuglevel $RPM_BUILD_ROOT%{l_prefix}/etc/scponly/
  -    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  +
  +    #   Creating 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.%{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}'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5186 -r1.5187 news.txt
  --- openpkg-web/news.txt      3 Jul 2003 13:44:19 -0000       1.5186
  +++ openpkg-web/news.txt      3 Jul 2003 13:54:28 -0000       1.5187
  @@ -1,3 +1,4 @@
  +03-Jul-2003: Upgraded package: P<scponly-3.8-20030703>
   03-Jul-2003: Upgraded package: P<j2se-1.3.1-20030703>
   03-Jul-2003: Upgraded package: P<samhain-1.7.9-20030703>
   03-Jul-2003: Upgraded package: P<msntp-1.6-20030703>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to