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:   09-Jul-2003 16:06:30
  Branch: HEAD                             Handle: 2003070915061316

  Modified files:
    openpkg-src/bind        bind.spec rc.bind
    openpkg-src/cvs         cvs.spec rc.cvs
    openpkg-src/cvsd        cvsd.spec rc.cvsd
    openpkg-src/dss         dss.spec rc.dss
    openpkg-src/jabberd     jabberd.spec rc.jabberd
    openpkg-src/less        less.spec rc.less
    openpkg-src/mysql3      mysql3.spec rc.mysql3
    openpkg-src/nsd         nsd.spec rc.nsd
    openpkg-src/perforce    perforce.spec rc.perforce
    openpkg-src/petidomo    petidomo.spec rc.petidomo
    openpkg-src/postfix-mailgraph
                            postfix-mailgraph.spec rc.postfix-mailgraph
    openpkg-src/pound       pound.spec rc.pound
    openpkg-src/proftpd     proftpd.spec rc.proftpd
    openpkg-src/pureftpd    pureftpd.spec rc.pureftpd
    openpkg-src/rsync       rc.rsync rsync.spec
    openpkg-src/sendmail    rc.sendmail
    openpkg-src/spamassassin
                            rc.spamassassin spamassassin.spec
    openpkg-src/sysmon      rc.sysmon sysmon.spec
    openpkg-src/tomcat      rc.tomcat tomcat.spec
    openpkg-src/tomcat4     rc.tomcat4 tomcat4.spec
    openpkg-src/vim         rc.vim vim.spec
    openpkg-web             news.txt

  Log:
    rclint police: fix badly prefixed variable, opServiceEnabled, exit not
    allowed here

  Summary:
    Revision    Changes     Path
    1.59        +1  -1      openpkg-src/bind/bind.spec
    1.11        +16 -21     openpkg-src/bind/rc.bind
    1.59        +1  -1      openpkg-src/cvs/cvs.spec
    1.8         +15 -17     openpkg-src/cvs/rc.cvs
    1.31        +1  -1      openpkg-src/cvsd/cvsd.spec
    1.6         +10 -13     openpkg-src/cvsd/rc.cvsd
    1.20        +1  -1      openpkg-src/dss/dss.spec
    1.7         +20 -23     openpkg-src/dss/rc.dss
    1.5         +1  -1      openpkg-src/jabberd/jabberd.spec
    1.3         +7  -9      openpkg-src/jabberd/rc.jabberd
    1.29        +1  -1      openpkg-src/less/less.spec
    1.4         +9  -4      openpkg-src/less/rc.less
    1.9         +1  -1      openpkg-src/mysql3/mysql3.spec
    1.3         +4  -4      openpkg-src/mysql3/rc.mysql3
    1.12        +1  -1      openpkg-src/nsd/nsd.spec
    1.8         +6  -9      openpkg-src/nsd/rc.nsd
    1.14        +1  -1      openpkg-src/perforce/perforce.spec
    1.5         +15 -17     openpkg-src/perforce/rc.perforce
    1.42        +1  -1      openpkg-src/petidomo/petidomo.spec
    1.6         +1  -0      openpkg-src/petidomo/rc.petidomo
    1.5         +1  -1      openpkg-src/postfix-mailgraph/postfix-mailgraph.spec
    1.3         +6  -8      openpkg-src/postfix-mailgraph/rc.postfix-mailgraph
    1.10        +1  -1      openpkg-src/pound/pound.spec
    1.8         +5  -7      openpkg-src/pound/rc.pound
    1.60        +1  -1      openpkg-src/proftpd/proftpd.spec
    1.7         +13 -17     openpkg-src/proftpd/rc.proftpd
    1.47        +1  -1      openpkg-src/pureftpd/pureftpd.spec
    1.8         +10 -13     openpkg-src/pureftpd/rc.pureftpd
    1.12        +19 -23     openpkg-src/rsync/rc.rsync
    1.44        +1  -1      openpkg-src/rsync/rsync.spec
    1.11        +27 -24     openpkg-src/sendmail/rc.sendmail
    1.4         +10 -12     openpkg-src/spamassassin/rc.spamassassin
    1.13        +1  -1      openpkg-src/spamassassin/spamassassin.spec
    1.6         +9  -11     openpkg-src/sysmon/rc.sysmon
    1.29        +1  -1      openpkg-src/sysmon/sysmon.spec
    1.9         +13 -16     openpkg-src/tomcat/rc.tomcat
    1.26        +1  -1      openpkg-src/tomcat/tomcat.spec
    1.7         +13 -16     openpkg-src/tomcat4/rc.tomcat4
    1.17        +1  -1      openpkg-src/tomcat4/tomcat4.spec
    1.4         +6  -4      openpkg-src/vim/rc.vim
    1.216       +1  -1      openpkg-src/vim/vim.spec
    1.5469      +20 -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/bind/bind.spec
  ============================================================================
  $ cvs diff -u -r1.58 -r1.59 bind.spec
  --- openpkg-src/bind/bind.spec        8 Jul 2003 14:38:47 -0000       1.58
  +++ openpkg-src/bind/bind.spec        9 Jul 2003 14:06:15 -0000       1.59
  @@ -37,7 +37,7 @@
   Group:        DNS
   License:      ISC
   Version:      %{V_bind}
  -Release:      20030707
  +Release:      20030709
   
   #   package options
   %option       with_dlz_mysql      no
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/bind/rc.bind
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 rc.bind
  --- openpkg-src/bind/rc.bind  7 Jul 2003 21:59:28 -0000       1.10
  +++ openpkg-src/bind/rc.bind  9 Jul 2003 14:06:15 -0000       1.11
  @@ -11,33 +11,28 @@
       bind_log_complevel="9"
   
   %start -p 100 -u @l_susr@
  -    if opServiceEnabled bind; then
  -        @l_prefix@/sbin/named ${bind_flags}
  -    fi
  +    opServiceEnabled bind || exit 0
  +    @l_prefix@/sbin/named ${bind_flags}
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled bind; then
  -        @l_prefix@/sbin/rndc stop
  -    fi
  +    opServiceEnabled bind || exit 0
  +    @l_prefix@/sbin/rndc stop
   
   %restart -u @l_susr@
  -    if opServiceEnabled bind; then
  -        @l_prefix@/sbin/rndc stop
  -        sleep 1
  -        @l_prefix@/sbin/named ${bind_flags}
  -    fi
  +    opServiceEnabled bind || exit 0
  +    @l_prefix@/sbin/rndc stop
  +    sleep 1
  +    @l_prefix@/sbin/named ${bind_flags}
   
   %reload -u @l_susr@
  -    if opServiceEnabled bind; then
  -        @l_prefix@/sbin/rndc reload
  -    fi
  +    opServiceEnabled bind || exit 0
  +    @l_prefix@/sbin/rndc reload
   
   %daily -u @l_susr@
  -    if opServiceEnabled bind; then
  -        shtool rotate -f \
  -            -n${bind_log_numfiles} -s${bind_log_minsize} \
  -            -d -z${bind_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  -            -E '@l_prefix@/sbin/rndc reload' \
  -            @l_prefix@/var/bind/named.log
  -    fi
  +    opServiceEnabled bind || exit 0
  +    shtool rotate -f \
  +        -n${bind_log_numfiles} -s${bind_log_minsize} \
  +        -d -z${bind_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  +        -E '@l_prefix@/sbin/rndc reload' \
  +        @l_prefix@/var/bind/named.log
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cvs/cvs.spec
  ============================================================================
  $ cvs diff -u -r1.58 -r1.59 cvs.spec
  --- openpkg-src/cvs/cvs.spec  8 Jul 2003 14:39:05 -0000       1.58
  +++ openpkg-src/cvs/cvs.spec  9 Jul 2003 14:06:16 -0000       1.59
  @@ -37,7 +37,7 @@
   Group:        SCM
   License:      GPL
   Version:      %{V_cvs}
  -Release:      20030708
  +Release:      20030709
   
   #   optional support for applying the RSE patches
   %option       with_fsl                      yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cvs/rc.cvs
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 rc.cvs
  --- openpkg-src/cvs/rc.cvs    7 Jul 2003 21:54:20 -0000       1.7
  +++ openpkg-src/cvs/rc.cvs    9 Jul 2003 14:06:16 -0000       1.8
  @@ -4,10 +4,10 @@
   ##
   
   %config
  -    cvs_pserverd_enable="no"
  -    cvs_pserverd_gflags=""
  -    cvs_pserverd_lflags=""
  -    cvs_pserverd_listen="127.0.0.1:2401"
  +    cvs_enable="no"
  +    cvs_gflags=""
  +    cvs_lflags=""
  +    cvs_listen="127.0.0.1:2401"
       cvs_log_prolog="true"
       cvs_log_epilog="true"
       cvs_log_numfiles="10"
  @@ -18,21 +18,19 @@
       cvs_pserverd_pidfile="@l_prefix@/var/cvs/pserverd.pid"
   
   %start -p 200 -u @l_susr@
  -    if opServiceEnabled cvs_pserverd; then
  -        rm -f $cvs_pserverd_pidfile >/dev/null 2>&1 || true
  -        @l_prefix@/bin/cvs -f $cvs_pserverd_gflags \
  -            pserverd -d -p $cvs_pserverd_pidfile \
  -                     -l $cvs_pserverd_listen $cvs_pserverd_lflags
  -    fi
  +    opServiceEnabled cvs || exit 0
  +    rm -f $cvs_pserverd_pidfile >/dev/null 2>&1 || true
  +    @l_prefix@/bin/cvs -f $cvs_gflags \
  +        pserverd -d -p $cvs_pserverd_pidfile \
  +        -l $cvs_listen $cvs_lflags
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled cvs_pserverd; then
  -        if [ -f $cvs_pserverd_pidfile ]; then
  -            kill -TERM `cat $cvs_pserverd_pidfile` >/dev/null 2>&1 || true
  -            sleep 2
  -            kill -KILL `cat $cvs_pserverd_pidfile` >/dev/null 2>&1 || true
  -            rm -f $cvs_pserverd_pidfile >/dev/null 2>&1 || true
  -        fi
  +    opServiceEnabled cvs || exit 0
  +    if [ -f $cvs_pserverd_pidfile ]; then
  +        kill -TERM `cat $cvs_pserverd_pidfile` >/dev/null 2>&1 || true
  +        sleep 2
  +        kill -KILL `cat $cvs_pserverd_pidfile` >/dev/null 2>&1 || true
  +        rm -f $cvs_pserverd_pidfile >/dev/null 2>&1 || true
       fi
   
   %daily -u @l_susr@
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cvsd/cvsd.spec
  ============================================================================
  $ cvs diff -u -r1.30 -r1.31 cvsd.spec
  --- openpkg-src/cvsd/cvsd.spec        8 Jul 2003 14:39:06 -0000       1.30
  +++ openpkg-src/cvsd/cvsd.spec        9 Jul 2003 14:06:16 -0000       1.31
  @@ -33,7 +33,7 @@
   Group:        SCM
   License:      GPL
   Version:      0.9.19
  -Release:      20030708
  +Release:      20030709
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cvsd/rc.cvsd
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 rc.cvsd
  --- openpkg-src/cvsd/rc.cvsd  7 Jul 2003 21:54:21 -0000       1.5
  +++ openpkg-src/cvsd/rc.cvsd  9 Jul 2003 14:06:16 -0000       1.6
  @@ -12,25 +12,22 @@
       cvsd_log_complevel="9"
   
   %start -p 200 -u @l_susr@
  -    if opServiceEnabled cvsd; then
  -        @l_prefix@/sbin/cvsd
  -    fi
  +    opServiceEnabled cvsd || exit 0
  +    @l_prefix@/sbin/cvsd
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled cvsd; then
  -        if [ -f @l_prefix@/var/cvsd/cvsd.pid ]; then
  -           kill `cat @l_prefix@/var/cvsd/cvsd.pid`
  -        fi
  +    opServiceEnabled cvsd || exit 0
  +    if [ -f @l_prefix@/var/cvsd/cvsd.pid ]; then
  +       kill `cat @l_prefix@/var/cvsd/cvsd.pid`
       fi
   
   %restart -u @l_susr@
  -    if opServiceEnabled cvsd; then
  -        if [ -f @l_prefix@/var/cvsd/cvsd.pid ]; then
  -           kill `cat @l_prefix@/var/cvsd/cvsd.pid`
  -           sleep 1
  -        fi
  -        @l_prefix@/sbin/cvsd
  +    opServiceEnabled cvsd || exit 0
  +    if [ -f @l_prefix@/var/cvsd/cvsd.pid ]; then
  +       kill `cat @l_prefix@/var/cvsd/cvsd.pid`
  +       sleep 1
       fi
  +    @l_prefix@/sbin/cvsd
   
   %daily -u @l_susr@
       opServiceEnabled cvsd || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/dss/dss.spec
  ============================================================================
  $ cvs diff -u -r1.19 -r1.20 dss.spec
  --- openpkg-src/dss/dss.spec  8 Jul 2003 14:39:23 -0000       1.19
  +++ openpkg-src/dss/dss.spec  9 Jul 2003 14:06:17 -0000       1.20
  @@ -37,7 +37,7 @@
   Group:        Video
   License:      APSL
   Version:      %{V_opkg}
  -Release:      20030707
  +Release:      20030709
   
   #   list of sources
   Source0:      
http://www.opensource.apple.com/projects/streaming/source/DSS-%{V_dss}.src.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/dss/rc.dss
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 rc.dss
  --- openpkg-src/dss/rc.dss    7 Jul 2003 10:26:33 -0000       1.6
  +++ openpkg-src/dss/rc.dss    9 Jul 2003 14:06:17 -0000       1.7
  @@ -4,46 +4,43 @@
   ##
   
   %config
  -    dssadmin_enable="no"
  -    dssdaemon_enable="yes"
  +    dss_enable="yes"
  +    dss_admin="no"
   
   %start -p 220 -u @l_susr@
  -    if opServiceEnabled dssadmin; then
  +    opServiceEnabled dss || exit 0
  +    @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
  +    echo $! >@l_prefix@/var/dss/dssdaemon.pid
  +    if opVarIsYes dss_admin; then
           @l_prefix@/sbin/streamingadminserver -c 
@l_prefix@/etc/dss/streamingadmin.conf
       fi
  -    if opServiceEnabled dssdaemon; then
  -        @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
  -        echo $! >@l_prefix@/var/dss/dssdaemon.pid
  -    fi
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled dssadmin; then
  +    opServiceEnabled dss || exit 0
  +    if [ -f @l_prefix@/var/dss/dssdaemon.pid ]; then
  +        kill -TERM `cat @l_prefix@/var/dss/dssdaemon.pid`
  +        rm @l_prefix@/var/dss/dssdaemon.pid
  +    fi
  +    if opVarIsYes dss_admin; then
           if [ -f @l_prefix@/var/dss/dssadmin.pid ]; then
               kill -TERM `cat @l_prefix@/var/dss/dssadmin.pid`
               rm @l_prefix@/var/dss/dssadmin.pid
           fi
       fi
  -    if opServiceEnabled dssdaemon; then
  -        if [ -f @l_prefix@/var/dss/dssdaemon.pid ]; then
  -            kill -TERM `cat @l_prefix@/var/dss/dssdaemon.pid`
  -            rm @l_prefix@/var/dss/dssdaemon.pid
  -        fi
  -    fi
   
   %restart -p 200 -u @l_susr@
  -    if opServiceEnabled dssadmin; then
  +    opServiceEnabled dss || exit 0
  +    if [ -f @l_prefix@/var/dss/dssdaemon.pid ]; then
  +        kill -TERM `cat @l_prefix@/var/dss/dssdaemon.pid`
  +        rm @l_prefix@/var/dss/dssdaemon.pid
  +    fi
  +    @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
  +    echo $! >@l_prefix@/var/dss/dssdaemon.pid
  +    if opVarIsYes dss_admin; then
           if [ -f @l_prefix@/var/dss/dssadmin.pid ]; then
               kill -TERM `cat @l_prefix@/var/dss/dssadmin.pid`
               rm @l_prefix@/var/dss/dssadmin.pid
           fi
           @l_prefix@/sbin/streamingadminserver -c 
@l_prefix@/etc/dss/streamingadmin.conf
  -    fi
  -    if opServiceEnabled dssdaemon; then
  -        if [ -f @l_prefix@/var/dss/dssdaemon.pid ]; then
  -            kill -TERM `cat @l_prefix@/var/dss/dssdaemon.pid`
  -            rm @l_prefix@/var/dss/dssdaemon.pid
  -        fi
  -        @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
  -        echo $! >@l_prefix@/var/dss/dssdaemon.pid
       fi
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/jabberd/jabberd.spec
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 jabberd.spec
  --- openpkg-src/jabberd/jabberd.spec  8 Jul 2003 14:40:15 -0000       1.4
  +++ openpkg-src/jabberd/jabberd.spec  9 Jul 2003 14:06:18 -0000       1.5
  @@ -35,7 +35,7 @@
   Group:        Network
   License:      JOSL/GPL
   Version:      1.4.2
  -Release:      20030707
  +Release:      20030709
   
   #   list of sources
   Source0:      http://jabberd.jabberstudio.org/downloads/jabber-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/jabberd/rc.jabberd
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 rc.jabberd
  --- openpkg-src/jabberd/rc.jabberd    24 Jun 2003 12:07:50 -0000      1.2
  +++ openpkg-src/jabberd/rc.jabberd    9 Jul 2003 14:06:18 -0000       1.3
  @@ -7,16 +7,14 @@
       jabberd_enable="yes"
   
   %start -p 100 -u @l_nusr@
  -    if opServiceEnabled jabberd; then
  -        umask 077
  -        @l_prefix@/sbin/jabberd -B -h `hostname` -c 
@l_prefix@/etc/jabberd/jabber.xml
  -    fi
  +    opServiceEnabled jabberd || exit 0
  +    umask 077
  +    @l_prefix@/sbin/jabberd -B -h `hostname` -c @l_prefix@/etc/jabberd/jabber.xml
   
   %stop -p 200 -u @l_nusr@
  -    if opServiceEnabled jabberd; then
  -        if [ -f @l_prefix@/var/jabberd/jabberd.pid ]; then
  -            kill `cat @l_prefix@/var/jabberd/jabberd.pid`
  -            rm -f @l_prefix@/var/jabberd/jabberd.pid
  -        fi
  +    opServiceEnabled jabberd || exit 0
  +    if [ -f @l_prefix@/var/jabberd/jabberd.pid ]; then
  +        kill `cat @l_prefix@/var/jabberd/jabberd.pid`
  +        rm -f @l_prefix@/var/jabberd/jabberd.pid
       fi
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/less/less.spec
  ============================================================================
  $ cvs diff -u -r1.28 -r1.29 less.spec
  --- openpkg-src/less/less.spec        8 Jul 2003 14:40:26 -0000       1.28
  +++ openpkg-src/less/less.spec        9 Jul 2003 14:06:18 -0000       1.29
  @@ -33,7 +33,7 @@
   Group:        Text
   License:      GPL
   Version:      381
  -Release:      20030216
  +Release:      20030709
   
   #   list of sources
   Source0:      http://www.greenwoodsoftware.com/less/less-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/less/rc.less
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 rc.less
  --- openpkg-src/less/rc.less  24 Jun 2003 12:07:51 -0000      1.3
  +++ openpkg-src/less/rc.less  9 Jul 2003 14:06:18 -0000       1.4
  @@ -3,9 +3,14 @@
   ##  rc.less -- Run-Commands
   ##
   
  +%config
  +    less_enable="yes"
  +
   %env
  -    PAGER="@l_prefix@/bin/less -E -r"
  -    export PAGER
  -    LESSOPEN="|@l_prefix@/bin/lesspipe %s"
  -    export LESSOPEN
  +    if opServiceEnabled less; then
  +        PAGER="@l_prefix@/bin/less -E -r"
  +        export PAGER
  +        LESSOPEN="|@l_prefix@/bin/lesspipe %s"
  +        export LESSOPEN
  +    fi
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql3/mysql3.spec
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 mysql3.spec
  --- openpkg-src/mysql3/mysql3.spec    8 Jul 2003 14:41:06 -0000       1.8
  +++ openpkg-src/mysql3/mysql3.spec    9 Jul 2003 14:06:19 -0000       1.9
  @@ -37,7 +37,7 @@
   Group:        Database
   License:      GPL
   Version:      %{V_major}.%{V_minor}
  -Release:      20030706
  +Release:      20030709
   
   #   package options
   %option       with_berkeleydb  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/mysql3/rc.mysql3
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 rc.mysql3
  --- openpkg-src/mysql3/rc.mysql3      24 Jun 2003 12:07:54 -0000      1.2
  +++ openpkg-src/mysql3/rc.mysql3      9 Jul 2003 14:06:19 -0000       1.3
  @@ -21,7 +21,7 @@
       [EMAIL PROTECTED]@/var/mysql/update.log
   
   %start -p 200 -u @l_rusr@
  -    opServiceEnabled mysql || exit 0
  +    opServiceEnabled mysql3 || exit 0
       cd @l_prefix@
       @l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
           [EMAIL PROTECTED]@ \
  @@ -29,13 +29,13 @@
           --err-log="$mysql3_log_err" &
   
   %stop -p 200 -u @l_rusr@
  -    opServiceEnabled mysql || exit 0
  +    opServiceEnabled mysql3 || exit 0
       @l_prefix@/bin/mysqladmin \
           --defaults-extra-file=${mysql3_pwd_file} \
           shutdown
   
   %restart -u @l_rusr@
  -    opServiceEnabled mysql || exit 0
  +    opServiceEnabled mysql3 || exit 0
       cd @l_prefix@
       @l_prefix@/bin/mysqladmin \
           --defaults-extra-file=${mysql3_pwd_file} \
  @@ -46,7 +46,7 @@
           --err-log="$mysql3_log_err" &
   
   %daily -u @l_rusr@
  -    opServiceEnabled mysql || exit 0
  +    opServiceEnabled mysql3 || exit 0
       shtool rotate -f \
           -n${mysql3_log_numfiles} -s${mysql3_log_minsize} -d \
           -z${mysql3_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/nsd/nsd.spec
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 nsd.spec
  --- openpkg-src/nsd/nsd.spec  8 Jul 2003 14:41:16 -0000       1.11
  +++ openpkg-src/nsd/nsd.spec  9 Jul 2003 14:06:20 -0000       1.12
  @@ -37,7 +37,7 @@
   Group:        DNS
   License:      GPL
   Version:      1.1.0
  -Release:      20030708
  +Release:      20030709
   
   #   package option
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/nsd/rc.nsd
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 rc.nsd
  --- openpkg-src/nsd/rc.nsd    7 Jul 2003 21:54:25 -0000       1.7
  +++ openpkg-src/nsd/rc.nsd    9 Jul 2003 14:06:20 -0000       1.8
  @@ -12,19 +12,16 @@
       nsd_log_complevel="9"
   
   %start -p 100 -u @l_susr@
  -    if opServiceEnabled nsd; then
  -        @l_prefix@/sbin/nsdc start
  -    fi
  +    opServiceEnabled nsd || exit 0
  +    @l_prefix@/sbin/nsdc start
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled nsd; then
  -        @l_prefix@/sbin/nsdc stop
  -    fi
  +    opServiceEnabled nsd || exit 0
  +    @l_prefix@/sbin/nsdc stop
   
   %reload -p 200 -u @l_susr@
  -    if opServiceEnabled nsd; then
  -        @l_prefix@/sbin/nsdc reload
  -    fi
  +    opServiceEnabled nsd || exit 0
  +    @l_prefix@/sbin/nsdc reload
   
   %daily -u @l_rusr@
       opServiceEnabled nsd || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perforce/perforce.spec
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 perforce.spec
  --- openpkg-src/perforce/perforce.spec        8 Jul 2003 14:41:32 -0000       1.13
  +++ openpkg-src/perforce/perforce.spec        9 Jul 2003 14:06:20 -0000       1.14
  @@ -33,7 +33,7 @@
   Group:        SCM
   License:      Commercial
   Version:      2003.1
  -Release:      20030604
  +Release:      20030709
   
   #   list of sources
   Source0:      perforce-%{version}.tar.bz2
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/perforce/rc.perforce
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 rc.perforce
  --- openpkg-src/perforce/rc.perforce  7 Jul 2003 21:59:30 -0000       1.4
  +++ openpkg-src/perforce/rc.perforce  9 Jul 2003 14:06:20 -0000       1.5
  @@ -11,23 +11,21 @@
       perforce_logfile="@l_prefix@/var/perforce/p4d.log"
   
   %start -p 100 -u @l_susr@
  -    if opServiceEnabled perforce; then
  -        cmd="@l_prefix@/sbin/p4d"
  -        cmd="$cmd -q -d -z"
  -        cmd="$cmd -p ${perforce_port}"
  -        cmd="$cmd -r ${perforce_rootdir}"
  -        cmd="$cmd -J ${perforce_journal}"
  -        cmd="$cmd -L ${perforce_logfile}"
  -        umask 077
  -        su @l_rusr@ -c "nohup $cmd </dev/null >/dev/null 2>&1 &"
  -    fi
  +    opServiceEnabled perforce || exit 0
  +    cmd="@l_prefix@/sbin/p4d"
  +    cmd="$cmd -q -d -z"
  +    cmd="$cmd -p ${perforce_port}"
  +    cmd="$cmd -r ${perforce_rootdir}"
  +    cmd="$cmd -J ${perforce_journal}"
  +    cmd="$cmd -L ${perforce_logfile}"
  +    umask 077
  +    su @l_rusr@ -c "nohup $cmd </dev/null >/dev/null 2>&1 &"
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled perforce; then
  -        cmd="@l_prefix@/bin/p4"
  -        cmd="$cmd -p ${perforce_port}"
  -        cmd="$cmd admin stop"
  -        umask 077
  -        su @l_rusr@ -c "$cmd"
  -    fi
  +    opServiceEnabled perforce || exit 0
  +    cmd="@l_prefix@/bin/p4"
  +    cmd="$cmd -p ${perforce_port}"
  +    cmd="$cmd admin stop"
  +    umask 077
  +    su @l_rusr@ -c "$cmd"
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/petidomo/petidomo.spec
  ============================================================================
  $ cvs diff -u -r1.41 -r1.42 petidomo.spec
  --- openpkg-src/petidomo/petidomo.spec        8 Jul 2003 14:41:50 -0000       1.41
  +++ openpkg-src/petidomo/petidomo.spec        9 Jul 2003 14:06:21 -0000       1.42
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      4.0b1
  -Release:      20030708
  +Release:      20030709
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/petidomo/rc.petidomo
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 rc.petidomo
  --- openpkg-src/petidomo/rc.petidomo  7 Jul 2003 21:54:26 -0000       1.5
  +++ openpkg-src/petidomo/rc.petidomo  9 Jul 2003 14:06:21 -0000       1.6
  @@ -4,6 +4,7 @@
   ##
   
   %config
  +    petidomo_enable="yes"
       petidomo_log_prolog="true"
       petidomo_log_epilog="true"
       petidomo_log_numfiles="10"
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/postfix-mailgraph/postfix-mailgraph.spec
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 postfix-mailgraph.spec
  --- openpkg-src/postfix-mailgraph/postfix-mailgraph.spec      8 Jul 2003 14:41:58 
-0000       1.4
  +++ openpkg-src/postfix-mailgraph/postfix-mailgraph.spec      9 Jul 2003 14:06:22 
-0000       1.5
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      1.4
  -Release:      20030614
  +Release:      20030709
   
   #   list of sources
   Source0:      
http://people.ee.ethz.ch/~dws/software/mailgraph/pub/mailgraph-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/postfix-mailgraph/rc.postfix-mailgraph
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 rc.postfix-mailgraph
  --- openpkg-src/postfix-mailgraph/rc.postfix-mailgraph        24 Jun 2003 12:08:01 
-0000      1.2
  +++ openpkg-src/postfix-mailgraph/rc.postfix-mailgraph        9 Jul 2003 14:06:22 
-0000       1.3
  @@ -7,15 +7,13 @@
       postfix_mailgraph_enable="yes"
   
   %start -p 100 -u @l_susr@
  -    if opServiceEnabled postfix_mailgraph; then
  -        @l_prefix@/sbin/mailgraph --daemon
  -    fi
  +    opServiceEnabled postfix_mailgraph || exit 0
  +    @l_prefix@/sbin/mailgraph --daemon
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled postfix_mailgraph; then
  -        if [ -f @l_prefix@/var/postfix-mailgraph/run/mailgraph.pid ]; then
  -            kill -TERM `cat @l_prefix@/var/postfix-mailgraph/run/mailgraph.pid` 
>/dev/null 2>&1 || true
  -            sleep 2
  -        fi
  +    opServiceEnabled postfix_mailgraph || exit 0
  +    if [ -f @l_prefix@/var/postfix-mailgraph/run/mailgraph.pid ]; then
  +        kill -TERM `cat @l_prefix@/var/postfix-mailgraph/run/mailgraph.pid` 
>/dev/null 2>&1 || true
  +        sleep 2
       fi
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pound/pound.spec
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 pound.spec
  --- openpkg-src/pound/pound.spec      8 Jul 2003 14:41:59 -0000       1.9
  +++ openpkg-src/pound/pound.spec      9 Jul 2003 14:06:23 -0000       1.10
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      GPL
   Version:      1.4
  -Release:      20030708
  +Release:      20030709
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pound/rc.pound
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 rc.pound
  --- openpkg-src/pound/rc.pound        7 Jul 2003 21:54:28 -0000       1.7
  +++ openpkg-src/pound/rc.pound        9 Jul 2003 14:06:23 -0000       1.8
  @@ -12,15 +12,13 @@
       pound_log_complevel="9"
   
   %start -p 100 -u @l_susr@
  -    if opServiceEnabled pound; then
  -        @l_prefix@/sbin/pound
  -    fi
  +    opServiceEnabled pound || exit 0
  +    @l_prefix@/sbin/pound
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled pound; then
  -        kill -TERM `cat @l_prefix@/var/pound/pound.pid`
  -        sleep 1
  -    fi
  +    opServiceEnabled pound || exit 0
  +    kill -TERM `cat @l_prefix@/var/pound/pound.pid`
  +    sleep 1
   
   %daily -u @l_susr@
       opServiceEnabled pound || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/proftpd.spec
  ============================================================================
  $ cvs diff -u -r1.59 -r1.60 proftpd.spec
  --- openpkg-src/proftpd/proftpd.spec  8 Jul 2003 14:42:02 -0000       1.59
  +++ openpkg-src/proftpd/proftpd.spec  9 Jul 2003 14:06:23 -0000       1.60
  @@ -33,7 +33,7 @@
   Group:        FTP
   License:      GPL
   Version:      1.2.8
  -Release:      20030707
  +Release:      20030709
   
   #   package options
   %option       with_mysql  no
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/proftpd/rc.proftpd
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 rc.proftpd
  --- openpkg-src/proftpd/rc.proftpd    24 Jun 2003 12:08:03 -0000      1.6
  +++ openpkg-src/proftpd/rc.proftpd    9 Jul 2003 14:06:24 -0000       1.7
  @@ -31,31 +31,27 @@
       proftpd_xfer_complevel="9"
   
   %start -p 200 -u @l_susr@
  -    if opServiceEnabled proftpd; then
  -        @l_prefix@/sbin/proftpd
  -    fi
  +    opServiceEnabled proftpd || exit 0
  +    @l_prefix@/sbin/proftpd
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled proftpd; then
  -        if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  -            kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid`
  -        fi
  +    opServiceEnabled proftpd || exit 0
  +    if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  +        kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid`
       fi
   
   %restart -u @l_susr@
  -    if opServiceEnabled proftpd; then
  -        if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  -            kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid`
  -            sleep 2
  -        fi
  -        @l_prefix@/sbin/proftpd
  +    opServiceEnabled proftpd || exit 0
  +    if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  +        kill -TERM `cat @l_prefix@/var/proftpd/proftpd.pid`
  +        sleep 2
       fi
  +    @l_prefix@/sbin/proftpd
   
   %reload -u @l_susr@
  -    if opServiceEnabled proftpd; then
  -        if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  -            kill -HUP `cat @l_prefix@/var/proftpd/proftpd.pid`
  -        fi
  +    opServiceEnabled proftpd || exit 0
  +    if [ -f @l_prefix@/var/proftpd/proftpd.pid ]; then
  +        kill -HUP `cat @l_prefix@/var/proftpd/proftpd.pid`
       fi
   
   %daily -u @l_susr@
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pureftpd/pureftpd.spec
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 pureftpd.spec
  --- openpkg-src/pureftpd/pureftpd.spec        8 Jul 2003 14:42:04 -0000       1.46
  +++ openpkg-src/pureftpd/pureftpd.spec        9 Jul 2003 14:06:24 -0000       1.47
  @@ -33,7 +33,7 @@
   Group:        FTP
   License:      GPL
   Version:      1.1.0
  -Release:      20030708
  +Release:      20030709
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/pureftpd/rc.pureftpd
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 rc.pureftpd
  --- openpkg-src/pureftpd/rc.pureftpd  7 Jul 2003 21:54:30 -0000       1.7
  +++ openpkg-src/pureftpd/rc.pureftpd  9 Jul 2003 14:06:24 -0000       1.8
  @@ -12,23 +12,20 @@
       pureftpd_log_complevel="9"
   
   %start -p 200 -u @l_susr@
  -    if opServiceEnabled pureftpd; then
  -        @l_prefix@/sbin/pure-ftpd </dev/null &
  -        echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
  -    fi
  +    opServiceEnabled pureftpd || exit 0
  +    @l_prefix@/sbin/pure-ftpd </dev/null &
  +    echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled pureftpd; then
  -        kill -TERM `cat @l_prefix@/var/pureftpd/pureftpd.pid`
  -    fi
  +    opServiceEnabled pureftpd || exit 0
  +    kill -TERM `cat @l_prefix@/var/pureftpd/pureftpd.pid`
   
   %restart -u @l_susr@
  -    if opServiceEnabled pureftpd; then
  -        kill -TERM `cat @l_prefix@/var/pureftpd/pureftpd.pid`
  -        sleep 2
  -        @l_prefix@/sbin/pure-ftpd </dev/null &
  -        echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
  -    fi
  +    opServiceEnabled pureftpd || exit 0
  +    kill -TERM `cat @l_prefix@/var/pureftpd/pureftpd.pid`
  +    sleep 2
  +    @l_prefix@/sbin/pure-ftpd </dev/null &
  +    echo "$!" >@l_prefix@/var/pureftpd/pureftpd.pid
   
   %daily -u @l_susr@
       opServiceEnabled pureftpd || exit 0
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rsync/rc.rsync
  ============================================================================
  $ cvs diff -u -r1.11 -r1.12 rc.rsync
  --- openpkg-src/rsync/rc.rsync        24 Jun 2003 12:08:05 -0000      1.11
  +++ openpkg-src/rsync/rc.rsync        9 Jul 2003 14:06:25 -0000       1.12
  @@ -17,37 +17,33 @@
       rsync_pidfile="@l_prefix@/var/rsync/rsync.pid"
   
   %start -p 200 -u @l_susr@
  -    if opServiceEnabled rsync; then
  -        nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags \
  -             --daemon --config=$rsync_cfgfile
  -    fi
  +    opServiceEnabled rsync || exit 0
  +    nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags \
  +         --daemon --config=$rsync_cfgfile
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled rsync; then
  -        if [ -f $rsync_pidfile ]; then
  -            kill -TERM `cat $rsync_pidfile`
  -        fi
  +    opServiceEnabled rsync || exit 0
  +    if [ -f $rsync_pidfile ]; then
  +        kill -TERM `cat $rsync_pidfile`
       fi
   
   %restart -u @l_susr@
  -    if opServiceEnabled rsync; then
  -        if [ -f $rsync_pidfile ]; then
  -            kill -TERM `cat $rsync_pidfile`
  -            sleep 2
  -        fi
  -        nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags \
  -             --daemon --config=$rsync_cfgfile
  +    opServiceEnabled rsync || exit 0
  +    if [ -f $rsync_pidfile ]; then
  +        kill -TERM `cat $rsync_pidfile`
  +        sleep 2
       fi
  +    nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags \
  +         --daemon --config=$rsync_cfgfile
   
   %daily -u @l_susr@
  -    if opServiceEnabled rsync; then
  -        shtool rotate -f \
  -            -n ${rsync_log_numfiles} -s ${rsync_log_minsize} \
  -            -d -z ${rsync_log_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
  -            -E "test -f $rsync_pidfile && kill -TERM \`cat $rsync_pidfile\`; sleep 
2; \
  -                nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags --daemon 
--config=$rsync_cfgfile" \
  -            $rsync_logfile
  -    fi
  +    opServiceEnabled rsync || exit 0
  +    shtool rotate -f \
  +        -n ${rsync_log_numfiles} -s ${rsync_log_minsize} \
  +        -d -z ${rsync_log_complevel} -o @l_musr@ -g @l_mgrp@ -m 644 \
  +        -E "test -f $rsync_pidfile && kill -TERM \`cat $rsync_pidfile\`; sleep 2; \
  +            nice -n $rsync_nicelevel @l_prefix@/bin/rsync $rsync_flags --daemon 
--config=$rsync_cfgfile" \
  +        $rsync_logfile
   
   %env
       if opServiceEnabled rsync; then
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/rsync/rsync.spec
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 rsync.spec
  --- openpkg-src/rsync/rsync.spec      8 Jul 2003 14:42:15 -0000       1.43
  +++ openpkg-src/rsync/rsync.spec      9 Jul 2003 14:06:25 -0000       1.44
  @@ -33,7 +33,7 @@
   Group:        Filesystem
   License:      GPL
   Version:      2.5.6
  -Release:      20030527
  +Release:      20030709
   
   #   list of sources
   Source0:      http://rsync.samba.org/ftp/rsync/rsync-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sendmail/rc.sendmail
  ============================================================================
  $ cvs diff -u -r1.10 -r1.11 rc.sendmail
  --- openpkg-src/sendmail/rc.sendmail  7 Jul 2003 21:59:31 -0000       1.10
  +++ openpkg-src/sendmail/rc.sendmail  9 Jul 2003 14:06:26 -0000       1.11
  @@ -73,17 +73,21 @@
       }
   
   %start -p 200 -u @l_susr@
  +    opServiceEnabled sendmail || exit 0
       sendmail_start
   
   %stop -p 200 -u @l_susr@
  +    opServiceEnabled sendmail || exit 0
       sendmail_signal TERM KILL
   
   %restart -u @l_susr@
  +    opServiceEnabled sendmail || exit 0
       sendmail_signal TERM KILL
       sleep 2
       sendmail_start
   
   %reload -u @l_susr@
  +    opServiceEnabled sendmail || exit 0
       #   sendmail does not like SIGHUP on queue-only processes,
       #   so we have to perform actually a restart...
       sendmail_signal TERM KILL
  @@ -91,29 +95,28 @@
       sendmail_start
   
   %daily -u @l_susr@
  -    if opServiceEnabled sendmail; then
  -        opTmpDirGen sendmail
  -        opTmpDirFile sendmail hint hintfile
  -        prolog="true"
  -        if [ ".$sendmail_log_prolog" != . ]; then
  -            prolog="$prolog; $sendmail_log_prolog"
  -        fi
  -        epilog="echo 'epilog' >$hintfile"
  -        if [ ".$sendmail_log_epilog" != . ]; then
  -            epilog="$epilog; $sendmail_log_epilog"
  -        fi
  -        shtool rotate -f \
  -            -n${sendmail_log_numfiles} -s${sendmail_log_minsize} \
  -            -d -z${sendmail_log_complevel} \
  -            [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  -            -P "$prolog" \
  -            -E "$epilog" \
  -            @l_prefix@/var/sendmail/sendmail.log
  -        if [ ".`cat $hintfile`" = ".epilog" ]; then
  -            sendmail_signal TERM KILL
  -            sleep 2
  -            sendmail_start
  -        fi
  -        opTmpDirDel sendmail
  +    opServiceEnabled sendmail || exit 0
  +    opTmpDirGen sendmail
  +    opTmpDirFile sendmail hint hintfile
  +    prolog="true"
  +    if [ ".$sendmail_log_prolog" != . ]; then
  +        prolog="$prolog; $sendmail_log_prolog"
       fi
  +    epilog="echo 'epilog' >$hintfile"
  +    if [ ".$sendmail_log_epilog" != . ]; then
  +        epilog="$epilog; $sendmail_log_epilog"
  +    fi
  +    shtool rotate -f \
  +        -n${sendmail_log_numfiles} -s${sendmail_log_minsize} \
  +        -d -z${sendmail_log_complevel} \
  +        [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
  +        -P "$prolog" \
  +        -E "$epilog" \
  +        @l_prefix@/var/sendmail/sendmail.log
  +    if [ ".`cat $hintfile`" = ".epilog" ]; then
  +        sendmail_signal TERM KILL
  +        sleep 2
  +        sendmail_start
  +    fi
  +    opTmpDirDel sendmail
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/spamassassin/rc.spamassassin
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 rc.spamassassin
  --- openpkg-src/spamassassin/rc.spamassassin  8 Jul 2003 13:47:59 -0000       1.3
  +++ openpkg-src/spamassassin/rc.spamassassin  9 Jul 2003 14:06:26 -0000       1.4
  @@ -18,20 +18,18 @@
       spamassassin_pidfile="@l_prefix@/var/spamassassin/spamassassin.pid"
   
   %start -p 100 -u @l_susr@
  -    if opServiceEnabled spamassassin; then
  -        @l_prefix@/bin/spamd \
  -            --daemonize \
  -            --pidfile="${spamassassin_pidfile}" \
  -            --listen-ip="${spamassassin_iface}" \
  -            --port="${spamassassin_port}" \
  -            --local
  -    fi
  +    opServiceEnabled spamassassin || exit 0
  +    @l_prefix@/bin/spamd \
  +        --daemonize \
  +        --pidfile="${spamassassin_pidfile}" \
  +        --listen-ip="${spamassassin_iface}" \
  +        --port="${spamassassin_port}" \
  +        --local
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled spamassassin; then
  -        if [ -f "${spamassassin_pidfile}" ] ;then
  -            kill -TERM `cat "${spamassassin_pidfile}"`
  -        fi
  +    opServiceEnabled spamassassin || exit 0
  +    if [ -f "${spamassassin_pidfile}" ] ;then
  +        kill -TERM `cat "${spamassassin_pidfile}"`
       fi
   
   %daily -u @l_susr@
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/spamassassin/spamassassin.spec
  ============================================================================
  $ cvs diff -u -r1.12 -r1.13 spamassassin.spec
  --- openpkg-src/spamassassin/spamassassin.spec        8 Jul 2003 14:42:35 -0000      
 1.12
  +++ openpkg-src/spamassassin/spamassassin.spec        9 Jul 2003 14:06:26 -0000      
 1.13
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL/Artistic
   Version:      2.55
  -Release:      20030708
  +Release:      20030709
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sysmon/rc.sysmon
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 rc.sysmon
  --- openpkg-src/sysmon/rc.sysmon      7 Jul 2003 21:54:35 -0000       1.5
  +++ openpkg-src/sysmon/rc.sysmon      9 Jul 2003 14:06:27 -0000       1.6
  @@ -15,19 +15,17 @@
       sysmon_pidfile="@l_prefix@/var/sysmon/sysmon.pid"
   
   %start -p 200 -u @l_susr@
  -    if opServiceEnabled sysmon; then
  -        opTmpDirGen sysmon
  -        opTmpDirFile sysmon log logfile
  -        @l_prefix@/sbin/sysmond -q -f @l_prefix@/etc/sysmon/sysmon.conf >$logfile 
2>&1
  -        grep "pid" $logfile | sed -e 's;^.*pid \([0-9]*\).*$;\1;' >$sysmon_pidfile
  -        opTmpDirDel sysmon
  -    fi
  +    opServiceEnabled sysmon || exit 0
  +    opTmpDirGen sysmon
  +    opTmpDirFile sysmon log logfile
  +    @l_prefix@/sbin/sysmond -q -f @l_prefix@/etc/sysmon/sysmon.conf >$logfile 2>&1
  +    grep "pid" $logfile | sed -e 's;^.*pid \([0-9]*\).*$;\1;' >$sysmon_pidfile
  +    opTmpDirDel sysmon
   
   %stop -p 200 -u @l_susr@
  -    if opServiceEnabled sysmon; then
  -        if [ -f $sysmon_pidfile ]; then
  -            kill -TERM `cat $sysmon_pidfile`
  -        fi
  +    opServiceEnabled sysmon || exit 0
  +    if [ -f $sysmon_pidfile ]; then
  +        kill -TERM `cat $sysmon_pidfile`
       fi
   
   %daily -u @l_susr@
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/sysmon/sysmon.spec
  ============================================================================
  $ cvs diff -u -r1.28 -r1.29 sysmon.spec
  --- openpkg-src/sysmon/sysmon.spec    8 Jul 2003 14:42:44 -0000       1.28
  +++ openpkg-src/sysmon/sysmon.spec    9 Jul 2003 14:06:27 -0000       1.29
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      0.91.19
  -Release:      20030708
  +Release:      20030709
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tomcat/rc.tomcat
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 rc.tomcat
  --- openpkg-src/tomcat/rc.tomcat      8 Jul 2003 19:39:12 -0000       1.8
  +++ openpkg-src/tomcat/rc.tomcat      9 Jul 2003 14:06:28 -0000       1.9
  @@ -8,26 +8,23 @@
       tomcat_home="@l_prefix@/libexec/tomcat"
   
   %start -p 200 -u @l_rusr@
  -    if opServiceEnabled tomcat; then
  -        JAVA_HOME="$jdk_home"; export JAVA_HOME
  -        TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
  -        $TOMCAT_HOME/bin/tomcat.sh start
  -    fi
  +    opServiceEnabled tomcat || exit 0
  +    JAVA_HOME="$jdk_home"; export JAVA_HOME
  +    TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
  +    $TOMCAT_HOME/bin/tomcat.sh start
   
   %stop -p 200 -u @l_rusr@
  -    if opServiceEnabled tomcat; then
  -        JAVA_HOME="$jdk_home"; export JAVA_HOME
  -        TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
  -        $TOMCAT_HOME/bin/tomcat.sh stop
  -    fi
  +    opServiceEnabled tomcat || exit 0
  +    JAVA_HOME="$jdk_home"; export JAVA_HOME
  +    TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
  +    $TOMCAT_HOME/bin/tomcat.sh stop
   
   %restart -p 200 -u @l_rusr@
  -    if opServiceEnabled tomcat; then
  -        JAVA_HOME="$jdk_home"; export JAVA_HOME
  -        TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
  -        $TOMCAT_HOME/bin/tomcat.sh stop
  -        $TOMCAT_HOME/bin/tomcat.sh start
  -    fi
  +    opServiceEnabled tomcat || exit 0
  +    JAVA_HOME="$jdk_home"; export JAVA_HOME
  +    TOMCAT_HOME="$tomcat_home"; export TOMCAT_HOME
  +    $TOMCAT_HOME/bin/tomcat.sh stop
  +    $TOMCAT_HOME/bin/tomcat.sh start
   
   %env
       if opServiceEnabled tomcat; then
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tomcat/tomcat.spec
  ============================================================================
  $ cvs diff -u -r1.25 -r1.26 tomcat.spec
  --- openpkg-src/tomcat/tomcat.spec    8 Jul 2003 14:42:54 -0000       1.25
  +++ openpkg-src/tomcat/tomcat.spec    9 Jul 2003 14:06:28 -0000       1.26
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      Apache Software License 1.1
   Version:      3.3.1a
  -Release:      20030405
  +Release:      20030709
   
   #   list of sources
   Source0:      
http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tomcat4/rc.tomcat4
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 rc.tomcat4
  --- openpkg-src/tomcat4/rc.tomcat4    8 Jul 2003 19:39:12 -0000       1.6
  +++ openpkg-src/tomcat4/rc.tomcat4    9 Jul 2003 14:06:28 -0000       1.7
  @@ -8,26 +8,23 @@
       tomcat4_home="@l_prefix@/libexec/tomcat"
   
   %start -p 200 -u @l_rusr@
  -    if opServiceEnabled tomcat4; then
  -        JAVA_HOME="$java_home"; export JAVA_HOME
  -        CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
  -        $CATALINA_HOME/bin/startup.sh
  -    fi
  +    opServiceEnabled tomcat4 || exit 0
  +    JAVA_HOME="$java_home"; export JAVA_HOME
  +    CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
  +    $CATALINA_HOME/bin/startup.sh
   
   %stop -p 200 -u @l_rusr@
  -    if opServiceEnabled tomcat4; then
  -        JAVA_HOME="$java_home"; export JAVA_HOME
  -        CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
  -        $CATALINA_HOME/bin/shutdown.sh
  -    fi
  +    opServiceEnabled tomcat4 || exit 0
  +    JAVA_HOME="$java_home"; export JAVA_HOME
  +    CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
  +    $CATALINA_HOME/bin/shutdown.sh
   
   %restart -p 200 -u @l_rusr@
  -    if opServiceEnabled tomcat4; then
  -        JAVA_HOME="$java_home"; export JAVA_HOME
  -        CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
  -        $CATALINA_HOME/bin/shutdown.sh
  -        $CATALINA_HOME/bin/startup.sh
  -    fi
  +    opServiceEnabled tomcat4 || exit 0
  +    JAVA_HOME="$java_home"; export JAVA_HOME
  +    CATALINA_HOME="$tomcat4_home"; export CATALINA_HOME
  +    $CATALINA_HOME/bin/shutdown.sh
  +    $CATALINA_HOME/bin/startup.sh
   
   %env
       if opServiceEnabled tomcat4; then
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/tomcat4/tomcat4.spec
  ============================================================================
  $ cvs diff -u -r1.16 -r1.17 tomcat4.spec
  --- openpkg-src/tomcat4/tomcat4.spec  8 Jul 2003 14:42:55 -0000       1.16
  +++ openpkg-src/tomcat4/tomcat4.spec  9 Jul 2003 14:06:28 -0000       1.17
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      Apache Software License 1.1
   Version:      4.1.24
  -Release:      20030322
  +Release:      20030709
   
   #   list of sources
   Source0:      
http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v%{version}/bin/jakarta-tomcat-%{version}.tar.gz
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/vim/rc.vim
  ============================================================================
  $ cvs diff -u -r1.3 -r1.4 rc.vim
  --- openpkg-src/vim/rc.vim    24 Jun 2003 12:08:15 -0000      1.3
  +++ openpkg-src/vim/rc.vim    9 Jul 2003 14:06:29 -0000       1.4
  @@ -4,8 +4,10 @@
   ##
   
   %env
  -    EDITOR="@l_prefix@/bin/vim"
  -    export EDITOR
  -    VISUAL="@l_prefix@/bin/vim"
  -    export VISUAL
  +    if opServiceEnabled vim; then
  +        EDITOR="@l_prefix@/bin/vim"
  +        export EDITOR
  +        VISUAL="@l_prefix@/bin/vim"
  +        export VISUAL
  +    fi
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/vim/vim.spec
  ============================================================================
  $ cvs diff -u -r1.215 -r1.216 vim.spec
  --- openpkg-src/vim/vim.spec  8 Jul 2003 14:43:09 -0000       1.215
  +++ openpkg-src/vim/vim.spec  9 Jul 2003 14:06:29 -0000       1.216
  @@ -38,7 +38,7 @@
   Group:        Editor
   License:      Charityware
   Version:      %{V_vl}.%{V_pl}
  -Release:      20030705
  +Release:      20030709
   
   #   package options
   %option       with_x11        no
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.5468 -r1.5469 news.txt
  --- openpkg-web/news.txt      9 Jul 2003 13:44:06 -0000       1.5468
  +++ openpkg-web/news.txt      9 Jul 2003 14:06:13 -0000       1.5469
  @@ -1,3 +1,23 @@
  +09-Jul-2003: Upgraded package: P<vim-6.2.21-20030709>
  +09-Jul-2003: Upgraded package: P<tomcat4-4.1.24-20030709>
  +09-Jul-2003: Upgraded package: P<tomcat-3.3.1a-20030709>
  +09-Jul-2003: Upgraded package: P<sysmon-0.91.19-20030709>
  +09-Jul-2003: Upgraded package: P<spamassassin-2.55-20030709>
  +09-Jul-2003: Upgraded package: P<rsync-2.5.6-20030709>
  +09-Jul-2003: Upgraded package: P<pureftpd-1.1.0-20030709>
  +09-Jul-2003: Upgraded package: P<proftpd-1.2.8-20030709>
  +09-Jul-2003: Upgraded package: P<pound-1.4-20030709>
  +09-Jul-2003: Upgraded package: P<postfix-mailgraph-1.4-20030709>
  +09-Jul-2003: Upgraded package: P<petidomo-4.0b1-20030709>
  +09-Jul-2003: Upgraded package: P<perforce-2003.1-20030709>
  +09-Jul-2003: Upgraded package: P<nsd-1.1.0-20030709>
  +09-Jul-2003: Upgraded package: P<mysql3-3.23.57-20030709>
  +09-Jul-2003: Upgraded package: P<less-381-20030709>
  +09-Jul-2003: Upgraded package: P<jabberd-1.4.2-20030709>
  +09-Jul-2003: Upgraded package: P<dss-4.1.3-20030709>
  +09-Jul-2003: Upgraded package: P<cvsd-0.9.19-20030709>
  +09-Jul-2003: Upgraded package: P<cvs-1.12.1-20030709>
  +09-Jul-2003: Upgraded package: P<bind-9.2.2-20030709>
   09-Jul-2003: Upgraded package: P<ksh-20030621-20030709>
   09-Jul-2003: Upgraded package: P<instant-1.0-20030709>
   09-Jul-2003: Upgraded package: P<dhcp-agent-0.40-20030709>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to