tomwij      14/06/12 14:13:48

  Modified:             shorewall-init-4.5.21.9.ebuild
                        shorewall-init-4.5.21.7.ebuild ChangeLog
  Added:                shorewall-init-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-init/shorewall-init-4.5.21.9.ebuild

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

Index: shorewall-init-4.5.21.9.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- shorewall-init-4.5.21.9.ebuild      4 Jun 2014 00:46:03 -0000       1.2
+++ shorewall-init-4.5.21.9.ebuild      12 Jun 2014 14:13:48 -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-init/shorewall-init-4.5.21.9.ebuild,v
 1.2 2014/06/04 00:46:03 jer Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.9.ebuild,v
 1.3 2014/06/12 14:13:48 tomwij Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@
 MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
 MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
 
-DESCRIPTION="Component to secure a Shorewall-protected system at boot time 
prior to bringing up the network."
+DESCRIPTION="Component to secure a Shorewall-protected system at boot time 
prior to bringing up the network"
 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-init/shorewall-init-4.5.21.7.ebuild

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

Index: shorewall-init-4.5.21.7.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shorewall-init-4.5.21.7.ebuild      15 Mar 2014 23:01:59 -0000      1.1
+++ shorewall-init-4.5.21.7.ebuild      12 Jun 2014 14:13:48 -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-init/shorewall-init-4.5.21.7.ebuild,v
 1.1 2014/03/15 23:01:59 hwoarang Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/net-firewall/shorewall-init/shorewall-init-4.5.21.7.ebuild,v
 1.2 2014/06/12 14:13:48 tomwij Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@
 MY_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
 MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)
 
-DESCRIPTION="Component to secure a Shorewall-protected system at boot time 
prior to bringing up the network."
+DESCRIPTION="Component to secure a Shorewall-protected system at boot time 
prior to bringing up the network"
 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.6                  net-firewall/shorewall-init/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ChangeLog   4 Jun 2014 00:46:03 -0000       1.5
+++ ChangeLog   12 Jun 2014 14:13:48 -0000      1.6
@@ -1,6 +1,18 @@
 # ChangeLog for net-firewall/shorewall-init
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/ChangeLog,v 1.5 
2014/06/04 00:46:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-init/ChangeLog,v 1.6 
2014/06/12 14:13:48 tomwij Exp $
+
+*shorewall-init-4.5.21.10 (12 Jun 2014)
+
+  12 Jun 2014; Tom Wijsman <tom...@gentoo.org>
+  +files/4.5.21.10/01_Remove-ipset-functionality.patch,
+  +files/4.5.21.10/README.Gentoo.txt, +files/4.5.21.10/shorewall-init.confd,
+  +files/4.5.21.10/shorewall-init.initd,
+  +files/4.5.21.10/shorewall-init.systemd, +files/4.5.21.10/shorewallrc,
+  +shorewall-init-4.5.21.10.ebuild, shorewall-init-4.5.21.7.ebuild,
+  shorewall-init-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-init-4.5.21.9.ebuild:
   Stable for HPPA (bug #511620).



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

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

Index: shorewall-init-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-init/shorewall-init-4.5.21.10.ebuild,v
 1.1 2014/06/12 14:13:48 tomwij Exp $

EAPI="5"

inherit eutils versionator prefix

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_MAJOR_RELEASE_NUMBER=$(get_version_component_range 1-2)
MY_MAJORMINOR_RELEASE_NUMBER=$(get_version_component_range 1-3)

DESCRIPTION="Component to secure a Shorewall-protected system at boot time 
prior to bringing up the network"
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";

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

DEPEND=">=sys-apps/coreutils-8.20"
RDEPEND="
        ${DEPEND}
        || ( =net-firewall/shorewall-${PVR} =net-firewall/shorewall6-${PVR} 
=net-firewall/shorewall-lite-${PVR} =net-firewall/shorewall6-lite-${PVR} )
"

S=${WORKDIR}/${MY_P}

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"
        eprefixify "${S}"/init.gentoo.sh

        cp "${FILESDIR}"/${PVR}/${PN}.systemd "${S}"/gentoo.service || die 
"Copying ${PN}.systemd failed"

        epatch "${FILESDIR}"/${PVR}/01_Remove-ipset-functionality.patch
        epatch_user
}

src_configure() {
        :;
}

src_compile() {
        :;
}

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

        if [ -d "${D}/etc/logrotate.d" ]; then
                # On Gentoo, shorewall-init will not create 
shorewall-ifupdown.log,
                # so we don't need a logrotate folder at all
                rm -rf "${D}"/etc/logrotate.d
        fi

        if [ -d "${D}/etc/NetworkManager" ]; then
                # On Gentoo, we don't support NetworkManager
                # so we don't need these folder at all
                rm -rf "${D}"/etc/NetworkManager
        fi

        if [ -f "${D}/usr/share/shorewall-init/ifupdown" ]; then
                # This script won't work on Gentoo
                rm -rf "${D}"/usr/share/shorewall-init/ifupdown
        fi

        dodoc changelog.txt releasenotes.txt 
"${FILESDIR}"/${PVR}/README.Gentoo.txt
}

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/conf.d/${PN}"
                elog ""
                elog "To use ${PN}, please add ${PN} to your boot runlevel:"
                elog ""
                elog "  # rc-update add ${PN} boot"
                elog ""
                ewarn "Notice:"
                ewarn "${PN} is more like a start script than a service."
                ewarn "Therefore you cannot start or stop ${PN} at default 
runlevel."
                ewarn ""
                ewarn "For more information read 
${EPREFIX}/usr/share/doc/${PF}/README.Gentoo.txt.bz2"
        fi
}




Reply via email to