[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/
commit: 9ea64cae86be274cc971174379926db8f3415411 Author: Sam James gentoo org> AuthorDate: Fri Jul 12 20:35:43 2024 + Commit: Sam James gentoo org> CommitDate: Fri Jul 12 20:36:04 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea64cae dev-util/schroot: fix build w/ boost-1.85 Closes: https://bugs.gentoo.org/933188 Signed-off-by: Sam James gentoo.org> dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch | 11 +++ 1 file changed, 11 insertions(+) diff --git a/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch b/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch index ba3c10edc104..627981a97b7d 100644 --- a/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch +++ b/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch @@ -1,4 +1,5 @@ https://bugs.gentoo.org/930499 +https://bugs.gentoo.org/933188 --- a/sbuild/sbuild-chroot-config.cc +++ b/sbuild/sbuild-chroot-config.cc @@ -31,6 +31,7 @@ @@ -30,3 +31,13 @@ https://bugs.gentoo.org/930499 using namespace sbuild; namespace +--- a/test/sbuild-run-parts.cc b/test/sbuild-run-parts.cc +@@ -23,6 +23,7 @@ + #include + #include + ++#include + #include + + #include
[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/, dev-util/schroot/
commit: 3adaac9a6baaea72b2d82afec290967f0f422a94
Author: Sam James gentoo org>
AuthorDate: Tue Apr 23 11:16:39 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 23 12:41:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3adaac9a
dev-util/schroot: fix build w/ boost-1.85.0
I haven't sent a PR upstream as our last few are rotting.
Closes: https://bugs.gentoo.org/930499
Signed-off-by: Sam James gentoo.org>
.../files/schroot-1.16.13_p2-boost-1.85.0.patch| 32 ++
dev-util/schroot/schroot-1.6.13_p2-r1.ebuild | 2 ++
2 files changed, 34 insertions(+)
diff --git a/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch
b/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch
new file mode 100644
index ..ba3c10edc104
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.16.13_p2-boost-1.85.0.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/930499
+--- a/sbuild/sbuild-chroot-config.cc
b/sbuild/sbuild-chroot-config.cc
+@@ -31,6 +31,7 @@
+ #include
+ #include
+
++#include
+ #include
+
+ #include
+--- a/sbuild/sbuild-run-parts.cc
b/sbuild/sbuild-run-parts.cc
+@@ -29,6 +29,7 @@
+ #include
+
+ #include
++#include
+ #include
+
+ using boost::format;
+--- a/sbuild/sbuild-util.cc
b/sbuild/sbuild-util.cc
+@@ -35,8 +35,6 @@
+ #include
+ #endif
+
+-#include
+-
+ using namespace sbuild;
+
+ namespace
diff --git a/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
index c287d0c0414d..d4c606a396ec 100644
--- a/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
@@ -53,6 +53,8 @@ PATCHES=(
# https://codeberg.org/shelter/reschroot/pulls/6
"${FILESDIR}"/${PN}-1.6.13-resize-reserve.patch
+
+ "${FILESDIR}"/${PN}-1.16.13_p2-boost-1.85.0.patch
)
src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/
commit: 7e4f7e6cd7caa15755bcd2ffc15b7f169d3275ba Author: Sam James gentoo org> AuthorDate: Sun Jan 15 13:00:35 2023 + Commit: Sam James gentoo org> CommitDate: Sun Jan 15 13:00:35 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e4f7e6c dev-util/schroot: add link to upstream PR for resize patch Signed-off-by: Sam James gentoo.org> dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch index da798f3b4761..066894a16ecc 100644 --- a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch +++ b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch @@ -1,3 +1,5 @@ +https://codeberg.org/shelter/reschroot/pulls/6 + From 6d7a762d6d630548ed558e0de8ddf04f3b0a69fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= Date: Sat, 14 Jan 2023 22:53:20 +0100 @@ -6,12 +8,6 @@ Subject: [PATCH] sbuild-util: use resize instead of reserve Using reserved but uninitialized space is invalid, and, additionally, reserve is not required to allocate memory or change the buffer size at all. - sbuild/sbuild-util.cc | 24 - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc -index b89068a7..b6af7e89 100644 --- a/sbuild/sbuild-util.cc +++ b/sbuild/sbuild-util.cc @@ -624,17 +624,17 @@ void
[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/, dev-util/schroot/
commit: d69385cd24a131899918f7d51f8350a30564e983
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sun Jan 15 03:56:10 2023 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sun Jan 15 03:59:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69385cd
dev-util/schroot: add resize -> reserve patch
otherwise it fails at runtime on hardened systems.
Thanks-to: Arsen Arsenović aarsen.me>
Signed-off-by: Georgy Yakovlev gentoo.org>
.../files/schroot-1.6.13-resize-reserve.patch | 103 +
6.13_p2.ebuild => schroot-1.6.13_p2-r1.ebuild} | 5 +-
2 files changed, 107 insertions(+), 1 deletion(-)
diff --git a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
new file mode 100644
index ..da798f3b4761
--- /dev/null
+++ b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
@@ -0,0 +1,103 @@
+From 6d7a762d6d630548ed558e0de8ddf04f3b0a69fc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?=
+Date: Sat, 14 Jan 2023 22:53:20 +0100
+Subject: [PATCH] sbuild-util: use resize instead of reserve
+
+Using reserved but uninitialized space is invalid, and, additionally,
+reserve is not required to allocate memory or change the buffer size at
+all.
+---
+ sbuild/sbuild-util.cc | 24
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc
+index b89068a7..b6af7e89 100644
+--- a/sbuild/sbuild-util.cc
b/sbuild/sbuild-util.cc
+@@ -624,17 +624,17 @@ void
+ sbuild::passwd::query_uid (uid_t uid)
+ {
+ buffer_type::size_type size = 1 << 7;
+- buffer.reserve(size);
++ buffer.resize(size);
+ int error;
+
+ ::passwd *pwd_result;
+
+ while ((error = getpwuid_r(uid, this,
+- [0], buffer.capacity(),
++ [0], buffer.size(),
+ _result)) == ERANGE)
+ {
+ size <<= 1;
+- buffer.reserve(size);
++ buffer.resize(size);
+ }
+
+ if (pwd_result)
+@@ -647,17 +647,17 @@ void
+ sbuild::passwd::query_name (const char *name)
+ {
+ buffer_type::size_type size = 1 << 8;
+- buffer.reserve(size);
++ buffer.resize(size);
+ int error;
+
+ ::passwd *pwd_result;
+
+ while ((error = getpwnam_r(name, this,
+- [0], buffer.capacity(),
++ [0], buffer.size(),
+ _result)) == ERANGE)
+ {
+ size <<= 1;
+- buffer.reserve(size);
++ buffer.resize(size);
+ }
+
+ if (pwd_result)
+@@ -733,17 +733,17 @@ void
+ sbuild::group::query_gid (gid_t gid)
+ {
+ buffer_type::size_type size = 1 << 7;
+- buffer.reserve(size);
++ buffer.resize(size);
+ int error;
+
+ ::group *grp_result;
+
+ while ((error = getgrgid_r(gid, this,
+- [0], buffer.capacity(),
++ [0], buffer.size(),
+ _result)) == ERANGE)
+ {
+ size <<= 1;
+- buffer.reserve(size);
++ buffer.resize(size);
+ }
+
+ if (grp_result)
+@@ -756,17 +756,17 @@ void
+ sbuild::group::query_name (const char *name)
+ {
+ buffer_type::size_type size = 1 << 8;
+- buffer.reserve(size);
++ buffer.resize(size);
+ int error;
+
+ ::group *grp_result;
+
+ while ((error = getgrnam_r(name, this,
+- [0], buffer.capacity(),
++ [0], buffer.size(),
+ _result)) == ERANGE)
+ {
+ size <<= 1;
+- buffer.reserve(size);
++ buffer.resize(size);
+ }
+
+ if (grp_result)
+--
+2.30.2
+
diff --git a/dev-util/schroot/schroot-1.6.13_p2.ebuild
b/dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
similarity index 96%
rename from dev-util/schroot/schroot-1.6.13_p2.ebuild
rename to dev-util/schroot/schroot-1.6.13_p2-r1.ebuild
index dedc047eec42..839f9adc48f4 100644
--- a/dev-util/schroot/schroot-1.6.13_p2.ebuild
+++ b/dev-util/schroot/schroot-1.6.13_p2-r1.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
@@ -50,6 +50,9 @@ S="${WORKDIR}/re${PN}"
PATCHES=(
"${FILESDIR}"/${PN}-1.6.13_p2-build-fixes.patch
+
+ # https://codeberg.org/shelter/reschroot/pulls/6
+ "${FILESDIR}"/${PN}-1.6.13-resize-reserve.patch
)
src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/
commit: 3fdb652c5862978d3c8b2e49b04692fb4c8fc7f1
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Wed Jun 13 18:11:49 2018 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Jun 13 18:51:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fdb652c
dev-util/schroot: remove unused patch
...t-1.6.10-cmake-add-additional-regex-tests.patch | 70 --
1 file changed, 70 deletions(-)
diff --git
a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
deleted file mode 100644
index 1660f18ae4b..000
---
a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8c9139249689570ff2f4d058ed1031f0cbb6c084 Mon Sep 17 00:00:00 2001
-From: Roger Leigh
-Date: Sun, 26 Jul 2015 14:00:13 +0100
-Subject: [PATCH] cmake: Add additional regex tests and corresponding unit
- tests
-
- cmake/regex-checks.cmake | 10 ++
- test/sbuild-regex.cc | 20
- 2 files changed, 30 insertions(+)
-
-diff --git a/cmake/regex-checks.cmake b/cmake/regex-checks.cmake
-index d0bb211..60507ec 100644
a/cmake/regex-checks.cmake
-+++ b/cmake/regex-checks.cmake
-@@ -30,6 +30,16 @@ int main() {
- if (${namespace}_match(fail, bar)) return 11;
- if (${namespace}_match(fail, chk)) return 12;
-
-+ // Checks for broken support in GCC 4.9 and 5.1
-+ ${namespace} range1(\"^[a-z0-9][a-z0-9-]*\$\", ${namespace}::extended);
-+ ${namespace} range2(\"^[a-z0-9][-a-z0-9]*\$\", ${namespace}::extended);
-+ if (!${namespace}_match(test, range1)) return 13;
-+ if (!${namespace}_match(test, range2)) return 14;
-+ if (!${namespace}_match(\"a-\", range1)) return 15;
-+ if (!${namespace}_match(\"a-\", range2)) return 16;
-+ if (${namespace}_match(\"-a\", range1)) return 17;
-+ if (${namespace}_match(\"-a\", range2)) return 18;
-+
- return 0;
- }"
- ${outvar})
-diff --git a/test/sbuild-regex.cc b/test/sbuild-regex.cc
-index 915e915..a8520c5 100644
a/test/sbuild-regex.cc
-+++ b/test/sbuild-regex.cc
-@@ -33,6 +33,8 @@ class test_regex : public TestCase
- CPPUNIT_TEST(test_output);
- CPPUNIT_TEST(test_input);
- CPPUNIT_TEST(test_match);
-+ CPPUNIT_TEST(test_match_bracket1);
-+ CPPUNIT_TEST(test_match_bracket2);
- CPPUNIT_TEST_EXCEPTION(test_input_fail, std::regex_error);
- CPPUNIT_TEST_SUITE_END();
-
-@@ -88,6 +90,24 @@ class test_regex : public TestCase
- }
-
- void
-+ test_match_bracket1()
-+ {
-+sbuild::regex r("^[a-z0-9][a-z0-9-]*$");
-+CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
-+CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
-+CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
-+ }
-+
-+ void
-+ test_match_bracket2()
-+ {
-+sbuild::regex r("^[a-z0-9][-a-z0-9]*$");
-+CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
-+CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
-+CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
-+ }
-+
-+ void
- test_input_fail()
- {
- sbuild::regex r;
