Merge branch 'maint' into next

9 files changed, 3 insertions, 334 deletions

diff --git a/debian/e2fsprogs-l10n.copyright b/debian/e2fsprogs-l10n.copyright
deleted file mode 100644
index 514039e4..00000000
--- a/debian/e2fsprogs-l10n.copyright
+++ /dev/null
@@ -1,26 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: e2fsprogs
-Upstream-Contact: Theodore Ts'o <tytso@mit.edu>
-Source: http://sourceforge.net/projects/e2fsprogs
-Comment:
- This is the Debian GNU/Linux prepackaged version of the translation
- files of the EXT2 file system utilities.  The EXT2 utilities were
- written by Theodore Ts'o <tytso@mit.edu> and Remy Card
- <card@masi.ibp.fr>.
-
-Files: po/*
-Copyright: 1993-2022 Theodore Ts'o
-License: GPL-2
-
-Files: po/fr.po
-       po/vi.po
-Copyright: 2008, 2014 Theodore Ts'o
-           1996, 2014 Free Software Foundation, Inc.
-License: GPL-2
-
-License: GPL-2
- This package, the EXT2 filesystem utilities, is protected by the GNU
- General Public License version 2.
-Comment:
- On Debian GNU systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/libblkid.copyright b/debian/libblkid.copyright
deleted file mode 100644
index 8be818b5..00000000
--- a/debian/libblkid.copyright
+++ /dev/null
@@ -1,19 +0,0 @@
-This package was added to the e2fsprogs debian source package by
-Theodore Ts'o <tytso@mit.edu> on Sat Mar 15 15:33:37 EST 2003
-
-It is part of the main e2fsprogs distribution, which can be found at:
-
-	http://sourceforge.net/projects/e2fsprogs
-
-Upstream Author: Theodore Ts'o <tytso@mit.edu>
-
-Copyright:
-
-Copyright (C) 1999, 2001 by Andries Brouwer
-Copyright (C) 1999, 2000, 2003 by Theodore Ts'o
-
-You are free to distribute this software under the terms of the GNU
-Lesser (Library) General Public License.
-
-On Debian systems, the complete text of the GNU Lesser (Library)
-General Public License can be found in /usr/share/common-licenses/LGPL-2.
diff --git a/debian/libcom-err2.copyright b/debian/libcom-err2.copyright
deleted file mode 100644
index bd8e52ed..00000000
--- a/debian/libcom-err2.copyright
+++ /dev/null
@@ -1,127 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: e2fsprogs
-Upstream-Contact: Theodore Ts'o <tytso@mit.edu>
-Source: http://sourceforge.net/projects/e2fsprogs
-Comment:
- This is the Debian GNU/Linux prepackaged version of the Common Error
- Description library. It is currently distributed together with the EXT2 file
- system utilities.
- .
- This package was put together by Yann Dirson <dirson@debian.org>.
-
-Files: lib/et/*
-Copyright: 1987-1988 MIT Student Information Processing Board
-License: NTP-0
- Permission to use, copy, modify, and distribute this software and
- its documentation for any purpose is hereby granted, provided that
- the names of M.I.T. and the M.I.T. S.I.P.B. not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.  M.I.T. and the
- M.I.T. S.I.P.B. make no representations about the suitability of
- this software for any purpose.  It is provided "as is" without
- express or implied warranty.
-
-Files: lib/et/vfprintf.c
-Copyright: 1988 Regents of the University of California
-License: BSD-3-Clause-Variant
- Redistribution and use in source and binary forms are permitted
- provided that the above copyright notice and this paragraph are
- duplicated in all such forms and that any documentation,
- advertising materials, and other materials related to such
- distribution and use acknowledge that the software was developed
- by the University of California, Berkeley.  The name of the
- University may not be used to endorse or promote products derived
- from this software without specific prior written permission.
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
-Files: lib/et/com_err.texinfo
-Copyright: (C) 1987, 1988 Student Information Processing Board of the
- Massachusetts Institute of Technology.
-License: NTP
- Permission to use, copy, modify, and distribute this software
- and its documentation for any purpose and without fee is
- hereby granted, provided that the above copyright notice
- appear in all copies and that both that copyright notice and
- this permission notice appear in supporting documentation,
- and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
- used in advertising or publicity pertaining to distribution
- of the software without specific, written prior permission.
- M.I.T. and the M.I.T. S.I.P.B. make no representations about
- the suitability of this software for any purpose.  It is
- provided "as is" without express or implied warranty.
-
-Files: lib/et/com_right.c
-Comment: Taken from lib/com_err/error.c from Kerberos4kth distribution.
-Copyright: (c) 2003 by Theodore Ts'o
- Copyright (c) 1997, 1998, 2001 Kungliga Tekniska Högskolan
- (Royal Institute of Technology, Stockholm, Sweden).
- All rights reserved.
-License: BSD-3-Clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- .
- 3. Neither the name of the Institute nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
-Files: lib/et/test_cases/imap_err.et
-Copyright: 1994-2008 Carnegie Mellon University.
-License: BSD-4-Clause-CMU
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
- .
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
- .
- 3. The name "Carnegie Mellon University" must not be used to
-    endorse or promote products derived from this software without
-    prior written permission. For permission or any legal
-    details, please contact
-      Carnegie Mellon University
-      Center for Technology Transfer and Enterprise Creation
-      4615 Forbes Avenue
-      Suite 302
-      Pittsburgh, PA  15213
-      (412) 268-7393, fax: (412) 268-7395
-      innovation@andrew.cmu.edu
- .
- 4. Redistributions of any form whatsoever must retain the following
-    acknowledgment:
-    "This product includes software developed by Computing Services
-     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
- .
- CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
- THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
- FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/debian/libss2.copyright b/debian/libss2.copyright
deleted file mode 100644
index 758343a0..00000000
--- a/debian/libss2.copyright
+++ /dev/null
@@ -1,44 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: e2fsprogs
-Upstream-Contact: Theodore Ts'o <tytso@mit.edu>
-Source: http://sourceforge.net/projects/e2fsprogs
-Comment:
- This is the Debian GNU/Linux prepackaged version of the ss
- command-line interface parsing library. It is currently
- distributed together with the EXT2 file system utilities.
- .
- This package was put together by Yann Dirson <dirson@debian.org>.
-
-Files: lib/ss/*
-Copyright: 1987, 1988, 2003 MIT Student Information Processing Board
-License: NTP-0
-
-Files: lib/ss/mk_cmds.1
-Copyright: 2003 Theodore Ts'o
-License: NTP-0
-
-Files: lib/ss/mit-sipb-copyright.h
-Copyright: 1987 by the Student Information Processing Board
- of the Massachusetts Institute of Technology
-License: NTP
- Permission to use, copy, modify, and distribute this software
- and its documentation for any purpose and without fee is
- hereby granted, provided that the above copyright notice
- appear in all copies and that both that copyright notice and
- this permission notice appear in supporting documentation,
- and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
- used in advertising or publicity pertaining to distribution
- of the software without specific, written prior permission.
- M.I.T. and the M.I.T. S.I.P.B. make no representations about
- the suitability of this software for any purpose.  It is
- provided "as is" without express or implied warranty.
-
-License: NTP-0
- Permission to use, copy, modify, and distribute this software and
- its documentation for any purpose is hereby granted, provided that
- the names of M.I.T. and the M.I.T. S.I.P.B. not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.  M.I.T. and the
- M.I.T. S.I.P.B. make no representations about the suitability of
- this software for any purpose.  It is provided "as is" without
- express or implied warranty.
diff --git a/debian/libuuid1.copyright b/debian/libuuid1.copyright
deleted file mode 100644
index f346739f..00000000
--- a/debian/libuuid1.copyright
+++ /dev/null
@@ -1,38 +0,0 @@
-This package was added to the e2fsprogs debian source package by
-Theodore Ts'o <tytso@mit.edu> on Sat Mar 15 15:33:37 EST 2003
-
-It is part of the main e2fsprogs distribution, which can be found at:
-
-	http://sourceforge.net/projects/e2fsprogs
-
-Upstream Author: Theodore Ts'o <tytso@mit.edu>
-
-Copyright:
-
-Copyright (C) 1999, 2000, 2003, 2004 by Theodore Ts'o
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, and the entire permission notice in its entirety,
-   including the disclaimer of warranties.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote
-   products derived from this software without specific prior
-   written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
-WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/debian/uuid-dev.copyright b/debian/uuid-dev.copyright
deleted file mode 100644
index f346739f..00000000
--- a/debian/uuid-dev.copyright
+++ /dev/null
@@ -1,38 +0,0 @@
-This package was added to the e2fsprogs debian source package by
-Theodore Ts'o <tytso@mit.edu> on Sat Mar 15 15:33:37 EST 2003
-
-It is part of the main e2fsprogs distribution, which can be found at:
-
-	http://sourceforge.net/projects/e2fsprogs
-
-Upstream Author: Theodore Ts'o <tytso@mit.edu>
-
-Copyright:
-
-Copyright (C) 1999, 2000, 2003, 2004 by Theodore Ts'o
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, and the entire permission notice in its entirety,
-   including the disclaimer of warranties.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote
-   products derived from this software without specific prior
-   written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
-WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/debian/uuid-runtime.copyright b/debian/uuid-runtime.copyright
deleted file mode 100644
index afcd4c53..00000000
--- a/debian/uuid-runtime.copyright
+++ /dev/null
@@ -1,39 +0,0 @@
-This package was added to the e2fsprogs debian source package by
-Theodore Ts'o <tytso@mit.edu> on Fri Dec 14 22:24:35 EST 2007
-
-It is part of the main e2fsprogs distribution, which can be found at:
-
-	http://sourceforge.net/projects/e2fsprogs
-
-Upstream Author: Theodore Ts'o <tytso@mit.edu>
-
-Copyright:
-
-Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 by
-Theodore Ts'o
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, and the entire permission notice in its entirety,
-   including the disclaimer of warranties.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote
-   products derived from this software without specific prior
-   written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
-WHICH ARE HEREBY DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
diff --git a/doc/RelNotes/v1.46.6.txt b/doc/RelNotes/v1.46.6.txt
index 3e8c9f47..223a2e29 100644
--- a/doc/RelNotes/v1.46.6.txt
+++ b/doc/RelNotes/v1.46.6.txt
@@ -1,4 +1,4 @@
-E2fsprogs 1.46.6 (September 12, 2022)
+E2fsprogs 1.46.6 (February 1, 2023)
 =====================================
 
 Updates/Fixes since v1.46.5:
diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index 3e8cffaf..72ee4c81 100644
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,14 +1,14 @@
 Begin3
 Title:          EXT2 Filesystem utilities
 Version:        1.46.6
-Entered-date:   2022-09-12
+Entered-date:   2023-02-01
 Description:    The filesystem utilities for the EXT2, EXT3, and EXT4
 		filesystems, including e2fsck, mke2fs, dumpe2fs, and others.
 Keywords:       utilities, filesystem, Ext2fs, ext3, ext4
 Author:         tytso@mit.edu (Theodore Tso)
 Maintained-by:  tytso@mit.edu (Theodore Tso)
 Primary-site:   ftp.kernel.org /pub/linux/kernel/people/tytso/e2fsprogs
-                9392kB e2fsprogs-1.46.6.tar.gz
+                9400kB e2fsprogs-1.46.6.tar.gz
                 1kB    e2fsprogs-1.46.6.lsm
 pAlternate-site: download.sourceforge.net /pub/sourceforge/e2fsprogs
 Platforms:	linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x/4.x/5.x/6.x