diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2015-05-30 13:57:11 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2015-05-30 13:57:11 +0000 |
| commit | fea403e77ba7f1cecebf6fcbcbaf4c20b5bd0e17 (patch) | |
| tree | 8b2646686013d0c9eae13ef0e5bc2b6bb52bb956 /net-ftp | |
| parent | vanilla-4.0.4 + genpatches-4.0-6 + grsecurity-3.1-4.0.4-201505272113 (diff) | |
| download | gentoo-2-fea403e77ba7f1cecebf6fcbcbaf4c20b5bd0e17.tar.gz gentoo-2-fea403e77ba7f1cecebf6fcbcbaf4c20b5bd0e17.tar.bz2 gentoo-2-fea403e77ba7f1cecebf6fcbcbaf4c20b5bd0e17.zip | |
correction to the slot operator setting to dev-libs/openssl, noted by floppym
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/proftpd/ChangeLog | 5 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.5-r2.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 56d74a3a78e9..51ac966952c8 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-ftp/proftpd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.331 2015/05/29 08:07:03 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.332 2015/05/30 13:57:11 idella4 Exp $ + + 30 May 2015; Ian Delaney <idella4@gentoo.org> proftpd-1.3.5-r2.ebuild: + correction to the slot operator setting to dev-libs/openssl, noted by floppym 29 May 2015; Sergei Trofimovich <slyfox@gentoo.org> files/CVE-2015-3306.patch: Removed CVS expansion patch damage, but it does not fix USE=copy build failure diff --git a/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild index c00dab53537b..026607d2167c 100644 --- a/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild,v 1.1 2015/05/27 05:40:59 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5-r2.ebuild,v 1.2 2015/05/30 13:57:11 idella4 Exp $ EAPI=5 inherit eutils multilib systemd @@ -48,7 +48,7 @@ CDEPEND="acl? ( virtual/acl ) mysql? ( virtual/mysql ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses ) - openssl? ( dev-libs/openssl:= ) + openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) |