gentoo resync : 30.05.2020

3 files changed, 46 insertions, 2 deletions

diff --git a/net-dialup/dwun/Manifest b/net-dialup/dwun/Manifest
index 98479f774577..d191c2f73cd8 100644
--- a/net-dialup/dwun/Manifest
+++ b/net-dialup/dwun/Manifest
@@ -1,4 +1,5 @@
 AUX dwun 432 BLAKE2B a9a5fbfb9d4aea40c157dec74347b3611d35989ded3e1bff5541fd0890f237b8b836631d79859defc8c075201d0de4708f58d1c16abc5cfc43070121863606be SHA512 daef582f4ecac47ddc826976eb1d1b97f06664c584b9501dd72068749a8724ac06a3780bb0fee2c84307db4d343b05b1a8663d05fb56a9a52a31c28939208d2c
+AUX dwun-0.96e-fno-common.patch 855 BLAKE2B 5945fc76cba0338d33edb17d33ffc53eac8e1f02a7323f105212a4fed23af524c1163eb88419715b09576a19c0ad67411d16e63e7048a9a0f91861519b00b9f6 SHA512 959a9561ed2134c3e08a6b0bb17a4d0107c2e246af517de26bfb480c035da2c45ea04d38aaf4e00c0132ffcdb8d17d538d51862e2854ca0bd28b33d8a383019b
 DIST dwun-0.96e.tar.gz 147960 BLAKE2B 2f1a414d629ff7d0c4f35c37b803819f141385225f151b8d6cb2ef0ad53aaa22067d974f085c5d239bb42c0faa1e8330a7ca1dba83a6c78cd24f802d78223663 SHA512 6763acd60192f18ffd81edd4f4e18ccfb8c5ac3882db96f9b7d2d032e9a0c61cb843094222744525a9927981c8cc7a603fd0aa1e1d4309d3f7fab21fec028115
-EBUILD dwun-0.96e-r4.ebuild 1024 BLAKE2B 0519574caf3d9c40ea30dcbcccbbac2aeaa02e4d9a63697047d0486c80415046445904b7d5def4b59fb3589815cc2e0b25f8a89c987ae6ab6e1ca30c6f257a73 SHA512 b6f1e05a74b4ec0b0cf53984af06cef4df5082125f9954c99ec6a23ebc236c765f33fa35bfb1e2955520cd5f5a3a678b53b7f2dbfefd6b48f15f637ff63c0daf
+EBUILD dwun-0.96e-r4.ebuild 1066 BLAKE2B 4a6962bf349fea67a11334c5755ca85f0bfc52948372ac7b51f02b36978a4ca4930c6e3a5974f3bd3cbfd12b031a7a0543181909651fb88d665d9a83e5609905 SHA512 d69045a5ad09736f7a2c435127d817b07b81e34337db12706587d320d4c5c7eae3f96cff929b63c9ab276ad3e75f83d39742fa94d8154223f92f4d4d8567ebe4
 MISC metadata.xml 241 BLAKE2B f87bb00f970786f5f1c20c61b14ae1cda9690ed4e9c3ec97938302d869c5b26a779c5bad9553f79f82d7e4584ef265d5b31147c98bc3373d0b6448d8289e4b8c SHA512 039438d314afaa5fef1f7aa3e11d5094c8fc797b0265171a55fe253c799ac95a30203284161da398554f5c73c434fd81c59b154c2d6971d2a65e752b72212f16
diff --git a/net-dialup/dwun/dwun-0.96e-r4.ebuild b/net-dialup/dwun/dwun-0.96e-r4.ebuild
index fbc86601b416..aa99a75ba5ee 100644
--- a/net-dialup/dwun/dwun-0.96e-r4.ebuild
+++ b/net-dialup/dwun/dwun-0.96e-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,8 @@ KEYWORDS="~amd64 x86"
 DOCS=( AUTHORS ChangeLog QUICKSTART README TODO UPGRADING )
 
 src_prepare() {
+	eapply "${FILESDIR}"/${P}-fno-common.patch
+
 	sed -i -e "s:TODO QUICKSTART README UPGRADING ChangeLog COPYING AUTHORS::" Makefile.in || die
 	tc-export CC
 
diff --git a/net-dialup/dwun/files/dwun-0.96e-fno-common.patch b/net-dialup/dwun/files/dwun-0.96e-fno-common.patch
new file mode 100644
index 000000000000..c84c027e42d5
--- /dev/null
+++ b/net-dialup/dwun/files/dwun-0.96e-fno-common.patch
@@ -0,0 +1,41 @@
+--- a/src/main.c
++++ b/src/main.c
+@@ -37,11 +37,11 @@
+ /* extern'ed in main.h */
+ struct settings set;
+ char *error_messages;
++enum MYLOG_OPTIONS MYLOG_OPTIONS = MYLOG_STDERR;
+ 
+ int main(int argc, char *argv[]) 
+ {
+ 	char orig_work_dir[MAXPATHLEN];
+-	MYLOG_OPTIONS = MYLOG_STDERR;
+ 	umask(022); /* -rw-r--r- */
+ 
+ 	if (!(error_messages = xmalloc(MAX_LOG_LENGTH)))
+--- a/src/shared.h
++++ b/src/shared.h
+@@ -56,10 +56,11 @@
+ 	char *external;			/* named pipe (optional) */
+ };
+ 
+-enum {
++enum MYLOG_OPTIONS {
+ 	MYLOG_STDERR,
+ 	MYLOG_STDERR_DATEPID,
+ 	MYLOG_SYSLOG
+-} MYLOG_OPTIONS;
++};
++extern enum MYLOG_OPTIONS MYLOG_OPTIONS;
+ 
+ #endif
+--- a/src/util.c
++++ b/src/util.c
+@@ -26,6 +26,7 @@
+ #include "util.h"
+ #include "child.h"
+ #include "main.h"
++#include "shared.h"
+ 
+ static bool create_file(char *file, int options);
+ static void print_date_pid(void);