X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=iptables.spec;h=cc10d1fc41a39c7615869e1446dc5bacf57a273e;hb=2c0de495e57d2fc8f87d6217d1fc5454cb7861b1;hp=5479d0dbf9fd57567436f42ee5521658f16b55f7;hpb=d1aa80376d2564a6e93ae090b2f9275196c35d47;p=iptables.git

diff --git a/iptables.spec b/iptables.spec
index 5479d0d..cc10d1f 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -1,6 +1,6 @@
 %define name iptables
 %define version 1.4.10
-%define taglevel 2
+%define taglevel 5
 
 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 
@@ -119,9 +119,7 @@ rm -rf %{buildroot}
 /sbin/chkconfig --add iptables
 DEFAULT_IFACE=$(ip route show default | awk '/default/ {print $5}')
 sed -i -e "s;__eth;$DEFAULT_IFACE;g" /etc/sysconfig/iptables 
-mv -f /etc/rc.d/init.d/iptables.rpmsave /etc/rc.d/init.d/iptables
-mv -f /etc/sysconfig/iptables-config.rpmnew /etc/sysconfig/iptables-config
-service iptables restart
+[ "$PL_BOOTCD" = "1" ] || service iptables restart
 
 %postun -p /sbin/ldconfig
 
@@ -142,8 +140,8 @@ fi
 %defattr(-,root,root)
 %doc COPYING INSTALL INCOMPATIBILITIES
 %attr(0755,root,root) /etc/rc.d/init.d/iptables
-%config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables-config
-%config(noreplace) %attr(0600,root,root) /etc/sysconfig/iptables
+%config %attr(0600,root,root) /etc/sysconfig/iptables-config
+%config %attr(0600,root,root) /etc/sysconfig/iptables
 /sbin/iptables*
 /bin/iptables-xml
 %{_mandir}/man8/iptables*
@@ -182,6 +180,19 @@ fi
 %{_libdir}/pkgconfig/xtables.pc
 
 %changelog
+* Tue Aug 09 2011 Sapan Bhatia <sapanb@cs.princeton.edu> - iptables-1.4.10-5
+- Adding a recently abused (=received experimental traffic from planetlab) node to a global iptables blacklist. I will be
+- implementing this mechanism more formally
+- using
+- iptables in the coming days. Unfortunately, because of the complexity of the recipient network we are unable to
+- determine a comprehensive set of the slices responsible in this case, so I am adding this temporary hack for now.
+
+* Thu Mar 24 2011 S.Çağlar Onur <caglar@verivue.com> - iptables-1.4.10-4
+- Don't start iptables service on build time
+
+* Wed Feb 23 2011 S.Çağlar Onur <caglar@verivue.com> - iptables-1.4.10-3
+- Remove ugly hack for config files
+
 * Thu Jan 27 2011 S.Çağlar Onur <caglar@cs.princeton.edu> - iptables-1.4.10-2
 - Fix the patch