commit:     a630c6eaaf5a17419028c4e311380e2423fcc9c1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 28 20:23:53 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 13:06:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a630c6ea

net-misc/wol: additional build fixes

- Try harder to convince it we've got a decent malloc & realloc
  (if upstream were alive, it'd be worth fixing up the autoconf here, but...)

- Fix build with newer linux-headers(?)

Closes: https://bugs.gentoo.org/874420
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-misc/wol/files/wol-0.7.1-linux-headers.patch          | 11 +++++++++++
 net-misc/wol/{wol-0.7.1-r3.ebuild => wol-0.7.1-r4.ebuild} |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/net-misc/wol/files/wol-0.7.1-linux-headers.patch 
b/net-misc/wol/files/wol-0.7.1-linux-headers.patch
new file mode 100644
index 000000000000..e381d2a31a6a
--- /dev/null
+++ b/net-misc/wol/files/wol-0.7.1-linux-headers.patch
@@ -0,0 +1,11 @@
+--- a/src/magic.c
++++ b/src/magic.c
+@@ -142,7 +142,7 @@ magic_assemble (struct magic *magic_buf, const char 
*mac_str,
+                               }
+ 
+                       for (j = 0; j < MAC_LEN; ++j)
+-                              m[j] = ea.ETHER_ADDR_OCTET[j];
++                              m[j] = ea.ether_addr_octet[j];
+               }
+ 
+       /* accommodate the packet chunk's size to the packet type */

diff --git a/net-misc/wol/wol-0.7.1-r3.ebuild b/net-misc/wol/wol-0.7.1-r4.ebuild
similarity index 90%
rename from net-misc/wol/wol-0.7.1-r3.ebuild
rename to net-misc/wol/wol-0.7.1-r4.ebuild
index 3bcd9963ecdb..1ead57765ef2 100644
--- a/net-misc/wol/wol-0.7.1-r3.ebuild
+++ b/net-misc/wol/wol-0.7.1-r4.ebuild
@@ -18,6 +18,7 @@ PATCHES=(
        "${FILESDIR}/${P}-musl.patch"
        "${FILESDIR}/${P}-Fix-config.h-test-consumption.patch"
        "${FILESDIR}/${P}-Fix-malloc-detection.patch"
+       "${FILESDIR}/${P}-linux-headers.patch"
 )
 
 src_prepare() {
@@ -28,6 +29,8 @@ src_prepare() {
 }
 
 src_configure() {
+       export jm_cv_func_working_{re,m}alloc=yes
+
        local myeconfargs=(
                --disable-rpath
                $(use_enable nls)

Reply via email to