3.0.4 version bump. Fixes bug 112942.

Package-Manager: portage-2.0.54

7 files changed, 41 insertions, 72 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 3f46d8b9cbaf..d80246a10e21 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/shorewall
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.92 2005/12/17 21:42:14 corsair Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.93 2006/01/18 15:04:06 vanquirius Exp $
+
+*shorewall-3.0.4 (18 Jan 2006)
+
+  18 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -shorewall-2.4.4.ebuild,
+  -shorewall-2.4.6.ebuild, +shorewall-3.0.4.ebuild:
+  3.0.4 version bump. Fixes bug 112942. Thanks to Vieri <rentorbuy at yahoo
+  dot com>.
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> ChangeLog:
   Added ~ppc64
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 4644fc05fb94..62ae4dd648bf 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,11 +1,9 @@
-MD5 4bbae2440248129bbe0cbff99b730459 ChangeLog 13278
+MD5 cf944638589f8e38d76026f678ca5a00 ChangeLog 13531
+MD5 e119bb212e45f53e1948e7a1ed93ef36 files/digest-shorewall-2.4.2 139
+MD5 89555fea4bd4d4b53a93b2395bb57140 files/digest-shorewall-3.0.2 139
+MD5 7271403f189568f22d949752fc7773b3 files/digest-shorewall-3.0.4 139
+MD5 874d62a846eefd6330b3bba8b8721cef files/shorewall 1057
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
 MD5 561cf6684de229fe37921356b62bb6c1 shorewall-2.4.2.ebuild 1488
-MD5 58b85b4e4d95e42681ea8ce8cabcdc1d shorewall-2.4.4.ebuild 1499
-MD5 aa66e9cdc5deae5576646b86bf3984c8 shorewall-2.4.6.ebuild 1498
 MD5 ea77744093e8f7b0f03734c85f24bcf0 shorewall-3.0.2.ebuild 1986
