On 10/3/2015 3:33 PM, Daniel Macks wrote: > On Sat, 3 Oct 2015 15:18:42 -0500, Hanspeter Niederstrasser > <f...@snaggledworks.com> wrote: > Currently (since 2005), (L)GPL packages that link to Fink's OpenSSL must >> be marked as Restrictive because we can't distribute binaries. A note >> is usually left in DescPackaging to keep track of the original >> license. >> >> With system-openssl dying with 10.11, there's going to be a large >> increase in packages that suddenly have to become Restrictive and the >> mass updates will probably cause information to be lost. >> >> Would it make sense to add a new license type such as GPL/OpenSSL? >> This would note the main license, the fact that it links to OpenSSL, >> and would thus be marked 'restrictive' by the bindist and no binaries >> would be generated for that package. >> >> (any GPL packages that have an explicit OpenSSL exception would still >> be labelled GPL as before)
Filed as https://github.com/fink/fink/pull/126 This is the changeset: ----- 8< ----- 8< ----- 8< ----- 8< ----- 8< ----- 8< diff --git a/perlmod/Fink/Scanpackages.pm b/perlmod/Fink/Scanpackages.pm index bbda942..573410f 100644 --- a/perlmod/Fink/Scanpackages.pm +++ b/perlmod/Fink/Scanpackages.pm @@ -506,7 +506,9 @@ sub _output { return if !$self->{restrictive} && ( !exists $control->{'Fink-License'} || lc $control->{'Fink-License'} eq 'restrictive' - || lc $control->{'Fink-License'} eq 'commercial'); + || lc $control->{'Fink-License'} eq 'commercial' + || lc $control->{'Fink-License'} eq 'gpl/openssl' + || lc $control->{'Fink-License'} eq 'lgpl/openssl'); # Order to output fields, from apt-pkg/tagfile.cc my @fieldorder = qw(Package Essential Status Priority Section diff --git a/perlmod/Fink/Validation.pm b/perlmod/Fink/Validation.pm index eba96b3..f987ca9 100644 --- a/perlmod/Fink/Validation.pm +++ b/perlmod/Fink/Validation.pm @@ -115,7 +115,7 @@ our %allowed_license_values = map {$_, 1} "GPL", "LGPL", "GPL/LGPL", "BSD", "Artistic", "Artistic/GPL", "GFDL", "GPL/GFDL", "LGPL/GFDL", "GPL/LGPL/GFDL", "LDP", "GPL/LGPL/LDP", "OSI-Approved", "Public Domain", "Restrictive/Distributable", - "Restrictive", "Commercial", "DFSG-Approved" + "Restrictive", "Commercial", "DFSG-Approved", "GPL/OpenSSL", "LGPL/OpenSSL" ); # Allowed values of the architecture field ----- 8< ----- 8< ----- 8< ----- 8< ----- 8< ----- 8< Documentation change to reference.php and policy.php to follow once this is accepted. Hanspeter ------------------------------------------------------------------------------ _______________________________________________ fink-core mailing list fink-core@lists.sourceforge.net List archive: http://news.gmane.org/gmane.os.apple.fink.core Subscription management: https://lists.sourceforge.net/lists/listinfo/fink-core
