[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rcs/files/, dev-vcs/rcs/
commit: 1952d4a6a76f61055d67ba83bffdaa30a6865790
Author: Sam James gentoo org>
AuthorDate: Fri Apr 14 03:27:11 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Apr 14 03:27:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1952d4a6
dev-vcs/rcs: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/898786
Signed-off-by: Sam James gentoo.org>
.../rcs/files/rcs-5.10.1-configure-clang16.patch | 24 ++
.../{rcs-5.10.1.ebuild => rcs-5.10.1-r1.ebuild}| 11 --
2 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/dev-vcs/rcs/files/rcs-5.10.1-configure-clang16.patch
b/dev-vcs/rcs/files/rcs-5.10.1-configure-clang16.patch
new file mode 100644
index ..4ad5df89042d
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.10.1-configure-clang16.patch
@@ -0,0 +1,24 @@
+https://savannah.gnu.org/bugs/index.php?64036
+https://bugs.gentoo.org/898786
+
+Include for the rename and perror functions. This avoids an
+implicit function declaration and build failures with future compilers.
+--- a/configure.ac
b/configure.ac
+@@ -384,6 +384,7 @@ m4_pushdef([GOOD],[test ! -f conftest-A && test -f
conftest-B])dnl
+ m4_pushdef([HMMM],[./conftest$EXEEXT && GOOD])dnl
+ ZONK
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
++#include
+ #include
+ ]],[
+ return 0 > rename ("conftest-A", "conftest-B");
+@@ -480,6 +481,7 @@ AC_DEFINE_UNQUOTED([MMAP_SIGNAL],[${rcs_cv_mmap_signal-0}],
+
+ AC_CACHE_CHECK([if `wait' can handle ignored SIGCHLD],[rcs_cv_tolerant_wait],[
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
++#include
+ #include
+ #include
+ #include
+
diff --git a/dev-vcs/rcs/rcs-5.10.1.ebuild b/dev-vcs/rcs/rcs-5.10.1-r1.ebuild
similarity index 82%
rename from dev-vcs/rcs/rcs-5.10.1.ebuild
rename to dev-vcs/rcs/rcs-5.10.1-r1.ebuild
index 912c4167c015..8040c42241d1 100644
--- a/dev-vcs/rcs/rcs-5.10.1.ebuild
+++ b/dev-vcs/rcs/rcs-5.10.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
-inherit flag-o-matic unpacker
+inherit autotools flag-o-matic unpacker
DESCRIPTION="Revision Control System"
HOMEPAGE="https://www.gnu.org/software/rcs/;
@@ -19,11 +19,18 @@ RDEPEND="sys-apps/diffutils
DEPEND="${RDEPEND}"
BDEPEND="$(unpacker_src_uri_depends)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.10.1-configure-clang16.patch
+)
+
src_prepare() {
default
sed -i -e '/gets is a security hole/d' \
lib/stdio.in.h || die
+
+ # Drop when clang 16 patch isn't needed anymore
+ eautoreconf
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rcs/files/, dev-vcs/rcs/
commit: f675edfa799ced49403a24b4a0007654d8be6781
Author: Sam James gentoo org>
AuthorDate: Tue Oct 18 02:46:57 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Oct 18 02:46:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f675edfa
dev-vcs/rcs: drop 5.10.0
Signed-off-by: Sam James gentoo.org>
dev-vcs/rcs/Manifest | 1 -
dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch | 44
dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch | 30 --
dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch | 32 ---
dev-vcs/rcs/rcs-5.10.0.ebuild | 59 ---
5 files changed, 166 deletions(-)
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index 9d7be564c5e0..5ecab5a7596d 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,2 +1 @@
-DIST rcs-5.10.0.tar.xz 890872 BLAKE2B
32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba
SHA512
d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
DIST rcs-5.10.1.tar.lz 917331 BLAKE2B
bf439b2bbb6d5d427f28b13d739f2a5902aa3113e958528028ff553007ad124a8c386141e10ff2d0157468d893e1da4a19240acb373a3f375aa21d97c187a4dd
SHA512
4d3755d704a05da8582acb78a83845885f34b3144af6d19c568e6707831563b077ec5603a12f5d4de6ec583d0886d3a8ccc7ee0e1f10070f9e6de142198cd530
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
b/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
deleted file mode 100644
index 5ee636bc522a..
--- a/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p=10fb2a018f320ff3c1615baa5af491410d9f8d09
-https://bugs.gentoo.org/806356
-
-From: Paul Eggert
-Date: Mon, 5 Apr 2021 10:13:49 -0700
-Subject: =?UTF-8?q?Don=E2=80=99t=20use=20SIGSTKSZ=20in=20#if?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Christoph Karl in:
-https://lists.gnu.org/r/bug-rcs/2021-04/msg0.html
-* b-isr.c (ISR_STACK_SIZE): Remove.
-(isr_init): Don’t assume SIGSTKSZ is a preprocessor constant.
a/src/b-isr.c
-+++ b/src/b-isr.c
-@@ -198,22 +198,17 @@ setup_catchsig (size_t count, int const set[VLA_ELEMS
(count)])
- #undef MUST
- }
-
--#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
--#define ISR_STACK_SIZE (10 * SIGSTKSZ)
--#else
--#define ISR_STACK_SIZE 0
--#endif
--
- struct isr_scratch *
- isr_init (bool *be_quiet)
- {
- struct isr_scratch *scratch = ZLLOC (1, struct isr_scratch);
-
--#if ISR_STACK_SIZE
-+#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
-+ size_t stack_size = 10 * SIGSTKSZ;
- stack_t ss =
- {
-- .ss_sp = alloc (PLEXUS, ISR_STACK_SIZE),
-- .ss_size = ISR_STACK_SIZE,
-+ .ss_sp = alloc (PLEXUS, stack_size),
-+ .ss_size = stack_size,
- .ss_flags = 0
- };
-
-cgit v1.2.1
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
b/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
deleted file mode 100644
index ea86af8fd022..
--- a/dev-vcs/rcs/files/rcs-5.10.0-test-t632.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p=8883c4f5a29be18e9ea09bd27a7b660830de45bb
-https://bugs.gentoo.org/820230
-
-From: Thien-Thi Nguyen
-Date: Fri, 23 Oct 2020 09:23:49 -0400
-Subject: [v] Don't test signal handling if stdin not ok.
-
-
-
-* tests/t632: If stdin is not open and connected to
-a tty, skip the signal handling portion of the test.
a/tests/t632
-+++ b/tests/t632
-@@ -40,6 +40,15 @@ echo | co -l -I $w \
- # (This is skipped if GNU coreutils timeout(1) is not available.)
- ##
-
-+#
-+# The timeout test needs co(1) to block on input.
-+# If stdin is not open and connected to a tty, skip out.
-+if test -t 0 ; then
-+echo STDIN OK
-+else
-+exit 0
-+fi
-+
- # TODO: Don't be lame! Pick one:
- # (a) Mimic timeout(1) w/ sh commands.
- # (b) Incorporate heart of timeout(1) into ./btdt and use that.
-cgit v1.2.1
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
b/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
deleted file mode 100644
index 86ebab5f1475..
--- a/dev-vcs/rcs/files/rcs-5.10.0-test-t808.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p=5df4567e69fc7f46d14cfbf396525c3d05bcf970
-https://bugs.gentoo.org/820230
-
-From: Thien-Thi Nguyen
-Date: Sat, 24 Oct 2020 19:14:26 -0400
-Subject: [v] Try to handle whoami(1) returning no info.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* tests/t808 (user): If whoami(1) returns no info, no longer error out.
-Instead, jam a value, and set env vars
[gentoo-commits] repo/gentoo:master commit in: dev-vcs/rcs/files/, dev-vcs/rcs/
commit: 5a948bc6f37f189ee5b72f5779543f18ae5544ac
Author: Sam James gentoo org>
AuthorDate: Mon Oct 25 13:09:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Oct 25 13:10:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a948bc6
dev-vcs/rcs: add 5.10.0 (for glibc-2.34)
Closes: https://bugs.gentoo.org/675430
Closes: https://bugs.gentoo.org/761115
Closes: https://bugs.gentoo.org/806356
Signed-off-by: Sam James gentoo.org>
dev-vcs/rcs/Manifest | 1 +
dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch | 44 ++
dev-vcs/rcs/rcs-5.10.0.ebuild | 53 +++
3 files changed, 98 insertions(+)
diff --git a/dev-vcs/rcs/Manifest b/dev-vcs/rcs/Manifest
index fa003fe9775..34695ca2a70 100644
--- a/dev-vcs/rcs/Manifest
+++ b/dev-vcs/rcs/Manifest
@@ -1,2 +1,3 @@
+DIST rcs-5.10.0.tar.xz 890872 BLAKE2B
32000df00c639cec90fb9128503b67957a23c82a08651953b57434c3f14ecea555155da933d5be801ad216aa27ccf496a7aae325cecf73f9bc121f3a3c659cba
SHA512
d42bded1214f27dfcbe912bbabad8479555a02bc57000a62512d63ff0672de1ed23911cd15c9d1aa4b9a53794ac3fd45937fa1cbc0fcb9d54a3ede4d831f76d0
DIST rcs-5.9.3.tar.xz 800736 BLAKE2B
aa3f17555e5b65a9d65dfa781f2e12496e282128d9412529f67a831b5d6035302a6f70c4fe0b9d9519a2bf02fc5a98d03f4aa3b86696fd27874bfa7549e8c8a3
SHA512
99b124a94f285d8c675a2a51397ca4a97468f053d42aecf543e9266f16aea6b2667613f565c3462ffd2350c28e22baa4d01d598e2cc7e1e940625086f6de0ba6
DIST rcs-5.9.4.tar.xz 801360 BLAKE2B
18cb97aae7a70f9f12b1018d6b6b42fbc06dd96b491caa7ee5ae2a4a746339e22ffc93ead5756add62f8a08d5cd1ec589c242f0a75e9d78aff29b95114869b25
SHA512
c501a46b8d2e166ec0b54301d72687d9b38b31d84517fcc8dd560a296e7ad250962a92f019e53b2921af9045755e2e7f2f2acc9542dbe0d19ee110ef36861cd4
diff --git a/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
b/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
new file mode 100644
index 000..5ee636bc522
--- /dev/null
+++ b/dev-vcs/rcs/files/rcs-5.10.0-glibc-2.34.patch
@@ -0,0 +1,44 @@
+https://git.savannah.gnu.org/cgit/rcs.git/commit/?h=p=10fb2a018f320ff3c1615baa5af491410d9f8d09
+https://bugs.gentoo.org/806356
+
+From: Paul Eggert
+Date: Mon, 5 Apr 2021 10:13:49 -0700
+Subject: =?UTF-8?q?Don=E2=80=99t=20use=20SIGSTKSZ=20in=20#if?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Christoph Karl in:
+https://lists.gnu.org/r/bug-rcs/2021-04/msg0.html
+* b-isr.c (ISR_STACK_SIZE): Remove.
+(isr_init): Don’t assume SIGSTKSZ is a preprocessor constant.
+--- a/src/b-isr.c
b/src/b-isr.c
+@@ -198,22 +198,17 @@ setup_catchsig (size_t count, int const set[VLA_ELEMS
(count)])
+ #undef MUST
+ }
+
+-#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
+-#define ISR_STACK_SIZE (10 * SIGSTKSZ)
+-#else
+-#define ISR_STACK_SIZE 0
+-#endif
+-
+ struct isr_scratch *
+ isr_init (bool *be_quiet)
+ {
+ struct isr_scratch *scratch = ZLLOC (1, struct isr_scratch);
+
+-#if ISR_STACK_SIZE
++#if defined HAVE_SIGALTSTACK && defined SIGSTKSZ
++ size_t stack_size = 10 * SIGSTKSZ;
+ stack_t ss =
+ {
+- .ss_sp = alloc (PLEXUS, ISR_STACK_SIZE),
+- .ss_size = ISR_STACK_SIZE,
++ .ss_sp = alloc (PLEXUS, stack_size),
++ .ss_size = stack_size,
+ .ss_flags = 0
+ };
+
+cgit v1.2.1
diff --git a/dev-vcs/rcs/rcs-5.10.0.ebuild b/dev-vcs/rcs/rcs-5.10.0.ebuild
new file mode 100644
index 000..4bd994b8b2e
--- /dev/null
+++ b/dev-vcs/rcs/rcs-5.10.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Revision Control System"
+HOMEPAGE="https://www.gnu.org/software/rcs/;
+SRC_URI="mirror://gnu/rcs/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="doc"
+
+RDEPEND="
+ sys-apps/diffutils
+ sys-apps/ed"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-glibc-2.34.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e '/gets is a security hole/d' \
+ lib/stdio.in.h || die
+}
+
+src_configure() {
+ append-flags -std=gnu99
+ econf
+}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc ChangeLog NEWS README
+
+ if use doc; then
+ emake -C doc html
+ rm -R "${ED}/usr/share/doc/rcs"
+ mv doc/rcs.html doc/html
+ dodoc -r doc/html/
+ fi
+}
