Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 405509 - net-firewall/shorewall-4.5.0.1: version bump
Summary: net-firewall/shorewall-4.5.0.1: version bump
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: New packages (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Vieri
URL:
Whiteboard:
Keywords: EBUILD, PATCH
Depends on:
Blocks:
 
Reported: 2012-02-24 05:18 UTC by Richard Grenville
Modified: 2012-02-24 18:58 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments
shorewall-core-4.5.0.1.ebuild (shorewall-core-4.5.0.1.ebuild,899 bytes, text/plain)
2012-02-24 05:20 UTC, Richard Grenville
Details
shorewall.initd.patch (shorewall.initd.patch,511 bytes, patch)
2012-02-24 05:27 UTC, Richard Grenville
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Richard Grenville 2012-02-24 05:18:11 UTC
There's a new shorewall release coming out every few weeks... And this time it's 4.5.0.1, came up 7 days ago.

The most dramatic change is Shorewall changed its release model and some core libraries split into a separate package, shorewall-core. Shorewall, shorewall-lite, and shorewall6-lite directly depend on shorewall-core, while shorewall6 still depends on shorewall. And since bundling shorewall-core into the shorewall{,-lite} ebuild would effectively prevent users from installing shorewall and shorewall-lite simultaneously (collision-protect...), this 34KB little package needs a separate ebuild.

Looks like Shorewall's ebuild requires no changes except the dependency on shorewall-core.

Reproducible: Always
Comment 1 Richard Grenville 2012-02-24 05:20:38 UTC
Created attachment 303017 [details]
shorewall-core-4.5.0.1.ebuild

New ebuild for shorewall-core-4.5.0.1. Works on my ~amd64.
Comment 2 Richard Grenville 2012-02-24 05:27:33 UTC
Created attachment 303019 [details, diff]
shorewall.initd.patch

A small patch to fix the "opts is deprecated" warning in /etc/init.d/shorewall. 

It seems a bit weird that "shorewall clear" works even when shorewall is stopped, but it does actually work.
Comment 3 Jeroen Roovers (RETIRED) gentoo-dev 2012-02-24 16:09:36 UTC
Comment on attachment 303017 [details]
shorewall-core-4.5.0.1.ebuild

--- shorewall-4.4.27.ebuild     2012-01-03 09:51:20.000000000 +0100
+++ -   2012-02-24 17:09:22.998210022 +0100
@@ -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/shorewall/shorewall-4.4.27.ebuild,v 1.1 2012/01/03 08:51:20 constanze Exp $
+# $Header: $
 
 EAPI="4"

@@ -10,49 +10,25 @@
 MY_PV_TREE=$(get_version_component_range 1-2)   # for devel versions use "development/$(get_version_component_range 1-2)"
 MY_PV_BASE=$(get_version_component_range 1-3)

-MY_P="${PN}-${MY_PV_BASE}"
-MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
+MY_P="shorewall-${MY_PV_BASE}"

-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
+DESCRIPTION="Core libraries of shorewall / shorewall(6)-lite"
 HOMEPAGE="http://www.shorewall.net/"
-SRC_URI="http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2
-       doc? ( http://www1.shorewall.net/pub/${PN}/${MY_PV_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )"
+SRC_URI="http://www1.shorewall.net/pub/shorewall/${MY_PV_TREE}/${MY_P}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
+IUSE=""
 
 DEPEND=">=net-firewall/iptables-1.2.4
        sys-apps/iproute2[-minimal]
        dev-lang/perl"
 RDEPEND="${DEPEND}"

-src_compile() {
-       :;
-}
+DOCS=( changelog.txt releasenotes.txt )
 
 src_install() {
-       keepdir /var/lib/shorewall
-
-       cd "${WORKDIR}/${P}"
-       PREFIX="${D}" ./install.sh || die "install.sh failed"
-       newinitd "${FILESDIR}"/shorewall.initd shorewall
-
-       dodoc changelog.txt releasenotes.txt
-       if use doc; then
-               dodoc -r Samples
-               cd "${WORKDIR}/${MY_P_DOCS}"
-               dohtml -r *
-       fi
-       dodir /var/lock/subsys
-}
-
-pkg_postinst() {
-       elog "It is advised to copy the /usr/share/shorewall/configfiles dir to your"
-       elog "own 'export directories'. However, whenever you upgrade Shorewall you"
-       elog "should check for changes in configfiles and manually update your exports."
-       elog "Alternatively, if you only have one Shorewall-Lite system in your network"
-       elog "then you can use the configfiles dir but set CONFIG_PROTECT appropriately"
-       elog "in /etc/make.conf (man make.conf)."
+       DESTDIR="${D}" ./install.sh || die "install.sh failed"
+       default
 }
Comment 4 Constanze Hausner (RETIRED) gentoo-dev 2012-02-24 18:58:13 UTC
Done :) Thanks a lot for your input Richard