diff --git a/quota-4.05-COPYING-Update-mailing-address.patch b/quota-4.05-COPYING-Update-mailing-address.patch new file mode 100644 index 0000000..3896eb2 --- /dev/null +++ b/quota-4.05-COPYING-Update-mailing-address.patch @@ -0,0 +1,106 @@ +From b6bb53e1124e6b813fe4de5682b9d9a9f8a1fba8 Mon Sep 17 00:00:00 2001 +From: Jan Kara +Date: Tue, 2 Apr 2019 16:54:49 +0200 +Subject: [PATCH] COPYING: Update mailing address +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Jan Kara +Signed-off-by: Petr Písař +--- + COPYING | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/COPYING b/COPYING +index 784e9cf..bb6a5e0 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,16 +1,16 @@ + This package, the quota tools, are made available under the GNU Public License + version 2. +----------------------------------------------------------------------- ++----------------------------------------------------------------------- + +- GNU GENERAL PUBLIC LICENSE +- Version 2, June 1991 ++ GNU GENERAL PUBLIC LICENSE ++ Version 2, June 1991 + +- Copyright (C) 1989, 1991 Free Software Foundation, Inc. +- 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 +@@ -19,7 +19,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 +@@ -59,8 +59,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 +@@ -114,7 +114,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 +@@ -172,7 +172,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 +@@ -229,7 +229,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 +@@ -259,7 +259,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 +@@ -281,4 +281,4 @@ 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 ++ END OF TERMS AND CONDITIONS +-- +2.20.1 + diff --git a/quota.spec b/quota.spec index b111276..d6a904b 100644 --- a/quota.spec +++ b/quota.spec @@ -74,6 +74,9 @@ Patch6: quota-4.05-setquota-Report-failure-to-obtain-quota-information.patch Patch7: quota-4.05-rpc-Clarify-error-message-when-cannot-connect-to-rpc.patch # 6/6 Patch8: quota-4.05-quotaops-Make-error-string-translatable.patch +# Fix Free Software Foundation's postal address, +# in upstream after 4.05 +Patch9: quota-4.05-COPYING-Update-mailing-address.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bash @@ -202,6 +205,7 @@ Linux/UNIX environment. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 # Regenerate build scripts autoreconf -f -i @@ -353,6 +357,7 @@ make check * Mon May 27 2019 Petr Pisar - 1:4.05-2 - Report an error if an RPC fails on an explicitly requested file system (upstream bug #134) +- Fix Free Software Foundation's postal address (upstream bug #133) * Tue Apr 02 2019 Petr Pisar - 1:4.05-1 - 4.05 bump