From 4df3bf9762850b34cd1ead5c80374d1a0fc3362e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 12 Jul 2021 08:41:54 +0100 Subject: gentoo resync : 12.07.2021 --- app-shells/bash/Manifest | 2 - .../files/bash-5.0_p11-disable_priv_mode.patch | 85 ---------------------- app-shells/bash/files/bash-5.1-parallel_make.patch | 15 ---- 3 files changed, 102 deletions(-) delete mode 100644 app-shells/bash/files/bash-5.0_p11-disable_priv_mode.patch delete mode 100644 app-shells/bash/files/bash-5.1-parallel_make.patch (limited to 'app-shells/bash') diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index d5a376084a27..901ff31a4f84 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -59,8 +59,6 @@ AUX bash-4.4-set-SHOBJ_STATUS.patch 410 BLAKE2B beddcd4ea00cf6814615896e9842a607 AUX bash-4.x-deferred-heredocs.patch 1181 BLAKE2B 3afb0e6d6e9b1220133a862bc44c13a5989c4d21ab456098ee19f8dc8adfd0dfff6c83e3c42fc622487b05a33d614c08e69f400796ff6f1ee9c56c74a94f6867 SHA512 167d6344cef96f2c0e732450c3174c5cd74df822f71c415d145d531fb192fc9c684dcdff1a982b87824becd2bdbdf3fb5ab47dcaa4c7a35905b42d25ad0710aa AUX bash-5.0-history-append.patch 1150 BLAKE2B cc3d4c2303b37b14da2cbb3130db0c2fa65cdc7f7f8d0a4413042a898c4c48afbedcca03c9dbfc525ab191ddc2b4258fb976a28830e03490011f89a1361974b4 SHA512 9c2fb93c67a5da1e97b293db4b26469fd6813e2cfc8ffd776042529878b96312644d8dc247887d6171c89c0853d552e9f7d5d2c0b2f3d05c25c15e17e6706999 AUX bash-5.0-syslog-history-extern.patch 376 BLAKE2B d883d3c3adbf8f4d19ecc3c2790754a7f6972682d1679b07d5bc599bdbfc019ba8ad4d1271ec550b59447db0a02f1219c9e6057a0b1c1c6c52f7750a746a07bf SHA512 c8dd17bdd8ccbd73061a7cbcb7351195e703a2c5fc6faf288ec3721fc6e526d88dd4b2201f87078a92ca134b98214ccfa935f82f585322f72e9a41fd51842b6a -AUX bash-5.0_p11-disable_priv_mode.patch 2651 BLAKE2B 9abd8497cdafa8f4b5fa2db887c0c67304077609da8894a43b5debe6d2223f2f5cb009879ad1a17a589e492273d5bfe139676451a68cd461bd82926d5f029e85 SHA512 112e71b85a7edec4898c940ba278ed2c1f443af7d658b10dec12ced8473fb2111fe772b2ceea93ec319038cee25ca275bc39216364150f52cdefe2155cdb78d7 -AUX bash-5.1-parallel_make.patch 472 BLAKE2B fa6432b4a92f868eae1162f39de2860c94970c90a7209b445099bf1771d06b3545ebec13e7b18754b016f0d822bfc01983e994d25ca00bab3ab4494e27d7b3a3 SHA512 9137f58f568142fb1d8cb554adbc382fbdf317b5090f609672d2c4a1dde4a4a5c0d1ca3df6b28c8c196b660956e9bc34bbf1b76f8133d1099b65f4648f6051b9 AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d AUX bashrc 3570 BLAKE2B 78fdff186afb07f9080b19e77ff197113df67b03407525d014a41b51ba6b42d98310f5093ecdc46c1d5354a77c578e94b9a4cd6d965156ad5f31c2955f4e41a2 SHA512 a3271c3c70b450fe67114720f0d2e4abf4eaf1925e5b3de1ee437968f4a29d722bc74b8e9461cd555487c578afe6f289d66898c75a7cc994d205fa5b29045604 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd diff --git a/app-shells/bash/files/bash-5.0_p11-disable_priv_mode.patch b/app-shells/bash/files/bash-5.0_p11-disable_priv_mode.patch deleted file mode 100644 index 9a05c8b8613f..000000000000 --- a/app-shells/bash/files/bash-5.0_p11-disable_priv_mode.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -urP ../bash-5.0.orig/config.h.in config.h.in ---- ../bash-5.0.orig/config.h.in 2018-12-04 09:54:17.000000000 -0700 -+++ config.h.in 2019-12-10 11:34:42.157926317 -0700 -@@ -1,6 +1,6 @@ - /* config.h -- Configuration file for bash. */ - --/* Copyright (C) 1987-2009,2011-2012 Free Software Foundation, Inc. -+/* Copyright (C) 1987-2009,2011-2012,2013-2019 Free Software Foundation, Inc. - - This file is part of GNU Bash, the Bourne Again SHell. - -@@ -807,6 +807,14 @@ - #undef HAVE_SETREGID - #undef HAVE_DECL_SETREGID - -+/* Define if you have the setregid function. */ -+#undef HAVE_SETRESGID -+#undef HAVE_DECL_SETRESGID -+ -+/* Define if you have the setresuid function. */ -+#undef HAVE_SETRESUID -+#undef HAVE_DECL_SETRESUID -+ - /* Define if you have the setvbuf function. */ - #undef HAVE_SETVBUF - -diff -urP ../bash-5.0.orig/configure configure ---- ../bash-5.0.orig/configure 2019-01-02 07:43:31.000000000 -0700 -+++ configure 2019-12-10 11:34:42.166926317 -0700 -@@ -10281,6 +10281,17 @@ - #define HAVE_DECL_SETREGID $ac_have_decl - _ACEOF - -+ac_fn_c_check_decl "$LINENO" "" "ac_cv_have_decl_" "$ac_includes_default" -+if test "x$ac_cv_have_decl_" = xyes; then : -+ ac_have_decl=1 -+else -+ ac_have_decl=0 -+fi -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_DECL_ $ac_have_decl -+_ACEOF -+(setresuid, setresgid) - ac_fn_c_check_decl "$LINENO" "strcpy" "ac_cv_have_decl_strcpy" "$ac_includes_default" - if test "x$ac_cv_have_decl_strcpy" = xyes; then : - ac_have_decl=1 -diff -urP ../bash-5.0.orig/configure.ac configure.ac ---- ../bash-5.0.orig/configure.ac 2019-01-02 07:39:11.000000000 -0700 -+++ configure.ac 2019-12-10 11:34:42.168926317 -0700 -@@ -810,6 +810,7 @@ - AC_CHECK_DECLS([printf]) - AC_CHECK_DECLS([sbrk]) - AC_CHECK_DECLS([setregid]) -+AC_CHECK_DECLS[(setresuid, setresgid]) - AC_CHECK_DECLS([strcpy]) - AC_CHECK_DECLS([strsignal]) - -diff -urP ../bash-5.0.orig/shell.c shell.c ---- ../bash-5.0.orig/shell.c 2018-12-06 09:28:21.000000000 -0700 -+++ shell.c 2019-12-10 11:34:42.170926317 -0700 -@@ -1293,7 +1293,11 @@ - { - int e; - -+#if HAVE_DECL_SETRESUID -+ if (setresuid (current_user.uid, current_user.uid, current_user.uid) < 0) -+#else - if (setuid (current_user.uid) < 0) -+#endif - { - e = errno; - sys_error (_("cannot set uid to %d: effective uid %d"), current_user.uid, current_user.euid); -@@ -1302,7 +1306,11 @@ - exit (e); - #endif - } -+#if HAVE_DECL_SETRESGID -+ if (setresgid (current_user.gid, current_user.gid, current_user.gid) < 0) -+#else - if (setgid (current_user.gid) < 0) -+#endif - sys_error (_("cannot set gid to %d: effective gid %d"), current_user.gid, current_user.egid); - - current_user.euid = current_user.uid; diff --git a/app-shells/bash/files/bash-5.1-parallel_make.patch b/app-shells/bash/files/bash-5.1-parallel_make.patch deleted file mode 100644 index b341a8a06e28..000000000000 --- a/app-shells/bash/files/bash-5.1-parallel_make.patch +++ /dev/null @@ -1,15 +0,0 @@ -bashline.c:65:10: fatal error: builtins/builtext.h: No such file or directory - 65 | #include "builtins/builtext.h" /* for read_builtin */ - | ^~~~~~~~~~~~~~~~~~~~~ - ---- bash-5.1/Makefile.in -+++ bash-5.1/Makefile.in -@@ -584,6 +584,8 @@ - ls -l $(Program) - -$(SIZE) $(Program) - -+$(CSOURCES): $(DEFDIR)/builtext.h -+ - .build: $(SOURCES) config.h Makefile version.h $(VERSPROG) - @echo - @echo " ***********************************************************" -- cgit v1.2.3