gentoo resync : 17.01.2010

5 files changed, 4 insertions, 188 deletions

diff --git a/sys-devel/bc/Manifest b/sys-devel/bc/Manifest
index 92630dc9b379..3f0d50919887 100644
--- a/sys-devel/bc/Manifest
+++ b/sys-devel/bc/Manifest
@@ -1,11 +1,9 @@
 AUX bc-1.06.95-mem-leak.patch 588 BLAKE2B b81094c82c02c47bc60d949f8aa50e1a9d00bb678d6759f9ac3a695d2e01d38b942a426a024f2e3023d4c67b3c7b40f1c968a9b066573da99823c0bccbcfbf6e SHA512 3a1f354b8979586b39e6e3f93f2df7d38c2f221fb00ceef7db6cb6b51712c0fc27dbbd75635a8e4e9e2f8f100c5a39cdc1d4c1cfc32bd6c406af94edef37e40d
 AUX bc-1.06.95-void_uninitialized.patch 351 BLAKE2B ad293d5efcebc2cf85a2d1a99e850f5c104e57b92cb3070739719f578d3eac38bfb92ba4b5cd5040fe8a711db5b77a4a673e080e27b233878adf1457cbc49073 SHA512 6d2803d831d8a3137c3d867606f8d40455a6f984bfe844e10e276e24cbd5d9fd1ff21b81ea91775dd7e1e55484cdde7bf859fa3e9a17887bdf548b32cdc46dae
 AUX bc-1.07.1-no-ed-its-sed.patch 441 BLAKE2B 52a6b47ea4d4847ca53e731a1ddc5ba4d5c9e41ab46e50f874247dd4e4f4ad039fd4e9631d1eab5cad03947ea570298f031f106d0474d776e80275a46ba12e54 SHA512 43c8e2e30def9f35174559bc8fa4dd3bc9ea4794e716f3405399f8d36a690303832f9d3fe762beb6d4632df66d0d8fa6153e1c10994239289af915bf493e0e75
-AUX bc-1.07.1-sandbox.patch 3669 BLAKE2B 9ea9a75dd3534b1fea0ea1053bf95f06a78e921b4cb8b08ae26133baa4e9cca766840d5896ea7ffc38d243b9f3d8327c6664d2911ddb66b020960bad4cab54d3 SHA512 6ec7d0169fbb537c2d35e1125c69caf67a061b5ca0ee394cc2d01bbee2d13ff54a29302135557b3846bb3dfcc18e1599f8ba0115350d54caea39e0344155fa5b
 AUX bc-1.07.1-use-system-bc.patch 556 BLAKE2B 822c525fa2fd90822498fad72b9cda91b2af5d0318fc33e74dd407e3bc2a29c8d12b9cc38e80ebd7f3a084f78e302efe38b44eb70c780b8a2a76895d4d7afddb SHA512 2074adf83ac9d7c2210fc62cc5b98bde3a4f6a4d4e4cb81eb95d32ad7a8432cffc21e11b63a7b3f7090f5b814d739dabfbd6c891ec6f5bf0a9d27ace9d0582d6
 DIST bc-1.06.95.tar.bz2 290069 BLAKE2B 774f07b1f85b4de7c4707baa355caed5a9fc7b3a5ee1a14f4e9fd59f47a4bbdf34bcb76dc05de4dd8c65615284c3588ad7961fa493ed559a0e8880647835bda0 SHA512 16ec13f87ef76ad4de77d378ef8d65a582adca1bf661c9d7675e78d940680c77e81a00a01817fde7c1ad1524562d6f933caa5c42a0686f3f85aadbb39393afb1
 DIST bc-1.07.1.tar.gz 419850 BLAKE2B dcedc193be5521aa0fa3a19746233ed65bc1fe8ef12e15155341706de6fbeecb6dd7ee4ab11e2d4b3aca2ae7097cce89e389b3573493bbc893e00b4ed3239594 SHA512 02126d0db6b6ed06d56cfc292d6f5475ff1e574779d7e69c7809bbb1e13f946f57ea07da2a7666baa092507a951a822044b0970075f75eefe65a5c1999b75d34
 EBUILD bc-1.06.95-r2.ebuild 1591 BLAKE2B 4aca8552b195e20f3103573297f4921f37ddd3c5cee9490ef22dcac56a9be42204ded0547b63dd5ad8958c733597e29fc43081b3d621a7789f53a89704cbaf05 SHA512 2daf462dabce1052a19e3e334acdc188165716e011db776c18309e9c90391509c3ea2379077d61eeeef6a7da05271ef4f91e87b28ba2ccc1776e1214af786e67
