gentoo resync : 08.01.2021

4 files changed, 74 insertions, 12 deletions

diff --git a/net-misc/aget/Manifest b/net-misc/aget/Manifest
index 06c866b155d4..d7728be715ae 100644
--- a/net-misc/aget/Manifest
+++ b/net-misc/aget/Manifest
@@ -1,4 +1,5 @@
-AUX aget-0.4.1-r1.patch 2423 BLAKE2B 26c1af35a30931d4c67323a636f4326426efe114cd62ef8ba344c59cc72a1581247483f9f80c3b6ea3d17695f752216d25ebd2983c19585c3e78a27b8f8b7cb2 SHA512 b4c1765634f6f14c19e992fa090b7ed1ec11a5d62fe874602f18466d3ced9c0a2ec255fdb8dcb732f0fbd9be9831fe080509992c86fa7b8f11f40366a523ae28
+AUX aget-0.4.1-fno-common.patch 1190 BLAKE2B c7482ccdb919bf16433bf1e22850931455d323cb0c50a5b684c93ed77e26fb1d81f048a64519c2c21e4be41cd3637cfb0603c86c2075c7d1c6e9dbb2a5824387 SHA512 0473951d51448811f1a34fecf4542251d2c02c57c5000a96aca2bde2cfbc16647d6075909a1941a4a6a28550eb288958a92d1a14a0959511b60065eae18efa1b
+AUX aget-0.4.1-overflow.patch 2351 BLAKE2B 549acde7d70ba5d45daf9712eba839c627f8c692be7f5821c2c677db3bec88dc939e0059f1423fc26bd7475536eac3ee2e65e0a6d12d5011fdb57ca4e21fdc6a SHA512 b578553bebf948a606f12e72a2a0b512bb540c14bce030825daa92ecb7af691a504b4f5f1bd1a1e930b2a332b6a15774f8ae0204e46a20b8c6712158c88de5c5
 DIST aget-0.4.1.tar.gz 12783 BLAKE2B e1716f85fe426a8b5c049d54a0c63ae2ec050ceafe8b7f67a36be23a2750782a96939e82ab53485fd646c078cdc5c64445340d0557b9a5656fdd4378aecc29a8 SHA512 23fd4a7786b905bb10fb8de62dea294e014e0c2ad276614c642ebd3865b262eb88e08308df9a68f418de19a984ad138561d82c67e0226dfb5f56520e8ed15ad7
-EBUILD aget-0.4.1-r2.ebuild 582 BLAKE2B d1f522198c0949e4346b97135e4ffecf8117933929859707649a771bcf6a4a2ff9d987cc9ab939a665c393a6ba2b65eeba00c241941176a037563edadfde75f2 SHA512 1f6f40bbdfae1eafdbb06de955bfdef4031c78457b06c6ee5c553b7792e9794b00efc350f20122dac1714afbf7f6c97a85a2dd068a03bbc3ea8bc31612551827
+EBUILD aget-0.4.1-r2.ebuild 516 BLAKE2B bc003db536e15c751667f22c5ea854939d6af5927b574aa6b79f92e4e89a1ee2d316a116e7b644d37b094e65abe76e4cddde2968b138200436f265079b50f2a1 SHA512 98bcda8a751897d85cded8191efba96028db0d249a476f9eda9c8e3a622cea6b413f22fed0a0fd03657c77ab2bfb8d00fa6f15144232d2775e6c2b133b0d2f3c
 MISC metadata.xml 686 BLAKE2B 214778867fe490fb2b87a3785cfc71d51de5d8d0228c80c5d3e544fd120a545b042ac0e2e25c981d67f68243beb766f0fbf1a3c40a74e214c7cc22a2151482ad SHA512 5dc261567f8a6d575f9622995bda903d2d10279473aaaca4c9e4df2a2a58074a2dd7b8239437a6fb0532cbb2af3a0cd6450659aaa76446ff7df1604e6761ca32
diff --git a/net-misc/aget/aget-0.4.1-r2.ebuild b/net-misc/aget/aget-0.4.1-r2.ebuild
index ed4438eb35fd..98c7c8837fa9 100644
--- a/net-misc/aget/aget-0.4.1-r2.ebuild
+++ b/net-misc/aget/aget-0.4.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,17 +12,12 @@ SRC_URI="http://www.enderunix.org/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
 
 PATCHES=(
-	"${FILESDIR}"/aget-0.4.1-r1.patch
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_compile() {
 	emake CC="$(tc-getCC)"
 }
-
-src_install() {
-	emake DESTDIR="${ED}" install
-	dodoc AUTHORS ChangeLog README* THANKS TODO
-}
diff --git a/net-misc/aget/files/aget-0.4.1-fno-common.patch b/net-misc/aget/files/aget-0.4.1-fno-common.patch
new file mode 100644
index 000000000000..e881cc39b88b
--- /dev/null
+++ b/net-misc/aget/files/aget-0.4.1-fno-common.patch
@@ -0,0 +1,66 @@
+--- a/Aget.c
++++ b/Aget.c
+@@ -33,6 +33,8 @@ extern pthread_t hthread;
+ #include <errno.h>
+ extern int errno;
+ 
++extern time_t  t_start, t_finish;
++
+ 
+ void get(struct request *req)
+ {
+--- a/Head.c
++++ b/Head.c
+@@ -34,6 +34,8 @@
+ extern int errno;
+ extern int h_errno;
+ 
++time_t  t_start, t_finish;
++
+ #ifdef SOLARIS
+ extern const char *hstrerror(int);
+ #endif
+--- a/Misc.h
++++ b/Misc.h
+@@ -24,7 +24,7 @@ void Log(char *, ...);				/* Log 						*/
+ void updateProgressBar(float, float);
+ void handleHttpRetcode(char *);
+ 
+-time_t  t_start, t_finish;
++extern time_t  t_start, t_finish;
+ 
+ #endif
+ 
+--- a/Signal.c
++++ b/Signal.c
+@@ -16,6 +16,8 @@ extern struct request *req;
+ extern int bwritten;
+ extern pthread_mutex_t bwritten_mutex;
+ 
++sigset_t signal_set;
++
+ void * signal_waiter(void *arg)
+ {
+ 	int signal;
+--- a/Signal.h
++++ b/Signal.h
+@@ -4,7 +4,7 @@
+ #include <signal.h>
+ #include <pthread.h>
+ 
+-sigset_t signal_set;
++extern sigset_t signal_set;
+ 
+ void * signal_waiter(void *arg);
+ void sigint_handler(void);
+--- a/main.c
++++ b/main.c
+@@ -15,6 +15,8 @@
+ #include "main.h"
+ #include <errno.h>
+ 
++extern sigset_t signal_set;
++
+ int main(int argc, char **argv)
+ {
+ 	extern char *optarg;
diff --git a/net-misc/aget/files/aget-0.4.1-r1.patch b/net-misc/aget/files/aget-0.4.1-overflow.patch
index fe804901528c..998dc128e3dd 100644
--- a/net-misc/aget/files/aget-0.4.1-r1.patch
+++ b/net-misc/aget/files/aget-0.4.1-overflow.patch
@@ -37,8 +37,8 @@ than setting GETRECVSIZ bytes to the value of 0. By Kevin Pyle.
  		dr = recv(sd, rbuf, GETRECVSIZ, 0);
  		if ((td->offset + dr) > foffset)
  			dw = pwrite(td->fd, rbuf, foffset - td->offset, td->offset);
---- aget-0.4.1/Head.c	2010-09-20 03:41:27.236019179 +0200
-+++ aget-0.4.1/Head.c	2010-09-20 03:43:00.087098655 +0200
+--- aget-0.4.1/Head.c
++++ aget-0.4.1/Head.c
 @@ -1,5 +1,4 @@
  #ifndef SOLARIS
 -#define _XOPEN_SOURCE 500