From f8c416ef1d442bff0897e78ce9ef6c13279f33c0 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 24 Jun 2021 10:31:58 +0200 Subject: [PATCH] net-dialup/lrzsz: sync with gentoo upstream the version stays the same (0.12.20) but we add some patches to fix compatibility issues with autoconf. See: https://bugs.gentoo.org/685696 Signed-off-by: Mathieu Tortuyaux --- .../portage-stable/net-dialup/lrzsz/Manifest | 30 +-------- .../lrzsz/files/lrzsz-0.12.20-AR.patch | 10 +++ .../files/lrzsz-0.12.20-gettext-0.20.patch | 23 +++++++ .../net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild | 64 +++++++++++++++++++ .../net-dialup/lrzsz/metadata.xml | 6 +- 5 files changed, 102 insertions(+), 31 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch create mode 100644 sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/Manifest b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/Manifest index 9ddeb53744..77293a9cd1 100644 --- a/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/Manifest +++ b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/Manifest @@ -1,29 +1 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - -AUX lrzsz-0.12.20-automake-1.12.patch 793 SHA256 da14545c343544d9c35cb20d9574f1f16cb39a057be1cb0af79998a5c0960455 SHA512 8e55cec506a494f97e7bd0c7bf910a0f49ab56485fe916e6d9e7dec7c6ff0f14aadd2b88d393ea16493c1780405e69ec7876490bf93fd05a8c51a3f58666a4a0 WHIRLPOOL 2494d8e15ee9d08f1001f512fca0bbf13646aead8d73100a003d56c99954fff133ff3c475dd13d458d8eca035949ee0c4c9d4d4f590f72fa55a7c6dbd9c8be6b -AUX lrzsz-0.12.20-automake-1.13.patch 454 SHA256 e25ebcc294beb5628e9801142a5dc4efb3ed1590f9afb89512cd0e51d2db5a72 SHA512 75b0f707704bb4f788de9f2fbb82c29daaa4b748e151271ba2617d24d759a84dea323f2f160b727e2c94675df78ffe1bd8368dd593d4582cbb567643717ec68e WHIRLPOOL 866e2c9300e69e44948bcc2537e8726148cbb06fcf1a4eefd0fbf9437853a740f8ca1e9d0299df6d557481f88b155c8ddf928edefb0e6ef384367117065894cc -AUX lrzsz-autotools.patch 8725 SHA256 05efb70cbe0a72a4ff3bfc89f9af05c79c215d7b4ffc7a883cd8ece56e605eb2 SHA512 4ba98fb4a72d8fcc654741d57992598d56eded61e7b89c54d44edd7a609149e15d9948d777d70bf41137daa0b860c67e1212a3f38519434cb5d44546bfb94909 WHIRLPOOL f37457903b0fb0638401edb084aac1ca64bb7e41473c8e25c624c3b0ba363d26b1b61a0334db67f10225696e5e69a0464084ca2a5ce3200ea9e17b0af4773d7e -AUX lrzsz-implicit-decl.patch 428 SHA256 867e4dc69fc83d0f96bb46d11d44b9575106e199506cf7098be0a5d2d9e39d81 SHA512 7dd642aa6701671986e6ab1635935c7a8088ad5ee74131b7c486e2e87d748fc835798d1a8a291e85a80ba3f88328ce4f293a8dafb1ebd9924f1f31fb2bd3a7d7 WHIRLPOOL f896657ad15689eec5d586e2b2954d32bed9a45583b1c545a80c5a97d4ac1f16cdebbf5232630c5480b55ae71eb841cace4701cbc095eda36809516387480d0c -DIST lrzsz-0.12.20.tar.gz 280938 SHA256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12 WHIRLPOOL 17934730db44d11c08b700cd68d8a1e619612bf158db106ef8e7fc54e623b0c5e98a133870cf8cd0b8f824c3cf24b24f7102725dcf438d307a2e1d3839e0d1d5 -EBUILD lrzsz-0.12.20-r3.ebuild 1724 SHA256 69235bdee88152dc4de51402bd20197c57711248bbcf2dad7aa283869376867b SHA512 d7c24632ee366d59852dffd51191d8d0988f5af563749fe99b2f8d0f0429be98ecc71966413b1b2633586024e92a431df7784778399058d63bed5837545b4fac WHIRLPOOL 6e8554eb3540e3c47d99c71ab7bcb65cd249319ef72385f98cb913c2be8b87e5ad632f9a799877dad03838febf7f2c1d2c6af87c97f3b5b2e817ad15e68e435a -MISC ChangeLog 6389 SHA256 5dd07ea33de701dbfea7d8b896874ceefcd67708b2bdf672baf3ab93d001d67e SHA512 90d54acb6cafc47e2291feb8f13c2664b6e879071510c0e0a35e6f7ad00c0d006573396a4749ad21170f4c32bbcdfe5b1084832f40b5adad7acf8c614bbd2dae WHIRLPOOL 9d30aef5977179c77f7628e8958247aa1e2077d09e99fe2d10ae7ff11e94083887ad173be0707ac012a17ea4c4d05ce7e8f588dbc927fdcc1c5b0cd0ab1c3b83 -MISC metadata.xml 275 SHA256 e398d119aa44aee1268aeba20f0ff50ce658a9d0011d476c9f3f7e060aac3d0d SHA512 71e87aef3131e0835223a9deca5ffeff8fd5e18d5ba2cdd2d53a9faf07c6e41d8a8131637d77ff77f52ebfe0493f7aebd870082627e69cb966077032c17af256 WHIRLPOOL 72cb28b728a06068fcdab9120951db2220420a914d7c004bf7a5b3929e235ef3ce56283777945ba13192a0c0cbfe76e27255f1623d19402fb8b11da653e29456 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 -Comment: GPGTools - https://gpgtools.org - -iQIcBAEBCAAGBQJT3dBHAAoJED/EDWHtqUmqX8gP/R8aPcwIkbbn8HfXqkmhwvTD -1Y+UGjPOo9cgmzJSJnUFuvUYWMV1KTEqULnrlO1n/XuwM6ArYvs4anuBej75St5Z -nu3ys6lsm5zzagQoJwXv1ZIp0L7ThzJUbXBuxnSnL6McqibXw6FH7CFhjshT/NG7 -6MYJa0o7EJQAGN2NamU9CaAhPyXHTzMuvDRopzkIsN28JFwyUJ8dO7ZfEzjTvs91 -TdKR7JZebNDafj5WVk5mcGu8ZVUASIjOoOWWGaH66uvK+l6jJWOG467TSfWSzMJd -mQeyryeJ71GSPa/PbevKEJsmgGNnWvbL86B/jrZe44cwPco2pD0Oke09FC0BIIfC -sgv7Lhb8ccCbw93684a3Dc61+ArgRwGPsYLgoEHFid+QdQjs78SnNZ2vEpz2yqj8 -FWa2jFnc9MtXGvVxSrmg7+ypofFzYOpUKw2PdmCBgGAq/J9PoZXUH59jW80kdxLj -9yfiMDh3GZ3rCQOsdVnX3cvT5je+qSM0N90M4+DoS6yBuljMUTeLM/htUtyTiNwu -pQii8ZYZBPgJNxIJEfp0VXmmlsIpDzDRUyB3j2+ZdhhaXzqgslJPTABoFaLp2bLF -OcLxxB6c6vUyn6OtOtKCOQuoWsFxplxH1kPyZZ5Xg3td/Yfibj5fnLtu2BaL4IyJ -VGd1M5ov+jN/1IjENrtl -=65yx ------END PGP SIGNATURE----- +DIST lrzsz-0.12.20.tar.gz 280938 BLAKE2B 86511ab112da849f5894f18c045f2c8a9dd4c4e97426c1d98c5b91aade6c39e26f4a7e5674e057c9596a240dfd3ef32053fcdc8ee58b33654cf15eec64779b1e SHA512 9bce64036f1f1c65f5910f19802aecaf3dc5ffeab0feeca10fa8d2fe1b83e212391cce23056d22fd0eda52df89e12ede68eb5d22ffcf22f935910d2af7399f12 diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch new file mode 100644 index 0000000000..fd923d5374 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-AR.patch @@ -0,0 +1,10 @@ +--- a/configure.in ++++ b/configure.in +@@ -95,6 +95,7 @@ AC_PROG_GCC_TRADITIONAL + dnl AC_PROG_INSTALL included in AM_INIT_AUTOMAKE + dnl AC_PROG_MAKE_SET included in AM_INIT_AUTOMAKE + AC_PROG_RANLIB ++AM_PROG_AR + AC_ISC_POSIX + AC_USE_SYSTEM_EXTENSIONS + AM_GNU_GETTEXT diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch new file mode 100644 index 0000000000..3c58bd1809 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/files/lrzsz-0.12.20-gettext-0.20.patch @@ -0,0 +1,23 @@ +diff -udr a/configure.in b/configure.in +--- a/configure.in 1998-12-30 08:50:07.000000000 +0100 ++++ b/configure.in 2019-06-01 20:38:54.918650170 +0200 +@@ -1,3 +1,4 @@ ++m4_pattern_allow(.*) + dnl Process this file with autoconf to produce a configure script. + AC_INIT(src/crctab.c) + AM_INIT_AUTOMAKE(lrzsz, 0.12.20) +diff -udr lrzsz-0.12.20.orig/po/Makefile.in.in lrzsz-0.12.20/po/Makefile.in.in +--- a/po/Makefile.in.in 1998-04-26 15:22:40.000000000 +0200 ++++ b/po/Makefile.in.in 2019-06-01 20:48:09.020703542 +0200 +@@ -110,9 +110,9 @@ + install-data-no: all + install-data-yes: all + if test -r $(MKINSTALLDIRS); then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DATADIR); \ + else \ +- $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(top_srcdir)/mkinstalldirs $(DATADIR); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild new file mode 100644 index 0000000000..b5461864bb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols" +HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html" +SRC_URI="https://www.ohse.de/uwe/releases/${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" + +DEPEND="nls? ( virtual/libintl )" + +PATCHES=( + "${FILESDIR}"/${PN}-autotools.patch + "${FILESDIR}"/${PN}-implicit-decl.patch + "${FILESDIR}"/${P}-automake-1.12.patch + "${FILESDIR}"/${P}-automake-1.13.patch + "${FILESDIR}"/${P}-gettext-0.20.patch + "${FILESDIR}"/${P}-AR.patch +) + +DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \ + README{,.cvs,.gettext,.isdn4linux,.tests} THANKS TODO ) + +src_prepare() { + default + # automake is unhappy if this is missing + >> config.rpath || die + # This is too old. Remove it so automake puts in a newer copy. + rm -f missing || die + # Autoheader does not like seeing this file. + rm -f acconfig.h || die + + eautoreconf +} + +src_configure() { + tc-export CC + append-flags -Wstrict-prototypes + econf $(use_enable nls) +} + +src_test() { + #Don't use check target. + #See bug #120748 before changing this function. + make vcheck || die "tests failed" +} + +src_install() { + default + + local x + for x in {r,s}{b,x,z} ; do + dosym l${x} /usr/bin/${x} + dosym l${x:0:1}z.1 /usr/share/man/man1/${x}.1 + [ "${x:1:1}" = "z" ] || dosym l${x:0:1}z.1 /usr/share/man/man1/l${x}.1 + done +} diff --git a/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/metadata.xml b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/metadata.xml index a46ef861b0..71b1461e11 100644 --- a/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/net-dialup/lrzsz/metadata.xml @@ -1,6 +1,8 @@ -net-dialup -Communication package providing the X, Y, and ZMODEM file transfer protocols + + embedded@gentoo.org + Embedded Gentoo +