[git] Pinentry - branch, master, updated. pinentry-1.0.0-39-g430a696
by Werner Koch
cvs at cvs.gnupg.org
Sun Dec 3 17:46:41 CET 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The standard pinentry collection".
The branch, master has been updated
via 430a6963d58069c0faa5a6836961d889b0b45930 (commit)
from 985e5cad6f60de8e60d8ae410cffcd7e2d84f3a2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 430a6963d58069c0faa5a6836961d889b0b45930
Author: Werner Koch <wk at gnupg.org>
Date: Sun Dec 3 17:41:55 2017 +0100
tqt: Add SPDX lines and clarify license in AUTHOR.
--
diff --git a/AUTHORS b/AUTHORS
index 317b17e..2482e1f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,10 @@
Program: Pinentry
-Download: ftp://ftp.gnupg.org/gcrypt/pinentry/
+Homepage: https://gnupg.org/software/pinentry/
+Download: https://gnupg.org/ftp/gcrypt/pinentry/
Repository: git://git.gnupg.org/pinentry.git
-Bug reports: https://bugs.gnupg.org (category: pinentry)
+Bug reports: https://bugs.gnupg.org
Security related bug reports: <security at gnupg.org>
-License: GPLv2+
+License: GPLv2
Pinentry is free software. See the files COPYING for copying conditions.
License copyright years may be listed using range notation, e.g.,
@@ -36,3 +37,12 @@ Marcus Brinkmann, g10 Code GmbH <marcus at g10code.com>
Timo Schulz, g10 Code GmbH
Neal Walfied, g10 Code GmbH <neal at gnu.org>
Daniel Kahn Gillmor <dkg at fifthhorseman.net>
+
+
+License
+========
+
+The optional TQt pinentry (found in the directory tqt/) is distributed
+under the GNU General Public License, version 2 (GPLv2only). All
+other parts of Pinentry are distributed under the GNU General Public
+License, version 2 or later (GPLv2+). See the file COPYING for details.
diff --git a/tqt/Makefile.am b/tqt/Makefile.am
index 9171b0f..ec82522 100644
--- a/tqt/Makefile.am
+++ b/tqt/Makefile.am
@@ -15,8 +15,8 @@
# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
+# SPDX-License-Identifier: GPL-2.0+
## Process this file with automake to produce Makefile.in
diff --git a/tqt/main.cpp b/tqt/main.cpp
index 3f7efb4..af12b9b 100644
--- a/tqt/main.cpp
+++ b/tqt/main.cpp
@@ -1,23 +1,23 @@
/* main.cpp - Secure KDE dialog for PIN entry.
- Copyright (C) 2002 Klarälvdalens Datakonsult AB
- Copyright (C) 2003 g10 Code GmbH
- Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
- Modified by Marcus Brinkmann <marcus at g10code.de>.
-
- 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 2002 Klarälvdalens Datakonsult AB
+ * Copyright (C) 2003 g10 Code GmbH
+ * Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
+ * Modified by Marcus Brinkmann <marcus at g10code.de>.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/tqt/pinentrydialog.cpp b/tqt/pinentrydialog.cpp
index 2eae54d..069eeaf 100644
--- a/tqt/pinentrydialog.cpp
+++ b/tqt/pinentrydialog.cpp
@@ -1,23 +1,22 @@
/* pinentrydialog.cpp - A secure KDE dialog for PIN entry.
- Copyright (C) 2002 Klarälvdalens Datakonsult AB
- Copyright (C) 2007 g10 Code GmbH
- Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
-
- 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
-
+ * Copyright (C) 2002 Klarälvdalens Datakonsult AB
+ * Copyright (C) 2007 g10 Code GmbH
+ * Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#include <ntqlayout.h>
#include <ntqpushbutton.h>
diff --git a/tqt/pinentrydialog.h b/tqt/pinentrydialog.h
index 4d69a28..8e901db 100644
--- a/tqt/pinentrydialog.h
+++ b/tqt/pinentrydialog.h
@@ -1,21 +1,21 @@
/* pinentrydialog.h - A secure KDE dialog for PIN entry.
- Copyright (C) 2002 Klarälvdalens Datakonsult AB
- Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
-
- 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 2002 Klarälvdalens Datakonsult AB
+ * Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0+
+ */
#ifndef __PINENTRYDIALOG_H__
#define __PINENTRYDIALOG_H__
diff --git a/tqt/secqinternal.cpp b/tqt/secqinternal.cpp
index a1113a8..7accf70 100644
--- a/tqt/secqinternal.cpp
+++ b/tqt/secqinternal.cpp
@@ -15,7 +15,7 @@
**
** This file may be distributed and/or modified under the terms of the
** GNU General Public License version 2 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
+** Foundation and appearing in the file COPYING included in the
** packaging of this file.
**
** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
@@ -33,6 +33,8 @@
** Contact info at trolltech.com if any conditions of this licensing are
** not clear to you.
**
+** SPDX-License-Identifier: GPL-2.0 OR QPL-1.0
+**
**********************************************************************/
#include "secqinternal_p.h"
diff --git a/tqt/secqinternal_p.h b/tqt/secqinternal_p.h
index 35d2b0d..a05c9c3 100644
--- a/tqt/secqinternal_p.h
+++ b/tqt/secqinternal_p.h
@@ -33,6 +33,8 @@
** Contact info at trolltech.com if any conditions of this licensing are
** not clear to you.
**
+** SPDX-License-Identifier: GPL-2.0 OR QPL-1.0
+**
**********************************************************************/
#ifndef SECTQINTERNAL_P_H
diff --git a/tqt/secqlineedit.cpp b/tqt/secqlineedit.cpp
index ecf6010..ee95c8d 100644
--- a/tqt/secqlineedit.cpp
+++ b/tqt/secqlineedit.cpp
@@ -1,27 +1,27 @@
/* secqlineedit.cpp - Secure version of TQLineEdit.
- Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
- Copyright (C) 2003 g10 Code GmbH
-
- The license of the original qlineedit.cpp file from which this file
- is derived can be found below. Modified by Marcus Brinkmann
- <marcus at g10code.de>. All modifications are licensed as follows, so
- that the intersection of the two licenses is then the GNU General
- Public License version 2.
-
- 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
+ * Copyright (C) 2003 g10 Code GmbH
+ *
+ * The license of the original qlineedit.cpp file from which this file
+ * is derived can be found below. Modified by Marcus Brinkmann
+ * <marcus at g10code.de>. All modifications are licensed as follows, so
+ * that the intersection of the two licenses is then the GNU General
+ * Public License version 2.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0
+ */
/* Undo/Redo is disabled, because it uses unsecure memory for the
diff --git a/tqt/secqlineedit.h b/tqt/secqlineedit.h
index 9b396ed..bd28cec 100644
--- a/tqt/secqlineedit.h
+++ b/tqt/secqlineedit.h
@@ -1,27 +1,27 @@
/* secntqlineedit.h - Secure version of TQLineEdit.
- Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
- Copyright (C) 2003 g10 Code GmbH
-
- The license of the original ntqlineedit.h file from which this file
- is derived can be found below. Modified by Marcus Brinkmann
- <marcus at g10code.de>. All modifications are licensed as follows, so
- that the intersection of the two licenses is then the GNU General
- Public License version 2.
-
- 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
+ * Copyright (C) 2003 g10 Code GmbH
+ *
+ * The license of the original ntqlineedit.h file from which this file
+ * is derived can be found below. Modified by Marcus Brinkmann
+ * <marcus at g10code.de>. All modifications are licensed as follows, so
+ * that the intersection of the two licenses is then the GNU General
+ * Public License version 2.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0
+ */
#include "secqstring.h"
diff --git a/tqt/secqstring.cpp b/tqt/secqstring.cpp
index 4070169..82dd918 100644
--- a/tqt/secqstring.cpp
+++ b/tqt/secqstring.cpp
@@ -1,27 +1,27 @@
/* secqstring.cpp - Secure version of TQString.
- Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
- Copyright (C) 2003 g10 Code GmbH
-
- The license of the original qstring.cpp file from which this file
- is derived can be found below. Modified by Marcus Brinkmann
- <marcus at g10code.de>. All modifications are licensed as follows, so
- that the intersection of the two licenses is then the GNU General
- Public License version 2.
-
- 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
+ * Copyright (C) 2003 g10 Code GmbH
+ *
+ * The license of the original qstring.cpp file from which this file
+ * is derived can be found below. Modified by Marcus Brinkmann
+ * <marcus at g10code.de>. All modifications are licensed as follows, so
+ * that the intersection of the two licenses is then the GNU General
+ * Public License version 2.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0
+ */
/****************************************************************************
** $Id$
diff --git a/tqt/secqstring.h b/tqt/secqstring.h
index fa309df..e8fa554 100644
--- a/tqt/secqstring.h
+++ b/tqt/secqstring.h
@@ -1,27 +1,27 @@
/* secntqstring.h - Secure version of TQString.
- Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
- Copyright (C) 2003 g10 Code GmbH
-
- The license of the original ntqstring.h file from which this file is
- derived can be found below. Modified by Marcus Brinkmann
- <marcus at g10code.de>. All modifications are licensed as follows, so
- that the intersection of the two licenses is then the GNU General
- Public License version 2.
-
- 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., 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA */
+ * Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
+ * Copyright (C) 2003 g10 Code GmbH
+ *
+ * The license of the original ntqstring.h file from which this file is
+ * derived can be found below. Modified by Marcus Brinkmann
+ * <marcus at g10code.de>. All modifications are licensed as follows, so
+ * that the intersection of the two licenses is then the GNU General
+ * Public License version 2.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
+ * SPDX-License-Identifier: GPL-2.0
+ */
/****************************************************************************
** $Id$
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 16 +++++++++++++---
tqt/Makefile.am | 4 ++--
tqt/main.cpp | 38 +++++++++++++++++++-------------------
tqt/pinentrydialog.cpp | 37 ++++++++++++++++++-------------------
tqt/pinentrydialog.h | 34 +++++++++++++++++-----------------
tqt/secqinternal.cpp | 4 +++-
tqt/secqinternal_p.h | 2 ++
tqt/secqlineedit.cpp | 46 +++++++++++++++++++++++-----------------------
tqt/secqlineedit.h | 46 +++++++++++++++++++++++-----------------------
tqt/secqstring.cpp | 46 +++++++++++++++++++++++-----------------------
tqt/secqstring.h | 46 +++++++++++++++++++++++-----------------------
11 files changed, 166 insertions(+), 153 deletions(-)
hooks/post-receive
--
The standard pinentry collection
http://git.gnupg.org
More information about the Gnupg-commits
mailing list