mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-30 10:01:32 +02:00
Upgraded the minicom Portage package
Upgraded net-dialup/minicom to version 2.6. Compared to our former version 2.3, version 2.6 includes "-D" which is useful when minicom to connect to a board serial port with servo. BUG=None TEST=emerge-link minicom and run "minicom -D /dev/pts/X" on link trybot build on x86 and arm : cbuildbot --remote -g 'I0e32686f93c7f4472e6d9c5251fce3b2236680b3' x86-generic-paladin amd64-generic-paladin daisy-paladin Change-Id: I0e32686f93c7f4472e6d9c5251fce3b2236680b3 Reviewed-on: https://gerrit.chromium.org/gerrit/35610 Reviewed-by: Mike Frysinger <vapier@chromium.org> Tested-by: Vincent Palatin <vpalatin@chromium.org> Commit-Ready: Vincent Palatin <vpalatin@chromium.org>
This commit is contained in:
Vincent Palatin
Gerrit
parent
a5a8c1217f
commit
21d5abc54d
@ -1,13 +1,13 @@
|
||||
DEFINED_PHASES=configure install preinst prepare
|
||||
DEPEND=sys-libs/ncurses nls? ( sys-devel/gettext )
|
||||
DESCRIPTION=Serial Communication Program
|
||||
EAPI=2
|
||||
EAPI=4
|
||||
HOMEPAGE=http://alioth.debian.org/projects/minicom
|
||||
IUSE=nls linguas_cs linguas_da linguas_de linguas_es linguas_fi linguas_fr linguas_hu linguas_ja linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sv linguas_vi linguas_zh_TW
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
|
||||
IUSE=nls linguas_cs linguas_da linguas_de linguas_es linguas_fi linguas_fr linguas_hu linguas_id linguas_ja linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sv linguas_vi linguas_zh_TW
|
||||
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=sys-libs/ncurses net-dialup/lrzsz
|
||||
SLOT=0
|
||||
SRC_URI=http://alioth.debian.org/download.php/2332/minicom-2.3.tar.gz
|
||||
SRC_URI=http://alioth.debian.org/download.php/3689/minicom-2.6.tar.gz
|
||||
_eclasses_=eutils 33ef77a15337022e05342d2c772a7a5a multilib 5f4ad6cf85e365e8f0c6050ddd21659e portability 0be430f759a631e692678ed796e09f5c toolchain-funcs 6526ac6fc9aedf391efb91fcd75ace68 user 9e552f935106ff0bc92af16da64b4b29
|
||||
_md5_=4e65bcdfe925b86a6addf2b39d3b3e76
|
||||
_md5_=56689c3665f6b75e85566ba4d4cd82b9
|
||||
@ -1 +1 @@
|
||||
DIST minicom-2.3.tar.gz 789162 RMD160 562995c04e6ff912d6bcab77b5007eac8950793a SHA1 407c4898a882f14639f30b394805382df0585b50 SHA256 2acbc3d4a07e1134ee285a72fa44bbc27703b02dba02be68db9e6fd8320356fb
|
||||
DIST minicom-2.6.tar.gz 830255 RMD160 348ab9aea947ba8009f99a7f9b144d062e5f4ac6 SHA1 610802d4e0c276b8d2fa7ca30cce5eac33416ebd SHA256 ea5fe79c22dcb115cf5ed287b0e7a69e069bedd39889aa89b1a23f64f53fceb3
|
||||
|
||||
@ -1,111 +0,0 @@
|
||||
--- minicom-2.3.orig/src/minicom.c 2008-02-02 23:49:53.000000000 +0100
|
||||
+++ minicom-2.3/src/minicom.c 2009-06-08 09:42:32.151729441 +0200
|
||||
@@ -167,7 +167,7 @@
|
||||
#endif /*SIGTSTP*/
|
||||
|
||||
/* Get a line from either window or scroll back buffer. */
|
||||
-static ELM *getline(WIN *w, int no)
|
||||
+static ELM *minic_getline(WIN *w, int no)
|
||||
{
|
||||
int i;
|
||||
static ELM outofrange[MAXCOLS] = {{0,0,0}};
|
||||
@@ -205,7 +205,7 @@
|
||||
|
||||
w->direct = 0;
|
||||
for (f = 0; f < w->ys; f++)
|
||||
- mc_wdrawelm(w, f, getline(w, y++));
|
||||
+ mc_wdrawelm(w, f, minic_getline(w, y++));
|
||||
if (r)
|
||||
mc_wredraw(w, 1);
|
||||
w->direct = 1;
|
||||
@@ -227,7 +227,7 @@
|
||||
tmp_line[0]='\0';
|
||||
w->direct = 0;
|
||||
for (f = 0; f < w->ys; f++) {
|
||||
- tmp_e = getline(w, y++);
|
||||
+ tmp_e = minic_getline(w, y++);
|
||||
|
||||
/* First we "accumulate" the line into a variable */
|
||||
mc_wdrawelm_var(w, tmp_e, tmp_line);
|
||||
@@ -324,7 +324,7 @@
|
||||
|
||||
for (next_line = hit_line; next_line <= all_lines; next_line++) {
|
||||
/* we do 'something' here... :-) */
|
||||
- tmp_e = getline(w_hist, next_line);
|
||||
+ tmp_e = minic_getline(w_hist, next_line);
|
||||
|
||||
/*
|
||||
* First we "accumulate" the line into a variable.
|
||||
@@ -379,9 +379,9 @@
|
||||
static void drawcite(WIN *w, int y, int citey, int start, int end)
|
||||
{
|
||||
if (y+citey >= start && y+citey <= end)
|
||||
- mc_wdrawelm_inverse(w, y, getline(w, y+citey));
|
||||
+ mc_wdrawelm_inverse(w, y, minic_getline(w, y+citey));
|
||||
else
|
||||
- mc_wdrawelm(w, y, getline(w, y+citey));
|
||||
+ mc_wdrawelm(w, y, minic_getline(w, y+citey));
|
||||
}
|
||||
|
||||
static void drawcite_whole(WIN *w, int y, int start, int end)
|
||||
@@ -400,7 +400,7 @@
|
||||
for (y=start; y<=end; y++) {
|
||||
vt_send('>');
|
||||
vt_send(' ');
|
||||
- tmp_e = getline(w, y);
|
||||
+ tmp_e = minic_getline(w, y);
|
||||
mc_wdrawelm_var(w, tmp_e, tmp_line);
|
||||
tmp_line[w->xs] = 0;
|
||||
for (x = w->xs-1; x >= 0; x--) {
|
||||
@@ -600,7 +600,7 @@
|
||||
if (citemode) {
|
||||
inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
|
||||
} else {
|
||||
- tmp_e = getline(b_us, y);
|
||||
+ tmp_e = minic_getline(b_us, y);
|
||||
if (wcslen(look_for) > 1) {
|
||||
/* quick scan for pattern match */
|
||||
mc_wdrawelm_var(b_us, tmp_e, tmp_line);
|
||||
@@ -611,9 +611,9 @@
|
||||
}
|
||||
|
||||
if (inverse)
|
||||
- mc_wdrawelm_inverse(b_us, 0, getline(b_us, y));
|
||||
+ mc_wdrawelm_inverse(b_us, 0, minic_getline(b_us, y));
|
||||
else
|
||||
- mc_wdrawelm(b_us, 0, getline(b_us, y));
|
||||
+ mc_wdrawelm(b_us, 0, minic_getline(b_us, y));
|
||||
if (citemode)
|
||||
mc_wlocate(b_us, 0, cite_y);
|
||||
mc_wflush();
|
||||
@@ -648,7 +648,7 @@
|
||||
if (citemode) {
|
||||
inverse = (y+cite_y >= cite_ystart && y+cite_y <= cite_yend);
|
||||
} else {
|
||||
- tmp_e = getline(b_us, y + b_us->ys - 1);
|
||||
+ tmp_e = minic_getline(b_us, y + b_us->ys - 1);
|
||||
if (wcslen(look_for) > 1) {
|
||||
/* quick scan for pattern match */
|
||||
mc_wdrawelm_var(b_us, tmp_e, tmp_line);
|
||||
@@ -660,10 +660,10 @@
|
||||
|
||||
if (inverse)
|
||||
mc_wdrawelm_inverse(b_us, b_us->ys - 1,
|
||||
- getline(b_us, y + b_us->ys - 1));
|
||||
+ minic_getline(b_us, y + b_us->ys - 1));
|
||||
else
|
||||
mc_wdrawelm(b_us, b_us->ys - 1,
|
||||
- getline(b_us, y + b_us->ys - 1));
|
||||
+ minic_getline(b_us, y + b_us->ys - 1));
|
||||
if (citemode)
|
||||
mc_wlocate(b_us, 0, cite_y);
|
||||
mc_wflush();
|
||||
@@ -753,7 +753,7 @@
|
||||
mc_wlocate(b_st, 0, 0);
|
||||
mc_wprintf(b_st, hline);
|
||||
mc_wredraw(b_st, 1);
|
||||
- mc_wdrawelm_inverse(b_us, cite_y, getline(b_us, cite_ystart));
|
||||
+ mc_wdrawelm_inverse(b_us, cite_y, minic_getline(b_us, cite_ystart));
|
||||
mc_wlocate(b_us, 0, cite_y);
|
||||
break;
|
||||
case K_ESC:
|
||||
11
sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.6-etimeout.patch
vendored
Normal file
11
sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.6-etimeout.patch
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/main.c.orig 2011-09-30 09:57:00.000000000 +0200
|
||||
+++ src/main.c 2011-12-28 16:07:59.000000000 +0100
|
||||
@@ -112,7 +112,7 @@ char *esc_key(void)
|
||||
static void get_alrm(int dummy)
|
||||
{
|
||||
(void)dummy;
|
||||
- errno = ETIME;
|
||||
+ errno = ETIMEDOUT;
|
||||
longjmp(albuf, 1);
|
||||
}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
# Copyright 1999-2009 Gentoo Foundation
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.3-r2.ebuild,v 1.5 2009/07/11 20:35:53 josejx Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.6.ebuild,v 1.9 2012/05/06 17:46:29 armin76 Exp $
|
||||
|
||||
EAPI="2"
|
||||
EAPI="4"
|
||||
|
||||
inherit eutils
|
||||
|
||||
STUPID_NUM="2332"
|
||||
STUPID_NUM="3689"
|
||||
|
||||
DESCRIPTION="Serial Communication Program"
|
||||
HOMEPAGE="http://alioth.debian.org/projects/minicom"
|
||||
@ -14,7 +14,7 @@ SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
|
||||
IUSE="nls"
|
||||
|
||||
COMMON_DEPEND="sys-libs/ncurses"
|
||||
@ -23,33 +23,31 @@ DEPEND="${COMMON_DEPEND}
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
net-dialup/lrzsz"
|
||||
|
||||
DOCS="AUTHORS ChangeLog NEWS README doc/minicom.FAQ"
|
||||
|
||||
# Supported languages and translated documentation
|
||||
# Be sure all languages are prefixed with a single space!
|
||||
MY_AVAILABLE_LINGUAS=" cs da de es fi fr hu ja nb pl pt_BR ro ru rw sv vi zh_TW"
|
||||
MY_AVAILABLE_LINGUAS=" cs da de es fi fr hu id ja nb pl pt_BR ro ru rw sv vi zh_TW"
|
||||
IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-gentoo-runscript.patch
|
||||
|
||||
#glibc name conflict
|
||||
epatch "${FILESDIR}"/${P}-getline-rename.patch
|
||||
epatch "${FILESDIR}"/${PN}-2.3-gentoo-runscript.patch
|
||||
epatch "${FILESDIR}"/${P}-etimeout.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf --sysconfdir=/etc/${PN} \
|
||||
$(use_enable nls) \
|
||||
|| die "econf failed"
|
||||
econf \
|
||||
--sysconfdir="${EPREFIX}"/etc/${PN} \
|
||||
$(use_enable nls)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake install DESTDIR="${D}" || die "einstall failed"
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README doc/minicom.FAQ
|
||||
default
|
||||
insinto /etc/minicom
|
||||
doins "${FILESDIR}"/minirc.dfl
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
[[ -s ${ROOT}/etc/minicom/minirc.dfl ]] \
|
||||
&& rm -f "${D}"/etc/minicom/minirc.dfl
|
||||
[[ -s ${EROOT}/etc/minicom/minirc.dfl ]] \
|
||||
&& rm -f "${ED}"/etc/minicom/minirc.dfl
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user