tnet-dialup/minicom: Add 2.7-r99 with musl-libc support. - parlay - yet another gentoo overlay HTML git clone https://git.parazyd.org/parlay DIR Log DIR Files DIR Refs DIR README --- DIR commit b30ee860e28db3f1c3a5791ff02b4d24f65026a5 DIR parent 09f783b98db08689b6b452a6fec6186806f7c666 HTML Author: parazyd <parazyd@dyne.org> Date: Wed, 5 Oct 2016 09:44:21 +0200 net-dialup/minicom: Add 2.7-r99 with musl-libc support. Diffstat: A net-dialup/minicom/Manifest | 1 + A net-dialup/minicom/files/fix-inclu… | 25 +++++++++++++++++++++++++ A net-dialup/minicom/files/minicom-2… | 55 +++++++++++++++++++++++++++++++ A net-dialup/minicom/files/minicom-2… | 11 +++++++++++ A net-dialup/minicom/files/minirc.dfl | 1 + A net-dialup/minicom/minicom-2.7-r99… | 50 +++++++++++++++++++++++++++++++ 6 files changed, 143 insertions(+), 0 deletions(-) --- DIR diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest t@@ -0,0 +1 @@ +DIST minicom-2.7.tar.gz 863544 SHA256 9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4 SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af WHIRLPOOL f93642d6cc3c8dee987d461a67e4a98b55d0ebea1a0c1b2dc8564a9af66dbf9aaad3e4cb2e161d127b965d955637882eda601034b863b32ee776925db969418e DIR diff --git a/net-dialup/minicom/files/fix-includes.patch b/net-dialup/minicom/files/fix-includes.patch t@@ -0,0 +1,25 @@ +--- minicom-2.6.2.orig/src/dial.c ++++ minicom-2.6.2/src/dial.c +@@ -39,11 +39,9 @@ + #include "intl.h" + + #ifdef VC_MUSIC +-# if defined(__GLIBC__) + # include <sys/ioctl.h> + # include <sys/kd.h> + # include <sys/time.h> +-# endif + #endif + + enum { CURRENT_VERSION = 6 }; +--- minicom-2.6.2.orig/src/getsdir.h ++++ minicom-2.6.2/src/getsdir.h +@@ -22,6 +22,7 @@ + * and licensing conditions. See the source, Luke. + */ + ++#include <sys/param.h> + #include <dirent.h> + + typedef struct dirEntry { /* structure of data item */ + DIR diff --git a/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch b/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch t@@ -0,0 +1,55 @@ +diff -ru minicom-2.3.orig/extras/scriptdemo minicom-2.3/extras/scriptdemo +--- minicom-2.3.orig/extras/scriptdemo 2003-03-30 21:55:39.000000000 +0300 ++++ minicom-2.3/extras/scriptdemo 2008-04-20 05:27:19.000000000 +0300 +@@ -1,5 +1,5 @@ + # A little demonstration of the possibilities of "runscript". +-# This script can be executed by typing: "runscript scriptdemo". ++# This script can be executed by typing: "/usr/bin/runscript scriptdemo". + # + # Adjust the stty's below to your system: BSD-like or SysV-like. + # Linux ofcourse accepts both :-) +diff -ru minicom-2.3.orig/man/minicom.1 minicom-2.3/man/minicom.1 +--- minicom-2.3.orig/man/minicom.1 2008-02-24 12:22:43.000000000 +0200 ++++ minicom-2.3/man/minicom.1 2008-04-20 05:27:19.000000000 +0300 +@@ -418,7 +418,7 @@ + .TP 0.5i + .B D - Script program + Which program to use as the script interpreter. Defaults to the +-program "runscript", but if you want to use something else (eg, ++program "/usr/bin/runscript", but if you want to use something else (eg, + /bin/sh or "expect") it is possible. Stdin and stdout are connected + to the modem, stderr to the screen. + .RS 0.5i +diff -ru minicom-2.3.orig/man/runscript.1 minicom-2.3/man/runscript.1 +--- minicom-2.3.orig/man/runscript.1 2007-11-13 23:35:06.000000000 +0200 ++++ minicom-2.3/man/runscript.1 2008-04-20 05:27:19.000000000 +0300 +@@ -5,7 +5,7 @@ + .\" for conditions under which this file may be redistributed. + .TH RUNSCRIPT 1 "$Date: 2008/04/20 02:39:28 $" "User's Manual" + .SH NAME +-runscript \- script interpreter for minicom ++/usr/bin/runscript \- script interpreter for minicom + .SH SYNOPSIS + .B runscript + .RI "scriptname [logfile [homedir]]" +diff -ru minicom-2.3.orig/src/rwconf.c minicom-2.3/src/rwconf.c +--- minicom-2.3.orig/src/rwconf.c 2007-10-10 23:18:20.000000000 +0300 ++++ minicom-2.3/src/rwconf.c 2008-04-20 05:27:19.000000000 +0300 +@@ -118,7 +118,7 @@ + { N_("No"), 0, "kermreal" }, + { "3", 0, "colusage" }, + /* The script program */ +- { "runscript", 0, "scriptprog" }, ++ { "/usr/bin/runscript", 0, "scriptprog" }, + /* Modem parameters */ + { "~^M~AT S7=45 S0=0 L1 V1 X4 &c1 E1 Q0^M", 0, "minit" }, + { "^M~ATZ^M~", 0, "mreset" }, +@@ -246,7 +246,7 @@ + int matched; + + if (conftype == CONFIG_GLOBAL) +- strcpy(P_SCRIPTPROG, "runscript"); ++ strcpy(P_SCRIPTPROG, "/usr/bin/runscript"); + + line = malloc(line_size); + if (!line) { DIR diff --git a/net-dialup/minicom/files/minicom-2.6-etimeout.patch b/net-dialup/minicom/files/minicom-2.6-etimeout.patch t@@ -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); + } + DIR diff --git a/net-dialup/minicom/files/minirc.dfl b/net-dialup/minicom/files/minirc.dfl t@@ -0,0 +1 @@ +# Machine-generated file - use "minicom -s" to change parameters. DIR diff --git a/net-dialup/minicom/minicom-2.7-r99.ebuild b/net-dialup/minicom/minicom-2.7-r99.ebuild t@@ -0,0 +1,50 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils + +STUPID_NUM="3977" +DESCRIPTION="Serial Communication Program" +HOMEPAGE="http://alioth.debian.org/projects/minicom" +SRC_URI="https://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux" +IUSE="nls" + +COMMON_DEPEND="sys-libs/ncurses" +DEPEND="${COMMON_DEPEND} + nls? ( sys-devel/gettext )" +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 id ja nb pl pt_BR ro ru rw sv vi zh_TW" +IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.3-gentoo-runscript.patch + epatch "${FILESDIR}"/fix-includes.patch +} + +src_configure() { + econf \ + --sysconfdir="${EPREFIX}"/etc/${PN} \ + $(use_enable nls) +} + +src_install() { + default + insinto /etc/minicom + doins "${FILESDIR}"/minirc.dfl +} + +pkg_preinst() { + [[ -s ${EROOT}/etc/minicom/minirc.dfl ]] && rm -f "${ED}"/etc/minicom/minirc.dfl +}