Fix USE=-ipv6 build failure. Report and fix by Yuri Shatroff (bug #465134).

Package-Manager: portage-2.2.0_alpha171_p5/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 37 insertions, 7 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 494367ad84c4..58e45a07358e 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.294 2013/04/07 13:48:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.295 2013/04/08 18:13:35 slyfox Exp $
+
+  08 Apr 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/proftpd-1.3.4c-fix-build-noipv6.patch, proftpd-1.3.4c.ebuild:
+  Fix USE=-ipv6 build failure. Report and fix by Yuri Shatroff (bug #465134).
 
 *proftpd-1.3.4c (07 Apr 2013)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 287844a9182a..30be2920634c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX proftpd-1.3.4a-ubug-3682.patch 4244 SHA256 310c18a525b3224edba7f1cfd0364a038df6394f57c0b6e1969957f0e25ded3e SHA512 7cd8313175704b809a001f29a9c320f51793bbb59e5fd2c732f11953aa6aa9d5b82bb48e1181b305e51ce61831a4955f40257863e184b1766d0a80cc4458585b WHIRLPOOL a094dcc2efa76af5bc4229ae5d3d68a1a8910269873a7825f3378b586c7bf07d8cc6f8f66c1247ee8b062e370ac69a43ab3e2ef4e06945202190046b3c2237b3
 AUX proftpd-1.3.4a-ubug-3728.patch 327 SHA256 f81256fe91be72ee8e96b18f356a55624cc080405f975760a2d17319828791cd SHA512 a3b173c398a3e3dac633488e005d7aab66373c9c0b1c32738a2cf6ef30a94024602bd96bd794036c86f214198a5d4f02f7f8097a13803bc2bc6320c53c14b023 WHIRLPOOL 8c283894f69d5bb24dfa790a232a234eb6dff9ca5e61de835129df83adf57b890e54e2a2c383904ed958656c65464c6f8e23cb3b75a5ab2c53314c116f33ed00
 AUX proftpd-1.3.4b-ubug-3795.patch 2768 SHA256 cc5f5175298408fb12de7cf268d8e59a4fa3fe2bc3c798d0f60f8c204e9831d8 SHA512 ed6eb3ed8080275c6b59b8c42dab08d6fa2653b8fd1f336b571429248c1807e95f60fa6ad491c97a689fed26e2c595e00f3a99996b472bf3bd87840fe3936790 WHIRLPOOL 61d8d6ca1aa0496fa0568a89fe2ec8ed64f6221ff14abb969541a6bf2285b2ac79a67c9ce3bf98e167236f38442ed5b6b12b0810fce001b7ec1c050af2649319
+AUX proftpd-1.3.4c-fix-build-noipv6.patch 582 SHA256 78aa3e205ca92fa2b97be2fb93d95980e1fec8b435ee858a8abb31435893909c SHA512 5ea38b94cb9f5d1a26f5bb0e3200aa72df7e5542f2041b3a33345918dc6c95859945ab8e80263d369f16f96862dc87b2511dea08080c76c14b68abe84a74bc04 WHIRLPOOL 4497bf1253be9be7663829fb1ab6ea96e45d67228219b7f099659c9f8654c9d37cdd3192d1eadc6f17430c120365375dee9fffbbc4ed6e1a3d8b0cc1e31900b7
 AUX proftpd-tmpfiles.d.conf 34 SHA256 75288bb0c76392ae10e7ef3ff27e7b665742cdac8ce4c70dff9f29d645d0f0f3 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52 WHIRLPOOL d3ef47f4e2abc178c2d153599e7b13148345a470c76410b499e41912f9e90a48c1217e7fdee3d6777b1598dd09840f8bffbd208fa9addbeaaaf9c64058d8df93
 AUX proftpd.conf.sample 1275 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0 SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df WHIRLPOOL a9f71cf50926ccdf5fe1116250c29a4048e7eb7fc7eb73732023b7c6e78c56b02356c001c203d9dc8c46f817471116977f76e961a6b2a60c03ae1d4722d9e3e1
 AUX proftpd.initd 1544 SHA256 aed3dd4cbbf1db8a1bd0cbadee66a808b430bbbcc436610407a9911df208f668 SHA512 f11ce49440341633ea4287e8887f8127d954207c5c25b0ae08b6ca1b8f42e90e693f657e45abc465c2c86c1b43a04776c9fb68b04c97a5a43fa17a05ff5ef5c6 WHIRLPOOL 0a8fe89a575491954fa177d6db85792eb5b6639abc9fd2c88358c0a7b64dc300602f5b75e4d90ba984e5d21831d2a5c2d39e98230f138cba463f3680eba49948
@@ -24,13 +25,13 @@ EBUILD proftpd-1.3.3g.ebuild 7177 SHA256 faf1de255cc098d2f2cc783ce8fa3b5c7d515ee
 EBUILD proftpd-1.3.4a-r1.ebuild 7310 SHA256 e1a2a35d992e1e84a126a4786f9a49e84ddd51ca13facfc9a31115cd3dbb1689 SHA512 51a9077c7d9d86841a6393964d0d4ea05df3abfbf16929fca4a5a4609cd5c49a6c83e9adfd0c0e6b4887d03a0b5666fc965c4a53ce2af665de6da266b1e9d2e8 WHIRLPOOL 350706a8685dd04ed0743623dac7fa2431cacf2be3e0a1e33df223ce99f78f83414558ac7b989ae7138f92b46e7d23f005b938636d82d7714dab3491515664a1
 EBUILD proftpd-1.3.4a.ebuild 6738 SHA256 398c1f9ce2e9bb261af7e34fd836950a82cfa96b7a87861427ea7501585d54f2 SHA512 bdff31c2848848c4371f93899b710aad7dfa898e2168184c9eaa1cc56c1a283ee29132f3a0458dd55d9cae06247d21fefdc07d400ceb620b7c710f59108be063 WHIRLPOOL f6db84d8c6a2a0d005b9ef873d07a10ba0a65171c6b257197ebd087abd6897131002c2c02f8500d820958ed6120c7bd7ba9826f45796395e483946777f0f59e8
 EBUILD proftpd-1.3.4b.ebuild 7216 SHA256 f0a8cbd628cec9af0ab06fe50bc568ade35b50014f739655e3bf68c9ac69bebf SHA512 4c5a1230ee552ca7a23cfbbb8760701c0a01de3b05bcb324a4c61e1763ea36a0f025c67a6347f85756869dd96897929757ebcc8e2d7ffe03266e77aa49d3de0a WHIRLPOOL ac2cdd8332338cd6b6d4dfa8ca24c6ae33cdb479527b69f7f6dca5ec6147e007e910ae578d62d85da3d02603fb68a86140c377e5ba17b2d037a1d54e560b42bc
-EBUILD proftpd-1.3.4c.ebuild 7252 SHA256 a22a61ea221d6e92b0dba38b19fa8f0e1eee90ab9a183ca041fdbbeaf9f3b7a6 SHA512 6bb8ecbea75c30c014fb9415d2d250fc7601005990d08dd4e61cc193ebda02e8e563d79677403cf132e0e073467b6f24bf9d5a7c611201aeb34a4d4128da34e5 WHIRLPOOL 49326b3b3ab7ee18c4b8851e4ac7d4f0b450a12079b1ac57fdab06b7f90ac4a07b1b0d1fb38e44ded260744dffddfd1e0747d16ec4f01ee628aec1825003e9c2
-MISC ChangeLog 51311 SHA256 ed19679ef4980531fed67f29958486a812e83d9c17df7d70434747ce0abafdb5 SHA512 a7adce8c0520beb7ada90549c635c47b8c0e44c0969f12eabd3c68a9517d124c22a4371efe18bf7666edc672a0f6d4056bfe741a500b81fb9451fc0f6f94ce84 WHIRLPOOL 0b7e862927e702f8a79e75be05b33dcc47c106cb1e9ac455a32c910e6bc7017570dc62fb1037890e7decac733e5310be931107d3e40befc86cf635a1adbb2838
+EBUILD proftpd-1.3.4c.ebuild 7311 SHA256 b54f74846b9e8e948f67d330f0a1c263e3e617fe8ed5e6c1f0416631ac733d2b SHA512 fa5f647e3519c2e7f325de8773dfd9ad65d80c2c51e3327a31788d334c6882f28aed5f34971321dcad107540d857aea8b4e8cb8c23e6d37a41d08b137bcd2fc1 WHIRLPOOL 1a22edfc3b3a2d36b42413728b49cd9cbd3bce37183bdb58258ff71e28efbd5b796460c4104fe60556127b453d7e1e65c6023b04faad6ffabbf41ebc80876e57
+MISC ChangeLog 51515 SHA256 69d8689447a800f9229d2f28f5783c1f58e781b362b93bf5e3757a74c887529e SHA512 825f9433c465a4ce16a9c0d17f19d93915ca02cf3115062db94cfe31fa329d0439b3442b2c44dd1eeb9db14cff50debac7d20f0432b484dc80cedf0299243f89 WHIRLPOOL 20bcc637dc403e27f89c8fb640a84698c2f4d1b726aa4f2cd13c75e1ee3102e11e187955ab69fb6c9eeb58e61dbf292d908a5f9dd78dfbf422d84fcf92376185
 MISC metadata.xml 2902 SHA256 3b934645a9ab012f409eb5564f1e1302fb8d9885f61d84fe2397d5ce1d30061c SHA512 c8d8e09b62f1d21739edc0afc4e7446904733d0eec40d6bfbd1ae2cb60cfea7580681653015a7282ecb38b59494b18e35cba43c9e9e6f8d04af7de6bbf1e9b93 WHIRLPOOL 78e7c0b5023d84c6b50e94e2f4853fcf042f871b92ce69b12ab4710efc7e299cdc1adaf4baef42de9dc36d69a38eda5bb6eec005208ab5f0a80ff6a0d4666278
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFheS4ACgkQcaHudmEf86qU4QCdG5qvIp3bUjN8RYENpA5z34Xp
-S8cAn0mvpsEFPHsRTvFvGCMk1gUE2EWw
-=+UHg
+iEYEAREIAAYFAlFjCLMACgkQcaHudmEf86qOPACfVMvncPAE9/jk04JgON2uWoRE
+rl8AoITB5/ctWGwUZh9+LOgLovW4oe6B
+=C+U+
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch b/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch
new file mode 100644
index 000000000000..937fff019415
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.4c-fix-build-noipv6.patch
@@ -0,0 +1,23 @@
+Fix buld failure of USE=-ipv6 case.
+
+> netaddr.c: In function 'get_addr_by_name':
+> netaddr.c:694:3: warning: control reaches end of non-void function [-Wreturn-type]
+>    }
+>    ^
+
+Fixes: http://bugs.gentoo.org/465134
+Patch-by:  Yuri Shatroff <yks-uno@ya.ru>
+diff --git a/src/netaddr.c b/src/netaddr.c
+index 9dbc716..2b025b6 100644
+--- a/src/netaddr.c
++++ b/src/netaddr.c
+@@ -690,8 +690,8 @@ static pr_netaddr_t *get_addr_by_name(pool *p, const char *name,
+         pr_freeaddrinfo(info);
+       }
+     }
+-#endif /* PR_USE_IPV6 */
+   }
++#endif /* PR_USE_IPV6 */
+ 
+   return na;
+ }
diff --git a/net-ftp/proftpd/proftpd-1.3.4c.ebuild b/net-ftp/proftpd/proftpd-1.3.4c.ebuild
index 5da2a399193d..2026180fe13c 100644
--- a/net-ftp/proftpd/proftpd-1.3.4c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c.ebuild,v 1.1 2013/04/07 13:48:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4c.ebuild,v 1.2 2013/04/08 18:13:35 slyfox Exp $
 
 EAPI=4
 inherit eutils multilib systemd
@@ -65,6 +65,8 @@ __prepare_module() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-build-noipv6.patch #465134
+
 	# Skip 'install-conf' / Support LINGUAS
 	sed -i -e "/install-all/s/ install-conf//" Makefile.in
 	sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in