libmount: cleanup licenses sections in the files

* add SPDX-License-Identifier (see https://spdx.org/licenses/)
* add "This file part of libmount from util-linux project."
* use proper text for LGPL-2.1-or-later
* use the same texts everywhere

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/libmount/mount.pc.in b/libmount/mount.pc.in
index 2c327978bcb0af9cc40cb4ce33dd9d6134ebad7f..7371b23c12a194dbc5ecd3f473f1bb716867e042 100644 (file)
--- a/libmount/mount.pc.in
+++ b/libmount/mount.pc.in
@@ -1,3 +1,14 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+#
+# This file is part of libmount from util-linux project.
+#
+# Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+#
+# libmount is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@usrlib_execdir@

diff --git a/libmount/src/btrfs.c b/libmount/src/btrfs.c
index 71567e4ce0ca36ba6d070a1414e7210b7c0f0f5c..a831ce83756c83fd08e2176c0bc986240ab2c95b 100644 (file)
--- a/libmount/src/btrfs.c
+++ b/libmount/src/btrfs.c
@@ -1,11 +1,16 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
+ * This file is part of libmount from util-linux project.
+ *
  * Copyright (C) 2016 David Sterba <dsterba@suse.cz>
  * Copyright (C) 2016 Stanislav Brabec <sbrabec@suse.cz>
  *
- * Based on kernel ctree.h, rbtree.h and btrfs-progs.
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Based on kernel ctree.h, rbtree.h and btrfs-progs.
  */
 #include <dirent.h>
 #include <sys/ioctl.h>

diff --git a/libmount/src/cache.c b/libmount/src/cache.c
index b52ca809801a9ca1f7fe2c485b978b1ea91287b8..659a72da5c9b2756eb4745ad6ee6e47e85b961b6 100644 (file)
--- a/libmount/src/cache.c
+++ b/libmount/src/cache.c
@@ -1,8 +1,13 @@
-/*
- * Copyright (C) 2009-2011 Karel Zak <kzak@redhat.com>
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
+/**
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/context.c b/libmount/src/context.c
index ac3daaf4e0047b962ba447e16741daf89e85efb3..26ee1e437cd76a6b6363959c7867c1bf5aba8fde 100644 (file)
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2010,2011,2012 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/context_loopdev.c b/libmount/src/context_loopdev.c
index 05ff71ae78897cf8b51a3bd4281900b0d11a6e33..c5fc80d77f98866aade9152ea196d43f8a2c97b3 100644 (file)
--- a/libmount/src/context_loopdev.c
+++ b/libmount/src/context_loopdev.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2011 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2011-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /*

diff --git a/libmount/src/context_mount.c b/libmount/src/context_mount.c
index bc3c993bcf4bf0b7384abca96339605f0f74c9de..f914c9b1bf51df1f620232c92242bd9f947ec24d 100644 (file)
--- a/libmount/src/context_mount.c
+++ b/libmount/src/context_mount.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/context_umount.c b/libmount/src/context_umount.c
index 645fefb6aa0158a04536984ee49868b558df5536..d72f5ccd0d81fbd85d4b59c5f91cb3b1e893898d 100644 (file)
--- a/libmount/src/context_umount.c
+++ b/libmount/src/context_umount.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/fs.c b/libmount/src/fs.c
index 98ce54d88c080eb300425692caf24eb49bd3dbda..9971d6ae312a6190a9a8a872ef3b10ecb52943c4 100644 (file)
--- a/libmount/src/fs.c
+++ b/libmount/src/fs.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/init.c b/libmount/src/init.c
index 29be282d59699815d6fb51fc36678f63d3359e51..a22922229039b62ff98fc35799ccd897ab6918b2 100644 (file)
--- a/libmount/src/init.c
+++ b/libmount/src/init.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/iter.c b/libmount/src/iter.c
index 016f88e3576d4b75836759b6193f98232d9e88be..891e2c8af2198056b75d4d402e978014c47af0e0 100644 (file)
--- a/libmount/src/iter.c
+++ b/libmount/src/iter.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index 3a9440371cfa1ad9237c10abb802956237f5f53d..63ba3225f61ea7df7d67f6bcd65e489f7fe44834 100644 (file)
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -1,7 +1,10 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * mount.h - libmount API
+ * libmount.h - libmount API
  *
- * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym
index 1db14b2b796454a14d014c2904c2789d75ad4c2a..ad7bd4786b107c39cbf5b13a929b43e9fa97787c 100644 (file)
--- a/libmount/src/libmount.sym
+++ b/libmount/src/libmount.sym
@@ -1,10 +1,20 @@
 /*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2011-2018 Karel Zak <kzak@redhat.com> 
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ *
  * The symbol versioning ensures that a new application requiring symbol foo,
  * can't run with old library.so not providing foo.
  *
  * Version info can't enforce this since we never change the SONAME.
- *
- * Copyright (C) 2011-2014 Karel Zak <kzak@redhat.com> 
  */
 MOUNT_2.19 {
 global:

diff --git a/libmount/src/lock.c b/libmount/src/lock.c
index f9d0253fb66d2a0aa94ac8d8eb7adb46857e0272..e6eefa13ae89c5d1968bd382743d2deea084cff5 100644 (file)
--- a/libmount/src/lock.c
+++ b/libmount/src/lock.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/monitor.c b/libmount/src/monitor.c
index 61b95f6ca09164a7de0c3ff280b83d3ccf1862b4..2383a734af4010088796bc514f0309fa68091be0 100644 (file)
--- a/libmount/src/monitor.c
+++ b/libmount/src/monitor.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2014 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2014-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/mountP.h b/libmount/src/mountP.h
index 0c795121afe467ce7b1b58189ef2d59b2cccbf8a..8f4fba7af70f7df359e235c31999705561ced54e 100644 (file)
--- a/libmount/src/mountP.h
+++ b/libmount/src/mountP.h
@@ -1,12 +1,16 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
  * mountP.h - private library header file
  *
- * Copyright (C) 2008-2012 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
-
 #ifndef _LIBMOUNT_PRIVATE_H
 #define _LIBMOUNT_PRIVATE_H
 

diff --git a/libmount/src/optmap.c b/libmount/src/optmap.c
index 0aa285f938cabdda2a7f1387bfdf3c759e480ffc..6136e27be180e41acf48ffb9349c17785a72f497 100644 (file)
--- a/libmount/src/optmap.c
+++ b/libmount/src/optmap.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/optstr.c b/libmount/src/optstr.c
index cc077ffd94d13a8571100e0944ae84286fffe619..c0f438fe2e2a77598daaee1d4e98eea33bcdd614 100644 (file)
--- a/libmount/src/optstr.c
+++ b/libmount/src/optstr.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2008,2009,2012 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/tab.c b/libmount/src/tab.c
index eb61dd33e87d134c71f4ce02eb65e04f4f5e64a9..d80fb0579b74058daafe4ba7fcbdad5276837b20 100644 (file)
--- a/libmount/src/tab.c
+++ b/libmount/src/tab.c
@@ -1,8 +1,14 @@
+
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2008-2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/tab_diff.c b/libmount/src/tab_diff.c
index 7c898697eb34d1181fa7ae705d3ecdca7473d8b1..70440bf8baec6ae9581bff62951976b9ab23d54f 100644 (file)
--- a/libmount/src/tab_diff.c
+++ b/libmount/src/tab_diff.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2011 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2011-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/tab_parse.c b/libmount/src/tab_parse.c
index 89f7c4d3047c0f9bff8ae20553e819773f385e6f..45ca45966d25fe732e2ce9281e3bfcd42f036dac 100644 (file)
--- a/libmount/src/tab_parse.c
+++ b/libmount/src/tab_parse.c
@@ -1,10 +1,14 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2009-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
-
 #ifdef HAVE_SCANDIRAT
 #ifndef __USE_GNU
 #define __USE_GNU

diff --git a/libmount/src/tab_update.c b/libmount/src/tab_update.c
index b08ac18c1bd0655e90ca623308de36e02ef7cd32..b685535151abd6e996e37d28b5a434161f04829f 100644 (file)
--- a/libmount/src/tab_update.c
+++ b/libmount/src/tab_update.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2010 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2011-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/test.c b/libmount/src/test.c
index 2da00b40d673f8a9fb009f1f2f0d75ce4c9e255b..0e3388c80056d3afc8815bcbc5781e31b774870a 100644 (file)
--- a/libmount/src/test.c
+++ b/libmount/src/test.c
@@ -1,8 +1,14 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
+ *
+ * Copyright (C) 2010-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
  *
  * Routines for TEST_PROGRAMs
  */

diff --git a/libmount/src/utils.c b/libmount/src/utils.c
index c478e2f9e7f69db6d9e36813250afd81392c2a44..034d3436f8a00f0ebd25abb4c4e4def8a4d6595c 100644 (file)
--- a/libmount/src/utils.c
+++ b/libmount/src/utils.c
@@ -1,8 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * Copyright (C) 2008-2009 Karel Zak <kzak@redhat.com>
+ * This file is part of libmount from util-linux project.
  *
- * This file may be redistributed under the terms of the
- * GNU Lesser General Public License.
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
+ *
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**

diff --git a/libmount/src/version.c b/libmount/src/version.c
index d3a981a4899719cb9d771e8679b14a394dc6ef4c..a7f3a9b608bb30617afb15e319b79441aa88e5b0 100644 (file)
--- a/libmount/src/version.c
+++ b/libmount/src/version.c
@@ -1,10 +1,13 @@
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
 /*
- * version.c - Return the version of the libmount library
+ * This file is part of libmount from util-linux project.
  *
- * Copyright (C) 2008 Karel Zak <kzak@redhat.com>
- * [Based on libblkid/version.c by Theodore Ts'o]
+ * Copyright (C) 2008-2018 Karel Zak <kzak@redhat.com>
  *
- * See COPYING.libmount for the License of this software.
+ * libmount is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
  */
 
 /**