summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2014-04-23 20:21:20 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2014-04-23 20:21:20 +0000
commit9b7e858b5bba0593f4bf9b5785f90c65a78464d8 (patch)
tree8d38faad0efb918b066f7344a4fbec6c0c59aa4c /net-ftp/vsftpd
parentStable for amd64 wrt bug #506816 (diff)
downloadgentoo-2-9b7e858b5bba0593f4bf9b5785f90c65a78464d8.tar.gz
gentoo-2-9b7e858b5bba0593f4bf9b5785f90c65a78464d8.tar.bz2
gentoo-2-9b7e858b5bba0593f4bf9b5785f90c65a78464d8.zip
Add epatch_user and override LIBS variable thanks to Mike Gilbert <floppym@gentoo.org>. Bug #508192
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 09BF4F54C2BA7F3C!)
Diffstat (limited to 'net-ftp/vsftpd')
-rw-r--r--net-ftp/vsftpd/ChangeLog8
-rw-r--r--net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild15
2 files changed, 18 insertions, 5 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 24f121d47cee..b2f04d1aa471 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/vsftpd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.178 2013/09/06 18:35:11 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.179 2014/04/23 20:21:20 hwoarang Exp $
+
+ 23 Apr 2014; Markos Chandras <hwoarang@gentoo.org> vsftpd-3.0.2-r2.ebuild:
+ Add epatch_user and override LIBS variable thanks to Mike Gilbert
+ <floppym@gentoo.org>. Bug #508192
06 Sep 2013; Agostino Sarubbo <ago@gentoo.org> vsftpd-3.0.2-r1.ebuild:
Stable for sparc, wrt bug #480078
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
index 6cf1c048ba62..c9934002f620 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild,v 1.1 2013/09/03 20:11:27 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild,v 1.2 2014/04/23 20:21:20 hwoarang Exp $
EAPI="4"
@@ -56,12 +56,21 @@ src_prepare() {
#Bug #450536
epatch "${FILESDIR}"/${P}-remove-legacy-cap.patch
+
+ epatch_user
}
src_compile() {
+ # Override LIBS variable. Bug #508192
+ LIBS=
+ use caps && LIBS+=" -lcap"
+ use pam && LIBS+=" -lpam"
+ use tcpd && LIBS+=" -lwrap"
+ use ssl && LIBS+=" -lssl -lcrypto"
+
CFLAGS="${CFLAGS}" \
CC="$(tc-getCC)" \
- emake
+ emake LIBS="${LIBS}"
}
src_install() {