[gentoo-commits] repo/gentoo:master commit in: net-ftp/pure-ftpd/files/, net-ftp/pure-ftpd/

[Thomas Deutschmann]

commit:     2076c4dfe876444034d00d0677e0f3b49951d1fb
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 16 21:05:04 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 16 21:05:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2076c4df

net-ftp/pure-ftpd: do not call ar directly

Closes: https://bugs.gentoo.org/721242
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 .../pure-ftpd-1.0.49-do-not-call-ar-directly.patch | 23 ++++++++++++++++++++++
 net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild       |  7 +++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch
new file mode 100644
index 00000000000..0df21320957
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/721242
+Backport of https://github.com/jedisct1/pure-ftpd/pull/148
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_INIT([pure-ftpd],[1.0.49],
+   [https://www.pureftpd.org])
+ AC_CONFIG_SRCDIR(src/ftpd.c)
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar])
++AM_INIT_AUTOMAKE([1.11.2 dist-bzip2 tar-ustar])
+ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+ AM_MAINTAINER_MODE
+ AM_DEP_TRACK
+@@ -17,6 +17,7 @@ AC_SUBST(VERSION)
+ 
+ dnl Checks for programs.
+ LX_CFLAGS=${CFLAGS-NONE}
++AM_PROG_AR
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ AC_USE_SYSTEM_EXTENSIONS
+ 

diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild
index 3386fbb63f8..1c34eeef0a5 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="Fast, production-quality, standard-conformant FTP server"
 HOMEPAGE="http://www.pureftpd.org/"
@@ -49,11 +49,14 @@ PATCHES=(
 	# https://bugs.gentoo.org/711124
 	"${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch"
 	"${FILESDIR}/${P}-pure_strcmp_OOB_read.patch"
+
+	# https://bugs.gentoo.org/721242
+	"${FILESDIR}/${P}-do-not-call-ar-directly.patch"
 )
 
 src_prepare() {
 	default
-	[[ "${PV}" == 9999 ]] && eautoreconf
+	eautoreconf
 }
 
 src_configure() {