diff --git a/dhcp-agent/dhcp-agent.spec b/dhcp-agent/dhcp-agent.spec index 2950684c55..4a3801e9b2 100644 --- a/dhcp-agent/dhcp-agent.spec +++ b/dhcp-agent/dhcp-agent.spec @@ -35,7 +35,7 @@ Class: JUNK Group: DHCP License: MIT-style Version: 0.41 -Release: 20061013 +Release: 20061114 # package options %option with_fsl yes diff --git a/dhcp-agent/rc.dhcp-agent b/dhcp-agent/rc.dhcp-agent index b900fdae99..24597738b5 100644 --- a/dhcp-agent/rc.dhcp-agent +++ b/dhcp-agent/rc.dhcp-agent @@ -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 \ diff --git a/milter-regex/milter-regex.spec b/milter-regex/milter-regex.spec index 8041fd482e..c2366e7323 100644 --- a/milter-regex/milter-regex.spec +++ b/milter-regex/milter-regex.spec @@ -33,7 +33,7 @@ Class: EVAL Group: Mail License: BSD Version: 1.6 -Release: 20061013 +Release: 20061114 # package options %option with_fsl yes diff --git a/milter-regex/rc.milter-regex b/milter-regex/rc.milter-regex index a0f6c48285..f4d4cb2032 100644 --- a/milter-regex/rc.milter-regex +++ b/milter-regex/rc.milter-regex @@ -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@ \ diff --git a/openpkg-registry/openpkg-registry.spec b/openpkg-registry/openpkg-registry.spec index 959f40f3f3..93f2ef654a 100644 --- a/openpkg-registry/openpkg-registry.spec +++ b/openpkg-registry/openpkg-registry.spec @@ -33,7 +33,7 @@ Class: EVAL Group: Bootstrapping License: BSD-style Version: 1.0.1 -Release: 20061022 +Release: 20061114 # package options %option with_client yes diff --git a/openpkg-registry/rc.openpkg-registry b/openpkg-registry/rc.openpkg-registry index 36fa1c731e..a38229c480 100644 --- a/openpkg-registry/rc.openpkg-registry +++ b/openpkg-registry/rc.openpkg-registry @@ -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 \ diff --git a/postfix-mailgraph/postfix-mailgraph.spec b/postfix-mailgraph/postfix-mailgraph.spec index a59969b809..4826f29624 100644 --- a/postfix-mailgraph/postfix-mailgraph.spec +++ b/postfix-mailgraph/postfix-mailgraph.spec @@ -33,7 +33,7 @@ Class: EVAL 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 diff --git a/postfix-mailgraph/rc.postfix-mailgraph b/postfix-mailgraph/rc.postfix-mailgraph index e29f413130..dc6d69a5ea 100644 --- a/postfix-mailgraph/rc.postfix-mailgraph +++ b/postfix-mailgraph/rc.postfix-mailgraph @@ -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 diff --git a/ripe-dbase/rc.ripe-dbase b/ripe-dbase/rc.ripe-dbase index 1736c379a1..0985d13dfe 100644 --- a/ripe-dbase/rc.ripe-dbase +++ b/ripe-dbase/rc.ripe-dbase @@ -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 diff --git a/ripe-dbase/ripe-dbase.spec b/ripe-dbase/ripe-dbase.spec index e31c165f8a..dd0f7d5098 100644 --- a/ripe-dbase/ripe-dbase.spec +++ b/ripe-dbase/ripe-dbase.spec @@ -33,7 +33,7 @@ Class: EVAL Group: WHOIS License: RIPE NCC Version: 3.2.0 -Release: 20061013 +Release: 20061114 # package options %option with_extobjs no