gentoo resync : 16.01.2018

4 files changed, 69 insertions, 20 deletions

diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index 6ac616928b4c..eefb7874ff04 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -1,11 +1,12 @@
 AUX logrotate 166 BLAKE2B a3da56439bae88709b8cea7d1631d6848ea9e63870a9e9ad2853889d3b9b16d11d09bbfa99a41e24b2ecb5e1134875190b99aa7056192fd16d7696560bbfb83f SHA512 77c7b0e17123432f39d43048d7c51b88b20cb5ef297d36e2be50f8816f956dda6ca300fa3053756ac9f9480699cec9c28fb5ad77e81eeac667ace55dbc61e88f
 AUX uftp-3.7_makefile.patch 2037 BLAKE2B a1bd4751b74c6d1b3edfa914575235a8ad135dd18e70ee31bd83bc8aa475d7f447ba0254ae7a094c7326f09e580fb4693d33ce16afeb839a3a5e27d26bd30fa8 SHA512 1fc5109626a8a46bd9bd05348cbfc957a524827c5f165f1f991f7887319f735ae90dab6bad91a96d7c6bae7e2c07e26ebcbd91b9a595b97d8b1b6d79e496e899
+AUX uftp-4.9.4_makefile.patch 1502 BLAKE2B fc5b2b07f250b16bed1386c31850dcab1fd854c8db2232190559855fb45c0608b35e4e5accd3c93cce198c792b36f31f5705b068371a94780cb841772c61846f SHA512 41a2c9f6f572eacb2c503f578ab3c4baf6c9e1ffb92b7831da2e122e1b99c2fed2e82811ec0fb2f98cee684b395981cd83ae2f50dacfc7234210c91c6d3ce87e
 AUX uftpd.conf 169 BLAKE2B 13e8d47f9a2b79f7e6c81d3a4aed80bbffa2c3195981b67eafce3801faf50b5ea2570de36634dd3e36b526f721e14259ba7b79a95f35c8e98d85fe6b95b9525f SHA512 732a3e7f5eb1eec609f05d6c075ea11b16bdd9abcdc9528dacf7fbc148e2249306226fd5975b39956758d0b237b0d59b97e7c602451639fe7db19c43ae4f39f9
 AUX uftpd.init 518 BLAKE2B b4a98852340d03a5bb8673faff02f7f18a5a27b87d22aebaf19753d836250c7d4519598049d41b9cf81832c18cc7a1726664bf647cceb92b2457a811df54ea8a SHA512 4008611d6a8f7e4c960269526761b9c5b2b7446bf1795983a62fb5fc12b4525ecd2e0e42ff2fb7d937e427d9d77834a2b6836db1242269fad7b09f92952c53b8
 AUX uftpproxyd.conf 121 BLAKE2B 82664d638b8a4041a5c18676e46509c3ed20525b7178ada1fa902f41f57a78c5e465b22701bd369e26ea65ebf4fe5834f7b23f4fcebd6d87850ed8fd93e58f40 SHA512 c61441d048ce99a50b5224cea7c4f9f1a2532fff8083a9a71e6099a98cba1fe79b43825188034efd402b47ac28bbe341827cb21872c17550419db36a8da7bb35
 AUX uftpproxyd.init 522 BLAKE2B a7a4df565d5dfa2761068adfa3dc440030269cc0d809c892807a2582df36882b2cc489de608ed0baa85f6714d15e7a3ec3f00895324fe1f6a521c3ca8ffd9ccb SHA512 2d69f0b84750cb62fb96b7fc7a042fe54b6f658074f9c4c49a2bf4957507fce333862ae95fd0498e60240490ce44cd299b8fba851d4d7c9a67dcdf1e7f29d7f5
 DIST uftp-3.7.1.tar 849920 BLAKE2B 32a2ccca01f4b8ee205301a2bb4ac30da4f17bf0d8a24f885ec40a430b2cc478efcd504ba118ef7f55c43ef53a6fb3e6caa2e2cebda93c254ab289a8683488a6 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15
