Author: arekm Date: Thu May 26 12:05:22 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 6.6
---- Files affected:
packages/ipset:
ipset-config_dist.patch (1.1 -> 1.2) , ipset.spec (1.120 -> 1.121)
---- Diffs:
================================================================
Index: packages/ipset/ipset-config_dist.patch
diff -u packages/ipset/ipset-config_dist.patch:1.1
packages/ipset/ipset-config_dist.patch:1.2
--- packages/ipset/ipset-config_dist.patch:1.1 Fri Apr 15 12:21:12 2011
+++ packages/ipset/ipset-config_dist.patch Thu May 26 14:05:13 2011
@@ -1,6 +1,6 @@
---- ipset-6.3/configure.ac.orig 2011-04-10 17:25:20.000000000 +0200
-+++ ipset-6.3/configure.ac 2011-04-15 12:14:24.000000000 +0200
-@@ -44,14 +44,14 @@
+--- ipset-6.6/configure.ac~ 2011-05-24 10:28:55.000000000 +0200
++++ ipset-6.6/configure.ac 2011-05-26 14:03:37.703069144 +0200
+@@ -44,7 +44,7 @@
AC_MSG_ERROR([Invalid kernel source directory $ksourcedir])
fi
@@ -8,12 +8,4 @@
+if test ! -e "$kbuilddir/config-dist"
then
AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
- fi
-
- AC_PROG_GREP
-
--if test "X`$GREP '^CONFIG_IP6_NF_IPTABLES=' $kbuilddir/.config`" = "X"
-+if test "X`$GREP '^CONFIG_IP6_NF_IPTABLES=' $kbuilddir/config-dist`" = "X"
- then
- AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured
with IP6_NF_IPTABLES support (ip6tables)])
fi
================================================================
Index: packages/ipset/ipset.spec
diff -u packages/ipset/ipset.spec:1.120 packages/ipset/ipset.spec:1.121
--- packages/ipset/ipset.spec:1.120 Wed May 25 14:43:28 2011
+++ packages/ipset/ipset.spec Thu May 26 14:05:13 2011
@@ -21,18 +21,18 @@
%define _enable_debug_packages 0
%endif
-%define rel 2
+%define rel 1
%define pname ipset
Summary: IP sets utility
Summary(pl.UTF-8): Narzędzie do zarządzania zbiorami IP
Name: %{pname}%{_alt_kernel}
-Version: 6.5
+Version: 6.6
Release: %{rel}
License: GPL v2
Group: Networking/Admin
#Source0Download: http://ipset.netfilter.org/install.html
Source0: http://ipset.netfilter.org/%{pname}-%{version}.tar.bz2
-# Source0-md5: 9d334e3a6b696d461de6de27246fdec0
+# Source0-md5: 14eafc915f559b900ed2256b761af9d4
Source1: %{pname}.init
Patch0: %{pname}-config_dist.patch
Patch1: %{pname}-no_kernel.patch
@@ -234,6 +234,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.121 2011/05/26 12:05:13 arekm
+- up to 6.6
+
Revision 1.120 2011/05/25 12:43:28 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipset/ipset-config_dist.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ipset/ipset.spec?r1=1.120&r2=1.121&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
