diff --git a/FUNDING.yml b/FUNDING.yml deleted file mode 100644 index 7a62ac3..0000000 --- a/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -# Read by Forgejo for the repository's Donate button. -custom: 'https://catcrafts.net/shop/donation' diff --git a/LICENSE b/LICENSE deleted file mode 100644 index f288702..0000000 --- a/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/README.md b/README.md index e04fbc5..9380819 100644 --- a/README.md +++ b/README.md @@ -38,15 +38,3 @@ NV back and reports the result. The bootloader never writes `boot`. Default login: `user` / `147147` (same as official Nura images). **Never re-lock the bootloader** with a custom image installed. - -## License - -GPL-3.0-only - see [LICENSE](LICENSE). That covers our own code; patches and packaging carried from other projects keep the license named in their files. - -## Funding - -https://catcrafts.net/shop/donation - see [FUNDING](FUNDING.yml) - -## Copyright - -Copyright (C) 2026 Catcrafts® [catcrafts.net](https://catcrafts.net/) diff --git a/aports/device/catcrafts-fp6-repo/APKBUILD b/aports/device/catcrafts-fp6-repo/APKBUILD index cb4d1bb..b28d9f5 100644 --- a/aports/device/catcrafts-fp6-repo/APKBUILD +++ b/aports/device/catcrafts-fp6-repo/APKBUILD @@ -10,7 +10,7 @@ pkgrel=0 pkgdesc="Catcrafts FP6 apk repository (signing key + repositories entry)" url="https://forgejo.catcrafts.net/Catcrafts/-/packages" arch="noarch" -license="GPL-3.0-only" +license="MIT" options="!check" install="$pkgname.post-install $pkgname.post-upgrade" _keyname="catcrafts@f79ff8fc14285f7824dd6a8c36ac814751da19ab7ed47c516f089a311ab7fe57.rsa.pub" diff --git a/aports/device/fp6-charging-mode/APKBUILD b/aports/device/fp6-charging-mode/APKBUILD index d4a40b6..5d97b0d 100644 --- a/aports/device/fp6-charging-mode/APKBUILD +++ b/aports/device/fp6-charging-mode/APKBUILD @@ -31,7 +31,7 @@ pkgrel=0 pkgdesc="Fairphone 6 offline charging mode (charger-boot detection + minimal charging target)" url="https://forgejo.catcrafts.net/Catcrafts/fp6-img" arch="noarch" -license="GPL-3.0-only" +license="MIT" options="!check" source=" charging-mode-generator diff --git a/aports/device/fp6-device-tweaks/APKBUILD b/aports/device/fp6-device-tweaks/APKBUILD index 1f0ca0a..4e288b0 100644 --- a/aports/device/fp6-device-tweaks/APKBUILD +++ b/aports/device/fp6-device-tweaks/APKBUILD @@ -19,12 +19,12 @@ # retried it every 30 s forever (its StartLimit never trips) maintainer="Jorijn van der Graaf " pkgname=fp6-device-tweaks -pkgver=6 -pkgrel=0 +pkgver=5 +pkgrel=1 pkgdesc="Fairphone 6 device-critical system configuration" url="https://forgejo.catcrafts.net/Catcrafts/fp6-img" arch="noarch" -license="GPL-3.0-only" +license="MIT" # apk-native ban: with this meta installed, the resolver routes Plasma # Mobile's audio through real PulseAudio, which claims the card and runs # wireplumber in a video-only profile - no sinks, ever @@ -36,7 +36,6 @@ source=" iio-sensor-proxy-restart.conf modem-gnss-nmea-optional.conf 91-fp6-no-ssc-sensors.rules - modemmanager-quick-suspend.conf " package() { @@ -54,8 +53,6 @@ package() { "$pkgdir"/etc/systemd/system/modem-gnss.service.d/10-nmea-types-optional.conf install -Dm644 "$srcdir"/91-fp6-no-ssc-sensors.rules \ "$pkgdir"/etc/udev/rules.d/91-fp6-no-ssc-sensors.rules - install -Dm644 "$srcdir"/modemmanager-quick-suspend.conf \ - "$pkgdir"/etc/systemd/system/ModemManager.service.d/50-quick-suspend.conf } sha512sums=" @@ -64,5 +61,4 @@ cc13f6abc4538fef976c59893992dd2c193cd0eac5da37a9fb01ba421b3ba8ff303aa438ec2fe4d1 f74c6c5d0ba3015cf123808452e9677c1d087e9540ea7037c30316e48a5c5bbdafe712ff0b07f17969337b1576a34cdfef4319c464ffe38c092a67d313129b57 iio-sensor-proxy-restart.conf 8fec832be59ca616d3e6a4c0a5ef8067d25f767c79155d8b0ef5761b8d21532932235a3236807305937029efe6255a16696d05523e3e654e2dc2212a281fe12c modem-gnss-nmea-optional.conf 1c5fd4a5a2a2c19165dca1381c8c6550fb61c6311561be450c9c6f88046d7649e4c7c6f4a86b163a2ecc1ef5ec93cc1dac1e2aded933a6b3d6d68292a1b609d0 91-fp6-no-ssc-sensors.rules -3e75ac137e76d556279866d8e34080f9724c3d02e58e9d4f55458b59047fcc62b9eff3d7c8a54faff13e6583d76ca5b5f62f362fc4f874b6c748211d1e9d26a5 modemmanager-quick-suspend.conf " diff --git a/aports/device/fp6-device-tweaks/modemmanager-quick-suspend.conf b/aports/device/fp6-device-tweaks/modemmanager-quick-suspend.conf deleted file mode 100644 index 5b1d423..0000000 --- a/aports/device/fp6-device-tweaks/modemmanager-quick-suspend.conf +++ /dev/null @@ -1,11 +0,0 @@ -# ModemManager's quick suspend/resume mode (fp6 repo journal/power/, 2026-10-14): -# on logind's PrepareForSleep the modem is set "terse" (the NAS signal-info, -# system-info and DSD system-status subscriptions are dropped, calls and -# texts still reach us) and on resume its state is synchronised. Without it -# the modem's indications end a deep suspend cycle every few seconds; with -# it a cycle runs to its wake alarm while the modem stays registered. The -# option still carries MM's --test- prefix; it is the only switch for the -# daemon's built-in terse mode. -[Service] -ExecStart= -ExecStart=/usr/sbin/ModemManager --test-quick-suspend-resume diff --git a/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest b/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest deleted file mode 100644 index c580ba3..0000000 --- a/aports/device/fp6-vendor-blobs/30-ath11k-board-data.manifest +++ /dev/null @@ -1,17 +0,0 @@ -# WCN6750 WLAN board data (calibration, Qualcomm/Fairphone) - taken from the -# stock modem partition on-device instead of being shipped (fp6 repo -# journal/base/ 2026-10-14, journal/blobs/). The device tree asks ath11k for -# the Fairphone_Gen_6 entry; upstream linux-firmware's board-2.bin has none, -# the driver silently falls back to generic data, and the FP6 Plus does not -# associate on that (user report 2026-10-14; the FP6 happens to work either -# way). The container built here is upstream's file with every entry kept -# plus the device's own bdwlan.elf under the requested name; it lives in -# /lib/firmware/updates, which the loader searches first. Active slot first, -# the other slot as fallback; no hash pin - calibration data is OEM data and -# the WLAN firmware verifies what it is given. -ath11k-bdf modem_a,modem_b image/qca6750/bdwlan.elf bus=ahb,qmi-chip-id=1,qmi-board-id=255,variant=Fairphone_Gen_6 /usr/lib/firmware/ath11k/WCN6750/hw1.0/board-2.bin.zst /usr/lib/firmware/updates/ath11k/WCN6750/hw1.0/board-2.bin -# Fallback for a driver that probed before extraction (the service runs -# pre-coldplug, so this normally no-ops): re-probing ath11k restarts the -# WPSS remoteproc and the firmware reads the new container; the association -# comes back through NetworkManager. -rebind platform 17110040.wifi diff --git a/aports/device/fp6-vendor-blobs/APKBUILD b/aports/device/fp6-vendor-blobs/APKBUILD index d6a2fcf..a03b09b 100644 --- a/aports/device/fp6-vendor-blobs/APKBUILD +++ b/aports/device/fp6-vendor-blobs/APKBUILD @@ -21,20 +21,19 @@ maintainer="Jorijn van der Graaf " pkgname=fp6-vendor-blobs pkgver=1 -pkgrel=4 +pkgrel=3 pkgdesc="On-device extraction of vendor blobs from the stock Android partitions" url="https://forgejo.catcrafts.net/Catcrafts/fp6-img" arch="noarch" -license="GPL-3.0-only" +license="MIT" # fallback mapper for when the initramfs didn't map the dynamic partitions -depends="make-dynpart-mappings zstd" +depends="make-dynpart-mappings" install="$pkgname.post-upgrade" options="!check" source=" fp6-vendor-blobs-extract fp6-vendor-blobs.service fp6-vendor-blobs.preset - 30-ath11k-board-data.manifest " package() { @@ -59,13 +58,11 @@ package() { # extracted, no sound card. See journal/blobs/ 2026-08-28. install -Dm644 "$srcdir"/fp6-vendor-blobs.preset \ "$pkgdir"/usr/lib/systemd/system-preset/50-fp6-vendor-blobs.preset - install -Dm644 "$srcdir"/30-ath11k-board-data.manifest \ - "$pkgdir"/usr/share/fp6-vendor-blobs/manifest.d/30-ath11k-board-data.manifest + mkdir -p "$pkgdir"/usr/share/fp6-vendor-blobs/manifest.d } sha512sums=" -2aa740a2c4999d7e09c328664fe9c03e8a4ac8ddf1215b2d2b2755b12383dce873b9eafbce4706e87405cf2b0aa2e29ed582f31d9ee085346f911c11269c1f22 fp6-vendor-blobs-extract +e9618b4a1ccbe0913a608b32a1a9e87337e3da79a3d7ccc7f49292ae9aaa9406d2ea9817d63b3cfff2c4346b80dd2476c10725f4f0f95c859acd17b22ec03a16 fp6-vendor-blobs-extract b4c290095d9f39515378dfef08de720ce49324210342aa13c131dfce1103785e796e6f821f0c659671a4c44b46f466ce0e03f11f216fdcdee2a99db5e7970800 fp6-vendor-blobs.service 9e79dd0aed13f11a71282aa24b2a26331e85c105e25ab0c0fed6189b8c300769a5f4308b18b91d9855868d658ad3a57c03e26c9b11bd27fd5e03f9a5decbbd6a fp6-vendor-blobs.preset -1265a0f78aa4d9566e4a9f7827c8cead3a1848dc8bbd4288165085e87a824ea0c0940a16e5426f74074fcb29c1fddccf76f6dd3b16efa7ddffc2c437b9531439 30-ath11k-board-data.manifest " diff --git a/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract b/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract index 29bb766..7f5b940 100644 --- a/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract +++ b/aports/device/fp6-vendor-blobs/fp6-vendor-blobs-extract @@ -11,7 +11,6 @@ # # file # mbn -# ath11k-bdf # rebind # # Partition lists are tried in the order written, except that on an A/B @@ -48,21 +47,6 @@ # itself and refuses a damaged or foreign image (one flipped byte -> # ERROR_ELF_SIGNATURE_ERROR, measured 2026-09-03). The sha256 of what was # installed is logged either way. -# ath11k-bdf: the WLAN board data (calibration) the device tree asks ath11k -# for by name, e.g. bus=ahb,qmi-chip-id=1,qmi-board-id=255,variant=Fairphone_Gen_6. -# Upstream linux-firmware's board-2.bin carries no Fairphone entry, so the -# driver silently falls back to the generic board-id data; the FP6 Plus does -# not associate on it (user report 2026-10-14, fp6 repo journal/base/). The -# stock modem partition has the device's own file (image/qca6750/bdwlan.elf). -# This directive copies it and wraps it into a container at (the -# loader searches /lib/firmware/updates first): (board-2.bin or -# board-2.bin.zst, every upstream entry kept byte for byte) + one BOARD -# entry named holding the ELF. Verified structurally (ELF -# magic, sane size, the container's own magic), never by a pinned hash: -# calibration data is OEM data and the WLAN firmware checks it itself. -# When already carries (upstream caught up) nothing is -# built and a stale is removed so the base is used again. -# --refresh re-derives the dest like mbn (a new base after an upgrade). # rebind: if this fragment's run extracted at least one file, unbind and # re-probe on so the consuming driver picks the file up # in the same boot. Unconditional on purpose: a still-bound consumer may @@ -273,62 +257,6 @@ extract_mbn() { # fail "no listed partition ($parts) yields $rname with sha256 $want - $dest NOT installed$kept" } -# One little-endian u32 as four raw bytes (busybox printf, octal escapes). -le32() { # - printf "\\$(printf %03o $(($1 & 255)))\\$(printf %03o $((($1 >> 8) & 255)))\\$(printf %03o $((($1 >> 16) & 255)))\\$(printf %03o $((($1 >> 24) & 255)))" -} -pad4() { # -> bytes of zero padding to the next multiple of 4, on stdout - n=$(( (4 - $1 % 4) % 4 )) - [ "$n" -gt 0 ] && head -c "$n" /dev/zero - return 0 -} -extract_ath11k_bdf() { # - parts=$1 bsrc=$2 bname=$3 bbase=$4 bdest=$5 - [ -f "$bbase" ] || fail "ath11k-bdf: base container $bbase missing" - braw="$bdest.fp6-base.$$" - mkdir -p "${bdest%/*}" || fail "cannot create ${bdest%/*}" - case "$bbase" in - *.zst) zstd -dcq "$bbase" > "$braw" 2>/dev/null || { rm -f "$braw"; fail "ath11k-bdf: cannot decompress $bbase"; } ;; - *) cp "$bbase" "$braw" || { rm -f "$braw"; fail "ath11k-bdf: cannot read $bbase"; } ;; - esac - [ "$(head -c 16 "$braw")" = "QCA-ATH11K-BOARD" ] || { rm -f "$braw"; fail "ath11k-bdf: $bbase is not a QCA-ATH11K-BOARD container"; } - if grep -a -q -F "$bname" "$braw"; then - rm -f "$braw" - log "ath11k-bdf: $bbase already carries $bname - no override needed" - [ -e "$bdest" ] && { rm -f "$bdest"; log "removed the redundant $bdest"; } - return 0 - fi - for part in $(order_parts "$parts"); do - mount_part "$part" || { log "$part: not mountable, trying next"; continue; } - elf="$MNT/$bsrc" - [ -f "$elf" ] || { log "$part: no $bsrc, trying next"; continue; } - esz=$(fsize "$elf") - [ "$(hex4 "$elf")" = 7f454c46 ] || { log "$part:$bsrc: not an ELF image, trying next"; continue; } - [ "$esz" -ge 4096 ] && [ "$esz" -le $((1024 * 1024)) ] || { log "$part:$bsrc: $esz bytes is not a board data file, trying next"; continue; } - nlen=${#bname} - npad=$(( (nlen + 3) / 4 * 4 )) - dpad=$(( (esz + 3) / 4 * 4 )) - tmp="$bdest.fp6-extract.$$" - # container = base + BOARD IE { NAME IE, DATA IE }, each IE padded to 4 - { - cat "$braw" - le32 0; le32 $((8 + npad + 8 + dpad)) - le32 0; le32 "$nlen"; printf '%s' "$bname"; pad4 "$nlen" - le32 1; le32 "$esz"; cat "$elf"; pad4 "$esz" - } > "$tmp" 2>/dev/null || { rm -f "$tmp"; fail "ath11k-bdf: writing $tmp failed"; } - want=$(( $(fsize "$braw") + 8 + 8 + npad + 8 + dpad )) - [ "$(fsize "$tmp")" -eq "$want" ] || { rm -f "$tmp" "$braw"; fail "ath11k-bdf: $tmp is $(fsize "$tmp") bytes, expected $want"; } - got=$(sha256sum "$tmp" | awk '{print $1}') - chmod 644 "$tmp" && mv "$tmp" "$bdest" || { rm -f "$tmp" "$braw"; fail "installing $bdest failed"; } - rm -f "$braw" - log "built $bdest = $bbase + $bname from $part:$bsrc ($esz bytes, sha256 $got)" - return 0 - done - rm -f "$braw" - kept= - [ -e "$bdest" ] && kept=" (the existing file is left in place)" - fail "no listed partition ($parts) yields a well-formed $bsrc - $bdest NOT installed$kept" -} extract() { # parts=$1 src=$2 dest=$3 want=$4 for part in $(order_parts "$parts"); do @@ -392,7 +320,6 @@ for f in "$MANIFEST_DIR"/*.manifest; do case "$kind" in file) [ -e "$c" ] || missing=1 ;; mbn) [ -e "$d" ] && [ -z "$REFRESH" ] || missing=1 ;; - ath11k-bdf) [ -e "$e" ] && [ -z "$REFRESH" ] || missing=1 ;; esac done < "$f" done @@ -418,12 +345,6 @@ for f in "$MANIFEST_DIR"/*.manifest; do extract_mbn "$a" "$b" "$c" "$d" "$e" -Date: Wed, 14 Oct 2026 18:18:45 +0200 -Subject: [PATCH] bearer: quiet the WDS event reports in terse, re-arm them on - resume - -The terse operation that runs before a suspend stops the 3GPP registration -and signal indications, but every connected QMI bearer keeps its WDS event -report subscription (data bearer technology, data systems, ...). Each of -those reports wakes a suspended host: on a Fairphone 6 on LTE with 5G NSA -the bearer technology changes every few seconds while the host is idle, -and the report ended a deep suspend cycle within seconds. - -Add a terse step for the bearers: MMBaseBearer gets an optional terse() -vfunc, the QMI bearer implements it by dropping the event report of its -IPv4/IPv6 WDS clients, and the quick-resume synchronization (the bearer's -reload_connection_status) re-arms them. ---- - src/mm-base-bearer.c | 50 +++++++++++++++++++ - src/mm-base-bearer.h | 18 +++++++ - src/mm-bearer-qmi.c | 101 +++++++++++++++++++++++++++++++++++++++ - src/mm-broadband-modem.c | 49 +++++++++++++++++++ - 4 files changed, 218 insertions(+) - -diff --git a/src/mm-base-bearer.c b/src/mm-base-bearer.c -index f9b86884..e89843e5 100644 ---- a/src/mm-base-bearer.c -+++ b/src/mm-base-bearer.c -@@ -1713,6 +1713,56 @@ mm_base_bearer_sync (MMBaseBearer *self, - - #endif - -+/*****************************************************************************/ -+/* Terse (quiet the modem's unsolicited reports before a suspend) */ -+ -+#if defined WITH_SUSPEND_RESUME -+ -+gboolean -+mm_base_bearer_terse_finish (MMBaseBearer *self, -+ GAsyncResult *res, -+ GError **error) -+{ -+ return g_task_propagate_boolean (G_TASK (res), error); -+} -+ -+static void -+terse_ready (MMBaseBearer *self, -+ GAsyncResult *res, -+ GTask *task) -+{ -+ GError *error = NULL; -+ -+ if (!MM_BASE_BEARER_GET_CLASS (self)->terse_finish (self, res, &error)) -+ g_task_return_error (task, error); -+ else -+ g_task_return_boolean (task, TRUE); -+ g_object_unref (task); -+} -+ -+void -+mm_base_bearer_terse (MMBaseBearer *self, -+ GAsyncReadyCallback callback, -+ gpointer user_data) -+{ -+ GTask *task; -+ -+ task = g_task_new (self, NULL, callback, user_data); -+ -+ /* Nothing to quiet unless the bearer is connected and its class knows how */ -+ if (self->priv->status != MM_BEARER_STATUS_CONNECTED || -+ !MM_BASE_BEARER_GET_CLASS (self)->terse || -+ !MM_BASE_BEARER_GET_CLASS (self)->terse_finish) { -+ g_task_return_boolean (task, TRUE); -+ g_object_unref (task); -+ return; -+ } -+ -+ MM_BASE_BEARER_GET_CLASS (self)->terse (self, (GAsyncReadyCallback)terse_ready, task); -+} -+ -+#endif -+ - /*****************************************************************************/ - - static gchar * -diff --git a/src/mm-base-bearer.h b/src/mm-base-bearer.h -index 336b4442..12ef3cf7 100644 ---- a/src/mm-base-bearer.h -+++ b/src/mm-base-bearer.h -@@ -151,6 +151,16 @@ struct _MMBaseBearerClass { - - #if defined WITH_SUSPEND_RESUME - -+ /* Terse: stop the unsolicited reports this bearer asked the modem for, -+ * so that they do not wake a suspended host; the quick-resume sync -+ * re-arms them. Optional. */ -+ void (* terse) (MMBaseBearer *bearer, -+ GAsyncReadyCallback callback, -+ gpointer user_data); -+ gboolean (* terse_finish) (MMBaseBearer *bearer, -+ GAsyncResult *res, -+ GError **error); -+ - /* Reload connection status: - * - * This method should return the exact connection status of the bearer, and -@@ -236,6 +246,14 @@ gboolean mm_base_bearer_sync_finish (MMBaseBearer *self, - GAsyncResult *res, - GError **error); - -+/* Terse Broadband Bearer (async): quiet the modem's reports before a suspend */ -+void mm_base_bearer_terse (MMBaseBearer *self, -+ GAsyncReadyCallback callback, -+ gpointer user_data); -+gboolean mm_base_bearer_terse_finish (MMBaseBearer *self, -+ GAsyncResult *res, -+ GError **error); -+ - #endif - - #endif /* MM_BASE_BEARER_H */ -diff --git a/src/mm-bearer-qmi.c b/src/mm-bearer-qmi.c -index 64d983eb..d637b993 100644 ---- a/src/mm-bearer-qmi.c -+++ b/src/mm-bearer-qmi.c -@@ -61,6 +61,9 @@ struct _MMBearerQmiPrivate { - guint packet_service_status_ipv6_indication_id; - guint event_report_ipv6_indication_id; - guint extended_ipv6_config_change_id; -+#if defined WITH_SUSPEND_RESUME -+ gboolean terse; -+#endif - - MMPort *data; - MMPort *link; -@@ -71,6 +74,10 @@ struct _MMBearerQmiPrivate { - GList *pco_list; - }; - -+#if defined WITH_SUSPEND_RESUME -+static void terse_rearm (MMBearerQmi *self); -+#endif -+ - /*****************************************************************************/ - /* Stats */ - -@@ -377,6 +384,11 @@ reload_connection_status (MMBaseBearer *self, - GTask *task; - ConnectionStatusContext *ctx; - -+#if defined WITH_SUSPEND_RESUME -+ /* The quick-resume sync lands here: give the modem its reports back */ -+ terse_rearm (MM_BEARER_QMI (self)); -+#endif -+ - ctx = g_new (ConnectionStatusContext, 1); - ctx->step = CONNECTION_STATUS_CONTEXT_STEP_FIRST; - -@@ -1565,6 +1577,93 @@ cleanup_event_report_unsolicited_events (MMBearerQmi *self, - qmi_message_wds_set_event_report_input_unref (input); - } - -+#if defined WITH_SUSPEND_RESUME -+ -+/*****************************************************************************/ -+/* Terse: the WDS event reports (data bearer technology, data systems, ...) -+ * are the modem's way of telling us about every bearer change, and each one -+ * wakes a suspended host. Drop them before the sleep; the quick-resume -+ * synchronization re-arms them. */ -+ -+static gboolean -+terse_finish (MMBaseBearer *self, -+ GAsyncResult *res, -+ GError **error) -+{ -+ return g_task_propagate_boolean (G_TASK (res), error); -+} -+ -+static void -+terse (MMBaseBearer *_self, -+ GAsyncReadyCallback callback, -+ gpointer user_data) -+{ -+ MMBearerQmi *self = MM_BEARER_QMI (_self); -+ GTask *task; -+ -+ task = g_task_new (self, NULL, callback, user_data); -+ -+ if (self->priv->client_ipv4 && self->priv->event_report_ipv4_indication_id) { -+ cleanup_event_report_unsolicited_events (self, self->priv->client_ipv4, -+ &self->priv->event_report_ipv4_indication_id); -+ self->priv->terse = TRUE; -+ } -+ if (self->priv->client_ipv6 && self->priv->event_report_ipv6_indication_id) { -+ cleanup_event_report_unsolicited_events (self, self->priv->client_ipv6, -+ &self->priv->event_report_ipv6_indication_id); -+ self->priv->terse = TRUE; -+ } -+ if (self->priv->terse) -+ mm_obj_msg (self, "terse: WDS event reports disabled"); -+ -+ g_task_return_boolean (task, TRUE); -+ g_object_unref (task); -+} -+ -+static void -+terse_rearm_ready (QmiClientWds *client, -+ GAsyncResult *res, -+ MMBearerQmi *self) -+{ -+ GError *error = NULL; -+ guint id; -+ -+ id = connect_enable_indications_ready (client, res, self, &error); -+ if (!id) { -+ mm_obj_warn (self, "couldn't re-enable WDS event reports after resume: %s", -+ error ? error->message : "unknown error"); -+ g_clear_error (&error); -+ } else if (client == self->priv->client_ipv4) { -+ self->priv->event_report_ipv4_indication_id = id; -+ } else if (client == self->priv->client_ipv6) { -+ self->priv->event_report_ipv6_indication_id = id; -+ } else { -+ /* the bearer was disconnected meanwhile: the client is gone */ -+ g_signal_handler_disconnect (client, id); -+ } -+ g_object_unref (self); -+} -+ -+static void -+terse_rearm (MMBearerQmi *self) -+{ -+ if (!self->priv->terse) -+ return; -+ self->priv->terse = FALSE; -+ -+ if (self->priv->client_ipv4 && !self->priv->event_report_ipv4_indication_id) -+ setup_event_report_unsolicited_events (self, self->priv->client_ipv4, NULL, -+ (GAsyncReadyCallback)terse_rearm_ready, -+ g_object_ref (self)); -+ if (self->priv->client_ipv6 && !self->priv->event_report_ipv6_indication_id) -+ setup_event_report_unsolicited_events (self, self->priv->client_ipv6, NULL, -+ (GAsyncReadyCallback)terse_rearm_ready, -+ g_object_ref (self)); -+ mm_obj_msg (self, "terse: WDS event reports re-enabled"); -+} -+ -+#endif -+ - static void - set_ip_family_ready (QmiClientWds *client, - GAsyncResult *res, -@@ -3015,5 +3114,7 @@ mm_bearer_qmi_class_init (MMBearerQmiClass *klass) - #if defined WITH_SUSPEND_RESUME - base_bearer_class->reload_connection_status = reload_connection_status; - base_bearer_class->reload_connection_status_finish = reload_connection_status_finish; -+ base_bearer_class->terse = terse; -+ base_bearer_class->terse_finish = terse_finish; - #endif - } -diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c -index 9364a20b..e65e4260 100644 ---- a/src/mm-broadband-modem.c -+++ b/src/mm-broadband-modem.c -@@ -13193,11 +13193,13 @@ synchronize (MMBaseModem *self, - typedef enum { - TERSE_STEP_FIRST, - TERSE_STEP_DISABLE_UNSOLICITED_EVENTS_3GPP, -+ TERSE_STEP_BEARERS, - TERSE_STEP_LAST, - } TerseStep; - - typedef struct { - TerseStep step; -+ guint pending_bearers; - } TerseContext; - - static void terse_step (GTask *task); -@@ -13228,6 +13230,38 @@ iface_modem_3gpp_terse_ready (MMIfaceModem3gpp *self, - terse_step (task); - } - -+static void -+bearer_terse_ready (MMBaseBearer *bearer, -+ GAsyncResult *res, -+ GTask *task) -+{ -+ MMBroadbandModem *self; -+ TerseContext *ctx; -+ g_autoptr(GError) error = NULL; -+ -+ self = g_task_get_source_object (task); -+ ctx = g_task_get_task_data (task); -+ -+ if (!mm_base_bearer_terse_finish (bearer, res, &error)) -+ mm_obj_warn (self, "bearer terse failed: %s", error->message); -+ -+ if (--ctx->pending_bearers == 0) { -+ ctx->step++; -+ terse_step (task); -+ } -+} -+ -+static void -+bearer_terse_start (MMBaseBearer *bearer, -+ GTask *task) -+{ -+ TerseContext *ctx; -+ -+ ctx = g_task_get_task_data (task); -+ ctx->pending_bearers++; -+ mm_base_bearer_terse (bearer, (GAsyncReadyCallback)bearer_terse_ready, task); -+} -+ - static void - terse_step (GTask *task) - { -@@ -13253,6 +13287,21 @@ terse_step (GTask *task) - ctx->step++; - /* fall through */ - -+ case TERSE_STEP_BEARERS: { -+ g_autoptr(MMBearerList) list = NULL; -+ -+ g_object_get (self, MM_IFACE_MODEM_BEARER_LIST, &list, NULL); -+ if (list) { -+ mm_obj_msg (self, "terse state (%d/%d): bearers disable unsolicited events", -+ ctx->step, TERSE_STEP_LAST); -+ /* hold the count while iterating: a bearer finishing early must not step on */ -+ ctx->pending_bearers = 1; -+ mm_bearer_list_foreach (list, (MMBearerListForeachFunc)bearer_terse_start, task); -+ if (--ctx->pending_bearers > 0) -+ return; -+ } -+ ctx->step++; -+ } /* fall through */ - case TERSE_STEP_LAST: - mm_obj_msg (self, "setting terse state (%d/%d): all done", - ctx->step, TERSE_STEP_LAST); --- -2.55.0 - diff --git a/aports/temp/modemmanager/APKBUILD b/aports/temp/modemmanager/APKBUILD index e8ec425..d5ef067 100644 --- a/aports/temp/modemmanager/APKBUILD +++ b/aports/temp/modemmanager/APKBUILD @@ -8,7 +8,7 @@ maintainer="Achill Gilgenast " pkgname=modemmanager pkgver=1.25.95_git20261005 -pkgrel=102 +pkgrel=101 _commit=7f0bf17ab518cd78925cf7e53cc0d5c42f88b41a pkgdesc="ModemManager library" url="https://www.freedesktop.org/wiki/Software/ModemManager" @@ -73,7 +73,6 @@ source="ModemManager-$_commit.tar.gz 0001-intel-XMM7360-fix-big-endian-handling-of-ASN-integer.patch 0002-shared-qmi-unlock-AFW-gated-GNSS-engines-at-LOC-star.patch 0003-shared-qmi-derive-location-from-Position-Report-indi.patch - 0004-bearer-quiet-the-WDS-event-reports-in-terse-re-arm-t.patch " #builddir="$srcdir"/ModemManager-$pkgver builddir="$srcdir"/ModemManager-$_commit @@ -126,5 +125,4 @@ fd659330b2ec4e8368807053ec01498241dec153f6f2491bb17c42e2b81c8d9a98ff5f8c153874a6 6fab86c27502b29be0c6610d835a3249a4a81993eb986cff2c3ea9393fadd3f693ba4bb0532ae0e50a83d359559511859dd05f7ea2f0cb52839f535a7e49f8a0 modemmanager.rules 6e234cebcdec6d1afbca164ee5c13c96f7132ef31231d5c043cc5750ebe99e362a384d0463874b3c1c30799b433e0d3286add03af13c97fa406b4b5d2b78880c modemmanager.initd f06e9b89acab5b61c5965658d62551b0f168066384674f7c4dd56feb6f811c82c640470e634e32d8c4ef62290588cf974aa5f213e5c67e797a06d33e61fa24ec 0001-intel-XMM7360-fix-big-endian-handling-of-ASN-integer.patch -1085a27a7f5dd89c5e4851ae3ddb2d6d970abbb3e2c0c548b4254c2aa13d702bff2234d03fb8c73662050d43508374cb4feb22166298a8dd2a6480bb77579b6f 0004-bearer-quiet-the-WDS-event-reports-in-terse-re-arm-t.patch "