Bug#1074399: libcgi-application-plugin-authentication-perl: autopkgtest regression: libcgi-application-plugin-authentication-perl vs libcgi-pm-perl

2024-06-27 Thread Chris Peterson
Package: libcgi-application-plugin-authentication-perl
Version: 0.24+~cs0.5-1
Severity: serious
Tags: patch ftbfs
Justification: fails to build from source (but built successfully in the past)
X-Debbugs-Cc: chris.peter...@canonical.com
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch




libcgi-application-plugin-authentication-perl's build time tests fail
due to a change in behavior in libcgi-pm-perl with trailing slashes in
URLs. In particular, a test was failing which compared generated output
with a reference output that was generated with an older version of
libcgi-pm-perl. I applied the attached patch to fix the issue Ubuntu and
also forwarded it upstream.

Thanks for considering the patch.

- cpete
diff -Nru 
libcgi-application-plugin-authentication-perl-0.24+~cs0.5/debian/patches/login-box-basic.patch
 
libcgi-application-plugin-authentication-perl-0.24+~cs0.5/debian/patches/login-box-basic.patch
--- 
libcgi-application-plugin-authentication-perl-0.24+~cs0.5/debian/patches/login-box-basic.patch
  1969-12-31 16:00:00.0 -0800
+++ 
libcgi-application-plugin-authentication-perl-0.24+~cs0.5/debian/patches/login-box-basic.patch
  2024-06-27 16:02:21.0 -0700
@@ -0,0 +1,23 @@
+Description: Update test for CGI.pm >=4.66
+  CGI.pm made changes to "restore the trailing slash in ->url" in 4.66[1],
+  which causes a test failure in one of the tests comparing output with
+  a reference generated by a previous version of CGI.pm. This patch
+  updates the reference file for compatibility with CGI.pm >= 4.66.
+
+  [1] 
https://github.com/leejo/CGI.pm/commit/a5485b5f3b2b1cc85761b6781ff6660b4f377498
+Author: Chris Peterson 
+Forwarded: 
https://github.com/MicroTechnology-Services/cgi-application-plugin-authentication/pull/2
+Bug-Ubuntu: 
https://bugs.launchpad.net/ubuntu/+source/libcgi-application-plugin-authentication-perl/+bug/2071369
+Last-Update: 2024-06-27
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/t/out/basic_login_box
 b/t/out/basic_login_box
+@@ -28,6 +28,6 @@
+   
+ 
+   
+-  http://localhost; />
++  http://localhost/; />
+   
+ 
diff -Nru 
libcgi-application-plugin-authentication-perl-0.24+~cs0.5/debian/patches/series 
libcgi-application-plugin-authentication-perl-0.24+~cs0.5/debian/patches/series
--- 
libcgi-application-plugin-authentication-perl-0.24+~cs0.5/debian/patches/series 
1969-12-31 16:00:00.0 -0800
+++ 
libcgi-application-plugin-authentication-perl-0.24+~cs0.5/debian/patches/series 
2024-06-27 11:32:51.0 -0700
@@ -0,0 +1 @@
+login-box-basic.patch


Bug#1063945: ipython: Ubuntu patch for pytest 8 support

2024-06-08 Thread Chris Peterson
Package: ipython
Version: 8.20.0-1
Followup-For: Bug #1063945
X-Debbugs-Cc: chris.peter...@canonical.com
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch
Control: tags -1 patch



Hi,

