[Buildroot] [PATCH 1/2] minicom: add COPYING sha256 to hash

Giulio Benetti

author

2018-08-31 10:55 UTC #0 lore raw

PATCH 1/2 minicom: add COPYING sha256 to hash

In minicom package hash file lacks sha256 entry for COPYING file even if it is added to MINICOM_LICENSE_FILES.

Add COPYING sha256 entry to minicom.hash file.

Signed-off-by Giulio Benetti <[email protected]>

---
 package/minicom/minicom.hash | 1 +
 1 file changed, 1 insertion(+)

package/minicom/minicom.hash +1 -0

index ca3087160b..f49e430c67 100644
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1  minicom-2.7.1.tar.gz
+sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15  COPYING

Signature · 1 line

2.17.1

Giulio Benetti

author

2018-08-31 10:56 UTC #1 lore raw

PATCH 2/2 minicom: bump version

Minicom is now available on a git repository at:
https://salsa.debian.org/minicom-team/minicom.git
Main changes:
- RS485 support
- NLS support
- various fixes

So:
- change MINICOM_METHOD to git pointing to latest commit
- add MINICOM_AUTORECONF = YES
- add MINICOM_MKDIR_M4 to MINICOM_POST_PATCH_HOOKS because autoreconf requires and existing m4 directory
- add TARGET_NLS_DEPENDENCIES to package since NLS has been added to minicom
- add host-gettext to DEPENDENCIES for AM_ICONV macro
- delete old patches since they became part of git repository as commits
- add new patch to assure TIOCGRS485 and TIOCSRS485 are present
- update tarball sha256 in hash file

Git shortlog of Minicom repository follows starting from version 2.7 since commit for 2.7-1 debian version is not present.
The only difference between version 2.7-1(debian) and 2.7 seems to be a coding style change in src/config.c file that breaks every line into a string like:
(
"aaa"
"bbb"
"ccc"
)
instead of:
(
"aaa\
bbb\
ccc"
)
**************************************************************************
git shortlog --no-merges 068f085908801ee3ab004c9ace889f6a59aa49af.. Adam Lackorzynski (87):
Added tag v2.7 for changeset ca0e6c0e1c7d
Set version to 2.7.90
Rename configure.in to configure.ac
Add delta timestamp mode
Enable SIGALRM signal
Implement HPA ESC sequence
Debugging aid (disabled)
man: add "U" key shortcut description
Fix filename of non-global config settings.
Update indonesian translation
Update french translations
Use dial_tty in statusline
Update by french translation team
Add more TODO/ideas
musl-libc compile fix
Change MAXNAMLEN to POSIX's NAME_MAX
Convert ChangeLog to UTF8
Add alternative window support
Remove SMOOTH code blocks
da.po: Update from translation team
Add ARRAY_SIZE macro
Add default for missing function keys
TODO: move location of config files to ~/.config
Add F11+F12 for use in macros
nb.po: Update from translation team
script: Proper shell exit status handling.
Add bug description
Improvement to socket handling code
autogen.sh: Set to 1.15
loadconv: Add missing fclose()
Add DTR toggle via TIOCMBIC+TIOCMBIS
remove conditional DTR toggle enable
Add entry
Discontinue Changelog
Fix printf warning on 64bit
Updated swedish translation by Sebastian Rasmussen
Fix color setting vt_pinit
Color settings: Simplify same term color message
Add "bug fixes" entry
Change mbslen to mbswidth
Add check_io_input() function
Fix return value when socket got closed
Add serbian translation
TODO: Transmit delay has no influence on macros
TODO: Need to move .macros location too
Use vt_send for macros too
Improve status line redrawing
Simplify pointer logic in output function
Fix CVE-2017-7467, a remote exploitalbe out of bound access
TODO: Add to make literal capture available
TODO: Add note on not running as root
Remove absolute paths to called programs
Make upload/download window wider
windiv: Add sys/types.h
Add sys/wait.h include
Add a missing 'free' for a calloc.
Fix type of vt_tabs for proper left shift
Free dialents on exit
dial: Remove tagged variable and code
Use ARRAY_SIZE macro
Zero initialize malloc'ed buffer
Fix behind-buffer access in input window
Fix buf size calculation by using ARRAY_SIZE
Fix value for one mbswidth test
Fix writing over end of array
Redraw status line on screen size changes
Support a second value for the mbswidth check
Fix build with SVR4_LOCKS
Fix a -Wformat-truncation warning from gcc7
Fix -Wformat-truncation warning by gcc7
Annotate switch-case fall-throughs
Fix parsing of MINICOM env-var
Introduce -O option, and add timestamps
timestamping: Only print if prev time exists
Add simplified chinese translation
man: Add current maintainer
Initial support for TCP connections
Abstract check_io functionality
Change return type of check_io_input to bool
Update spanish translation
Flush output before delaying output
ascii-xfr: Put flushing into a function
ascii-xfr: Apply 'static'
configure.ac: Add -Wno-format-truncation
Common FALLTHRU style
Increase used automake verstion to 1.16
NEWS: Update with RS485

Giulio Benetti (4):
Add RS485 parameters.
Add RS485 menu entries to "Serial port Setup" Handle RS485 low-level
sysdep1: avoid asserting rts when rs485 enabled

Martin A. Godisch (2):
fixed text width in history buffer message box properly escaped dashes in manual page

Matthias Dieter Walln?fer (1):
Properly recognise multi-byte characters by introducing

Ond?ej Lyson?k (6):
Add a missing va_end() call
Make sure strings copied by strncpy are null-terminated Fix file descriptor leaks
Fix a directory handle leak
Fix a read past end of buffer
Fix a warning about an unused variable

Sebastian Rasmussen (3):
src/man: Fix typos in documentation and comments Fixes #315391
src: Use gettext in ascii-xfr to make it translatable Fixes
src: Make various messages/strings translatable Fixes #315392

**************************************************************************

Signed-off-by Giulio Benetti <[email protected]>

---
 .../minicom/0001-musl-libc-compile-fix.patch  | 28 ----------
 ...TIOCGRS485-and-TIOCSRS485-if-not-def.patch | 39 ++++++++++++++
 ...-change-maxnamlen-to-posixs-name-max.patch | 51 -------------------
 package/minicom/Config.in                     |  2 +-
 package/minicom/minicom.hash                  |  2 +-
 package/minicom/minicom.mk                    | 21 ++++++--
 6 files changed, 59 insertions(+), 84 deletions(-)
 delete mode 100644 package/minicom/0001-musl-libc-compile-fix.patch
 create mode 100644 package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch
 delete mode 100644 package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch

package/minicom/0001-musl-libc-compile-fix.patch deleted +0 ~~-28~~

deleted file mode 100644
index 94c0da06a5..0000000000
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Adam Lackorzynski <[email protected]>
-# Date 1432407431 -7200
-#      Sat May 23 20:57:11 2015 +0200
-# Node ID 8bf81e6a8e60e37c2dec9577a1be6357b8d56165
-# Parent  8c784c80c17aa7a346d982db23bca5df67302cda
-musl-libc compile fix
-
-By Felix Janda <[email protected]>:
-VC_MUSIC is enabled by default on linux and in dial.c the
-necessary header are only included for glibc. (The wrong conditional
-include has likely been introduced by the 2003-03-30 GNU/Hurd patch.)
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-[Taken from upstream Mercurial commit 8bf81e6a8e60]
-
-diff -r 8c784c80c17a -r 8bf81e6a8e60 src/dial.c
---- a/src/dial.c	Sat May 23 20:56:29 2015 +0200
-+++ b/src/dial.c	Sat May 23 20:57:11 2015 +0200
-@@ -39,7 +39,7 @@
- #include "intl.h"
- 
- #ifdef VC_MUSIC
--#  if defined(__GLIBC__)
-+#  if defined(__linux__) || defined(__GLIBC__)
- #    include <sys/ioctl.h>
- #    include <sys/kd.h>
- #    include <sys/time.h>

package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch new file +39 -0

new file mode 100644
index 0000000000..c4d881a8b5
@@ -0,0 +1,39 @@
+From b9d9a7c3bba81853f77c6789ab5b65925f9de067 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Sun, 26 Aug 2018 11:26:11 +0200
+Subject: [PATCH] sysdep.h: define TIOCGRS485 and TIOCSRS485 if not defined
+
+Depending on toolchain sometimes SER_RS485_ENABLED is defined but
+TIOCGRS485 and TIOCSRS485 are not always found in included files.
+They are contained in <asm-generic/ioctls.h> that should be included in
+<asm/ioctls.h> then in <termios.h>, but this doesn't always happen.
+This leads to build failure because TIOCGRS485 and TIOCSRS485 have not
+been found.
+
+Define if not defined TIOCGRS485 and TIOCSRS485.
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ src/sysdep.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/sysdep.h b/src/sysdep.h
+index a99c5ee..7b9665d 100644
+--- a/src/sysdep.h
++++ b/src/sysdep.h
+@@ -124,6 +124,12 @@
+ #ifndef CRTSCTS
+ #  define CRTSCTS 0
+ #endif
++#ifndef TIOCGRS485
++#  define TIOCGRS485 0x542E
++#endif
++#ifndef TIOCSRS485
++#  define TIOCSRS485 0x542F
++#endif
+ 
+ /* If this is SysV without Posix, emulate Posix. */
+ #if defined(_SYSV)
+-- 
+2.17.1
+

package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch deleted +0 ~~-51~~

51 lines not on this page · raw message

package/minicom/Config.in +1 -1