-EBUILD bc-1.07.1-r1.ebuild 1239 BLAKE2B a4794290859366b9ad2c9a164488dfd725c4f659f175645f563836408c0a50ac71f2c3f07cf5803fd278e7451fa24d4b1355d75aa87f0967dd5883cbb03fce16 SHA512 cd45a1f58eaca2aa9802f8260304fa20c143ade2aa7bd16ca03bb513c40a7861011b47334abe448b597bced6e812acb9c3c0c7635a66efe1d2d85d5cfc7c435b
-EBUILD bc-1.07.1-r2.ebuild 1747 BLAKE2B 8ae7f0f150adcb6b21fd9e96ad82dc45c6f9137164ca363387f7f5cdf104b3306b6764e051fb3f4439db36f358aa077c73ab31098cc0c7f53ea2aa0be95483f9 SHA512 d7faf63f9d4684d0d8d106a54e5b61a935c1f795d0fc21d772287cb09d398ca8df1653f507cb5fccbaba740bcd9b210315a5c32820e2f623d048a7dd690774c1
-MISC metadata.xml 389 BLAKE2B 39234be070bd1ff9ad6fbb7dc76420b9f030e336ca94f64784f45de9f92fd260328a8367763151c95d429a7b5ffcae9db5cbddd692ded7cd83b9d25c24b573c5 SHA512 96b8257188ecefe1dc05cd7f2c14b0df052b14a2920fec12caf9b28e5f54dd4cce1e228d68507ee8391e85ff68c39435d7d2d9339efaf06d6b089a89347a0d18
+EBUILD bc-1.07.1-r3.ebuild 1462 BLAKE2B 8b3868f319e2291ec7d57e0b76c0e8c6bf05f37bf95f8c500f9c338ffd51e034ee21e88ae942c02be7924a847c3a3036b658cccfc429c454f41b6fdcde344b62 SHA512 b4237f24d1528f7f8d1ec1f848ac86eb720e1ebaad90ddbd220706f35e21591ed037a6122b522d34092aa0fda78a2281d17da0d3dc148ec8c9946ec856b4b591
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/bc/bc-1.07.1-r1.ebuild b/sys-devel/bc/bc-1.07.1-r1.ebuild
deleted file mode 100644
index 14f6c1f69115..000000000000
--- a/sys-devel/bc/bc-1.07.1-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Handy console-based calculator utility"
-HOMEPAGE="https://www.gnu.org/software/bc/bc.html"
-SRC_URI="mirror://gnu/bc/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="libedit readline static"
-
-RDEPEND="
-	!readline? ( libedit? ( dev-libs/libedit:= ) )
-	readline? (
-		>=sys-libs/readline-4.1:0=
-		>=sys-libs/ncurses-5.2:=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	sys-apps/ed
-	sys-devel/flex
-	virtual/yacc
-"
-
-src_configure() {
-	local myconf=(
-		$(use_with readline)
-	)
-	if use readline ; then
-		myconf+=( --without-libedit )
-	else
-		myconf+=( $(use_with libedit) )
-	fi
-	use static && append-ldflags -static
-
-	econf "${myconf[@]}"
-
-	# Do not regen docs -- configure produces a small fragment that includes
-	# the version info which causes all pages to regen (newer file). #554774
-	touch -r doc doc/*
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
diff --git a/sys-devel/bc/bc-1.07.1-r2.ebuild b/sys-devel/bc/bc-1.07.1-r3.ebuild
index 14782c7a3975..33e7244ef027 100644
--- a/sys-devel/bc/bc-1.07.1-r2.ebuild
+++ b/sys-devel/bc/bc-1.07.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/bc/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="forced-sandbox libedit readline static"
+IUSE="libedit readline static"
 
 RDEPEND="
 	!readline? ( libedit? ( dev-libs/libedit:= ) )
@@ -28,7 +28,6 @@ DEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.07.1-sandbox.patch"
 	"${FILESDIR}/${PN}-1.07.1-no-ed-its-sed.patch"
 )
 
@@ -37,12 +36,6 @@ src_prepare() {
 
 	# Avoid bad build tool usage when cross-compiling.  #627126
 	tc-is-cross-compiler && eapply "${FILESDIR}/${PN}-1.07.1-use-system-bc.patch"
-
-	# A patch to make this into a configure option has been sent upstream,
-	# but lets avoid regenerating all the autotools just for this.
-	if use forced-sandbox ; then
-		sed -i '/dc_sandbox_enabled = 0/s:0:1:' dc/dc.c || die
-	fi
 }
 
 src_configure() {
diff --git a/sys-devel/bc/files/bc-1.07.1-sandbox.patch b/sys-devel/bc/files/bc-1.07.1-sandbox.patch
deleted file mode 100644
index ec5c406645b2..000000000000
--- a/sys-devel/bc/files/bc-1.07.1-sandbox.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-this has been sent upstream, but they don't have a mailing list or project site
-to link to.  oh well.
-
-From e641584767c3c7cc1ff544805acc2562fc56cda9 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Mon, 17 Sep 2018 18:57:57 -0400
-Subject: [PATCH 1/2] dc: add a --sandbox option
-
-Other GNU projects (like sed & gawk) have a --sandbox flag whereby
-access to files and system() are disabled.  This allows people to
-run arbitrary scripts without worrying about them "escaping" and
-executing arbitrary commands on the system.
----
- dc/dc.c     | 9 ++++++++-
- dc/dc.h     | 3 +++
- dc/misc.c   | 6 ++++++
- doc/dc.1    | 5 +++++
- doc/dc.texi | 4 ++++
- 5 files changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/dc/dc.c b/dc/dc.c
-index 6a2bb2639235..592a76be71da 100644
---- a/dc/dc.c
-+++ b/dc/dc.c
-@@ -54,6 +54,7 @@
- #endif
- 
- const char *progname;	/* basename of program invocation */
-+int dc_sandbox_enabled;	/* whether sandbox mode is enabled */
- 
- static void
- bug_report_info DC_DECLVOID()
-@@ -80,6 +81,7 @@ usage DC_DECLARG((f))
- Usage: %s [OPTION] [file ...]\n\
-   -e, --expression=EXPR    evaluate expression\n\
-   -f, --file=FILE          evaluate contents of file\n\
-+  -S, --sandbox            disable the ! (system) command\n\
-   -h, --help               display this help and exit\n\
-   -V, --version            output version information and exit\n\
- \n\
-@@ -252,6 +254,7 @@ main DC_DECLARG((argc, argv))
- 	static struct option const long_opts[] = {
- 		{"expression", required_argument, NULL, 'e'},
- 		{"file", required_argument, NULL, 'f'},
-+		{"sandbox", no_argument, NULL, 'S'},
- 		{"help", no_argument, NULL, 'h'},
- 		{"version", no_argument, NULL, 'V'},
- 		{NULL, 0, NULL, 0}
-@@ -260,12 +263,13 @@ main DC_DECLARG((argc, argv))
- 	int c;
- 
- 	progname = r1bindex(*argv, '/');
-+	dc_sandbox_enabled = 0;
- 	dc_math_init();
- 	dc_string_init();
- 	dc_register_init();
- 	dc_array_init();
- 
--	while ((c = getopt_long(argc, argv, "hVe:f:", long_opts, (int *)0)) != EOF) {
-+	while ((c = getopt_long(argc, argv, "hVe:f:S", long_opts, (int *)0)) != EOF) {
- 		switch (c) {
- 		case 'e':
- 			{	dc_data string = dc_makestring(optarg, strlen(optarg));
-@@ -279,6 +283,9 @@ main DC_DECLARG((argc, argv))
- 			try_file(optarg);
- 			did_eval = 1;
- 			break;
-+		case 'S':
-+			dc_sandbox_enabled = 1;
-+			break;
- 		case 'h':
- 			usage(stdout);
- 			return flush_okay();
-diff --git a/dc/dc.h b/dc/dc.h
-index 6a871ad612a5..a148df467a92 100644
---- a/dc/dc.h
-+++ b/dc/dc.h
-@@ -76,4 +76,7 @@ typedef struct {
- /* This is dc's only global variable: */
- extern const char *progname;	/* basename of program invocation */
- 
-+/* Whether to run in sandbox mode. */
-+extern int dc_sandbox_enabled;
-+
- #endif /* not DC_DEFS_H */
-diff --git a/dc/misc.c b/dc/misc.c
-index cd23602fce32..115be90b03bf 100644
---- a/dc/misc.c
-+++ b/dc/misc.c
-@@ -131,6 +131,12 @@ dc_system DC_DECLARG((s))
- 	char *tmpstr;
- 	size_t len;
- 
-+	if (dc_sandbox_enabled) {
-+		fprintf(stderr, "%s: ! command disabled in sandbox mode\n",
-+				progname);
-+		exit(EXIT_FAILURE);
-+	}
-+
- 	p = strchr(s, '\n');
- 	if (p != NULL) {
- 		len = (size_t) (p - s);
-diff --git a/doc/dc.1 b/doc/dc.1
-index 1c666493e00a..7c4b6fffd616 100644
---- a/doc/dc.1
-+++ b/doc/dc.1
-@@ -84,6 +84,11 @@ to the set of commands to be run while processing the input.
- Add the commands contained in the file
- .I script-file
- to the set of commands to be run while processing the input.
-+.TP
-+.B -S
-+.TP
-+.B --sandbox
-+Run in sandbox mode where access to \fB!\fR for the system function.
- .PP
- If any command-line parameters remain after processing the above,
- these parameters are interpreted as the names of input files to
--- 
-2.17.1
-
diff --git a/sys-devel/bc/metadata.xml b/sys-devel/bc/metadata.xml
index 5bdfef6846f9..56c124413057 100644
--- a/sys-devel/bc/metadata.xml
+++ b/sys-devel/bc/metadata.xml
@@ -5,7 +5,4 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<use>
-	<flag name="forced-sandbox">Always enable --sandbox mode for simpler/secure runtime (disables the ! command in dc)</flag>
-</use>
 </pkgmetadata>