Package: mtd-utils
Severity: normal
Please provide the new mtd-utils version 2.1.2. I created a patch series
with all necessary changes to import it.
From e6f21d34c8ea6a715d0d2d54155f4636d10e206d Mon Sep 17 00:00:00 2001
From: Bastian Germann <bastiangerm...@fishpost.de>
Date: Thu, 16 Jul 2020 21:55:18 +0200
Subject: [PATCH 1/5] Add d/watch with pubkey
---
debian/upstream/signing-key.asc | 30 ++++++++++++++++++++++++++++++
debian/watch | 3 +++
2 files changed, 33 insertions(+)
create mode 100644 debian/upstream/signing-key.asc
create mode 100644 debian/watch
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..14f1350
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,30 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFZyf0YBCADHyKhABhxthCC9n48pvsuk5p3IEdYXMs8Apenh1N/Z4cViAz/d
+/nSCZ+FGFX/PSubEzq8AilZLejchAltaORCvA1Y6FgTlpcdJ6gHDfStDbJL/vk5N
+8aL7YNF7VfjTRntBtKbhKcrG05nbdNjIioAm04pt9rx5mV5KMbf22/FdZpOSSsC6
+/N7b/cFH9+fx8kwi4pNFuJwrBkWRuQ7rEtCoSpd22t+Vh9qA7kymW9gWY405258j
+nN65jBO7ElqU2CCuGRPg6uryAHV3RVCB9j9AE3HLacQReFtt5ylyydSQbaK4K9as
+nd7U2/C11vIuuciXCppX4bPap/pMnGpzw0UNABEBAAG0N0RhdmlkIE9iZXJob2xs
+ZW56ZXIgPGRhdmlkLm9iZXJob2xsZW56ZXJAc2lnbWEtc3Rhci5hdD6JATcEEwEI
+ACEFAlZyf0YCGwMFCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQvOXcPHQaAtFu
+EAgArXOhaoaVvCMVCa5N25Q/+Q6K1wrVpPmkH89yhQqCmfM6f+2VM5MGFDPfaSJ3
+5fBDH0iwBQwlXIb7NSXWtzdXX9rMvJkJqv45TgeKtJApf/sRhmcN+clrwzP8oZQb
+xkP1YWzoVwo4lOb3Kv7aY9yeCjqNbdJJ57NpvYOUrzrCpGkrDPBBQOvKF3wbq3oU
+/o3dT23NDeQ20jXgquJf/PCw6WCzRxqg58wH02MdMDQe8vByzVig2bM2e7DErtt+
+hPK/Dmdsqgns+Z+SrQcOvRa3GMAHAuHB0u2LhYO6NyaNCgzdgutorilYcq7FEKr8
+XqwOnfVmZdCW3qGKmLbn6qMEdLkBDQRWcn9GAQgAvugF8cFjv2Zs4BBb44SnxGaw
+BySC1bMRas/MjA9EMHUAx/StcecQmxnl6BzEyGpr+TRnXIzcb5xI8SxitBDU5MLv
+wsHgNvpYp9fscd4kWP7oMir9ta3Q8SvT4OLbO4FZBGaURzGPak8JmjMMtOoOBh4m
+eOjz6GrJe9UIGxT94aB01w7YohfBANzK8xyk4ykKC5Op4XgaaMKOEQUah7wajcoj
+YSlvgOiXqEisMHlRDAW6sXL2sEM7TIpvYhy9txMLllpkYb0Pu1BvUpY/unsybWKA
+FyiTmeiY+nEveUvqX6Ef7BWdClBeCk2UaRvtcoLd22VxMlKTniHQcNMOXlRRawAR
+AQABiQEfBBgBCAAJBQJWcn9GAhsMAAoJELzl3Dx0GgLRPtcH/jD6rn2+VIKgrHdt
+3ao3Abpu2fqYfwbIyPAtpXOddDptVq+0A/2arXT1Y8+jNSZpbAg8K+bLaEAcSUEj
+viKMpfI7ppTUBuGKrpgc5xsiUpKkJCb7oB1ZraIBNBPtPPVUhbwLie4uW/LVt+8r
+BKz3W9KEDOsT0ZCG/pW8Ld+EpDR9l0fmqoVHaw8PhLAtez+B7HS7Hv7iJPDtX85k
+FYpud8kIPENXVn9EjZudyMWgZb2LhYlcavNcszgR7In6ift5SNySojCOfAV0iKZb
+8QUXWktLleY8kQ8jltOsSRTuO4PDfzvtCQDixUw4tQ7WLwDTqyUpot0oG03vtSG4
+LIRCdxI=
+=j0tV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..8f7a4da
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=4
+opts=mode=git,pgpmode=gittag \
+ git://git.infradead.org/mtd-utils.git refs/tags/v([\d\.]+)
--
2.28.0.rc0
From 9997b9bd39892451282a0c4df552bf1f15e6705c Mon Sep 17 00:00:00 2001
From: Bastian Germann <bastiangerm...@fishpost.de>
Date: Thu, 16 Jul 2020 22:59:22 +0200
Subject: [PATCH 2/5] d/copyright: Convert to DEP-5
Merge the ubi-tools paragraph into the general copyright paragraph.
"Toshiba America Electronics Components, Inc" is not found in the
current version.
---
debian/copyright | 131 +++++++++++++++++++++--------------------------
1 file changed, 57 insertions(+), 74 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index f1f1409..02a7910 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,15 @@
-This package was debianized by David Schleef <d...@debian.org> on
-Sat, 13 Jan 2001 10:48:08 -0800.
-
-It was downloaded from: git://git.infradead.org/mtd-utils.git
-Main web page for the project: http://www.linux-mtd.infradead.org/
-
-Upstream Author: David Woodhouse <dm...@infradead.org> and others
-
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: mtd-utils
+Upstream-Contact: David Oberhollenzer <david.oberhollen...@sigma-star.at>
+Source: git://git.infradead.org/mtd-utils.git
+License: GPL-2+
+Comment: This package was debianized by David Schleef <d...@debian.org>.
+
+Files: *
Copyright:
-
-mtd-tools is copyrighted by following entities:
-
Copyright (C) 2007-2008 Nokia Corporation. All rights reserved.
+ Copyright (C) 2007, 2008 Artem Bityutskiy
+ Copyright (C) 2006-2008 International Business Machines Corp.
2006 KaiGai Kohei <kai...@ak.jp.nec.com>
2005 Daniel Measurement and Control, Inc
Copyright (C) 2005 Sean Young <s...@mess.org>
@@ -29,32 +28,29 @@ mtd-tools is copyrighted by following entities:
2000 Steven J. Hill (sjh...@realitydiluted.com)
Copyright (C) 1999 David A. Hinds. All Rights Reserved.
(C) 1999 Andrea Arcangeli <and...@suse.de>
-
-most of mtd-tools is licensed under the terms of GNU GPL v2 ;
-the licence header is:
-
+License: GPL-2+
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
(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 General Public License for more details.
-
+.
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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-On Debian systems, the complete text of the GNU General Public
-License, version 2, can be found in /usr/share/common-licenses/GPL-2.
-
- flashcp.c, mtd_debug.c:
-
- * Copyright (c) 2d3D, Inc.
- * Written by Abraham vd Merwe <abra...@2d3d.co.za>
- *
+.
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
+
+Files: misc-utils/flashcp.c
+ misc-utils/mtd_debug.c
+Copyright: Copyright (c) 2d3D, Inc.
+ Written by Abraham vd Merwe <abra...@2d3d.co.za>
+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:
@@ -78,14 +74,12 @@ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
* 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.
- fec.c is:
-
- (C) 1997-98 Luigi Rizzo (lu...@iet.unipi.it)
-
- * Portions derived from code by Phil Karn (k...@ka9q.ampr.org),
- * Robert Morelos-Zaragoza (rob...@spectra.eng.hawaii.edu) and Hari
- * Thirumoorthy (ha...@spectra.eng.hawaii.edu), Aug 1995
- *
+Files: lib/libfec.c
+Copyright: (C) 1997-98 Luigi Rizzo (lu...@iet.unipi.it)
+ Portions derived from code by Phil Karn (k...@ka9q.ampr.org),
+ Robert Morelos-Zaragoza (rob...@spectra.eng.hawaii.edu) and Hari
+ Thirumoorthy (ha...@spectra.eng.hawaii.edu), Aug 1995
+License: BSD-2-clause
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -110,43 +104,32 @@ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
* OF SUCH DAMAGE.
- crc32.c is:
-
- COPYRIGHT (C) 1986 Gary S. Brown. You may use this program, or
- code or tables extracted from it, as desired without restriction.
-
- ubi-tools is GPL-2:
-
- Copyright (c) International Business Machines Corp., 2006-2008
- 2007 Frank Haverkamp <ha...@vnet.ibm.com>
- Copyright (C) 2007, 2008 Nokia Corporation
- Copyright (c) Artem Bityutskiy, 2007
- Copyright (C) 2000-2004 Steven J. Hill (sjh...@realitydiluted.com)
- Toshiba America Electronics Components, Inc
-
-
- libiniparser is:
-
-Copyright (c) 2000-2007 by Nicolas Devillard.
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-
-
+Files: lib/libcrc32.c
+Copyright: COPYRIGHT (C) 1986 Gary S. Brown
+License: unrestricted
+ You may use this program, or code or tables extracted from it,
+ as desired without restriction.
+
+Files: include/dictionary.h
+ include/libiniparser.h
+ lib/dictionary.c
+ lib/libiniparser.c
+Copyright: Copyright (c) 2000-2007 by Nicolas Devillard.
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
--
2.28.0.rc0
From 2f9d23673edfde6195d95e9a8a2446dd1fa74d85 Mon Sep 17 00:00:00 2001
From: Bastian Germann <bastiangerm...@fishpost.de>
Date: Thu, 16 Jul 2020 23:09:19 +0200
Subject: [PATCH 3/5] d/copyright: Add new copyrights for 2.1.2
---
debian/copyright | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 02a7910..9229f5e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -29,22 +29,6 @@ Copyright:
Copyright (C) 1999 David A. Hinds. All Rights Reserved.
(C) 1999 Andrea Arcangeli <and...@suse.de>
License: GPL-2+
- 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
- (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 General Public License for more details.
-.
- 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-.
- On Debian systems, the complete text of the GNU General Public
- License, version 2, can be found in /usr/share/common-licenses/GPL-2.
Files: misc-utils/flashcp.c
misc-utils/mtd_debug.c
@@ -133,3 +117,25 @@ License: Expat
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+
+Files: ubifs-utils/mkfs.ubifs/sign.*
+Copyright: Copyright (C) 2018 Pengutronix
+License: GPL-2+
+
+License: GPL-2+
+ 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
+ (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 General Public License for more details.
+ .
+ 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License, version 2, can be found in /usr/share/common-licenses/GPL-2.
--
2.28.0.rc0
From dc633ac97ff0f80a27006e0148a8c1e6958e0092 Mon Sep 17 00:00:00 2001
From: Bastian Germann <bastiangerm...@fishpost.de>
Date: Thu, 16 Jul 2020 23:12:33 +0200
Subject: [PATCH 4/5] Revert "lib*-dev: Don't include private kernel header"
This reverts commit 83154dbf5e8c222722cda595be9695f46993120e.
The patches are upstream.
---
.../libubi-remove-private-kernel-header.patch | 55 -------------------
...libubigen-remove-unnecessary-include.patch | 26 ---------
debian/patches/series | 2 -
3 files changed, 83 deletions(-)
delete mode 100644 debian/patches/libubi-remove-private-kernel-header.patch
delete mode 100644 debian/patches/libubigen-remove-unnecessary-include.patch
delete mode 100644 debian/patches/series
diff --git a/debian/patches/libubi-remove-private-kernel-header.patch b/debian/patches/libubi-remove-private-kernel-header.patch
deleted file mode 100644
index 8a49e92..0000000
--- a/debian/patches/libubi-remove-private-kernel-header.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 42e051acd32c28c2f93c946d0c4bf6f9eada2aa4 Mon Sep 17 00:00:00 2001
-From: Bastian Germann <bastiangerm...@fishpost.de>
-Date: Wed, 29 Jan 2020 19:50:13 +0100
-Subject: [PATCH] libubi: remove private kernel header from includes
-
-libubi.h includes ubi-media.h which was made private in the kernel a
-long time ago. There are users of libubi.h, e.g. swupdate, which have to
-have ubi-media.h available at build time with this inclusion.
-
-However, libubi.h uses only one symbol from ubi-media.h. Define that symbol
-in the header to enable using libubi.h without installing ubi-media.h.
-
-Make up for the transitive symbol use in ubiformat.c by including ubi-media.h.
-
-Signed-off-by: Bastian Germann <bastiangerm...@fishpost.de>
-Signed-off-by: David Oberhollenzer <david.oberhollen...@sigma-star.at>
----
- include/libubi.h | 4 +++-
- ubi-utils/ubiformat.c | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/include/libubi.h b/include/libubi.h
-index 46596a3..46c732a 100644
---- a/include/libubi.h
-+++ b/include/libubi.h
-@@ -26,7 +26,6 @@
- #include <ctype.h>
- #include <stdint.h>
- #include <mtd/ubi-user.h>
--#include <mtd/ubi-media.h>
-
- #ifdef __cplusplus
- extern "C" {
-@@ -38,6 +37,9 @@ extern "C" {
- /* Maximum physical eraseblock size in bytes */
- #define UBI_MAX_PEB_SZ (2*1024*1024)
-
-+/* The maximum volume name length (from Linux's ubi-media.h) */
-+#define UBI_VOL_NAME_MAX 127
-+
- /* UBI library descriptor */
- typedef void * libubi_t;
-
-diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c
-index be40e52..d1b12e4 100644
---- a/ubi-utils/ubiformat.c
-+++ b/ubi-utils/ubiformat.c
-@@ -38,6 +38,7 @@
- #include <getopt.h>
- #include <fcntl.h>
-
-+#include <mtd/ubi-media.h>
- #include <libubi.h>
- #include <libmtd.h>
- #include <libscan.h>
diff --git a/debian/patches/libubigen-remove-unnecessary-include.patch b/debian/patches/libubigen-remove-unnecessary-include.patch
deleted file mode 100644
index 74c1cf9..0000000
--- a/debian/patches/libubigen-remove-unnecessary-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 87809c4804d3355ecd2fd0bd3362526fa27bf953 Mon Sep 17 00:00:00 2001
-From: Bastian Germann <bastiangerm...@fishpost.de>
-Date: Wed, 29 Jan 2020 19:50:12 +0100
-Subject: [PATCH] libubigen: remove unnecessary include
-
-libubigen.h does not use any symbol from mtd/ubi-media.h,
-so remove it from includes.
-
-Signed-off-by: Bastian Germann <bastiangerm...@fishpost.de>
-Signed-off-by: David Oberhollenzer <david.oberhollen...@sigma-star.at>
----
- include/libubigen.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/include/libubigen.h b/include/libubigen.h
-index c25ac20..48d2fad 100644
---- a/include/libubigen.h
-+++ b/include/libubigen.h
-@@ -26,7 +26,6 @@
- #define __LIBUBIGEN_H__
-
- #include <stdint.h>
--#include <mtd/ubi-media.h>
-
- #ifdef __cplusplus
- extern "C" {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2b16aae..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-libubigen-remove-unnecessary-include.patch
-libubi-remove-private-kernel-header.patch
--
2.28.0.rc0
From 9dd19439698da09fe14fa957a74deee5cf1b0fe3 Mon Sep 17 00:00:00 2001
From: Bastian Germann <bastiangerm...@fishpost.de>
Date: Thu, 16 Jul 2020 23:50:05 +0200
Subject: [PATCH 5/5] Update debhelper to v13
---
debian/compat | 1 -
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
delete mode 100644 debian/compat
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
index 5d296b5..928f622 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mtd-utils
Section: utils
Priority: optional
Maintainer: Riku Voipio <riku.voi...@linaro.org>
-Build-Depends: debhelper (>= 9), pkg-config, dh-autoreconf, dh-exec (>= 0.3), zlib1g-dev, libacl1-dev, libcmocka-dev <!nocheck>, liblzo2-dev, uuid-dev, libzstd-dev
+Build-Depends: debhelper-compat (= 13), pkg-config, dh-exec (>= 0.3), zlib1g-dev, libacl1-dev, libcmocka-dev <!nocheck>, liblzo2-dev, uuid-dev, libzstd-dev
Build-Conflicts: libssl-dev
Standards-Version: 4.3.0
Homepage: http://www.linux-mtd.infradead.org/
diff --git a/debian/rules b/debian/rules
index b3103bb..492c46e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
%:
- dh $@ --parallel --with autoreconf
+ dh $@
override_dh_auto_configure:
dh_auto_configure -- --enable-test --enable-unit-tests
--
2.28.0.rc0