-MD5 e119bb212e45f53e1948e7a1ed93ef36 files/digest-shorewall-2.4.2 139
-MD5 40658e202a62d4ef2e1e973e1c949bac files/digest-shorewall-2.4.4 139
-MD5 874d62a846eefd6330b3bba8b8721cef files/shorewall 1057
-MD5 05f9a37c3a717f3075ef08dbdff13ceb files/digest-shorewall-2.4.6 139
-MD5 89555fea4bd4d4b53a93b2395bb57140 files/digest-shorewall-3.0.2 139
+MD5 542ff42bc8e649780350b1d21763789a shorewall-3.0.4.ebuild 1989
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.4.4 b/net-firewall/shorewall/files/digest-shorewall-2.4.4
deleted file mode 100644
index 8dff02011fbd..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.4.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 de12be9692723cd4badaed983f0a4694 shorewall-2.4.4.tgz 133282
-MD5 d0d67fd5cb6645ed21bb000074bf9c7f shorewall-docs-html-2.4.4.tgz 2618840
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.4.6 b/net-firewall/shorewall/files/digest-shorewall-2.4.6
deleted file mode 100644
index 7717c3fb3a57..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.4.6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0e2634b1670c2708218f4dde68253668 shorewall-2.4.6.tgz 134984
-MD5 09b53f137eaaf30d91fa2a2678f2229b shorewall-docs-html-2.4.6.tgz 2659812
diff --git a/net-firewall/shorewall/files/digest-shorewall-3.0.4 b/net-firewall/shorewall/files/digest-shorewall-3.0.4
new file mode 100644
index 000000000000..202be6186b55
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-3.0.4
@@ -0,0 +1,2 @@
+MD5 6f5c00e9806a928387e49419f87a46f8 shorewall-3.0.4.tgz 189506
+MD5 10b16287ec08383b8eee442e10d008fa shorewall-docs-html-3.0.4.tgz 3281011
diff --git a/net-firewall/shorewall/shorewall-2.4.6.ebuild b/net-firewall/shorewall/shorewall-2.4.6.ebuild
deleted file mode 100644
index 59689540cf25..000000000000
--- a/net-firewall/shorewall/shorewall-2.4.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.6.ebuild,v 1.1 2005/11/05 17:46:27 vanquirius Exp $
-
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.4/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.4/${P}/${MY_P_DOCS}.tgz )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-IUSE="doc"
-
-DEPEND="virtual/libc
-	>=net-firewall/iptables-1.2.4
-	sys-apps/iproute2"
-
-src_install() {
-	keepdir /var/lib/shorewall
-
-	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	doinitd ${FILESDIR}/shorewall || die "doinitd failed"
-
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
-		dohtml -r *
-		dosym Documentation_Index.html /usr/share/doc/${PF}/html/index.htm
-	fi
-}
-
-pkg_postinst() {
-	einfo
-	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html"
-	else
-		einfo "Documentation is available at http://www.shorewall.net"
-	fi
-	einfo "Do not blindly start shorewall, edit the files in /etc/shorewall first"
-	einfo "At the very least, you must change 'STARTUP_ENABLED' in shorewall.conf"
-	einfo
-	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
-	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
-	einfo
-}
diff --git a/net-firewall/shorewall/shorewall-2.4.4.ebuild b/net-firewall/shorewall/shorewall-3.0.4.ebuild
index 1e4be152fa87..e73159dbd977 100644
--- a/net-firewall/shorewall/shorewall-2.4.4.ebuild
+++ b/net-firewall/shorewall/shorewall-3.0.4.ebuild
@@ -1,41 +1,49 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.4.4.ebuild,v 1.1 2005/09/13 09:11:25 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-3.0.4.ebuild,v 1.1 2006/01/18 15:04:06 vanquirius Exp $
 
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
 DESCRIPTION="Full state iptables firewall"
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://shorewall.net/pub/${PN}/2.4/${P}/${P}.tgz
-	doc? ( http://shorewall.net/pub/${PN}/2.4/${P}/${MY_P_DOCS}.tgz )"
+SRC_URI="http://shorewall.net/pub/${PN}/3.0/${P}/${P}.tgz
+	doc? ( http://shorewall.net/pub/${PN}/3.0/${P}/${MY_P_DOCS}.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc"
 
 DEPEND="virtual/libc
 	>=net-firewall/iptables-1.2.4
 	sys-apps/iproute2"
 
+src_compile() {
+	einfo "Nothing to compile."
+}
+
 src_install() {
 	keepdir /var/lib/shorewall
 
 	PREFIX="${D}" ./install.sh || die "install.sh failed"
-	doinitd ${FILESDIR}/shorewall || die "doinitd failed"
+	doinitd "${FILESDIR}"/shorewall || die "doinitd failed"
 
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
+	dodoc changelog.txt releasenotes.txt
 	if use doc; then
-		cd ${WORKDIR}/${MY_P_DOCS}
+		cd "${WORKDIR}/${MY_P_DOCS}"
+		# install documentation
 		dohtml -r *
-		dosym Documentation_Index.html /usr/share/doc/${PF}/html/index.htm
+		dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm"
+		# install samples
+		cp -pR "${S}/Samples" "${D}/usr/share/doc/${PF}"
 	fi
 }
 
 pkg_postinst() {
 	einfo
 	if use doc ; then
-		einfo "Documentation is available at /usr/share/doc/${PF}/html"
+		einfo "Documentation is available at /usr/share/doc/${PF}/html."
+		einfo "Samples are available at /usr/share/doc/${PF}/Samples."
 	else
 		einfo "Documentation is available at http://www.shorewall.net"
 	fi
@@ -45,4 +53,10 @@ pkg_postinst() {
 	einfo "If you intend to use the 2.6 IPSEC Support, you must retrieve the"
 	einfo "kernel patches from http://shorewall.net/pub/shorewall/contrib/IPSEC/"
 	einfo
+	einfo "Be aware that version 3 differs substantially from previous releases."
+	einfo "Information on upgrading is available at:"
+	einfo "http://www.shorewall.net/upgrade_issues.htm"
+	einfo
+	einfo "Known problems:"
+	einfo "http://shorewall.net/pub/${PN}/3.0/${P}/known_problems.txt"
 }