1
0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00

Change license of argparse.c back to LGPLv2.1

* common/argparse.c, common/argparse.h: Change license

--

On 2011-09-30 the license of these two files were changed from
LGPLv2.1 to LGPLv3+/GPLv2+.  This was part of a general change from
files with either GPLv3+ or LGPv2.1+ to this combination so to allow
the use of these files with GPLv2only code.

Since then the code was only modified by employees of g10 Code GmbH
under my direction and myself.  The following changes

  commit 7249ab0f95d1f6cb8ee61eefedc79801bb56398f
  Author:     Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  AuthorDate: Tue Jan 10 15:59:36 2017 -0500

  commit eed16ccebf8fd1fdf9709affbd5c831f6957b8ae
  Author:     Daniel Kahn Gillmor <dkg@fifthhorseman.net>
  AuthorDate: Fri Nov 21 17:04:42 2014 -0500

and a few typo fixes are minor and thus not copyright-able.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2018-03-21 09:15:13 +01:00
parent b32de1bf3e
commit fa0ed1c7e2
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 28 additions and 45 deletions

View File

@ -1,32 +1,23 @@
/* [argparse.c wk 17.06.97] Argument Parser for option handling /* argparse.c - Argument Parser for option handling
* Copyright (C) 1998-2001, 2006-2008, 2012 Free Software Foundation, Inc.
* Copyright (C) 1997-2001, 2006-2008, 2013-2017 Werner Koch * Copyright (C) 1997-2001, 2006-2008, 2013-2017 Werner Koch
* Copyright (C) 1998-2001, 2006-2008, 2012 Free Software Foundation, Inc.
* Copyright (C) 2015-2017 g10 Code GmbH
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
* GnuPG is free software; you can redistribute and/or modify this * This file is free software; you can redistribute it and/or modify
* part of GnuPG under the terms of either * it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
* *
* - the GNU Lesser General Public License as published by the Free * This file is distributed in the hope that it will be useful,
* Software Foundation; either version 3 of the License, or (at * but WITHOUT ANY WARRANTY; without even the implied warranty of
* your option) any later version. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
* or * You should have received a copy of the GNU Lesser General Public License
* * along with this program; if not, see <https://www.gnu.org/licenses/>.
* - the GNU General Public License as published by the Free * SPDX-License-Identifier: LGPL-2.1+
* Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* or both in parallel, as here.
*
* GnuPG 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 copies of the GNU General Public License
* and the GNU Lesser General Public License along with this program;
* if not, see <https://gnu.org/licenses/>.
*/ */
/* This file may be used as part of GnuPG or standalone. A GnuPG /* This file may be used as part of GnuPG or standalone. A GnuPG

View File

@ -1,31 +1,23 @@
/* argparse.h - Argument parser for option handling. /* argparse.h - Argument parser for option handling.
* Copyright (C) 1998,1999,2000,2001,2006 Free Software Foundation, Inc. * Copyright (C) 1997-2001, 2006-2008, 2013-2017 Werner Koch
* Copyright (C) 1998-2001, 2006-2008, 2012 Free Software Foundation, Inc.
* Copyright (C) 2015-2017 g10 Code GmbH
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
* GnuPG is free software; you can redistribute and/or modify this * This file is free software; you can redistribute it and/or modify
* part of GnuPG under the terms of either * it under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
* *
* - the GNU Lesser General Public License as published by the Free * This file is distributed in the hope that it will be useful,
* Software Foundation; either version 3 of the License, or (at * but WITHOUT ANY WARRANTY; without even the implied warranty of
* your option) any later version. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* *
* or * You should have received a copy of the GNU Lesser General Public License
* * along with this program; if not, see <https://www.gnu.org/licenses/>.
* - the GNU General Public License as published by the Free * SPDX-License-Identifier: LGPL-2.1+
* Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* or both in parallel, as here.
*
* GnuPG 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 copies of the GNU General Public License
* and the GNU Lesser General Public License along with this program;
* if not, see <https://www.gnu.org/licenses/>.
*/ */
#ifndef GNUPG_COMMON_ARGPARSE_H #ifndef GNUPG_COMMON_ARGPARSE_H