public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.12.1-r1.ebuild
@ 2011-09-19  7:45 Peter Volkov (pva)
  0 siblings, 0 replies; 3+ messages in thread
From: Peter Volkov (pva) @ 2011-09-19  7:45 UTC (permalink / raw
  To: gentoo-commits

pva         11/09/19 07:45:40

  Modified:             ChangeLog
  Added:                iptables-1.4.12.1-r1.ebuild
  Log:
  Fix parsing bug in libxt_conntrack.c, bug 383331 thank Bill Kenworthy for report.
  
  (Portage version: 2.1.10.16/cvs/Linux x86_64)

Revision  Changes    Path
1.253                net-firewall/iptables/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.253&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.253&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.252&r2=1.253

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -r1.252 -r1.253
--- ChangeLog	18 Sep 2011 16:57:17 -0000	1.252
+++ ChangeLog	19 Sep 2011 07:45:40 -0000	1.253
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.252 2011/09/18 16:57:17 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.253 2011/09/19 07:45:40 pva Exp $
+
+*iptables-1.4.12.1-r1 (19 Sep 2011)
+
+  19 Sep 2011; Peter Volkov <pva@gentoo.org> +iptables-1.4.12.1-r1.ebuild,
+  +files/iptables-1.4.12.1-conntrack-v2-ranges.patch:
+  Fix parsing bug in libxt_conntrack.c, bug 383331 thank Bill Kenworthy for
+  report.
 
   18 Sep 2011; Markus Meier <maekke@gentoo.org> iptables-1.4.12.1.ebuild:
   arm stable, bug #382367



1.1                  net-firewall/iptables/iptables-1.4.12.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?rev=1.1&content-type=text/plain

Index: iptables-1.4.12.1-r1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.1 2011/09/19 07:45:40 pva Exp $

EAPI="4"

# Force users doing their own patches to install their own tools
AUTOTOOLS_AUTO_DEPEND=no

inherit eutils toolchain-funcs autotools

DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
HOMEPAGE="http://www.iptables.org/"
SRC_URI="http://iptables.org/projects/iptables/files/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="ipv6 netlink"

COMMON_DEPEND="
	netlink? ( net-libs/libnfnetlink )
"
DEPEND="
	${COMMON_DEPEND}
	virtual/os-headers
	sys-devel/automake
"
RDEPEND="
	${COMMON_DEPEND}
"

src_prepare() {
	epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch"
	epatch "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
	eautomake

	# Only run autotools if user patched something
	epatch_user && eautoreconf || elibtoolize
}

src_configure() {
	sed -i \
		-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
		configure || die
	econf \
		--sbindir=/sbin \
		--libexecdir=/$(get_libdir) \
		--enable-devel \
		--enable-libipq \
		--enable-shared \
		--enable-static \
		$(use_enable ipv6)
}

src_compile() {
	emake V=1
}

src_install() {
	emake install DESTDIR="${D}"
	dodoc INCOMPATIBILITIES iptables/iptables.xslt

	# all the iptables binaries are in /sbin, so might as well
	# put these small files in with them
	into /
	dosbin iptables/iptables-apply
	dosym iptables-apply /sbin/ip6tables-apply
	doman iptables/iptables-apply.8

	insinto /usr/include
	doins include/iptables.h $(use ipv6 && echo include/ip6tables.h)
	insinto /usr/include/iptables
	doins include/iptables/internal.h

	keepdir /var/lib/iptables
	newinitd "${FILESDIR}"/${PN}-1.4.11.init iptables
	newconfd "${FILESDIR}"/${PN}-1.3.2.confd iptables
	if use ipv6 ; then
		keepdir /var/lib/ip6tables
		newinitd "${FILESDIR}"/iptables-1.4.11.init ip6tables
		newconfd "${FILESDIR}"/ip6tables-1.3.2.confd ip6tables
	fi

	# Move important libs to /lib
	gen_usr_ldscript -a ip{4,6}tc ipq iptc xtables
	find "${ED}" -type f -name '*.la' -exec rm -rf '{}' '+' || die "la removal failed"
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.12.1-r1.ebuild
@ 2011-12-30 12:01 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 3+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2011-12-30 12:01 UTC (permalink / raw
  To: gentoo-commits

scarabeus    11/12/30 12:01:22

  Modified:             ChangeLog iptables-1.4.12.1-r1.ebuild
  Log:
  Do not provide static libs unless requested. Sort the deps to be more straight-forward.
  
  (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

Revision  Changes    Path
1.257                net-firewall/iptables/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.257&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.257&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.256&r2=1.257

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -r1.256 -r1.257
--- ChangeLog	4 Dec 2011 10:15:59 -0000	1.256
+++ ChangeLog	30 Dec 2011 12:01:22 -0000	1.257
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.256 2011/12/04 10:15:59 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.257 2011/12/30 12:01:22 scarabeus Exp $
+
+  30 Dec 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  iptables-1.4.12.1-r1.ebuild:
+  Do not provide static libs unless requested. Sort the deps to be more
+  straight-forward.
 
   04 Dec 2011; Sven Wegener <swegener@gentoo.org> files/iptables-1.3.2.init,
   files/iptables-1.4.11.init:



1.2                  net-firewall/iptables/iptables-1.4.12.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?r1=1.1&r2=1.2

Index: iptables-1.4.12.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- iptables-1.4.12.1-r1.ebuild	19 Sep 2011 07:45:40 -0000	1.1
+++ iptables-1.4.12.1-r1.ebuild	30 Dec 2011 12:01:22 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.1 2011/09/19 07:45:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.2 2011/12/30 12:01:22 scarabeus Exp $
 
 EAPI="4"
 
@@ -16,23 +16,20 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="ipv6 netlink"
+IUSE="ipv6 netlink static-libs"
 
-COMMON_DEPEND="
+RDEPEND="
 	netlink? ( net-libs/libnfnetlink )
 "
-DEPEND="
-	${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	virtual/os-headers
 	sys-devel/automake
 "
-RDEPEND="
-	${COMMON_DEPEND}
-"
 
 src_prepare() {
-	epatch "${FILESDIR}/iptables-1.4.12.1-lm.patch"
-	epatch "${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
+	epatch \
+		"${FILESDIR}/iptables-1.4.12.1-lm.patch" \
+		"${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
 	eautomake
 
 	# Only run autotools if user patched something
@@ -49,7 +46,7 @@
 		--enable-devel \
 		--enable-libipq \
 		--enable-shared \
-		--enable-static \
+		$(use-enable static-libs static) \
 		$(use_enable ipv6)
 }
 
@@ -58,7 +55,7 @@
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
+	default
 	dodoc INCOMPATIBILITIES iptables/iptables.xslt
 
 	# all the iptables binaries are in /sbin, so might as well






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.12.1-r1.ebuild
@ 2012-01-06 23:16 Mike Frysinger (vapier)
  0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger (vapier) @ 2012-01-06 23:16 UTC (permalink / raw
  To: gentoo-commits

vapier      12/01/06 23:16:39

  Modified:             ChangeLog iptables-1.4.12.1-r1.ebuild
  Log:
  Trim core kernel headers from source to fix building with newer kernel headers (3.2+).
  
  (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)

Revision  Changes    Path
1.259                net-firewall/iptables/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.259&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?rev=1.259&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/ChangeLog?r1=1.258&r2=1.259

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- ChangeLog	2 Jan 2012 00:08:34 -0000	1.258
+++ ChangeLog	6 Jan 2012 23:16:38 -0000	1.259
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.258 2012/01/02 00:08:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.259 2012/01/06 23:16:38 vapier Exp $
+
+  06 Jan 2012; Mike Frysinger <vapier@gentoo.org> iptables-1.4.12.1-r1.ebuild:
+  Trim core kernel headers from source to fix building with newer kernel
+  headers (3.2+).
 
   02 Jan 2012; Agostino Sarubbo <ago@gentoo.org> iptables-1.4.12.1-r1.ebuild:
   Fix typo in src_configure by Franz Siegfried Metz in bug #396737



1.4                  net-firewall/iptables/iptables-1.4.12.1-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild?r1=1.3&r2=1.4

Index: iptables-1.4.12.1-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- iptables-1.4.12.1-r1.ebuild	2 Jan 2012 00:08:34 -0000	1.3
+++ iptables-1.4.12.1-r1.ebuild	6 Jan 2012 23:16:38 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.3 2012/01/02 00:08:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.12.1-r1.ebuild,v 1.4 2012/01/06 23:16:38 vapier Exp $
 
 EAPI="4"
 
@@ -32,13 +32,16 @@
 		"${FILESDIR}/iptables-1.4.12.1-conntrack-v2-ranges.patch"
 	eautomake
 
+	# use the saner headers from the kernel
+	rm -f include/linux/{kernel,types}.h
+
 	# Only run autotools if user patched something
 	epatch_user && eautoreconf || elibtoolize
 }
 
 src_configure() {
 	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(use netlink && echo 1 || echo 0):" \
+		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
 		configure || die
 	econf \
 		--sbindir=/sbin \






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-01-06 23:16 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-19  7:45 [gentoo-commits] gentoo-x86 commit in net-firewall/iptables: ChangeLog iptables-1.4.12.1-r1.ebuild Peter Volkov (pva)
  -- strict thread matches above, loose matches on Subject: below --
2011-12-30 12:01 Tomas Chvatal (scarabeus)
2012-01-06 23:16 Mike Frysinger (vapier)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox