minicom: Bump to 2.8
This commit is contained in:
Tee KOBAYASHI
xtkoba
parent
6196528d30
commit
273343a4d2
|
|
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://salsa.debian.org/minicom-team/minicom
|
|||
TERMUX_PKG_DESCRIPTION="Friendly menu driven serial communication program"
|
||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=2.7.1
|
||||
TERMUX_PKG_REVISION=5
|
||||
TERMUX_PKG_SRCURL=https://alioth-archive.debian.org/releases/minicom/Source/$TERMUX_PKG_VERSION/minicom-$TERMUX_PKG_VERSION.tar.gz
|
||||
TERMUX_PKG_SHA256=532f836b7a677eb0cb1dca8d70302b73729c3d30df26d58368d712e5cca041f1
|
||||
TERMUX_PKG_VERSION=2.8
|
||||
TERMUX_PKG_SRCURL=https://salsa.debian.org/minicom-team/minicom/-/archive/${TERMUX_PKG_VERSION}/minicom-${TERMUX_PKG_VERSION}.tar.gz
|
||||
TERMUX_PKG_SHA256=9e8dee8e7e1f6d6115d0e1955da5b801e44b91289f6b3e320842949488d4b22f
|
||||
TERMUX_PKG_DEPENDS="libiconv, ncurses"
|
||||
|
||||
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||
|
|
@ -16,4 +15,5 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
|||
|
||||
termux_step_pre_configure() {
|
||||
export CFLAGS+=" -fcommon"
|
||||
CPPFLAGS+=" -Dushort=u_short"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- ../minicom-2.7/src/dial.c 2013-05-10 04:32:02.000000000 +1000
|
||||
+++ ./src/dial.c 2016-04-19 15:38:20.216743308 +1000
|
||||
@@ -33,7 +33,7 @@
|
||||
#include <stdint.h>
|
||||
#include <limits.h>
|
||||
#include <arpa/inet.h>
|
||||
-
|
||||
+#include <linux/kd.h>
|
||||
#include "port.h"
|
||||
#include "minicom.h"
|
||||
#include "intl.h"
|
||||
|
|
@ -1,11 +1,10 @@
|
|||
--- ../minicom-2.7/src/file.c 2011-02-14 21:14:57.000000000 +1100
|
||||
+++ ./src/file.c 2016-04-19 15:56:22.188283387 +1000
|
||||
@@ -25,7 +25,7 @@
|
||||
@@ -25,6 +25,7 @@
|
||||
#endif
|
||||
|
||||
#include <limits.h>
|
||||
-
|
||||
+#include <sys/types.h>
|
||||
|
||||
#include "assert.h"
|
||||
#include "port.h"
|
||||
#include "minicom.h"
|
||||
#include "intl.h"
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
--- ../minicom-2.7/src/getsdir.c 2011-02-14 21:07:00.000000000 +1100
|
||||
+++ ./src/getsdir.c 2016-04-19 15:47:10.402330875 +1000
|
||||
@@ -145,7 +145,7 @@
|
||||
*
|
||||
* The data will be in the form:
|
||||
* typedef struct dirEntry {
|
||||
- * char fname[MAXNAMLEN + 1];
|
||||
+ * char fname[NAME_MAX + 1];
|
||||
* time_t time;
|
||||
* mode_t mode;
|
||||
* } GETSDIR_ENTRY;
|
||||
@@ -232,7 +232,7 @@
|
||||
}
|
||||
|
||||
/* copy the filename */
|
||||
- strncpy((*datptr)[cnt].fname, dp->d_name, MAXNAMLEN);
|
||||
+ strncpy((*datptr)[cnt].fname, dp->d_name, NAME_MAX);
|
||||
|
||||
/* get information about the directory entry */
|
||||
snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name);
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
--- ../minicom-2.7/src/getsdir.h 2009-12-13 02:47:47.000000000 +1100
|
||||
+++ ./src/getsdir.h 2016-04-19 15:59:00.459999674 +1000
|
||||
@@ -23,12 +23,13 @@
|
||||
*/
|
||||
|
||||
#include <dirent.h>
|
||||
-
|
||||
+#include <sys/types.h>
|
||||
+#include <limits.h>
|
||||
typedef struct dirEntry { /* structure of data item */
|
||||
- char fname[MAXNAMLEN + 1]; /* filename + terminating null */
|
||||
+ char fname[NAME_MAX + 1]; /* filename + terminating null */
|
||||
time_t time; /* last modification date */
|
||||
mode_t mode; /* file mode (dir? etc.) */
|
||||
- ushort cflags; /* caller field for convenience */
|
||||
+ u_short cflags; /* caller field for convenience */
|
||||
} GETSDIR_ENTRY;
|
||||
|
||||
#define GETSDIR_PARNT 0x01 /* include parent dir (..) */
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
--- a/src/minicom.c
|
||||
+++ b/src/minicom.c
|
||||
@@ -1544,7 +1544,10 @@
|
||||
#endif
|
||||
|
||||
/* On some Linux systems SIGALRM is masked by default. Unmask it */
|
||||
- sigrelse(SIGALRM);
|
||||
+ sigset_t sigset;
|
||||
+ sigemptyset(&sigset);
|
||||
+ sigaddset(&sigset, SIGALRM);
|
||||
+ sigprocmask(SIG_UNBLOCK, &sigset, NULL);
|
||||
|
||||
keyboard(KINSTALL, 0);
|
||||
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- a/src/port.h
|
||||
+++ b/src/port.h
|
||||
@@ -72,7 +72,7 @@
|
||||
#endif
|
||||
|
||||
/* Enable music routines. Could we use defined(i386) here? */
|
||||
-#if defined(__linux__) || defined(_SCO)
|
||||
+#if defined(__linux__) && !defined(__ANDROID__) || defined(_SCO)
|
||||
# define VC_MUSIC 1
|
||||
# include <linux/version.h>
|
||||
# include <linux/serial.h>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
--- ../minicom-2.7/src/script.c 2013-10-29 22:07:42.000000000 +1100
|
||||
+++ ./src/script.c 2016-04-19 16:02:45.252434872 +1000
|
||||
@@ -1093,7 +1093,10 @@
|
||||
signal(SIGHUP, SIG_IGN);
|
||||
#endif
|
||||
/* On some Linux systems SIGALRM is masked by default. Unmask it */
|
||||
- sigrelse(SIGALRM);
|
||||
+ sigset_t sigset;
|
||||
+ sigemptyset(&sigset);
|
||||
+ sigaddset(&sigset, SIGALRM);
|
||||
+ sigprocmask(SIG_UNBLOCK, &sigset, NULL);
|
||||
|
||||
/* initialize locale support */
|
||||
setlocale(LC_ALL, "");
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- ../minicom-2.7/src/script.c 2013-10-29 22:07:42.000000000 +1100
|
||||
+++ ./src/script.c 2016-04-19 16:02:45.252434872 +1000
|
||||
@@ -33,7 +33,7 @@
|
||||
#endif
|
||||
|
||||
#include <stdarg.h>
|
||||
-
|
||||
+#include <sys/wait.h>
|
||||
#include "port.h"
|
||||
#include "minicom.h"
|
||||
#include "intl.h"
|
||||
Loading…
Reference in New Issue