diff --git a/recipes/aiohttp/meta.yaml b/recipes/aiohttp/meta.yaml index ebda4135..e40b218f 100644 --- a/recipes/aiohttp/meta.yaml +++ b/recipes/aiohttp/meta.yaml @@ -1,6 +1,6 @@ package: name: aiohttp - version: "3.14.0" + version: "3.14.5" build: number: 1 diff --git a/recipes/curl-cffi/README.md b/recipes/curl-cffi/README.md index 079b1b3a..142d3889 100644 --- a/recipes/curl-cffi/README.md +++ b/recipes/curl-cffi/README.md @@ -276,8 +276,8 @@ against your own backend, on a device, is the thing to validate. ship, but each asks that its copyright notice travel with the binary — and **those notices are not in the curl_cffi wheel**. Its `dist-info/licenses/` holds one file, curl_cffi's own MIT text, because the archive links in as a build-time dependency that ships nothing else to the - device. The nine texts are in `flet-libcurl-impersonate`'s wheel, under the same - `dist-info/licenses/`, and beside its `meta.yaml`; copy them into whatever acknowledgements + device. The texts are in `flet-libcurl-impersonate`'s wheel, under the same + `dist-info/licenses/`, taken from upstream's release tarball; copy them into whatever acknowledgements screen your app has. Flagging it, not advising you — we are not lawyers. ## Build notes (maintainers) @@ -314,6 +314,12 @@ wheel — declares `flet-libcpp-shared`: the arm64-v8a extension's `DT_NEEDED` i simulator assets. `excluded_arches: [armeabi-v7a]` is what makes `target_arch` mandatory in [Install](#install); if a 32-bit ARM asset ever appears, that paragraph and the example's `pyproject.toml` entry both stop being necessary. +- **Hold curl-impersonate at 2.2.2, and so curl-cffi at 0.16.x, until upstream fixes iOS DNS.** + From 2.2.3 the iOS archives resolve through c-ares, and on an iOS simulator every lookup + then fails with `curl: (28) Resolving timed out`; measured with curl-cffi 0.17.0 and + 2.3.1, against 5/5 requests on 0.16.2 in the same app. Upstream moved Android back to the + threaded resolver (curl-impersonate #339/#344) but not iOS. A bump past 0.16.3 needs a real + HTTPS request on iOS first: `tests/` makes no network calls, and passed on 0.17.0. - **`scripts/build.py` is the patch target.** A restructure of `detect_arch()` or of `libs.json` makes the patch fail to apply — or worse, apply into a build that falls back to the host's `uname` and downloads a host-architecture archive. diff --git a/recipes/curl-cffi/examples/fingerprint-fanout/pyproject.toml b/recipes/curl-cffi/examples/fingerprint-fanout/pyproject.toml index d940c2bf..db599259 100644 --- a/recipes/curl-cffi/examples/fingerprint-fanout/pyproject.toml +++ b/recipes/curl-cffi/examples/fingerprint-fanout/pyproject.toml @@ -6,7 +6,7 @@ requires-python = ">=3.12" dependencies = [ "flet==0.86.5", - "curl-cffi==0.16.2", + "curl-cffi==0.16.3", "certifi", ] diff --git a/recipes/curl-cffi/meta.yaml b/recipes/curl-cffi/meta.yaml index 549d948f..640f6467 100644 --- a/recipes/curl-cffi/meta.yaml +++ b/recipes/curl-cffi/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "0.16.2" %} +{% set version = "0.16.3" %} package: name: curl-cffi @@ -30,7 +30,7 @@ requirements: # constant normally drives the download URL, so a skew self-corrects; the patch # skips the download, and cdef.c compiles against curl-cffi's own bundled # include/curl/ headers — so a mismatch links a skewed archive and still goes green. - - flet-libcurl-impersonate 2.1.1 + - flet-libcurl-impersonate 2.2.2 # {% if sdk == 'android' %} host: # The extension links -lc++ -> DT_NEEDED libc++_shared.so on Android (iOS diff --git a/recipes/flet-libcurl-impersonate/licenses/COPYING.curl b/recipes/flet-libcurl-impersonate/licenses/COPYING.curl deleted file mode 100644 index 2f71d999..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/COPYING.curl +++ /dev/null @@ -1,22 +0,0 @@ -COPYRIGHT AND PERMISSION NOTICE - -Copyright (c) 1996 - 2026, Daniel Stenberg, , and many -contributors, see the THANKS file. - -All rights reserved. - -Permission to use, copy, modify, and distribute this software for any purpose -with or without fee is hereby granted, provided that the above copyright -notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN -NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of a copyright holder shall not -be used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization of the copyright holder. diff --git a/recipes/flet-libcurl-impersonate/licenses/COPYING.nghttp2 b/recipes/flet-libcurl-impersonate/licenses/COPYING.nghttp2 deleted file mode 100644 index 80201792..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/COPYING.nghttp2 +++ /dev/null @@ -1,23 +0,0 @@ -The MIT License - -Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa -Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/recipes/flet-libcurl-impersonate/licenses/COPYING.nghttp3 b/recipes/flet-libcurl-impersonate/licenses/COPYING.nghttp3 deleted file mode 100644 index 37562ea5..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/COPYING.nghttp3 +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License - -Copyright (c) 2019 nghttp3 contributors - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/recipes/flet-libcurl-impersonate/licenses/COPYING.ngtcp2 b/recipes/flet-libcurl-impersonate/licenses/COPYING.ngtcp2 deleted file mode 100644 index 9b367cdc..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/COPYING.ngtcp2 +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License - -Copyright (c) 2016 ngtcp2 contributors - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/recipes/flet-libcurl-impersonate/licenses/LICENSE.boringssl b/recipes/flet-libcurl-impersonate/licenses/LICENSE.boringssl deleted file mode 100644 index 37a5b743..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/LICENSE.boringssl +++ /dev/null @@ -1,238 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - -Licenses for support code -------------------------- - -Parts of the TLS test suite are under the Go license. This code is not included -in BoringSSL (i.e. libcrypto and libssl) when compiled, however, so -distributing code linked against BoringSSL does not trigger this license: - -Copyright (c) 2009 The Go Authors. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/recipes/flet-libcurl-impersonate/licenses/LICENSE.brotli b/recipes/flet-libcurl-impersonate/licenses/LICENSE.brotli deleted file mode 100644 index 33b7cdd2..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/LICENSE.brotli +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2009, 2010, 2013-2016 by the Brotli Authors. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/recipes/flet-libcurl-impersonate/licenses/LICENSE.curl-impersonate b/recipes/flet-libcurl-impersonate/licenses/LICENSE.curl-impersonate deleted file mode 100644 index 7475f58f..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/LICENSE.curl-impersonate +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2026 curl_cffi developers - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/recipes/flet-libcurl-impersonate/licenses/LICENSE.zlib b/recipes/flet-libcurl-impersonate/licenses/LICENSE.zlib deleted file mode 100644 index ab8ee6f7..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/LICENSE.zlib +++ /dev/null @@ -1,22 +0,0 @@ -Copyright notice: - - (C) 1995-2022 Jean-loup Gailly and Mark Adler - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - 3. This notice may not be removed or altered from any source distribution. - - Jean-loup Gailly Mark Adler - jloup@gzip.org madler@alumni.caltech.edu diff --git a/recipes/flet-libcurl-impersonate/licenses/LICENSE.zstd b/recipes/flet-libcurl-impersonate/licenses/LICENSE.zstd deleted file mode 100644 index 75800288..00000000 --- a/recipes/flet-libcurl-impersonate/licenses/LICENSE.zstd +++ /dev/null @@ -1,30 +0,0 @@ -BSD License - -For Zstandard software - -Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name Facebook, nor Meta, nor the names of its contributors may - be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/recipes/flet-libcurl-impersonate/meta.yaml b/recipes/flet-libcurl-impersonate/meta.yaml index db1012dc..edaef609 100644 --- a/recipes/flet-libcurl-impersonate/meta.yaml +++ b/recipes/flet-libcurl-impersonate/meta.yaml @@ -1,4 +1,4 @@ -{% set version = "2.1.1" %} +{% set version = "2.2.2" %} package: name: flet-libcurl-impersonate @@ -32,30 +32,14 @@ source: about: - # The release tarballs ship no licence text at all, so the notices are vendored in - # licenses/ — every file there ships, so there is no list here to fall out of step - # with the folder. libcurl-impersonate.a is a single `ld -r` blob merging nine - # upstream projects, pinned by upstream's CMakeLists.txt at this tag and confirmed - # in the archive by symbol probe: + # The release tarballs carry their components' notices at the top level (LICENSE, + # LICENSE_BORINGSSL, LICENSE_CURL, ...), identical across slices, and forge's + # licence discovery ships them. libcurl-impersonate.a is one `ld -r` blob merging + # curl, the curl-impersonate patches, BoringSSL, nghttp2, nghttp3, ngtcp2, brotli, + # zstd and zlib, so the expression ANDs all of them. zstd's notice is its BSD arm; + # the GPL-2.0 alternative is not expressed. # - # curl 8.21.0 curl COPYING.curl - # curl-impersonate patches MIT LICENSE.curl-impersonate - # BoringSSL 156c7b75 Apache-2.0 LICENSE.boringssl - # nghttp2 1.63.0 MIT COPYING.nghttp2 - # nghttp3 1.15.0 MIT COPYING.nghttp3 - # ngtcp2 1.20.0 MIT COPYING.ngtcp2 - # brotli 1.2.0 MIT LICENSE.brotli - # zstd 1.5.7 BSD-3-Clause LICENSE.zstd - # zlib 1.3.1 Zlib LICENSE.zlib - # - # On a bump, re-fetch each file from its project at the NEW pinned version and - # re-run the probe — the component set is upstream's to change. Two traps: take - # nghttp2's COPYING (its LICENSE is a 12-byte "See COPYING") and zstd's LICENSE - # (its COPYING is the GPL-2.0 arm of a dual licence; we take the BSD arm). - # - # Same set on both platforms — one superbuild, only BoringSSL's asm differs. - # - # Deduplicated set of the nine, ANDed because the archive holds all of them at - # once. zstd's GPL-2.0 alternative is deliberately not expressed: it is a fact - # about the project, not about this artifact. + # Hold at 2.2.2: 2.2.3+ resolve DNS through c-ares on iOS, and on the iOS simulator + # every lookup then times out (curl 28, "Resolving timed out"). Android went back + # to the threaded resolver upstream (curl-impersonate #339/#344); iOS did not. license: curl AND MIT AND Apache-2.0 AND BSD-3-Clause AND Zlib diff --git a/recipes/kiwisolver/meta.yaml b/recipes/kiwisolver/meta.yaml index 5df9e805..ef06ce93 100644 --- a/recipes/kiwisolver/meta.yaml +++ b/recipes/kiwisolver/meta.yaml @@ -1,6 +1,6 @@ package: name: kiwisolver - version: "1.5.0" + version: "1.5.1" build: number: 1 diff --git a/recipes/markupsafe/meta.yaml b/recipes/markupsafe/meta.yaml index 0729a2c2..210c0960 100644 --- a/recipes/markupsafe/meta.yaml +++ b/recipes/markupsafe/meta.yaml @@ -1,6 +1,6 @@ package: name: MarkupSafe - version: "3.0.3" + version: "3.0.4" build: number: 1 diff --git a/recipes/msgpack/meta.yaml b/recipes/msgpack/meta.yaml index 8f6edd56..c0fae858 100644 --- a/recipes/msgpack/meta.yaml +++ b/recipes/msgpack/meta.yaml @@ -1,6 +1,6 @@ package: name: msgpack - version: "1.1.2" + version: "1.2.4" build: number: 1 diff --git a/recipes/msgpack/tests/test_msgpack.py b/recipes/msgpack/tests/test_msgpack.py index 5eb33cad..a7550dcc 100644 --- a/recipes/msgpack/tests/test_msgpack.py +++ b/recipes/msgpack/tests/test_msgpack.py @@ -30,3 +30,14 @@ def test_streaming_unpacker(): unpacker = msgpack.Unpacker(buf) decoded = list(unpacker) assert decoded == [{"i": 0}, {"i": 1}, {"i": 2}] + + +def test_c_extension_is_in_use(): + """msgpack falls back to pure Python if `_cmsgpack` fails to import, and the + round-trip tests above still pass, so assert the C classes are the ones bound.""" + import msgpack + from msgpack import _cmsgpack + + assert msgpack.Packer is _cmsgpack.Packer + assert msgpack.Unpacker is _cmsgpack.Unpacker + assert msgpack.unpackb is _cmsgpack.unpackb diff --git a/recipes/ncnn/meta.yaml b/recipes/ncnn/meta.yaml index 9b7748bd..3d65bc2e 100644 --- a/recipes/ncnn/meta.yaml +++ b/recipes/ncnn/meta.yaml @@ -1,9 +1,9 @@ package: name: ncnn - version: "1.0.20260526" + version: "1.0.20261020" build: - number: 2 + number: 1 script_env: _PYTHON_SYSCONFIGDATA_NAME: '{sysconfigdata_name}' # setup.py appends EXTRA_CMAKE_ARGS after its own args, so our overrides @@ -58,3 +58,4 @@ requirements: patches: - pin-version-date.patch + - skip-upstream-ios-cross.patch diff --git a/recipes/ncnn/patches/pin-version-date.patch b/recipes/ncnn/patches/pin-version-date.patch index bcaee8b7..28e9833f 100644 --- a/recipes/ncnn/patches/pin-version-date.patch +++ b/recipes/ncnn/patches/pin-version-date.patch @@ -1,5 +1,5 @@ setup.py generates the wheel version as MAJOR.MINOR. -(time.strftime("%Y%m%d")), so building the 1.0.20260526 sdist on any other +(time.strftime("%Y%m%d")), so building the sdist on any other day would produce a version that mismatches this recipe's pin (and forge's wheel bookkeeping). Pin the date segment to the sdist's own release date. @@ -11,7 +11,7 @@ wheel bookkeeping). Pin the date segment to the sdist's own release date. if version_major and version_minor: - ncnn_version = time.strftime("%Y%m%d", time.localtime()) + # mobile-forge: pinned to the sdist release date -+ ncnn_version = "20260526" ++ ncnn_version = "20261020" return version_major[0] + "." + version_minor[0] + "." + ncnn_version raise RuntimeError("Unable to find version string.") diff --git a/recipes/ncnn/patches/skip-upstream-ios-cross.patch b/recipes/ncnn/patches/skip-upstream-ios-cross.patch new file mode 100644 index 00000000..8a58bcb6 --- /dev/null +++ b/recipes/ncnn/patches/skip-upstream-ios-cross.patch @@ -0,0 +1,22 @@ +Skip setup.py's own iOS cross-compile block when EXTRA_CMAKE_ARGS is set. + +20261020 added a cibuildwheel-oriented iOS block that swaps the compilers for +raw `xcrun clang++` and re-derives the SDK, deployment target and Python paths. +forge's compiler wrappers carry the simulator `-target`; raw clang++ does not, +so the simulator slice compiles for iOS-simulator but links as iOS: +"ld: building for 'iOS', but linking in object file ... built for +'iOS-simulator'". The recipe already passes every setting that block sets +through EXTRA_CMAKE_ARGS, so let the recipe's own args stand alone. + +--- a/setup.py ++++ b/setup.py +@@ -118,7 +118,8 @@ + sysconfig.get_config_var("LDLIBRARY"), + )), + ] +- elif sys.platform == "ios": ++ elif sys.platform == "ios" and not os.environ.get("EXTRA_CMAKE_ARGS"): ++ # mobile-forge: skipped when the caller passes its own cross args + # use the selected target python framework and native xcode compilers + # cross-venv compiler wrappers may otherwise select the host macos sdk + arch, sdk = sys.implementation._multiarch.rsplit("-", 1) diff --git a/recipes/pillow/meta.yaml b/recipes/pillow/meta.yaml index 073b0fe8..0e3a203a 100644 --- a/recipes/pillow/meta.yaml +++ b/recipes/pillow/meta.yaml @@ -1,6 +1,6 @@ package: name: Pillow - version: "12.3.0" + version: "13.0.0" requirements: # PNG support is internal: libpng is not used. @@ -26,8 +26,15 @@ requirements: - flet-libtiff 4.7.0 # {% endif %} -# {% if not version or version >= (12,0,0) %} -# pillow >= 12.x (12.x drops `self.add_imaging_libs = ""` from +# {% if not version or version >= (13,0,0) %} +# pillow >= 13.x (13.0 reworks the sys.prefix lib/include lookup, so the +# 12.x patch's second hunk no longer applies; otherwise identical.) + +patches: + - setup-13.x.patch + +# {% elif version >= (12,0,0) %} +# pillow 12.x (12.x drops `self.add_imaging_libs = ""` from # initialize_options, so the 11.x patch's hunk-1 context no longer # matches; the 12.x patch is otherwise identical to the 11.x one.) diff --git a/recipes/pillow/patches/setup-13.x.patch b/recipes/pillow/patches/setup-13.x.patch new file mode 100644 index 00000000..0971d735 --- /dev/null +++ b/recipes/pillow/patches/setup-13.x.patch @@ -0,0 +1,107 @@ +Cross-compile Pillow 13 for iOS and Android under mobile-forge. + +Same four changes as setup-12.x.patch. Only the sys.prefix hunk is re-cut: +13.0 picks LIBDIR/INCLUDEDIR from sysconfig there, so the 12.x context no +longer matches. + + * force disable_platform_guessing, and disable brotli (no host dep supplies it) + * skip sys.prefix lib/include dirs, which point at the build host + * drop exact host system dirs that leak in from the build Python's sysconfig + * on iOS, link only z + bz2 transitively for _imagingft + +diff --git a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -371,13 +371,19 @@ + return True if value in configuration.get(option, []) else None + + def initialize_options(self) -> None: +- self.disable_platform_guessing = self.check_configuration( +- "platform-guessing", "disable" +- ) ++ self.disable_platform_guessing = True + build_ext.initialize_options(self) + for x in self.feature: + setattr(self, f"disable_{x}", self.check_configuration(x, "disable")) + setattr(self, f"enable_{x}", self.check_configuration(x, "enable")) ++ # Mobile-forge: force-disable optional features whose libraries ++ # mobile-forge does NOT supply via host deps. Pillow 12 added ++ # brotli to the link line whenever the headers can be reached; ++ # on iOS the cross site-packages happens to expose them, so the ++ # build pulls in `-lbrotlicommon -lbrotlidec` but no matching ++ # static archive exists in the link search path, breaking the ++ # _imaging.so link with `ld: library 'brotlicommon' not found`. ++ self.disable_brotli = True + for x in ("raqm", "fribidi"): + setattr(self, f"vendor_{x}", self.check_configuration(x, "vendor")) + if self.check_configuration("debug", "true"): +@@ -572,16 +578,18 @@ + for d in os.environ[k].split(os.path.pathsep): + _add_directory(library_dirs, d) + +- _add_directory( +- library_dirs, +- (sys.prefix == sys.base_prefix and sysconfig.get_config_var("LIBDIR")) +- or os.path.join(sys.prefix, "lib"), +- ) +- _add_directory( +- include_dirs, +- (sys.prefix == sys.base_prefix and sysconfig.get_config_var("INCLUDEDIR")) +- or os.path.join(sys.prefix, "include"), +- ) ++ # Skip sys.prefix paths when cross-compiling to avoid host headers ++ if not self.disable_platform_guessing: ++ _add_directory( ++ library_dirs, ++ (sys.prefix == sys.base_prefix and sysconfig.get_config_var("LIBDIR")) ++ or os.path.join(sys.prefix, "lib"), ++ ) ++ _add_directory( ++ include_dirs, ++ (sys.prefix == sys.base_prefix and sysconfig.get_config_var("INCLUDEDIR")) ++ or os.path.join(sys.prefix, "include"), ++ ) + + # + # add platform directories +@@ -723,6 +731,31 @@ + self.compiler.library_dirs = library_dirs + self.compiler.library_dirs + self.compiler.include_dirs = include_dirs + self.compiler.include_dirs + ++ # ++ # When cross-compiling, drop the host's Linux system include/lib ++ # paths that leak in from the build Python's sysconfig (e.g. a ++ # system-installed CPython contributing /usr/include). ++ # ++ # Match exact paths only — NOT `d.startswith("/usr/")` — because ++ # pillow's `_add_directory` calls `os.path.realpath()`, so a ++ # CPATH entry pointing inside the Android NDK resolves through ++ # whatever symlink chain the runner uses. On GitHub Actions ++ # `$ANDROID_HOME=/usr/local/lib/android/sdk`, so the NDK ++ # sysroot include path realpaths to ++ # `/usr/local/lib/android/sdk/ndk//.../sysroot/usr/include` ++ # — `startswith("/usr/")` matches that and the prefix-based ++ # filter ends up stripping the very headers CPATH was set to ++ # surface for zlib detection. ++ if self.disable_platform_guessing: ++ _host_leaks = frozenset({ ++ "/usr/include", "/usr/local/include", ++ "/usr/lib", "/usr/local/lib", ++ # Debian/Ubuntu multi-arch: ++ "/usr/include/x86_64-linux-gnu", ++ "/usr/lib/x86_64-linux-gnu", ++ }) ++ self.compiler.include_dirs = [d for d in self.compiler.include_dirs if d not in _host_leaks] ++ self.compiler.library_dirs = [d for d in self.compiler.library_dirs if d not in _host_leaks] + # + # look for available libraries + +@@ -972,7 +1005,7 @@ + + if sys.platform == "ios": + # Ensure transitive dependencies are linked. +- libs.extend(["z", "bz2", "brotlicommon", "brotlidec", "png"]) ++ libs.extend(["z", "bz2"]) + + self._update_extension("PIL._imagingft", libs, defs, srcs) + diff --git a/recipes/pydantic-core/meta.yaml b/recipes/pydantic-core/meta.yaml index a83765b3..671102a2 100644 --- a/recipes/pydantic-core/meta.yaml +++ b/recipes/pydantic-core/meta.yaml @@ -1,8 +1,8 @@ package: name: pydantic-core - version: "2.47.0" + version: "2.50.4" build: - number: 10 + number: 1 script_env: _PYTHON_SYSCONFIGDATA_NAME: '{sysconfigdata_name}' \ No newline at end of file diff --git a/recipes/pyzmq/meta.yaml b/recipes/pyzmq/meta.yaml index 9a371f52..d47288e6 100644 --- a/recipes/pyzmq/meta.yaml +++ b/recipes/pyzmq/meta.yaml @@ -1,6 +1,6 @@ package: name: pyzmq - version: "27.1.0" + version: "27.3.0" requirements: build: diff --git a/recipes/xxhash/meta.yaml b/recipes/xxhash/meta.yaml index 8d1d09c2..17b66aa2 100644 --- a/recipes/xxhash/meta.yaml +++ b/recipes/xxhash/meta.yaml @@ -1,6 +1,6 @@ package: name: xxhash - version: "3.8.0" + version: "4.1.0" build: number: 1