[gentoo-commits] repo/gentoo:master commit in: sys-apps/restartd/, sys-apps/restartd/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/restartd/, sys-apps/restartd/files/

[David Seifert]

commit:     fd6ae80cf2f1191ee1504798257fe8efe26e7e9c
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Nov 26 10:32:42 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 10:32:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd6ae80c

sys-apps/restartd: fix build with gcc-10

Closes: https://bugs.gentoo.org/707678
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../restartd/files/restartd-0.2.2-fno-common.patch | 66 ++++++++++++++++++++++
 sys-apps/restartd/restartd-0.2.2-r1.ebuild         |  5 +-
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch b/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch
new file mode 100644
index 00000000000..c0b0ad5ff8b
--- /dev/null
+++ b/sys-apps/restartd/files/restartd-0.2.2-fno-common.patch
@@ -0,0 +1,66 @@
+--- a/config.c
++++ b/config.c
+@@ -22,6 +22,14 @@
+ #include <syslog.h>
+ #include "config.h"
+ 
++int debug;
++int config_process_number;
++int check_interval;
++int foreground;
++char *config_file;
++struct config_process_type *config_process;
++struct config_process_type config_process_type;
++
+ int
+ read_config (void)
+ {
+--- a/config.h
++++ b/config.h
+@@ -34,12 +34,12 @@
+ #define DEFAULT_CONFIG "/etc/restartd.conf"
+ #define VERSION "0.2.1"
+ 
+-int debug;			// Debug
+-int config_process_number;
+-int check_interval;
+-int foreground;
+-struct config_process_type *config_process;
+-char *config_file;
++extern int debug;			// Debug
++extern int config_process_number;
++extern int check_interval;
++extern int foreground;
++extern struct config_process_type *config_process;
++extern char *config_file;
+ 
+ typedef struct config_process_type
+ {
+@@ -51,7 +51,9 @@ typedef struct config_process_type
+   char processes[256];
+   char status[32];
+ 
+-} config_process_type;
++};
++
++extern struct config_process_type config_process_type;
+ 
+ int read_config ( /* char *config_file */ );
+ 
+--- a/main.c
++++ b/main.c
+@@ -35,6 +35,14 @@
+ 
+ #include "config.h"
+ 
++extern int debug;
++extern int config_process_number;
++extern int check_interval;
++extern int foreground;
++extern char *config_file;
++extern struct config_process_type *config_process;
++extern struct config_process_type config_process_type;
++
+ // SIGTERM & SIGHUP handler
+ void
+ got_signal (int sig)

diff --git a/sys-apps/restartd/restartd-0.2.2-r1.ebuild b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
index dadb97c5f33..6f78d10eb3a 100644
--- a/sys-apps/restartd/restartd-0.2.2-r1.ebuild
+++ b/sys-apps/restartd/restartd-0.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,8 @@ SRC_URI="mirror://debian/pool/main/r/restartd/${PN}_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 src_prepare() {
 	default