I identified two patches from upstream that solved this issue but
aren't available in the currently packaged version. I applied the
following in Ubuntu to solve the issue:

  * Update pytest and tests for pytest 8 compatibility (LP: #2068674).
- d/p/pytest8-nose-tests.patch: update nose-style tests for pytest 8.2+
- d/p/support-pytest-plugin.patch: update pytest plugin for pytest 8.1+


Thanks for considering the patches.


-- System Information:
Debian Release: trixie/sid
  APT prefers oracular
  APT policy: (500, 'oracular'), (100, 'oracular-proposed')
Architecture: amd64 (x86_64)

Kernel: Linux 6.8.0-31-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru ipython-8.20.0/debian/patches/pytest8-nose-tests.patch 
ipython-8.20.0/debian/patches/pytest8-nose-tests.patch
--- ipython-8.20.0/debian/patches/pytest8-nose-tests.patch  1969-12-31 
16:00:00.0 -0800
+++ ipython-8.20.0/debian/patches/pytest8-nose-tests.patch  2024-06-06 
17:10:18.0 -0700
@@ -0,0 +1,32 @@
+Description: Update nose-style tests for pytest 8 compatbility
+ Pytest dropped support for nose-style tests in pytest 8. This patch cherry-
+ picks the patch from upstream to fix the offending tests. This patch can
+ be dropped in version 8.24.0.
+Author: Chris Peterson 
+Origin: upstream, 
https://github.com/ipython/ipython/commit/cdacafdccaf1f562e59b21b3c9f2c1a28eba54da
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipython/+bug/2068674
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1063945
+Forwarded: not-needed
+Last-Update: 2024-06-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/IPython/core/tests/test_pylabtools.py
 b/IPython/core/tests/test_pylabtools.py
+@@ -165,7 +165,7 @@
+ def enable_gui(self, gui):
+ pass
+ 
+-def setup(self):
++def setup_method(self):
+ import matplotlib
+ def act_mpl(backend):
+ matplotlib.rcParams['backend'] = backend
+@@ -184,7 +184,7 @@
+ self._save_cis = backend_inline.configure_inline_support
+ backend_inline.configure_inline_support = lambda *a, **kw: None
+ 
+-def teardown(self):
++def teardown_method(self):
+ pt.activate_matplotlib = self._save_am
+ pt.import_pylab = self._save_ip
+ backend_inline.configure_inline_support = self._save_cis
diff -Nru ipython-8.20.0/debian/patches/series 
ipython-8.20.0/debian/patches/series
--- ipython-8.20.0/debian/patches/series2024-01-14 16:32:19.0 
-0800
+++ ipython-8.20.0/debian/patches/series2024-06-06 17:10:38.0 
-0700
@@ -1,2 +1,4 @@
 0002-Update-intersphinx-links-for-local-access.patch
 0003-Drop-setuptools-data_files.patch
+pytest8-nose-tests.patch
+support-pytest-plugin.patch
diff -Nru ipython-8.20.0/debian/patches/support-pytest-plugin.patch 
ipython-8.20.0/debian/patches/support-pytest-plugin.patch
--- ipython-8.20.0/debian/patches/support-pytest-plugin.patch   1969-12-31 
16:00:00.0 -0800
+++ ipython-8.20.0/debian/patches/support-pytest-plugin.patch   2024-06-06 
17:22:13.0 -0700
@@ -0,0 +1,120 @@
+Description: Update pytest plugin for pytest 8
+ Pytest 8.1 changed the plugin API. This patch cherry-picks the upstream
+ modifications to the plugin for pytest 8.1+ support. This patch can be
+ dropped with upstream version 8.25.0.
+Author: Chris Peterson 
+Origin: upstream, 
https://github.com/ipython/ipython/commit/7df70a3cd79068be6f98596e427d60a5d0cfe5b3
+Bug: https://github.com/ipython/ipython/issues/14390
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipython/+bug/2068674
+Forwarded: not-needed
+Last-Update: 2024-06-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/IPython/testing/plugin/pytest_ipdoctest.py
 b/IPython/testing/plugin/pytest_ipdoctest.py
+@@ -38,7 +38,11 @@
+ from _pytest.compat import safe_getattr
+ from _pytest.config import Config
+ from _pytest.config.argparsing import Parser
+-from _pytest.fixtures import FixtureRequest
++
++try:
++from _pytest.fixtures import TopRequest as FixtureRequest
++except ImportError:
++from _pytest.fixtures import FixtureRequest
+ from _pytest.nodes import Collector
+ from _pytest.outcomes import OutcomeException
+ from _pytest.pathlib import fnmatch_ex
+@@ -68,6 +72,8 @@
+ # Lazy definition of output checker class
+ CHECKER_CLASS: Optional[Type["IPDoctestOutputChecker"]] = None
+ 
++pytest_version = tuple([int(part) for part in pytest.__version__.split(".&

Bug#1070112: ipykernel: Ubuntu patch for pytest 8 support

2024-06-08 Thread Chris Peterson
Package: ipykernel
Version: 6.29.3-1
Followup-For: Bug #1070112
X-Debbugs-Cc: chris.peter...@canonical.com
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch
Control: tags -1 patch



Hi,

I applied the following patch in Ubuntu to fix this issue.

  * pytest8-nose-deprecation.patch: update tests for pytest 8 compatibility
(LP: #2068672).


Thanks for considering the patch.


-- System Information:
Debian Release: trixie/sid
  APT prefers oracular
  APT policy: (500, 'oracular'), (100, 'oracular-proposed')
Architecture: amd64 (x86_64)

Kernel: Linux 6.8.0-31-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru ipykernel-6.29.3/debian/patches/pytest8-nose-deprecation.patch 
ipykernel-6.29.3/debian/patches/pytest8-nose-deprecation.patch
--- ipykernel-6.29.3/debian/patches/pytest8-nose-deprecation.patch  
1969-12-31 16:00:00.0 -0800
+++ ipykernel-6.29.3/debian/patches/pytest8-nose-deprecation.patch  
2024-06-06 16:39:16.0 -0700
@@ -0,0 +1,95 @@
+Description: Update tests for pytest 8 compatibility
+ Pytest 8 deprecated support for nose-style tests. This patch cherrry-picks
+ changes from upstream to modify tests to run with pytest 8.
+Author: Chris Peterson 
+Origin: upstream, 
https://github.com/ipython/ipykernel/commit/a7d66ae2197e0d7471ba160542cf5ff7713084b5
+Bug: https://github.com/ipython/ipykernel/issues/1230
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipykernel/+bug/2068672
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1070112
+Forwarded: not-needed
+Last-Update: 2024-06-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/__init__.py
 b/tests/__init__.py
+@@ -7,6 +7,8 @@
+ import tempfile
+ from unittest.mock import patch
+ 
++import pytest
++
+ from ipykernel.kernelspec import install
+ 
+ pjoin = os.path.join
+@@ -15,7 +17,8 @@
+ patchers: list = []
+ 
+ 
+-def setup():
++@pytest.fixture(autouse=True)
++def _global_setup():
+ """setup temporary env for tests"""
+ global tmp
+ tmp = tempfile.mkdtemp()
+@@ -35,8 +38,8 @@
+ # install IPython in the temp home:
+ install(user=True)
+ 
++yield
+ 
+-def teardown():
+ for p in patchers:
+ p.stop()
+ 
+--- a/tests/test_eventloop.py
 b/tests/test_eventloop.py
+@@ -42,14 +42,15 @@
+ _get_qt_vers()
+ 
+ 
+-def setup():
++@pytest.fixture(autouse=True)
++def _setup_env():
+ """start the global kernel (if it isn't running) and return its client"""
+ global KM, KC
+ KM, KC = start_new_kernel()
+ flush_channels(KC)
+ 
++yield
+ 
+-def teardown():
+ assert KM is not None
+ assert KC is not None
+ KC.stop_channels()
+--- a/tests/test_message_spec.py
 b/tests/test_message_spec.py
+@@ -21,7 +21,8 @@
+ KC: BlockingKernelClient = None  # type:ignore
+ 
+ 
+-def setup():
++@pytest.fixture(autouse=True)
++def _setup_env():
+ global KC
+ KC = start_global_kernel()
+ 
+--- a/tests/test_async.py
 b/tests/test_async.py
+@@ -8,14 +8,15 @@
+ KC = KM = None
+ 
+ 
+-def setup_function():
++@pytest.fixture(autouse=True)
++def _setup_env():
+ """start the global kernel (if it isn't running) and return its client"""
+ global KM, KC
+ KM, KC = start_new_kernel()
+ flush_channels(KC)
+ 
++yield
+ 
+-def teardown_function():
+ assert KC is not None
+ assert KM is not None
+ KC.stop_channels()
diff -Nru ipykernel-6.29.3/debian/patches/series 
ipykernel-6.29.3/debian/patches/series
--- ipykernel-6.29.3/debian/patches/series  2024-01-11 14:25:38.0 
-0800
+++ ipykernel-6.29.3/debian/patches/series  2024-06-06 16:22:48.0 
-0700
@@ -1,2 +1,3 @@
 0002-test_simple_print-may-produce-stderr-content-when-ex.patch
 0003-Made-build-reproducible-patch-by-Daniel-Shahaf.patch
+pytest8-nose-deprecation.patch


Bug#1063967: protontricks: Forward pytest 8 support patch from Ubuntu

2024-06-08 Thread Chris Peterson
Package: protontricks
Version: 1.10.5-1
Followup-For: Bug #1063967
X-Debbugs-Cc: chris.peter...@canonical.com
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch
Control: tags -1 patch



Hi,

I applied the following patch in Ubuntu to fix this issue.


  * pytest8-caplog.patch: Update tests for pytest 8 compatibility
(LP: #2068659).


Thanks for considering the patch.


-- System Information:
Debian Release: trixie/sid
  APT prefers oracular
  APT policy: (500, 'oracular'), (100, 'oracular-proposed')
Architecture: amd64 (x86_64)

Kernel: Linux 6.8.0-31-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru protontricks-1.10.5/debian/patches/pytest8-caplog.patch 
protontricks-1.10.5/debian/patches/pytest8-caplog.patch
--- protontricks-1.10.5/debian/patches/pytest8-caplog.patch 1969-12-31 
16:00:00.0 -0800
+++ protontricks-1.10.5/debian/patches/pytest8-caplog.patch 2024-06-06 
12:27:04.0 -0700
@@ -0,0 +1,37 @@
+Description: Update test for pytest 8 comptability
+ Pytest 8 now includes all log levels in the caplog fixture. Apply upstream
+ changes to test case which ensures warning messages are logged. Can be dropped
+ in upstream version 1.11.1
+Author: Chris Peterson 
+Origin: upstream, 
https://github.com/Matoking/protontricks/commit/bb1da5a0ddcac1cbd577fd54fe947ff6ad1731bc
+Bug: https://github.com/Matoking/protontricks/issues/283
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pytest/+bug/2068659
+Forwarded: not-needed
+Last-Update: 2024-06-06
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/test_gui.py
 b/tests/test_gui.py
+@@ -207,7 +207,7 @@
+ assert steam_app == steam_apps[1]
+ assert (
+ "Your system locale is incapable of displaying all characters"
+-in caplog.records[0].message
++in caplog.records[-1].message
+ )
+ 
+ @pytest.mark.parametrize("gui_cmd", ["yad", "zenity"])
+--- a/tests/conftest.py
 b/tests/conftest.py
+@@ -44,6 +44,11 @@
+ logging.getLogger("protontricks").handlers.clear()
+ 
+ 
++@pytest.fixture(scope="function", autouse=True)
++def default_caplog(caplog):
++caplog.set_level(logging.INFO)
++
++
+ @pytest.fixture(scope="function")
+ def verbose_logging():
+ """
diff -Nru protontricks-1.10.5/debian/patches/series 
protontricks-1.10.5/debian/patches/series
--- protontricks-1.10.5/debian/patches/series   1969-12-31 16:00:00.0 
-0800
+++ protontricks-1.10.5/debian/patches/series   2024-06-06 12:26:50.0 
-0700
@@ -0,0 +1 @@
+pytest8-caplog.patch


Bug#1061744: ipyparallel: Patch to fix failing unit test

2024-02-09 Thread Chris Peterson
Package: ipyparallel
Followup-For: Bug #1061744
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
X-Debbugs-Cc: chris.peter...@canonical.com
Control: tags -1 patch

Dear Maintainer,


In Ubuntu, the attached patch was applied to achieve the following:


  * Fix tests for python3.12 (LP: #2052727)

Python3.12 added checks for mock methods prefixed with `called_` since

  assert mock.called_once()

was a common mistake.

Thanks for considering the patch.

- Chris
diff -Nru 
ipyparallel-7.1.0/debian/patches/python3-assert-called-once-with.patch 
ipyparallel-7.1.0/debian/patches/python3-assert-called-once-with.patch
--- ipyparallel-7.1.0/debian/patches/python3-assert-called-once-with.patch  
1969-12-31 16:00:00.0 -0800
+++ ipyparallel-7.1.0/debian/patches/python3-assert-called-once-with.patch  
2024-02-08 10:44:16.0 -0800
@@ -0,0 +1,24 @@
+Description: Fix bad test assert for python3.12
+ Python3.12 includes a check for the common mistake of:
+assert mocked_object.called_once_with(params)
+ and now raises an attribute error instead of erroneously passing the test.
+ The correct assertion method is `assert_called_once_with`. See:
+ https://github.com/python/cpython/issues/100690
+ for more information.
+Author: Chris Peterson 
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipyparallel/+bug/2052727
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1061744
+Last-Update: 2024-02-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/ipyparallel/tests/test_util.py
 b/ipyparallel/tests/test_util.py
+@@ -14,7 +14,7 @@
+ assert util.disambiguate_ip_address('0.0.0.0', socket.gethostname()) == 
localhost()
+ wontresolve = 'this.wontresolve.dns'
+ assert util.disambiguate_ip_address('0.0.0.0', wontresolve) == wontresolve
+-assert warn_mock.called_once_with(
++warn_mock.assert_called_once_with(
+ 'IPython could not determine IPs for {}: '
+ '[Errno -2] Name or service not known'.format(wontresolve),
+ RuntimeWarning,
diff -Nru ipyparallel-7.1.0/debian/patches/series 
ipyparallel-7.1.0/debian/patches/series
--- ipyparallel-7.1.0/debian/patches/series 2023-02-10 00:19:19.0 
-0800
+++ ipyparallel-7.1.0/debian/patches/series 2024-02-08 10:42:39.0 
-0800
@@ -5,3 +5,4 @@
 fix_docs
 fix_setuptools_import.patch
 0007-generate-code-reducer-from-CodeType-signature.patch
+python3-assert-called-once-with.patch


Bug#1063434: 389-ds-base: Build flags for 32bit architectures

2024-02-09 Thread Chris Peterson
Package: 389-ds-base
Version: 2.4.4+dfsg1-1
Followup-For: Bug #1063434
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble ubuntu-patch
X-Debbugs-Cc: chris.peter...@canonical.com
Control: tags -1 patch

Dear Maintainer,

I see this has been marked for autoremoval, but I have recently
introduced a patch in Ubuntu which fixed builds for armhf. Please see
the attached for a functionally similar patch that should enable builds
on your 32bit architectures (armhf, armel, and i386). I can provide
armhf autopkgtest results shortly.

Thanks,
Chris
diff -Nru 389-ds-base-2.4.4+dfsg1/debian/rules 
389-ds-base-2.4.4+dfsg1/debian/rules
--- 389-ds-base-2.4.4+dfsg1/debian/rules2024-01-08 07:40:49.0 
-0800
+++ 389-ds-base-2.4.4+dfsg1/debian/rules2024-02-08 16:26:51.0 
-0800
@@ -7,6 +7,9 @@
 ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc powerpcspe 
sh4))
   export DEB_LDFLAGS_MAINT_APPEND=-latomic
 endif
+ifneq (,$(filter $(DEB_HOST_ARCH), armhf armel i386))
+ export DEB_CFLAGS_MAINT_APPEND=-D_LARGEFILE64_SOURCE
+endif
 
 REALFILE = \
bin/ds-logpipe.py \


Bug#1057483: alex4 depends on alex4-data but is NBS

2023-12-05 Thread Chris Peterson
Package: alex4
Severity: serious
Tags: ftbfs
Justification: fails to build from source (but built successfully in the past)
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu noble
X-Debbugs-Cc: chris.peter...@canonical.com

Dear Maintainer,

Forwarding the Ubuntu bug for visibility.

*** /tmp/forwarded-from-ubuntu-0d3o2qla.txt
This bug report was also filed in Ubuntu and can be found at
https://launchpad.net/bugs/2045607
The description, from Chris Peterson, follows:

alex4-data is currently listed as an NBS due to changes in alex4 v1.1-10, which 
drops alex4-data as as a build target but leaves alex4-data as a potential 
Depends. I've read through (Debian Bug) #1035043 but it is still unclear to me 
(1) the intended fate of alex4-data and (2) if it can be fully replaced by 
game-data-packager.

It appears that alex4-data on Debian is just an old version of alex4 which 
builds it. My assumption is that the answer to (2) is yes, and 
game-data-packager is meant to fully replace alex4-data. In this case my 
suggestion is to drop alex4-data from Depends (patch to follow this post).

I will note that these changes were only from a few days ago, so perhaps I'm 
jumping the gun.

-- System Information:
Debian Release: bookworm/sid
  APT prefers jammy-updates
  APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy'), 
(100, 'jammy-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.2.0-37-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled