Version bump.

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64

diff --git a/net-firewall/xtables-addons/ChangeLog b/net-firewall/xtables-addons/ChangeLog
index 19d50b1079b79e91af5dee565dfe12624e367dab..71a362230f432e5d06dc495325304d035e19427e 100644 (file)
--- a/net-firewall/xtables-addons/ChangeLog
+++ b/net-firewall/xtables-addons/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/xtables-addons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.18 2011/06/20 08:26:05 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/xtables-addons/ChangeLog,v 1.19 2011/07/24 10:24:39 pva Exp $
+
+*xtables-addons-1.37 (24 Jul 2011)
+
+  24 Jul 2011; Peter Volkov <pva@gentoo.org> +xtables-addons-1.37.ebuild:
+  Version bump.
 
   20 Jun 2011; Peter Volkov <pva@gentoo.org> xtables-addons-1.36.ebuild,
   +files/xtables-addons-1.36-absolute-M.patch,

diff --git a/net-firewall/xtables-addons/Manifest b/net-firewall/xtables-addons/Manifest
index 200ff2f08e1ec0f73ef5608f2ee250b3aca2b067..9d738a090dec363052a2bab9ddaea87f368152d5 100644 (file)
--- a/net-firewall/xtables-addons/Manifest
+++ b/net-firewall/xtables-addons/Manifest
@@ -4,9 +4,11 @@ DIST xtables-addons-1.28.tar.xz 333440 RMD160 b9906c6d08870ed6e3c9e2843b16e22df2
 DIST xtables-addons-1.30.tar.xz 337148 RMD160 98e4390c1e8ca14164435067583b19c78f599585 SHA1 e33972bfd34f68212bf385431b6e7663f148fb3a SHA256 51ff5fda46acb3da55f338343fde53258b3604df6878e3da86506a58e5f8c831
 DIST xtables-addons-1.31.tar.xz 338224 RMD160 116771c966d01229bcbb2044323fe963a2ee7a01 SHA1 7afaa43bf9975a846a146a0335f6fa2644779b85 SHA256 030e16513775266c2832cbd96f3703d390e58b67892abe9ec72c3e1e16c9dd53
 DIST xtables-addons-1.36.tar.xz 423580 RMD160 e7e14935d41c93df184ffa20c02d6c159285c982 SHA1 4e46d094353fe2fe11f6845ed8f3c72a2386b7ac SHA256 cfa2109c332f1c8b91cf64973e79a20dae6643da0c35b9d80c16ad2687bc21c4
+DIST xtables-addons-1.37.tar.xz 423784 RMD160 901bafe76977e0cfc9b5c8c6a4d2603c7790acb3 SHA1 6eab42320590a5b338ab06ad5202e3d54df298ba SHA256 2b60a3ae1c71a5b802625b595edceb14ea0be1fb5517e98a9542c5a1157fb7b6
 EBUILD xtables-addons-1.28-r1.ebuild 4186 RMD160 b362f70b738c4680e0ca7dd8f1ae2584767028bf SHA1 9cfa66cf0489fa6e51c3fce5513748858d858d4f SHA256 3cd3f236209d0c6d0f5fb7204e8f95ff3f876e97ad4889298071fd9e097de472
 EBUILD xtables-addons-1.30.ebuild 4185 RMD160 67edabf5a465e90de16c8cc9664016de9c26d03c SHA1 9b7463c6debd14998ed3831156566830f0102a80 SHA256 780cb489b912d5ebe699a4f5d74da4f7924ab962abed31a94a65cc38b3f78036
 EBUILD xtables-addons-1.31.ebuild 4193 RMD160 62d7312a966c4d91acb7c36e4c809c8c61b0e091 SHA1 9fb25977596054d7441f106930cb5784715294e0 SHA256 762ff274a169d37ac5d77bd456bc2f9ad247e06ccfa350c918c5a337efa69388
 EBUILD xtables-addons-1.36.ebuild 4930 RMD160 c964eb1409a539cae9baf697cc054f991465d7ad SHA1 7cfa731fe771458c4a98f7e06ea3bc5e91848f26 SHA256 84707e6e1bfc79a55e93461a35731cab4b2150be6d1d5667e73671824bae68fb
