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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   14-Nov-2006 14:47:51
  Branch: HEAD                             Handle: 2006111413474703

  Modified files:
    openpkg-src/dhcp-agent  dhcp-agent.spec rc.dhcp-agent
    openpkg-src/milter-regex
                            milter-regex.spec rc.milter-regex
    openpkg-src/openpkg-registry
                            openpkg-registry.spec rc.openpkg-registry
    openpkg-src/postfix-mailgraph
                            postfix-mailgraph.spec rc.postfix-mailgraph
    openpkg-src/ripe-dbase  rc.ripe-dbase ripe-dbase.spec

  Log:
    the argument to rcService has to be the original package name as it
    internally run 'rc <name> status'. For checking the variables
    rcService since ever automatically translates all '-' into '_'
    characters

  Summary:
    Revision    Changes     Path
    1.44        +1  -1      openpkg-src/dhcp-agent/dhcp-agent.spec
    1.14        +13 -13     openpkg-src/dhcp-agent/rc.dhcp-agent
    1.7         +1  -1      openpkg-src/milter-regex/milter-regex.spec
    1.3         +9  -9      openpkg-src/milter-regex/rc.milter-regex
    1.30        +1  -1      openpkg-src/openpkg-registry/openpkg-registry.spec
    1.3         +3  -3      openpkg-src/openpkg-registry/rc.openpkg-registry
    1.28        +1  -1      openpkg-src/postfix-mailgraph/postfix-mailgraph.spec
    1.12        +7  -4      openpkg-src/postfix-mailgraph/rc.postfix-mailgraph
    1.14        +7  -7      openpkg-src/ripe-dbase/rc.ripe-dbase
    1.51        +1  -1      openpkg-src/ripe-dbase/ripe-dbase.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/dhcp-agent/dhcp-agent.spec
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 dhcp-agent.spec
  --- openpkg-src/dhcp-agent/dhcp-agent.spec    13 Oct 2006 17:27:35 -0000      
1.43
  +++ openpkg-src/dhcp-agent/dhcp-agent.spec    14 Nov 2006 13:47:47 -0000      
1.44
  @@ -35,7 +35,7 @@
   Group:        DHCP
   License:      MIT-style
   Version:      0.41
  -Release:      20061013
  +Release:      20061114
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/dhcp-agent/rc.dhcp-agent
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 rc.dhcp-agent
  --- openpkg-src/dhcp-agent/rc.dhcp-agent      13 Oct 2006 15:20:49 -0000      
1.13
  +++ openpkg-src/dhcp-agent/rc.dhcp-agent      14 Nov 2006 13:47:47 -0000      
