[gentoo-commits] dev/blueness:master commit in: net-firewall/xtables-addons/, net-firewall/xtables-addons/files/

[gentoo-commits] dev/blueness:master commit in: net-firewall/xtables-addons/, net-firewall/xtables-addons/files/

[Anthony G. Basile]

commit:     689fbaefc2e9b23f4e1227a3b8db218c77779f24
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 22:33:10 2011 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 22:33:10 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/blueness.git;a=commit;h=689fbaef

net-firewall/xtables-addons: pva put it in the tree

(Portage version: 2.1.9.25/git/Linux x86_64, unsigned Manifest commit)

---
 net-firewall/xtables-addons/ChangeLog              |    9 --
 net-firewall/xtables-addons/Manifest               |    5 -
 .../files/xtables-addons-grsec-2.2.0.patch         |  135 ------------------
 net-firewall/xtables-addons/metadata.xml           |   18 ---
 .../xtables-addons/xtables-addons-1.28-r2.ebuild   |  143 --------------------
 5 files changed, 0 insertions(+), 310 deletions(-)

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
deleted file mode 100644
index 53b1a17..0000000
--- a/net-firewall/xtables-addons/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-*xtables-addons-1.28-r2 (12 Oct 2010)
-
-  12 Oct 2010; Anthony G. Basile <blueness@gentoo.org>
-  +xtables-addons-1.28-r2.ebuild, +files/xtables-addons-grsec-2.2.0.patch,
-  +metadata.xml:
-  See bug #339596
-

diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
deleted file mode 100644
index 01b31ca..0000000
--- a/net-firewall/xtables-addons/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX xtables-addons-grsec-2.2.0.patch 3496 RMD160 eb7bbd26a9cc164e0de4cf497eaa4574549afdcb SHA1 1eff13888260de7dfa9f1e84938857d37d6121bb SHA256 f442caae9fcbc819c38aedc606a6a308dcfd26829b146f11850c70ccdcd1096f
-DIST xtables-addons-1.28.tar.xz 333440 RMD160 b9906c6d08870ed6e3c9e2843b16e22df2442092 SHA1 1c1a7e1be38ef1a756b504c90dd5cdffa696e2ac SHA256 3d06d6d1d8b8adeae7c9edee20ffd3f2a754eb0b187e8b9f397666e26a7dbbcc
-EBUILD xtables-addons-1.28-r2.ebuild 4259 RMD160 fb27068a52c6f56751a764cd2fb4045a4dd18bb0 SHA1 b797fc76f514694af75be4f2cdbebea2b656260a SHA256 8b56c822e4f04378f6627ce97e6d93d6078e65c9c04becbb0d85ef8dd7e498f2
-MISC ChangeLog 207 RMD160 dc5364e7d48b4161ba15ae6cff03041fe897d9ed SHA1 eb1c2a5f0da664b1ffd5e62d374438566f4c9c3b SHA256 72790ddb0b7b8515eff9c4ece2ca7fc53f07dbb6690c5b9de6eafb17f073795a
-MISC metadata.xml 683 RMD160 27b60860ee7f57c4345693fcd3be8d338d23bacd SHA1 1f3aac7a15cedd8261c4f62ffa90876cc76c6507 SHA256 64cb53d9fda3166dcaa6fe5c1656bb0cf1a89701ae3c451f68f4d365e1e872ad

diff --git a/net-firewall/xtables-addons/files/xtables-addons-grsec-2.2.0.patch b/net-firewall/xtables-addons/files/xtables-addons-grsec-2.2.0.patch
deleted file mode 100644
index 2a558f4..0000000
--- a/net-firewall/xtables-addons/files/xtables-addons-grsec-2.2.0.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff --git a/extensions/Mbuild b/extensions/Mbuild
-index f5aa137..3e5557c 100644
---- a/extensions/Mbuild
-+++ b/extensions/Mbuild
-@@ -25,3 +25,4 @@ obj-${build_lscan}       += libxt_lscan.so
- obj-${build_pknock}      += pknock/
- obj-${build_psd}         += libxt_psd.so
- obj-${build_quota2}      += libxt_quota2.so
-+obj-${build_gradm}       += libxt_gradm.so
-diff --git a/extensions/libxt_gradm.c b/extensions/libxt_gradm.c
-new file mode 100644
-index 0000000..cecf192
---- /dev/null
-+++ b/extensions/libxt_gradm.c
-@@ -0,0 +1,96 @@
-+/*
-+ *	"gradm" match extension for iptables
-+ *	Zbigniew Krzystolik <zbyniu@destrukcja.pl>, 2010
-+ *
-+ *	This program is free software; you can redistribute it and/or
-+ *	modify it under the terms of the GNU General Public License;
-+ *	either version 2 of the License, or any later version, as
-+ *	published by the Free Software Foundation.
-+ */
-+#include <getopt.h>
-+#include <netdb.h>
-+#include <stddef.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <xtables.h>
-+#include <linux/netfilter/xt_gradm.h>
-+
-+static void gradm_mt_help(void)
-+{
-+	printf(
-+"gradm match options:\n"
-+" [!] --enabled    is Grsecurity RBAC enabled\n"
-+" [!] --disabled   is Grsecurity RBAC disabled\n");
-+};
-+
-+static const struct option gradm_mt_opts[] = {
-+	{.name = "enabled", .has_arg = false, .val = '1'},
-+	{.name = "disabled", .has_arg = false, .val = '2'},
-+	{NULL},
-+};
-+
-+static void gradm_mt_init(struct xt_entry_match *m)
-+{
-+}
-+
-+static int gradm_mt_parse(int c, char **argv, int invert, unsigned int *flags,
-+                          const void *entry, struct xt_entry_match **match)
-+{
-+	struct xt_gradm_mtinfo *info = (void *)(*match)->data;
-+
-+	switch (c) {
-+	case '1':
-+		if (invert)
-+			info->invflags |= 1;
-+		return true;
-+	case '2':
-+		if (!invert)
-+			info->invflags |= 1;
-+		return true;
-+	}
-+	return false;
-+}
-+
-+static void gradm_mt_check(unsigned int flags)
-+{
-+}
-+
-+static void gradm_mt_print(const void *ip, const struct xt_entry_match *match,
-+                           int numeric)
-+{
-+	const struct xt_gradm_mtinfo *info = (const void *)match->data;
-+	if (info->invflags)
-+		printf("gradm:  disabled");
-+	else
-+		printf("gradm:  enabled");
-+}
-+
-+static void gradm_mt_save(const void *ip, const struct xt_entry_match *match)
-+{
-+	const struct xt_gradm_mtinfo *info = (const void *)match->data;
-+	if (info->invflags)
-+		printf("--disabled ");
-+	else
-+		printf("--enabled ");
-+}
-+
-+static struct xtables_match gradm_mt_reg = { 
-+	.family		= NFPROTO_UNSPEC,
-+	.name		= "gradm",
-+	.version	= XTABLES_VERSION,
-+	.size		= XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
-+	.userspacesize	= XT_ALIGN(sizeof(struct xt_gradm_mtinfo)),
-+	.help		= gradm_mt_help,
-+	.init		= gradm_mt_init,
-+	.parse		= gradm_mt_parse,
-+	.final_check	= gradm_mt_check,
-+	.print		= gradm_mt_print,
-+	.save		= gradm_mt_save,
-+	.extra_opts	= gradm_mt_opts,
-+};
-+
-+static __attribute__((constructor)) void gradm_mt_ldr(void)
-+{
-+	xtables_register_match(&gradm_mt_reg);
-+}
-diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
-new file mode 100644
-index 0000000..96aa447
---- /dev/null
-+++ b/include/linux/netfilter/xt_gradm.h
-@@ -0,0 +1,9 @@
-+#ifndef _XT_GRADM_H
-+#define _XT_GRADM_H
-+
-+struct xt_gradm_mtinfo {
-+	__u16 flags;
-+	__u16 invflags;
-+};
-+
-+#endif
-diff --git a/mconfig b/mconfig
-index 6bfeb71..d22cd20 100644
---- a/mconfig
-+++ b/mconfig
-@@ -25,3 +25,4 @@ build_lscan=m
- build_pknock=m
- build_psd=m
- build_quota2=m
-+build_gradm=n

diff --git a/net-firewall/xtables-addons/metadata.xml b/net-firewall/xtables-addons/metadata.xml
deleted file mode 100644
index 1fe6ec7..0000000
--- a/net-firewall/xtables-addons/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-	<email>pva@gentoo.org</email>
-	<name>Peter Volkov</name>
-</maintainer>
-<longdescription>
-Xtables-addons is the successor to patch-o-matic(-ng). Likewise, it contains
-extensions that were not, or are not yet, accepted in the main kernel/iptables
-packages.
-
-Xtables-addons is different from patch-o-matic in that you do not have to patch
-or recompile the kernel, sometimes recompiling iptables is also not needed. But
-please see the INSTALL file for the minimum requirements of this package.
-</longdescription>
-</pkgmetadata>

