Minor changes. Color is now default.
https://salsa.debian.org/minicom-team/minicom/-/releases/2.10

* Rearrange options, remove deprecated options.

* Offset-adjust patch. Applies cleanly.

Signed-off-by: Christian Melki <[email protected]>
---
 .../0001-build-reproducibly.patch                          | 6 +++---
 patches/{minicom-2.9 => minicom-2.10}/series               | 0
 rules/minicom.make                                         | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)
 rename patches/{minicom-2.9 => minicom-2.10}/0001-build-reproducibly.patch 
(87%)
 rename patches/{minicom-2.9 => minicom-2.10}/series (100%)

diff --git a/patches/minicom-2.9/0001-build-reproducibly.patch 
b/patches/minicom-2.10/0001-build-reproducibly.patch
similarity index 87%
rename from patches/minicom-2.9/0001-build-reproducibly.patch
rename to patches/minicom-2.10/0001-build-reproducibly.patch
index ba445171e..606c1e45d 100644
--- a/patches/minicom-2.9/0001-build-reproducibly.patch
+++ b/patches/minicom-2.10/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 c9ce75c223be..8a006a3e039f 100644
+index 7cead0e22f50..bccaa3cb9a09 100644
 --- a/src/minicom.c
 +++ b/src/minicom.c
-@@ -1323,9 +1323,6 @@ int main(int argc, char **argv)
+@@ -1322,9 +1322,6 @@ int main(int argc, char **argv)
        switch(c) {
          case 'v':
            printf(_("%s version %s"), PACKAGE, VERSION);
@@ -21,7 +21,7 @@ index c9ce75c223be..8a006a3e039f 100644
            printf("\n");
            printf(_("Copyright (C) Miquel van Smoorenburg.\n\n"));
            printf(_("This program is free software; you can redistribute it 
and/or\n"
-@@ -1659,9 +1656,6 @@ int main(int argc, char **argv)
+@@ -1658,9 +1655,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.10/series
similarity index 100%
rename from patches/minicom-2.9/series
rename to patches/minicom-2.10/series
diff --git a/rules/minicom.make b/rules/minicom.make
index 473a3668b..13921dfeb 100644
--- a/rules/minicom.make
+++ b/rules/minicom.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_MINICOM) += minicom
 #
 # Paths and names
 #
-MINICOM_VERSION        := 2.9
-MINICOM_MD5    := e61ea3d07e73e245513c119e91989254
+MINICOM_VERSION        := 2.10
+MINICOM_MD5    := df480a0c10447b39b3741fe26637ddee
 MINICOM_SUFFIX := tar.bz2
 MINICOM                := minicom-$(MINICOM_VERSION)
 MINICOM_URL    := 
https://salsa.debian.org/minicom-team/minicom/-/archive/$(MINICOM_VERSION)/$(MINICOM).$(MINICOM_SUFFIX)
@@ -42,8 +42,6 @@ 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 \
@@ -51,6 +49,7 @@ MINICOM_CONF_OPT      := \
        --enable-cfg-dir=/etc \
        --enable-kermit=$(call 
ptx/ifdef,PTXCONF_MINICOM_KERMIT,/usr/bin/ckermit,/usr/bin/false) \
        --disable-nls \
+       --$(call ptx/endis, PTXDIST_Y2038)-year2038 \
        --without-dmalloc
 
 # ----------------------------------------------------------------------------
-- 
2.34.1


Reply via email to