1.14
  @@ -21,9 +21,9 @@
   %status -u @l_susr@ -o
       dhcp_agent_usable="no"
       dhcp_agent_active="no"
  -    rcService dhcp_agent enable yes && \
  +    rcService dhcp-agent enable yes && \
           [ ".$dhcp_agent_interface" != . ] && dhcp_agent_usable="yes"
  -    rcService dhcp_agent enable yes && \
  +    rcService dhcp-agent enable yes && \
           rcVarIsYes dhcp_agent_usable && \
           dhcp_agent_signal 0 && dhcp_agent_active="yes"
       echo "dhcp_agent_enable=\"$dhcp_agent_enable\""
  @@ -31,31 +31,31 @@
       echo "dhcp_agent_active=\"$dhcp_agent_active\""
   
   %start -p 50 -u @l_susr@
  -    rcService dhcp_agent enable yes || exit 0
  -    rcService dhcp_agent active yes && exit 0
  -    rcService dhcp_agent usable && \
  +    rcService dhcp-agent enable yes || exit 0
  +    rcService dhcp-agent active yes && exit 0
  +    rcService dhcp-agent usable && \
       @l_prefix@/sbin/dhcp-client 2>/dev/null -i $dhcp_agent_interface
   
   %stop -p 950 -u @l_susr@
  -    rcService dhcp_agent enable yes || exit 0
  -    rcService dhcp_agent active no && exit 0
  -    rcService dhcp_agent usable && \
  +    rcService dhcp-agent enable yes || exit 0
  +    rcService dhcp-agent active no && exit 0
  +    rcService dhcp-agent usable && \
       @l_prefix@/sbin/dhcp-client 2>/dev/null -k -i $dhcp_agent_interface
   
   %restart -u @l_susr@
  -    rcService dhcp_agent enable yes || exit 0
  -    rcService dhcp_agent active no && exit 0
  +    rcService dhcp-agent enable yes || exit 0
  +    rcService dhcp-agent active no && exit 0
       rc dhcp_agent stop
       sleep 2
       rc dhcp_agent start
   
   %reload -u @l_susr@
  -    rcService dhcp_agent enable yes || exit 0
  -    rcService dhcp_agent usable && \
  +    rcService dhcp-agent enable yes || exit 0
  +    rcService dhcp-agent usable && \
       @l_prefix@/sbin/dhcp-client 2>/dev/null -c -i $dhcp_agent_interface
   
   %daily -u @l_susr@
  -    rcService dhcp_agent enable yes || exit 0
  +    rcService dhcp-agent enable yes || exit 0
       shtool rotate -f \
           -n ${dhcp_agent_log_numfiles} -s ${dhcp_agent_log_minsize} -d \
           -z ${dhcp_agent_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/milter-regex/milter-regex.spec
  ============================================================================
  $ cvs diff -u -r1.6 -r1.7 milter-regex.spec
  --- openpkg-src/milter-regex/milter-regex.spec        13 Oct 2006 17:29:58 
-0000      1.6
  +++ openpkg-src/milter-regex/milter-regex.spec        14 Nov 2006 13:47:48 
-0000      1.7
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      BSD
   Version:      1.6
  -Release:      20061013
  +Release:      20061114
   
   #   package options
   %option       with_fsl  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/milter-regex/rc.milter-regex
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 rc.milter-regex
  --- openpkg-src/milter-regex/rc.milter-regex  18 Sep 2006 06:36:43 -0000      
1.2
  +++ openpkg-src/milter-regex/rc.milter-regex  14 Nov 2006 13:47:48 -0000      
1.3
  @@ -25,15 +25,15 @@
   %status -u @l_susr@ -o
       milter_regex_usable="unknown"
       milter_regex_active="no"
  -    rcService milter_regex enable yes && \
  +    rcService milter-regex enable yes && \
           milter_regex_signal 0 && milter_regex_active="yes"
       echo "milter_regex_enable=\"$milter_regex_enable\""
       echo "milter_regex_usable=\"$milter_regex_usable\""
       echo "milter_regex_active=\"$milter_regex_active\""
   
   %start -u @l_susr@
  -    rcService milter_regex enable yes || exit 0
  -    rcService milter_regex active yes && exit 0
  +    rcService milter-regex enable yes || exit 0
  +    rcService milter-regex active yes && exit 0
       rm -f $milter_regex_socket >/dev/null 2>&2 || true
       ( nohup @l_prefix@/bin/milter-regex -d \
            -u $milter_regex_user \
  @@ -43,23 +43,23 @@
       ) >/dev/null 2>&1
   
   %stop -u @l_susr@
  -    rcService milter_regex enable yes || exit 0
  -    rcService milter_regex active no  && exit 0
  +    rcService milter-regex enable yes || exit 0
  +    rcService milter-regex active no  && exit 0
       milter_regex_signal TERM
       rm -rf $milter_regex_socket
       sleep 2
   
   %restart -u @l_susr@
  -    rcService milter_regex enable yes || exit 0
  -    rcService milter_regex active no  && exit 0
  +    rcService milter-regex enable yes || exit 0
  +    rcService milter-regex active no  && exit 0
       rc milter_regex stop start
   
   %reload -u @l_susr@
  -    rcService milter_regex enable yes || exit 0
  +    rcService milter-regex enable yes || exit 0
       milter_regex_signal HUP
   
   %daily -u @l_susr@
  -    rcService milter_regex enable yes || exit 0
  +    rcService milter-regex enable yes || exit 0
       shtool rotate -f \
           -n ${milter_regex_numfiles} -s ${milter_regex_minsize} -d \
           -z ${milter_regex_complevel} -m 644 -o @l_rusr@ -g @l_rgrp@ \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-registry/openpkg-registry.spec
  ============================================================================
  $ cvs diff -u -r1.29 -r1.30 openpkg-registry.spec
  --- openpkg-src/openpkg-registry/openpkg-registry.spec        22 Oct 2006 
17:30:38 -0000      1.29
  +++ openpkg-src/openpkg-registry/openpkg-registry.spec        14 Nov 2006 
13:47:50 -0000      1.30
  @@ -33,7 +33,7 @@
   Group:        Bootstrapping
   License:      BSD-style
   Version:      1.0.1
  -Release:      20061022
  +Release:      20061114
   
   #   package options
   %option       with_client  yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openpkg-registry/rc.openpkg-registry
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 rc.openpkg-registry
  --- openpkg-src/openpkg-registry/rc.openpkg-registry  25 Aug 2006 19:17:53 
-0000      1.2
  +++ openpkg-src/openpkg-registry/rc.openpkg-registry  14 Nov 2006 13:47:50 
-0000      1.3
  @@ -21,7 +21,7 @@
       echo "openpkg_registry_active=\"$openpkg_registry_active\""
   
   %daily -u @l_susr@
  -    rcService openpkg_registry enable yes || exit 0
  +    rcService openpkg-registry enable yes || exit 0
   
       #   create backup
       shtool install -c -m 640 -o @l_musr@ -g @l_rgrp@ \
  @@ -40,7 +40,7 @@
           $openpkg_registry_dumpfile-daily
   
   %weekly -u @l_susr@
  -    rcService openpkg_registry enable yes || exit 0
  +    rcService openpkg-registry enable yes || exit 0
   
       #   rotate backup files
       shtool rotate -f \
  @@ -51,7 +51,7 @@
           $openpkg_registry_dumpfile-weekly
   
   %monthly -u @l_susr@
  -    rcService openpkg_registry enable yes || exit 0
  +    rcService openpkg-registry enable yes || exit 0
   
       #   rotate backup files
       shtool rotate -f \
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/postfix-mailgraph/postfix-mailgraph.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 postfix-mailgraph.spec
  --- openpkg-src/postfix-mailgraph/postfix-mailgraph.spec      13 Oct 2006 
17:32:51 -0000      1.27
  +++ openpkg-src/postfix-mailgraph/postfix-mailgraph.spec      14 Nov 2006 
13:47:49 -0000      1.28
  @@ -33,7 +33,7 @@
   Group:        Mail
   License:      GPL
   Version:      1.12
  -Release:      20061013
  +Release:      20061114
   
   #   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.11 -r1.12 rc.postfix-mailgraph
  --- openpkg-src/postfix-mailgraph/rc.postfix-mailgraph        13 Oct 2006 
15:22:07 -0000      1.11
  +++ openpkg-src/postfix-mailgraph/rc.postfix-mailgraph        14 Nov 2006 
13:47:49 -0000      1.12
  @@ -16,22 +16,25 @@
   %status -u @l_susr@ -o
       postfix_mailgraph_usable="unknown"
       postfix_mailgraph_active="no"
  -    rcService postfix_mailgraph enable yes && \
  +    rcService postfix-mailgraph enable yes && \
           postfix_mailgraph_signal 0 && postfix_mailgraph_active="yes"
       echo "postfix_mailgraph_enable=\"$postfix_mailgraph_enable\""
       echo "postfix_mailgraph_usable=\"$postfix_mailgraph_usable\""
       echo "postfix_mailgraph_active=\"$postfix_mailgraph_active\""
   
   %start -u @l_susr@
  -    rcService postfix_mailgraph enable yes || exit 0
  +    rcService postfix-mailgraph enable yes || exit 0
  +    rcService postfix-mailgraph active yes && exit 0
       @l_prefix@/sbin/mailgraph --daemon
   
   %stop -u @l_susr@
  -    rcService postfix_mailgraph enable yes || exit 0
  +    rcService postfix-mailgraph enable yes || exit 0
  +    rcService postfix-mailgraph active no  && exit 0
       postfix_mailgraph_signal TERM
   
   %restart -u @l_susr@
  -    rcService postfix_mailgraph enable yes || exit 0
  +    rcService postfix-mailgraph enable yes || exit 0
  +    rcService postfix-mailgraph active no  && exit 0
       postfix_mailgraph_signal TERM
       sleep 2
       @l_prefix@/sbin/mailgraph --daemon
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ripe-dbase/rc.ripe-dbase
  ============================================================================
  $ cvs diff -u -r1.13 -r1.14 rc.ripe-dbase
  --- openpkg-src/ripe-dbase/rc.ripe-dbase      25 Aug 2006 19:18:58 -0000      
1.13
  +++ openpkg-src/ripe-dbase/rc.ripe-dbase      14 Nov 2006 13:47:48 -0000      
1.14
  @@ -16,26 +16,26 @@
   %status -u @l_susr@ -o
       ripe_dbase_usable="unknown"
       ripe_dbase_active="no"
  -    rcService ripe_dbase enable yes && \
  +    rcService ripe-dbase enable yes && \
           ripe_dbase_signal 0 && ripe_dbase_active="yes"
       echo "ripe_dbase_enable=\"$ripe_dbase_enable\""
       echo "ripe_dbase_usable=\"$ripe_dbase_usable\""
       echo "ripe_dbase_active=\"$ripe_dbase_active\""
   
   %start -u @l_susr@
  -    rcService ripe_dbase enable yes || exit 0
  -    rcService ripe_dbase active yes && exit 0
  +    rcService ripe-dbase enable yes || exit 0
  +    rcService ripe-dbase active yes && exit 0
       nohup @l_prefix@/bin/whois_rip -p ${ripe_dbase_pidfile} \
           -c ${ripe_dbase_cfgfile} &
   
   %stop -u @l_susr@
  -    rcService ripe_dbase enable yes || exit 0
  -    rcService ripe_dbase active no  && exit 0
  +    rcService ripe-dbase enable yes || exit 0
  +    rcService ripe-dbase active no  && exit 0
       ripe_dbase_signal TERM
       sleep 8
   
   %restart -u @l_susr@
  -    rcService ripe_dbase enable yes || exit 0
  -    rcService ripe_dbase active no  && exit 0
  +    rcService ripe-dbase enable yes || exit 0
  +    rcService ripe-dbase active no  && exit 0
       rc ripe-dbase stop start
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/ripe-dbase/ripe-dbase.spec
  ============================================================================
  $ cvs diff -u -r1.50 -r1.51 ripe-dbase.spec
  --- openpkg-src/ripe-dbase/ripe-dbase.spec    13 Oct 2006 17:33:42 -0000      
1.50
  +++ openpkg-src/ripe-dbase/ripe-dbase.spec    14 Nov 2006 13:47:48 -0000      
1.51
  @@ -33,7 +33,7 @@
   Group:        WHOIS
   License:      RIPE NCC
   Version:      3.2.0
  -Release:      20061013
  +Release:      20061114
   
   #   package options
   %option       with_extobjs  no
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to