From 45b3b10dca9250d22969269c5340bc16c83058c8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 5 Nov 2021 21:10:18 +0100 Subject: [PATCH] net-dialup/minicom: Sync with gentoo It's from gentoo commit 77ac7cb548198f5386113e973b6402f4a282151c. --- .../net-dialup/minicom/Manifest | 16 +---- .../minicom/files/minicom-2.6-etimeout.patch | 11 ---- .../minicom/files/minicom-2.7.1-gcc-10.patch | 31 ++++++++++ .../minicom/files/minicom-2.7.1-musl.patch | 24 ++++++++ .../files/minicom-2.8-gentoo-runscript.patch | 42 +++++++++++++ .../minicom/files/minicom-2.8-lockdir.patch | 14 +++++ .../net-dialup/minicom/metadata.xml | 22 ++++--- .../net-dialup/minicom/minicom-2.6.ebuild | 52 ---------------- .../net-dialup/minicom/minicom-2.7-r1.ebuild | 59 ------------------ .../net-dialup/minicom/minicom-2.7.1.ebuild | 18 +++--- .../net-dialup/minicom/minicom-2.7.ebuild | 48 --------------- .../net-dialup/minicom/minicom-2.8.ebuild | 60 +++++++++++++++++++ 12 files changed, 193 insertions(+), 204 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.6-etimeout.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-gcc-10.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-musl.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-lockdir.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.6.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7-r1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/Manifest b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/Manifest index 06eda13d59..920a2cf93f 100644 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/Manifest @@ -1,14 +1,2 @@ -AUX minicom-2.3-gentoo-runscript.patch 2382 SHA256 9d79ab8eb2942cdbde2b65ab7958b7c485c83428f31e5644f0f2af2c1d6bffb7 SHA512 f88a54d5d64bec288930eb7d34332d3f4cdf879a90a694c4e538cc92ec213f15816ea9fa1225ea1122b3ee00b69b365cd69a17ec09369f4498b437374d425b5f WHIRLPOOL 74c40c8b81c81ec504d3193175b38c0644809a505f201f5d01cd9d74723336e3b4c1cd5cfd11e55fa528439aaef17bdc2c88b797de63c339c1ce8b51a020387f -AUX minicom-2.6-etimeout.patch 266 SHA256 cce9dfa838f7df59e59e64e0494d98ffe7143512ed419f2034f36e73be80d698 SHA512 623310112fe8c9ca50e2f5bc3c67675d501a96706ff80cb30b0e4da0074c6662f9268bd9aad792e7495f156690755ce7c1625c19efa69ff577a34967646cbb4c WHIRLPOOL 6333f7ae0d68824ae16126705800cc90837a1be4090f423f2bce60e24c2904829044a413fa3a018bc4202ce0ae9bf978877e3c763be670364e878cc249e2db80 -AUX minicom-2.7-lockdir.patch 535 SHA256 bfabbe8c36248b57a7ac0ab453e0597f37889791b848610dce15ba4727ba39ba SHA512 7e555046cd58a796f01473e064cbf289bfd467b0ceefbdc49734d5a9ee3c8f41480378cd456e0b30e94bb892b3329959c4c38ecc942e35d3890bc6da515e1f59 WHIRLPOOL 1fe4316e70b4cb2ed26072769f64228f81e80fe9010e11bbdd8be7b499a056d0af7d0c925c3e82da80ac52b3b64e10fa597a607b7871ff84fe9e5dc6ee17a6f3 -AUX minirc.dfl 66 SHA256 d7a08c0a5befc155170b8e6009b028c0361e72da6c2c3f55e1858711eaaca5a0 SHA512 dc6f65392ec4ee9e0f499596b6220cb23e443530a3802edc8805412a7999ffb48cb2f9f5c9f7a7ebfbbe166fdbf128847f00141c4f67c0176bb245081814955c WHIRLPOOL 7c245ce32e0e37147974b392ce01a3deb8fc81e692fabc9eada329f00523a6989dffc652b95e2ce6a091b6f199964a038618afced647d2cc85f9556a850490f9 -DIST minicom-2.6.tar.gz 830255 SHA256 ea5fe79c22dcb115cf5ed287b0e7a69e069bedd39889aa89b1a23f64f53fceb3 SHA512 96345e0c7b5991d3320fb4478b26717efdcdde307cd1cd065be424456bd90e528405c889a8aebaf6a67f3c614e4858825ec7f32769f2069f1b2e3ec5a2556023 WHIRLPOOL 7bfcb9a9609dc85585c808c8027f14406c1ff72771262d3c5beee9209078db9a58396d272333eb1ec6f97c0013b6a3792e0a1444cb737db4c202ccc90b8b1483 -DIST minicom-2.7.1.tar.gz 863544 SHA256 9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4 SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af WHIRLPOOL f93642d6cc3c8dee987d461a67e4a98b55d0ebea1a0c1b2dc8564a9af66dbf9aaad3e4cb2e161d127b965d955637882eda601034b863b32ee776925db969418e -DIST minicom-2.7.tar.gz 863544 SHA256 9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4 SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af WHIRLPOOL f93642d6cc3c8dee987d461a67e4a98b55d0ebea1a0c1b2dc8564a9af66dbf9aaad3e4cb2e161d127b965d955637882eda601034b863b32ee776925db969418e -EBUILD minicom-2.6.ebuild 1297 SHA256 42e94f0256f5fd0c14261fe94837e6df86d9981296641ef01f4067c52d79aebb SHA512 414e4a77e21a7a2158047e9f645f3304c78e40eccb28e7d3071227814cbdd740089f928f38fbe867c943f173b86f78a9c0afa6d9aa8604d69effa57ed8c78388 WHIRLPOOL 359e1fe14b87a5ebb76f35590fd9587dd638e8f780e5160640cbeaed2a49bff066d4172f1b422de9515b2849036b9c93a57dd948d3cdc029415d6a7cc5f82712 -EBUILD minicom-2.7-r1.ebuild 1515 SHA256 ed53a8057ff1d0003e6651959c7c00713d91dbab0b32e0c32fb5b2420383655c SHA512 277c4fc3446b1ec23853ab521ee6c5a90f2b8f8d18875ccc9d5a704c6c51504f65542c3cfb5b882b7f54f77435f84f6655123dde5c9f4b971da6b424db525fbc WHIRLPOOL 7d3bf88a0fe302c4c45f9c2cd0a45da0b93a2c94784b286736082e08f982a4a37558ded750abab285659b741cce9fe11ffc21712f47b8043b25563e874329581 -EBUILD minicom-2.7.1.ebuild 1549 SHA256 f98acfc71ba9aebc5443f534d1a0c6c1b30084e1e4bfa7aed8bc8517fe37966c SHA512 e48de13f90d97ae188307573e49b96db8c5865751ce73b76d95a7adc301c2b81a1eb1f00c4b8774c2669a51101f3104a3a2273df1c118e5b458f895989bc1373 WHIRLPOOL ef50d9106fc72943a31654aa9661dba6383151e7aece6d2e26496424cb1b1fdb0ef2023769fbf65a2a707f2e7f5271a079a3ca804302c39ea562798a78dac7f7 -EBUILD minicom-2.7.ebuild 1269 SHA256 1eea7fdf8aa21e4410b22dfd80ca6c14698240e81d67d13041f67630305d57ca SHA512 9bcfbecd8f3a639ae8d98d104a08d95af9f9735d75dcd026c7965e86dc9648a1c06a9b152c182f466ac72db594a4c07ec7565cc65c95d0d5721a6c60c498a7b8 WHIRLPOOL 19a585000c1b9c5c458d47c4757df7fc0d1d9a40928f4028db9959167ddf3f2536c1ea649ed85a400c5336fe97ba61a8c4c583894eeb12c705cbec9557fd302c -MISC ChangeLog 3104 SHA256 b48e3e7269765489b1d0eceaec11062fa87a474bb7c692d91254604ff6c12280 SHA512 cad2f9a88ab489f90f9ecb3f8e638eacbd96a7ade1db9fb84aaf3f9d2390afb491ce8c611c25d51c18432c8446496894f16b44c44326f04b7530dda8faafd9e0 WHIRLPOOL 11d9797df2dbdbaac2da09e32052b75a29dc24cd36996ef42398a38641927ec186422525d9d63edc3d9222d53786b041153ac7eca3c77eaa61bf10532e8ced36 -MISC ChangeLog-2015 13282 SHA256 6ab75410072149bf7acf3b1eadc1776505be34fe46f2cb014d0f543b7a572c1f SHA512 d0bcb42be3439cba34194e75146cf0cb83039fd57ac4dfd262ee4201ee40e810aedbc8eeca1cf2ecf07cc9481a5f703a3b407cf7938cde0e5f7eed74d0e854fc WHIRLPOOL 7c00c6208af8e3a38c7e61d55f54046ddd9e318d8075a50ad13ab9359efa87b717a4cda516ac4730f3024053d4a6577e369c9f32683f97196c3876677fda6ed3 -MISC metadata.xml 456 SHA256 6e64d84b244d1d177d3c88778c94b0a4b6af1f5c3124d720a6a403b7c4d0d6eb SHA512 9d7b2e8de12baea7bbc03a2031caf9e791b1168eb70a8100edbedea42344a26421e7f8e11b114ff86677799583d471220da2973c1395a0fe13d9f33b3a22c336 WHIRLPOOL 359c9ed736edd57e648262f37fbf138bf7f62ed826b323dfa236a77b8214ff48821504742902329568880f5366d8a39141792f49ddc6f5375183ded85386597f +DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af +DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36 diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.6-etimeout.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.6-etimeout.patch deleted file mode 100644 index 2dd01963c4..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.6-etimeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); - } - diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-gcc-10.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-gcc-10.patch new file mode 100644 index 0000000000..43e057ce1f --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-gcc-10.patch @@ -0,0 +1,31 @@ +https://bugs.gentoo.org/705836 +--- a/src/minicom.h ++++ b/src/minicom.h +@@ -109,13 +109,13 @@ EXTERN char *dial_tty; /* tty to use. */ + + EXTERN char *dial_name; /* System we're conneced to */ + EXTERN char *dial_number; /* Number we've dialed. */ +-EXTERN char *dial_user; /* Our username there */ +-EXTERN char *dial_pass; /* Our password */ ++extern char *dial_user; /* Our username there */ ++extern char *dial_pass; /* Our password */ + + #ifdef USE_SOCKET +-EXTERN int portfd_is_socket; /* File descriptor is a unix socket */ +-EXTERN int portfd_is_connected; /* 1 if the socket is connected */ +-EXTERN struct sockaddr_un portfd_sock_addr; /* the unix socket address */ ++extern int portfd_is_socket; /* File descriptor is a unix socket */ ++extern int portfd_is_connected; /* 1 if the socket is connected */ ++extern struct sockaddr_un portfd_sock_addr; /* the unix socket address */ + #define portfd_connected ((portfd_is_socket && !portfd_is_connected) \ + ? -1 : portfd) + #else +@@ -141,7 +141,7 @@ EXTERN int sbcolor; /* Status Bar Background Color */ + EXTERN int st_attr; /* Status Bar attributes. */ + + /* jl 04.09.97 conversion tables */ +-EXTERN unsigned char vt_outmap[256], vt_inmap[256]; ++extern unsigned char vt_outmap[256], vt_inmap[256]; + + /* MARK updated 02/17/95 - history buffer */ + EXTERN int num_hist_lines; /* History buffer size */ diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-musl.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-musl.patch new file mode 100644 index 0000000000..da4ce13d0b --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-musl.patch @@ -0,0 +1,24 @@ +--- a/src/dial.c ++++ b/src/dial.c +@@ -39,11 +39,9 @@ + #include "intl.h" + + #ifdef VC_MUSIC +-# if defined(__GLIBC__) + # include + # include + # include +-# endif + #endif + + enum { CURRENT_VERSION = 6 }; +--- a/src/getsdir.h ++++ b/src/getsdir.h +@@ -22,6 +22,7 @@ + * and licensing conditions. See the source, Luke. + */ + ++#include + #include + + typedef struct dirEntry { /* structure of data item */ diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch new file mode 100644 index 0000000000..97c53e91c8 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-gentoo-runscript.patch @@ -0,0 +1,42 @@ +--- a/man/minicom.1 ++++ b/man/minicom.1 +@@ -469,7 +469,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 +--- a/man/runscript.1 ++++ b/man/runscript.1 +@@ -5,7 +5,7 @@ + .\" for conditions under which this file may be redistributed. + .TH RUNSCRIPT 1 "$Date: 2007-10-07 18:13:51 $" "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]]" +--- a/src/rwconf.c ++++ b/src/rwconf.c +@@ -105,7 +105,7 @@ + { N_("No"), 0, "kermreal" }, + { "3", 0, "colusage" }, + /* The script program */ +- { "runscript", 0, "scriptprog" }, ++ { "/usr/bin/runscript", 0, "scriptprog" }, + /* Modem parameters */ + { "", 0, "minit" }, + { "", 0, "mreset" }, +@@ -245,7 +245,7 @@ + int matched; + + if (conftype == CONFIG_GLOBAL) +- strcpy(P_SCRIPTPROG, "runscript"); ++ strcpy(P_SCRIPTPROG, "/usr/bin/runscript"); + + line = malloc(line_size); + if (!line) { diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-lockdir.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-lockdir.patch new file mode 100644 index 0000000000..17fb635cd9 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-lockdir.patch @@ -0,0 +1,14 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -219,7 +219,10 @@ + + if test "x$UUCPLOCK" != x + then +- if test -d $UUCPLOCK ++ dnl If a lock directory was manually specified, do not test it actually, ++ dnl as that might not be true during a chroot build, and the ++ dnl packager is responsible for making sure it exists at runtime. ++ if true + then + AC_MSG_RESULT($UUCPLOCK) + AC_DEFINE_UNQUOTED(UUCPLOCK, "$UUCPLOCK", [Lock directory]) diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/metadata.xml b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/metadata.xml index 6c2a6ce03c..1a25698629 100644 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/metadata.xml @@ -1,12 +1,16 @@ - + - - embedded@gentoo.org - Embedded Gentoo - - - Minicom is a menu driven communications program. It emulates ANSI and VT102 - terminals. It has a dialing directory and auto zmodem download. - + + embedded@gentoo.org + Embedded Gentoo + + + Minicom is a menu driven communications program. + It emulates ANSI and VT102 terminals and + has a dialing directory and auto zmodem download. + + + cpe:/a:minicom_project:minicom + diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.6.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.6.ebuild deleted file mode 100644 index 1f2712ff73..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.6.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" - -inherit eutils - -STUPID_NUM="3689" - -DESCRIPTION="Serial Communication Program" -HOMEPAGE="http://alioth.debian.org/projects/minicom" -SRC_URI="http://alioth.debian.org/download.php/${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 ~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}"/${P}-etimeout.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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7-r1.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7-r1.ebuild deleted file mode 100644 index fece4e19b3..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils autotools - -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 ~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_}" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3-gentoo-runscript.patch - "${FILESDIR}"/${PN}-2.7-lockdir.patch -) - -src_prepare() { - default - mv "${S}"/configure.{in,ac} - eautoreconf -} - -src_configure() { - # Lockdir must exist if not manually specified. - # /var/lock is created by openrc. - LOCKDIR=/var/lock - econf \ - --sysconfdir="${EPREFIX}"/etc/${PN} \ - --enable-lock-dir="${LOCKDIR}" \ - $(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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.1.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.1.ebuild index 487e66e64a..4ae4c38c5c 100644 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.1.ebuild +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.1.ebuild @@ -1,17 +1,16 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit eutils autotools +inherit autotools -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" +HOMEPAGE="https://salsa.debian.org/minicom-team/minicom" +SRC_URI="https://alioth-archive.debian.org/releases/minicom/Source/${PV}/${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 ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux" IUSE="nls" COMMON_DEPEND="sys-libs/ncurses:=" @@ -23,14 +22,11 @@ RDEPEND="${COMMON_DEPEND} DOCS="AUTHORS ChangeLog NEWS README doc/minicom.FAQ" S="${WORKDIR}/${PN}-2.7" # 2.7.1 specific -# 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_}" - PATCHES=( "${FILESDIR}"/${PN}-2.3-gentoo-runscript.patch "${FILESDIR}"/${PN}-2.7-lockdir.patch + "${FILESDIR}"/${PN}-2.7.1-gcc-10.patch + "${FILESDIR}"/${PN}-2.7.1-musl.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.ebuild deleted file mode 100644 index 0e9f00786b..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 ~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 -} - -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 -} diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8.ebuild new file mode 100644 index 0000000000..d68e0a208e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Serial Communication Program" +HOMEPAGE="https://salsa.debian.org/minicom-team/minicom" +SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="nls" + +DEPEND="sys-libs/ncurses:=" + +RDEPEND=" + ${DEPEND} + net-dialup/lrzsz +" + +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.8-gentoo-runscript.patch + "${FILESDIR}"/${PN}-2.8-lockdir.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Lockdir must exist if not manually specified. + # '/var/lock' is created by OpenRC. + local myeconfargs=( + --disable-rpath + --enable-lock-dir="/var/lock" + $(use_enable nls) + ) + + econf "${myeconfargs[@]}" +} + +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 +}