| 1 |
pva 08/02/25 18:06:27 |
| 2 |
|
| 3 |
Modified: ChangeLog shorewall-common-4.0.9.ebuild |
| 4 |
Log: |
| 5 |
Don't depend on shorewall-shell by default, bug #211321, thank you Stefan Wimmer for report and Vieri for the fix. |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.11 net-firewall/shorewall-common/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/ChangeLog?rev=1.11&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/ChangeLog?rev=1.11&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/ChangeLog?r1=1.10&r2=1.11 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/ChangeLog,v |
| 18 |
retrieving revision 1.10 |
| 19 |
retrieving revision 1.11 |
| 20 |
diff -u -r1.10 -r1.11 |
| 21 |
--- ChangeLog 24 Feb 2008 18:46:36 -0000 1.10 |
| 22 |
+++ ChangeLog 25 Feb 2008 18:06:26 -0000 1.11 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for net-firewall/shorewall-common |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/ChangeLog,v 1.10 2008/02/24 18:46:36 pva Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/ChangeLog,v 1.11 2008/02/25 18:06:26 pva Exp $ |
| 28 |
+ |
| 29 |
+ 25 Feb 2008; <pva@g.o> shorewall-common-4.0.9.ebuild: |
| 30 |
+ Don't depend on shorewall-shell by default, bug #211321, thank you Stefan |
| 31 |
+ Wimmer for report and Vieri for the fix. |
| 32 |
|
| 33 |
*shorewall-common-4.0.9 (24 Feb 2008) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: shorewall-common-4.0.9.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- shorewall-common-4.0.9.ebuild 24 Feb 2008 18:46:36 -0000 1.1 |
| 51 |
+++ shorewall-common-4.0.9.ebuild 25 Feb 2008 18:06:26 -0000 1.2 |
| 52 |
@@ -1,14 +1,13 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild,v 1.1 2008/02/24 18:46:36 pva Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/shorewall-common/shorewall-common-4.0.9.ebuild,v 1.2 2008/02/25 18:06:26 pva Exp $ |
| 57 |
|
| 58 |
inherit eutils |
| 59 |
|
| 60 |
-# Choose between experimental, stable and beta: |
| 61 |
-#MY_P_TREE="development/4.0" # experimental and beta |
| 62 |
-MY_P_TREE="4.0" # stable |
| 63 |
-#MY_P_BETA="-RC1" # only beta and RC |
| 64 |
-MY_P_BETA="" # stable or experimental |
| 65 |
+# Select version (stable, RC, Beta, upstream patched): |
| 66 |
+MY_P_TREE="4.0" # stable/devel (eg. "4.0" or "development/4.0") |
| 67 |
+MY_P_BETA="" # stable or experimental (eg. "-RC1" or "-Beta4") |
| 68 |
+MY_P_PATCH="" # upstream patch (eg. ".2") |
| 69 |
|
| 70 |
MY_P="${P/-common/}${MY_P_BETA}" |
| 71 |
MY_PN="${PN/-common/}" |
| 72 |
@@ -17,7 +16,7 @@ |
| 73 |
|
| 74 |
DESCRIPTION="Shoreline Firewall is an iptables-based firewall for Linux." |
| 75 |
HOMEPAGE="http://www.shorewall.net/" |
| 76 |
-SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_P_TREE}/${MY_P}/${P}${MY_P_BETA}.tar.bz2 |
| 77 |
+SRC_URI="http://www1.shorewall.net/pub/${MY_PN}/${MY_P_TREE}/${MY_P}/${P}${MY_P_PATCH}${MY_P_BETA}.tar.bz2 |
| 78 |
doc? ( http://www1.shorewall.net/pub/${MY_PN}/${MY_P_TREE}/${MY_P}/${MY_P_DOCS}.tar.bz2 )" |
| 79 |
|
| 80 |
LICENSE="GPL-2" |
| 81 |
@@ -27,7 +26,6 @@ |
| 82 |
|
| 83 |
DEPEND=">=net-firewall/iptables-1.2.4 |
| 84 |
sys-apps/iproute2 |
| 85 |
- ~net-firewall/shorewall-shell-${PV} |
| 86 |
!<net-firewall/shorewall-4.0" |
| 87 |
|
| 88 |
pkg_setup() { |
| 89 |
@@ -43,7 +41,7 @@ |
| 90 |
src_install() { |
| 91 |
keepdir /var/lib/shorewall |
| 92 |
|
| 93 |
- cd "${WORKDIR}/${P}${MY_P_BETA}" |
| 94 |
+ cd "${WORKDIR}/${P}${MY_P_PATCH}${MY_P_BETA}" |
| 95 |
PREFIX="${D}" ./install.sh || die "install.sh failed" |
| 96 |
newinitd "${FILESDIR}"/shorewall.initd shorewall || die "doinitd failed" |
| 97 |
|
| 98 |
@@ -54,7 +52,7 @@ |
| 99 |
dohtml -r * |
| 100 |
## dosym Documentation_Index.html "/usr/share/doc/${PF}/html/index.htm" |
| 101 |
# install samples |
| 102 |
- cp -pR "${S}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}" |
| 103 |
+ cp -pR "${S}${MY_P_PATCH}${MY_P_BETA}/Samples" "${D}/usr/share/doc/${PF}" |
| 104 |
fi |
| 105 |
} |
| 106 |
|
| 107 |
@@ -97,5 +95,4 @@ |
| 108 |
elog |
| 109 |
elog "${PN} requires a compiler." |
| 110 |
elog "You can choose to emerge shorewall-shell and/or shorewall-perl." |
| 111 |
- elog "As of ${PV} shorewall-shell is mandatory." |
| 112 |
} |
| 113 |
|
| 114 |
|
| 115 |
|
| 116 |
-- |
| 117 |
gentoo-commits@l.g.o mailing list |
Archives