| 1 |
commit: 22559fe330c7f6ff63d007b0f834b097dbe3a27b |
| 2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
| 3 |
AuthorDate: Mon Nov 30 21:39:51 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 30 21:39:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22559fe3 |
| 7 |
|
| 8 |
net-misc/ucarp: port to EAPI 7 |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/18448 |
| 11 |
Closes: https://bugs.gentoo.org/524214 |
| 12 |
Closes: https://bugs.gentoo.org/689188 |
| 13 |
Closes: https://bugs.gentoo.org/706964 |
| 14 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
| 15 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
| 16 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 17 |
|
| 18 |
net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch | 8 ++++++++ |
| 19 |
...{ucarp-1.5.2-r5.ebuild => ucarp-1.5.2-r6.ebuild} | 21 ++++++++++++++------- |
| 20 |
2 files changed, 22 insertions(+), 7 deletions(-) |
| 21 |
|
| 22 |
diff --git a/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch b/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..6e746b26da6 |
| 25 |
--- /dev/null |
| 26 |
+++ b/net-misc/ucarp/files/ucarp-1.5.2-fno-common.patch |
| 27 |
@@ -0,0 +1,8 @@ |
| 28 |
+--- a/src/ip_carp.h |
| 29 |
++++ b/src/ip_carp.h |
| 30 |
+@@ -70,7 +70,7 @@ struct carp_header { |
| 31 |
+ u_int16_t carp_cksum; |
| 32 |
+ u_int32_t carp_counter[2]; |
| 33 |
+ unsigned char carp_md[20]; /* SHA1 HMAC */ |
| 34 |
+-} __packed; |
| 35 |
++}; |
| 36 |
|
| 37 |
diff --git a/net-misc/ucarp/ucarp-1.5.2-r5.ebuild b/net-misc/ucarp/ucarp-1.5.2-r6.ebuild |
| 38 |
similarity index 77% |
| 39 |
rename from net-misc/ucarp/ucarp-1.5.2-r5.ebuild |
| 40 |
rename to net-misc/ucarp/ucarp-1.5.2-r6.ebuild |
| 41 |
index 00283bf58e8..a843fc050bf 100644 |
| 42 |
--- a/net-misc/ucarp/ucarp-1.5.2-r5.ebuild |
| 43 |
+++ b/net-misc/ucarp/ucarp-1.5.2-r6.ebuild |
| 44 |
@@ -1,23 +1,28 @@ |
| 45 |
-# Copyright 1999-2016 Gentoo Foundation |
| 46 |
+# Copyright 1999-2020 Gentoo Authors |
| 47 |
# Distributed under the terms of the GNU General Public License v2 |
| 48 |
|
| 49 |
-EAPI="5" |
| 50 |
+EAPI=7 |
| 51 |
|
| 52 |
DESCRIPTION="Portable userland implementation of Common Address Redundancy Protocol (CARP)" |
| 53 |
-HOMEPAGE="http://www.ucarp.org" |
| 54 |
+HOMEPAGE="https://ucarp.wordpress.com" |
| 55 |
SRC_URI="ftp://ftp.ucarp.org/pub/ucarp/${P}.tar.gz" |
| 56 |
|
| 57 |
LICENSE="GPL-2" |
| 58 |
SLOT="0" |
| 59 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 60 |
-IUSE="nls" |
| 61 |
+IUSE="debug nls" |
| 62 |
|
| 63 |
RDEPEND="net-libs/libpcap" |
| 64 |
-DEPEND="${RDEPEND} |
| 65 |
- nls? ( sys-devel/gettext )" |
| 66 |
+DEPEND="${RDEPEND}" |
| 67 |
+BDEPEND="nls? ( sys-devel/gettext )" |
| 68 |
+ |
| 69 |
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) |
| 70 |
|
| 71 |
src_configure() { |
| 72 |
- econf $(use_enable nls) |
| 73 |
+ econf \ |
| 74 |
+ --disable-static \ |
| 75 |
+ $(use_with debug) \ |
| 76 |
+ $(use_enable nls) |
| 77 |
} |
| 78 |
|
| 79 |
src_install() { |
| 80 |
@@ -33,6 +38,8 @@ src_install() { |
| 81 |
|
| 82 |
newinitd "${FILESDIR}"/ucarp.initd-r2 ucarp |
| 83 |
newconfd "${FILESDIR}"/ucarp.confd ucarp |
| 84 |
+ |
| 85 |
+ find "${ED}" -name '*.la' -delete || die |
| 86 |
} |
| 87 |
|
| 88 |
pkg_postinst() { |
Archives