From 97e39ed7b4a8577eae3a6f423a653859aa4a98a8 Mon Sep 17 00:00:00 2001 From: Adam Sampson Date: Tue, 9 Oct 2018 20:24:25 +0100 Subject: [PATCH] Update COPYING and license notices to current versions. rawdog is still GPL v2+, but the FSF's current text has some minor formatting improvements, and the license notice is clearer. --- COPYING | 39 +++++++++++++++++++-------------------- NEWS | 3 +++ rawdog | 20 +++++++++----------- rawdoglib/persister.py | 20 +++++++++----------- rawdoglib/plugins.py | 20 +++++++++----------- rawdoglib/rawdog.py | 20 +++++++++----------- test-rawdog | 20 +++++++++----------- testserver.py | 20 +++++++++----------- 8 files changed, 76 insertions(+), 86 deletions(-) diff --git a/COPYING b/COPYING index b6f92f3..d159169 100644 --- a/COPYING +++ b/COPYING @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to +the GNU Lesser General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not @@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions: License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - + These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in @@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - + 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is @@ -225,7 +225,7 @@ impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - + 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License @@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ 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. - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + 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 @@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found. 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, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Also add information on how to contact you by electronic and paper mail. @@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names: This 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 Library General +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. diff --git a/NEWS b/NEWS index 38bb71d..4ac2dda 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,9 @@ converted to "rawdog_exception" for network errors, and "rawdog_timeout" is set if a timeout exception occurred. For compatibility with existing plugins, an empty "feed" is also provided on a timeout. +Update COPYING and the GPL v2 license notices to the FSF's current +recommended text. + - rawdog 2.22 When handling an HTTP 301 redirect response, check whether the new diff --git a/rawdog b/rawdog index 3715145..b5dcdef 100755 --- a/rawdog +++ b/rawdog @@ -2,20 +2,18 @@ # rawdog: RSS aggregator without delusions of grandeur. # Copyright 2003, 2004, 2005, 2006, 2016 Adam Sampson # -# rawdog is free software; you can redistribute and/or modify it -# under the terms of that license as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) -# any later version. +# 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 2 of the License, or +# (at your option) any later version. # -# rawdog 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. +# 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 rawdog; see the file COPYING. If not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA, or see http://www.gnu.org/. +# along with this program. If not, see . from rawdoglib.rawdog import main diff --git a/rawdoglib/persister.py b/rawdoglib/persister.py index 40169da..b0fd709 100644 --- a/rawdoglib/persister.py +++ b/rawdoglib/persister.py @@ -1,20 +1,18 @@ # persister: persist Python objects safely to pickle files # Copyright 2003, 2004, 2005, 2013, 2014 Adam Sampson # -# rawdog is free software; you can redistribute and/or modify it -# under the terms of that license as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) -# any later version. +# 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 2 of the License, or +# (at your option) any later version. # -# rawdog 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. +# 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 rawdog; see the file COPYING. If not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA, or see http://www.gnu.org/. +# along with this program. If not, see . import cPickle as pickle import errno diff --git a/rawdoglib/plugins.py b/rawdoglib/plugins.py index 447b269..0c73fbf 100644 --- a/rawdoglib/plugins.py +++ b/rawdoglib/plugins.py @@ -1,20 +1,18 @@ # plugins: handle add-on modules for rawdog. # Copyright 2004, 2005, 2013, 2016 Adam Sampson # -# rawdog is free software; you can redistribute and/or modify it -# under the terms of that license as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) -# any later version. +# 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 2 of the License, or +# (at your option) any later version. # -# rawdog 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. +# 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 rawdog; see the file COPYING. If not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA, or see http://www.gnu.org/. +# along with this program. If not, see . # The design of rawdog's plugin API was inspired by Stuart Langridge's # Vellum weblog system: diff --git a/rawdoglib/rawdog.py b/rawdoglib/rawdog.py index a781d70..9fb1ed7 100644 --- a/rawdoglib/rawdog.py +++ b/rawdoglib/rawdog.py @@ -1,20 +1,18 @@ # rawdog: RSS aggregator without delusions of grandeur. # Copyright 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Adam Sampson # -# rawdog is free software; you can redistribute and/or modify it -# under the terms of that license as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) -# any later version. +# 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 2 of the License, or +# (at your option) any later version. # -# rawdog 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. +# 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 rawdog; see the file COPYING. If not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA, or see http://www.gnu.org/. +# along with this program. If not, see . VERSION = "2.23rc1" HTTP_AGENT = "rawdog/" + VERSION diff --git a/test-rawdog b/test-rawdog index b2a13a9..426508d 100755 --- a/test-rawdog +++ b/test-rawdog @@ -2,20 +2,18 @@ # test-rawdog: run some basic tests to make sure rawdog's working. # Copyright 2013, 2014, 2015, 2016, 2018 Adam Sampson # -# rawdog is free software; you can redistribute and/or modify it -# under the terms of that license as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) -# any later version. +# 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 2 of the License, or +# (at your option) any later version. # -# rawdog 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. +# 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 rawdog; see the file COPYING. If not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA, or see http://www.gnu.org/. +# along with this program. If not, see . # Default to the C locale, to avoid localised error messages. default_LC_ALL="C" diff --git a/testserver.py b/testserver.py index d78e05d..9579e8d 100644 --- a/testserver.py +++ b/testserver.py @@ -1,20 +1,18 @@ # testserver: servers for rawdog's test suite. # Copyright 2013, 2016 Adam Sampson # -# rawdog is free software; you can redistribute and/or modify it -# under the terms of that license as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) -# any later version. +# 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 2 of the License, or +# (at your option) any later version. # -# rawdog 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. +# 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 rawdog; see the file COPYING. If not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -# MA 02110-1301, USA, or see http://www.gnu.org/. +# along with this program. If not, see . import BaseHTTPServer import SimpleHTTPServer -- 2.35.1