Fix/Update copyright notices; Add SPDX annotation

Let's fix some erroneous/accidential references to wrong license,
update copyright information where applicable and introduce a
SPDX-License-Identifier to all files.

Change-Id: I39af26c6aaaf5c926966391f6565fc5936be21af

6 files changed, 18 insertions, 13 deletions

diff --git a/include/osmocom/core/bitcomp.h b/include/osmocom/core/bitcomp.h
index dc356bd8..5faa5ea4 100644
--- a/include/osmocom/core/bitcomp.h
+++ b/include/osmocom/core/bitcomp.h
@@ -1,10 +1,12 @@
 /*! \file bitcomp.h
  *  Osmocom bit compression routines. */
 /*
- * (C) 2016 sysmocom s.f.m.c. GmbH by Max Suraev <msuraev@sysmocom.de>
- *
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH
+ * Author: Max Suraev <msuraev@sysmocom.de>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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
diff --git a/include/osmocom/core/bitvec.h b/include/osmocom/core/bitvec.h
index 19466abb..c9bab398 100644
--- a/include/osmocom/core/bitvec.h
+++ b/include/osmocom/core/bitvec.h
@@ -1,6 +1,6 @@
 /* (C) 2009 by Harald Welte <laforge@gnumonks.org>
  * (C) 2012 Ivan Klyuchnikov
- * (C) 2015 Sysmocom s.f.m.c. GmbH
+ * (C) 2015 sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
diff --git a/include/osmocom/core/stats.h b/include/osmocom/core/stats.h
index f50796c4..e4d46baf 100644
--- a/include/osmocom/core/stats.h
+++ b/include/osmocom/core/stats.h
@@ -1,5 +1,5 @@
 /*
- * (C) 2015 by Sysmocom s.f.m.c. GmbH
+ * (C) 2015 by sysmocom - s.f.m.c. GmbH
  *
  * All Rights Reserved
  *
diff --git a/include/osmocom/gsm/gsm0808_utils.h b/include/osmocom/gsm/gsm0808_utils.h
index db156668..7432164d 100644
--- a/include/osmocom/gsm/gsm0808_utils.h
+++ b/include/osmocom/gsm/gsm0808_utils.h
@@ -2,22 +2,22 @@
  *  @{
  *  \file gsm0808_utils.h */
 /*
- * (C) 2016 by Sysmocom s.f.m.c. GmbH
+ * (C) 2016 by sysmocom - s.f.m.c. GmbH, Author: Philipp Maier
  * All Rights Reserved
  *
- * Author: Philipp Maier
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * 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/>.
  *
  */
diff --git a/include/osmocom/gsm/gsup.h b/include/osmocom/gsm/gsup.h
index 8daf4602..5cfe1ec1 100644
--- a/include/osmocom/gsm/gsup.h
+++ b/include/osmocom/gsm/gsup.h
@@ -16,10 +16,12 @@
  *  \file gsup.h
  *  Osmocom Generic Subscriber Update Protocol message encoder/decoder. */
 /*
- * (C) 2014 by sysmocom s.f.m.c. GmbH, Author: Jacob Erlbeck
+ * (C) 2014 by sysmocom - s.f.m.c. GmbH, Author: Jacob Erlbeck
  * (C) 2016 by Harald Welte <laforge@gnumonks.org>
  * All Rights Reserved
  *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
  * 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
diff --git a/include/osmocom/gsm/oap.h b/include/osmocom/gsm/oap.h
index ce1e1513..f33cb50a 100644
--- a/include/osmocom/gsm/oap.h
+++ b/include/osmocom/gsm/oap.h
@@ -8,10 +8,11 @@
  *
  *  \file oap.h */
 /*
- * (C) 2015-2016 by sysmocom s.f.m.c. GmbH
+ * (C) 2015-2016 by sysmocom - s.f.m.c. GmbH
+ * Author: Neels Hofmeyr
  * All Rights Reserved
  *
- * Author: Neels Hofmeyr
+ * SPDX-License-Identifier: GPL-2.0+
  *
  * 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