Fixes USE=nls and build failure(sparc) on Gentoo/FreeBSD. Thanks to Dmitri Bogomolov and Naohiro Aota (bug #354295) and Tibor Vago (bug #393189)

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 179 insertions, 19 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 4619e5be435c..93dfa727b46b 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.286 2011/12/22 22:46:48 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.287 2011/12/29 23:30:13 voyageur Exp $
+
+  29 Dec 2011; Bernard Cafarelli <voyageur@gentoo.org> proftpd-1.3.4a.ebuild,
+  +files/proftpd-1.3.4a-ubug-3682.patch, +files/proftpd-1.3.4a-ubug-3728.patch:
+  Fixes USE=nls and build failure(sparc) on Gentoo/FreeBSD. Thanks to Dmitri
+  Bogomolov and Naohiro Aota (bug #354295) and Tibor Vago (bug #393189)
 
   22 Dec 2011; Mark Loeser <halcy0n@gentoo.org> proftpd-1.3.3g.ebuild:
   Stable for ppc/ppc64; bug #390075
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index dc6b15e299ac..95922528265f 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX proftpd-1.3.4a-ubug-3682.patch 4244 RMD160 5be5844579bbd26f4e87e4e169934aaf71770da4 SHA1 8d6c179ee51ed0b99c06ba4f483af7bcc1ea533f SHA256 310c18a525b3224edba7f1cfd0364a038df6394f57c0b6e1969957f0e25ded3e
+AUX proftpd-1.3.4a-ubug-3728.patch 327 RMD160 d475c51d3b73af9397f08097ee0db6c2d6520f46 SHA1 074ac1333c08c812e91e252b2d93c0f33112bd91 SHA256 f81256fe91be72ee8e96b18f356a55624cc080405f975760a2d17319828791cd
 AUX proftpd.conf.sample 1275 RMD160 199b8cced06d347ef8a2033b68850fd9dd922ccd SHA1 e58e5e7856bc77e159a628717ad1c73e20c5b883 SHA256 a214b3937f319c70976d29cfcd47c2cd937d1d70b7274c2b241b1e97606e89c0
 AUX proftpd.initd 1565 RMD160 efa4d3a98202666ba55e91c711fa03832ad5e320 SHA1 18ff1ec4d34d7442d06ab2201deea40548116d51 SHA256 52ee854ddd402b251b483450a26001a4d8d72706870040d0a866347440e0c395
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
@@ -18,23 +20,13 @@ DIST proftpd-mod-vroot-0.9.2.tar.gz 22438 RMD160 8d8620a346b422e57cd775fdde0241a
 EBUILD proftpd-1.3.3e.ebuild 7181 RMD160 452f01da3094782974a7cc1c8f2788cdc6127425 SHA1 0a31b7522788638f6a97f57e7e46cd0b91a55ca2 SHA256 1b12ff82ea60f7b18e4b6af606f79d42517ba8ecb7f393f0e6f0400d55ac61f4
 EBUILD proftpd-1.3.3f.ebuild 7187 RMD160 10d00838dc9840d6632674c2cd7ee9db0636a678 SHA1 1c554d29d90275d5fa307e5a6a8282296f98e259 SHA256 f71b0593ff70248b834bf006e062dd7b62090f32b847d53dfadd6d63a9943db3
 EBUILD proftpd-1.3.3g.ebuild 7180 RMD160 3e765eabf5d392c5f87d92b723e67ff656fe5a3d SHA1 89dfe43be743c732e16d404123c8dfad7483e9ea SHA256 5370228efc6e02633a8d350662892ebd48e5a29306b7785d21a91a2b325ac4a0
-EBUILD proftpd-1.3.4a.ebuild 6558 RMD160 55eff9f0af57ca9b603023ea024a6bf2cc432e43 SHA1 ed84f9bc4ec68739f6e31c7f40312e0f1d6c7118 SHA256 e33ab3fe6d841f6422ce602cf2d8be12eb26ea5970fb296bfb5c5b8a09cbe136
-MISC ChangeLog 49434 RMD160 8d953137ac0364794b47a7992b9948d11a6306fe SHA1 5116c6111c73c805d4cafa6640751fa60463809e SHA256 7a754f6c49c4773a4ba12a880cb673a9529be30163ca346e4fc2bf4e7189cdf3
+EBUILD proftpd-1.3.4a.ebuild 6742 RMD160 729a988d4ff73138531a6ce8c0c6089d560f4c86 SHA1 fda08bed7b8bb8d8d328147c754c8b501ada5786 SHA256 faaaab9366104d67150c328ac6e7088d074a9ab671f7389664b9d6badc3fbdc7
+MISC ChangeLog 49743 RMD160 826c557fc3d2efc5280d8b3986ce0406cecd2461 SHA1 56998f49a1b17c6e00d78356ab4dd2c9b014283f SHA256 57d65bc448b89a67908f3992847375b7ab32a56f7a2122b519e29f9d82be32bd
 MISC metadata.xml 2286 RMD160 881ef9e88e0426169393f54c68dcf91f895e898e SHA1 37abd54df219347761bd3e1b9f74bded51aa0740 SHA256 f63550b381774d49259b5723c68e5b73f1e8f0b8a72760a1aa0e54747027a26e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJO87NeAAoJEPTTRK0uRVaNJBMQAIc3t2UGvOxk80PuDBUjlj/W
-bMgoGHHkm6s5xQaIN3B6iYfR95vv8YwSajcIgQlQOXJTEsVfePcgkwiHyfSFFVh7
-75obWgvlTr5pYRztGXH6q1pU6Y3azwJhNEKI4rHGDuE6w4OnPdISN+m0AxACDsmU
-PdbvNXCUhC03rL+nLk9ruFWvXakhkNYc5kR/YnARjRjpCGZbglpO+lNGygGOIpNa
-KvIxUkYYQgDi1N3DMBcATduqrX7p69QZo1FiV4ENhp1XvxRWqTuabxC8xH7ty2X/
-rV30UcaQlJ04ubTFNsGJSDx1az0Hca0GELPbX7v1fXdRl0Vb1jm4g0Zlb5dQEh8I
-3tghO/DkMhX5ggrgWKXTm9bvxo0I9EuU7MaPVrf1MdBMFePAh1ueSyCAOQo2dDUO
-MKjuVDoJiWWERqUhLbVww62Km/6Y9YiG+4UPxVAjkhoVsYTig8IiBhs5OorUyb77
-2gnpUJN7v1eTtjLk1FZ9SLayuBnr1xiFMRIcdDr8ubIeLwCcCbyA+b0BVEWwLrNx
-SsKvOPo37YDOqQTEaw3xslAjqfr9catJ0AjGNlptzXDmZW6Ub5NwjYW+PWEa/U4S
-jUIwuekVtbuQop3LsyAdPPnIZUFTel9X/zvWrUH0DaMbQV/ePAzhF0QTCjvlI0QU
-p1d4i20DkG2xo6JaDo82
-=WOUw
+iF4EAREIAAYFAk78+BAACgkQFYEBGcdFJfLLIQEAi9JWSYGCz7NVwsQJoQyJ+08I
+s4ZQenxrjxKzektFbzQA/iDJintfrqXY3Lkho8RPpHNEJCKpV/zp1Nimm2V1QnZ8
+=Xepy
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch b/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch
new file mode 100644
index 000000000000..c6ebef741a47
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3682.patch
@@ -0,0 +1,146 @@
+--- configure
++++ configure
+@@ -15457,7 +15457,7 @@
+ fi
+ 
+ 
+-                  { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
++                        { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
+ echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -15533,6 +15533,82 @@
+          ENABLE_NLS="1"
+ 
+ else
++  { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
++echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
++if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-liconv  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char libiconv_open ();
++int
++main ()
++{
++return libiconv_open ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  ac_cv_lib_iconv_libiconv_open=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_lib_iconv_libiconv_open=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
++echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
++if test $ac_cv_lib_iconv_libiconv_open = yes; then
++  LIBS="$LIBS -liconv"
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LIBICONV 1
++_ACEOF
++
++
++cat >>confdefs.h <<\_ACEOF
++#define PR_USE_NLS 1
++_ACEOF
++
++           ENABLE_NLS="1"
++
++else
+   { echo "$as_me:$LINENO: checking for iconv_open in -lc" >&5
+ echo $ECHO_N "checking for iconv_open in -lc... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_c_iconv_open+set}" = set; then
+@@ -15600,7 +15676,7 @@
+ #define PR_USE_NLS 1
+ _ACEOF
+ 
+-           ENABLE_NLS="1"
++             ENABLE_NLS="1"
+ 
+ else
+   { { echo "$as_me:$LINENO: error: libiconv support, required for NLS, not present -- aborting" >&5
+@@ -15609,6 +15685,9 @@
+ 
+ fi
+ 
++
++fi
++
+ 
+ fi
+ 
+--- configure.in
++++ configure.in
+@@ -715,18 +715,26 @@
+       )
+ 
+       dnl Similarly, the libiconv library is only needed on some non-GNU
+-      dnl systems.
++      dnl systems.  Note that some systems redefine the iconv_open function
++      dnl to something else (Bug#3682), e.g. libiconv_open.
+       AC_CHECK_LIB(iconv, iconv_open,
+         [LIBS="$LIBS -liconv"
+          AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
+          AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
+          ENABLE_NLS="1"
+         ],
+-        [AC_CHECK_LIB(c, iconv_open,
+-          [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
++        [AC_CHECK_LIB(iconv, libiconv_open,
++          [LIBS="$LIBS -liconv"
++           AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
++           AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
+            ENABLE_NLS="1"
+           ],
+-          [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
++          [AC_CHECK_LIB(c, iconv_open,
++            [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
++             ENABLE_NLS="1"
++            ],
++            [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
++          ])
+         ])
+       )
+     fi
diff --git a/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch b/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch
new file mode 100644
index 000000000000..8f656dd8a899
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.4a-ubug-3728.patch
@@ -0,0 +1,11 @@
+--- src/wtmp.c
++++ src/wtmp.c
+@@ -42,7 +42,7 @@
+     !(defined(LINUX) || defined(__hpux) || defined (_AIX))
+   /* This "auxilliary" utmp doesn't exist under linux. */
+ 
+-#if defined(__sparcv9) && !defined(__NetBSD__)
++#if defined(__sparcv9) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+   struct futmpx utx;
+   time_t t;
+ 
diff --git a/net-ftp/proftpd/proftpd-1.3.4a.ebuild b/net-ftp/proftpd/proftpd-1.3.4a.ebuild
index 0a1ff527c344..8d9a07dfcc3b 100644
--- a/net-ftp/proftpd/proftpd-1.3.4a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.4a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a.ebuild,v 1.1 2011/11/14 11:54:57 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4a.ebuild,v 1.2 2011/12/29 23:30:13 voyageur Exp $
 
 EAPI=4
 inherit eutils autotools
@@ -71,6 +71,12 @@ src_prepare() {
 
 	sed -i -e "s/utils install-conf install/utils install/g" Makefile.in
 
+	# Fixes Gentoo Bug #354295 / ProFTPD Bug #3682
+	epatch "${FILESDIR}"/${P}-ubug-3682.patch
+
+	# Fixes Gentoo Bug #393189 / ProFTPD Bug #3728
+	epatch "${FILESDIR}"/${P}-ubug-3728.patch
+
 	# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903)
 	if use kerberos ; then
 		cd "${WORKDIR}"/mod_gss-${MOD_GSS}