From 146b26349a13ecd1a7a3eb1fdb58d2a9f72d7444 Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Tue, 10 Apr 2018 18:29:26 -0700
Subject: [PATCH] Make licensing explicit, add missing GPL file headers

Since this repository has multi-licensed code, add GPL v2+ file headers
to code that had no licensing blocks to make it obvious which files
carry which license.

And add "AND GPL-3.0-or-later" to extension.json's license-name property
to make it clear that this extension does have code that isn't
redistributable under GPL v2.

Change-Id: Id3059fb9596527ef054bec9d89a28f1ccbe2113d
---
 extension.json                                   |  2 +-
 includes/OATHAuthHooks.php                       | 16 ++++++++++++++++
 includes/OATHAuthKey.php                         | 16 ++++++++++++++++
 includes/OATHAuthUtils.php                       | 16 ++++++++++++++++
 includes/OATHUser.php                            | 16 ++++++++++++++++
 includes/OATHUserRepository.php                  | 16 ++++++++++++++++
 includes/auth/TOTPAuthenticationRequest.php      | 16 ++++++++++++++++
 .../auth/TOTPSecondaryAuthenticationProvider.php | 16 ++++++++++++++++
 includes/special/ProxySpecialPage.php            | 16 ++++++++++++++++
 includes/special/SpecialOATH.php                 | 16 ++++++++++++++++
 includes/special/SpecialOATHDisable.php          | 16 ++++++++++++++++
 includes/special/SpecialOATHEnable.php           | 16 ++++++++++++++++
 12 files changed, 177 insertions(+), 1 deletion(-)

diff --git a/extension.json b/extension.json
index d4074976..c6b58388 100644
--- a/extension.json
+++ b/extension.json
@@ -8,7 +8,7 @@
 	"requires": {
 		"MediaWiki": ">= 1.31.0"
 	},
-	"license-name": "GPL-2.0-or-later",
+	"license-name": "GPL-2.0-or-later AND GPL-3.0-or-later",
 	"AutoloadClasses": {
 		"ApiOATHValidate": "includes/api/ApiOATHValidate.php",
 		"ApiQueryOATH": "includes/api/ApiQueryOATH.php",
diff --git a/includes/OATHAuthHooks.php b/includes/OATHAuthHooks.php
index 4a091651..8842b16a 100644
--- a/includes/OATHAuthHooks.php
+++ b/includes/OATHAuthHooks.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 use MediaWiki\Auth\AuthenticationRequest;
 use MediaWiki\MediaWikiServices;
diff --git a/includes/OATHAuthKey.php b/includes/OATHAuthKey.php
index 7281fc05..2e178803 100644
--- a/includes/OATHAuthKey.php
+++ b/includes/OATHAuthKey.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 /**
  * Class representing a two-factor key
diff --git a/includes/OATHAuthUtils.php b/includes/OATHAuthUtils.php
index 26f5ae60..2afd3bf8 100644
--- a/includes/OATHAuthUtils.php
+++ b/includes/OATHAuthUtils.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 /**
  * Utility class for various OATH functions
diff --git a/includes/OATHUser.php b/includes/OATHUser.php
index e346054f..ed1b4a16 100644
--- a/includes/OATHUser.php
+++ b/includes/OATHUser.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 /**
  * Class representing a user from OATH's perspective
diff --git a/includes/OATHUserRepository.php b/includes/OATHUserRepository.php
index cfbfdfd9..698ca49b 100644
--- a/includes/OATHUserRepository.php
+++ b/includes/OATHUserRepository.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\Rdbms\DBConnRef;
diff --git a/includes/auth/TOTPAuthenticationRequest.php b/includes/auth/TOTPAuthenticationRequest.php
index f3a6723d..c10f5e2f 100644
--- a/includes/auth/TOTPAuthenticationRequest.php
+++ b/includes/auth/TOTPAuthenticationRequest.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 use MediaWiki\Auth\AuthenticationRequest;
 
diff --git a/includes/auth/TOTPSecondaryAuthenticationProvider.php b/includes/auth/TOTPSecondaryAuthenticationProvider.php
index fe09d03f..90d69cc3 100644
--- a/includes/auth/TOTPSecondaryAuthenticationProvider.php
+++ b/includes/auth/TOTPSecondaryAuthenticationProvider.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 use MediaWiki\Auth\AbstractSecondaryAuthenticationProvider;
 use MediaWiki\Auth\AuthenticationRequest;
diff --git a/includes/special/ProxySpecialPage.php b/includes/special/ProxySpecialPage.php
index e09e9211..bdb808f0 100644
--- a/includes/special/ProxySpecialPage.php
+++ b/includes/special/ProxySpecialPage.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 /**
  * A proxy class that routes a special page to other special pages based on
diff --git a/includes/special/SpecialOATH.php b/includes/special/SpecialOATH.php
index f35fe7b9..21a854c2 100644
--- a/includes/special/SpecialOATH.php
+++ b/includes/special/SpecialOATH.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 /**
  * Proxy page that redirects to the proper OATH special page
diff --git a/includes/special/SpecialOATHDisable.php b/includes/special/SpecialOATHDisable.php
index 37820160..7e5758b9 100644
--- a/includes/special/SpecialOATHDisable.php
+++ b/includes/special/SpecialOATHDisable.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 /**
  * Special page to display key information to the user
diff --git a/includes/special/SpecialOATHEnable.php b/includes/special/SpecialOATHEnable.php
index 330e19fa..bf4b62e5 100644
--- a/includes/special/SpecialOATHEnable.php
+++ b/includes/special/SpecialOATHEnable.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * 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.
+ * http://www.gnu.org/copyleft/gpl.html
+ */
 
 /**
  * Special page to display key information to the user