changeset c23ca951b466 in /srv/hg/libpwquality
details:
http://hg.fedorahosted.org/hg/srv/hg/libpwquality?cmd=changeset;node=c23c...
summary: Clarified alternative licensing to GPLv2+.
diffstat:
COPYING | 6 ++----
libpwquality.spec.in | 4 ++--
python/pwquality.c | 6 ++----
python/setup.py | 8 +++-----
src/check.c | 6 ++----
src/error.c | 6 ++----
src/generate.c | 6 ++----
src/pam_pwquality.c | 6 ++----
src/pwmake.c | 6 ++----
src/pwqprivate.h | 6 ++----
src/pwquality.h | 6 ++----
src/pwscore.c | 6 ++----
src/settings.c | 6 ++----
13 files changed, 27 insertions(+), 51 deletions(-)
diffs (216 lines):
diff -r 120b1798114a -r c23ca951b466 COPYING
--- a/COPYING Fri Jun 29 11:04:35 2012 +0200
+++ b/COPYING Tue Aug 07 12:23:17 2012 +0200
@@ -21,10 +21,8 @@
written permission.
ALTERNATIVELY, this product may be distributed under the terms of the
-GNU General Public License, in which case the provisions of the GNU
-GPL are required INSTEAD OF the above restrictions. (This clause is
-necessary due to a potential conflict between the GNU GPL and the
-restrictions contained in a BSD-style copyright.)
+GNU General Public License version 2 or later, in which case the provisions
+of the GNU GPL are required INSTEAD OF the above restrictions.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
diff -r 120b1798114a -r c23ca951b466 libpwquality.spec.in
--- a/libpwquality.spec.in Fri Jun 29 11:04:35 2012 +0200
+++ b/libpwquality.spec.in Tue Aug 07 12:23:17 2012 +0200
@@ -2,9 +2,9 @@
Name: libpwquality
Version: @PACKAGE_VERSION@
Release: 1%{?dist}
-# The package is BSD licensed with option to relicense as GPL+
+# The package is BSD licensed with option to relicense as GPLv2+
# - this option is redundant as the BSD license allows that anyway.
-License: BSD or GPL+
+License: BSD or GPLv2+
Group: System Environment/Base
Source0:
http://fedorahosted.org/releases/l/i/libpwquality/libpwquality-%{version}...
diff -r 120b1798114a -r c23ca951b466 python/pwquality.c
--- a/python/pwquality.c Fri Jun 29 11:04:35 2012 +0200
+++ b/python/pwquality.c Tue Aug 07 12:23:17 2012 +0200
@@ -408,10 +408,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 python/setup.py
--- a/python/setup.py Fri Jun 29 11:04:35 2012 +0200
+++ b/python/setup.py Tue Aug 07 12:23:17 2012 +0200
@@ -34,7 +34,7 @@
author = 'Tomáš Mráz',
author_email = 'tm(a)t8m.info',
url = 'http://fedorahosted.org/libpwquality',
- license = 'BSD or GPL+',
+ license = 'BSD or GPLv2+',
ext_modules = [pwqmodule],
cmdclass = {'build_ext': build_ext}
)
@@ -56,10 +56,8 @@
# written permission.
#
# ALTERNATIVELY, this product may be distributed under the terms of
-# the GNU Public License, in which case the provisions of the GPL are
-# required INSTEAD OF the above restrictions. (This clause is
-# necessary due to a potential bad interaction between the GPL and
-# the restrictions contained in a BSD-style copyright.)
+# the GNU General Public License version 2 or later, in which case the
+# provisions of the GPL are required INSTEAD OF the above restrictions.
#
# THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/check.c
--- a/src/check.c Fri Jun 29 11:04:35 2012 +0200
+++ b/src/check.c Tue Aug 07 12:23:17 2012 +0200
@@ -695,10 +695,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/error.c
--- a/src/error.c Fri Jun 29 11:04:35 2012 +0200
+++ b/src/error.c Tue Aug 07 12:23:17 2012 +0200
@@ -173,10 +173,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/generate.c
--- a/src/generate.c Fri Jun 29 11:04:35 2012 +0200
+++ b/src/generate.c Tue Aug 07 12:23:17 2012 +0200
@@ -192,10 +192,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/pam_pwquality.c
--- a/src/pam_pwquality.c Fri Jun 29 11:04:35 2012 +0200
+++ b/src/pam_pwquality.c Tue Aug 07 12:23:17 2012 +0200
@@ -255,10 +255,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/pwmake.c
--- a/src/pwmake.c Fri Jun 29 11:04:35 2012 +0200
+++ b/src/pwmake.c Tue Aug 07 12:23:17 2012 +0200
@@ -85,10 +85,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/pwqprivate.h
--- a/src/pwqprivate.h Fri Jun 29 11:04:35 2012 +0200
+++ b/src/pwqprivate.h Tue Aug 07 12:23:17 2012 +0200
@@ -72,10 +72,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/pwquality.h
--- a/src/pwquality.h Fri Jun 29 11:04:35 2012 +0200
+++ b/src/pwquality.h Tue Aug 07 12:23:17 2012 +0200
@@ -149,10 +149,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/pwscore.c
--- a/src/pwscore.c Fri Jun 29 11:04:35 2012 +0200
+++ b/src/pwscore.c Tue Aug 07 12:23:17 2012 +0200
@@ -95,10 +95,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
diff -r 120b1798114a -r c23ca951b466 src/settings.c
--- a/src/settings.c Fri Jun 29 11:04:35 2012 +0200
+++ b/src/settings.c Tue Aug 07 12:23:17 2012 +0200
@@ -363,10 +363,8 @@
* written permission.
*
* ALTERNATIVELY, this product may be distributed under the terms of
- * the GNU Public License, in which case the provisions of the GPL are
- * required INSTEAD OF the above restrictions. (This clause is
- * necessary due to a potential bad interaction between the GPL and
- * the restrictions contained in a BSD-style copyright.)
+ * the GNU General Public License version 2 or later, in which case the
+ * provisions of the GPL are required INSTEAD OF the above restrictions.
*
* THIS SOFTWARE IS PROVIDED `AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES