gentoo Easter resync : 12.04.2020

4 files changed, 67 insertions, 3 deletions

diff --git a/net-ftp/frox/Manifest b/net-ftp/frox/Manifest
index 8363d4921361..7f93b8cfcf99 100644
--- a/net-ftp/frox/Manifest
+++ b/net-ftp/frox/Manifest
@@ -1,8 +1,9 @@
 AUX 0.7.18-netfilter-includes.patch 552 BLAKE2B 32f7e081f64a76ca4a62d6dc13e8d9ff458048e6932b664c31f6685c7700f77ae27a433e8045136a4cd11b177a9a683f7e84c62760126d261ec2f8374f24dac7 SHA512 3dbed66a3602736f881ca993b416731112bcdd9885f9b9f8d05f573e748dcbd43d118f3b97d4689ad17695e52d6c7e94e2e72e04921f19ec4af181f16e9361aa
 AUX 0.7.18-respect-CFLAGS.patch 332 BLAKE2B 14e47c8f0362bb69293163f9f1964cfbf494fe947e25698cd0f45164927a078c982a491bad302e0d4c2e3a521209f25cdb92437b1d9f2eaa2e8b829920da0952 SHA512 88c6efab38aaf9cf58e77d4c6f677f66920f9a48fcd964ac4e02a471a805b41ad85949bc7134eff715254235be77b8056f03d031dcf310fd883c37eb820942b3
 AUX frox-0.7.18-config.patch 1960 BLAKE2B a6ca1b8bd15f39a3dc5b3b10cb4a578447ce306f9f82262e99ead6a57bceb007da44172648e66fde609e4c71c839625b4ca28b35d8fd8750d8b9b0334f0a7b82 SHA512 69210560adaa38cc94960f4e76ba4ae9f20b5044c0d3d84e835a107554ae3f5315f9463c7730ada716c63615cab782d140e8df8c2b9f9bcf6e844a7bd7033666
+AUX frox-0.7.18-no-common.patch 1644 BLAKE2B a84e686a1bffa8d8adb92bbc030b1fa61df6dd978f84490f48e102e9fcc3efbd77b3cbf09071ca7c1dcf15bb20cd149c576680d7705beb4c8814bc15e8afbc44 SHA512 99c2157206f1cf14bb5bef5b2fef656c4322077363d531c2798091d871e1931a81df8dd5a21f9b57ecba22c5379ad72ddf36c10d78e9efcdfee7e1e29fbf6108
 AUX frox.initd 873 BLAKE2B 1f4182a11bd42d091b9d6cbba4b2115327766787f329c6c113e43070f8fc6a8867017bdf009a2c97a94b16e958888384dc604dfc06ecf5df0cc711f212b11d76 SHA512 26bc18f28cf46184b0c387196958f9236ec0cd70fe43ac8b18de66e69c42d73087ed5063f3ecc1b1d5c0880b2047293403e4cfbb15f5a23ca5d6fc521021f364
 DIST frox-0.7.18.tar.bz2 173355 BLAKE2B 70e51ef14fd16dfeb8c2b8c42acf32b4fc8456622f6258aca7faee49e59ccd4e3cb563620a50a4cb877401d9154311dd2f88e76a94c48974bf9b77ad558a6d9f SHA512 bdffe4b70c91b920378a422dcf386088c3bb34f26e10de8ff57f487ccef6356803c93057eee2b3801a79120a6b2e1618a51dde5bc8c42e13211abf4182c4ff8c
 EBUILD frox-0.7.18-r5.ebuild 1863 BLAKE2B 48fba76ac94415e82046d0486d9afe2c4b84a6e2e1694b7a30b9bda22ee70a373fa1a055fa5ac8865d0a344a85e8b9dcc7fa3dc892e8ac96239476dc843be63f SHA512 3490ec5fd9d7e25825b8d69ee23113dc565b2d7925b335441ce0b2b54051ce7d1d75e148a23f7471d90dec0d85af0ed8e78233c141f067183e28d5418f1acf98