-DIST uftp-3.7.tar 849920 BLAKE2B fac05a89ed0a8e2904e810595c0f43e8b7e9402446499dabaa9567cb5f058e5d6c71e6f4521664a8c38a4d556f6dcedaad9643d5147ecd646c01f874cbf40b02 SHA512 8e154ea196b34995bc3831c375237a4d98f0627ca79fb6714b66763f64748810e5151efdc40773044a127a0e875ffcc8b985e6f7babd359ae38280a219c4d610
-EBUILD uftp-3.7.1.ebuild 1079 BLAKE2B 56b5290daa949a982974eca806e31ce1a6918c0e6b8bf91bb9274cf9ddd8be8cfb41fcef26a8ff4c3c53c64f296768bbe52a36ca79601e3781b8a14b7cc75f74 SHA512 29499af4e9c9747f56686fd9f39cd79f4af9dccb19560b1470a431a3a6ba1943e60eebc9a6eef760e0e82448474fc0e9e6da757503b4090e8ef3e623a0634ee9
-EBUILD uftp-3.7.ebuild 1074 BLAKE2B ae6e5199a83cb71dc3ae4904f8c47ef47aa7bb8258b36255509bf5aafa8d427888331dd0d7675f76f9e5066fe0ebd211c775e590decdb727809e25f29a513c1d SHA512 abe662c5b454aa24d3b001b5fe1b5ac905573a03bd00a75607bbdacd31f98c83da7beb4b5b3b4965982b756c9cffdc4e9369f67463f20ce59b856d4d03250d57
+DIST uftp-4.9.4.tar.gz 243819 BLAKE2B b7aa75f8db82480912dd4cf8199dce7e8170db837853f16a2d8e5a4b7cf190416b7a2a23e170a4837f59a7bba030b0434383bceae9b253eb1d2fc13f6fcd26e7 SHA512 f3c799265a55e0cb536f17be3a0ebfad5f81284255083ebe9a12fda4b5ce8407f05a710cb32a41f3dccbc0ac90367c44d4b67058bdbeaa4f2f8efe732463ebf0
+EBUILD uftp-3.7.1.ebuild 1062 BLAKE2B eab032956e3170de02ad65e543011be42260335cbe51e30acde9509a6b15a10f98ade2bd284293a27906484c4281bd7549569543df68ae1af6b4c2fcd5160b13 SHA512 59352a391e6b7aceff3939ea588a6be4859b1b62333451b26978ad0b08eb3d1cd7b90c0e3e4a5d84c1fac86741ce43ffc9ec5bfb64c697ccb02079cd1b5f6006
+EBUILD uftp-4.9.4.ebuild 1268 BLAKE2B f0f5346bc945ded6924a601256d95e997c9a626a3b770f849e35b73a380ab319ca30e3ef8b211f7aed256fb0e1d214291943b730b6b9b52b23bdd8b0cf48fb82 SHA512 1ae279fcaa4e627fd212465e73de1d1b1bb18491de290fd0cce5c945c07c43eca7f35421ff589fe1fc33b35bf057d938519cb32d327fd5bf88de1e7a27fe5612
 MISC metadata.xml 433 BLAKE2B 0c732cc29ed317b29aa5c7313ebf825e62835325c1c44f1e39bbf2893d40335b3458ddf9263132fc858d28ac8c66876f39bdccbfdc376c87c955e8f09eba7171 SHA512 7e63ff9bed7a90bc94ac2f0441b6f089e5f38d08afb47c5513b09bb6ee2b5fca756a20401d622548c129b540a0b93dba882c38e5ac69dcca9ec72e4c4c9e7686
