| 1 |
commit: aa51d55cd7028c025d5edad781178d8abccf2aea |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Tue Jan 8 23:54:33 2019 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 8 23:54:55 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa51d55c |
| 7 |
|
| 8 |
net-misc/lldpd: Fix USE="fdp -cdp" in 1.0.3 (bug #674900) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/674900 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/lldpd-1.0.3-fix-fdp-without-cdp.patch | 30 ++++++++++++++++++++++ |
| 16 |
net-misc/lldpd/lldpd-1.0.3.ebuild | 1 + |
| 17 |
2 files changed, 31 insertions(+) |
| 18 |
|
| 19 |
diff --git a/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..17099a2f819 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/lldpd/files/lldpd-1.0.3-fix-fdp-without-cdp.patch |
| 24 |
@@ -0,0 +1,30 @@ |
| 25 |
+commit 4e7ec8233cd185941eaa9e41785cfc53f92799b4 |
| 26 |
+Author: Vincent Bernat <vincent@××××××.ch> |
| 27 |
+Date: Tue Jan 8 17:19:15 2019 -0500 |
| 28 |
+ |
| 29 |
+ build: fix compilation with `--enable-fdp --disable-cdp` |
| 30 |
+ |
| 31 |
+ Fix #315 |
| 32 |
+ |
| 33 |
+diff --git a/src/lldpd-structs.h b/src/lldpd-structs.h |
| 34 |
+index c3ffa10..f6b03d7 100644 |
| 35 |
+--- a/src/lldpd-structs.h |
| 36 |
++++ b/src/lldpd-structs.h |
| 37 |
+@@ -129,7 +129,7 @@ struct lldpd_dot3_power { |
| 38 |
+ MARSHAL(lldpd_dot3_power); |
| 39 |
+ #endif |
| 40 |
+ |
| 41 |
+-#ifdef ENABLE_CDP |
| 42 |
++#if defined (ENABLE_CDP) || defined (ENABLE_FDP) |
| 43 |
+ struct cdpv2_power { |
| 44 |
+ u_int16_t request_id; |
| 45 |
+ u_int16_t management_id; |
| 46 |
+@@ -273,7 +273,7 @@ struct lldpd_port { |
| 47 |
+ struct lldpd_med_power p_med_power; |
| 48 |
+ #endif |
| 49 |
+ |
| 50 |
+-#ifdef ENABLE_CDP |
| 51 |
++#if defined (ENABLE_CDP) || defined (ENABLE_FDP) |
| 52 |
+ struct cdpv2_power p_cdp_power; |
| 53 |
+ #endif |
| 54 |
+ |
| 55 |
|
| 56 |
diff --git a/net-misc/lldpd/lldpd-1.0.3.ebuild b/net-misc/lldpd/lldpd-1.0.3.ebuild |
| 57 |
index 226f947f3bd..822e037de61 100644 |
| 58 |
--- a/net-misc/lldpd/lldpd-1.0.3.ebuild |
| 59 |
+++ b/net-misc/lldpd/lldpd-1.0.3.ebuild |
| 60 |
@@ -36,6 +36,7 @@ PATCHES=( |
| 61 |
"${FILESDIR}/lldpd-0.9.5-seccomp-add-socket-ops.patch" |
| 62 |
"${FILESDIR}/lldpd-1.0.1-seccomp-add-brk.patch" |
| 63 |
"${FILESDIR}/lldpd-1.0.2-seccomp-add-misc.patch" |
| 64 |
+ "${FILESDIR}/lldpd-1.0.3-fix-fdp-without-cdp.patch" |
| 65 |
) |
| 66 |
|
| 67 |
pkg_setup() { |
Archives