[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: a14d78b34df9a6ed1fef577b5a346c5ea12e147a Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 31 12:08:11 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 31 12:08:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a14d78b3 sys-devel/patch: Stabilize 2.7.6-r5 ppc, #892189 Signed-off-by: Arthur Zamarin gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index 271c14d9875e..8ab2c52c0d74 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 383d8ccf52fefc0f320882e73424a61cc6ceca6e Author: Sam James gentoo org> AuthorDate: Fri Feb 24 18:34:50 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 24 18:36:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=383d8ccf sys-devel/patch: keyword for ~arm64-macos Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 4 ++-- sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 25e16497..154e5382e772 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )" diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index e93ac48c3848..271c14d9875e 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 1f1ff19f615b6568ca81c49f051e38359de1f2c0 Author: Sam James gentoo org> AuthorDate: Sun Jan 29 00:58:53 2023 + Commit: Sam James gentoo org> CommitDate: Sun Jan 29 00:58:53 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f1ff19f sys-devel/patch: Stabilize 2.7.6-r5 hppa, #892189 Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index 1f64ef5366c6..e93ac48c3848 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: ad1ae969d8a2a08cac13463c4e22c558e2a92b79 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 08:04:29 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 08:04:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad1ae969 sys-devel/patch: Stabilize 2.7.6-r5 sparc, #892189 Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index e9647aa0b9f4..1f64ef5366c6 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: d3e048a44e7aa1dc2d93ca0457d968767f508559 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 08:04:24 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 08:04:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3e048a4 sys-devel/patch: Stabilize 2.7.6-r5 x86, #892189 Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index 803a7e832e09..c3a31831591e 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 6a15bea25046295c2e19e16ed582012a150d5cc3 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 08:04:26 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 08:04:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a15bea2 sys-devel/patch: Stabilize 2.7.6-r5 ppc64, #892189 Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index c3a31831591e..927043f56022 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 4a9cf8b01525a3fab1c61d28210cef503dcc851c Author: Sam James gentoo org> AuthorDate: Fri Jan 27 08:04:28 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 08:04:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9cf8b0 sys-devel/patch: Stabilize 2.7.6-r5 amd64, #892189 Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index 927043f56022..e9647aa0b9f4 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 5180c68de8de288b10da289dbb23f33447dcd465 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 06:30:36 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 06:30:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5180c68d sys-devel/patch: Stabilize 2.7.6-r5 arm, #892189 Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index 09f7c0284f92..08f674ac772d 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: cdc734a546ba7fdff59498f64ddde52200de30ba Author: Sam James gentoo org> AuthorDate: Fri Jan 27 06:30:38 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 06:30:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdc734a5 sys-devel/patch: Stabilize 2.7.6-r5 arm64, #892189 Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild index 08f674ac772d..803a7e832e09 100644 --- a/sys-devel/patch/patch-2.7.6-r5.ebuild +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 4f3a2f4276d716c11d39f2851d781225b777f053 Author: Michał Górny gentoo org> AuthorDate: Sun Oct 30 13:25:58 2022 + Commit: Sam James gentoo org> CommitDate: Sun Oct 30 15:50:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3a2f42 sys-devel/patch: Install as gpatch for better BSD compat. Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Sam James gentoo.org> sys-devel/patch/patch-2.7.6-r5.ebuild | 59 +++ 1 file changed, 59 insertions(+) diff --git a/sys-devel/patch/patch-2.7.6-r5.ebuild b/sys-devel/patch/patch-2.7.6-r5.ebuild new file mode 100644 index ..09f7c0284f92 --- /dev/null +++ b/sys-devel/patch/patch-2.7.6-r5.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/patch.asc +inherit flag-o-matic verify-sig + +DESCRIPTION="Utility to apply diffs to files" +HOMEPAGE="https://www.gnu.org/software/patch/patch.html; +SRC_URI="mirror://gnu/patch/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static test xattr" +RESTRICT="!test? ( test )" + +RDEPEND="xattr? ( sys-apps/attr )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( sys-apps/ed ) + verify-sig? ( sec-keys/openpgp-keys-patch )" + +PATCHES=( + "${FILESDIR}"/${P}-fix-test-suite.patch + "${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch + "${FILESDIR}"/${PN}-2.7.6-CVE-2018-6951.patch + "${FILESDIR}"/${PN}-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch + "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156.patch + "${FILESDIR}"/${PN}-2.7.6-CVE-2018-6952.patch + "${FILESDIR}"/${PN}-2.7.6-Do-not-crash-when-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch + "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix1.patch + "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156-fix2.patch + "${FILESDIR}"/${PN}-2.7.6-CVE-2019-13636.patch + "${FILESDIR}"/${PN}-2.7.6-CVE-2019-13638.patch + "${FILESDIR}"/${PN}-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch +) + +src_configure() { + use static && append-ldflags -static + + local myeconfargs=( + $(use_enable xattr) + # rename to gpatch for better BSD compatibility + --program-prefix=g + ) + # Do not let $ED mess up the search for `ed` 470210. + ac_cv_path_ED=$(type -P ed) \ + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # symlink to the standard name + dosym gpatch /usr/bin/patch + dosym gpatch.1 /usr/share/man/man1/patch.1 +}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 7ccde8c7f7393974463ab7f82e956920d6f57d68 Author: Sam James gentoo org> AuthorDate: Thu Apr 7 03:53:10 2022 + Commit: Sam James gentoo org> CommitDate: Thu Apr 7 03:57:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ccde8c7 sys-devel/patch: add verify-sig Signed-off-by: Sam James gentoo.org> sys-devel/patch/Manifest | 1 + sys-devel/patch/patch-2.7.6-r4.ebuild | 9 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest index 15f0b1675c72..612a9aae3b54 100644 --- a/sys-devel/patch/Manifest +++ b/sys-devel/patch/Manifest @@ -1 +1,2 @@ DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd +DIST patch-2.7.6.tar.xz.sig 801 BLAKE2B 8f2decb10402ecf0208d05ea7cce3bae565d31ee2bb2a118367c117d25b158d8bd525cae654ec0c0e2c036cc8f47a331edc1bb10b100683ade64dfa3b651988b SHA512 1302a1110dcda4f3d83b5263415d72be55c46dae0efb1c123e9c346154e09def5657004bbe7249e2d014555349410e7a5217140dd8852331235f75bcc757351b diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 30d831025c06..c753368a27ea 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -3,11 +3,13 @@ EAPI="7" -inherit flag-o-matic +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/patch.asc +inherit flag-o-matic verify-sig DESCRIPTION="Utility to apply diffs to files" HOMEPAGE="https://www.gnu.org/software/patch/patch.html; SRC_URI="mirror://gnu/patch/${P}.tar.xz" +SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )" LICENSE="GPL-3+" SLOT="0" @@ -16,8 +18,9 @@ IUSE="static test xattr" RESTRICT="!test? ( test )" RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - test? ( sys-apps/ed )" +DEPEND="${RDEPEND}" +BDEPEND="test? ( sys-apps/ed ) + verify-sig? ( sec-keys/openpgp-keys-patch )" PATCHES=( "${FILESDIR}"/${P}-fix-test-suite.patch
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: ef511d7814808591e6a273ea1598dcc1b3a798cc Author: David Seifert gentoo org> AuthorDate: Thu Jan 6 09:07:14 2022 + Commit: David Seifert gentoo org> CommitDate: Thu Jan 6 09:07:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef511d78 sys-devel/patch: remove userland_BSD Signed-off-by: David Seifert gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 5919bbb39640..30d831025c06 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -39,7 +39,6 @@ src_configure() { local myeconfargs=( $(use_enable xattr) - --program-prefix="$(use userland_BSD && echo g)" ) # Do not let $ED mess up the search for `ed` 470210. ac_cv_path_ED=$(type -P ed) \
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/files/
commit: c02ca61191198aacf2bd51c4d5a7b53b1cbb5ab9 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Apr 29 22:20:43 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 29 22:21:08 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c02ca611 sys-devel/patch: fix test suite when using dash Closes: https://bugs.gentoo.org/738810 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> .../patch/files/patch-2.7.6-fix-test-suite.patch | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch index 3aff5c0f77b..5571209c493 100644 --- a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch +++ b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch @@ -1,5 +1,6 @@ -http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288 -http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5 +https://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288 +https://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5 +https://git.savannah.gnu.org/cgit/patch.git/commit/?id=7623b2dc0d1837ecfd58f32efc78e35834deeb38 --- a/tests/crlf-handling +++ b/tests/crlf-handling @@ -117,4 +118,16 @@ http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c2 while test $# -gt 0 ; do echo "$1" shift --- + +--- a/tests/test-lib.sh b/tests/test-lib.sh +@@ -113,7 +113,7 @@ cleanup() { + exit $status + } + +-if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then ++if ( eval 'test -n "${BASH_LINENO[0]}"' 2>/dev/null ); then + eval ' + _start_test() { + printf "[${BASH_LINENO[2]}] %s -- " "$*" +
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 6cf9a6540f82f1488c512784be6632ec006336b4 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 6 15:32:13 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 6 15:32:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cf9a654 sys-devel/patch: drop x86-macos Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index be2b3d2052c..e3ec281181a 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 190e82238e22f0fb93989c0da40775e87d013d46 Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 27 18:18:12 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 27 18:18:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=190e8223 sys-devel/patch: drop ppc-aix m68k-mint Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 9f407fde9ed..be2b3d2052c 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 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" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RESTRICT="!test? ( test )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 34ffe29ab0338df627232856d5b2acfbd701a2d1 Author: Roy Yang google com> AuthorDate: Sat May 2 22:16:50 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon May 4 17:35:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ffe29a Fixed CPE tag for sys-devel/patch Signed-off-by: Roy Yang google.com> Signed-off-by: Thomas Deutschmann gentoo.org> sys-devel/patch/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-devel/patch/metadata.xml b/sys-devel/patch/metadata.xml index 56c12441305..a3b432e703b 100644 --- a/sys-devel/patch/metadata.xml +++ b/sys-devel/patch/metadata.xml @@ -5,4 +5,7 @@ base-sys...@gentoo.org Gentoo Base System + + cpe:/a:gnu:patch +
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 2bef9462bfc0da8ffcc14f3228c3b78db6c4f560 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Aug 23 10:25:11 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Aug 23 10:25:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bef9462 sys-devel/patch: alpha stable wrt bug #690136 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="alpha" Signed-off-by: Mikle Kolyada gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 43101461022..deba9edbb38 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 5aca169d5e8c7dd83b25c60b8f49dafe52df7003 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Aug 23 10:24:27 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Aug 23 10:24:27 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aca169d sys-devel/patch: sh stable wrt bug #690136 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="sh" Signed-off-by: Mikle Kolyada gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 9f5d5165884..156c40fd66e 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 8fdd2174f51fb6a7ac9c39c8f2de4573c82e2f25 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Aug 23 10:26:40 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Aug 23 10:26:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fdd2174 sys-devel/patch: Drop old Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> sys-devel/patch/patch-2.7.6-r3.ebuild | 40 --- 1 file changed, 40 deletions(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild deleted file mode 100644 index 6efd8634870..000 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic - -DESCRIPTION="Utility to apply diffs to files" -HOMEPAGE="https://www.gnu.org/software/patch/patch.html; -SRC_URI="mirror://gnu/patch/${P}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static test xattr" - -RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - test? ( sys-apps/ed )" - -PATCHES=( - "${FILESDIR}"/${P}-fix-test-suite.patch - "${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-6951.patch - "${FILESDIR}"/${PN}-2.7.6-allow-input-files-to-be-missing-for-ed-style-patches.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-1000156.patch - "${FILESDIR}"/${PN}-2.7.6-CVE-2018-6952.patch -) - -src_configure() { - use static && append-ldflags -static - - local myeconfargs=( - $(use_enable xattr) - --program-prefix="$(use userland_BSD && echo g)" - ) - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ - econf "${myeconfargs[@]}" -}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 13f8889bd89c4b5750d64a309cc243bc64640a16 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Aug 23 10:25:52 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Aug 23 10:25:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f8889b sys-devel/patch: arm stable wrt bug #690136 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="arm" Signed-off-by: Mikle Kolyada gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index deba9edbb38..b480b40246e 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: e83c1e54bf58955d57ee898b215742b1cbcffc99 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Aug 23 10:24:50 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Aug 23 10:24:50 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e83c1e54 sys-devel/patch: m68k stable wrt bug #690136 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="m68k" Signed-off-by: Mikle Kolyada gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 156c40fd66e..43101461022 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 7a2896b3234feac3fcbcab8115fe1efd31726423 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 23 09:59:40 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 23 09:59:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a2896b3 sys-devel/patch: s390 stable wrt bug #690136 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="s390" Signed-off-by: Agostino Sarubbo gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 7c073f3c5cb..9f5d5165884 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: de4df110a40b5eb7de0367bd7f0b1a0bfa457a30 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Aug 19 06:56:08 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Aug 19 06:56:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de4df110 sys-devel/patch: stable 2.7.6-r4 for hppa, bug #690136 Package-Manager: Portage-2.3.71, Repoman-2.3.17 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index ef42ee0ed00..7c073f3c5cb 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: c416461d37429e84fbf0daa2b245d9ffa2ba2a2b Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Aug 18 10:12:06 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Aug 18 10:12:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c416461d sys-devel/patch: stable 2.7.6-r4 for ppc64, bug #690136 Package-Manager: Portage-2.3.71, Repoman-2.3.17 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 68a88643ed4..ef42ee0ed00 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 54a25f25a85df430530fe03e3a547de10eb87034 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Aug 18 10:10:02 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Aug 18 10:10:02 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54a25f25 sys-devel/patch: stable 2.7.6-r4 for ppc, bug #690136 Package-Manager: Portage-2.3.71, Repoman-2.3.17 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index a50625c1225..68a88643ed4 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 3f4d4c6a28d306ee66dff50084fcdb2e4d07ed45 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Aug 18 10:07:54 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Aug 18 10:08:13 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f4d4c6a sys-devel/patch: stable 2.7.6-r4 for ia64, bug #690136 Package-Manager: Portage-2.3.71, Repoman-2.3.17 RepoMan-Options: --include-arches="ia64" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 0a5ef4fe709..a50625c1225 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: cfb526943af08c66debbe8d4606197ccbf4a29e4 Author: Rolf Eike Beer sf-mail de> AuthorDate: Sun Aug 18 08:20:32 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Aug 18 08:29:20 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb52694 sys-devel/patch: stable 2.7.6-r4 for sparc, bug #690136 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index d4ea7e02edb..0a5ef4fe709 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 0db92ef34a6b43d1044596ac7a649599df839d5a Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Aug 16 22:36:15 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Aug 16 22:36:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db92ef3 sys-devel/patch: x86 stable (bug #690136) Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 2c389ee54fe..d4ea7e02edb 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 3b4bc4295ae53e953d58724fec76e01a15099a9e Author: Aaron Bauman gentoo org> AuthorDate: Fri Aug 16 21:53:42 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Fri Aug 16 21:53:42 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b4bc429 sys-devel/patch: arm64 stable (bug #690136) Signed-off-by: Aaron Bauman gentoo.org> Package-Manager: Portage-2.3.71, Repoman-2.3.17 RepoMan-Options: --include-arches="arm64" sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index 6a60dd3f75f..2c389ee54fe 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: b3f711686335ae63fc003a2e390d01b6f2d50fd3 Author: Mikle Kolyada gentoo org> AuthorDate: Fri Aug 16 21:50:00 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri Aug 16 21:50:54 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3f71168 sys-devel/patch: amd64 stable wrt bug #690136 Package-Manager: Portage-2.3.69, Repoman-2.3.16 RepoMan-Options: --include-arches="amd64" Signed-off-by: Mikle Kolyada gentoo.org> sys-devel/patch/patch-2.7.6-r4.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r4.ebuild b/sys-devel/patch/patch-2.7.6-r4.ebuild index cce90dd296d..6a60dd3f75f 100644 --- a/sys-devel/patch/patch-2.7.6-r4.ebuild +++ b/sys-devel/patch/patch-2.7.6-r4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/files/, sys-devel/patch/
commit: b4e5bfd9d4c04c2f942bbecce62e4394d827de16 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Aug 16 12:38:46 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Aug 16 12:40:22 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e5bfd9 sys-devel/patch: rev bump to add some patches Bug: https://bugs.gentoo.org/690136 Package-Manager: Portage-2.3.71, Repoman-2.3.17 Signed-off-by: Thomas Deutschmann gentoo.org> ...lid-memory-access-in-context-format-diffs.patch | 26 + .../files/patch-2.7.6-CVE-2018-1000156-fix1.patch | 102 +++ .../files/patch-2.7.6-CVE-2018-1000156-fix2.patch | 37 +++ .../patch/files/patch-2.7.6-CVE-2019-13636.patch | 108 + .../patch/files/patch-2.7.6-CVE-2019-13638.patch | 38 ...hen-RLIMIT_NOFILE-is-set-to-RLIM_INFINITY.patch | 89 + sys-devel/patch/patch-2.7.6-r4.ebuild | 46 + 7 files changed, 446 insertions(+) diff --git a/sys-devel/patch/files/patch-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch b/sys-devel/patch/files/patch-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch new file mode 100644 index 000..5eef875b85d --- /dev/null +++ b/sys-devel/patch/files/patch-2.7.6-Avoid-invalid-memory-access-in-context-format-diffs.patch @@ -0,0 +1,26 @@ +From 15b158db3ae11cb835f2eb8d2eb48e09d1a4af48 Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Mon, 15 Jul 2019 19:10:02 +0200 +Subject: Avoid invalid memory access in context format diffs + +* src/pch.c (another_hunk): Avoid invalid memory access in context format +diffs. +--- + src/pch.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pch.c b/src/pch.c +index a500ad9..cb54e03 100644 +--- a/src/pch.c b/src/pch.c +@@ -1328,6 +1328,7 @@ another_hunk (enum diff difftype, bool rev) + ptrn_prefix_context = context; + ptrn_suffix_context = context; + if (repl_beginning ++ || p_end <= 0 + || (p_end + != p_ptrn_lines + 1 + (p_Char[p_end - 1] == '\n'))) + { +-- +cgit v1.0-41-gc330 + diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix1.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix1.patch new file mode 100644 index 000..d2492f59317 --- /dev/null +++ b/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156-fix1.patch @@ -0,0 +1,102 @@ +From 19599883ffb6a450d2884f081f8ecf68edbed7ee Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Thu, 3 May 2018 14:31:55 +0200 +Subject: Don't leak temporary file on failed ed-style patch + +Now that we write ed-style patches to a temporary file before we +apply them, we need to ensure that the temporary file is removed +before we leave, even on fatal error. + +* src/pch.c (do_ed_script): Use global TMPEDNAME instead of local + tmpname. Don't unlink the file directly, instead tag it for removal + at exit time. +* src/patch.c (cleanup): Unlink TMPEDNAME at exit. + +This closes bug #53820: +https://savannah.gnu.org/bugs/index.php?53820 + +Fixes: 123eaff0d5d1 ("Fix arbitrary command execution in ed-style patches (CVE-2018-1000156)") +--- + src/common.h | 2 ++ + src/patch.c | 1 + + src/pch.c| 11 +-- + 3 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/common.h b/src/common.h +index 904a3f8..53c5e32 100644 +--- a/src/common.h b/src/common.h +@@ -94,10 +94,12 @@ XTERN char const *origsuff; + XTERN char const * TMPINNAME; + XTERN char const * TMPOUTNAME; + XTERN char const * TMPPATNAME; ++XTERN char const * TMPEDNAME; + + XTERN bool TMPINNAME_needs_removal; + XTERN bool TMPOUTNAME_needs_removal; + XTERN bool TMPPATNAME_needs_removal; ++XTERN bool TMPEDNAME_needs_removal; + + #ifdef DEBUGGING + XTERN int debug; +diff --git a/src/patch.c b/src/patch.c +index 3fcaec5..9146597 100644 +--- a/src/patch.c b/src/patch.c +@@ -2003,6 +2003,7 @@ cleanup (void) + remove_if_needed (TMPINNAME, _needs_removal); + remove_if_needed (TMPOUTNAME, _needs_removal); + remove_if_needed (TMPPATNAME, _needs_removal); ++ remove_if_needed (TMPEDNAME, _needs_removal); + remove_if_needed (TMPREJNAME, _needs_removal); + output_files (NULL); + } +diff --git a/src/pch.c b/src/pch.c +index 79a3c99..1bb3153 100644 +--- a/src/pch.c b/src/pch.c +@@ -2392,7 +2392,6 @@ do_ed_script (char const *inname, char c + file_offset beginning_of_this_line; + size_t chars_read; + FILE *tmpfp = 0; +-char const *tmpname; + int tmpfd; + pid_t pid; + +@@ -2404,12 +2403,13 @@ do_ed_script (char const *inname, char const *outname, + invalid commands and treats the next line as a new command, which + can lead to arbitrary command execution. */ + +- tmpfd = make_tempfile (, 'e', NULL, O_RDWR | O_BINARY, 0); ++ tmpfd = make_tempfile (, 'e', NULL, O_RDWR | O_BINARY, 0); +
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 06fd44d5e51d1e240a58419a32f37ba8a0353e3f Author: Mikle Kolyada gentoo org> AuthorDate: Fri May 3 23:38:19 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Fri May 3 23:38:19 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06fd44d5 sys-devel/patch: Add ~riscv keyword Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index 079eb98f174..6efd8634870 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: d233b9af4b14c5e752a864aa7c6b5f0d43e68ece Author: Mikle Kolyada gentoo org> AuthorDate: Thu Apr 11 09:47:50 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Apr 11 09:49:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d233b9af sys-devel/patch: sh stable wrt bug #652710 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="sh" sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index d83343790ce..079eb98f174 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 2fe56f145db0e80e3d9cfe9357269c69c9bb585e Author: Mikle Kolyada gentoo org> AuthorDate: Thu Apr 11 09:47:14 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Apr 11 09:49:07 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe56f14 sys-devel/patch: m68k stable wrt bug #652710 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="m68k" sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index d8b5a61f6cd..d83343790ce 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 473392c657823d46c09f4c3e7d58bdde2f60ba54 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Apr 11 09:48:52 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Apr 11 09:49:08 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=473392c6 sys-devel/patch: Security cleanup Bug: https://bugs.gentoo.org/652710 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 sys-devel/patch/patch-2.7.6-r2.ebuild | 36 --- 1 file changed, 36 deletions(-) diff --git a/sys-devel/patch/patch-2.7.6-r2.ebuild b/sys-devel/patch/patch-2.7.6-r2.ebuild deleted file mode 100644 index a50f746ea05..000 --- a/sys-devel/patch/patch-2.7.6-r2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic - -DESCRIPTION="Utility to apply diffs to files" -HOMEPAGE="https://www.gnu.org/software/patch/patch.html; -SRC_URI="mirror://gnu/patch/${P}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static test xattr" - -RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - test? ( sys-apps/ed )" - -PATCHES=( - "${FILESDIR}"/${P}-fix-test-suite.patch - "${FILESDIR}"/${PN}-2.7.6-fix-error-handling-with-git-style-patches.patch -) - -src_configure() { - use static && append-ldflags -static - - local myeconfargs=( - $(use_enable xattr) - --program-prefix="$(use userland_BSD && echo g)" - ) - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ - econf "${myeconfargs[@]}" -}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: d03fd6f3e39aff8326eff35b779d412f4d5fdef8 Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Apr 10 19:57:23 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Apr 10 22:03:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d03fd6f3 sys-devel/patch: stable 2.7.6-r3 for sparc, bug #652710 Signed-off-by: Rolf Eike Beer sf-mail.de> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="sparc" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index e3454441647..d8b5a61f6cd 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 6a53a09ba715ffebd6b3f432b016483bd89ba26b Author: Mart Raudsepp gentoo org> AuthorDate: Mon Apr 8 08:07:44 2019 + Commit: Mart Raudsepp gentoo org> CommitDate: Mon Apr 8 08:07:44 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a53a09b sys-devel/patch: arm64 stable (bug #652710) Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp gentoo.org> sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index 7de6477d5f4..e3454441647 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: a15df8380443057ffc09273ba915587dcf016765 Author: Mikle Kolyada gentoo org> AuthorDate: Mon Apr 8 06:40:16 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Mon Apr 8 06:40:16 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15df838 sys-devel/patch: alpha stable wrt bug #652710 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="alpha" sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index 2b41420b36d..7de6477d5f4 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 6b26e15b16fa79bf1a14594af2c517a9ffd4b5ba Author: Mikle Kolyada gentoo org> AuthorDate: Sun Apr 7 21:51:21 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Apr 7 21:51:21 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b26e15b sys-devel/patch: s390 stable wrt bug #652710 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="s390" sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index b05b7a03db4..3294abf043f 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 08eee12a26392f83d2dd7b50c47a3e0b79929afd Author: Mikle Kolyada gentoo org> AuthorDate: Sun Apr 7 21:38:48 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Apr 7 21:38:48 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08eee12a sys-devel/patch: arm stable wrt bug #652710 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="arm" sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index 311ea087893..b05b7a03db4 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: e545517f75eb6a6d195c0602df5e385ad6d1ee99 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Apr 7 20:47:05 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Apr 7 20:50:10 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e545517f sys-devel/patch: stable 2.7.6-r3 for hppa, bug #652710 Package-Manager: Portage-2.3.62, Repoman-2.3.12 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index e10e929d0ca..b802b901fba 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 790a1c40b2998e369432b9b279f96fd6ac5b2ea1 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Apr 5 20:46:37 2019 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Apr 5 20:46:37 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=790a1c40 sys-devel/patch: amd64 stable wrt bug #652710 Signed-off-by: Agostino Sarubbo gentoo.org> Package-Manager: Portage-2.3.62, Repoman-2.3.11 RepoMan-Options: --include-arches="amd64" sys-devel/patch/patch-2.7.6-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r3.ebuild b/sys-devel/patch/patch-2.7.6-r3.ebuild index 0cc81c91981..e10e929d0ca 100644 --- a/sys-devel/patch/patch-2.7.6-r3.ebuild +++ b/sys-devel/patch/patch-2.7.6-r3.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/files/, sys-devel/patch/
commit: 5c55ece4eee17a954740b8ecc03b1cb8ed58c123 Author: Thomas Deutschmann gentoo org> AuthorDate: Thu Mar 28 00:32:30 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Mar 28 00:33:05 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c55ece4 sys-devel/patch: add patches for CVE-2018-{6951,6952}, CVE-2018-1000156 Bug: https://bugs.gentoo.org/647792 Bug: https://bugs.gentoo.org/647794 Bug: https://bugs.gentoo.org/652710 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> .../patch/files/patch-2.7.6-CVE-2018-1000156.patch | 150 + .../patch/files/patch-2.7.6-CVE-2018-6951.patch| 29 .../patch/files/patch-2.7.6-CVE-2018-6952.patch| 30 + ...-files-to-be-missing-for-ed-style-patches.patch | 25 sys-devel/patch/patch-2.7.6-r3.ebuild | 40 ++ 5 files changed, 274 insertions(+) diff --git a/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156.patch b/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156.patch new file mode 100644 index 000..c0324d082fc --- /dev/null +++ b/sys-devel/patch/files/patch-2.7.6-CVE-2018-1000156.patch @@ -0,0 +1,150 @@ +From 123eaff0d5d1aebe128295959435b9ca5909c26d Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Fri, 6 Apr 2018 12:14:49 +0200 +Subject: Fix arbitrary command execution in ed-style patches + (CVE-2018-1000156) + +* src/pch.c (do_ed_script): Write ed script to a temporary file instead +of piping it to ed: this will cause ed to abort on invalid commands +instead of rejecting them and carrying on. +* tests/ed-style: New test case. +* tests/Makefile.am (TESTS): Add test case. + + +Without test to avoid automake due to @system package. +--- + +diff --git a/src/pch.c b/src/pch.c +index 0c5cc26..4fd5a05 100644 +--- a/src/pch.c b/src/pch.c +@@ -33,6 +33,7 @@ + # include + #endif + #include ++#include + + #define INITHUNKMAX 125 /* initial dynamic allocation size */ + +@@ -2389,24 +2390,28 @@ do_ed_script (char const *inname, char const *outname, + static char const editor_program[] = EDITOR_PROGRAM; + + file_offset beginning_of_this_line; +-FILE *pipefp = 0; + size_t chars_read; ++FILE *tmpfp = 0; ++char const *tmpname; ++int tmpfd; ++pid_t pid; ++ ++if (! dry_run && ! skip_rest_of_patch) ++ { ++ /* Write ed script to a temporary file. This causes ed to abort on ++ invalid commands such as when line numbers or ranges exceed the ++ number of available lines. When ed reads from a pipe, it rejects ++ invalid commands and treats the next line as a new command, which ++ can lead to arbitrary command execution. */ ++ ++ tmpfd = make_tempfile (, 'e', NULL, O_RDWR | O_BINARY, 0); ++ if (tmpfd == -1) ++pfatal ("Can't create temporary file %s", quotearg (tmpname)); ++ tmpfp = fdopen (tmpfd, "w+b"); ++ if (! tmpfp) ++pfatal ("Can't open stream for file %s", quotearg (tmpname)); ++ } + +-if (! dry_run && ! skip_rest_of_patch) { +- int exclusive = *outname_needs_removal ? 0 : O_EXCL; +- if (inerrno != ENOENT) +-{ +- *outname_needs_removal = true; +- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); +-} +- sprintf (buf, "%s %s%s", editor_program, +- verbosity == VERBOSE ? "" : "- ", +- outname); +- fflush (stdout); +- pipefp = popen(buf, binary_transput ? "wb" : "w"); +- if (!pipefp) +-pfatal ("Can't open pipe to %s", quotearg (buf)); +-} + for (;;) { + char ed_command_letter; + beginning_of_this_line = file_tell (pfp); +@@ -2417,14 +2422,14 @@ do_ed_script (char const *inname, char const *outname, + } + ed_command_letter = get_ed_command_letter (buf); + if (ed_command_letter) { +- if (pipefp) +- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) ++ if (tmpfp) ++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) + write_fatal (); + if (ed_command_letter != 'd' && ed_command_letter != 's') { + p_pass_comments_through = true; + while ((chars_read = get_line ()) != 0) { +- if (pipefp) +- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) ++ if (tmpfp) ++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) + write_fatal (); + if (chars_read == 2 && strEQ (buf, ".\n")) + break; +@@ -2437,13 +2442,49 @@ do_ed_script (char const *inname, char const *outname, + break; + } + } +-if (!pipefp) ++if (!tmpfp) + return; +-if (fwrite ("w\nq\n", sizeof (char), (size_t) 4, pipefp) == 0 +- || fflush (pipefp) != 0) ++if (fwrite
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: b4847297f4d44518633d5a68f6621f777d249f9d Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Aug 31 03:25:11 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Aug 31 03:26:10 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4847297 sys-devel/patch: drop old Package-Manager: Portage-2.3.48, Repoman-2.3.10 sys-devel/patch/Manifest | 1 - sys-devel/patch/patch-2.7.5.ebuild | 29 - 2 files changed, 30 deletions(-) diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest index 07919eb372e..15f0b1675c7 100644 --- a/sys-devel/patch/Manifest +++ b/sys-devel/patch/Manifest @@ -1,2 +1 @@ -DIST patch-2.7.5.tar.xz 727704 BLAKE2B a7aefd05da73329ae301f0f6429306661d72fedd59c6d35acef4828c7e5951c0ce3e8cedfc8ed9ac45d45f6eff564c2e41c0ccb95fbe1c668f63844b7069520c SHA512 6620ac8101f60c0b456ce339fa5e371f40be0b391e2e9728f34f3625f9907e516de61dac2f91bc76e6fd28a9bd1224efc3ba827cfaa606d857730c1af4195a0f DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild deleted file mode 100644 index 358352b7791..000 --- a/sys-devel/patch/patch-2.7.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=4 - -inherit flag-o-matic eutils - -DESCRIPTION="Utility to apply diffs to files" -HOMEPAGE="https://www.gnu.org/software/patch/patch.html; -SRC_URI="mirror://gnu/patch/${P}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static test xattr" - -RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - test? ( sys-apps/ed )" - -src_configure() { - use static && append-ldflags -static - - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ - econf \ - $(use_enable xattr) \ - --program-prefix="$(use userland_BSD && echo g)" -}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: c19e6b4811e292d005888616a8f333a6ed9a310d Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Aug 31 03:23:12 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Aug 31 03:26:08 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c19e6b48 sys-devel/patch: move stable keywords Package-Manager: Portage-2.3.48, Repoman-2.3.10 sys-devel/patch/patch-2.7.6-r1.ebuild | 33 - sys-devel/patch/patch-2.7.6-r2.ebuild | 2 +- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild deleted file mode 100644 index 24dd59de75f..000 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic - -DESCRIPTION="Utility to apply diffs to files" -HOMEPAGE="https://www.gnu.org/software/patch/patch.html; -SRC_URI="mirror://gnu/patch/${P}.tar.xz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static test xattr" - -RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - test? ( sys-apps/ed )" - -PATCHES=( "${FILESDIR}"/${P}-fix-test-suite.patch ) - -src_configure() { - use static && append-ldflags -static - - local myeconfargs=( - $(use_enable xattr) - --program-prefix="$(use userland_BSD && echo g)" - ) - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ - econf "${myeconfargs[@]}" -} diff --git a/sys-devel/patch/patch-2.7.6-r2.ebuild b/sys-devel/patch/patch-2.7.6-r2.ebuild index 046e63f8da8..a50f746ea05 100644 --- a/sys-devel/patch/patch-2.7.6-r2.ebuild +++ b/sys-devel/patch/patch-2.7.6-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/files/, sys-devel/patch/
commit: dedeef3e8b0b5cb7010149efa4e92892fa74ed36 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Aug 26 14:32:18 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Aug 26 14:32:18 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dedeef3e sys-devel/patch: fix error handling with git-style patches Closes: https://bugs.gentoo.org/664640 Package-Manager: Portage-2.3.48, Repoman-2.3.10 ...fix-error-handling-with-git-style-patches.patch | 125 + sys-devel/patch/patch-2.7.6-r2.ebuild | 36 ++ 2 files changed, 161 insertions(+) diff --git a/sys-devel/patch/files/patch-2.7.6-fix-error-handling-with-git-style-patches.patch b/sys-devel/patch/files/patch-2.7.6-fix-error-handling-with-git-style-patches.patch new file mode 100644 index 000..a4f127dd7ce --- /dev/null +++ b/sys-devel/patch/files/patch-2.7.6-fix-error-handling-with-git-style-patches.patch @@ -0,0 +1,125 @@ +Backport for Gentoo patch-2.7.x. + +https://bugs.gentoo.org/664640 + + +Original patch: +Author: Lubomir Rintel +Date: Tue Feb 27 16:52:00 2018 +0100 +Subject: Fix error handling with git-style patches + +When an error is encountered in output_files(), the subsequent call to +cleanup() calls back into output_files() resulting in an infinte recursion. +This is trivially reproduced with a git-style patch (which utilizes +output_file_later()) that tries to patch a nonexistent or unreadable +file (see attached test case). + +* src/patch.c: (output_files) clear the files_to_output list before +iterating it, so that recursive calls won't iterate the same files. +* tests/git-error: New test case. +* tests/Makefile.am (TESTS): Add test case. + +Origin: https://lists.gnu.org/archive/html/bug-patch/2018-02/msg00010.html + +--- a/src/patch.c b/src/patch.c +@@ -1938,8 +1938,12 @@ output_files (struct stat const *st) + { + gl_list_iterator_t iter; + const void *elt; ++ gl_list_t files; + +- iter = gl_list_iterator (files_to_output); ++ files = files_to_output; ++ init_files_to_output (); ++ ++ iter = gl_list_iterator (files); + while (gl_list_iterator_next (, , NULL)) + { + const struct file_to_output *file_to_output = elt; +@@ -1957,8 +1961,8 @@ output_files (struct stat const *st) + /* Free the list up to here. */ + for (;;) + { +-const void *elt2 = gl_list_get_at (files_to_output, 0); +-gl_list_remove_at (files_to_output, 0); ++const void *elt2 = gl_list_get_at (files, 0); ++gl_list_remove_at (files, 0); + if (elt == elt2) + break; + } +@@ -1967,7 +1971,7 @@ output_files (struct stat const *st) + } + } + gl_list_iterator_free (); +- gl_list_clear (files_to_output); ++ gl_list_free (files); + } + + /* Fatal exit with cleanup. */ +--- a/tests/Makefile.am b/tests/Makefile.am +@@ -40,6 +40,7 @@ TESTS = \ + filename-choice \ + git-binary-diff \ + git-cleanup \ ++ git-error \ + garbage \ + global-reject-files \ + inname \ +--- a/tests/Makefile.in b/tests/Makefile.in +@@ -1316,6 +1316,7 @@ TESTS = \ + filename-choice \ + git-binary-diff \ + git-cleanup \ ++ git-error \ + garbage \ + global-reject-files \ + inname \ +@@ -1695,6 +1696,13 @@ git-cleanup.log: git-cleanup + --log-file $$b.log --trs-file $$b.trs \ + $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ + "$$tst" $(AM_TESTS_FD_REDIRECT) ++git-error.log: git-error ++ @p='git-error'; \ ++ b='git-error'; \ ++ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ ++ --log-file $$b.log --trs-file $$b.trs \ ++ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ ++ "$$tst" $(AM_TESTS_FD_REDIRECT) + garbage.log: garbage + @p='garbage'; \ + b='garbage'; \ +--- /dev/null b/tests/git-error +@@ -0,0 +1,29 @@ ++# Copyright (C) 2018 Free Software Foundation, Inc. ++# ++# Copying and distribution of this file, with or without modification, ++# in any medium, are permitted without royalty provided the copyright ++# notice and this notice are preserved. ++ ++. $srcdir/test-lib.sh ++ ++require cat ++use_local_patch ++use_tmpdir ++ ++cat > f.diff
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 710a54fc4d7034434d547c6967295150b5f847b3 Author: Mikle Kolyada gentoo org> AuthorDate: Sun May 27 14:53:43 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun May 27 14:53:43 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710a54fc sys-devel/patch: m68k/s390 stable wrt bug #647270 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 08b8dd2046d..16b54d38449 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 8bab57f2a8bddeaaafa7c9541a743d379573c265 Author: Mart Raudsepp gentoo org> AuthorDate: Tue Apr 24 15:04:10 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Tue Apr 24 15:14:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bab57f2 sys-devel/patch-2.7.6-r1: arm64 stable (bug #647270) Package-Manager: Portage-2.3.28, Repoman-2.3.9 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 06a8e9bede2..08b8dd2046d 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: ab33ff1dfeba2841369afd1896b62e6fe750ccd4 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Mar 22 16:37:01 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Mar 22 16:37:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab33ff1d sys-devel/patch: sh stable wrt bug #647270 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 2a78efab705..06a8e9bede2 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 3543bf2710c2551b77bcec2285582b39fef4f38b Author: Matt Turner gentoo org> AuthorDate: Sun Mar 18 00:32:51 2018 + Commit: Matt Turner gentoo org> CommitDate: Sun Mar 18 01:02:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3543bf27 sys-devel/patch-2.7.6-r1: ppc64 stable, bug 647270 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 1c48f20569c..2a78efab705 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: a1b5edea9df503915c6e5d542ed7429e327992a1 Author: Matt Turner gentoo org> AuthorDate: Sun Mar 18 00:32:50 2018 + Commit: Matt Turner gentoo org> CommitDate: Sun Mar 18 01:02:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1b5edea sys-devel/patch-2.7.6-r1: ppc stable, bug 647270 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 9a51511c71e..1c48f20569c 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 5b869c5922c502542012dae4d3f44a3dc1d6d6f6 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Mar 15 14:14:46 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Mar 15 14:14:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b869c59 sys-devel/patch: arm stable wrt bug #647270 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 2177f236f45..9a51511c71e 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 957ad91b50d68db55b38d783b4ae75f2a2907b5c Author: Tobias Klausmann gentoo org> AuthorDate: Mon Mar 5 12:31:39 2018 + Commit: Tobias Klausmann gentoo org> CommitDate: Mon Mar 5 13:57:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957ad91b sys-devel/patch-2.7.6-r1: alpha stable Gentoo-Bug: http://bugs.gentoo.org/647270 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index b4b3fdb8725..2177f236f45 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 25aee2d06cd9d70192140730f287ccaf194ec139 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Feb 17 22:12:07 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Feb 17 22:12:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25aee2d0 sys-devel/patch: stable 2.7.6-r1 for ia64, bug #647270 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="ia64" sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 6da5e76b6d6..b4b3fdb8725 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 0826bda1c9c6a38bad9a6fe90c1a38df41dc609d Author: Jason Zaman gentoo org> AuthorDate: Wed Feb 14 13:19:09 2018 + Commit: Jason Zaman gentoo org> CommitDate: Wed Feb 14 13:29:12 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0826bda1 sys-devel/patch: amd64 stable Gentoo-bug: 647270 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 0e53362d871..6da5e76b6d6 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 7e7c24112a51e8469569e7069474454cb3722f59 Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Feb 12 23:12:16 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Feb 13 07:51:56 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e7c2411 sys-devel/patch: stable 2.7.6-r1 for hppa/sparc, bug #647270 Package-Manager: Portage-2.3.19, Repoman-2.3.6 RepoMan-Options: --include-arches="hppa sparc" sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 3d806990336..0e53362d871 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 185f49c47a27b17497adfd3ca32f1de0338315e9 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Feb 12 21:32:27 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Feb 12 21:32:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185f49c4 sys-devel/patch: x86 stable (bug #647270) Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/patch/patch-2.7.6-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.6-r1.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild index 388826a546a..3d806990336 100644 --- a/sys-devel/patch/patch-2.7.6-r1.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/, sys-devel/patch/files/
commit: ff5c04761b1534110b752bddfe904114cd42f430 Author: Thomas Deutschmann gentoo org> AuthorDate: Mon Feb 12 15:14:13 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Mon Feb 12 15:14:13 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5c0476 sys-devel/patch: Rev bump to fix test suite Package-Manager: Portage-2.3.24, Repoman-2.3.6 .../patch/files/patch-2.7.6-fix-test-suite.patch | 120 + .../{patch-2.7.6.ebuild => patch-2.7.6-r1.ebuild} | 2 + 2 files changed, 122 insertions(+) diff --git a/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch new file mode 100644 index 000..3aff5c0f77b --- /dev/null +++ b/sys-devel/patch/files/patch-2.7.6-fix-test-suite.patch @@ -0,0 +1,120 @@ +http://git.savannah.gnu.org/cgit/patch.git/commit/?id=f6bc5b14bd193859851d15a049bafb1007acd288 +http://git.savannah.gnu.org/cgit/patch.git/commit/?id=074e2395f81d0ecaa66b71a6c228c70b49db72e5 + +--- a/tests/crlf-handling b/tests/crlf-handling +@@ -14,7 +14,7 @@ use_local_patch + use_tmpdir + + lf2crlf() { +-while read l; do echo -e "$l\r"; done ++while read l; do printf "%s\r\n" "$l"; done + } + + echo 1 > a +--- a/tests/git-cleanup b/tests/git-cleanup +@@ -36,8 +36,8 @@ BAD PATCH + EOF + + echo 1 > f +-echo -n '' > g +-echo -n '' > h ++printf '' > g ++printf '' > h + + check 'patch -f -i 1.diff || echo status: $?' < a.sed +-echo "$body" | sed -f a.sed > b ++done > b.sed ++echo "$body" | sed -f b.sed > b + shift + while test $# -gt 0 ; do + echo "$1" + shift +-done > b.sed +-echo "$body" | sed -f b.sed > c +-rm -f a.sed b.sed ++done > c.sed ++echo "$body" | sed -f c.sed > c ++rm -f b.sed c.sed + output=`diff -u a b | patch $ARGS -f c` + status=$? + echo "$output" | sed -e '/^$/d' -e '/^patching file c$/d' + cat c +-test $status == 0 || echo "Status: $status" ++test $status = 0 || echo "Status: $status" + } + + x() { +-ARGS="$ARGS --merge" x2 "$@" ++ARGS="--merge" x2 "$@" + echo +-ARGS="$ARGS --merge=diff3" x2 "$@" ++ARGS="--merge=diff3" x2 "$@" + } + +-unset ARGS +- + # == + + check 'x 3' <&3 ++printf "\n\n" >&3 + gdbserver localhost:53153 $PATCH "$@" 2>&3 + else + $PATCH "$@" +@@ -113,22 +113,15 @@ cleanup() { + exit $status + } + +-if test -z "`echo -n`"; then +-if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then +- eval ' +- _start_test() { +- echo -n "[${BASH_LINENO[2]}] $* -- " +- }' +-else +- eval ' +- _start_test() { +- echo -n "* $* -- " +- }' +-fi ++if eval 'test -n "${BASH_LINENO[0]}" 2>/dev/null'; then ++eval ' ++ _start_test() { ++ printf "[${BASH_LINENO[2]}] %s -- " "$*" ++ }' + else + eval ' + _start_test() { +- echo "* $*" ++ printf "* %s -- " "$*" + }' + fi + +--- a/tests/merge b/tests/merge +@@ -32,7 +32,7 @@ x2() { + shift + done > b.sed + echo "$body" | sed -f b.sed > b +-shift ++test $# -eq 0 || shift + while test $# -gt 0 ; do + echo "$1" + shift +-- diff --git a/sys-devel/patch/patch-2.7.6.ebuild b/sys-devel/patch/patch-2.7.6-r1.ebuild similarity index 94% rename from sys-devel/patch/patch-2.7.6.ebuild rename to sys-devel/patch/patch-2.7.6-r1.ebuild index b16c1511b88..388826a546a 100644 --- a/sys-devel/patch/patch-2.7.6.ebuild +++ b/sys-devel/patch/patch-2.7.6-r1.ebuild @@ -18,6 +18,8 @@ RDEPEND="xattr? ( sys-apps/attr )" DEPEND="${RDEPEND} test? ( sys-apps/ed )" +PATCHES=( "${FILESDIR}"/${P}-fix-test-suite.patch ) + src_configure() { use static && append-ldflags -static
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 2ebe49bd054de072fc3679638717c1335e2ee579 Author: Lars Wendler gentoo org> AuthorDate: Wed Feb 7 11:35:10 2018 + Commit: Lars Wendler gentoo org> CommitDate: Wed Feb 7 11:35:25 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ebe49bd sys-devel/patch: License is GPL3+ Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/patch/patch-2.7.5.ebuild | 2 +- sys-devel/patch/patch-2.7.6.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild index 04f387d863c..cbc18cb3dcd 100644 --- a/sys-devel/patch/patch-2.7.5.ebuild +++ b/sys-devel/patch/patch-2.7.5.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Utility to apply diffs to files" HOMEPAGE="https://www.gnu.org/software/patch/patch.html; SRC_URI="mirror://gnu/patch/${P}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" diff --git a/sys-devel/patch/patch-2.7.6.ebuild b/sys-devel/patch/patch-2.7.6.ebuild index 0f51919147f..b16c1511b88 100644 --- a/sys-devel/patch/patch-2.7.6.ebuild +++ b/sys-devel/patch/patch-2.7.6.ebuild @@ -9,7 +9,7 @@ DESCRIPTION="Utility to apply diffs to files" HOMEPAGE="https://www.gnu.org/software/patch/patch.html; SRC_URI="mirror://gnu/patch/${P}.tar.xz" -LICENSE="GPL-2" +LICENSE="GPL-3+" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 5d7541ffc1a9434390aa52210a6df5c14a591b53 Author: Lars Wendler gentoo org> AuthorDate: Wed Feb 7 09:51:25 2018 + Commit: Lars Wendler gentoo org> CommitDate: Wed Feb 7 09:51:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d7541ff sys-devel/patch: Bump to version 2.7.6 Package-Manager: Portage-2.3.24, Repoman-2.3.6 sys-devel/patch/Manifest | 1 + sys-devel/patch/patch-2.7.6.ebuild | 31 +++ 2 files changed, 32 insertions(+) diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest index 6e873f84c79..07919eb372e 100644 --- a/sys-devel/patch/Manifest +++ b/sys-devel/patch/Manifest @@ -1 +1,2 @@ DIST patch-2.7.5.tar.xz 727704 BLAKE2B a7aefd05da73329ae301f0f6429306661d72fedd59c6d35acef4828c7e5951c0ce3e8cedfc8ed9ac45d45f6eff564c2e41c0ccb95fbe1c668f63844b7069520c SHA512 6620ac8101f60c0b456ce339fa5e371f40be0b391e2e9728f34f3625f9907e516de61dac2f91bc76e6fd28a9bd1224efc3ba827cfaa606d857730c1af4195a0f +DIST patch-2.7.6.tar.xz 783756 BLAKE2B e3dd2d155a94c39cb60eafc26677e84de14c3a6d5814dff69de091ded52f21862490970254297795f2c42a0c3203f7e88a8f65bb66968f8dfd6e066bf53f2dfb SHA512 fcca87bdb67a88685a8a25597f9e015f5e60197b9a269fa350ae35a7991ed8da553939b4bbc7f7d3cfd863c67142af403b04165633acbce4339056a905e87fbd diff --git a/sys-devel/patch/patch-2.7.6.ebuild b/sys-devel/patch/patch-2.7.6.ebuild new file mode 100644 index 000..0f51919147f --- /dev/null +++ b/sys-devel/patch/patch-2.7.6.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic + +DESCRIPTION="Utility to apply diffs to files" +HOMEPAGE="https://www.gnu.org/software/patch/patch.html; +SRC_URI="mirror://gnu/patch/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="static test xattr" + +RDEPEND="xattr? ( sys-apps/attr )" +DEPEND="${RDEPEND} + test? ( sys-apps/ed )" + +src_configure() { + use static && append-ldflags -static + + local myeconfargs=( + $(use_enable xattr) + --program-prefix="$(use userland_BSD && echo g)" + ) + # Do not let $ED mess up the search for `ed` 470210. + ac_cv_path_ED=$(type -P ed) \ + econf "${myeconfargs[@]}" +}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: b14b209d8386c46981a281f48d8843043d254237 Author: Michael Haubenwallner gentoo org> AuthorDate: Mon Feb 20 12:55:45 2017 + Commit: Michael Haubenwallner gentoo org> CommitDate: Mon Feb 20 14:10:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b14b209d sys-devel/patch: keyword ~x64-cygwin Package-Manager: portage-2.3.3 sys-devel/patch/patch-2.7.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild index 03640c59c7..2f4e8e6dc2 100644 --- a/sys-devel/patch/patch-2.7.5.ebuild +++ b/sys-devel/patch/patch-2.7.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: cbc57635aa89df7536ad7e52523c23b1d275f9c6 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jan 29 20:07:45 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Jan 29 20:13:58 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc57635 sys-devel/patch: dropped ~hppa-hpux ~ia64-hpux ~ia64-linux ~x64-freebsd ~x86-freebsd ~x86-interix Package-Manager: portage-2.3.3 sys-devel/patch/patch-2.7.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild index 3bf4402..03640c5 100644 --- a/sys-devel/patch/patch-2.7.5.ebuild +++ b/sys-devel/patch/patch-2.7.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 94454b066a7f2dc14ed0202a66f234cbc0a6990c Author: Mike Frysinger gentoo org> AuthorDate: Wed Dec 7 08:39:43 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Dec 7 08:39:43 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94454b06 sys-devel/patch: mark 2.7.5 m68k/s390/sh stable sys-devel/patch/patch-2.7.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild index f83abe7..3bf4402 100644 --- a/sys-devel/patch/patch-2.7.5.ebuild +++ b/sys-devel/patch/patch-2.7.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: e00febb6b1e65871c8a4147f96338ae2eb0312c5 Author: Lars Wendler gentoo org> AuthorDate: Thu Dec 1 21:59:10 2016 + Commit: Lars Wendler gentoo org> CommitDate: Thu Dec 1 21:59:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00febb6 sys-devel/patch: Security cleanup (bug #538658). Package-Manager: portage-2.3.2 sys-devel/patch/Manifest | 2 -- sys-devel/patch/patch-2.7.3.ebuild | 30 -- sys-devel/patch/patch-2.7.4.ebuild | 30 -- 3 files changed, 62 deletions(-) diff --git a/sys-devel/patch/Manifest b/sys-devel/patch/Manifest index f45c742..f97a23f 100644 --- a/sys-devel/patch/Manifest +++ b/sys-devel/patch/Manifest @@ -1,3 +1 @@ -DIST patch-2.7.3.tar.xz 684764 SHA256 d09022de9d629561bf4dad44625ef4b1ead15178b210412113531730cdb6f19d SHA512 8d2e3010cfb3283913edb87cbf8d3c474811dc0d288fcb6b87b8ce62296ae95c16dd3b59f21345905d4ffbc572d0be985612eebf90f0e9ee390ca53613402836 WHIRLPOOL 7b4e5471e22c24d97ebac94939582d5d3d311f057e97b43f39def297b7c2db723f5558d66d10c3b289caea241b931dea49beabfe0ec03c0c6d0f91bc526ad52c -DIST patch-2.7.4.tar.xz 714392 SHA256 0eacbb07ce106fe4dcbfbe6c052e55b50bf3df8e1bb16228c9da77b6659ff109 SHA512 7842ad925c6223b1e106844d403a66151fd511a51bf2c78f3c15aa15f5e923f9b58d139bc098aca7c7c6d07e78c01dba729a7e85e93c1c7d18f3150314be0a6f WHIRLPOOL 71c5643345b6c573afe59b13a9c69c0076b38bbd3448220f645b4bb0fc629dc598e37242770de52fa4f1fb949a90375e1b9dca2d43188342562385ad77512d84 DIST patch-2.7.5.tar.xz 727704 SHA256 fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299 SHA512 6620ac8101f60c0b456ce339fa5e371f40be0b391e2e9728f34f3625f9907e516de61dac2f91bc76e6fd28a9bd1224efc3ba827cfaa606d857730c1af4195a0f WHIRLPOOL 27e209cd99b0e3366c7e094e54581510fb3018202fc79d6a906e14e87efae1b7b7548fcafb70af6f5db59f08237fd0f5363789d719ff3452925bd99dc41a9cdb diff --git a/sys-devel/patch/patch-2.7.3.ebuild b/sys-devel/patch/patch-2.7.3.ebuild deleted file mode 100644 index 75e6042.. --- a/sys-devel/patch/patch-2.7.3.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit flag-o-matic eutils - -DESCRIPTION="Utility to apply diffs to files" -HOMEPAGE="https://www.gnu.org/software/patch/patch.html; -SRC_URI="mirror://gnu/patch/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static test xattr" - -RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - test? ( sys-apps/ed )" - -src_configure() { - use static && append-ldflags -static - - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ - econf \ - $(use_enable xattr) \ - --program-prefix="$(use userland_BSD && echo g)" -} diff --git a/sys-devel/patch/patch-2.7.4.ebuild b/sys-devel/patch/patch-2.7.4.ebuild deleted file mode 100644 index a35dca5.. --- a/sys-devel/patch/patch-2.7.4.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=4 - -inherit flag-o-matic eutils - -DESCRIPTION="Utility to apply diffs to files" -HOMEPAGE="https://www.gnu.org/software/patch/patch.html; -SRC_URI="mirror://gnu/patch/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static test xattr" - -RDEPEND="xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - test? ( sys-apps/ed )" - -src_configure() { - use static && append-ldflags -static - - # Do not let $ED mess up the search for `ed` 470210. - ac_cv_path_ED=$(type -P ed) \ - econf \ - $(use_enable xattr) \ - --program-prefix="$(use userland_BSD && echo g)" -}
[gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
commit: 4d7c840473c2f40133475c412141d3d22c2395f2 Author: Steev Klimaszewski gentoo org> AuthorDate: Mon Feb 29 08:32:52 2016 + Commit: Stephen Klimaszewski gentoo org> CommitDate: Mon Feb 29 08:42:19 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d7c8404 sys-devel/patch: stable 2.7.5 for arm64 Package-Manager: portage-2.2.27 sys-devel/patch/patch-2.7.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-devel/patch/patch-2.7.5.ebuild b/sys-devel/patch/patch-2.7.5.ebuild index cae9454..f83abe7 100644 --- a/sys-devel/patch/patch-2.7.5.ebuild +++ b/sys-devel/patch/patch-2.7.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/patch/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static test xattr" RDEPEND="xattr? ( sys-apps/attr )"