gentoo resync : 25.11.2020

5 files changed, 30 insertions, 11 deletions

diff --git a/net-misc/wput/files/wput-0.6-gentoo.diff b/net-misc/wput/files/wput-0.6-gentoo.diff
index 312172348d02..7ddf0ba3ba19 100644
--- a/net-misc/wput/files/wput-0.6-gentoo.diff
+++ b/net-misc/wput/files/wput-0.6-gentoo.diff
@@ -1,6 +1,5 @@
-diff -urN wput/Makefile.in wput/Makefile.in
---- wput/Makefile.in	2006-04-04 18:16:52.000000000 +0100
-+++ wput/Makefile.in	2006-11-07 17:31:10.000000000 +0000
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -15,8 +15,12 @@
  
  install: all
diff --git a/net-misc/wput/files/wput-0.6-respectldflags.patch b/net-misc/wput/files/wput-0.6-respectldflags.patch
index d2b460b339b3..9f0e09c4a78d 100644
--- a/net-misc/wput/files/wput-0.6-respectldflags.patch
+++ b/net-misc/wput/files/wput-0.6-respectldflags.patch
@@ -1,6 +1,4 @@
-Index: wput/src/Makefile.in
-===================================================================
---- wput.orig/src/Makefile.in
+--- wput/src/Makefile.in
 +++ wput/src/Makefile.in
 @@ -23,7 +23,7 @@ ftplib.o: socketlib.h ftplib.h
  ftp-ls.o: ftp.h wget.h url.h
diff --git a/net-misc/wput/files/wput-0.6.2-fno-common.patch b/net-misc/wput/files/wput-0.6.2-fno-common.patch
new file mode 100644
index 000000000000..f188141aa87b
--- /dev/null
+++ b/net-misc/wput/files/wput-0.6.2-fno-common.patch
@@ -0,0 +1,25 @@
+https://sources.debian.org/patches/wput/0.6.2+git20130413-9/single-declaration.patch/
+https://bugs.gentoo.org/706954
+--- a/src/wput.h
++++ b/src/wput.h
+@@ -140,7 +140,9 @@
+ 
+   unsigned short int retry_interval;
+   unsigned       int speed_limit;
+-} opt;
++};
++
++extern struct global_options opt;
+ 
+ extern _fsession * fsession_queue_entry_point;
+ extern char * email_address;
+--- a/src/wput.c
++++ b/src/wput.c
+@@ -55,6 +55,7 @@
+ #include "utils.h"
+ 
+ extern char *optarg;
++struct global_options opt;
+ 
+ #ifdef WIN32
+ const static char * version = "0.6.2-w32";
diff --git a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
index f0cbfcdebd69..9cece1f388f8 100644
--- a/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
+++ b/net-misc/wput/files/wput-0.6.2-respect-destdir.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 6756cd2..6debea8 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -16,12 +16,12 @@ win-clean:
diff --git a/net-misc/wput/files/wput-fix-crash.patch b/net-misc/wput/files/wput-fix-crash.patch
index 2afab8e59913..3d0efc9fd37f 100644
--- a/net-misc/wput/files/wput-fix-crash.patch
+++ b/net-misc/wput/files/wput-fix-crash.patch
@@ -1,6 +1,5 @@
-diff -ur wput-0.6.2+git20130413.orig/src/progress.c wput-0.6.2+git20130413/src/progress.c
---- wput-0.6.2+git20130413.orig/src/progress.c	2013-07-15 00:05:50.000000000 +0200
-+++ wput-0.6.2+git20130413/src/progress.c	2016-10-25 16:48:05.909105000 +0200
+--- a/src/progress.c
++++ b/src/progress.c
 @@ -181,7 +181,7 @@
    static char output[15];
    time_t secs = time (NULL);