gentoo resync : 10.02.2020

3 files changed, 14 insertions, 79 deletions

diff --git a/net-misc/uftp/files/uftp-3.7_makefile.patch b/net-misc/uftp/files/uftp-3.7_makefile.patch
deleted file mode 100644
index 81afe8b9baae..000000000000
--- a/net-misc/uftp/files/uftp-3.7_makefile.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -Nuar uftp-3.7.orig//makefile uftp-3.7/makefile
---- uftp-3.7.orig//makefile	2012-08-10 17:00:22.566403478 +0600
-+++ uftp-3.7/makefile	2012-08-10 17:04:47.523386683 +0600
-@@ -39,25 +39,26 @@
- endif
- 
- # defaults
--CC = gcc
--OPTIONS=-g -Wall $(ENC_OPTS)
-+CC ?= gcc
-+OPTIONS=$(ENC_OPTS)
- LDLIBS=-lc -lm $(CRYPT_LIB)
--CFLAGS=
-+CFLAGS?=
-+LDFLAGS?=
- 
- # FreeBSD
- ifeq ("FreeBSD", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- endif
- 
- # OSX, aka Darwin
- ifeq ("Darwin", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- endif
- 
- # Sun
- ifeq ("SunOS", "$(UNAME_S)")
--CC = cc
--OPTIONS=-g -DBSD_COMP $(ENC_OPTS)
-+CC ?= cc
-+OPTIONS=-DBSD_COMP $(ENC_OPTS)
- LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
- CFLAGS=`getconf LFS_CFLAGS`
- OPENSSL=/usr/sfw
-@@ -65,9 +66,9 @@
- 
- # Linux
- ifeq ("Linux", "$(UNAME_S)")
--OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
-+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
- LDLIBS=-lm $(CRYPT_LIB)
--CFLAGS=`getconf LFS_CFLAGS`
-+CFLAGS?=`getconf LFS_CFLAGS`
- endif
- 
- ifdef OPENSSL
-@@ -82,7 +83,7 @@
- testclient_multi.o: testclient_multi.c uftp.h uftp_common.h encryption.h
- 
- testclient_multi: testclient_multi.o encrypt_openssl.o uftp_common.o
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- clean:
- 	rm -f testclient_multi uftp uftpd uftpproxyd uftp_keymgt *.o
-@@ -176,16 +177,16 @@
- endif
- 
- uftp: $(UFTP_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftpd: $(UFTPD_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftpproxyd: $(UFTPPROXYD_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- uftp_keymgt: $(UFTP_KEYMGT_OBJS)
--	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
-+	$(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
- 
- %.o: %.c
- 	$(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) -c $<
diff --git a/net-misc/uftp/files/uftp-4.10.1_gcc10.patch b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch
new file mode 100644
index 000000000000..d25de61465dc
--- /dev/null
+++ b/net-misc/uftp/files/uftp-4.10.1_gcc10.patch
@@ -0,0 +1,14 @@
+diff -Nuar uftp-4.10.1.orig/proxy.h uftp-4.10.1/proxy.h
+--- uftp-4.10.1.orig/proxy.h	2020-02-06 17:30:34.904020513 +0300
++++ uftp-4.10.1/proxy.h	2020-02-06 17:30:49.214021144 +0300
+@@ -167,8 +167,8 @@
+ extern int proxy_type, debug, rcvbuf, dscp, keyfile_count, keyinfo_count;
+ extern int hb_interval, priority;
+ extern unsigned int ttl;
+-char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN];
+-int port, out_port;
++extern char portname[PORTNAME_LEN], out_portname[PORTNAME_LEN];
++extern int port, out_port;
+ extern union sockaddr_u down_addr;
+ extern int have_down_fingerprint;
+ extern uint8_t down_fingerprint[HMAC_LEN];
diff --git a/net-misc/uftp/files/uftp-4.9.4_makefile.patch b/net-misc/uftp/files/uftp-4.10.1_makefile.patch
index 5a131c350a56..5a131c350a56 100644
--- a/net-misc/uftp/files/uftp-4.9.4_makefile.patch
+++ b/net-misc/uftp/files/uftp-4.10.1_makefile.patch