diff --git a/net-misc/uftp/files/uftp-4.9.4_makefile.patch b/net-misc/uftp/files/uftp-4.9.4_makefile.patch
new file mode 100644
index 000000000000..5a131c350a56
--- /dev/null
+++ b/net-misc/uftp/files/uftp-4.9.4_makefile.patch
@@ -0,0 +1,41 @@
+diff -Nuar uftp-4.9.4-orig/makefile uftp-4.9.4/makefile
+--- uftp-4.9.4-orig/makefile	2017-12-13 13:15:53.873252064 +0500
++++ uftp-4.9.4/makefile	2017-12-13 13:25:44.092223428 +0500
+@@ -42,24 +42,24 @@
+ endif
+ 
+ # defaults
+-OPTIONS=-g -Wall $(ENC_OPTS)
++OPTIONS=-Wall $(ENC_OPTS)
+ LDLIBS=-lc -lm $(CRYPT_LIB)
+ MTFLAGS=
+ 
+ # FreeBSD
+ ifeq ("FreeBSD", "$(UNAME_S)")
+-OPTIONS=-g -Wall -DHAS_GETIFADDRS -DNO_DUAL -DSOCKADDR_LEN $(ENC_OPTS)
++OPTIONS=-DHAS_GETIFADDRS -DNO_DUAL -DSOCKADDR_LEN $(ENC_OPTS)
+ endif
+ 
+ # OSX, aka Darwin
+ ifeq ("Darwin", "$(UNAME_S)")
+-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
++OPTIONS=-Wall -DHAS_GETIFADDRS $(ENC_OPTS)
+ endif
+ 
+ # Sun
+ ifeq ("SunOS", "$(UNAME_S)")
+ CC = cc
+-OPTIONS=-g -DBSD_COMP -DNO_DUAL -DNO_RECVMSG $(ENC_OPTS)
++OPTIONS=-DBSD_COMP -DNO_DUAL -DNO_RECVMSG $(ENC_OPTS)
+ LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
+ CFLAGS+=`getconf LFS_CFLAGS`
+ OPENSSL=/usr/sfw
+@@ -68,7 +68,7 @@
+ 
+ # Linux
+ ifeq ("Linux", "$(UNAME_S)")
+-OPTIONS=-g -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wformat=2 -Wwrite-strings -Wpointer-arith -Wcast-qual -Wshadow -Wno-missing-field-initializers -Wstrict-prototypes -Winline -Wbad-function-cast -DHAS_GETIFADDRS $(ENC_OPTS)
++OPTIONS=-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wformat=2 -Wwrite-strings -Wpointer-arith -Wcast-qual -Wshadow -Wno-missing-field-initializers -Wstrict-prototypes -Winline -Wbad-function-cast -DHAS_GETIFADDRS $(ENC_OPTS)
+ LDLIBS=-lm $(CRYPT_LIB)
+ CFLAGS+=`getconf LFS_CFLAGS`
+ endif
diff --git a/net-misc/uftp/uftp-3.7.1.ebuild b/net-misc/uftp/uftp-3.7.1.ebuild
index 21d1dd7ac57d..41aed30ba67b 100644
--- a/net-misc/uftp/uftp-3.7.1.ebuild
+++ b/net-misc/uftp/uftp-3.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Encrypted UDP based FTP with multicast"
 HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
@@ -14,12 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+server ssl"
 
-DEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.7_makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7_makefile.patch"
+)
 
 src_compile() {
 	use ssl || local opt="NO_ENCRYPTION=1"
diff --git a/net-misc/uftp/uftp-3.7.ebuild b/net-misc/uftp/uftp-4.9.4.ebuild
index 4ce34926ad04..74358db417d4 100644
--- a/net-misc/uftp/uftp-3.7.ebuild
+++ b/net-misc/uftp/uftp-4.9.4.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
-SRC_URI="http://www.tcnj.edu/~bush/downloads/${P}.tar"
+HOMEPAGE="http://uftp-multicast.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+server ssl"
 
-DEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}_makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}_makefile.patch"
+)
 
 src_compile() {
 	use ssl || local opt="NO_ENCRYPTION=1"
@@ -29,7 +29,7 @@ src_compile() {
 
 src_install() {
 	dobin uftp uftp_keymgt
-	dodoc ReadMe.txt
+	dodoc {Changes,protocol,ReadMe}.txt
 	doman uftp.1 uftp_keymgt.1
 
 	if use server ; then
@@ -43,3 +43,10 @@ src_install() {
 		newins "${FILESDIR}/logrotate" uftpd
 	fi
 }
+
+pkg_postinst() {
+	if use server ; then
+		ewarn "Please note, uftpd 4.x server is not backward compatible with"
+		ewarn "uftp 3.x clients! Please upgrade clients before servers."
+	fi
+}