From ae519d5a337c92bf2028a992026ca9ce7d2d6aa6 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 8 Aug 2024 13:51:08 +0200 Subject: [PATCH] net-dialup/minicom: Sync with Gentoo It's from Gentoo commit 168995c59aee4ad848a64d748f48e7d32936265b. --- .../net-dialup/minicom/Manifest | 3 +- .../files/minicom-2.3-gentoo-runscript.patch | 55 --------------- .../minicom/files/minicom-2.7-lockdir.patch | 14 ---- .../minicom/files/minicom-2.7.1-gcc-10.patch | 31 --------- .../minicom/files/minicom-2.7.1-musl.patch | 24 ------- .../files/minicom-2.8-enable-large-file.patch | 30 ++++++++ .../files/minicom-2.9-update-gettext.patch | 13 ++++ .../net-dialup/minicom/minicom-2.7.1.ebuild | 56 --------------- ...nicom-2.8.ebuild => minicom-2.8-r2.ebuild} | 12 ++-- .../net-dialup/minicom/minicom-2.8-r4.ebuild | 69 +++++++++++++++++++ .../net-dialup/minicom/minicom-2.9.ebuild | 61 ++++++++++++++++ 11 files changed, 181 insertions(+), 187 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7-lockdir.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-gcc-10.patch delete 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-enable-large-file.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.9-update-gettext.patch delete mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.1.ebuild rename sdk_container/src/third_party/portage-stable/net-dialup/minicom/{minicom-2.8.ebuild => minicom-2.8-r2.ebuild} (87%) create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.9.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 920a2cf93f..c03ddf9606 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,2 +1,3 @@ -DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36 +DIST minicom-2.9.tar.gz 1044053 BLAKE2B 4c17f235d770ff9b4719c0ce9d3dfdb01603986d08cec245b1bfba5addbea597032bb06fc73c585886e035915dec990f37e9690b58d0a80a3e6faf8675485f96 SHA512 3bd41fa3b93b086c7b0fc851e9f46f241b13a037a4a325fc5e0ca6a4db7e9389443e8965891aa938a9c31ff848d50fd0cb88b98690a06737b5f3aca2520a60e2 +DIST minicom-m4-2.8.tar.bz2 26016 BLAKE2B 0cff0bc3ca134b417fdabb5e2994afebaf89224b95c0b3843ec57e815f43778c8eab1f8df6098d756616a0c494812d9fabc4292eaeaa9c09afb62821ce852438 SHA512 d09e141b1b83f215dc11dcd33d0cd62000c46384ea86084edfb07b04a4d30c0d9e2dce49e5e8e78f3f70fb646737f1e55a9c1158906312575ca2f02db6283994 diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch deleted file mode 100644 index ff72db966b..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.3-gentoo-runscript.patch +++ /dev/null @@ -1,55 +0,0 @@ -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) { diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7-lockdir.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7-lockdir.patch deleted file mode 100644 index acbdcbe902..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7-lockdir.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- minicom-2.7.orig/configure.in 2013-12-31 07:14:09.000000000 -0800 -+++ minicom-2.7/configure.in 2017-03-05 11:25:01.379020326 -0800 -@@ -217,7 +217,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 exists, 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/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 deleted file mode 100644 index 43e057ce1f..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-gcc-10.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 deleted file mode 100644 index da4ce13d0b..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.7.1-musl.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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-enable-large-file.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-enable-large-file.patch new file mode 100644 index 0000000000..11489b50c6 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.8-enable-large-file.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/912680 +https://salsa.debian.org/minicom-team/minicom/-/commit/4ed314c504bc95d8ccef81d7c68684d5ac31e9db.patch + +From 4ed314c504bc95d8ccef81d7c68684d5ac31e9db Mon Sep 17 00:00:00 2001 +From: Adam Lackorzynski +Date: Sat, 19 Aug 2023 12:52:02 +0200 +Subject: [PATCH] configure.ac: Enable large file support + +Add AC_SYS_LARGEFILE to enable large file support in a portable way. +Thanks the ChromeOS team and Raul Rangel for hinting at this. +--- + configure.ac | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 7b3f0df..6424a3f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -16,6 +16,8 @@ dnl Checks for programs. + AC_PROG_CC + AM_PROG_AR + ++AC_SYS_LARGEFILE ++ + AC_USE_SYSTEM_EXTENSIONS + AC_USE_SYSTEM_EXTENSIONS + +-- +GitLab + diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.9-update-gettext.patch b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.9-update-gettext.patch new file mode 100644 index 0000000000..4218d75e0e --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/files/minicom-2.9-update-gettext.patch @@ -0,0 +1,13 @@ +Use REQUIRE so eautopoint --force will upgrade gettext to 0.22 if available. + +--- a/configure.ac ++++ b/configure.ac +@@ -131,7 +131,7 @@ ALL_LINGUAS="cs da de es fr fi hu id ja ka ko nb pl pt_BR ro ru rw sr sv vi zh_C + + dnl Checks for programs. + AM_GNU_GETTEXT([external]) +-AM_GNU_GETTEXT_VERSION([0.21]) ++AM_GNU_GETTEXT_REQUIRE_VERSION([0.21]) + + dnl This is a hacky workaround as the m4 scripts for iconv seem to set + dnl LIBICONV to '-liconv' despite that this lib is not available if iconv 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 deleted file mode 100644 index 4ae4c38c5c..0000000000 --- a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.7.1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools - -DESCRIPTION="Serial Communication Program" -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 sparc x86 ~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" -S="${WORKDIR}/${PN}-2.7" # 2.7.1 specific - -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() { - 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.8.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r2.ebuild similarity index 87% rename from sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8.ebuild rename to sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r2.ebuild index d68e0a208e..2a2544d4ec 100644 --- 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-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -40,6 +40,9 @@ src_configure() { # Lockdir must exist if not manually specified. # '/var/lock' is created by OpenRC. local myeconfargs=( + # See bug #788142 + --sysconfdir="${EPREFIX}"/etc/${PN} + --disable-rpath --enable-lock-dir="/var/lock" $(use_enable nls) @@ -51,10 +54,7 @@ src_configure() { src_install() { default + # Needs to match --sysconfdir above 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-r4.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild new file mode 100644 index 0000000000..98e6c105af --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.8-r4.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + https://dev.gentoo.org/~ceamac/${CATEGORY}/${PN}/${PN}-m4-${PV}.tar.bz2 +" + +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 + "${FILESDIR}"/${PN}-2.8-enable-large-file.patch +) + +src_prepare() { + default + + # 912459 + # Embed the needed m4 macros if gettext is not installed + mv "${WORKDIR}"/m4 . || die + + eautoreconf +} + +src_configure() { + # Lockdir must exist if not manually specified. + # '/var/lock' is created by OpenRC. + local myeconfargs=( + # See bug #788142 + --sysconfdir="${EPREFIX}"/etc/${PN} + + --disable-rpath + --enable-lock-dir="/var/lock" + $(use_enable nls) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Needs to match --sysconfdir above + insinto /etc/minicom + doins "${FILESDIR}"/minirc.dfl +} diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.9.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.9.ebuild new file mode 100644 index 0000000000..43be39e042 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/minicom/minicom-2.9.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 + "${FILESDIR}"/${PN}-2.9-update-gettext.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + # Lockdir must exist if not manually specified. + # '/var/lock' is created by OpenRC. + local myeconfargs=( + # See bug #788142 + --sysconfdir="${EPREFIX}"/etc/${PN} + + --disable-rpath + --enable-lock-dir="/var/lock" + $(use_enable nls) + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # Needs to match --sysconfdir above + insinto /etc/minicom + doins "${FILESDIR}"/minirc.dfl +}