packages: iptables/iptables.init, iptables/iptables.spec - upstart hook

[glen]

Author: glen                         Date: Thu Jan 27 22:27:06 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upstart hook

---- Files affected:
packages/iptables:
   iptables.init (1.13 -> 1.14) , iptables.spec (1.289 -> 1.290) 

---- Diffs:

================================================================
Index: packages/iptables/iptables.init
diff -u packages/iptables/iptables.init:1.13 packages/iptables/iptables.init:1.14
--- packages/iptables/iptables.init:1.13	Thu Jan 27 23:26:20 2011
+++ packages/iptables/iptables.init	Thu Jan 27 23:27:00 2011
@@ -106,6 +106,8 @@
 	rm -f /var/lock/subsys/iptables
 }
 
+upstart_controlled --except status panic load save clear
+
 case "$1" in
   start|load)
 	start

================================================================
Index: packages/iptables/iptables.spec
diff -u packages/iptables/iptables.spec:1.289 packages/iptables/iptables.spec:1.290
--- packages/iptables/iptables.spec:1.289	Wed Jan 26 09:55:14 2011
+++ packages/iptables/iptables.spec	Thu Jan 27 23:27:00 2011
@@ -14,7 +14,7 @@
 %bcond_without	vserver		# kernel build without vserver
 %bcond_with	batch		# build iptables-batch
 %bcond_with	static
-#
+
 %define		netfilter_snap		20070806
 %define		llh_version		7:2.6.22.1
 %define		name6			ip6tables
@@ -26,7 +26,7 @@
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		iptables
 Version:	1.4.10
-Release:	3
+Release:	4
 License:	GPL
 Group:		Networking/Admin
 Source0:	ftp://ftp.netfilter.org/pub/iptables/%{name}-%{version}.tar.bz2
@@ -150,7 +150,7 @@
 Group:		Networking/Admin
 Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name}
-Requires:	rc-scripts
+Requires:	rc-scripts >= 0.4.3.0
 Obsoletes:	firewall-init
 Obsoletes:	firewall-init-ipchains
 Obsoletes:	iptables24-init
@@ -414,6 +414,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.290  2011/01/27 22:27:00  glen
+- upstart hook
+
 Revision 1.289  2011/01/26 08:55:14  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.init?r1=1.13&r2=1.14&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iptables/iptables.spec?r1=1.289&r2=1.290&f=u