summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2014-06-16 15:08:32 +0000
committerAnthony G. Basile <blueness@gentoo.org>2014-06-16 15:08:32 +0000
commit2137f0770352eb5ce7192b1cc5cc61a036266b0a (patch)
tree58f3d369df05d79e264ff4f2eecdb4e77e5e39fd
parentKeyword ~mips (diff)
downloadgentoo-2-2137f0770352eb5ce7192b1cc5cc61a036266b0a.tar.gz
gentoo-2-2137f0770352eb5ce7192b1cc5cc61a036266b0a.tar.bz2
gentoo-2-2137f0770352eb5ce7192b1cc5cc61a036266b0a.zip
Mask CURL_SSL=winssl on all profiles, except prefix/windows/winnt
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/base/use.mask5
-rw-r--r--profiles/prefix/windows/winnt/use.mask5
3 files changed, 13 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 4e0c38ab7b23..ae6705e3839e 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9093 2014/06/16 14:20:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9094 2014/06/16 15:08:31 blueness Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 16 Jun 2014; Anthony G. Basile <blueness@gentoo.org> base/use.mask,
+ prefix/windows/winnt/use.mask:
+ Mask CURL_SSL=winssl on all profiles, except prefix/windows/winnt
+
16 Jun 2014; Anthony G. Basile <blueness@gentoo.org> profiles.desc:
Add hardened musl profiles for mips
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 52ee0a5cc79a..f239383ce2dc 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.198 2014/05/16 11:10:18 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.199 2014/06/16 15:08:31 blueness Exp $
+
+# CURL_SSL=winssl is for prefix/windows/winnt only
+curl_ssl_winssl
# cuda only works on amd64/x86
cuda
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index 334704e2997f..043b276c8833 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -1,10 +1,13 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/use.mask,v 1.9 2014/04/30 22:30:21 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/use.mask,v 1.10 2014/06/16 15:08:32 blueness Exp $
# Re-add Winnt libc
-elibc_Winnt
+# CURL_SSL=winssl is allowd on Winnt libc
+-curl_ssl_winssl
+
# these need a review, since they are just copied from interix
# these will more than likely never work on Windows
3dfx