From 147d5faccff683f31afbd9d6f79ca23f25483698 Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Tue, 21 Aug 2007 16:26:07 +0000 Subject: [PATCH] Fix inconsistent licence notices: executables are GPLv2; libraries LGPLv2.1. --- WHATS_NEW_DM | 3 ++- daemons/dmeventd/Makefile.in | 2 +- daemons/dmeventd/dmeventd.h | 14 ++++++++++++++ daemons/dmeventd/libdevmapper-event.c | 2 +- daemons/dmeventd/libdevmapper-event.h | 2 +- libdm/Makefile.in | 2 +- libdm/datastruct/bitset.c | 6 +++--- libdm/datastruct/bitset.h | 6 +++--- libdm/datastruct/hash.c | 6 +++--- libdm/datastruct/hash.h | 6 +++--- libdm/ioctl/libdm-compat.h | 2 +- libdm/ioctl/libdm-iface.c | 3 +-- libdm/ioctl/libdm-targets.h | 2 +- libdm/libdevmapper.h | 2 +- libdm/libdm-common.c | 2 +- libdm/libdm-common.h | 2 +- libdm/libdm-deptree.c | 2 +- libdm/libdm-file.c | 7 +++---- libdm/libdm-file.h | 25 ------------------------- libdm/libdm-report.c | 9 ++++----- libdm/libdm-string.c | 6 +++--- libdm/mm/dbg_malloc.c | 6 +++--- libdm/mm/dbg_malloc.h | 6 +++--- libdm/mm/pool-debug.c | 4 ++-- libdm/mm/pool-fast.c | 6 +++--- libdm/mm/pool.c | 4 ++-- libdm/mm/pool.h | 6 +++--- libdm/regex/matcher.c | 4 ++-- libdm/regex/parse_rx.c | 4 ++-- libdm/regex/parse_rx.h | 4 ++-- libdm/regex/ttree.c | 4 ++-- libdm/regex/ttree.h | 4 ++-- tools/dmsetup.c | 2 +- 33 files changed, 76 insertions(+), 89 deletions(-) delete mode 100644 libdm/libdm-file.h diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM index a367db4d0..e055b8a97 100644 --- a/WHATS_NEW_DM +++ b/WHATS_NEW_DM @@ -1,9 +1,10 @@ Version 1.02.22 - ================================ + Fix inconsistent licence notices: executables are GPLv2; libraries LGPLv2.1. Update to use autoconf 2.61, while still supporting 2.57. Avoid repeated dm_task free on some dm_event_get_registered_device errors. Introduce log_sys_* macros from LVM2. - Export dm_fclose and dm_create_dir. + Export dm_fclose and dm_create_dir; remove libdm-file.h. Don't log EROFS mkdir failures in _create_dir_recursive (for LVM2). Add fclose wrapper dm_fclose that catches write failures (using ferror). diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in index 8b5571199..f9bc3c553 100644 --- a/daemons/dmeventd/Makefile.in +++ b/daemons/dmeventd/Makefile.in @@ -1,5 +1,5 @@ # -# Copyright (C) 2005 Red Hat, Inc. All rights reserved. +# Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. # # This file is part of the device-mapper userspace tools. # diff --git a/daemons/dmeventd/dmeventd.h b/daemons/dmeventd/dmeventd.h index d7474b838..c8fe74698 100644 --- a/daemons/dmeventd/dmeventd.h +++ b/daemons/dmeventd/dmeventd.h @@ -1,3 +1,17 @@ +/* + * Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. + * + * This file is part of the device-mapper userspace tools. + * + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License v.2.1. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + #ifndef __DMEVENTD_DOT_H__ #define __DMEVENTD_DOT_H__ diff --git a/daemons/dmeventd/libdevmapper-event.c b/daemons/dmeventd/libdevmapper-event.c index a13a11157..f9fab592e 100644 --- a/daemons/dmeventd/libdevmapper-event.c +++ b/daemons/dmeventd/libdevmapper-event.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * diff --git a/daemons/dmeventd/libdevmapper-event.h b/daemons/dmeventd/libdevmapper-event.h index 87acf0d4c..25f5152ad 100644 --- a/daemons/dmeventd/libdevmapper-event.h +++ b/daemons/dmeventd/libdevmapper-event.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * diff --git a/libdm/Makefile.in b/libdm/Makefile.in index 7db4f4e81..ca6eebcda 100644 --- a/libdm/Makefile.in +++ b/libdm/Makefile.in @@ -1,6 +1,6 @@ # # Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. -# Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. +# Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. # # This file is part of the device-mapper userspace tools. # diff --git a/libdm/datastruct/bitset.c b/libdm/datastruct/bitset.c index 060481fbc..aaf678787 100644 --- a/libdm/datastruct/bitset.c +++ b/libdm/datastruct/bitset.c @@ -1,14 +1,14 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/datastruct/bitset.h b/libdm/datastruct/bitset.h index bb7924ecd..d4b161fbc 100644 --- a/libdm/datastruct/bitset.h +++ b/libdm/datastruct/bitset.h @@ -1,14 +1,14 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/datastruct/hash.c b/libdm/datastruct/hash.c index 9362d1de5..8f0b82f9c 100644 --- a/libdm/datastruct/hash.c +++ b/libdm/datastruct/hash.c @@ -1,14 +1,14 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/datastruct/hash.h b/libdm/datastruct/hash.h index 13b7c8627..2b86931bb 100644 --- a/libdm/datastruct/hash.h +++ b/libdm/datastruct/hash.h @@ -1,14 +1,14 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/ioctl/libdm-compat.h b/libdm/ioctl/libdm-compat.h index 7a7e75237..d5d302f4a 100644 --- a/libdm/ioctl/libdm-compat.h +++ b/libdm/ioctl/libdm-compat.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c index 6fd7eeca3..3de9ee4c4 100644 --- a/libdm/ioctl/libdm-iface.c +++ b/libdm/ioctl/libdm-iface.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * @@ -16,7 +16,6 @@ #include "lib.h" #include "libdm-targets.h" #include "libdm-common.h" -#include "libdm-file.h" #ifdef DM_COMPAT # include "libdm-compat.h" diff --git a/libdm/ioctl/libdm-targets.h b/libdm/ioctl/libdm-targets.h index 9df9f1421..5b037303f 100644 --- a/libdm/ioctl/libdm-targets.h +++ b/libdm/ioctl/libdm-targets.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index c7a60590c..a00345b49 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c index 7a50c5ee2..c8c3500a4 100644 --- a/libdm/libdm-common.c +++ b/libdm/libdm-common.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * diff --git a/libdm/libdm-common.h b/libdm/libdm-common.h index e40871b7f..9fefa4451 100644 --- a/libdm/libdm-common.h +++ b/libdm/libdm-common.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c index ec96e908b..f0c9de29c 100644 --- a/libdm/libdm-deptree.c +++ b/libdm/libdm-deptree.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * diff --git a/libdm/libdm-file.c b/libdm/libdm-file.c index c61cb565f..5fce80633 100644 --- a/libdm/libdm-file.c +++ b/libdm/libdm-file.c @@ -1,20 +1,19 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "lib.h" -#include "libdm-file.h" #include #include diff --git a/libdm/libdm-file.h b/libdm/libdm-file.h deleted file mode 100644 index b2d48e210..000000000 --- a/libdm/libdm-file.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. - * - * This file is part of the device-mapper userspace tools. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. - * - * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef LIB_DMFILE_H -#define LIB_DMFILE_H - -/* - * Create directory (recursively) if necessary. Return 1 - * if directory was successfully created (or already exists), else 0. - */ -int create_dir(const char *dir); - -#endif diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c index 1bff83856..182198fb0 100644 --- a/libdm/libdm-report.c +++ b/libdm/libdm-report.c @@ -1,15 +1,14 @@ /* * Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * - * This file is part of device-mapper userspace tools. - * The code is based on LVM2 report function. + * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/libdm-string.c b/libdm/libdm-string.c index 4b6a8368a..ab68b654f 100644 --- a/libdm/libdm-string.c +++ b/libdm/libdm-string.c @@ -1,13 +1,13 @@ /* - * Copyright (C) 2006 Red Hat, Inc. All rights reserved. + * Copyright (C) 2006-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/mm/dbg_malloc.c b/libdm/mm/dbg_malloc.c index 24044fec9..3d0765035 100644 --- a/libdm/mm/dbg_malloc.c +++ b/libdm/mm/dbg_malloc.c @@ -1,14 +1,14 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/mm/dbg_malloc.h b/libdm/mm/dbg_malloc.h index 2399725b1..698687180 100644 --- a/libdm/mm/dbg_malloc.h +++ b/libdm/mm/dbg_malloc.h @@ -1,14 +1,14 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/mm/pool-debug.c b/libdm/mm/pool-debug.c index d680768b3..1700c59f9 100644 --- a/libdm/mm/pool-debug.c +++ b/libdm/mm/pool-debug.c @@ -6,9 +6,9 @@ * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/mm/pool-fast.c b/libdm/mm/pool-fast.c index 73c034a52..4071c72d4 100644 --- a/libdm/mm/pool-fast.c +++ b/libdm/mm/pool-fast.c @@ -1,14 +1,14 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2006 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/mm/pool.c b/libdm/mm/pool.c index f9518041b..fa6c4bbc8 100644 --- a/libdm/mm/pool.c +++ b/libdm/mm/pool.c @@ -6,9 +6,9 @@ * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/mm/pool.h b/libdm/mm/pool.h index 505f0a6b7..68a0afabb 100644 --- a/libdm/mm/pool.h +++ b/libdm/mm/pool.h @@ -1,14 +1,14 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. - * Copyright (C) 2004-2005 Red Hat, Inc. All rights reserved. + * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. * * This file is part of the device-mapper userspace tools. * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/regex/matcher.c b/libdm/regex/matcher.c index 6427d1908..24c12ae42 100644 --- a/libdm/regex/matcher.c +++ b/libdm/regex/matcher.c @@ -6,9 +6,9 @@ * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/regex/parse_rx.c b/libdm/regex/parse_rx.c index 9c2a11cf9..976a6b899 100644 --- a/libdm/regex/parse_rx.c +++ b/libdm/regex/parse_rx.c @@ -6,9 +6,9 @@ * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/regex/parse_rx.h b/libdm/regex/parse_rx.h index e4d0f0f02..1c2393fc1 100644 --- a/libdm/regex/parse_rx.h +++ b/libdm/regex/parse_rx.h @@ -6,9 +6,9 @@ * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/regex/ttree.c b/libdm/regex/ttree.c index b58b7500d..da9b46cda 100644 --- a/libdm/regex/ttree.c +++ b/libdm/regex/ttree.c @@ -6,9 +6,9 @@ * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/libdm/regex/ttree.h b/libdm/regex/ttree.h index 7f2ba3119..b4e3ba211 100644 --- a/libdm/regex/ttree.h +++ b/libdm/regex/ttree.h @@ -6,9 +6,9 @@ * * This copyrighted material is made available to anyone wishing to use, * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU General Public License v.2. + * of the GNU Lesser General Public License v.2.1. * - * You should have received a copy of the GNU General Public License + * You should have received a copy of the GNU Lesser General Public License * along with this program; if not, write to the Free Software Foundation, * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 363e82482..562f6288b 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved. - * Copyright (C) 2005-2007 NEC Corperation + * Copyright (C) 2005-2007 NEC Corporation * * This file is part of the device-mapper userspace tools. *