Change in libosmocore[master]: oap_client: Fix license: GPLv2+ instead of AGPLv3+

Harald Welte gerrit-no-reply at lists.osmocom.org
Mon May 27 21:49:51 UTC 2019


Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/14212 )

Change subject: oap_client: Fix license: GPLv2+ instead of AGPLv3+
......................................................................

oap_client: Fix license: GPLv2+ instead of AGPLv3+

libosmo{core,gsm,vty} code is GPLv2+.  The OAP code originated in
osmo-msc.git and was moved here without changing the license. That
was a mistake, it always was meant to be under GPLv2-or-later after
moving to libosmocore.git.

Copyright is with sysmocom, so I as the managing director can
approve the license change.

Change-Id: I08311fa8214c15f8df8945b9894226608cf96f15
---
M include/osmocom/gsm/oap_client.h
M src/gsm/oap_client.c
M tests/oap/oap_client_test.c
3 files changed, 16 insertions(+), 12 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/gsm/oap_client.h b/include/osmocom/gsm/oap_client.h
index 763f982..f94cc83 100644
--- a/include/osmocom/gsm/oap_client.h
+++ b/include/osmocom/gsm/oap_client.h
@@ -6,18 +6,19 @@
  * Author: Neels Hofmeyr
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * 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 Affero General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * SPDX-License-Identifier: GPL-2.0+
  */
 
 #pragma once
diff --git a/src/gsm/oap_client.c b/src/gsm/oap_client.c
index ea40634..a2974b5 100644
--- a/src/gsm/oap_client.c
+++ b/src/gsm/oap_client.c
@@ -6,18 +6,20 @@
  * Author: Neels Hofmeyr
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * 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 Affero General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  */
 
 #include <string.h>
diff --git a/tests/oap/oap_client_test.c b/tests/oap/oap_client_test.c
index a841b38..dadf2ee 100644
--- a/tests/oap/oap_client_test.c
+++ b/tests/oap/oap_client_test.c
@@ -4,18 +4,19 @@
  * All Rights Reserved
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
+ * 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 Affero General Public License for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
+ * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
+ * SPDX-License-Identifier: GPLv2+
  */
 
 #include <osmocom/core/application.h>

-- 
To view, visit https://gerrit.osmocom.org/14212
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I08311fa8214c15f8df8945b9894226608cf96f15
Gerrit-Change-Number: 14212
Gerrit-PatchSet: 3
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190527/e2e78e61/attachment.html>


More information about the gerrit-log mailing list