From 65fc3a858ee3b22c97b3e0d570bf4ae4b4ee7a88 Mon Sep 17 00:00:00 2001 From: Logan Gunthorpe Date: Fri, 25 Sep 2015 09:34:35 -0600 Subject: [PATCH] Modified the license of the code pulled from libargconfig to be GPLv2 There have been legal concerns of linking Apache licensed code with GPLv2 code. This change modifies the license of the code originating from libargconfig. All of the copyright holders (including myself and PMC Sierra represented by Stephen Bates ) have signed off on this change. --- src/argconfig.c | 22 +++++++++++++--------- src/argconfig.h | 22 +++++++++++++--------- src/suffix.c | 22 +++++++++++++--------- src/suffix.h | 22 +++++++++++++--------- 4 files changed, 52 insertions(+), 36 deletions(-) diff --git a/src/argconfig.c b/src/argconfig.c index c89bbea4..ef59fbaa 100644 --- a/src/argconfig.c +++ b/src/argconfig.c @@ -2,15 +2,19 @@ // // Copyright 2014 PMC-Sierra, Inc. // -// Licensed under the Apache License, Version 2.0 (the "License"); you -// may not use this file except in compliance with the License. You may -// obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 Unless required by -// applicable law or agreed to in writing, software distributed under the -// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for -// the specific language governing permissions and limitations under the -// License. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // //////////////////////////////////////////////////////////////////////// diff --git a/src/argconfig.h b/src/argconfig.h index 22e4b8ad..6e779311 100644 --- a/src/argconfig.h +++ b/src/argconfig.h @@ -2,15 +2,19 @@ // // Copyright 2014 PMC-Sierra, Inc. // -// Licensed under the Apache License, Version 2.0 (the "License"); you -// may not use this file except in compliance with the License. You may -// obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 Unless required by -// applicable law or agreed to in writing, software distributed under the -// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for -// the specific language governing permissions and limitations under the -// License. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // //////////////////////////////////////////////////////////////////////// diff --git a/src/suffix.c b/src/suffix.c index 50c4fa60..1e116fdb 100644 --- a/src/suffix.c +++ b/src/suffix.c @@ -2,15 +2,19 @@ // // Copyright 2014 PMC-Sierra, Inc. // -// Licensed under the Apache License, Version 2.0 (the "License"); you -// may not use this file except in compliance with the License. You may -// obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 Unless required by -// applicable law or agreed to in writing, software distributed under the -// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for -// the specific language governing permissions and limitations under the -// License. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // //////////////////////////////////////////////////////////////////////// diff --git a/src/suffix.h b/src/suffix.h index a38c1a96..ce58593f 100644 --- a/src/suffix.h +++ b/src/suffix.h @@ -2,15 +2,19 @@ // // Copyright 2014 PMC-Sierra, Inc. // -// Licensed under the Apache License, Version 2.0 (the "License"); you -// may not use this file except in compliance with the License. You may -// obtain a copy of the License at -// http://www.apache.org/licenses/LICENSE-2.0 Unless required by -// applicable law or agreed to in writing, software distributed under the -// License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -// CONDITIONS OF ANY KIND, either express or implied. See the License for -// the specific language governing permissions and limitations under the -// License. +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // //////////////////////////////////////////////////////////////////////// -- 2.50.1