From bb58e82b386b6b60fe02d0304b5275100987e77d Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Wed, 23 May 2012 22:57:17 +0200 Subject: Packages: Iptables: move it under packages/net Signed-off-by: Abdoulaye Walsimou Gaye --- packages/security/iptables/iptables.kconfig | 61 ----------------------------- packages/security/iptables/iptables.mk | 41 ------------------- packages/security/security.kconfig | 26 ++++++------ packages/security/security.mk | 25 ++++++------ 4 files changed, 22 insertions(+), 131 deletions(-) delete mode 100644 packages/security/iptables/iptables.kconfig delete mode 100644 packages/security/iptables/iptables.mk (limited to 'packages/security') diff --git a/packages/security/iptables/iptables.kconfig b/packages/security/iptables/iptables.kconfig deleted file mode 100644 index 1852cf8..0000000 --- a/packages/security/iptables/iptables.kconfig +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# Embtoolkit -# Copyright(C) 2012 Averell KINOUANI -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -################################################################################ -# -# \file iptables.kconfig -# \brief iptables.kconfig of Embtoolkit -# \author Averell KINOUANI, -# \date May 2012 -################################################################################ - -config EMBTK_HAVE_IPTABLES - bool "Have Iptables" - select KEMBTK_UCLIBC_UCLIBC_HAS_FLOATS if EMBTK_CLIB_UCLIBC - select KEMBTK_UCLIBC_DO_C99_MATH if EMBTK_CLIB_UCLIBC - help - iptables is the userspace command line program used to configure - the Linux 2.4.x and 2.6.x IPv4 packet filtering ruleset. - It is target towards system administrators. - Since Network Address Translation is also configured from the - packet filter ruleset, iptables is used for Sthis, too. - -choice - prompt "Iptables version you wish" - depends on EMBTK_HAVE_IPTABLES - help - Here you can choose which version of iptables you want to use. - config EMBTK_IPTABLES_VERSION_1_4_13 - bool "iptables-1.4.13" - -endchoice - -config EMBTK_IPTABLES_HAVE_LIBIPQ - bool "Have Libipq" - depends on EMBTK_HAVE_IPTABLES - help - libipq is a developpement library for iptables userspace packet - queuing. libipq provides an API for communicating with ip_queue. - -config EMBTK_IPTABLES_VERSION_STRING - string - default "1.4.13" if EMBTK_IPTABLES_VERSION_1_4_13 - -config EMBTK_IPTABLES_NEED_PATCH - bool -config EMBTK_IPTABLES_NEED_AUTORECONF - bool diff --git a/packages/security/iptables/iptables.mk b/packages/security/iptables/iptables.mk deleted file mode 100644 index e42523d..0000000 --- a/packages/security/iptables/iptables.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# Embtoolkit -# Copyright(C) 2012 Averell KINOUANI -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -################################################################################ -# -# \file iptables.mk -# \brief iptables.mk of Embtoolkit -# \author Averell KINOUANI -# \date May 2012 -################################################################################ - -IPTABLES_NAME := iptables -IPTABLES_VERSION := $(call embtk_get_pkgversion,iptables) -IPTABLES_SITE := ftp://ftp.netfilter.org/pub/iptables -IPTABLES_PACKAGE := iptables-$(IPTABLES_VERSION).tar.bz2 -IPTABLES_SRC_DIR := $(PACKAGES_BUILD)/iptables-$(IPTABLES_VERSION) -IPTABLES_BUILD_DIR := $(PACKAGES_BUILD)/iptables-$(IPTABLES_VERSION) - -IPTABLES_SBINS := iptables ip6tables ip6tables-restore ip6tables-save -IPTABLES_SBINS += iptables-restore iptables-save -IPTABLES_INCLUDES := ipt_kernel_headers.h libip6tc.h libiptc.h -IPTABLES_INCLUDES += libxtc.h xtables.h xtcshared.h -IPTABLES_LIBS := libip4tc.so.0 libip4tc.so.0 libxtables.so.7 - -ifeq ($(CONFIG_EMBTK_IPTABLES_HAVE_LIBIPQ),y) -IPTABLES_CONFIGURE_OPTS := --enable-libipq -endif diff --git a/packages/security/security.kconfig b/packages/security/security.kconfig index c23f3fe..4643af0 100644 --- a/packages/security/security.kconfig +++ b/packages/security/security.kconfig @@ -1,21 +1,20 @@ ################################################################################ # Embtoolkit # Copyright(C) 2010-2012 GAYE Abdoulaye Walsimou. -# For Copyrright from linux kernel's build/configure system, see their source -# code. # -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License -# (Version 2 or later) published by the Free Software Foundation. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ################################################################################ # # \file security.kconfig @@ -24,8 +23,5 @@ # \date February 2010 ################################################################################ -# Iptables -source packages/security/iptables/iptables.kconfig - # OpenSSL source packages/security/openssl/openssl.kconfig diff --git a/packages/security/security.mk b/packages/security/security.mk index 05fc349..07632ad 100644 --- a/packages/security/security.mk +++ b/packages/security/security.mk @@ -2,18 +2,19 @@ # Embtoolkit # Copyright(C) 2010-2012 Abdoulaye Walsimou GAYE. # -# This program is free software; you can distribute it and/or modify it -# under the terms of the GNU General Public License -# (Version 2 or later) published by the Free Software Foundation. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -# for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # -# You should have received a copy of the GNU General Public License along -# with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ################################################################################ # # \file security.mk @@ -22,10 +23,6 @@ # \date February 2010 ################################################################################ -# Iptables -include $(EMBTK_ROOT)/packages/security/iptables/iptables.mk -ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_IPTABLES) += iptables_install - # OpenSSL include $(EMBTK_ROOT)/packages/security/openssl/openssl.mk ROOTFS_COMPONENTS-$(CONFIG_EMBTK_HAVE_OPENSSL) += openssl_install -- cgit v1.2.3