gentoo auto-resync : 25:10:2022 - 15:53:58

4 files changed, 90 insertions, 3 deletions

diff --git a/net-misc/wol/Manifest b/net-misc/wol/Manifest
index 1de80c37aacc..3f113257ef57 100644
--- a/net-misc/wol/Manifest
+++ b/net-misc/wol/Manifest
@@ -1,4 +1,6 @@
+AUX wol-0.7.1-Fix-config.h-test-consumption.patch 1194 BLAKE2B 469cf423fb9accb234fbc238fe7ac611d5d2a256798ec9d5a7e3ec17d21c7445e0bf0ac99f592d3a39b0fac129b1ae968949ef4d332f3e518e043de3df1031b3 SHA512 65575cb1caf69bd9ecda87e7b8a0719b12627b0fd75a999187573dd6ee5c8ce5aa8fc51fcfd77d917c7af184a66da1258410fc6530848cab415e734ff45a0c09
+AUX wol-0.7.1-Fix-malloc-detection.patch 1030 BLAKE2B 904df8bd0fc83c97192833e9443941e708d642877cb1fe4c79bb3bb6dea8e738057084290f360a1eebaf6b94f9d4c85fb02c1a41a076ad35f9d2d338b990f2ba SHA512 86ecca84b7897e1a9cbf78432a93ed463e9d73e857fccfe62fe39a4cf2f804a96452a19a2da8d093fa7fe9facec7d1e50434462834c93d2ff02b8514124c9ef6
 AUX wol-0.7.1-musl.patch 1123 BLAKE2B ff9efe257a32f3ce484ee978bee7d8b8d706d28934f83c00e7c5edaab1e04186b8d31db6a2e90bab9be7406c9caeb298fcef377d3f59a31c77b7fe9276a0f8de SHA512 670a860f02d82dd9fae8216d47629fc81f9acfa6bfdd9e38125b0e84604d14998539cb7d9c0cce15e49a52e8b38336c6475d3a5b0ec0763746b1bccd4f2f64cb
 DIST wol-0.7.1.tar.gz 445648 BLAKE2B 80e34ee5a588f7caec92c17d3455abec8227789c30dcde46ecbb75d2f5d7f2a852f6a8c11dea54c036e63db73e28f6d2aaa32bbf7b5708f23c9005f163a17f5f SHA512 233cbd038633c4b04a22710c04a8349d7706c6b4ff0554b6899ee3309349502a318f6fb05a4ad4c80cd373c362b2ad8818cb52a432d768f569e80f05658615a3
-EBUILD wol-0.7.1-r3.ebuild 605 BLAKE2B a745251d60a5b7b932aa74f379e16101197c3e4891161ca77f83256dd646a4c107b800262b8f8f6faa70a435fc7541ee9146b0b99a7420bcbe08c5a347a50e6e SHA512 7dce445920605d46ad2f97cb69a9022cd7a5a686c665bb4d8c2bf038b6d58b77796243b349cd6de03258d2c63ca1c1eee69334a13774aa3805177dd893747fd5
+EBUILD wol-0.7.1-r3.ebuild 776 BLAKE2B 93d7bf19e485eb6fff2c0a58bab5b0f66e749f74335c85be425f80d7d9f3d68f76c61274f4730c12d9bc8704e1f540e673c05a9e2dd523a6c39d8ae90f7f5ce1 SHA512 e8205dccde3842a263b227b0d750a016a8d09ba51c99026f80ed24f59f7ac66cc4cfed08c539942a3e86a8b035127728affb880c2f950ee38b61898b9f401f56
 MISC metadata.xml 617 BLAKE2B bafbe2d18eaafd5934c3d5f341076bd442700e774068cf8f143310a16b689d3140ee72fa600fc7bdcb638c5972199c96cf5534a8612565ab02192bf06507d422 SHA512 e402abeecb6242c052247d9385e3ebfd8fd8c6cf4f70b95bf244edcd32cd9b2efd0a24be8ece1353f56d51e81acc902148c68043d1ab100cc78a471c6b663dfd
