commit: eb4fa416f9beef50c217853ead0f074666566597 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Fri Sep 4 11:48:23 2020 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Fri Sep 4 11:48:23 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4fa416
app-shells/dash: Removed old Package-Manager: Portage-3.0.5, Repoman-3.0.1 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-shells/dash/Manifest | 1 - app-shells/dash/dash-0.5.10.2-r1.ebuild | 56 ---------------------- .../dash/files/dash-0.5.20.2-gcc-fno-common.patch | 38 --------------- .../dash/files/dash-0.5.9.1-format-security.patch | 13 ----- 4 files changed, 108 deletions(-) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 925df4efde0..dea2bfa7e01 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,3 +1,2 @@ -DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640 DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72 DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4 diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild b/app-shells/dash/dash-0.5.10.2-r1.ebuild deleted file mode 100644 index cb4780554ab..00000000000 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic toolchain-funcs - -DESCRIPTION="Debian Almquist Shell" -HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/"; -SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="libedit static" - -BDEPEND="virtual/pkgconfig" -RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" -DEPEND="${RDEPEND} - libedit? ( static? ( dev-libs/libedit[static-libs] ) )" - -PATCHES=( - "${FILESDIR}/dash-0.5.9.1-format-security.patch" - "${FILESDIR}/dash-0.5.20.2-gcc-fno-common.patch" -) - -src_prepare() { - default - - # Fix the invalid sort - sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins - - # Use pkg-config for libedit linkage - sed -i \ - -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ - configure || die -} - -src_configure() { - # don't redefine stat on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - export ac_cv_func_stat64=yes - - # if your headers strictly adhere to POSIX, you'll need this too - [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255 - fi - append-cppflags -DJOBS=$(usex libedit 1 0) - use static && append-ldflags -static - # Do not pass --enable-glob due to #443552. - local myeconfargs=( - --bindir="${EPREFIX}"/bin - --enable-fnmatch - $(use_with libedit) - ) - econf "${myeconfargs[@]}" -} diff --git a/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch b/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch deleted file mode 100644 index 08d5ed08a39..00000000000 --- a/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4459ec7f6cd394b9d01bd9d537b0f04975583dff Mon Sep 17 00:00:00 2001 -From: Jeroen Roovers <[email protected]> -Date: Mon, 16 Mar 2020 19:25:00 +0100 -Subject: [PATCH] input: Fix compiling against libedit with -fno-common -To: [email protected] - -With -fno-common, which will be enabled by default in GCC 10, we see -this error: - -ld: input.o:(.bss+0x0): multiple definition of `el'; -histedit.o:(.bss+0x8): first defined here - -To fix this, simply remove the definition as it is not needed. - -Signed-off-by: Jeroen Roovers <[email protected]> -Signed-off-by: Mike Gilbert <[email protected]> ---- - src/input.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/input.c b/src/input.c -index ae0c4c8..e84eca8 100644 ---- a/src/input.c -+++ b/src/input.c -@@ -67,10 +67,6 @@ MKINIT char basebuf[IBUFSIZ]; /* buffer for top level input file */ - struct parsefile *parsefile = &basepf; /* current input file */ - int whichprompt; /* 1 == PS1, 2 == PS2 */ - --#ifndef SMALL --EditLine *el; /* cookie for editline package */ --#endif -- - STATIC void pushfile(void); - static int preadfd(void); - static void setinputfd(int fd, int push); --- -2.25.1 - diff --git a/app-shells/dash/files/dash-0.5.9.1-format-security.patch b/app-shells/dash/files/dash-0.5.9.1-format-security.patch deleted file mode 100644 index ea2114f392b..00000000000 --- a/app-shells/dash/files/dash-0.5.9.1-format-security.patch +++ /dev/null @@ -1,13 +0,0 @@ -Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1037030#c2 - ---- a/src/jobs.c -+++ a/src/jobs.c -@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly) - goto out; - #endif - } -- col = fmtstr(s, 32, strsignal(st)); -+ col = fmtstr(s, 32, "%s", strsignal(st)); - #ifdef WCOREDUMP - if (WCOREDUMP(status)) { - col += fmtstr(s + col, 16, " (core dumped)");
