From 1e5ec9d853b89f6a142a4128e9fff6e2d48213d5 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Tue, 17 Oct 2023 17:25:48 +0100 Subject: gnu: hplip: Fix USB timeouts. * gnu/packages/patches/hplip-usb-timeout.patch: New file. * gnu/local.mk: Register it. * gnu/packages/cups.scm (hplip): Use it. Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 43145caf80..6a285f11b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1401,6 +1401,7 @@ dist_patch_DATA = \ %D%/packages/patches/heimdal-CVE-2022-45142.patch \ %D%/packages/patches/helm-fix-gcc-9-build.patch \ %D%/packages/patches/highlight-gui-data-dir.patch \ + %D%/packages/patches/hplip-usb-timeout.patch \ %D%/packages/patches/http-parser-CVE-2020-8287.patch \ %D%/packages/patches/htslib-for-stringtie.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ -- cgit v1.2.3 From d461dd81cd688ddd63892204a19b3456810352e8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 Oct 2023 02:00:00 +0200 Subject: gnu: Remove left-over python-pycrypto patches. This follows up on commit a55e18f17cc82a01c11d03bdfb693c62cb068d5c. Change-Id: If61e46da1dc4f352b362ad3db42859322846984b --- gnu/local.mk | 2 - .../patches/python-pycrypto-CVE-2013-7459.patch | 97 ---------------------- .../patches/python-pycrypto-time-clock.patch | 23 ----- 3 files changed, 122 deletions(-) delete mode 100644 gnu/packages/patches/python-pycrypto-CVE-2013-7459.patch delete mode 100644 gnu/packages/patches/python-pycrypto-time-clock.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 6a285f11b8..a00884a7c6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1874,8 +1874,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-parso-unit-tests-in-3.10.patch \ %D%/packages/patches/python-packaging-test-arch.patch \ %D%/packages/patches/python-paste-remove-timing-test.patch \ - %D%/packages/patches/python-pycrypto-CVE-2013-7459.patch \ - %D%/packages/patches/python-pycrypto-time-clock.patch \ %D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \ %D%/packages/patches/python-pyan3-fix-positional-arguments.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ diff --git a/gnu/packages/patches/python-pycrypto-CVE-2013-7459.patch b/gnu/packages/patches/python-pycrypto-CVE-2013-7459.patch deleted file mode 100644 index 3570b94e9b..0000000000 --- a/gnu/packages/patches/python-pycrypto-CVE-2013-7459.patch +++ /dev/null @@ -1,97 +0,0 @@ -Fix CVE-2013-7459: - -https://github.com/dlitz/pycrypto/issues/176 -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-7459 - -Copied from Debian: - -https://anonscm.debian.org/cgit/collab-maint/python-crypto.git/commit/?id=0de2243837ed369a086f15c50cca2be85bdfab9d - -Debian adapts this upstream commit: - -https://github.com/dlitz/pycrypto/commit/8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 - -From 8dbe0dc3eea5c689d4f76b37b93fe216cf1f00d4 Mon Sep 17 00:00:00 2001 -From: Legrandin -Date: Sun, 22 Dec 2013 22:24:46 +0100 -Subject: [PATCH] Throw exception when IV is used with ECB or CTR - -The IV parameter is currently ignored when initializing -a cipher in ECB or CTR mode. - -For CTR mode, it is confusing: it takes some time to see -that a different parameter is needed (the counter). - -For ECB mode, it is outright dangerous. - -This patch forces an exception to be raised. ---- - lib/Crypto/SelfTest/Cipher/common.py | 31 +++++++++++++++++++++++-------- - src/block_template.c | 11 +++++++++++ - 2 files changed, 34 insertions(+), 8 deletions(-) - ---- a/lib/Crypto/SelfTest/Cipher/common.py -+++ b/lib/Crypto/SelfTest/Cipher/common.py -@@ -239,19 +239,34 @@ class RoundtripTest(unittest.TestCase): - return """%s .decrypt() output of .encrypt() should not be garbled""" % (self.module_name,) - - def runTest(self): -- for mode in (self.module.MODE_ECB, self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB, self.module.MODE_OPENPGP): -+ -+ ## ECB mode -+ mode = self.module.MODE_ECB -+ encryption_cipher = self.module.new(a2b_hex(self.key), mode) -+ ciphertext = encryption_cipher.encrypt(self.plaintext) -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode) -+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext) -+ self.assertEqual(self.plaintext, decrypted_plaintext) -+ -+ ## OPENPGP mode -+ mode = self.module.MODE_OPENPGP -+ encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) -+ eiv_ciphertext = encryption_cipher.encrypt(self.plaintext) -+ eiv = eiv_ciphertext[:self.module.block_size+2] -+ ciphertext = eiv_ciphertext[self.module.block_size+2:] -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv) -+ decrypted_plaintext = decryption_cipher.decrypt(ciphertext) -+ self.assertEqual(self.plaintext, decrypted_plaintext) -+ -+ ## All other non-AEAD modes (but CTR) -+ for mode in (self.module.MODE_CBC, self.module.MODE_CFB, self.module.MODE_OFB): - encryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) - ciphertext = encryption_cipher.encrypt(self.plaintext) -- -- if mode != self.module.MODE_OPENPGP: -- decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) -- else: -- eiv = ciphertext[:self.module.block_size+2] -- ciphertext = ciphertext[self.module.block_size+2:] -- decryption_cipher = self.module.new(a2b_hex(self.key), mode, eiv) -+ decryption_cipher = self.module.new(a2b_hex(self.key), mode, self.iv) - decrypted_plaintext = decryption_cipher.decrypt(ciphertext) - self.assertEqual(self.plaintext, decrypted_plaintext) - -+ - class PGPTest(unittest.TestCase): - def __init__(self, module, params): - unittest.TestCase.__init__(self) ---- a/src/block_template.c -+++ b/src/block_template.c -@@ -170,6 +170,17 @@ ALGnew(PyObject *self, PyObject *args, P - "Key cannot be the null string"); - return NULL; - } -+ if (IVlen != 0 && mode == MODE_ECB) -+ { -+ PyErr_Format(PyExc_ValueError, "ECB mode does not use IV"); -+ return NULL; -+ } -+ if (IVlen != 0 && mode == MODE_CTR) -+ { -+ PyErr_Format(PyExc_ValueError, -+ "CTR mode needs counter parameter, not IV"); -+ return NULL; -+ } - if (IVlen != BLOCK_SIZE && mode != MODE_ECB && mode != MODE_CTR) - { - PyErr_Format(PyExc_ValueError, diff --git a/gnu/packages/patches/python-pycrypto-time-clock.patch b/gnu/packages/patches/python-pycrypto-time-clock.patch deleted file mode 100644 index 9b7a8232a2..0000000000 --- a/gnu/packages/patches/python-pycrypto-time-clock.patch +++ /dev/null @@ -1,23 +0,0 @@ -Drop use of the deprecated time.clock which was removed in Python 3.8. - -Adapted from upstream pull request: - -https://github.com/dlitz/pycrypto/pull/296 - -diff --git a/lib/Crypto/Random/_UserFriendlyRNG.py b/lib/Crypto/Random/_UserFriendlyRNG.py ---- a/lib/Crypto/Random/_UserFriendlyRNG.py -+++ b/lib/Crypto/Random/_UserFriendlyRNG.py -@@ -73,8 +73,11 @@ class _EntropyCollector(object): - t = time.time() - self._time_es.feed(struct.pack("@I", int(2**30 * (t - floor(t))))) - -- # Add the fractional part of time.clock() -- t = time.clock() -+ # Add the fractional part of time.process_time() -+ try: -+ t = time.process_time() -+ except AttributeError: -+ t = time.clock() - self._clock_es.feed(struct.pack("@I", int(2**30 * (t - floor(t))))) - - -- cgit v1.2.3 From 9524ff9f3ac63e02bc954d19273ed630eab0c754 Mon Sep 17 00:00:00 2001 From: gemmaro Date: Sat, 26 Aug 2023 15:22:40 +0900 Subject: gnu: Add python-online-judge-api-client. * gnu/packages/python-xyz.scm (python-online-judge-api-client): New variable. * gnu/packages/patches/python-online-judge-api-client-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch file. Signed-off-by: Christopher Baines Change-Id: If407a070a52e66c723d042217a5ff6e1589efce1 --- gnu/local.mk | 2 + .../python-online-judge-api-client-tests.patch | 429 +++++++++++++++++++++ gnu/packages/python-xyz.scm | 62 +++ 3 files changed, 493 insertions(+) create mode 100644 gnu/packages/patches/python-online-judge-api-client-tests.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index a00884a7c6..8518c91268 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -60,6 +60,7 @@ # Copyright © 2023 Ivana Drazovic # Copyright © 2023 Andy Tai # Copyright © 2023 B. Wilson +# Copyright © 2023 gemmaro # # This file is part of GNU Guix. # @@ -1861,6 +1862,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-fixtures-remove-monkeypatch-test.patch \ %D%/packages/patches/python-hiredis-fix-header.patch \ %D%/packages/patches/python-hiredis-use-system-hiredis.patch \ + %D%/packages/patches/python-online-judge-api-client-tests.patch \ %D%/packages/patches/python-pdoc3-tests.patch \ %D%/packages/patches/python-peachpy-determinism.patch \ %D%/packages/patches/python-pep8-stdlib-tokenize-compat.patch \ diff --git a/gnu/packages/patches/python-online-judge-api-client-tests.patch b/gnu/packages/patches/python-online-judge-api-client-tests.patch new file mode 100644 index 0000000000..f999828ab3 --- /dev/null +++ b/gnu/packages/patches/python-online-judge-api-client-tests.patch @@ -0,0 +1,429 @@ +Skip tests which requires network connections. + +--- a/tests/dispatch.py ++++ b/tests/dispatch.py +@@ -4,6 +4,7 @@ from onlinejudge import dispatch, service + + + class DispatchAtCoderTest(unittest.TestCase): ++ @unittest.skip("Disabled by Guix") + def test_problem_from_url(self): + problem = dispatch.problem_from_url('https://atcoder.jp/contests/arc001/tasks/arc001_1') + self.assertIsInstance(problem, service.atcoder.AtCoderProblem) + +--- a/tests/service_anarchygolf.py ++++ b/tests/service_anarchygolf.py +@@ -10,6 +10,7 @@ class AnarchyGolfServiceTest(unittest.TestCase): + self.assertIsInstance(AnarchyGolfService.from_url('http://golf.shinh.org/p.rb?Indent+Space+Alignment'), AnarchyGolfService) + + ++@unittest.skip("Disabled by Guix") + class AnarchyGolfProblemTest(unittest.TestCase): + def test_download_sample_cases(self): + self.assertEqual(AnarchyGolfProblem.from_url('http://golf.shinh.org/p.rb?last+non+zero').download_sample_cases(), [ + +--- a/tests/service_aoj.py ++++ b/tests/service_aoj.py +@@ -20,6 +20,7 @@ class AOJProblemTest(unittest.TestCase): + self.assertEqual(AOJProblem.from_url('https://onlinejudge.u-aizu.ac.jp/challenges/sources/JAG/Spring/2394?year=2011').problem_id, '2394') + self.assertIsNone(AOJProblem.from_url('https://onlinejudge.u-aizu.ac.jp/services/room.html#RitsCamp19Day2/problems/A')) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases(self): + self.assertEqual(AOJProblem.from_url('http://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=DSL_1_A').download_sample_cases(), [ + TestCase(name='sample-1', input_name='1', input_data=b'5 12\n0 1 4\n0 2 3\n1 1 2\n1 3 4\n1 1 4\n1 3 2\n0 1 3\n1 2 4\n1 3 0\n0 0 4\n1 0 2\n1 3 0\n', output_name='1', output_data=b'0\n0\n1\n1\n1\n0\n1\n1\n'), +@@ -39,6 +40,7 @@ class AOJProblemTest(unittest.TestCase): + TestCase(name='sample-1', input_name='1', input_data=b'4\n0 0\n10 0\n10 10\n0 10\n3\n0 0\n1 0\n0 1\n0\n', output_name='1', output_data=b'Case 1: 14.142135624\nCase 2: 1.41421356\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_not_registered(self): + # see: https://github.com/kmyk/online-judge-tools/issues/207 + self.assertEqual(AOJProblem.from_url('https://onlinejudge.u-aizu.ac.jp/challenges/sources/ICPC/Regional/1399').download_sample_cases(), [ +@@ -57,11 +59,13 @@ class AOJArenaProblemTest(unittest.TestCase): + self.assertEqual(AOJArenaProblem.from_url('https://onlinejudge.u-aizu.ac.jp/services/room.html#ACPC2018Day2/problems/d').alphabet, 'D') + self.assertIsNone(AOJArenaProblem.from_url('http://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=DSL_1_A')) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases(self): + self.assertEqual(AOJArenaProblem.from_url('https://onlinejudge.u-aizu.ac.jp/services/room.html#yupro/problems/A').download_sample_cases(), [ + TestCase(name='sample-1', input_name='1', input_data=b'koukyoukoukokukikou\nabrakadabra\nacmicpc\njapaque\nhelloworld\n#\n', output_name='1', output_data=b'0\n2\n4\n5\n7\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_not_registered(self): + # see: https://github.com/kmyk/online-judge-tools/issues/207 + self.assertEqual(AOJArenaProblem.from_url('https://onlinejudge.u-aizu.ac.jp/services/room.html#RitsCamp18Day3/problems/B').download_sample_cases(), [ + +--- a/tests/service_atcoder.py ++++ b/tests/service_atcoder.py +@@ -15,6 +15,7 @@ class AtCoderSerivceTest(unittest.TestCase): + self.assertIsInstance(AtCoderService.from_url('https://atcoder.jp/contests/agc001/submissions/806160'), AtCoderService) + self.assertIsNone(AtCoderService.from_url('https://codeforces.com/')) + ++ @unittest.skip("Disabled by Guix") + def test_iterate_contests(self): + contests = list(AtCoderService().iterate_contests()) + contest_ids = [contest.contest_id for contest in contests] +@@ -37,6 +38,7 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(AtCoderContest.from_url('https://atcoder.jp/contests/agc030').contest_id, 'agc030') + self.assertIsNone(AtCoderContest.from_url('https://atcoder.jp/contests/')) + ++ @unittest.skip("Disabled by Guix") + def test_load_details(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/keyence2019') + self.assertEqual(contest.download_data(lang='en').name, 'KEYENCE Programming Contest 2019') +@@ -62,10 +64,12 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(data.rated_range, '-') + self.assertEqual(data.penalty.total_seconds(), 5 * 60) + ++ @unittest.skip("Disabled by Guix") + def test_get_penalty_a_singular_form(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/chokudai_S002') + self.assertEqual(contest.download_data().penalty.total_seconds(), 60) # Penalty is written as "1 minute", not "1 minutes" + ++ @unittest.skip("Disabled by Guix") + def test_list_problems(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/agc028') + problems = contest.list_problems() +@@ -79,6 +83,7 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(problems[6].download_data().alphabet, 'F2') + self.assertEqual(problems[6].problem_id, 'agc028_f2') + ++ @unittest.skip("Disabled by Guix") + def test_list_problems_with_float_values(self): + """ + .. seealso: +@@ -92,6 +97,7 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(problems[1].download_data().time_limit_msec, 5252) + self.assertEqual(problems[1].download_data().memory_limit_byte, 512 * 1000 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems_time_limit_is_less_than_msec(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/joi2019ho') + problems = contest.list_problems() +@@ -101,12 +107,14 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(problems[3].download_data().time_limit_msec, 1000) + self.assertEqual(problems[4].download_data().time_limit_msec, 2000) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems_memory_limit_is_zero(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/future-contest-2019-final-open') + problems = contest.list_problems() + self.assertEqual(problems[0].download_data().memory_limit_byte, 1024 * 1000 * 1000) # 1024 MB + self.assertEqual(problems[1].download_data().memory_limit_byte, 0) # 0 KB + ++ @unittest.skip("Disabled by Guix") + def test_iterate_submissions(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/code-festival-2014-exhibition-open') + submissions = list(contest.iterate_submissions()) +@@ -114,6 +122,7 @@ class AtCoderContestTest(unittest.TestCase): + self.assertEqual(submissions[0].get_url(), 'https://atcoder.jp/contests/code-festival-2014-exhibition-open/submissions/272697') + self.assertEqual(submissions[1].get_url(), 'https://atcoder.jp/contests/code-festival-2014-exhibition-open/submissions/272700') + ++ @unittest.skip("Disabled by Guix") + def test_get_contest_without_penalty(self): + contest = AtCoderContest.from_url('https://atcoder.jp/contests/otemae2019') + self.assertEqual(contest.download_data(lang='ja').name, '大手前プロコン 2019') +@@ -154,6 +163,7 @@ class AtCoderProblemTest(unittest.TestCase): + self.assertEqual(AtCoderProblem.from_url('https://kupc2014.contest.atcoder.jp/tasks/kupc2014_d'), AtCoderProblem.from_url('https://atcoder.jp/contests/kupc2014/tasks/kupc2014_d')) + self.assertNotEqual(AtCoderProblem.from_url('https://kupc2014.contest.atcoder.jp/tasks/kupc2014_d'), AtCoderProblem.from_url('https://atcoder.jp/contests/agc030/tasks/agc030_c')) + ++ @unittest.skip("Disabled by Guix") + def test_load_details(self): + problem = AtCoderProblem.from_url('https://atcoder.jp/contests/abc118/tasks/abc118_a') + data = problem.download_data() +@@ -163,14 +173,17 @@ class AtCoderProblemTest(unittest.TestCase): + self.assertEqual(data.memory_limit_byte, 1024 * 1000 * 1000) + self.assertEqual(data.score, 100) + ++ @unittest.skip("Disabled by Guix") + def test_get_alphabet(self): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/agc028/tasks/agc028_f').download_data().alphabet, 'F') + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/agc028/tasks/agc028_f2').download_data().alphabet, 'F2') + ++ @unittest.skip("Disabled by Guix") + def test_get_score(self): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/future-contest-2018-final/tasks/future_contest_2018_final_a').download_data().score, 50000000) + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/abc001/tasks/abc001_4').download_data().score, None) + ++ @unittest.skip("Disabled by Guix") + def test_get_score_latex(self): + """ + .. seealso:: +@@ -179,13 +192,16 @@ class AtCoderProblemTest(unittest.TestCase): + + self.assertIsNone(AtCoderProblem.from_url('https://atcoder.jp/contests/wupc2019/tasks/wupc2019_a').download_data().score) + ++ @unittest.skip("Disabled by Guix") + def test_get_time_limit_is_less_than_msec(self): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/joi2019ho/tasks/joi2019ho_c').download_data().time_limit_msec, 500) + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/future-contest-2019-qual/tasks/future_contest_2019_qual_b').download_data().time_limit_msec, 0) + ++ @unittest.skip("Disabled by Guix") + def test_get_memory_limit_is_zero(self): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/future-contest-2019-qual/tasks/future_contest_2019_qual_b').download_data().memory_limit_byte, 0) + ++ @unittest.skip("Disabled by Guix") + def test_iterate_submissions(self): + problem = AtCoderProblem.from_url('https://atcoder.jp/contests/abc119/tasks/abc119_c') + submissions = problem.iterate_submissions() +@@ -204,6 +220,7 @@ class AtCoderSubmissionTest(unittest.TestCase): + + + class AtCoderProblemDataTest(unittest.TestCase): ++ @unittest.skip("Disabled by Guix") + def test_from_html_very_old(self): + url = 'https://atcoder.jp/contests/utpc2011/tasks/utpc2011_1' + resp = requests.get(url) +@@ -225,6 +242,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, None) + self.assertEqual(data.time_limit_msec, 1 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_old(self): + url = 'https://atcoder.jp/contests/abc003/tasks/abc003_4' + resp = requests.get(url) +@@ -247,6 +265,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, None) + self.assertEqual(data.time_limit_msec, 2 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_standard(self): + url = 'https://atcoder.jp/contests/abc114/tasks/abc114_d' + resp = requests.get(url) +@@ -268,6 +287,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, 400) + self.assertEqual(data.time_limit_msec, 2 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_with_empty_output(self): + url = 'https://atcoder.jp/contests/agc036/tasks/agc036_b' + resp = requests.get(url) +@@ -290,6 +310,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, 700) + self.assertEqual(data.time_limit_msec, 2 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_without_sample_cases(self): + url = 'https://atcoder.jp/contests/tenka1-2013-quala/tasks/tenka1_2013_qualA_a' + resp = requests.get(url) +@@ -307,6 +328,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, None) + self.assertEqual(data.time_limit_msec, 2 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_from_html_issue_414(self): + url = 'https://atcoder.jp/contests/fuka5/tasks/fuka_graphcut' + resp = requests.get(url) +@@ -399,6 +421,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + self.assertEqual(data.score, None) + self.assertEqual(data.time_limit_msec, 5 * 1000) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_pre_without_prettyprint_insection(self): + # see: https://github.com/kmyk/online-judge-tools/issues/625 + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/tdpc/tasks/tdpc_fibonacci').download_sample_cases(), [ +@@ -406,6 +429,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + TestCase(name='sample-2', input_name='Sample Input 2', input_data=b'3 10\n', output_name='Sample Output 2', output_data=b'105\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_s8pc_broken_html(self): + # see: https://github.com/kmyk/online-judge-tools/issues/615 + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/s8pc-4/tasks/s8pc_4_d').download_sample_cases(), [ +@@ -427,6 +451,7 @@ class AtCoderProblemDataTest(unittest.TestCase): + + + class AtCoderProblemGetInputFormatTest(unittest.TestCase): ++ @unittest.skip("Disabled by Guix") + def test_normal(self): + """ + .. code-block:: html +@@ -456,6 +481,7 @@ class AtCoderProblemGetInputFormatTest(unittest.TestCase): + + self.assertEqual(AtCoderProblem.from_url('https://beta.atcoder.jp/contests/arc083/tasks/arc083_a').download_data().input_format, 'A B C D E F\r\n') + ++ @unittest.skip("Disabled by Guix") + def test_old_problem(self): + """ + :note: https://github.com/kmyk/online-judge-tools/issues/380 +@@ -475,6 +501,7 @@ class AtCoderProblemGetInputFormatTest(unittest.TestCase): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/arc002/tasks/arc002_3').download_data().input_format, '\r\nN\r\nc_{1}c_{2}...c_{N}\r\n') + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/arc034/tasks/arc034_4').download_data().input_format, '\r\nA B C\r\na_1 a_2 .. a_A\r\nb_1 b_2 .. b_B\r\n') + ++ @unittest.skip("Disabled by Guix") + def test_dwacon_problem(self): + """ + :note: https://github.com/kmyk/online-judge-tools/issues/142 +@@ -493,9 +520,11 @@ class AtCoderProblemGetInputFormatTest(unittest.TestCase): + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/dwacon2018-final/tasks/dwacon2018_final_a').download_data().input_format, '\r\nH M S\r\nC_1 C_2\r\n') + self.assertEqual(AtCoderProblem.from_url('https://atcoder.jp/contests/dwacon2018-final/tasks/dwacon2018_final_b').download_data().input_format, '\r\nN K\r\nv_1 ... v_N\r\n') + ++ @unittest.skip("Disabled by Guix") + def test_problem_without_input(self): + self.assertIsNone(AtCoderProblem.from_url('https://atcoder.jp/contests/tenka1-2013-quala/tasks/tenka1_2013_qualA_a').download_data().input_format) + ++ @unittest.skip("Disabled by Guix") + def test_problem_without_input_format(self): + self.assertIsNone(AtCoderProblem.from_url('https://atcoder.jp/contests/joi2006ho/tasks/joi2006ho_a').download_data().input_format) + +--- a/tests/service_codechef.py ++++ b/tests/service_codechef.py +@@ -15,6 +15,7 @@ class CodeChefProblemTest(unittest.TestCase): + self.assertEqual(CodeChefProblem.from_url('https://www.codechef.com/COOK113A/problems/DAND').contest_id, 'COOK113A') + self.assertEqual(CodeChefProblem.from_url('https://www.codechef.com/COOK113A/problems/DAND').problem_id, 'DAND') + ++ @unittest.skip("Disabled by Guix") + def test_download_samples_chfgcd(self): + url = 'https://www.codechef.com/COOK131B/problems/CHFGCD' + expected = [ + +--- a/tests/service_codeforces.py ++++ b/tests/service_codeforces.py +@@ -25,6 +25,7 @@ class CodeforcesContestTest(unittest.TestCase): + self.assertEqual(CodeforcesContest.from_url('http://m3.codeforces.com/contest/1333').get_url(), CodeforcesContest.from_url('https://codeforces.com/contest/1333').get_url()) + self.assertIsNone(CodeforcesContest.from_url('http://m4.codeforces.com/contest/1333')) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems_data(self): + contest = CodeforcesContest.from_url('https://codeforces.com/contest/1157') + problems = contest.list_problem_data() +@@ -38,6 +39,7 @@ class CodeforcesContestTest(unittest.TestCase): + self.assertEqual(problems[6].tags, ['constructive algorithms', 'dp', 'greedy', 'two pointers']) + self.assertEqual(problems[7].tags, ['brute force', 'constructive algorithms']) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems(self): + contest = CodeforcesContest.from_url('https://codeforces.com/contest/1157') + problems = contest.list_problems() +@@ -46,6 +48,7 @@ class CodeforcesContestTest(unittest.TestCase): + self.assertEqual(problems[6].get_url(), 'https://codeforces.com/contest/1157/problem/F') + self.assertEqual(problems[7].download_data().tags, ['brute force', 'constructive algorithms']) + ++ @unittest.skip("Disabled by Guix") + def test_download_data(self): + contest = CodeforcesContest.from_url('http://codeforces.com/contest/1200') + data = contest.download_data() +@@ -85,6 +88,7 @@ class CodeforcesProblemTest(unittest.TestCase): + self.assertEqual(CodeforcesProblem.from_url('https://codeforces.com/contest/1133/problem/F1').index, 'F1') + self.assertEqual(CodeforcesProblem.from_url('https://codeforces.com/contest/1133/problem/F2').index, 'F2') + ++ @unittest.skip("Disabled by Guix") + def test_download_problem(self): + problem = CodeforcesProblem.from_url('http://codeforces.com/contest/1205/problem/D') + data = problem.download_data() + +--- a/tests/service_google.py ++++ b/tests/service_google.py +@@ -42,6 +42,7 @@ class GoogleCodeJamProblemTest(unittest.TestCase): + self.assertEqual(problem.contest_id, '8404486') + self.assertEqual(problem.problem_id, 'p0') + ++ @unittest.skip("Disabled by Guix") + def test_download_samples_codejam(self): + problem = GoogleCodeJamProblem.from_url('https://codingcompetitions.withgoogle.com/codejam/round/000000000019fd27/000000000020993c') + sample_input = textwrap.dedent("""\ +@@ -76,6 +77,7 @@ class GoogleCodeJamProblemTest(unittest.TestCase): + ), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_samples_kickstart(self): + problem = GoogleCodeJamProblem.from_url('https://codingcompetitions.withgoogle.com/kickstart/round/000000000019ffc7/00000000001d3f56') + sample_input = textwrap.dedent("""\ +@@ -102,6 +104,7 @@ class GoogleCodeJamProblemTest(unittest.TestCase): + ), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_multiple_samples(self): + problem = GoogleCodeJamProblem.from_url('https://codingcompetitions.withgoogle.com/kickstart/round/000000000019ffc7/00000000001d3ff3') + sample_input1 = textwrap.dedent("""\ + +--- a/tests/service_library_checker.py ++++ b/tests/service_library_checker.py +@@ -29,13 +29,13 @@ class LibraryCheckerProblemTest(unittest.TestCase): + def test_from_url(self): + self.assertEqual(LibraryCheckerProblem.from_url('https://judge.yosupo.jp/problem/point_add_range_sum').problem_id, 'point_add_range_sum') + +- @unittest.skipIf(os.name == 'nt', "Library Checker is not supported on Windows") ++ @unittest.skip("Disabled by Guix") + def test_download_samples(self): + self.assertEqual(LibraryCheckerProblem.from_url('https://judge.yosupo.jp/problem/unionfind').download_sample_cases(), [ + TestCase(name='example_00', input_name='example_00.in', input_data=b'4 7\n1 0 1\n0 0 1\n0 2 3\n1 0 1\n1 1 2\n0 0 2\n1 1 3\n', output_name='example_00.out', output_data=b'0\n1\n0\n1\n'), + ]) + +- @unittest.skipIf(os.name == 'nt', "Library Checker is not supported on Windows") ++ @unittest.skip("Disabled by Guix") + def test_pull_repository(self): + # reset + LibraryCheckerService.is_repository_updated = False + +--- a/tests/service_spoj.py ++++ b/tests/service_spoj.py +@@ -14,11 +14,13 @@ class SPOJProblemTest(unittest.TestCase): + def test_from_url(self): + self.assertEqual(SPOJProblem.from_url('https://www.spoj.com/problems/ACARGO/').problem_id, 'ACARGO') + ++ @unittest.skip("Disabled by Guix") + def test_download_samples(self): + self.assertEqual(SPOJProblem.from_url('https://www.spoj.com/problems/ACARGO/').download_sample_cases(), [ + TestCase(name='sample-1', input_name='Sample Input:', input_data=b'3 5\n0\n1\n3\n2 3\n0\n1\n5 20\n2\n7\n12\n9\n13\n0 0\n', output_name='Sample Output:', output_data=b'1\n0\n10\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_samples_todo(self): + # No samples found. + self.assertFalse(SPOJProblem.from_url('https://www.spoj.com/problems/MKLABELS/').download_sample_cases()) + +--- a/tests/service_yukicoder.py ++++ b/tests/service_yukicoder.py +@@ -20,6 +20,7 @@ class YukicoderProblemTest(unittest.TestCase): + self.assertEqual(YukicoderProblem.from_url('http://yukicoder.me/problems/no/123/').problem_no, 123) + self.assertEqual(YukicoderProblem.from_url('http://yukicoder.me/problems/123').problem_id, 123) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases(self): + self.assertEqual(YukicoderProblem.from_url('http://yukicoder.me/problems/no/9000').download_sample_cases(), [ + TestCase(name='sample-1', input_name='サンプル1 入力', input_data=b'yukicoder\n', output_name='サンプル1 出力', output_data=b'Hello World!\n'), +@@ -45,6 +46,7 @@ class YukicoderProblemTest(unittest.TestCase): + TestCase(name='sample-4', input_name='サンプル4 入力', input_data=b'\n', output_name='サンプル4 出力', output_data=b'1\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_issue_355(self): + # see https://github.com/kmyk/online-judge-tools/issues/355 + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/649').download_sample_cases(), [ +@@ -54,6 +56,7 @@ class YukicoderProblemTest(unittest.TestCase): + TestCase(name='sample-4', input_name='サンプル4 入力', input_data=b'1 1\n2\n', output_name='サンプル4 出力', output_data=b'-1\n'), + ]) + ++ @unittest.skip("Disabled by Guix") + def test_download_sample_cases_issue_192(self): + # see https://github.com/kmyk/online-judge-tools/issues/192 + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/750').download_sample_cases(), [ +@@ -133,6 +136,7 @@ class YukicoderContestTest(unittest.TestCase): + self.assertEqual(YukicoderContest.from_url('https://yukicoder.me/contests/276').contest_id, 276) + self.assertEqual(YukicoderContest.from_url('http://yukicoder.me/contests/276/all').contest_id, 276) + ++ @unittest.skip("Disabled by Guix") + def test_list_problems(self): + self.assertEqual(YukicoderContest.from_url('https://yukicoder.me/contests/276').list_problems(), [ + YukicoderProblem(problem_id=4401), +@@ -145,6 +149,7 @@ class YukicoderContestTest(unittest.TestCase): + + + class YukicoderProblemGetInputFormatTest(unittest.TestCase): ++ @unittest.skip("Disabled by Guix") + def test_normal(self): + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/1').get_input_format(), '\\(N\\)\n\\(C\\)\n\\(V\\)\n\\(S_1\\ S_2\\ S_3\\ \\dots\\ S_V\\)\n\\(T_1\\ T_2\\ T_3\\ \\dots\\ T_V\\)\n\\(Y_1\\ Y_2\\ Y_3\\ \\dots\\ Y_V\\)\n\\(M_1\\ M_2\\ M_3\\ \\dots\\ M_V\\)\n') + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/2').get_input_format(), 'N\n') +@@ -154,6 +159,7 @@ class YukicoderProblemGetInputFormatTest(unittest.TestCase): + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/512').get_input_format(), '$X$ $Y$\n$N$\n$A_1$ $\\cdots$ $A_N$\n') + self.assertEqual(YukicoderProblem.from_url('https://yukicoder.me/problems/no/777').get_input_format(), '$N$\n$A_1$ $B_1$ $C_1$\n$A_2$ $B_2$ $C_2$\n…\n$A_N$ $B_N$ $C_N$\n') + ++ @unittest.skip("Disabled by Guix") + def test_problem_without_input(self): + self.assertIsNone(YukicoderProblem.from_url('https://yukicoder.me/problems/no/3003').get_input_format()) + \ No newline at end of file diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index fd199535c8..a64a86492c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -139,6 +139,7 @@ ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Ivan Vilata-i-Balaguer ;;; Copyright © 2023 Ontje Lünsdorf +;;; Copyright © 2023 gemmaro ;;; Copyright © 2023 Parnikkapore ;;; Copyright © 2023 Foundation Devices, Inc. ;;; Copyright © c4droid @@ -24568,6 +24569,67 @@ (define-public python-onetimepass time-based (TOTP) passwords.") (license license:expat))) +(define-public python-online-judge-api-client + (package + (name "python-online-judge-api-client") + (version "10.10.1") + ;; Source distributions are not uploaded to PyPI. + ;; https://pypi.org/project/online-judge-api-client/10.10.1/#files + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/online-judge-tools/api-client") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0yjqhh44va5nawd9rpqcjyf0g7rjlkvn7s90fmwmwjyqvy6lhjiz")) + (patches (search-patches + "python-online-judge-api-client-tests.patch")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + ;; These tests require network connections + (add-after 'unpack 'remove-failing-test + (lambda _ + (for-each delete-file + '("tests/get_contest_atcoder.py" + "tests/get_contest_atcoder_problems.py" + "tests/get_contest_codechef.py" + "tests/get_contest_codeforces.py" + "tests/get_contest_yukicoder.py" + "tests/get_problem_anarchygolf.py" + "tests/get_problem_aoj.py" + "tests/get_problem_atcoder.py" + "tests/get_problem_codechef.py" + "tests/get_problem_codeforces.py" + "tests/get_problem_csacademy.py" + "tests/get_problem_facebook.py" + "tests/get_problem_hackerrank.py" + "tests/get_problem_kattis.py" + "tests/get_problem_library_checker.py" + "tests/get_problem_poj.py" + "tests/get_problem_topcoder.py" + "tests/get_problem_toph.py" + "tests/get_problem_yukicoder.py" + "tests/login_service.py")) #t))))) + (propagated-inputs (list python-appdirs + python-beautifulsoup4 + python-colorlog + python-lxml + python-requests + python-toml + python-jsonschema)) + (home-page "https://github.com/online-judge-tools/api-client") + (synopsis "API client for various online judges") + (description + "This is an API client for various online judges, used as the backend +library of @code{oj} command. You can use the Python +library (@code{onlinejudge} module) and the command-line +interface (@command{oj-api} command) which talks JSON compatible with +jmerle/competitive-companion.") + (license license:expat))) + (define-public python-parso (package (name "python-parso") -- cgit v1.2.3 From 789ef6837f9794c02bc53a854aacfdf04d3384cf Mon Sep 17 00:00:00 2001 From: gemmaro Date: Sat, 26 Aug 2023 15:22:41 +0900 Subject: gnu: Add online-judge-tools. * gnu/packages/python-xyz.scm (online-judge-tools): New variable. * gnu/packages/patches/online-judge-tools.patch: New file. * gnu/local.mk (dist_patch_DATA): Add patch file. Signed-off-by: Christopher Baines Change-Id: I78315db15ca8205dff607e98388c404ede64fb60 --- gnu/local.mk | 1 + gnu/packages/patches/online-judge-tools.patch | 62 +++++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 35 +++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 gnu/packages/patches/online-judge-tools.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 8518c91268..8d817379a7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1703,6 +1703,7 @@ dist_patch_DATA = \ %D%/packages/patches/omake-fix-non-determinism.patch \ %D%/packages/patches/oneko-remove-nonfree-characters.patch \ %D%/packages/patches/onionshare-cli-async-mode.patch \ + %D%/packages/patches/online-judge-tools.patch \ %D%/packages/patches/onnx-optimizer-system-library.patch \ %D%/packages/patches/onnx-use-system-googletest.patch \ %D%/packages/patches/onnx-shared-libraries.patch \ diff --git a/gnu/packages/patches/online-judge-tools.patch b/gnu/packages/patches/online-judge-tools.patch new file mode 100644 index 0000000000..9e016d7104 --- /dev/null +++ b/gnu/packages/patches/online-judge-tools.patch @@ -0,0 +1,62 @@ +Skip failing tests and an assertion. The skipped tests require network +connections. + +--- a/tests/command_download.py ++++ b/tests/command_download.py +@@ -90,6 +90,7 @@ class DownloadTest(unittest.TestCase): + def snippet_call_download_failure(self, *args, **kwargs): + tests.command_download.snippet_call_download_failure(self, *args, **kwargs) + ++ @unittest.skip("Disabled by Guix") + def test_call_download_atcoder_abc114_c(self): + self.snippet_call_download('https://atcoder.jp/contests/abc114/tasks/abc114_c', [ + { +@@ -106,6 +107,7 @@ class DownloadTest(unittest.TestCase): + }, + ], type='json') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_atcoder_abc003_4(self): + self.snippet_call_download('https://atcoder.jp/contests/abc003/tasks/abc003_4', [ + { +@@ -126,9 +128,11 @@ class DownloadTest(unittest.TestCase): + }, + ], type='json') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_invalid_url(self): + self.snippet_call_download_failure('http://abc001.contest.atcoder.jp/tasks/abc001_100') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_413(self): + # This task is not supported. + self.snippet_call_download_failure('https://chokudai001.contest.atcoder.jp/tasks/chokudai_001_a') +@@ -141,13 +145,16 @@ class DownloadInvalidTest(unittest.TestCase): + def snippet_call_download_twice(self, *args, **kwargs): + tests.command_download.snippet_call_download_twice(self, *args, **kwargs) + ++ @unittest.skip("Disabled by Guix") + def test_call_download_invalid(self): + self.snippet_call_download_failure('https://not_exist_contest.jp/tasks/001_a') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_no_sample_found(self): + self.snippet_call_download_failure('https://atcoder.jp/contests/tenka1-2013-quala/tasks/tenka1_2013_qualA_a') + self.snippet_call_download_failure('https://open.kattis.com/problems/hello') + ++ @unittest.skip("Disabled by Guix") + def test_call_download_twice(self): + self.snippet_call_download_twice('https://atcoder.jp/contests/abc114/tasks/abc114_c', 'https://atcoder.jp/contests/abc003/tasks/abc003_4', [ + { + +--- a/tests/command_test.py ++++ b/tests/command_test.py +@@ -1319,7 +1319,7 @@ class TestTest(unittest.TestCase): + timer = threading.Timer(1.0, send_keyboard_interrupt) + timer.start() + result = tests.utils.run_in_sandbox(args=['-v', 'test', '-c', tests.utils.python_c("import time; time.sleep(10) # {}".format(marker_for_callee)), 'test/{}-1.in'.format(marker_for_caller)], files=files) +- self.assertNotEqual(result['proc'].returncode, 0) ++ # self.assertNotEqual(result['proc'].returncode, 0) + + # check there are no processes whose command-line arguments contains the marker word + for cmdline in pathlib.Path('/proc').glob('*/cmdline'): diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a64a86492c..c95defd999 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24630,6 +24630,41 @@ (define-public python-online-judge-api-client jmerle/competitive-companion.") (license license:expat))) +(define-public online-judge-tools + (package + (name "online-judge-tools") + (version "11.5.1") + ;; Source distributions are not uploaded to PyPI. + ;; https://pypi.org/project/online-judge-tools/11.5.1/#files + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/online-judge-tools/oj") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0zkzmmjgjb6lyrzq1ip54cpnp7al9a7mcyjyi5vx58bvnx3q0c6m")) + (patches (search-patches "online-judge-tools.patch")))) + (build-system python-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + ;; These tests require network connections + (add-after 'unpack 'remove-failing-test + (lambda _ + (delete-file "tests/command_version.py") #t))))) + (inputs (list time)) + (propagated-inputs (list python-online-judge-api-client python-colorama + python-requests)) + (home-page "https://github.com/online-judge-tools/oj") + (synopsis "Command to help solving problems on various online judges") + (description + "@command{oj} is a command line tool to help solving problems on +various online judges. This command automates downloading sample +cases, generating additional test cases, testing for your code, and +submitting it.") + (license license:expat))) + (define-public python-parso (package (name "python-parso") -- cgit v1.2.3 From c0895371c5759c7d9edb330774e90f192cc4cf2c Mon Sep 17 00:00:00 2001 From: Yann Dupont Date: Tue, 17 Oct 2023 10:57:36 +0200 Subject: gnu: lvm2: Remove systemd rule. Fixes . Reported by Adrien 'neox' Bourmault . * gnu/packages/patches/lvm2-no-systemd.patch: New file. * gnu/packages/linux.scm (lvm2)[source]: Apply patch. * gnu/local.mk: Register new patch. Signed-off-by: Simon Tournier Change-Id: I6b9d583f5914cc127c067829b5891827c04608cb --- gnu/local.mk | 1 + gnu/packages/linux.scm | 1 + gnu/packages/patches/lvm2-no-systemd.patch | 20 ++++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100644 gnu/packages/patches/lvm2-no-systemd.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 8d817379a7..27e57302ae 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1629,6 +1629,7 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ + %D%/packages/patches/lvm2-no-systemd.patch \ %D%/packages/patches/maturin-no-cross-compile.patch \ %D%/packages/patches/mecab-variable-param.patch \ %D%/packages/patches/memtest86+-build-reproducibly.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7a9f357681..6abdb23958 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4494,6 +4494,7 @@ (define-public lvm2 (sha256 (base32 "0z6w6bknhwh1n3qfkb5ij6x57q3wjf28lq3l8kh7rkhsplinjnjc")) + (patches (search-patches "lvm2-no-systemd.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/lvm2-no-systemd.patch b/gnu/packages/patches/lvm2-no-systemd.patch new file mode 100644 index 0000000000..440559b96d --- /dev/null +++ b/gnu/packages/patches/lvm2-no-systemd.patch @@ -0,0 +1,20 @@ +Fixes . + +Run 'vgchange' directly instead of attempting to run it via 'systemd-run' as +the udev rules included in lvm2 >= 2.03.14 do. + +diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in +index ff15681..f9e5b70 100644 +--- a/udev/69-dm-lvm.rules.in ++++ b/udev/69-dm-lvm.rules.in +@@ -75,8 +75,8 @@ LABEL="lvm_scan" + # TODO: adjust the output of vgchange -aay so that + # it's better suited to appearing in the journal. + +-IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}" +-ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}" ++IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg ++ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay + GOTO="lvm_end" + + LABEL="lvm_end" -- cgit v1.2.3 From 3991d9e4d9867ec499283bfc71b34d7bfebe49b3 Mon Sep 17 00:00:00 2001 From: Simon Tournier Date: Tue, 31 Oct 2023 21:28:43 +0100 Subject: Revert "gnu: lvm2: Remove systemd rule." This reverts commit c0895371c5759c7d9edb330774e90f192cc4cf2c, which does not correctly fix the issue, as reported by Josselin Poiret in . --- gnu/local.mk | 1 - gnu/packages/linux.scm | 1 - gnu/packages/patches/lvm2-no-systemd.patch | 20 -------------------- 3 files changed, 22 deletions(-) delete mode 100644 gnu/packages/patches/lvm2-no-systemd.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 27e57302ae..8d817379a7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1629,7 +1629,6 @@ dist_patch_DATA = \ %D%/packages/patches/mcrypt-CVE-2012-4527.patch \ %D%/packages/patches/libmemcached-build-with-gcc7.patch \ %D%/packages/patches/libmhash-hmac-fix-uaf.patch \ - %D%/packages/patches/lvm2-no-systemd.patch \ %D%/packages/patches/maturin-no-cross-compile.patch \ %D%/packages/patches/mecab-variable-param.patch \ %D%/packages/patches/memtest86+-build-reproducibly.patch \ diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 6abdb23958..7a9f357681 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4494,7 +4494,6 @@ (define-public lvm2 (sha256 (base32 "0z6w6bknhwh1n3qfkb5ij6x57q3wjf28lq3l8kh7rkhsplinjnjc")) - (patches (search-patches "lvm2-no-systemd.patch")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/lvm2-no-systemd.patch b/gnu/packages/patches/lvm2-no-systemd.patch deleted file mode 100644 index 440559b96d..0000000000 --- a/gnu/packages/patches/lvm2-no-systemd.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fixes . - -Run 'vgchange' directly instead of attempting to run it via 'systemd-run' as -the udev rules included in lvm2 >= 2.03.14 do. - -diff --git a/udev/69-dm-lvm.rules.in b/udev/69-dm-lvm.rules.in -index ff15681..f9e5b70 100644 ---- a/udev/69-dm-lvm.rules.in -+++ b/udev/69-dm-lvm.rules.in -@@ -75,8 +75,8 @@ LABEL="lvm_scan" - # TODO: adjust the output of vgchange -aay so that - # it's better suited to appearing in the journal. - --IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg --checkcomplete --vgonline --autoactivation event --udevoutput --journal=output $env{DEVNAME}" --ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block --property DefaultDependencies=no --unit lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay --autoactivation event $env{LVM_VG_NAME_COMPLETE}" -+IMPORT{program}="(LVM_EXEC)/lvm pvscan --cache --listvg -+ENV{LVM_VG_NAME_COMPLETE}=="?*", RUN+="(SYSTEMDRUN) --no-block lvm-activate-$env{LVM_VG_NAME_COMPLETE} (LVM_EXEC)/lvm vgchange -aay - GOTO="lvm_end" - - LABEL="lvm_end" -- cgit v1.2.3