-EBUILD frox-0.7.18-r6.ebuild 1972 BLAKE2B 003ece373a12d8e295d874b1d042455d5878c5c2d240351c22e27db03c06086c75e75eef21423e1328a265e0d17d01b7cb9078c42a2865ad2abb72179966e4fc SHA512 883072a3b61878ee675f4c0093ae0358b948c99e0f4814c2d545cb44ce62fccd63c0dcc6ecb99705a96946d00cecba3d476633a4ade6dc7b2e72cae8b846b612
-MISC metadata.xml 656 BLAKE2B 0df7615c3cc7c5abf83bd69242e2ef175436f184858a7c7501f9328ff29a0c131622142ff89764069de5c3a90299b46b9192b8152bad3f00578722349cb0ce07 SHA512 c4e9a07f7e868c032e8830b70d3ccc876a54d685790e74aac5ea5554710af473004a176ffb9501e87fa6b32010464e274a111f34f318e12be97f86a96df58f3a
+EBUILD frox-0.7.18-r6.ebuild 2015 BLAKE2B 0aee6ae2281032f87a418a3447a9ce53365d7c77d92d632f7283afba8f77bc2a9a25f72bdc115b2a9d7d63b02bec467b828ca9ff9002184dec8c50c32c6c1a70 SHA512 6651750ae788cbf944eab85a543567de946144067be94ae671f1f232e9cfef03f8d65643b68c07eb99b3f4b5dd5b636ab431623c8ce493d352ec79375baa0cc4
+MISC metadata.xml 593 BLAKE2B 65aeb3bac2df8a84512c91c24632a9d4b744344c95afe91c1631d442bcef11d19f922eb61ad85052ec14e9908bbbbe43f57a20a89a4fa39e3b8591734fc09bd6 SHA512 eb6aa83ad2cafe20d5348ff946f4f8d9c8b24dea6c0cd43de4ca9cfb27cd134e595874f09576a156b0936add5dab9b3924bbee40605095da899f28ced299943f
diff --git a/net-ftp/frox/files/frox-0.7.18-no-common.patch b/net-ftp/frox/files/frox-0.7.18-no-common.patch
new file mode 100644
index 000000000000..ef2e72898aca
--- /dev/null
+++ b/net-ftp/frox/files/frox-0.7.18-no-common.patch
@@ -0,0 +1,63 @@
+Fix compilation with -fno-common (default for GCC 10)
+
+Signed-off-by: Marek Behún kabel@blackhole.sk>
+---
+diff --git a/lib/sstrlib/sstr_private.h b/lib/sstrlib/sstr_private.h
+--- a/lib/sstrlib/sstr_private.h
++++ b/lib/sstrlib/sstr_private.h
+@@ -32,6 +32,6 @@ struct _sstr {
+ };
+ 
+ int sstr_alloc_space(sstr * p, int len);
+-void (*on_error) (void);
++extern void (*on_error) (void);
+ 
+ #endif /*SSTR_PRIVATE_H */
+diff --git a/src/common.h b/src/common.h
+--- a/src/common.h
++++ b/src/common.h
+@@ -184,7 +184,7 @@ typedef struct _session_info {
+ /*******************
+ **Global Variables**
+ ********************/
+-session_info *info;
++extern session_info *info;
+ extern pid_t cmgrpid, tdatapid;
+ 
+ #endif /* COMMON_H */
+diff --git a/src/ftp-cmds.c b/src/ftp-cmds.c
+--- a/src/ftp-cmds.c
++++ b/src/ftp-cmds.c
+@@ -38,6 +38,8 @@ void xfer_command(sstr * cmd, sstr * arg
+ void cwd_command(sstr * cmd, sstr * arg);
+ void pasv_reply(sstr * msg);
+ 
++struct cmd_struct *ftp_cmds;
++
+ void ftpcmds_init()
+ {
+ 	static struct cmd_struct list[] = {	/*Pinched in part SUSE */
+diff --git a/src/ftp-cmds.h b/src/ftp-cmds.h
+--- a/src/ftp-cmds.h
++++ b/src/ftp-cmds.h
+@@ -33,7 +33,7 @@ struct cmd_struct {
+ 	void (*cmd) (sstr * cmd, sstr * arg);
+ };
+ 
+-struct cmd_struct *ftp_cmds;
++extern struct cmd_struct *ftp_cmds;
+ void user_munge(sstr * cmd, sstr * arg);
+ 
+ 
+diff --git a/src/main.c b/src/main.c
+--- a/src/main.c
++++ b/src/main.c
+@@ -62,6 +62,8 @@ static struct client_info {
+ void add_client(pid_t, struct sockaddr_in client);
+ void rm_client(pid_t pid);
+ 
++session_info *info;
++
+ #ifdef ENABLE_CHANGEPROC
+ int main(int argc, char *argv[], char *envp[])
+ #else
diff --git a/net-ftp/frox/frox-0.7.18-r6.ebuild b/net-ftp/frox/frox-0.7.18-r6.ebuild
index 943286654f7b..0f3521729e32 100644
--- a/net-ftp/frox/frox-0.7.18-r6.ebuild
+++ b/net-ftp/frox/frox-0.7.18-r6.ebuild
@@ -45,6 +45,7 @@ src_prepare() {
 	eapply "${FILESDIR}/${PV}-respect-CFLAGS.patch"
 	eapply "${FILESDIR}/${PV}-netfilter-includes.patch"
 	eapply "${FILESDIR}/${P}-config.patch"
+	eapply "${FILESDIR}/${P}-no-common.patch"
 
 	if use clamav ; then
 		sed -i -e "s:^# VirusScanner.*:# VirusScanner '\"/usr/bin/clamscan\" \"%s\"':" \
diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml
index 62cb681b803e..748515899f6e 100644
--- a/net-ftp/frox/metadata.xml
+++ b/net-ftp/frox/metadata.xml
@@ -12,7 +12,6 @@
     <use>
         <flag name="transparent">Enable transparent proxying of data connections</flag>
     </use>
-    <longdescription>A transparent ftp proxy</longdescription>
     <upstream>
         <remote-id type="sourceforge">frox</remote-id>
     </upstream>