Skip to contentSkip to conversation

ipset: bump to version 6.10

PATCH Superseded Gustavo Zacarias 3 participants 6 messages Dec 2, 2011 – Dec 9, 2011

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Gustavo Zacarias

author
#0 lore raw

PATCH 1/2 ipset: bump to version 6.10

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/ipset/ipset-drop-modules.patch |  100 --------------------------------
 package/ipset/ipset.mk                 |    2 +-
 2 files changed, 1 insertions(+), 101 deletions(-)
 delete mode 100644 package/ipset/ipset-drop-modules.patch
package/ipset/ipset-drop-modules.patch deleted +0 -100
deleted file mode 100644
index ee29d43..0000000
@@ -1,100 +0,0 @@
-Drop all the kernel checks and let the user deal with having a new enough
-version of the kernel to enjoy this.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
----
-
-diff -Nura ipset-6.8.orig//Makefile.am ipset-6.8/Makefile.am
---- ipset-6.8.orig//Makefile.am	2011-08-17 16:10:41.999386034 -0300
-+++ ipset-6.8/Makefile.am	2011-08-17 16:17:34.108702969 -0300
-@@ -4,11 +4,6 @@
- 
- include $(top_srcdir)/Make_global.am
- 
--if ! WITH_KBUILDDIR
--KBUILD_OUTPUT=/lib/modules/`uname -r`/build
--else
--KBUILD_OUTPUT=$(KBUILDDIR)
--endif
- if ! WITH_MAXSETS
- IP_SET_MAX=256
- else
-@@ -22,23 +17,6 @@
- 
- SUBDIRS		= lib src
- 
--modules_sparse:
--	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
--			V=$V C=2 CF=-D__CHECK_ENDIAN__ \
--			IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
--
--modules:
--	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter V=$V \
--			IP_SET_MAX=$(IP_SET_MAX) KDIR=$$PWD/kernel modules
--
--modules_install:
--	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
--			KDIR=$$PWD/kernel modules_install
--
--modules_clean:
--	${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net/netfilter \
--			KDIR=$$PWD/kernel clean
--
- update_includes:
- 	./update ip_set.h
- 	./update ip_set_bitmap.h
-diff -Nura ipset-6.8.orig//configure.ac ipset-6.8/configure.ac
---- ipset-6.8.orig//configure.ac	2011-08-17 16:10:42.015387986 -0300
-+++ ipset-6.8/configure.ac	2011-08-17 16:18:01.578056869 -0300
-@@ -11,51 +11,6 @@
- *) AC_MSG_ERROR([Linux systems supported exclusively!]);;
- esac
- 
--dnl Additional arguments
--dnl Kernel build directory or source tree
--AC_ARG_WITH([kbuild],
--            AS_HELP_STRING([--with-kbuild=PATH],
--                           [Path to kernel build directory]),
--            [KBUILDDIR="$withval";])
--AC_ARG_WITH([ksource],
--            AS_HELP_STRING([--with-ksource=PATH],
--                           [Path to kernel source directory, if not the same as the kernel build directory]),
--            [KSOURCEDIR="$withval";])
--AM_CONDITIONAL(WITH_KBUILDDIR, test "$KBUILDDIR" != "")
--AC_SUBST(KBUILDDIR)
--
--dnl Sigh: check kernel version dependencies
--if test "$KBUILDDIR" != ""
--then
--	kbuilddir="$KBUILDDIR"
--else
--	kbuilddir="/lib/modules/`uname -r`/build"
--fi
--
--if test -n "$KSOURCEDIR"; then
--	ksourcedir="$KSOURCEDIR"
--elif test -e "$kbuilddir/include/linux/netfilter/nfnetlink.h"; then
--	ksourcedir="$kbuilddir"
--else
--	ksourcedir="/lib/modules/$(uname -r)/source"
--fi
--if test ! -e "$ksourcedir/include/linux/netfilter/nfnetlink.h"
--then
--	AC_MSG_ERROR([Invalid kernel source directory $ksourcedir])
--fi
--
--if test ! -e "$kbuilddir/.config"
--then
--	AC_MSG_ERROR([The kernel build directory $kbuilddir is not configured])
--fi
--
--AC_PROG_GREP
--
--if test "X`$GREP 'NFNL_SUBSYS_IPSET' $ksourcedir/include/linux/netfilter/nfnetlink.h`" = "X"
--then
--	AC_MSG_ERROR([The kernel source directory $ksourcedir is not patched with netlink.patch to support ipset])
--fi
--
- dnl Maximal number of sets supported by the kernel, default 256
- AC_ARG_WITH([maxsets],
- 	    AS_HELP_STRING([--with-maxsets=256],
package/ipset/ipset.mk +1 -1
index f98f73f..6294234 100644
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-IPSET_VERSION = 6.9.1
+IPSET_VERSION = 6.10
 IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 2/2 ebtables: bump to version 2.0.10-2

Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/ebtables/ebtables.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
package/ebtables/ebtables.mk +2 -1
index 6cfdfdc..66242a4 100644
@@ -3,7 +3,8 @@
 # ebtables
 #
 #############################################################
-EBTABLES_VERSION = 2.0.10-1
+
+EBTABLES_VERSION = 2.0.10-2
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
 EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH 2/2 ebtables: bump to version 2.0.10-2

Hi Gustavo,

Quoted 10 lines · Gustavo Zacarias
Signed-off-by Gustavo Zacarias <[email protected]>
---
 package/ebtables/ebtables.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
package/ebtables/ebtables.mk +0 -0
index 6cfdfdc..66242a4 100644

package/ebtables/ebtables.mk line 9

Quoted 8 lines
package/ebtables/ebtables.mk +2 -1
@@ -3,7 +3,8 @@
 # ebtables
 #
 #############################################################
-EBTABLES_VERSION = 2.0.10-1
+
+EBTABLES_VERSION = 2.0.10-2
 EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz
 EBTABLES_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/ebtables

Version 2.0.10-3 has now been released. Care to update?

baruch

Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
author
#3 lore raw

PATCH 2/2 ebtables: bump to version 2.0.10-2

Quoted 3 lines · Baruch Siach

Version 2.0.10-3 has now been released. Care to update?

baruch

Things that happen, sent, thanks for ponting it out. Regards.

#4 lore raw

PATCH 1/2 ipset: bump to version 6.10

In reply to Gustavo Zacarias
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/ipset/ipset-drop-modules.patch |  100 --------------------------------

Why did you drop this patch? The build fails here as it ends up looking at my host modules:

configure: error: Invalid kernel source directory /lib/modules/3.1.1/source
make: *** [/home/peko/source/buildroot/output/build/ipset-6.10/.stamp_configured] Error 1

Signature · 1 line
Bye, Peter Korsgaard
author
#5 lore raw

PATCH 1/2 ipset: bump to version 6.10

Quoted 11 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Gustavo" == Gustavo Zacarias <[email protected]> writes:

Gustavo> Signed-off-by: Gustavo Zacarias <[email protected]> Gustavo> ---

 Gustavo>  package/ipset/ipset-drop-modules.patch |  100

--------------------------------

Why did you drop this patch? The build fails here as it ends up looking
at my host modules:

Quoted 6 lines

configure: error: Invalid kernel source directory
/lib/modules/3.1.1/source
make: ***

[/home/peko/source/buildroot/output/build/ipset-6.10/.stamp_configured] Error 1

On my tests it works autodetecting that it doesn't need to, it's new to version 6.10.
Try the v2 patch which forces it to no, something different in your config and/or host probably triggers the autodetection to think it does. Regards.