index c41c188570..efc4f1b709 100644
@@ -9,7 +9,7 @@ config BR2_PACKAGE_MINICOM
 	  ANSI and VT102 terminals. It has a dialing directory and auto
 	  zmodem download.
 
-	  http://alioth.debian.org/projects/minicom/
+	  https://salsa.debian.org/minicom-team/minicom
 
 comment "minicom needs a toolchain w/ wchar"
 	depends on BR2_USE_MMU

package/minicom/minicom.hash +1 -1

index f49e430c67..c566f4be52 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1  minicom-2.7.1.tar.gz
+sha256 3bd58b594ac66545649c13ab2b728a4df0f78612eb030680d4152f7627d1f177  minicom-19ab49422f3431102c31fea01549121385113f80.tar.gz
 sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15  COPYING

package/minicom/minicom.mk +18 -3

index cb06482379..dcc78ec4bb 100644
@@ -4,10 +4,12 @@
 #
 ################################################################################
 
-MINICOM_VERSION = 2.7.1
-MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/4215
+MINICOM_VERSION = 19ab49422f3431102c31fea01549121385113f80
+MINICOM_SITE = https://salsa.debian.org/minicom-team/minicom.git
+MINICOM_SITE_METHOD = git
 MINICOM_LICENSE = GPL-2.0+
 MINICOM_LICENSE_FILES = COPYING
+MINICOM_AUTORECONF = YES
 
 # pkg-config is only used to check for liblockdev, which we don't have
 # in BR, so instead of adding host-pkgconf as a dependency, simply make

@@ -15,6 +17,19 @@ MINICOM_LICENSE_FILES = COPYING
 # people have liblockdev1-dev installed
 MINICOM_CONF_ENV = PKG_CONFIG=/bin/false
 
-MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv)
+MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \
+	$(TARGET_NLS_DEPENDENCIES)
+# add host-gettext for AM_ICONV macro
+MINICOM_DEPENDENCIES += host-gettext
+
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
+MINICOM_CONF_OPTS += --disable-nls
+endif
+
+# Autoreconf requires an existing m4 directory
+define MINICOM_MKDIR_M4
+	mkdir -p $(@D)/m4
+endef
+MINICOM_POST_PATCH_HOOKS += MINICOM_MKDIR_M4
 
 $(eval $(autotools-package))

Signature · 1 line

2.17.1

Thomas Petazzoni

2018-08-31 12:13 UTC #2 lore raw

PATCH 2/2 minicom: bump version

Hello Giulio,

Quoted 29 lines · Giulio Benetti

package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch new file +23 -0

new file mode 100644
index 0000000000..c4d881a8b5
@@ -0,0 +1,39 @@
+From b9d9a7c3bba81853f77c6789ab5b65925f9de067 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Sun, 26 Aug 2018 11:26:11 +0200
+Subject: [PATCH] sysdep.h: define TIOCGRS485 and TIOCSRS485 if not defined
+
+Depending on toolchain sometimes SER_RS485_ENABLED is defined but
+TIOCGRS485 and TIOCSRS485 are not always found in included files.
+They are contained in <asm-generic/ioctls.h> that should be included in
+<asm/ioctls.h> then in <termios.h>, but this doesn't always happen.
+This leads to build failure because TIOCGRS485 and TIOCSRS485 have not
+been found.
+
+Define if not defined TIOCGRS485 and TIOCSRS485.
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ src/sysdep.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/sysdep.h b/src/sysdep.h
+index a99c5ee..7b9665d 100644
+--- a/src/sysdep.h
++++ b/src/sysdep.h

package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch line 33

Quoted 10 lines

package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch new file +10 -0
+@@ -124,6 +124,12 @@
+ #ifndef CRTSCTS
+ #  define CRTSCTS 0
+ #endif
++#ifndef TIOCGRS485
++#  define TIOCGRS485 0x542E
++#endif
++#ifndef TIOCSRS485
++#  define TIOCSRS485 0x542F
++#endif

Are you sure they always have the same value on all architectures ? I'm not so sure:

arch/alpha/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 0x2E, struct serial_rs485) arch/mips/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 0x2E, struct serial_rs485)
arch/parisc/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 0x2E, struct serial_rs485)
arch/powerpc/include/uapi/asm/ioctls.h:#define TIOCGRS485 0x542e
arch/sh/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 46, struct serial_rs485)
arch/sparc/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 0x41, struct serial_rs485)
arch/xtensa/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 46, struct serial_rs485)
drivers/tty/serial/serial_core.c: case TIOCGRS485:
fs/compat_ioctl.c:#ifdef TIOCGRS485
fs/compat_ioctl.c:COMPATIBLE_IOCTL(TIOCGRS485)
include/uapi/asm-generic/ioctls.h:#define TIOCGRS485 0x542E
include/uapi/linux/serial.h: * support. Set with TIOCSRS485 and get with TIOCGRS485 if supported by your
tools/include/uapi/asm-generic/ioctls.h:#define TIOCGRS485 0x542E