diff --git a/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch b/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch
new file mode 100644
index 000000000000..897517a97f44
--- /dev/null
+++ b/net-misc/wol/files/wol-0.7.1-Fix-config.h-test-consumption.patch
@@ -0,0 +1,35 @@
+From 1c16d04a3fc03a5f4c0cd54ff6f207de1062e9bd Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 25 Oct 2022 13:54:04 +0100
+Subject: [PATCH] Fix config.h test consumption
+
+Bug: https://bugs.gentoo.org/874420
+--- a/lib/ether.h
++++ b/lib/ether.h
+@@ -35,7 +35,7 @@
+ 
+ #include "magic.h"
+ 
+-#if !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET
++#if !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET)
+ 
+ struct
+ ether_addr
+@@ -45,7 +45,7 @@ ether_addr
+ 
+ #define ETHER_ADDR_OCTET ether_addr_octet
+ 
+-#else /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET || HAVE_STRUCT_ETHER_ADDR_OCTET */
++#else /* defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) || defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */
+ 
+ #if HAVE_STRUCT_ETHER_ADDR_OCTET
+ #define ETHER_ADDR_OCTET octet
+@@ -55,7 +55,7 @@ ether_addr
+ #define ETHER_ADDR_OCTET ether_addr_octet
+ #endif /* HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET */
+ 
+-#endif /* !HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET && !HAVE_STRUCT_ETHER_ADDR_OCTET */
++#endif /* !defined(HAVE_STRUCT_ETHER_ADDR_ETHER_ADDR_OCTET) && !defined(HAVE_STRUCT_ETHER_ADDR_OCTET) */
+ 
+ 
+ #if !defined(HAVE_ETHER_HOSTTON)
diff --git a/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch b/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch
new file mode 100644
index 000000000000..6f783e9cfaed
--- /dev/null
+++ b/net-misc/wol/files/wol-0.7.1-Fix-malloc-detection.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/874420
+
+From bcf98fe9a674a3784ad1a4f8eecc3b31a7b209a9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Tue, 25 Oct 2022 14:00:23 +0100
+Subject: [PATCH] Fix malloc detection
+
+--- a/m4/getline.m4
++++ b/m4/getline.m4
+@@ -18,6 +18,7 @@ AC_DEFUN([AM_FUNC_GETLINE],
+ #    include <stdio.h>
+ #    include <sys/types.h>
+ #    include <string.h>
++#    include <stdlib.h>
+     int main ()
+     { /* Based on a test program from Karl Heuer.  */
+       char *line = NULL;
+--- a/m4/malloc.m4
++++ b/m4/malloc.m4
+@@ -14,6 +14,7 @@ AC_DEFUN([jm_FUNC_MALLOC],
+ 
+  AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
+   [AC_TRY_RUN([
++    #include <stdlib.h>
+     char *malloc ();
+     int
+     main ()
+--- a/m4/realloc.m4
++++ b/m4/realloc.m4
+@@ -14,7 +14,8 @@ AC_DEFUN([jm_FUNC_REALLOC],
+ 
+  AC_CACHE_CHECK([for working realloc], jm_cv_func_working_realloc,
+   [AC_TRY_RUN([
+-    char *realloc ();
++    #include <stdlib.h>
++    void *realloc(void *ptr, size_t size);
+     int
+     main ()
+     {
diff --git a/net-misc/wol/wol-0.7.1-r3.ebuild b/net-misc/wol/wol-0.7.1-r3.ebuild
index 4b4ba0165cd9..3bcd9963ecdb 100644
--- a/net-misc/wol/wol-0.7.1-r3.ebuild
+++ b/net-misc/wol/wol-0.7.1-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Implements Wake On LAN (Magic Paket) functionality in a small program"
 HOMEPAGE="http://ahh.sourceforge.net/wol/"
@@ -14,7 +14,18 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="nls"
 
-PATCHES=( "${FILESDIR}/${P}-musl.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-musl.patch"
+	"${FILESDIR}/${P}-Fix-config.h-test-consumption.patch"
+	"${FILESDIR}/${P}-Fix-malloc-detection.patch"
+)
+
+src_prepare() {
+	default
+
+	# bug #874420
+	eautoreconf
+}
 
 src_configure() {
 	local myeconfargs=(