1 |
commit: eb4fa416f9beef50c217853ead0f074666566597 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 4 11:48:23 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 4 11:48:23 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4fa416 |
7 |
|
8 |
app-shells/dash: Removed old |
9 |
|
10 |
Package-Manager: Portage-3.0.5, Repoman-3.0.1 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
app-shells/dash/Manifest | 1 - |
14 |
app-shells/dash/dash-0.5.10.2-r1.ebuild | 56 ---------------------- |
15 |
.../dash/files/dash-0.5.20.2-gcc-fno-common.patch | 38 --------------- |
16 |
.../dash/files/dash-0.5.9.1-format-security.patch | 13 ----- |
17 |
4 files changed, 108 deletions(-) |
18 |
|
19 |
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest |
20 |
index 925df4efde0..dea2bfa7e01 100644 |
21 |
--- a/app-shells/dash/Manifest |
22 |
+++ b/app-shells/dash/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640 |
25 |
DIST dash-0.5.11.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72 |
26 |
DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4 |
27 |
|
28 |
diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild b/app-shells/dash/dash-0.5.10.2-r1.ebuild |
29 |
deleted file mode 100644 |
30 |
index cb4780554ab..00000000000 |
31 |
--- a/app-shells/dash/dash-0.5.10.2-r1.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,56 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
- |
39 |
-inherit flag-o-matic toolchain-funcs |
40 |
- |
41 |
-DESCRIPTION="Debian Almquist Shell" |
42 |
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" |
43 |
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz" |
44 |
- |
45 |
-LICENSE="BSD" |
46 |
-SLOT="0" |
47 |
-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" |
48 |
-IUSE="libedit static" |
49 |
- |
50 |
-BDEPEND="virtual/pkgconfig" |
51 |
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" |
52 |
-DEPEND="${RDEPEND} |
53 |
- libedit? ( static? ( dev-libs/libedit[static-libs] ) )" |
54 |
- |
55 |
-PATCHES=( |
56 |
- "${FILESDIR}/dash-0.5.9.1-format-security.patch" |
57 |
- "${FILESDIR}/dash-0.5.20.2-gcc-fno-common.patch" |
58 |
-) |
59 |
- |
60 |
-src_prepare() { |
61 |
- default |
62 |
- |
63 |
- # Fix the invalid sort |
64 |
- sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins |
65 |
- |
66 |
- # Use pkg-config for libedit linkage |
67 |
- sed -i \ |
68 |
- -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ |
69 |
- configure || die |
70 |
-} |
71 |
- |
72 |
-src_configure() { |
73 |
- # don't redefine stat on Solaris |
74 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
75 |
- export ac_cv_func_stat64=yes |
76 |
- |
77 |
- # if your headers strictly adhere to POSIX, you'll need this too |
78 |
- [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255 |
79 |
- fi |
80 |
- append-cppflags -DJOBS=$(usex libedit 1 0) |
81 |
- use static && append-ldflags -static |
82 |
- # Do not pass --enable-glob due to #443552. |
83 |
- local myeconfargs=( |
84 |
- --bindir="${EPREFIX}"/bin |
85 |
- --enable-fnmatch |
86 |
- $(use_with libedit) |
87 |
- ) |
88 |
- econf "${myeconfargs[@]}" |
89 |
-} |
90 |
|
91 |
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 |
92 |
deleted file mode 100644 |
93 |
index 08d5ed08a39..00000000000 |
94 |
--- a/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch |
95 |
+++ /dev/null |
96 |
@@ -1,38 +0,0 @@ |
97 |
-From 4459ec7f6cd394b9d01bd9d537b0f04975583dff Mon Sep 17 00:00:00 2001 |
98 |
-From: Jeroen Roovers <jer@g.o> |
99 |
-Date: Mon, 16 Mar 2020 19:25:00 +0100 |
100 |
-Subject: [PATCH] input: Fix compiling against libedit with -fno-common |
101 |
-To: dash@×××××××××××.org |
102 |
- |
103 |
-With -fno-common, which will be enabled by default in GCC 10, we see |
104 |
-this error: |
105 |
- |
106 |
-ld: input.o:(.bss+0x0): multiple definition of `el'; |
107 |
-histedit.o:(.bss+0x8): first defined here |
108 |
- |
109 |
-To fix this, simply remove the definition as it is not needed. |
110 |
- |
111 |
-Signed-off-by: Jeroen Roovers <jer@g.o> |
112 |
-Signed-off-by: Mike Gilbert <floppym@g.o> |
113 |
---- |
114 |
- src/input.c | 4 ---- |
115 |
- 1 file changed, 4 deletions(-) |
116 |
- |
117 |
-diff --git a/src/input.c b/src/input.c |
118 |
-index ae0c4c8..e84eca8 100644 |
119 |
---- a/src/input.c |
120 |
-+++ b/src/input.c |
121 |
-@@ -67,10 +67,6 @@ MKINIT char basebuf[IBUFSIZ]; /* buffer for top level input file */ |
122 |
- struct parsefile *parsefile = &basepf; /* current input file */ |
123 |
- int whichprompt; /* 1 == PS1, 2 == PS2 */ |
124 |
- |
125 |
--#ifndef SMALL |
126 |
--EditLine *el; /* cookie for editline package */ |
127 |
--#endif |
128 |
-- |
129 |
- STATIC void pushfile(void); |
130 |
- static int preadfd(void); |
131 |
- static void setinputfd(int fd, int push); |
132 |
--- |
133 |
-2.25.1 |
134 |
- |
135 |
|
136 |
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 |
137 |
deleted file mode 100644 |
138 |
index ea2114f392b..00000000000 |
139 |
--- a/app-shells/dash/files/dash-0.5.9.1-format-security.patch |
140 |
+++ /dev/null |
141 |
@@ -1,13 +0,0 @@ |
142 |
-Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1037030#c2 |
143 |
- |
144 |
---- a/src/jobs.c |
145 |
-+++ a/src/jobs.c |
146 |
-@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly) |
147 |
- goto out; |
148 |
- #endif |
149 |
- } |
150 |
-- col = fmtstr(s, 32, strsignal(st)); |
151 |
-+ col = fmtstr(s, 32, "%s", strsignal(st)); |
152 |
- #ifdef WCOREDUMP |
153 |
- if (WCOREDUMP(status)) { |
154 |
- col += fmtstr(s + col, 16, " (core dumped)"); |