See how the definitions on SuperH, Sparc and PARisc are different than the others ?

I believe it would be safer to disable RS485 support in minicom if those definitions are not provided by the kernel headers.

package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch line 36

Quoted 3 lines

package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch new file +3 -0
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
+MINICOM_CONF_OPTS += --disable-nls
+endif

This is not needed, the autotools-package infrastructure is already passing --disable-nls. See package/pkg-autotools.mk and its use of the NLS_OPTS variable.

Best regards,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Giulio Benetti

author

2018-08-31 13:32 UTC #3 lore raw

PATCH 2/2 minicom: bump version

Hello Thomas,

Il 31/08/2018 14:13, Thomas Petazzoni ha scritto:

Quoted 61 lines

Hello Giulio,
Quoted 29 lines · Giulio Benetti
package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch new file +23 -0
new file mode 100644
index 0000000000..c4d881a8b5
@@ -0,0 +1,39 @@
+From b9d9a7c3bba81853f77c6789ab5b65925f9de067 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Sun, 26 Aug 2018 11:26:11 +0200
+Subject: [PATCH] sysdep.h: define TIOCGRS485 and TIOCSRS485 if not defined
+
+Depending on toolchain sometimes SER_RS485_ENABLED is defined but
+TIOCGRS485 and TIOCSRS485 are not always found in included files.
+They are contained in <asm-generic/ioctls.h> that should be included in
+<asm/ioctls.h> then in <termios.h>, but this doesn't always happen.
+This leads to build failure because TIOCGRS485 and TIOCSRS485 have not
+been found.
+
+Define if not defined TIOCGRS485 and TIOCSRS485.
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ src/sysdep.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/sysdep.h b/src/sysdep.h
+index a99c5ee..7b9665d 100644
+--- a/src/sysdep.h
++++ b/src/sysdep.h
package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch line 33
Quoted 10 lines
package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch new file +10 -0
+@@ -124,6 +124,12 @@
+ #ifndef CRTSCTS
+ #  define CRTSCTS 0
+ #endif
++#ifndef TIOCGRS485
++#  define TIOCGRS485 0x542E
++#endif
++#ifndef TIOCSRS485
++#  define TIOCSRS485 0x542F
++#endif
Are you sure they always have the same value on all architectures ? I'm not so sure:
arch/alpha/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 0x2E, struct serial_rs485) arch/mips/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 0x2E, struct serial_rs485)
arch/parisc/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 0x2E, struct serial_rs485)
arch/powerpc/include/uapi/asm/ioctls.h:#define TIOCGRS485 0x542e
arch/sh/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 46, struct serial_rs485)
arch/sparc/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 0x41, struct serial_rs485)
arch/xtensa/include/uapi/asm/ioctls.h:#define TIOCGRS485 _IOR('T', 46, struct serial_rs485)
drivers/tty/serial/serial_core.c: case TIOCGRS485:
fs/compat_ioctl.c:#ifdef TIOCGRS485
fs/compat_ioctl.c:COMPATIBLE_IOCTL(TIOCGRS485)
include/uapi/asm-generic/ioctls.h:#define TIOCGRS485 0x542E
include/uapi/linux/serial.h: * support. Set with TIOCSRS485 and get with TIOCGRS485 if supported by your
tools/include/uapi/asm-generic/ioctls.h:#define TIOCGRS485 0x542E

Quoted 2 lines

See how the definitions on SuperH, Sparc and PARisc are different than the others ?

Oops, I didn't know this.

Quoted 3 lines

I believe it would be safer to disable RS485 support in minicom if those definitions are not provided by the kernel headers.

I haven't thought about that, actually many kernels don't support RS485. During test-pkg instead I've found a case where those macros were defined but not included.
Anyway it's safer as you've told.

Quoted 8 lines

package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch line 36
Quoted 4 lines
package/minicom/0001-sysdep.h-define-TIOCGRS485-and-TIOCSRS485-if-not-def.patch new file +3 -0
+ifeq ($(BR2_SYSTEM_ENABLE_NLS),)
+MINICOM_CONF_OPTS += --disable-nls
+endif
This is not needed, the autotools-package infrastructure is already passing --disable-nls. See package/pkg-autotools.mk and its use of the NLS_OPTS variable.

Ah, just checked package/Makefile.in where it's handled according to BR2_SYSTEM_ENABLE_NLS.

Thank you very much.

I'm going to send v2.

Best regards
Giulio Benetti

Giulio Benetti

author

2018-08-31 13:38 UTC #4 lore raw

PATCH v2 1/2 minicom: add COPYING sha256 to hash

In reply to Thomas Petazzoni

In minicom package hash file lacks sha256 entry for COPYING file even if it is added to MINICOM_LICENSE_FILES.

Add COPYING sha256 entry to minicom.hash file.

Signed-off-by Giulio Benetti <[email protected]>

---
Changes V1->V2:
no changes

 package/minicom/minicom.hash | 1 +
 1 file changed, 1 insertion(+)

package/minicom/minicom.hash +1 -0

index ca3087160b..f49e430c67 100644
@@ -1,2 +1,3 @@
 # Locally calculated
 sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1  minicom-2.7.1.tar.gz
+sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15  COPYING

Signature · 1 line

2.17.1

Giulio Benetti

author

2018-08-31 13:38 UTC #5 lore raw

PATCH v2 2/2 minicom: bump version

Minicom is now available on a git repository at:
https://salsa.debian.org/minicom-team/minicom.git
Main changes:
- RS485 support
- NLS support
- various fixes

So:
- change MINICOM_METHOD to git pointing to latest commit
- add MINICOM_AUTORECONF = YES
- add MINICOM_MKDIR_M4 to MINICOM_POST_PATCH_HOOKS because autoreconf requires and existing m4 directory
- add host-gettext to DEPENDENCIES for AM_ICONV macro
- delete old patches since they became part of git repository as commits
- add new patch to check if RS485 is supported
- update tarball sha256 in hash file

Git shortlog of Minicom repository follows starting from version 2.7 since commit for 2.7-1 debian version is not present.
The only difference between version 2.7-1(debian) and 2.7 seems to be a coding style change in src/config.c file that breaks every line into a string like:
(
"aaa"
"bbb"
"ccc"
)
instead of:
(
"aaa\
bbb\
ccc"
)
**************************************************************************
git shortlog --no-merges 068f085908801ee3ab004c9ace889f6a59aa49af.. Adam Lackorzynski (87):
Added tag v2.7 for changeset ca0e6c0e1c7d
Set version to 2.7.90
Rename configure.in to configure.ac
Add delta timestamp mode
Enable SIGALRM signal
Implement HPA ESC sequence
Debugging aid (disabled)
man: add "U" key shortcut description
Fix filename of non-global config settings.
Update indonesian translation
Update french translations
Use dial_tty in statusline
Update by french translation team
Add more TODO/ideas
musl-libc compile fix
Change MAXNAMLEN to POSIX's NAME_MAX
Convert ChangeLog to UTF8
Add alternative window support
Remove SMOOTH code blocks
da.po: Update from translation team
Add ARRAY_SIZE macro
Add default for missing function keys
TODO: move location of config files to ~/.config
Add F11+F12 for use in macros
nb.po: Update from translation team
script: Proper shell exit status handling.
Add bug description
Improvement to socket handling code
autogen.sh: Set to 1.15
loadconv: Add missing fclose()
Add DTR toggle via TIOCMBIC+TIOCMBIS
remove conditional DTR toggle enable
Add entry
Discontinue Changelog
Fix printf warning on 64bit
Updated swedish translation by Sebastian Rasmussen
Fix color setting vt_pinit
Color settings: Simplify same term color message
Add "bug fixes" entry
Change mbslen to mbswidth
Add check_io_input() function
Fix return value when socket got closed
Add serbian translation
TODO: Transmit delay has no influence on macros
TODO: Need to move .macros location too
Use vt_send for macros too
Improve status line redrawing
Simplify pointer logic in output function
Fix CVE-2017-7467, a remote exploitalbe out of bound access
TODO: Add to make literal capture available
TODO: Add note on not running as root
Remove absolute paths to called programs
Make upload/download window wider
windiv: Add sys/types.h
Add sys/wait.h include
Add a missing 'free' for a calloc.
Fix type of vt_tabs for proper left shift
Free dialents on exit
dial: Remove tagged variable and code
Use ARRAY_SIZE macro
Zero initialize malloc'ed buffer
Fix behind-buffer access in input window
Fix buf size calculation by using ARRAY_SIZE
Fix value for one mbswidth test
Fix writing over end of array
Redraw status line on screen size changes
Support a second value for the mbswidth check
Fix build with SVR4_LOCKS
Fix a -Wformat-truncation warning from gcc7
Fix -Wformat-truncation warning by gcc7
Annotate switch-case fall-throughs
Fix parsing of MINICOM env-var
Introduce -O option, and add timestamps
timestamping: Only print if prev time exists
Add simplified chinese translation
man: Add current maintainer
Initial support for TCP connections
Abstract check_io functionality
Change return type of check_io_input to bool
Update spanish translation
Flush output before delaying output
ascii-xfr: Put flushing into a function
ascii-xfr: Apply 'static'
configure.ac: Add -Wno-format-truncation
Common FALLTHRU style
Increase used automake verstion to 1.16
NEWS: Update with RS485

