[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/

[Michał Górny]

commit:     3fdb652c5862978d3c8b2e49b04692fb4c8fc7f1
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 18:11:49 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 18:51:27 2018 +0000
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..00000000000
--- 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 <rleigh@codelibre.net>
-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;

[gentoo-commits] repo/gentoo:master commit in: dev-util/schroot/files/

[Sam James]

commit:     7e4f7e6cd7caa15755bcd2ffc15b7f169d3275ba
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 13:00:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 13:00:35 2023 +0000
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 <sam <AT> 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?= <arsen@aarsen.me>
 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/

[Sam James]

commit:     9ea64cae86be274cc971174379926db8f3415411
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 20:35:43 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 20:36:04 2024 +0000
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 <sam <AT> 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 <iostream>
+ #include <sstream>
+ 
++#include <boost/filesystem/exception.hpp>
+ #include <boost/filesystem/operations.hpp>
+ 
+ #include <cppunit/extensions/HelperMacros.h>