| 1 |
commit: 2dbc84da7af261484768ab90fe47b1a677359382 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 28 22:27:59 2019 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 28 22:27:59 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2dbc84da |
| 7 |
|
| 8 |
net-firewall/ebtables: Sync with latest changes from portage |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.73, Repoman-2.3.17 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
net-firewall/ebtables/Manifest | 2 +- |
| 14 |
...s-2.0.10.4-r1.ebuild => ebtables-2.0.10.4-r2.ebuild} | 17 ++++++++++------- |
| 15 |
2 files changed, 11 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-firewall/ebtables/Manifest b/net-firewall/ebtables/Manifest |
| 18 |
index 68edfb1..73219a0 100644 |
| 19 |
--- a/net-firewall/ebtables/Manifest |
| 20 |
+++ b/net-firewall/ebtables/Manifest |
| 21 |
@@ -1 +1 @@ |
| 22 |
-DIST ebtables-v2.0.10-4.tar.gz 103764 SHA256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d SHA512 a6832453812eaede3fcbb5b4cab5902ea1ea752a80a259eed276a01b61e2afaa6cf07d3d023d86a883f9a02505aecc44a1c6e0d27b3a61f341002e4c051cd60a WHIRLPOOL 5a1e0703e3fd5c79e149824e789646d042660081fb8a9f301fa4cc2716e84fbf842216d5b6b4c8c33de3b6949bfbfcaa2eb7293fe7afa71a2305de8f70abd57d |
| 23 |
+DIST ebtables-v2.0.10-4.tar.gz 103764 BLAKE2B 01995c701c6dbc7495bdf1f0fce61dce51a379dd1a304d2a5174e0190c040ee958833c65be9fd9d6a7601a2f81461ce1f2e9db989081b4fe7dabc5bfcecd57d6 SHA512 a6832453812eaede3fcbb5b4cab5902ea1ea752a80a259eed276a01b61e2afaa6cf07d3d023d86a883f9a02505aecc44a1c6e0d27b3a61f341002e4c051cd60a |
| 24 |
|
| 25 |
diff --git a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild b/net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild |
| 26 |
similarity index 87% |
| 27 |
rename from net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild |
| 28 |
rename to net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild |
| 29 |
index bdcbd7a..78a3c20 100644 |
| 30 |
--- a/net-firewall/ebtables/ebtables-2.0.10.4-r1.ebuild |
| 31 |
+++ b/net-firewall/ebtables/ebtables-2.0.10.4-r2.ebuild |
| 32 |
@@ -1,9 +1,9 @@ |
| 33 |
-# Copyright 1999-2015 Gentoo Foundation |
| 34 |
+# Copyright 1999-2019 Gentoo Authors |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
|
| 37 |
-EAPI="4" |
| 38 |
+EAPI="6" |
| 39 |
|
| 40 |
-inherit versionator eutils toolchain-funcs multilib flag-o-matic |
| 41 |
+inherit versionator toolchain-funcs flag-o-matic |
| 42 |
|
| 43 |
MY_PV=$(replace_version_separator 3 '-' ) |
| 44 |
MY_P=${PN}-v${MY_PV} |
| 45 |
@@ -18,7 +18,8 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" |
| 46 |
IUSE="+perl static" |
| 47 |
|
| 48 |
# The ebtables-save script is written in perl. |
| 49 |
-RDEPEND="perl? ( dev-lang/perl )" |
| 50 |
+RDEPEND="perl? ( dev-lang/perl ) |
| 51 |
+ net-misc/ethertypes" |
| 52 |
|
| 53 |
S=${WORKDIR}/${MY_P} |
| 54 |
|
| 55 |
@@ -31,7 +32,9 @@ pkg_setup() { |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
# Enhance ebtables-save to take table names as parameters bug #189315 |
| 59 |
- epatch "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff" |
| 60 |
+ local PATCHES=( "${FILESDIR}/${PN}-2.0.8.1-ebt-save.diff" ) |
| 61 |
+ |
| 62 |
+ default |
| 63 |
|
| 64 |
# Musl fixes |
| 65 |
epatch "${FILESDIR}/musl-fixes.patch" |
| 66 |
@@ -64,11 +67,11 @@ src_install() { |
| 67 |
if ! use perl; then |
| 68 |
rm "${ED}"/sbin/ebtables-save || die |
| 69 |
fi |
| 70 |
+ # Bug 647458 |
| 71 |
+ rm "${ED%/}"/etc/ethertypes || die |
| 72 |
else |
| 73 |
into / |
| 74 |
newsbin static ebtables |
| 75 |
- insinto /etc |
| 76 |
- doins ethertypes |
| 77 |
fi |
| 78 |
dodoc ChangeLog THANKS |
| 79 |
} |
Archives