Giulio Benetti (4):
Add RS485 parameters.
Add RS485 menu entries to "Serial port Setup" Handle RS485 low-level
sysdep1: avoid asserting rts when rs485 enabled

Martin A. Godisch (2):
fixed text width in history buffer message box properly escaped dashes in manual page

Matthias Dieter Walln?fer (1):
Properly recognise multi-byte characters by introducing

Ond?ej Lyson?k (6):
Add a missing va_end() call
Make sure strings copied by strncpy are null-terminated Fix file descriptor leaks
Fix a directory handle leak
Fix a read past end of buffer
Fix a warning about an unused variable

Sebastian Rasmussen (3):
src/man: Fix typos in documentation and comments Fixes #315391
src: Use gettext in ascii-xfr to make it translatable Fixes
src: Make various messages/strings translatable Fixes #315392

**************************************************************************

Signed-off-by Giulio Benetti <[email protected]>

---
Changes V1->V2:
* substitute patch to check if RS485 is supported
* remove NLS handling since already present in Buildroot

 .../minicom/0001-musl-libc-compile-fix.patch  | 28 ----------
 ...-RS485-is-support-before-setting-its.patch | 36 +++++++++++++
 ...-change-maxnamlen-to-posixs-name-max.patch | 51 -------------------
 package/minicom/Config.in                     |  2 +-
 package/minicom/minicom.hash                  |  2 +-
 package/minicom/minicom.mk                    | 17 +++++--
 6 files changed, 52 insertions(+), 84 deletions(-)
 delete mode 100644 package/minicom/0001-musl-libc-compile-fix.patch
 create mode 100644 package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch
 delete mode 100644 package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch

package/minicom/0001-musl-libc-compile-fix.patch deleted +0 ~~-28~~

deleted file mode 100644
index 94c0da06a5..0000000000
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Adam Lackorzynski <[email protected]>
-# Date 1432407431 -7200
-#      Sat May 23 20:57:11 2015 +0200
-# Node ID 8bf81e6a8e60e37c2dec9577a1be6357b8d56165
-# Parent  8c784c80c17aa7a346d982db23bca5df67302cda
-musl-libc compile fix
-
-By Felix Janda <[email protected]>:
-VC_MUSIC is enabled by default on linux and in dial.c the
-necessary header are only included for glibc. (The wrong conditional
-include has likely been introduced by the 2003-03-30 GNU/Hurd patch.)
-
-Signed-off-by: Bernd Kuhls <[email protected]>
-[Taken from upstream Mercurial commit 8bf81e6a8e60]
-
-diff -r 8c784c80c17a -r 8bf81e6a8e60 src/dial.c
---- a/src/dial.c	Sat May 23 20:56:29 2015 +0200
-+++ b/src/dial.c	Sat May 23 20:57:11 2015 +0200
-@@ -39,7 +39,7 @@
- #include "intl.h"
- 
- #ifdef VC_MUSIC
--#  if defined(__GLIBC__)
-+#  if defined(__linux__) || defined(__GLIBC__)
- #    include <sys/ioctl.h>
- #    include <sys/kd.h>
- #    include <sys/time.h>

package/minicom/0001-sysdep1-check-if-RS485-is-support-before-setting-its.patch new file +36 -0

