* [ptxdist] [PATCH] minicom: Version bump. 2.8 -> 2.9
@ 2023-09-25 17:15 Christian Melki
2023-09-28 15:08 ` [ptxdist] [APPLIED] " Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2023-09-25 17:15 UTC (permalink / raw)
To: ptxdist
Minor bugfix release.
(Hardware Flow Control is now default off, yay!)
https://salsa.debian.org/minicom-team/minicom/-/releases/2.9
* Move URL to debian gitlab.
* Pin down some options, lockdev is default enabled.
* Remove patch that is included and fix offset in the remaining one.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...b-usleep.c-fix-error-NULL-undeclared.patch | 27 -------------------
patches/minicom-2.8/series | 5 ----
.../0001-build-reproducibly.patch | 6 ++---
patches/minicom-2.9/series | 4 +++
rules/minicom.make | 9 ++++---
5 files changed, 12 insertions(+), 39 deletions(-)
delete mode 100644 patches/minicom-2.8/0002-lib-usleep.c-fix-error-NULL-undeclared.patch
delete mode 100644 patches/minicom-2.8/series
rename patches/{minicom-2.8 => minicom-2.9}/0001-build-reproducibly.patch (87%)
create mode 100644 patches/minicom-2.9/series
diff --git a/patches/minicom-2.8/0002-lib-usleep.c-fix-error-NULL-undeclared.patch b/patches/minicom-2.8/0002-lib-usleep.c-fix-error-NULL-undeclared.patch
deleted file mode 100644
index 79e414295..000000000
--- a/patches/minicom-2.8/0002-lib-usleep.c-fix-error-NULL-undeclared.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Roland Hieber <rhi@pengutronix.de>
-Date: Mon, 24 May 2021 22:52:00 +0200
-Subject: [PATCH] lib/usleep.c: fix error: 'NULL' undeclared
-
-This fixes compilation with GCC 11:
-
- usleep.c: In function 'usleep':
- usleep.c:14:12: error: 'NULL' undeclared (first use in this function)
- usleep.c:14:12: note: 'NULL' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'?
- usleep.c:14:12: note: each undeclared identifier is reported only once for each function it appears in
- make[2]: *** [Makefile:365: usleep.o] Error 1
----
- lib/usleep.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/usleep.c b/lib/usleep.c
-index af9dd0326024..861c00ad97d1 100644
---- a/lib/usleep.c
-+++ b/lib/usleep.c
-@@ -2,6 +2,7 @@
- # include <config.h>
- #endif
-
-+#include <stddef.h>
- #include <sys/time.h>
- #include <sys/select.h>
-
diff --git a/patches/minicom-2.8/series b/patches/minicom-2.8/series
deleted file mode 100644
index 259f67ccf..000000000
--- a/patches/minicom-2.8/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-build-reproducibly.patch
-0002-lib-usleep.c-fix-error-NULL-undeclared.patch
-# beb4273308afd0935d7b8b27ba4f2497 - git-ptx-patches magic
diff --git a/patches/minicom-2.8/0001-build-reproducibly.patch b/patches/minicom-2.9/0001-build-reproducibly.patch
similarity index 87%
rename from patches/minicom-2.8/0001-build-reproducibly.patch
rename to patches/minicom-2.9/0001-build-reproducibly.patch
index 2d48c129a..ba445171e 100644
--- a/patches/minicom-2.8/0001-build-reproducibly.patch
+++ b/patches/minicom-2.9/0001-build-reproducibly.patch
@@ -8,10 +8,10 @@ Origin: Debian, https://sources.debian.org/patches/minicom/2.8-1/04reproducible.
1 file changed, 6 deletions(-)
diff --git a/src/minicom.c b/src/minicom.c
-index cfdb76396968..bf3ad17ca089 100644
+index c9ce75c223be..8a006a3e039f 100644
--- a/src/minicom.c
+++ b/src/minicom.c
-@@ -1248,9 +1248,6 @@ int main(int argc, char **argv)
+@@ -1323,9 +1323,6 @@ int main(int argc, char **argv)
switch(c) {
case 'v':
printf(_("%s version %s"), PACKAGE, VERSION);
@@ -21,7 +21,7 @@ index cfdb76396968..bf3ad17ca089 100644
printf("\n");
printf(_("Copyright (C) Miquel van Smoorenburg.\n\n"));
printf(_("This program is free software; you can redistribute it and/or\n"
-@@ -1580,9 +1577,6 @@ int main(int argc, char **argv)
+@@ -1659,9 +1656,6 @@ int main(int argc, char **argv)
mc_wprintf(us, "\n%s %s\r\n", _("Welcome to minicom"), VERSION);
mc_wprintf(us, "\n%s: %s\r\n", _("OPTIONS"), option_string);
diff --git a/patches/minicom-2.9/series b/patches/minicom-2.9/series
new file mode 100644
index 000000000..a3135b429
--- /dev/null
+++ b/patches/minicom-2.9/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-build-reproducibly.patch
+# efe12230191a1ea2d64341d06c8f792b - git-ptx-patches magic
diff --git a/rules/minicom.make b/rules/minicom.make
index e757b3230..473a3668b 100644
--- a/rules/minicom.make
+++ b/rules/minicom.make
@@ -16,12 +16,11 @@ PACKAGES-$(PTXCONF_MINICOM) += minicom
#
# Paths and names
#
-MINICOM_VERSION := 2.8
-MINICOM_MD5 := d32eb2e615f286611c4d1877a25939be
+MINICOM_VERSION := 2.9
+MINICOM_MD5 := e61ea3d07e73e245513c119e91989254
MINICOM_SUFFIX := tar.bz2
MINICOM := minicom-$(MINICOM_VERSION)
-MINICOM_TARBALL := minicom_$(MINICOM_VERSION).orig.$(MINICOM_SUFFIX)
-MINICOM_URL := http://snapshot.debian.org/archive/debian/20210524T032801Z/pool/main/m/minicom/$(MINICOM_TARBALL)
+MINICOM_URL := https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION)/$(MINICOM).$(MINICOM_SUFFIX)
MINICOM_SOURCE := $(SRCDIR)/$(MINICOM).$(MINICOM_SUFFIX)
MINICOM_DIR := $(BUILDDIR)/$(MINICOM)
MINICOM_LICENSE := LGPL-2.0-or-later AND xinetd AND GPL-2.0-or-later
@@ -41,9 +40,11 @@ MINICOM_LICENSE_FILES := \
MINICOM_CONF_TOOL := autoconf
MINICOM_CONF_OPT := \
$(CROSS_AUTOCONF_USR) \
+ $(GLOBAL_LARGE_FILE_OPTION) \
--disable-rpath \
--disable-music \
--enable-socket \
+ --enable-lockdev \
--enable-lock-dir=/var/lock \
--enable-dfl-port=/dev/modem \
--enable-dfl-baud=115200 \
--
2.34.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] minicom: Version bump. 2.8 -> 2.9
2023-09-25 17:15 [ptxdist] [PATCH] minicom: Version bump. 2.8 -> 2.9 Christian Melki
@ 2023-09-28 15:08 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2023-09-28 15:08 UTC (permalink / raw)
To: ptxdist; +Cc: Christian Melki
Thanks, applied as 35503db5dbcacbbf769b6c87fe827df3667c21a0.
Michael
[sent from post-receive hook]
On Thu, 28 Sep 2023 17:08:55 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Minor bugfix release.
> (Hardware Flow Control is now default off, yay!)
> https://salsa.debian.org/minicom-team/minicom/-/releases/2.9
>
> * Move URL to debian gitlab.
>
> * Pin down some options, lockdev is default enabled.
>
> * Remove patch that is included and fix offset in the remaining one.
>
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230925171549.1290273-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/patches/minicom-2.8/0002-lib-usleep.c-fix-error-NULL-undeclared.patch b/patches/minicom-2.8/0002-lib-usleep.c-fix-error-NULL-undeclared.patch
> deleted file mode 100644
> index 79e414295dc9..000000000000
> --- a/patches/minicom-2.8/0002-lib-usleep.c-fix-error-NULL-undeclared.patch
> +++ /dev/null
> @@ -1,27 +0,0 @@
> -From: Roland Hieber <rhi@pengutronix.de>
> -Date: Mon, 24 May 2021 22:52:00 +0200
> -Subject: [PATCH] lib/usleep.c: fix error: 'NULL' undeclared
> -
> -This fixes compilation with GCC 11:
> -
> - usleep.c: In function 'usleep':
> - usleep.c:14:12: error: 'NULL' undeclared (first use in this function)
> - usleep.c:14:12: note: 'NULL' is defined in header '<stddef.h>'; did you forget to '#include <stddef.h>'?
> - usleep.c:14:12: note: each undeclared identifier is reported only once for each function it appears in
> - make[2]: *** [Makefile:365: usleep.o] Error 1
> ----
> - lib/usleep.c | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/lib/usleep.c b/lib/usleep.c
> -index af9dd0326024..861c00ad97d1 100644
> ---- a/lib/usleep.c
> -+++ b/lib/usleep.c
> -@@ -2,6 +2,7 @@
> - # include <config.h>
> - #endif
> -
> -+#include <stddef.h>
> - #include <sys/time.h>
> - #include <sys/select.h>
> -
> diff --git a/patches/minicom-2.8/series b/patches/minicom-2.8/series
> deleted file mode 100644
> index 259f67ccf675..000000000000
> --- a/patches/minicom-2.8/series
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-build-reproducibly.patch
> -0002-lib-usleep.c-fix-error-NULL-undeclared.patch
> -# beb4273308afd0935d7b8b27ba4f2497 - git-ptx-patches magic
> diff --git a/patches/minicom-2.8/0001-build-reproducibly.patch b/patches/minicom-2.9/0001-build-reproducibly.patch
> similarity index 87%
> rename from patches/minicom-2.8/0001-build-reproducibly.patch
> rename to patches/minicom-2.9/0001-build-reproducibly.patch
> index 2d48c129aee1..ba445171e2c0 100644
> --- a/patches/minicom-2.8/0001-build-reproducibly.patch
> +++ b/patches/minicom-2.9/0001-build-reproducibly.patch
> @@ -8,10 +8,10 @@ Origin: Debian, https://sources.debian.org/patches/minicom/2.8-1/04reproducible.
> 1 file changed, 6 deletions(-)
>
> diff --git a/src/minicom.c b/src/minicom.c
> -index cfdb76396968..bf3ad17ca089 100644
> +index c9ce75c223be..8a006a3e039f 100644
> --- a/src/minicom.c
> +++ b/src/minicom.c
> -@@ -1248,9 +1248,6 @@ int main(int argc, char **argv)
> +@@ -1323,9 +1323,6 @@ int main(int argc, char **argv)
> switch(c) {
> case 'v':
> printf(_("%s version %s"), PACKAGE, VERSION);
> @@ -21,7 +21,7 @@ index cfdb76396968..bf3ad17ca089 100644
> printf("\n");
> printf(_("Copyright (C) Miquel van Smoorenburg.\n\n"));
> printf(_("This program is free software; you can redistribute it and/or\n"
> -@@ -1580,9 +1577,6 @@ int main(int argc, char **argv)
> +@@ -1659,9 +1656,6 @@ int main(int argc, char **argv)
>
> mc_wprintf(us, "\n%s %s\r\n", _("Welcome to minicom"), VERSION);
> mc_wprintf(us, "\n%s: %s\r\n", _("OPTIONS"), option_string);
> diff --git a/patches/minicom-2.9/series b/patches/minicom-2.9/series
> new file mode 100644
> index 000000000000..a3135b429a40
> --- /dev/null
> +++ b/patches/minicom-2.9/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-build-reproducibly.patch
> +# efe12230191a1ea2d64341d06c8f792b - git-ptx-patches magic
> diff --git a/rules/minicom.make b/rules/minicom.make
> index e757b323018a..473a3668b69f 100644
> --- a/rules/minicom.make
> +++ b/rules/minicom.make
> @@ -16,12 +16,11 @@ PACKAGES-$(PTXCONF_MINICOM) += minicom
> #
> # Paths and names
> #
> -MINICOM_VERSION := 2.8
> -MINICOM_MD5 := d32eb2e615f286611c4d1877a25939be
> +MINICOM_VERSION := 2.9
> +MINICOM_MD5 := e61ea3d07e73e245513c119e91989254
> MINICOM_SUFFIX := tar.bz2
> MINICOM := minicom-$(MINICOM_VERSION)
> -MINICOM_TARBALL := minicom_$(MINICOM_VERSION).orig.$(MINICOM_SUFFIX)
> -MINICOM_URL := http://snapshot.debian.org/archive/debian/20210524T032801Z/pool/main/m/minicom/$(MINICOM_TARBALL)
> +MINICOM_URL := https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION)/$(MINICOM).$(MINICOM_SUFFIX)
> MINICOM_SOURCE := $(SRCDIR)/$(MINICOM).$(MINICOM_SUFFIX)
> MINICOM_DIR := $(BUILDDIR)/$(MINICOM)
> MINICOM_LICENSE := LGPL-2.0-or-later AND xinetd AND GPL-2.0-or-later
> @@ -41,9 +40,11 @@ MINICOM_LICENSE_FILES := \
> MINICOM_CONF_TOOL := autoconf
> MINICOM_CONF_OPT := \
> $(CROSS_AUTOCONF_USR) \
> + $(GLOBAL_LARGE_FILE_OPTION) \
> --disable-rpath \
> --disable-music \
> --enable-socket \
> + --enable-lockdev \
> --enable-lock-dir=/var/lock \
> --enable-dfl-port=/dev/modem \
> --enable-dfl-baud=115200 \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-09-28 15:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-25 17:15 [ptxdist] [PATCH] minicom: Version bump. 2.8 -> 2.9 Christian Melki
2023-09-28 15:08 ` [ptxdist] [APPLIED] " Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox