From: Karel Zak Date: Thu, 16 Aug 2018 13:43:53 +0000 (+0200) Subject: libmount: cleanup licenses sections in the files X-Git-Tag: v2.33-rc1~54 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c37ca7c4b766d08ed604eac17fea42e86916c2d;p=thirdparty%2Futil-linux.git 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 --- diff --git a/libmount/mount.pc.in b/libmount/mount.pc.in index 2c327978bc..7371b23c12 100644 --- 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 +# +# 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 71567e4ce0..a831ce8375 100644 --- 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 * Copyright (C) 2016 Stanislav Brabec * - * 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 #include diff --git a/libmount/src/cache.c b/libmount/src/cache.c index b52ca80980..659a72da5c 100644 --- a/libmount/src/cache.c +++ b/libmount/src/cache.c @@ -1,8 +1,13 @@ -/* - * Copyright (C) 2009-2011 Karel Zak +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/** + * This file is part of libmount from util-linux project. + * + * Copyright (C) 2009-2018 Karel Zak * - * 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 ac3daaf4e0..26ee1e437c 100644 --- 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 + * 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 + * + * 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 05ff71ae78..c5fc80d77f 100644 --- 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 + * 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 + * + * 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 bc3c993bcf..f914c9b1bf 100644 --- 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 + * 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 + * + * 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 645fefb6aa..d72f5ccd0d 100644 --- 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 + * 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 + * + * 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 98ce54d88c..9971d6ae31 100644 --- 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 + * 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 + * + * 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 29be282d59..a229222290 100644 --- 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 + * 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 + * + * 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 016f88e357..891e2c8af2 100644 --- 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 + * 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 + * + * 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 3a9440371c..63ba3225f6 100644 --- 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 + * This file is part of libmount from util-linux project. + * + * Copyright (C) 2008-2018 Karel Zak * * 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 1db14b2b79..ad7bd4786b 100644 --- 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 + * + * 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 */ MOUNT_2.19 { global: diff --git a/libmount/src/lock.c b/libmount/src/lock.c index f9d0253fb6..e6eefa13ae 100644 --- 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 + * 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 + * + * 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 61b95f6ca0..2383a734af 100644 --- 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 + * 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 + * + * 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 0c795121af..8f4fba7af7 100644 --- 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 + * 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 + * + * 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 0aa285f938..6136e27be1 100644 --- 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 + * 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 + * + * 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 cc077ffd94..c0f438fe2e 100644 --- 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 + * 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 + * + * 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 eb61dd33e8..d80fb0579b 100644 --- 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 + * This file is part of libmount from util-linux project. + * + * Copyright (C) 2008-2018 Karel Zak * - * 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 7c898697eb..70440bf8ba 100644 --- 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 + * 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 + * + * 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 89f7c4d304..45ca45966d 100644 --- 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 + * 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 + * + * 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 b08ac18c1b..b685535151 100644 --- 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 + * 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 + * + * 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 2da00b40d6..0e3388c800 100644 --- 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 + * This file is part of libmount from util-linux project. + * + * Copyright (C) 2010-2018 Karel Zak + * + * 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 c478e2f9e7..034d3436f8 100644 --- 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 + * 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 + * + * 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 d3a981a489..a7f3a9b608 100644 --- 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 - * [Based on libblkid/version.c by Theodore Ts'o] + * Copyright (C) 2008-2018 Karel Zak * - * 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. */ /**