new file mode 100644
index 0000000000..39f68350c8
@@ -0,0 +1,36 @@
+From 238bbe98558bcd5ed9ab73ef03db82b57ab056ab Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <[email protected]>
+Date: Fri, 31 Aug 2018 15:18:22 +0200
+Subject: [PATCH] sysdep1: check if RS485 is support before setting its
+ parameters
+
+Not every kernel supports RS485, so better check it before setting its
+parameters.
+
+Test if RS485 is supported by checking if these 3 macros are defined:
+- SER_RS485_ENABLED
+- TIOCGRS485
+- TIOCSRS485
+If they're not defined m_set485parms becomes a dummy function.
+
+Signed-off-by: Giulio Benetti <[email protected]>
+---
+ src/sysdep1.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sysdep1.c b/src/sysdep1.c
+index 798b006..b03b442 100644
+--- a/src/sysdep1.c
++++ b/src/sysdep1.c
+@@ -599,7 +599,7 @@ void m_set485parms(int fd, int en, int rts_on_snd, int rts_aft_snd,
+                    int rx_dur_tx, int term_bus, char *del_rts_bef_snd,
+                    char *del_rts_aft_snd)
+ {
+-#ifdef SER_RS485_ENABLED
++#if defined (SER_RS485_ENABLED) && defined (TIOCGRS485) && defined (TIOCSRS485)
+   struct serial_rs485 rs485conf;
+ 
+   if (ioctl(fd, TIOCGRS485, &rs485conf))
+-- 
+2.17.1
+

package/minicom/0002-change-maxnamlen-to-posixs-name-max.patch deleted +0 ~~-51~~

51 lines not on this page · raw message

package/minicom/Config.in +1 -1

index c41c188570..efc4f1b709 100644
@@ -9,7 +9,7 @@ config BR2_PACKAGE_MINICOM
 	  ANSI and VT102 terminals. It has a dialing directory and auto
 	  zmodem download.
 
-	  http://alioth.debian.org/projects/minicom/
+	  https://salsa.debian.org/minicom-team/minicom
 
 comment "minicom needs a toolchain w/ wchar"
 	depends on BR2_USE_MMU

package/minicom/minicom.hash +1 -1

index f49e430c67..c566f4be52 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1  minicom-2.7.1.tar.gz
+sha256 3bd58b594ac66545649c13ab2b728a4df0f78612eb030680d4152f7627d1f177  minicom-19ab49422f3431102c31fea01549121385113f80.tar.gz
 sha256 cf80a758014eefbf068afffe3d462fc34ff4f528527524d8e100329c42094e15  COPYING

package/minicom/minicom.mk +14 -3

index cb06482379..000597f8a9 100644
@@ -4,10 +4,12 @@
 #
 ################################################################################
 
-MINICOM_VERSION = 2.7.1
-MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/4215
+MINICOM_VERSION = 19ab49422f3431102c31fea01549121385113f80
+MINICOM_SITE = https://salsa.debian.org/minicom-team/minicom.git
+MINICOM_SITE_METHOD = git
 MINICOM_LICENSE = GPL-2.0+
 MINICOM_LICENSE_FILES = COPYING
+MINICOM_AUTORECONF = YES
 
 # pkg-config is only used to check for liblockdev, which we don't have
 # in BR, so instead of adding host-pkgconf as a dependency, simply make

@@ -15,6 +17,15 @@ MINICOM_LICENSE_FILES = COPYING
 # people have liblockdev1-dev installed
 MINICOM_CONF_ENV = PKG_CONFIG=/bin/false
 
-MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv)
+MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) \
+	$(TARGET_NLS_DEPENDENCIES)
+# add host-gettext for AM_ICONV macro
+MINICOM_DEPENDENCIES += host-gettext
+
+# Autoreconf requires an existing m4 directory
+define MINICOM_MKDIR_M4
+	mkdir -p $(@D)/m4
+endef
+MINICOM_POST_PATCH_HOOKS += MINICOM_MKDIR_M4
 
 $(eval $(autotools-package))

Signature · 1 line

2.17.1

Thomas Petazzoni

2018-08-31 21:47 UTC #6 lore raw

PATCH v2 2/2 minicom: bump version

Hello,

Quoted 145 lines · Giulio Benetti