diff --git a/net-firewall/xtables-addons/xtables-addons-1.28-r2.ebuild b/net-firewall/xtables-addons/xtables-addons-1.28-r2.ebuild
deleted file mode 100644
index 3105fe0..0000000
--- a/net-firewall/xtables-addons/xtables-addons-1.28-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/xtables-addons-1.28-r1.ebuild,v 1.3 2010/10/06 19:51:34 maekke Exp $
-
-EAPI="3"
-
-inherit eutils linux-mod multilib
-
-DESCRIPTION="extensions not yet accepted in the main kernel/iptables (patch-o-matic(-ng) successor)"
-HOMEPAGE="http://xtables-addons.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xtables-addons/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="modules"
-
-MODULES="gradm quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dhcpmac delude checksum chaos account"
-
-for mod in ${MODULES}; do
-	IUSE="${IUSE} xtables_addons_${mod}"
-done
-
-DEPEND="virtual/modutils
-	>=net-firewall/iptables-1.4.3
-	>virtual/linux-sources-2.6.22
-	xtables_addons_ipset? ( !net-firewall/ipset )"
-
-RDEPEND="${DEPEND}
-	xtables_addons_geoip? ( virtual/perl-Getopt-Long
-		dev-perl/Text-CSV_XS )"
-
-pkg_setup()	{
-	if use modules; then
-		get_version
-		check_modules_supported
-		# CONFIG_IP_NF_CONNTRACK{,_MARK} doesn't exist in >virtual/linux-sources-2.6.22
-		CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK"
-		linux-mod_pkg_setup
-
-		if ! linux_chkconfig_present IPV6; then
-			SKIP_IPV6_MODULES="ip6table_rawpost"
-		fi
-	fi
-}
-
-# Helper for maintainer: cheks if all possible MODULES are listed.
-XA_qa_check() {
-	local all_modules
-	all_modules=$(sed -n '/^build_/{s/build_\(.*\)=.*/\L\1/;G;s/\n/ /;s/ $//;h}; ${x;p}' "${S}/mconfig")
-	if [[ ${all_modules} != ${MODULES} ]]; then
-		ewarn "QA: Modules in mconfig differ from \$MODULES in ebuild."
-		ewarn "Please, update MODULES in ebuild."
-		ewarn "'${all_modules}'"
-	fi
-}
-
-# Is there any use flag set?
-XA_has_something_to_build() {
-	local mod
-	for mod in ${MODULES}; do
-		use xtables_addons_${mod} && return
-	done
-
-	eerror "All modules are disabled. What do you want me to build?"
-	eerror "Please, set XTABLES_ADDONS to any combination of"
-	eerror "${MODULES}"
-	die "All modules are disabled."
-}
-
-# Parse Kbuid files and generates list of sources
-XA_get_module_name() {
-	[[ $# != 1 ]] && die "XA_get_sources_for_mod: needs exactly one argument."
-	local mod objdir build_mod sources_list
-	mod=${1}
-	objdir=${S}/extensions
-	build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
-	sources_list=$(sed -n "/^obj-[$][{]${build_mod}[}]/\
-		{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-
-	if [[ -d ${S}/extensions/${sources_list} ]]; then
-		objdir=${S}/extensions/${sources_list}
-		sources_list=$(sed -n "/^obj-m/\
-			{s:obj-[^+]\+ [+]=[[:space:]]*::;s:[.]o::g;p}" \
-				"${objdir}/Kbuild")
-	fi
-	for mod_src in ${sources_list}; do
-		has ${mod_src} ${SKIP_IPV6_MODULES} || \
-			echo " ${mod_src}(xtables_addons:${S}/extensions:${objdir})"
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/xtables-addons-grsec-2.2.0.patch
-
-	XA_qa_check
-	XA_has_something_to_build
-
-	local mod module_name
-	if use modules; then
-		MODULE_NAMES="compat_xtables(xtables_addons:${S}/extensions:)"
-	fi
-	for mod in ${MODULES}; do
-		if use xtables_addons_${mod}; then
-			sed "s/\(build_${mod}=\).*/\1m/I" -i mconfig || die
-			if use modules; then
-				for module_name in $(XA_get_module_name ${mod}); do
-					MODULE_NAMES+=" ${module_name}"
-				done
-			fi
-		else
-			sed "s/\(build_${mod}=\).*/\1n/I" -i mconfig || die
-		fi
-	done
-
-	sed -e 's/depmod -a/true/' -i Makefile.in || die
-	sed -e '/^all-local:/{s: modules::}' \
-		-e '/^install-exec-local:/{s: modules_install::}' \
-			-i extensions/Makefile.in || die
-
-	use xtables_addons_geoip || sed  -e '/^SUBDIRS/{s/geoip//}' -i Makefile.in
-}
-
-src_configure() {
-	unset ARCH # .. or it'll look for /arch/amd64/Makefile in linux sources
-	export KBUILD_EXTMOD=${S} # Avoid build in /usr/src/linux #250407
-	econf --prefix="${EPREFIX}/" \
-		--libexecdir="${EPREFIX}/$(get_libdir)/" \
-		--with-kbuild="${KV_DIR}"
-}
-
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1 || die
-	use modules && BUILD_TARGETS="modules" linux-mod_src_compile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	use modules && linux-mod_src_install
-	dodoc README doc/* || die
-	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
-}