mgorny 15/07/25 16:21:10 Modified: ChangeLog Added: shorewall-4.6.11.ebuild Log: Version bump. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/177 by Whissi. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Revision Changes Path 1.290 net-firewall/shorewall/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/ChangeLog?rev=1.290&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/ChangeLog?rev=1.290&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/ChangeLog?r1=1.289&r2=1.290 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- ChangeLog 23 Jul 2015 20:58:46 -0000 1.289 +++ ChangeLog 25 Jul 2015 16:21:10 -0000 1.290 @@ -1,6 +1,12 @@ # ChangeLog for net-firewall/shorewall # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.289 2015/07/23 20:58:46 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/ChangeLog,v 1.290 2015/07/25 16:21:10 mgorny Exp $ + +*shorewall-4.6.11 (25 Jul 2015) + + 25 Jul 2015; Michał Górny <mgo...@gentoo.org> +shorewall-4.6.11.ebuild: + Version bump. https://github.com/gentoo/gentoo-portage-rsync-mirror/pull/177 + by Whissi. 23 Jul 2015; Pacho Ramos <pa...@gentoo.org> shorewall-4.6.10.1.ebuild: ppc stable wrt bug #555188 1.1 net-firewall/shorewall/shorewall-4.6.11.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/shorewall-4.6.11.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-firewall/shorewall/shorewall-4.6.11.ebuild?rev=1.1&content-type=text/plain Index: shorewall-4.6.11.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall/shorewall-4.6.11.ebuild,v 1.1 2015/07/25 16:21:10 mgorny Exp $ EAPI="5" inherit eutils linux-info prefix systemd versionator DESCRIPTION='The Shoreline Firewall, commonly known as Shorewall, is' DESCRIPTION+=' a high-level tool for configuring Netfilter' HOMEPAGE="http://www.shorewall.net/"; LICENSE="GPL-2" SLOT="0" IUSE="doc +init +ipv4 ipv6 lite4 lite6" 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) # shorewall MY_PN_IPV4=Shorewall MY_P_IPV4=${MY_PN_IPV4/#S/s}-${MY_PV} # shorewall6 MY_PN_IPV6=Shorewall6 MY_P_IPV6=${MY_PN_IPV6/#S/s}-${MY_PV} # shorewall-lite MY_PN_LITE4=Shorewall-lite MY_P_LITE4=${MY_PN_LITE4/#S/s}-${MY_PV} # shorewall6-lite MY_PN_LITE6=Shorewall6-lite MY_P_LITE6=${MY_PN_LITE6/#S/s}-${MY_PV} # shorewall-init MY_PN_INIT=Shorewall-init MY_P_INIT=${MY_PN_INIT/#S/s}-${MY_PV} # shorewall-core MY_PN_CORE=Shorewall-core MY_P_CORE=${MY_PN_CORE/#S/s}-${MY_PV} # shorewall-docs-html MY_PN_DOCS=Shorewall-docs-html MY_P_DOCS=${MY_PN_DOCS/#S/s}-${MY_PV} # Upstream URL schema: # Beta: $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-Beta2/shorewall-4.6.4-Beta2.tar.bz2 # RC: $MIRROR/pub/shorewall/development/4.6/shorewall-4.6.4-RC1/shorewall-4.6.4-RC1.tar.bz2 # Release: $MIRROR/pub/shorewall/4.6/shorewall-4.6.3/shorewall-4.6.3.3.tar.bz2 MY_URL_PREFIX= MY_URL_SUFFIX= if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then MY_URL_PREFIX='development/' _tmp_last_index=$(($(get_last_version_component_index ${MY_PV})+1)) _tmp_suffix=$(get_version_component_range ${_tmp_last_index} ${MY_PV}) if [[ ${_tmp_suffix} = *Beta* ]] || [[ ${_tmp_suffix} = *RC* ]]; then MY_URL_SUFFIX="-${_tmp_suffix}" fi # Cleaning up temporary variables unset _tmp_last_index unset _tmp_suffix else KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" fi SRC_URI=" http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-core-${MY_PV}.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-${MY_PV}.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-${MY_PV}.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-lite-${MY_PV}.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall6-lite-${MY_PV}.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/shorewall-init-${MY_PV}.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/${MY_URL_PREFIX}${MY_MAJOR_RELEASE_NUMBER}/shorewall-${MY_MAJORMINOR_RELEASE_NUMBER}${MY_URL_SUFFIX}/${MY_P_DOCS}.tar.bz2 ) " # - Shorewall6 requires Shorewall # - Installing Shorewall-init or just the documentation doesn't make any sense, # that's why we force the user to select at least one "real" Shorewall product # # See http://shorewall.net/download.htm#Which REQUIRED_USE=" ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 ) " # No build dependencies! Just plain shell scripts... DEPEND="" RDEPEND=" >=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214 " S=${WORKDIR} pkg_pretend() { local CONFIG_CHECK="~NF_CONNTRACK" local WARNING_CONNTRACK="Without NF_CONNTRACK support, you will be unable" local WARNING_CONNTRACK+=" to run any shorewall-based firewall on the local system." if use ipv4 || use lite4; then CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV4" local WARNING_CONNTRACK_IPV4="Without NF_CONNTRACK_IPV4 support, you will" local WARNING_CONNTRACK_IPV4+=" be unable to run any shorewall-based IPv4 firewall on the local system." fi if use ipv6 || use lite6; then CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK_IPV6" local WARNING_CONNTRACK_IPV6="Without NF_CONNTRACK_IPV6 support, you will" local WARNING_CONNTRACK_IPV6+=" be unable to run any shorewall-based IPv6 firewall on the local system." fi check_extra_config } pkg_setup() { if [ -n "${DIGEST}" ]; then einfo "Unsetting environment variable \"DIGEST\" to prevent conflicts with package's \"install.sh\" script ..." unset DIGEST fi } src_prepare() { # We are moving each unpacked source from MY_P_* to MY_PN_*. # This allows us to use patches from upstream and keeps epatch_user working einfo "Preparing shorewallrc ..." cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewallrc "${S}"/shorewallrc.gentoo || die "Copying shorewallrc failed" eprefixify "${S}"/shorewallrc.gentoo # shorewall-core mv "${S}"/${MY_P_CORE} "${S}"/${MY_PN_CORE} || die "Failed to move '${S}/${MY_P_CORE}' to '${S}/${MY_PN_CORE}'" ebegin "Applying Gentoo-specific changes to ${MY_P_CORE} ..." ln -s ../shorewallrc.gentoo ${MY_PN_CORE}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" eend 0 # shorewall if use ipv4; then mv "${S}"/${MY_P_IPV4} "${S}"/${MY_PN_IPV4} || die "Failed to move '${S}/${MY_P_IPV4}' to '${S}/${MY_PN_IPV4}'" ebegin "Applying Gentoo-specific changes to ${MY_P_IPV4}" ln -s ../shorewallrc.gentoo ${MY_PN_IPV4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.confd "${S}"/${MY_PN_IPV4}/default.gentoo || die "Copying shorewall.confd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.initd "${S}"/${MY_PN_IPV4}/init.gentoo.sh || die "Copying shorewall.initd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall.systemd-r1 "${S}"/${MY_PN_IPV4}/gentoo.service || die "Copying shorewall.systemd failed" eend 0 fi # shorewall6 if use ipv6; then mv "${S}"/${MY_P_IPV6} "${S}"/${MY_PN_IPV6} || die "Failed to move '${S}/${MY_P_IPV6}' to '${S}/${MY_PN_IPV6}'" ebegin "Applying Gentoo-specific changes to ${MY_P_IPV6}" ln -s ../shorewallrc.gentoo ${MY_PN_IPV6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.confd "${S}"/${MY_PN_IPV6}/default.gentoo || die "Copying shorewall6.confd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.initd "${S}"/${MY_PN_IPV6}/init.gentoo.sh || die "Copying shorewall6.initd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6.systemd-r1 "${S}"/${MY_PN_IPV6}/gentoo.service || die "Copying shorewall6.systemd failed" eend 0 fi # shorewall-lite if use lite4; then mv "${S}"/${MY_P_LITE4} "${S}"/${MY_PN_LITE4} || die "Failed to move '${S}/${MY_P_LITE4}' to '${S}/${MY_PN_LITE4}'" ebegin "Applying Gentoo-specific changes to ${MY_P_LITE4}" ln -s ../shorewallrc.gentoo ${MY_PN_LITE4}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.confd "${S}"/${MY_PN_LITE4}/default.gentoo || die "Copying shorewall-lite.confd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.initd "${S}"/${MY_PN_LITE4}/init.gentoo.sh || die "Copying shorewall-lite.initd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-lite.systemd-r1 "${S}"/${MY_PN_LITE4}/gentoo.service || die "Copying shorewall-lite.systemd failed" eend 0 fi # shorewall6-lite if use lite6; then mv "${S}"/${MY_P_LITE6} "${S}"/${MY_PN_LITE6} || die "Failed to move '${S}/${MY_P_LITE6}' to '${S}/${MY_PN_LITE6}'" ebegin "Applying Gentoo-specific changes to ${MY_P_LITE6}" ln -s ../shorewallrc.gentoo ${MY_PN_LITE6}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.confd "${S}"/${MY_PN_LITE6}/default.gentoo || die "Copying shorewall6-lite.confd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.initd "${S}"/${MY_PN_LITE6}/init.gentoo.sh || die "Copying shorewall6-lite.initd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall6-lite.systemd-r1 "${S}"/${MY_PN_LITE6}/gentoo.service || die "Copying shorewall6-lite.systemd failed" eend 0 fi # shorewall-init if use init; then mv "${S}"/${MY_P_INIT} "${S}"/${MY_PN_INIT} || die "Failed to move '${S}/${MY_P_INIT}' to '${S}/${MY_PN_INIT}'" ebegin "Applying Gentoo-specific changes to ${MY_P_INIT}" ln -s ../shorewallrc.gentoo ${MY_PN_INIT}/shorewallrc.gentoo || die "Failed to symlink shorewallrc.gentoo" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.confd "${S}"/${MY_PN_INIT}/default.gentoo || die "Copying shorewall-init.confd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.initd "${S}"/${MY_PN_INIT}/init.gentoo.sh || die "Copying shorewall-init.initd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.systemd-r1 "${S}"/${MY_PN_INIT}/gentoo.service || die "Copying shorewall-init.systemd failed" cp "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init.readme "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt || die "Copying shorewall-init.systemd failed" eend 0 eprefixify "${S}"/${MY_PN_INIT}/init.gentoo.sh cd "${S}"/${MY_PN_INIT} epatch "${FILESDIR}"/${MY_MAJOR_RELEASE_NUMBER}/shorewall-init-01_remove-ipset-functionality-r1.patch cd "${S}" fi # shorewall-docs-html if use doc; then mv "${S}"/${MY_P_DOCS} "${S}"/${MY_PN_DOCS} || die "Failed to move '${S}/${MY_P_DOCS}' to '${S}/${MY_PN_DOCS}'" fi epatch_user } src_configure() { :; } src_compile() { :; } src_install() { # shorewall-core einfo "Installing ${MY_P_CORE} ..." DESTDIR="${D%/}" ${MY_PN_CORE}/install.sh shorewallrc.gentoo || die "${MY_PN_CORE}/install.sh failed" dodoc "${S}"/${MY_PN_CORE}/changelog.txt "${S}"/${MY_PN_CORE}/releasenotes.txt # shorewall if use ipv4; then einfo "Installing ${MY_P_IPV4} ..." keepdir /var/lib/shorewall DESTDIR="${D%/}" ${MY_PN_IPV4}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV4}/install.sh failed" if use doc; then dodoc -r "${S}"/${MY_PN_IPV4}/Samples fi fi # shorewall6 if use ipv6; then einfo "Installing ${MY_P_IPV6} ..." keepdir /var/lib/shorewall6 DESTDIR="${D%/}" ${MY_PN_IPV6}/install.sh shorewallrc.gentoo || die "${MY_PN_IPV6}/install.sh failed" if use doc; then dodoc -r "${S}"/${MY_PN_IPV6}/Samples6 fi fi # shorewall-lite if use lite4; then einfo "Installing ${MY_P_LITE4} ..." keepdir /var/lib/shorewall-lite DESTDIR="${D%/}" ${MY_PN_LITE4}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE4}/install.sh failed" fi # shorewall6-lite if use lite6; then einfo "Installing ${MY_P_LITE6} ..." keepdir /var/lib/shorewall6-lite DESTDIR="${D%/}" ${MY_PN_LITE6}/install.sh shorewallrc.gentoo || die "${MY_PN_LITE6}/install.sh failed" fi # shorewall-init if use init; then einfo "Installing ${MY_P_INIT} ..." DESTDIR="${D%/}" ${MY_PN_INIT}/install.sh shorewallrc.gentoo || die "${MY_PN_INIT}/install.sh failed" dodoc "${S}"/${MY_PN_INIT}/shorewall-init.README.Gentoo.txt if [ -f "${D}etc/logrotate.d/shorewall-init" ]; then # On Gentoo, shorewall-init will not create shorewall-ifupdown.log, # so we don't need a logrotate configuration file for shorewall-init einfo "Removing unused \"${D}etc/logrotate.d/shorewall-init\" ..." rm -rf "${D}"etc/logrotate.d/shorewall-init || die "Removing \"${D}etc/logrotate.d/shorewall-init\" failed" fi if [ -d "${D}etc/NetworkManager" ]; then # On Gentoo, we don't support NetworkManager # so we don't need this folder at all einfo "Removing unused \"${D}etc/NetworkManager\" ..." rm -rf "${D}"etc/NetworkManager || die "Removing \"${D}etc/NetworkManager\" failed" fi if [ -f "${D}usr/share/shorewall-init/ifupdown" ]; then # This script isn't supported on Gentoo rm -rf "${D}"usr/share/shorewall-init/ifupdown || die "Removing \"${D}usr/share/shorewall-init/ifupdown\" failed" fi fi if use doc; then einfo "Installing ${MY_P_DOCS} ..." dohtml -r "${S}"/${MY_PN_DOCS} fi } pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then # This is a new installation # Show first steps for shorewall/shorewall6 local _PRODUCTS="" if use ipv4; then _PRODUCTS="shorewall" if use ipv6; then _PRODUCTS="${_PRODUCTS}/shorewall6" fi fi if [[ -n "${_PRODUCTS}" ]]; then elog "Before you can use ${_PRODUCTS}, you need to edit its configuration in:" elog "" elog " /etc/shorewall/shorewall.conf" if use ipv6; then elog " /etc/shorewall6/shorewall6.conf" fi elog "" elog "To activate your shorewall-based firewall on system start, please add ${_PRODUCTS} to your default runlevel:" elog "" elog " # rc-update add shorewall default" if use ipv6; then elog " # rc-update add shorewall6 default" fi fi # Show first steps for shorewall-lite/shorewall6-lite _PRODUCTS="" if use lite4; then _PRODUCTS="shorewall-lite" fi if use lite6; then if [[ -z "${_PRODUCTS}" ]]; then _PRODUCTS="shorewall6-lite" else _PRODUCTS="${_PRODUCTS}/shorewall6-lite" fi fi if [[ -n "${_PRODUCTS}" ]]; then if use ipv4; then elog "" fi elog "Before you can use ${_PRODUCTS}, you need to provide a configuration, which you can" elog "create using ${CATEGORY}/shorewall (with \"ipv4\" and or \"ipv6\" USE flag)." elog "" elog "To read more about ${_PRODUCTS}, please visit" elog " http://shorewall.net/CompiledPrograms.html"; elog "" elog "To activate your shorewall-lite-based firewall on system start, please add ${PRODUCTS} to your default runlevel:" elog "" if use lite4; then elog " # rc-update add shorewall-lite default" fi if use lite6; then elog " # rc-update add shorewall6-lite default" fi fi if use init; then elog "" elog "To secure your system on boot, please add shorewall-init to your boot runlevel:" elog "" elog " # rc-update add shorewall-init boot" elog "" elog "and review \$PRODUCTS in" elog "" elog " /etc/conf.d/shorewall-init" fi fi if [[ -n "${REPLACING_VERSIONS}" && ${REPLACING_VERSIONS} < ${MY_MAJOR_RELEASE_NUMBER} ]]; then # This is an upgrade elog "You are upgrading from a previous major version. It is highly recommended that you read" elog "" elog " - /usr/share/doc/shorewall*/releasenotes.tx*" elog " - http://shorewall.net/upgrade_issues.htm#idp8704902640"; if use ipv4; then elog "" elog "You can auto-migrate your configuration using" elog "" elog " # shorewall update -A" if use ipv6; then elog " # shorewall6 update -A" fi elog "" elog "But if you are not familiar with the \"shorewall[6] update\" command," elog "please read the shorewall[6] man page first." fi fi if ! use init; then elog "" elog "Consider emerging ${CATEGORY}/${PN} with USE flag \"init\" to secure your system on boot" elog "before your shorewall-based firewall is ready to start." elog "" elog "To read more about shorewall-init, please visit" elog " http://www.shorewall.net/Shorewall-init.html"; fi if ! has_version "net-firewall/conntrack-tools"; then elog "" elog "Your Shorewall firewall can utilize \"conntrack\" from the \"net-firewall/conntrack-tools\"" elog "package. if you want to use this feature, you need to install \"net-firewall/conntrack-tools\"!" fi }