Minicom is now available on a git repository at:
https://salsa.debian.org/minicom-team/minicom.git
Main changes:
- RS485 support
- NLS support
- various fixes
So:
- change MINICOM_METHOD to git pointing to latest commit
- add MINICOM_AUTORECONF = YES
- add MINICOM_MKDIR_M4 to MINICOM_POST_PATCH_HOOKS because autoreconf requires and existing m4 directory
- add host-gettext to DEPENDENCIES for AM_ICONV macro
- delete old patches since they became part of git repository as commits
- add new patch to check if RS485 is supported
- update tarball sha256 in hash file
Git shortlog of Minicom repository follows starting from version 2.7 since commit for 2.7-1 debian version is not present.
The only difference between version 2.7-1(debian) and 2.7 seems to be a coding style change in src/config.c file that breaks every line into a string like:
(
"aaa"
"bbb"
"ccc"
)
instead of:
(
"aaa\
bbb\
ccc"
)
**************************************************************************
git shortlog --no-merges 068f085908801ee3ab004c9ace889f6a59aa49af.. Adam Lackorzynski (87):
Added tag v2.7 for changeset ca0e6c0e1c7d
Set version to 2.7.90
Rename configure.in to configure.ac
Add delta timestamp mode
Enable SIGALRM signal
Implement HPA ESC sequence
Debugging aid (disabled)
man: add "U" key shortcut description
Fix filename of non-global config settings.
Update indonesian translation
Update french translations
Use dial_tty in statusline
Update by french translation team
Add more TODO/ideas
musl-libc compile fix
Change MAXNAMLEN to POSIX's NAME_MAX
Convert ChangeLog to UTF8
Add alternative window support
Remove SMOOTH code blocks
da.po: Update from translation team
Add ARRAY_SIZE macro
Add default for missing function keys
TODO: move location of config files to ~/.config
Add F11+F12 for use in macros
nb.po: Update from translation team
script: Proper shell exit status handling.
Add bug description
Improvement to socket handling code
autogen.sh: Set to 1.15
loadconv: Add missing fclose()
Add DTR toggle via TIOCMBIC+TIOCMBIS
remove conditional DTR toggle enable
Add entry
Discontinue Changelog
Fix printf warning on 64bit
Updated swedish translation by Sebastian Rasmussen
Fix color setting vt_pinit
Color settings: Simplify same term color message
Add "bug fixes" entry
Change mbslen to mbswidth
Add check_io_input() function
Fix return value when socket got closed
Add serbian translation
TODO: Transmit delay has no influence on macros
TODO: Need to move .macros location too
Use vt_send for macros too
Improve status line redrawing
Simplify pointer logic in output function
Fix CVE-2017-7467, a remote exploitalbe out of bound access
TODO: Add to make literal capture available
TODO: Add note on not running as root
Remove absolute paths to called programs
Make upload/download window wider
windiv: Add sys/types.h
Add sys/wait.h include
Add a missing 'free' for a calloc.
Fix type of vt_tabs for proper left shift
Free dialents on exit
dial: Remove tagged variable and code
Use ARRAY_SIZE macro
Zero initialize malloc'ed buffer
Fix behind-buffer access in input window
Fix buf size calculation by using ARRAY_SIZE
Fix value for one mbswidth test
Fix writing over end of array
Redraw status line on screen size changes
Support a second value for the mbswidth check
Fix build with SVR4_LOCKS
Fix a -Wformat-truncation warning from gcc7
Fix -Wformat-truncation warning by gcc7
Annotate switch-case fall-throughs
Fix parsing of MINICOM env-var
Introduce -O option, and add timestamps
timestamping: Only print if prev time exists
Add simplified chinese translation
man: Add current maintainer
Initial support for TCP connections
Abstract check_io functionality
Change return type of check_io_input to bool
Update spanish translation
Flush output before delaying output
ascii-xfr: Put flushing into a function
ascii-xfr: Apply 'static'
configure.ac: Add -Wno-format-truncation
Common FALLTHRU style
Increase used automake verstion to 1.16
NEWS: Update with RS485
Giulio Benetti (4):
Add RS485 parameters.
Add RS485 menu entries to "Serial port Setup" Handle RS485 low-level
sysdep1: avoid asserting rts when rs485 enabled
Martin A. Godisch (2):
fixed text width in history buffer message box properly escaped dashes in manual page
Matthias Dieter Walln?fer (1):
Properly recognise multi-byte characters by introducing
Ond?ej Lyson?k (6):
Add a missing va_end() call
Make sure strings copied by strncpy are null-terminated Fix file descriptor leaks
Fix a directory handle leak
Fix a read past end of buffer
Fix a warning about an unused variable

Quoted 6 lines

Sebastian Rasmussen (3):
src/man: Fix typos in documentation and comments Fixes #315391
src: Use gettext in ascii-xfr to make it translatable Fixes
src: Make various messages/strings translatable Fixes #315392
**************************************************************************

To be honest, this commit log containing the entire "git shortlog" of the project was a bit too verbose.

But anyway: applied to next. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Giulio Benetti

author

2018-08-31 22:29 UTC #7 lore raw

PATCH v2 2/2 minicom: bump version

Hello,

Il 31/08/2018 23:47, Thomas Petazzoni ha scritto:

Quoted 2 lines

To be honest, this commit log containing the entire "git shortlog" of the project was a bit too verbose.

Ok, so for these situations is it ok using a brief log such the one on the top?
Like:
Main changes:
- RS485 support
- NLS support
- various fixes

Or maybe something more?

Thanks for applying anyway.

Giulio Benetti

Thomas Petazzoni

2018-09-01 07:18 UTC #8 lore raw

PATCH v2 2/2 minicom: bump version

Hello,

Quoted 7 lines · Giulio Benetti

Ok, so for these situations is it ok using a brief log such the one on the top?
Like:
Main changes:
- RS485 support
- NLS support
- various fixes

Yes that is enough.

Thanks,

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Thomas Petazzoni

Applied

2018-08-31 21:32 UTC #9 lore raw

PATCH v2 1/2 minicom: add COPYING sha256 to hash

In reply to Giulio Benetti

Hello,

Quoted 9 lines · Giulio Benetti

In minicom package hash file lacks sha256 entry for COPYING file even if it is added to MINICOM_LICENSE_FILES.
Add COPYING sha256 entry to minicom.hash file.
Signed-off-by Giulio Benetti <[email protected]>
---
Changes V1->V2:
no changes

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Peter Korsgaard

2018-09-27 20:28 UTC #10 lore raw

PATCH 1/2 minicom: add COPYING sha256 to hash

In reply to Giulio Benetti

Quoted 8 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Giulio" == Giulio Benetti <[email protected]> writes:
In minicom package hash file lacks sha256 entry for COPYING file even if it is added to MINICOM_LICENSE_FILES.
Add COPYING sha256 entry to minicom.hash file.
Signed-off-by Giulio Benetti <[email protected]>

Committed to 2018.02.x and 2018.05.x, thanks.

Signature · 1 line

Bye, Peter Korsgaard