Version bumped. Fixes 55816

7 files changed, 19 insertions, 54 deletions

diff --git a/net-firewall/shorewall/ChangeLog b/net-firewall/shorewall/ChangeLog
index 6865263605bf..4a16ce0ee17d 100644
--- a/net-firewall/shorewall/ChangeLog
+++ b/net-firewall/shorewall/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.44 2004/07/03 18:46:55 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.45 2004/07/07 15:24:34 mholzer Exp $
+
+*shorewall-2.0.3c (07 Jul 2004)
+
+  07 Jul 2004; Martin Holzer <mholzer@gentoo.org> +shorewall-2.0.3c.ebuild:
+  Version bumped. Fixes 55816
 
   03 Jul 2004; Jason Wever <weeve@gentoo.org> shorewall-1.4.10f.ebuild:
   Stable on sparc.
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index 1c2053e4631a..8c1e597ea543 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -1,13 +1,15 @@
-MD5 bc94e92fd0a44aba0d2b66125e5aceb1 ChangeLog 6391
-MD5 9f6283147576388e1acf94f91e54eae5 shorewall-1.4.10b.ebuild 1136
 MD5 e55b42b0660ba13717f0dcdbafccc97a shorewall-1.4.10c.ebuild 1144
 MD5 b79b013e61fed8fa5bb6731f847d023d shorewall-1.4.5-r1.ebuild 848
+MD5 4489300442dce2c6616e5e6ace3f917f shorewall-1.4.10f.ebuild 1138
+MD5 0b445cc1838b8e631f767c3349e8e960 shorewall-2.0.3c.ebuild 1878
 MD5 8fef1056e5b3a2b9cc9b047ed76a2e83 shorewall-2.0.3a.ebuild 1852
 MD5 9683bb7323c40d69b48d54ad0eb169ed metadata.xml 221
-MD5 4489300442dce2c6616e5e6ace3f917f shorewall-1.4.10f.ebuild 1138
-MD5 5b05d5de1dd9592dc38da2599bd0845f files/digest-shorewall-1.4.10b 143
+MD5 bc94e92fd0a44aba0d2b66125e5aceb1 ChangeLog 6391
+MD5 9f6283147576388e1acf94f91e54eae5 shorewall-1.4.10b.ebuild 1136
+MD5 15be5815097cdddb4eb018aef62ea4b5 files/shorewall 563
 MD5 1362896295d3e48686b4845303c49bb9 files/digest-shorewall-1.4.10c 143
-MD5 7c8660b2d2395b8c9b6cc7f5902170f4 files/digest-shorewall-1.4.5-r1 65
 MD5 3b1f1510d6cf9a2d9a050cfd5e70c7d5 files/digest-shorewall-1.4.10f 142
+MD5 1de40dcaa00b03ddacb582eebe9e1c29 files/digest-shorewall-2.0.3c 141
+MD5 7c8660b2d2395b8c9b6cc7f5902170f4 files/digest-shorewall-1.4.5-r1 65
 MD5 a7d8f0cc57793c05a50f3f8ff363556b files/digest-shorewall-2.0.3a 141
-MD5 e2182d798772722624d55e39875effc6 files/shorewall 564
+MD5 5b05d5de1dd9592dc38da2599bd0845f files/digest-shorewall-1.4.10b 143
diff --git a/net-firewall/shorewall/files/digest-shorewall-1.4.10c b/net-firewall/shorewall/files/digest-shorewall-1.4.10c
deleted file mode 100644
index e71fa532096d..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-1.4.10c
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 58106a8953f773c9a7523a7014e62a5f shorewall-1.4.10c.tgz 118678
-MD5 016304f16077e33e457d1dfb120c6ea9 shorewall-docs-html-1.4.10c.tgz 2257210
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.0.3a b/net-firewall/shorewall/files/digest-shorewall-2.0.3a
deleted file mode 100644
index 77d8067f7cc6..000000000000
--- a/net-firewall/shorewall/files/digest-shorewall-2.0.3a
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8d2caefda9b3f766f8ea54c8ffae3d0d shorewall-2.0.3a.tgz 102012
-MD5 1219d6ae51975f77ce2d394808f467d5 shorewall-docs-html-2.0.3a.tgz 2409239
diff --git a/net-firewall/shorewall/files/digest-shorewall-2.0.3c b/net-firewall/shorewall/files/digest-shorewall-2.0.3c
new file mode 100644
index 000000000000..ef968edbe674
--- /dev/null
+++ b/net-firewall/shorewall/files/digest-shorewall-2.0.3c
@@ -0,0 +1,2 @@
+MD5 fabc0dac70ad0be19c1e18d49688ceb7 shorewall-2.0.3c.tgz 102255
+MD5 54eda24dbdb7b876c6acc1a23fac1766 shorewall-docs-html-2.0.3c.tgz 2409516
diff --git a/net-firewall/shorewall/shorewall-1.4.10c.ebuild b/net-firewall/shorewall/shorewall-1.4.10c.ebuild
deleted file mode 100644
index 3ed5138c1603..000000000000
--- a/net-firewall/shorewall/shorewall-1.4.10c.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-1.4.10c.ebuild,v 1.7 2004/07/01 23:37:44 eradicator Exp $
-
-IUSE="doc"
-
-DESCRIPTION="Full state iptables firewall"
-HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="ftp://slovakia.shorewall.net/mirror/${PN}/${P}/${P}.tgz
-	doc? ( ftp://slovakia.shorewall.net/mirror/${PN}/${P}/${PN}-docs-html-${PV}.tgz )"
-#RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~amd64"
-
-DEPEND="virtual/libc
-	net-firewall/iptables
-	sys-apps/iproute2"
-
-S=${WORKDIR}/${P}
-
-src_install() {
-	keepdir /var/lib/shorewall
-	PREFIX=${D} ./install.sh /etc/init.d || die
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/shorewall shorewall
-	dodoc COPYING INSTALL changelog.txt releasenotes.txt
-	if use doc; then
-		cd ${WORKDIR}/${PN}-docs-html-${PV}
-		dohtml -r *
-	fi
-}
-
-pkg_postinst() {
-	einfo "Read the documentation from http://www.shorewall.net"
-	einfo "available at /usr/share/doc/${PF}/html/index.htm"
-	einfo "and edit the files in /etc/shorewall before starting the firewall"
-}
diff --git a/net-firewall/shorewall/shorewall-2.0.3a.ebuild b/net-firewall/shorewall/shorewall-2.0.3c.ebuild
index f0d9bbf5e2ec..a31c9205d055 100644
--- a/net-firewall/shorewall/shorewall-2.0.3a.ebuild
+++ b/net-firewall/shorewall/shorewall-2.0.3c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.3a.ebuild,v 1.4 2004/07/02 08:33:56 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-2.0.3c.ebuild,v 1.1 2004/07/07 15:24:34 mholzer Exp $
 
 IUSE="doc"
 
@@ -8,8 +8,8 @@ MY_P_DOCS=${P/${PN}/${PN}-docs-html}
 
 DESCRIPTION="Full state iptables firewall"
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz
-	doc? ( mirror://sourceforge/${PN}/${MY_P_DOCS}.tgz )"
+SRC_URI="http://shorewall.net/pub/${PN}/2.0/${P}/${P}.tgz
+	doc? ( http://shorewall.net/pub/${PN}/2.0/${P}/${MY_P_DOCS}.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"