diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2012-12-02 10:10:51 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2012-12-02 10:10:51 +0000 |
| commit | cc71d5da29d84fbcb92fe523dd2ae420243cc40b (patch) | |
| tree | 3bd1cace8e49befdd2c81495d4b4c60c155f7d82 /profiles | |
| parent | Use oui.txt from sys-apps/hwids instead of local copy. Relax USE="consolekit"... (diff) | |
| download | gentoo-2-cc71d5da29d84fbcb92fe523dd2ae420243cc40b.tar.gz gentoo-2-cc71d5da29d84fbcb92fe523dd2ae420243cc40b.tar.bz2 gentoo-2-cc71d5da29d84fbcb92fe523dd2ae420243cc40b.zip | |
Include SSLeay license in the MISC-FREE group wrt #445560, Comment #2 by Ulrich Müller
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/license_groups | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 45ffd76d484a..33aecb4d743f 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7210 2012/12/01 21:03:09 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7211 2012/12/02 10:10:51 ssuominen 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! + 02 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> license_groups: + Include SSLeay license in the MISC-FREE group wrt #445560, Comment #2 by + Ulrich Müller + 01 Dec 2012; Diego E. Pettenò <flameeyes@gentoo.org> arch/amd64/no-multilib/package.mask, features/64bit-native/package.mask: Unmask newer versions of hpacucli since it's now available as an amd64 diff --git a/profiles/license_groups b/profiles/license_groups index f83195b152b7..483269382e7e 100644 --- a/profiles/license_groups +++ b/profiles/license_groups @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.142 2012/11/25 19:34:52 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.143 2012/12/02 10:10:51 ssuominen Exp $ # Please report bugs or other requests at bugs.gentoo.org and assign to # licenses@gentoo.org @@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist # Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED # TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation? # BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath -MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp czyborra dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL imagemagick Info-ZIP ipadic JasPer2.0 jaxen JDOM JNIC JOVE libpng LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA Subversion SVFL tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH +MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CMake CPL-0.5 CRACKLIB cryptopp czyborra dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL imagemagick Info-ZIP ipadic JasPer2.0 jaxen JDOM JNIC JOVE libpng LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH # The following are NOT valid in @MISC-FREE: # arj - usage restrictions # freedist - Doesn't grant the right to do modifications. |