tomwij      14/06/12 14:02:16

  Modified:             shorewall-4.5.21.9.ebuild shorewall-4.5.21.7.ebuild
                        shorewall-4.5.18-r1.ebuild ChangeLog
  Added:                shorewall-4.5.21.10.ebuild
  Log:
  Version bump to 4.5.21.10; fixes bug #509258 and bug #509258, proxied commit 
for Thomas D. (whissi).
  
  (Portage version: 2.2.10_p125/cvs/Linux x86_64, signed Manifest commit with 
key 6D34E57D)

Revision  Changes    Path
1.3                  net-firewall/shorewall/shorewall-4.5.21.9.ebuild

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

Index: shorewall-4.5.21.9.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shorewall-4.5.21.9.ebuild   4 Jun 2014 00:45:17 -0000       1.2
+++ shorewall-4.5.21.9.ebuild   12 Jun 2014 14:02:16 -0000      1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.9.ebuild,v 1.2 
2014/06/04 00:45:17 jer Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.9.ebuild,v 1.3 
2014/06/12 14:02:16 tomwij Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@
 MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
 
 DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter.'
+DESCRIPTION+=' a high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/";
 SRC_URI="
        
http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2



1.2                  net-firewall/shorewall/shorewall-4.5.21.7.ebuild

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

Index: shorewall-4.5.21.7.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall-4.5.21.7.ebuild   15 Mar 2014 22:54:39 -0000      1.1
+++ shorewall-4.5.21.7.ebuild   12 Jun 2014 14:02:16 -0000      1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.7.ebuild,v 1.1 
2014/03/15 22:54:39 hwoarang Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.7.ebuild,v 1.2 
2014/06/12 14:02:16 tomwij Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@
 MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
 
 DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
-DESCRIPTION+=' a high-level tool for configuring Netfilter.'
+DESCRIPTION+=' a high-level tool for configuring Netfilter'
 HOMEPAGE="http://www.shorewall.net/";
 SRC_URI="
        
http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2



1.9                  net-firewall/shorewall/shorewall-4.5.18-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild?rev=1.9&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild?rev=1.9&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild?r1=1.8&r2=1.9

Index: shorewall-4.5.18-r1.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- shorewall-4.5.18-r1.ebuild  23 Mar 2014 18:01:45 -0000      1.8
+++ shorewall-4.5.18-r1.ebuild  12 Jun 2014 14:02:16 -0000      1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild,v 1.8 
2014/03/23 18:01:45 ago Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.18-r1.ebuild,v 1.9 
2014/06/12 14:02:16 tomwij Exp $
 
 EAPI="5"
 
@@ -13,7 +13,7 @@
 MY_P="${PN}-${MY_PV_BASE}"
 MY_P_DOCS="${P/${PN}/${PN}-docs-html}"
 
-DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux."
+DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux"
 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 
)"



1.259                net-firewall/shorewall/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- ChangeLog   4 Jun 2014 00:45:17 -0000       1.258
+++ ChangeLog   12 Jun 2014 14:02:16 -0000      1.259
@@ -1,6 +1,16 @@
 # ChangeLog for net-firewall/shorewall
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.258 
2014/06/04 00:45:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.259 
2014/06/12 14:02:16 tomwij Exp $
+
+*shorewall-4.5.21.10 (12 Jun 2014)
+
+  12 Jun 2014; Tom Wijsman <tom...@gentoo.org> 
+files/4.5.21.10/shorewall.confd,
+  +files/4.5.21.10/shorewall.initd, +files/4.5.21.10/shorewall.systemd,
+  +files/4.5.21.10/shorewallrc, +shorewall-4.5.21.10.ebuild,
+  shorewall-4.5.18-r1.ebuild, shorewall-4.5.21.7.ebuild,
+  shorewall-4.5.21.9.ebuild:
+  Version bump to 4.5.21.10; fixes bug #509258 and bug #509258, proxied commit
+  for Thomas D. (whissi).
 
   04 Jun 2014; Jeroen Roovers <j...@gentoo.org> shorewall-4.5.21.9.ebuild:
   Stable for HPPA (bug #511620).



1.1                  net-firewall/shorewall/shorewall-4.5.21.10.ebuild

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

Index: shorewall-4.5.21.10.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.5.21.10.ebuild,v 1.1 
2014/06/12 14:02:16 tomwij Exp $

EAPI="5"

inherit eutils linux-info prefix systemd versionator

MY_URL_PREFIX=
case ${P} in
        *_beta* | \
        *_rc*)
                MY_URL_PREFIX='development/'
                ;;
