diff --git a/README.md b/README.md index e64b69d..b59b586 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -Introduction ------------- +# Introduction This is the README for **pv** ("Pipe Viewer"), a terminal-based tool for monitoring the progress of data through a pipeline. It can be inserted into @@ -8,8 +7,7 @@ quickly data is passing through, how long it has taken, how near to completion it is, and an estimate of how long it will be until completion. -Documentation -------------- +# Documentation A manual page is included in this distribution ("`man pv`"). Before installation, it is in "[docs/pv.1](./docs/pv.1.md)". @@ -19,8 +17,7 @@ Changes are listed in "[docs/NEWS.md](./docs/NEWS.md)". The to-do list is "[doc Developers and translators, please see "[docs/DEVELOPERS.md](./docs/DEVELOPERS.md)". -Compilation ------------ +# Compilation To compile the package, type "`sh ./configure`", which should generate a Makefile for your system. You may then type "`make`" to build everything, @@ -34,12 +31,25 @@ development tools. You can then run "`autoreconf -is`" to generate the "`configure`" script. -Author and acknowledgements ---------------------------- +# Copyright, bug reporting, and acknowledgements -This package is copyright 2023 Andrew Wood, and is being distributed under -the terms of the Artistic License 2.0. For more details of this license, -see the file "[docs/COPYING](./docs/COPYING)". +Copyright (C) 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood. + +License GPLv3+: GNU GPL version 3 or later . + +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, version +3, in "[docs/COPYING](./docs/COPYING)". If not, see +. Please report any bugs to **pv@ivarch.com**, or use the issue tracker linked from the **pv** home page. diff --git a/configure.ac b/configure.ac index 6b01d28..64810f6 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. dnl dnl Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood dnl -dnl Distributed under the Artistic License v2.0; see `docs/COPYING'. +dnl License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. AC_INIT([pv], [0.0.20230923-UNRELEASED], [pv@ivarch.com], [pv], [https://www.ivarch.com/programs/pv.shtml]) AC_CONFIG_SRCDIR([src/include/config.h.in]) diff --git a/docs/COPYING b/docs/COPYING index a1afc69..f288702 100644 --- a/docs/COPYING +++ b/docs/COPYING @@ -1,171 +1,674 @@ -This package is free software, and is being distributed under the terms -of the Artistic License 2.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. -Artistic License 2.0 + Preamble -Copyright (c) 2000-2006, The Perl Foundation. + The GNU General Public License is a free, copyleft license for +software and other kinds of works. -Everyone is permitted to copy and distribute verbatim copies of this -license document, but changing it is not allowed. Preamble + 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. -This license establishes the terms under which a given free software -Package may be copied, modified, distributed, and/or redistributed. The -intent is that the Copyright Holder maintains some artistic control -over the development of that Package while still keeping the Package -available as open source and free software. + 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. -You are always permitted to make arrangements wholly outside of this -license directly with the Copyright Holder of a given Package. If the -terms of this license do not permit the full use that you propose to -make of the Package, you should contact the Copyright Holder and seek -a different licensing arrangement. Definitions + 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. -"Copyright Holder" means the individual(s) or organization(s) named in -the copyright notice for the entire Package. + 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. -"Contributor" means any party that has contributed code or other material -to the Package, in accordance with the Copyright Holder's procedures. + 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. -"You" and "your" means any person who would like to copy, distribute, -or modify the Package. + 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. -"Package" means the collection of files distributed by the Copyright -Holder, and derivatives of that collection and/or of those files. A given -Package may consist of either the Standard Version, or a Modified Version. + 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. -"Distribute" means providing a copy of the Package or making it accessible -to anyone else, or in the case of a company or organization, to others -outside of your company or organization. + 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. -"Distributor Fee" means any fee that you charge for Distributing this -Package or providing support for this Package to another party. It does -not mean licensing fees. + The precise terms and conditions for copying, distribution and +modification follow. -"Standard Version" refers to the Package if it has not been modified, -or has been modified only in ways explicitly requested by the Copyright -Holder. + TERMS AND CONDITIONS -"Modified Version" means the Package, if it has been changed, and such -changes were not explicitly requested by the Copyright Holder. + 0. Definitions. -"Original License" means this Artistic License as Distributed with the -Standard Version of the Package, in its current version or as it may be -modified by The Perl Foundation in the future. + "This License" refers to version 3 of the GNU General Public License. -"Source" form means the source code, documentation source, and -configuration files for the Package. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. -"Compiled" form means the compiled bytecode, object code, binary, or any -other form resulting from mechanical transformation or translation of -the Source form. Permission for Use and Modification Without Distribution + "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. -(1) You are permitted to use the Standard Version and create and use -Modified Versions for any purpose without restriction, provided that you -do not Distribute the Modified Version. Permissions for Redistribution -of the Standard Version + 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. -(2) You may Distribute verbatim copies of the Source form of the Standard -Version of this Package in any medium without restriction, either gratis -or for a Distributor Fee, provided that you duplicate all of the original -copyright notices and associated disclaimers. At your discretion, such -verbatim copies may or may not include a Compiled form of the Package. + A "covered work" means either the unmodified Program or a work based +on the Program. -(3) You may apply any bug fixes, portability changes, and other -modifications made available from the Copyright Holder. The resulting -Package will still be considered the Standard Version, and as such will -be subject to the Original License. Distribution of Modified Versions -of the Package as Source + 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. -(4) You may Distribute your Modified Version as Source (either gratis -or for a Distributor Fee, and with or without a Compiled form of the -Modified Version) provided that you clearly document how it differs -from the Standard Version, including, but not limited to, documenting -any non-standard features, executables, or modules, and provided that -you do at least ONE of the following: + 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. -(a) make the Modified Version available to the Copyright Holder of the -Standard Version, under the Original License, so that the Copyright Holder -may include your modifications in the Standard Version. -(b) ensure that installation of your Modified Version does not prevent the -user installing or running the Standard Version. In addition, the Modified -Version must bear a name that is different from the name of the Standard -Version. -(c) allow anyone who receives a copy of the Modified Version to make -the Source form of the Modified Version available to others under -(i) the Original License or -(ii) a license that permits the licensee to freely copy, modify and -redistribute the Modified Version using the same licensing terms that apply -to the copy that the licensee received, and requires that the Source form of -the Modified Version, and of any works derived from it, be made freely -available in that license fees are prohibited but Distributor Fees are -allowed. Distribution of Compiled Forms of the Standard Version or Modified -Versions without the Source + 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. -(5) You may Distribute Compiled forms of the Standard Version without -the Source, provided that you include complete instructions on how to -get the Source of the Standard Version. Such instructions must be valid -at the time of your distribution. If these instructions, at any time -while you are carrying out such distribution, become invalid, you must -provide new instructions on demand or cease further distribution. If -you provide valid instructions or cease distribution within thirty days -after you become aware that the instructions are invalid, then you do -not forfeit any of your rights under this license. + 1. Source Code. -(6) You may Distribute a Modified Version in Compiled form without the -Source, provided that you comply with Section 4 with respect to the -Source of the Modified Version. Aggregating or Linking the Package + 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. -(7) You may aggregate the Package (either the Standard Version or -Modified Version) with other packages and Distribute the resulting -aggregation provided that you do not charge a licensing fee for the -Package. Distributor Fees are permitted, and licensing fees for other -components in the aggregation are permitted. The terms of this license -apply to the use and Distribution of the Standard or Modified Versions -as included in the aggregation. + 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. -(8) You are permitted to link Modified and Standard Versions with other -works, to embed the Package in a larger work of your own, or to build -stand-alone binary or bytecode versions of applications that include the -Package, and Distribute the result without restriction, provided the -result does not expose a direct interface to the Package. Items That -are Not Considered Part of a Modified Version + 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. -(9) Works (including, but not limited to, modules and scripts) that -merely extend or make use of the Package, do not, by themselves, cause -the Package to be a Modified Version. In addition, such works are not -considered parts of the Package itself, and are not subject to the terms -of this license. General Provisions + 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. -(10) Any use, modification, and distribution of the Standard or Modified -Versions is governed by this Artistic License. By using, modifying or -distributing the Package, you accept this license. Do not use, modify, -or distribute the Package, if you do not accept this license. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. -(11) If your Modified Version has been derived from a Modified Version -made by someone other than you, you are nevertheless required to ensure -that your Modified Version complies with the requirements of this license. + The Corresponding Source for a work in source code form is that +same work. -(12) This license does not grant you the right to use any trademark, -service mark, tradename, or logo of the Copyright Holder. + 2. Basic Permissions. -(13) This license includes the non-exclusive, worldwide, free-of-charge -patent license to make, have made, use, offer to sell, sell, import -and otherwise transfer the Package with respect to any patent claims -licensable by the Copyright Holder that are necessarily infringed by the -Package. If you institute patent litigation (including a cross-claim or -counterclaim) against any party alleging that the Package constitutes -direct or contributory patent infringement, then this Artistic License -to you shall terminate on the date that such litigation is filed. + 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. -(14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT -HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED -WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT -PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER -OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR -CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + 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/docs/NEWS.md b/docs/NEWS.md index f408874..1b60d4e 100644 --- a/docs/NEWS.md +++ b/docs/NEWS.md @@ -40,6 +40,10 @@ * dropped: will no longer publish to SourceForge as it has a chequered history and is unnecessary * dropped: removed project from GitHub and moved to Codeberg - see "[Give Up GitHub](https://giveupgithub.org/)" +#### Other items + + * licensing change from Artistic 2.0 to GPLv3+ + ### 1.7.24 - 30 July 2023 * fix: correct terminal size detection, broken in 1.7.17 by the configuration script rewrite ([#72](https://codeberg.org/a-j-wood/pv/issues/72)) diff --git a/docs/TODO.md b/docs/TODO.md index d238598..dcb45a7 100644 --- a/docs/TODO.md +++ b/docs/TODO.md @@ -27,6 +27,5 @@ Things still to do. (#n) indicates the issue tracker number. * ([#67](https://codeberg.org/a-j-wood/pv/issues/67)) Wrap another process to monitor its stdin & stdout ([Alex Mason](https://github.com/axman6)) * ([#76](https://codeberg.org/a-j-wood/pv/issues/76)) Provide a way to test translations without installing * ([#77](https://codeberg.org/a-j-wood/pv/issues/77)) Eliminate all warnings from "splint" and "flawfinder" - * Switch license to GPLv3+ Any assistance would be appreciated. diff --git a/docs/pv.1 b/docs/pv.1 index 602e26d..ee500ac 100644 --- a/docs/pv.1 +++ b/docs/pv.1 @@ -717,5 +717,10 @@ home page: (for .BR O_DIRECT ) -.SH LICENSE -This is free software, distributed under the ARTISTIC 2.0 license. +.SH COPYRIGHT +Copyright \(co 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood. + +License GPLv3+: GNU GPL version 3 or later . + +This is free software: you are free to change and redistribute it. There is +NO WARRANTY, to the extent permitted by law. diff --git a/docs/pv.1.md b/docs/pv.1.md index 215eeee..9055b31 100644 --- a/docs/pv.1.md +++ b/docs/pv.1.md @@ -535,6 +535,12 @@ Alternatively, use the issue tracker linked from the **pv** home page: **cat**(1), **dialog**(1), **splice**(2), **open**(2) (for **O_DIRECT**) -# LICENSE +# COPYRIGHT -This is free software, distributed under the ARTISTIC 2.0 license. +Copyright © 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood. + +License GPLv3+: GNU GPL version 3 or later +\. + +This is free software: you are free to change and redistribute it. There +is NO WARRANTY, to the extent permitted by law. diff --git a/po/de.po b/po/de.po index fcb69a4..0e3d0f2 100644 --- a/po/de.po +++ b/po/de.po @@ -325,7 +325,7 @@ msgid "IPC not supported on this system" msgstr "IPC wird auf diesem System nicht unterstützt" #: src/main/version.c:28 -msgid "License: Artistic v2.0 " +msgid "License: GPLv3+ " msgstr "" #: src/main/version.c:29 @@ -480,34 +480,3 @@ msgstr "" #: src/pv/watchpid.c:104 src/pv/watchpid.c:171 msgid "not a regular file or block device" msgstr "keine normale Datei oder Blockgerät" - -#~ msgid "" -#~ "Debugging is enabled; export the DEBUG environment variable to define " -#~ "the\n" -#~ "output filename.\n" -#~ msgstr "" -#~ "Das Debuggen ist aktiviert. Exportieren Sie die Umgebungsvariable DEBUG,\n" -#~ "um den Ausgabedateinamen zu definieren.\n" - -#~ msgid "%s %s - Copyright %s %s" -#~ msgstr "%s %s - Copyright(C) %s %s" - -#~ msgid "Web site: %s" -#~ msgstr "Web-Site: %s" - -#~ msgid "" -#~ "This program is free software, and is being distributed under the\n" -#~ "terms of the Artistic License 2.0." -#~ msgstr "" -#~ "Dieses Programm ist freie Software und wird unter den Bedingungen\n" -#~ "der Artistic License verbreitet." - -#~ msgid "" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -#~ msgstr "" -#~ "Dieses Programm wird in der Hoffnung verbreitet, dass es nützlich sein " -#~ "wird,\n" -#~ "aber OHNE JEGLICHE GARANTIE; ohne die implizite Garantie von\n" -#~ "MARKTGÄNGIGKEIT oder EIGNUNG FÜR EINEN BESTIMMTEN ZWECK." diff --git a/po/fr.po b/po/fr.po index 357dffc..8cea523 100644 --- a/po/fr.po +++ b/po/fr.po @@ -326,7 +326,7 @@ msgid "IPC not supported on this system" msgstr "IPC non pris en charge sur ce système" #: src/main/version.c:28 -msgid "License: Artistic v2.0 " +msgid "License: GPLv3+ " msgstr "" #: src/main/version.c:29 @@ -481,34 +481,3 @@ msgstr "" #: src/pv/watchpid.c:104 src/pv/watchpid.c:171 msgid "not a regular file or block device" msgstr "pas un fichier ordinaire ou un périphérique de bloc" - -#~ msgid "" -#~ "Debugging is enabled; export the DEBUG environment variable to define " -#~ "the\n" -#~ "output filename.\n" -#~ msgstr "" -#~ "Le débogage est activé; exportez la variable d'environnement DEBUG pour\n" -#~ "définir le nom du fichier de sortie.\n" - -#~ msgid "%s %s - Copyright %s %s" -#~ msgstr "%s %s - Copyright(C) %s %s" - -#~ msgid "Web site: %s" -#~ msgstr "Site Web: %s" - -#~ msgid "" -#~ "This program is free software, and is being distributed under the\n" -#~ "terms of the Artistic License 2.0." -#~ msgstr "" -#~ "Ce programme est un logiciel libre et est distribué sous les termes\n" -#~ "anglophone de la Licence Artistique 2.0 (Artistic License 2.0)." - -#~ msgid "" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -#~ msgstr "" -#~ "Ce programme est distribué dans l'espoir qu'il sera utile, mais\n" -#~ "SANS GARANTIE AUCUNE; ni même de garantie sous-entendu que le\n" -#~ "programme soit COMMERCIALISABLE ou APPLICABLE À UNE TÂCHE\n" -#~ "PARTICULIÈRE." diff --git a/po/pl.po b/po/pl.po index d94dc58..ebe2589 100644 --- a/po/pl.po +++ b/po/pl.po @@ -313,7 +313,7 @@ msgid "IPC not supported on this system" msgstr "" #: src/main/version.c:28 -msgid "License: Artistic v2.0 " +msgid "License: GPLv3+ " msgstr "" #: src/main/version.c:29 @@ -470,6 +470,3 @@ msgstr "" #: src/pv/watchpid.c:104 src/pv/watchpid.c:171 msgid "not a regular file or block device" msgstr "" - -#~ msgid "Web site: %s" -#~ msgstr "Strona WWW: %s" diff --git a/po/pt.po b/po/pt.po index 64ef3da..cdafe9b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -317,7 +317,7 @@ msgid "IPC not supported on this system" msgstr "IPC não suportado neste sistema" #: src/main/version.c:28 -msgid "License: Artistic v2.0 " +msgid "License: GPLv3+ " msgstr "" #: src/main/version.c:29 @@ -472,33 +472,3 @@ msgstr "" #: src/pv/watchpid.c:104 src/pv/watchpid.c:171 msgid "not a regular file or block device" msgstr "não é um arquivo regular ou dispositivo de bloqueio" - -#~ msgid "" -#~ "Debugging is enabled; export the DEBUG environment variable to define " -#~ "the\n" -#~ "output filename.\n" -#~ msgstr "" -#~ "A depuração está habilitada; exporte a variável de ambiente DEBUG para\n" -#~ "definir o nome do arquivo de saída.\n" - -#~ msgid "%s %s - Copyright %s %s" -#~ msgstr "%s %s - Copyright(C) %s %s" - -#~ msgid "Web site: %s" -#~ msgstr "Site: %s" - -#~ msgid "" -#~ "This program is free software, and is being distributed under the\n" -#~ "terms of the Artistic License 2.0." -#~ msgstr "" -#~ "Este programa é um software livre, distribuído sob os termos da\n" -#~ "Licença Artística." - -#~ msgid "" -#~ "This program is distributed in the hope that it will be useful,\n" -#~ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -#~ msgstr "" -#~ "Este programa é distribuído com o intuito de que seja útil,\n" -#~ "porém SEM QUAISQUER GARANTIAS; sem inclusive as garantias implícitas de\n" -#~ "COMERCIALIZAÇÃO e ADEQUAÇÃO A OBJETIVOS PARTICULARES." diff --git a/src/include/config-aux.h b/src/include/config-aux.h index a2cec8e..0b6d8f4 100644 --- a/src/include/config-aux.h +++ b/src/include/config-aux.h @@ -5,7 +5,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #if ENABLE_NLS diff --git a/src/include/options.h b/src/include/options.h index 7e5e632..8cbe183 100644 --- a/src/include/options.h +++ b/src/include/options.h @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #ifndef _OPTIONS_H diff --git a/src/include/pv-internal.h b/src/include/pv-internal.h index fd70e44c..4659e80 100644 --- a/src/include/pv-internal.h +++ b/src/include/pv-internal.h @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #ifndef _PV_INTERNAL_H diff --git a/src/include/pv.h b/src/include/pv.h index 886607c..c09f083 100644 --- a/src/include/pv.h +++ b/src/include/pv.h @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #ifndef _PV_H diff --git a/src/main/debug.c b/src/main/debug.c index d768ac3..b8bb6ae 100644 --- a/src/main/debug.c +++ b/src/main/debug.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/main/help.c b/src/main/help.c index f3835d0..6900093 100644 --- a/src/main/help.c +++ b/src/main/help.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/main/main.c b/src/main/main.c index f26bd12..fcb6514 100644 --- a/src/main/main.c +++ b/src/main/main.c @@ -4,7 +4,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/main/options.c b/src/main/options.c index 4a72eb5..01df7a1 100644 --- a/src/main/options.c +++ b/src/main/options.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/main/remote.c b/src/main/remote.c index 083ee90..3031e06 100644 --- a/src/main/remote.c +++ b/src/main/remote.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/main/version.c b/src/main/version.c index 0c7fd36..1cefbd7 100644 --- a/src/main/version.c +++ b/src/main/version.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" @@ -25,7 +25,7 @@ void display_version(void) /* GNU standard second line format - "Copyright" always in English */ printf("Copyright %s %s\n", "2023", "Andrew Wood"); /* GNU standard license line and free software notice */ - printf("%s\n", _("License: Artistic v2.0 ")); + printf("%s\n", _("License: GPLv3+ ")); printf("%s\n", _("This is free software: you are free to change and redistribute it.")); printf("%s\n", _("There is NO WARRANTY, to the extent permitted by law.")); /* Project web site link */ diff --git a/src/pv/cursor.c b/src/pv/cursor.c index 2618304..43a3fb9 100644 --- a/src/pv/cursor.c +++ b/src/pv/cursor.c @@ -12,7 +12,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/display.c b/src/pv/display.c index c9f85e3..d293d36 100644 --- a/src/pv/display.c +++ b/src/pv/display.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/elapsedtime.c b/src/pv/elapsedtime.c index 05eee08..7ef26cd 100644 --- a/src/pv/elapsedtime.c +++ b/src/pv/elapsedtime.c @@ -3,7 +3,7 @@ * * Copyright 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/file.c b/src/pv/file.c index b976532..d1295fe 100644 --- a/src/pv/file.c +++ b/src/pv/file.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/loop.c b/src/pv/loop.c index e6cb8a6..85bc37c 100644 --- a/src/pv/loop.c +++ b/src/pv/loop.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/number.c b/src/pv/number.c index f1664b9..2eda015 100644 --- a/src/pv/number.c +++ b/src/pv/number.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/signal.c b/src/pv/signal.c index 85a7af4..902605b 100644 --- a/src/pv/signal.c +++ b/src/pv/signal.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/state.c b/src/pv/state.c index 88969f1..3bf6bcd 100644 --- a/src/pv/state.c +++ b/src/pv/state.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/string.c b/src/pv/string.c index 03eec76..a9d8eb1 100644 --- a/src/pv/string.c +++ b/src/pv/string.c @@ -3,7 +3,7 @@ * * Copyright 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/transfer.c b/src/pv/transfer.c index 1bafe60..6c2861e 100644 --- a/src/pv/transfer.c +++ b/src/pv/transfer.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h" diff --git a/src/pv/watchpid.c b/src/pv/watchpid.c index 67efa0f..f042f86 100644 --- a/src/pv/watchpid.c +++ b/src/pv/watchpid.c @@ -3,7 +3,7 @@ * * Copyright 2002-2008, 2010, 2012-2015, 2017, 2021, 2023 Andrew Wood * - * Distributed under the Artistic License v2.0; see `docs/COPYING'. + * License GPLv3+: GNU GPL version 3 or later; see `docs/COPYING'. */ #include "config.h"