-MISC ChangeLog 3337 RMD160 50110995d76993d8d74201501c4b134985e7dbbb SHA1 3b078148532558e6e486e70a3dfb5553d65e82bc SHA256 293687c1fd615e60c66a58b3c0095d6403329897192404c8289f2df47546d46c
+EBUILD xtables-addons-1.37.ebuild 4822 RMD160 49c9547d35f237ca05a721a7c8cd2a1f95389de7 SHA1 10db651d61bcb1a9358d800d1fc01d8f3473ffa0 SHA256 12e35aa04659140187a20869b15c8bc74279529aeb1c91a90212201ce5fc76d0
+MISC ChangeLog 3464 RMD160 48a9d98dcf6c1d3f75131123d376bceb246918bd SHA1 e25b62be6af5bd1d690bff56041f9ff944adab01 SHA256 78dc54dea0158bf49335687cbc6d1c18a95bcb2810729d8c81b8f781d4f41f2a
 MISC metadata.xml 683 RMD160 27b60860ee7f57c4345693fcd3be8d338d23bacd SHA1 1f3aac7a15cedd8261c4f62ffa90876cc76c6507 SHA256 64cb53d9fda3166dcaa6fe5c1656bb0cf1a89701ae3c451f68f4d365e1e872ad

diff --git a/net-firewall/xtables-addons/xtables-addons-1.37.ebuild b/net-firewall/xtables-addons/xtables-addons-1.37.ebuild
new file mode 100644 (file)
index 0000000..07dfb37
--- /dev/null
+++ b/net-firewall/xtables-addons/xtables-addons-1.37.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2011 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.37.ebuild,v 1.1 2011/07/24 10:24:39 pva Exp $
+
+EAPI="4"
+inherit eutils linux-info linux-mod multilib autotools
+
+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"
+
+REQUIRED_USE="
+       xtables_addons_ipset4? ( !xtables_addons_ipset6 )
+       xtables_addons_ipset6? ( !xtables_addons_ipset4 )"
+
+MODULES="quota2 psd pknock lscan length2 ipv4options ipset6 ipset4 ipp2p iface gradm geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark echo dnetmap dhcpmac delude checksum chaos account"
+
+for mod in ${MODULES}; do
+       IUSE="${IUSE} xtables_addons_${mod}"
+done
+
+DEPEND=">=net-firewall/iptables-1.4.3"
+
+RDEPEND="${DEPEND}
+       xtables_addons_ipset4? ( !net-firewall/ipset )
+       xtables_addons_ipset6? (
+               !net-firewall/ipset
+               net-libs/libmnl )
+       xtables_addons_geoip? ( virtual/perl-Getopt-Long
+               dev-perl/Text-CSV_XS )"
+
+DEPEND="${DEPEND}
+       virtual/linux-sources"
+
+pkg_setup()    {
+       if use modules; then
+               get_version
+               check_modules_supported
+               CONFIG_CHECK="NF_CONNTRACK NF_CONNTRACK_MARK ~CONNECTOR"
+               ERROR_CONNECTOR="Please, enable CONFIG_CONNECTOR if you wish to receive userspace notifications from pknock through netlink/connector"
+               linux-mod_pkg_setup
+
+               if ! linux_chkconfig_present IPV6; then
+                       SKIP_IPV6_MODULES="ip6table_rawpost ipset6"
+                       ewarn "No IPV6 support in kernel. Disabling: ${SKIP_IPV6_MODULES}"
+               fi
+               if ! (use xtables_addons_ipset4 || use xtables_addons_ipset6) &&
+                       kernel_is -lt 2 6 35; then
+                       die "${PN} with ipset requires kernel version >= 2.6.29"
+               fi
+               kernel_is -lt 2 6 29 && die "${PN} requires kernel version >= 2.6.29"
+       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
+       # Take modules name from mconfig
+       build_mod=$(sed -n "s/\(build_${mod}\)=.*/\1/Ip" "${S}/mconfig")
+       # strip .o, = and everything before = and print
+       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() {
+       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
+       einfo "${MODULE_NAMES}" # for debugging
+
+       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() {
+       set_arch_to_kernel # .. or it'll look for /arch/amd64/Makefile
+       econf --prefix="${EPREFIX}/" \
+               --libexecdir="${EPREFIX}/$(get_libdir)/" \
+               --with-kbuild="${KV_DIR}"
+}
+
+src_compile() {
+       emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" V=1
+       use modules && BUILD_TARGETS="modules" linux-mod_src_compile
+}
+
+src_install() {
+       emake DESTDIR="${D}" install
+       use modules && linux-mod_src_install
+       dodoc -r README doc/*
+       find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+'
+}