parted: update to 3.3

Fixes build against recent glibc.

Signed-off-by: Markus Niebel <Markus.Niebel@tq-group.com>
Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com>
Message-Id: <20200217085302.20804-1-matthias.schiffer@ew.tq-group.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 11 insertions, 41 deletions

diff --git a/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch b/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch
deleted file mode 100644
index b2be0f21c..000000000
--- a/patches/parted-2.3/0001-make-sure-gets-is-defined-before-undefining-it.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 7 Dec 2012 11:47:58 +0100
-Subject: [PATCH] make sure 'gets' is defined before undefining it
-
-glibc 2.16 has removed gets completely
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- lib/stdio.in.h |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/lib/stdio.in.h b/lib/stdio.in.h
-index 79dda5f..e3ede74 100644
---- a/lib/stdio.in.h
-+++ b/lib/stdio.in.h
-@@ -142,8 +142,10 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
-+#if defined gets
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
diff --git a/patches/parted-2.3/series b/patches/parted-2.3/series
deleted file mode 100644
index 3aed33f27..000000000
--- a/patches/parted-2.3/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-sure-gets-is-defined-before-undefining-it.patch
-# 193fb47748b8a510e34ff1672ac111fc  - git-ptx-patches magic
diff --git a/rules/parted.in b/rules/parted.in
index 2e9f54a31..dbaef4b0a 100644
--- a/rules/parted.in
+++ b/rules/parted.in
@@ -1,18 +1,18 @@
-## SECTION=staging
-## old section:
-### SECTION=shell_and_console
+## SECTION=shell_and_console
 config PARTED
 	tristate
 	prompt "parted"
-	select GETTEXT
+	select HOST_GETTEXT
 	select READLINE
+	select LIBUUID
 	select E2FSPROGS
 	select NCURSES
+	depends on !BUSYBOX_PARTPROBE || ALLYES
 	help
 	  The GNU Parted program allows you to create, destroy, resize, move,
 	  and copy hard disk partitions. Parted can be used for creating space
 	  for new operating systems, reorganizing disk usage, and copying data
 	  to new hard disks.
 
-	  STAGING: remove in ptxdist-2020.06.0
-	  Old version that need to be updated. Fails to build with glibc-2.28.
+comment "busybox' partprobe is selected!"
+	depends on BUSYBOX_PARTPROBE
diff --git a/rules/parted.make b/rules/parted.make
index 6b994f372..eca3f9eee 100644
--- a/rules/parted.make
+++ b/rules/parted.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_PARTED) += parted
 #
 # Paths and names
 #
-PARTED_VERSION	:= 2.3
-PARTED_MD5	:= 30ceb6df7e8681891e865e2fe5a7903d
+PARTED_VERSION	:= 3.3
+PARTED_MD5	:= 090655d05f3c471aa8e15a27536889ec
 PARTED		:= parted-$(PARTED_VERSION)
-PARTED_SUFFIX	:= tar.gz
+PARTED_SUFFIX	:= tar.xz
 PARTED_URL	:= $(call ptx/mirror, GNU, parted/$(PARTED).$(PARTED_SUFFIX))
 PARTED_SOURCE	:= $(SRCDIR)/$(PARTED).$(PARTED_SUFFIX)
 PARTED_DIR	:= $(BUILDDIR)/$(PARTED)
@@ -29,8 +29,8 @@ PARTED_LICENSE	:= GPL-3.0-only
 PARTED_CONF_TOOL := autoconf
 PARTED_CONF_OPT  := \
 	$(CROSS_AUTOCONF_USR) \
-	--disable-device-mapper \
-	--disable-Werror
+	--without-readline \
+	--disable-device-mapper
 
 # ----------------------------------------------------------------------------
 # Target-Install