esac

MY_PV=${PV/_rc/-RC}
MY_PV=${MY_PV/_beta/-Beta}
MY_P=${PN}-${MY_PV}
MY_P_DOCS=shorewall-docs-html-${MY_PV}

MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)

DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is'
DESCRIPTION+=' a high-level tool for configuring Netfilter'
HOMEPAGE="http://www.shorewall.net/";
SRC_URI="
        
http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P}.tar.bz2
        doc? ( 
http://www1.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}/${MY_P_DOCS}.tar.bz2
 )
"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc"

DEPEND="
        >=dev-lang/perl-5.10
        virtual/perl-Digest-SHA
        =net-firewall/shorewall-core-${PVR}
"
RDEPEND="
        ${DEPEND}
        >=net-firewall/iptables-1.4.20
        >=sys-apps/iproute2-3.8.0[-minimal]
        >=sys-devel/bc-1.06.95
"

S=${WORKDIR}/${MY_P}

pkg_pretend() {
        local CONFIG_CHECK="~NF_CONNTRACK ~NF_CONNTRACK_IPV4"

        local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be 
unable"
        local WARNING_CONNTRACK+=" to run ${PN} on the local system."

        local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you 
will"
        local WARNING_CONNTRACK_IPV4+=" be unable to run ${PN} on the local 
system."

        check_extra_config
}

src_prepare() {
        cp "${FILESDIR}"/${PVR}/shorewallrc "${S}"/shorewallrc.gentoo || die 
"Copying shorewallrc failed"
        eprefixify "${S}"/shorewallrc.gentoo

        cp "${FILESDIR}"/${PVR}/${PN}.confd "${S}"/default.gentoo || die 
"Copying ${PN}.confd failed"
        cp "${FILESDIR}"/${PVR}/${PN}.initd "${S}"/init.gentoo.sh || die 
"Copying ${PN}.initd failed"
        cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die 
"Copying ${PN}.systemd failed"

        epatch_user
}

src_configure() {
        :;
}

src_compile() {
        :;
}

src_install() {
        keepdir /var/lib/${PN}

        DESTDIR="${D}" ./install.sh shorewallrc.gentoo || die "install.sh 
failed"

        dodoc changelog.txt releasenotes.txt
        if use doc; then
                dodoc -r Samples
                cd "${WORKDIR}"/${MY_P_DOCS}
                dohtml -r *
        fi
}

pkg_postinst() {
        if [[ -z "${REPLACING_VERSIONS}" ]]; then
                # This is a new installation
                elog "Before you can use ${PN}, you need to edit its 
configuration in:"
                elog ""
                elog "  ${EPREFIX}/etc/${PN}/${PN}.conf"
                elog ""
                elog "To activate ${PN} on system start, please add ${PN} to 
your default runlevel:"
                elog ""
                elog "  # rc-update add ${PN} default"
        fi

        if ! has_version ${CATEGORY}/shorewall-init; then
                elog ""
                elog "Starting with shorewall-4.5.21.2, Gentoo also offers 
${CATEGORY}/shorewall-init,"
                elog "which we recommend to install, to protect your firewall 
at system boot."
                elog ""
                elog "To read more about shorewall-init, please visit"
                elog "  http://www.shorewall.net/Shorewall-init.html";
        fi
}




Reply via email to