summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkos Chandras <hwoarang@gentoo.org>2012-05-23 18:33:51 +0000
committerMarkos Chandras <hwoarang@gentoo.org>2012-05-23 18:33:51 +0000
commit2f8b92fef9b0883700767394e2b84f1e1e098c86 (patch)
tree726105fc885a1979c7259323bc0c33c2829bbe9c /net-ftp
parent[bump] dev-perl/File-Next-1.80.0 (diff)
downloadgentoo-2-2f8b92fef9b0883700767394e2b84f1e1e098c86.tar.gz
gentoo-2-2f8b92fef9b0883700767394e2b84f1e1e098c86.tar.bz2
gentoo-2-2f8b92fef9b0883700767394e2b84f1e1e098c86.zip
Respect CFLAGS. Bug #417193. Thanks to Andrew Savchenko <bircoph@gmail.com>
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/vsftpd/ChangeLog6
-rw-r--r--net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch2
2 files changed, 6 insertions, 2 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 30e4f84736f7..987e818993bd 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/vsftpd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.153 2012/05/13 10:57:37 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.154 2012/05/23 18:33:51 hwoarang Exp $
+
+ 23 May 2012; Markos Chandras <hwoarang@gentoo.org>
+ files/vsftpd-3.0.0-Makefile.patch:
+ Respect CFLAGS. Bug #417193. Thanks to Andrew Savchenko <bircoph@gmail.com>
13 May 2012; <swift@gentoo.org> vsftpd-2.2.2.ebuild, vsftpd-2.3.2.ebuild,
vsftpd-2.3.2-r1.ebuild, vsftpd-2.3.4.ebuild, vsftpd-2.3.5.ebuild,
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch b/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch
index ab917209ea7b..5df3b03f3fa9 100644
--- a/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch
+++ b/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch
@@ -11,7 +11,7 @@ Index: vsftpd-3.0.0/Makefile
#CFLAGS = -g
-CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
- -Wall -W -Wshadow -Werror -Wformat-security \
-+CFLAGS = -fPIE -fstack-protector --param=ssp-buffer-size=4 \
++CFLAGS += -fPIE -fstack-protector --param=ssp-buffer-size=4 \
+ -Wall -W -Wshadow -Wformat-security \
-D_FORTIFY_SOURCE=2 \
#-pedantic -Wconversion