From 12544486ef2de86e4f2dfc920cd2860fb81658d1 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Mon, 29 Aug 2011 12:56:17 -0400 Subject: pdate addres for Free Software Foundation License texts contain multiple address for FSF, some wrong. So update them and replace COPYING file with http://www.gnu.org/licenses/gpl-2.0.txt which has a few changes to preamble and commentary. Also remove extra COPYING file from utils/statd/ Signed-off-by: NeilBrown Signed-off-by: Steve Dickson --- utils/mount/error.c | 4 ++-- utils/mount/error.h | 4 ++-- utils/mount/mount_libmount.c | 4 ++-- utils/mount/network.c | 4 ++-- utils/mount/network.h | 4 ++-- utils/mount/parse_dev.c | 4 ++-- utils/mount/parse_dev.h | 4 ++-- utils/mount/parse_opt.c | 4 ++-- utils/mount/parse_opt.h | 4 ++-- utils/mount/stropts.c | 4 ++-- utils/mount/stropts.h | 4 ++-- utils/mount/token.c | 4 ++-- utils/mount/token.h | 4 ++-- utils/mount/utils.c | 4 ++-- utils/mount/utils.h | 4 ++-- utils/mount/version.h | 4 ++-- utils/nfsd/nfssvc.h | 2 +- utils/statd/COPYRIGHT | 25 ------------------------- 18 files changed, 33 insertions(+), 58 deletions(-) delete mode 100644 utils/statd/COPYRIGHT (limited to 'utils') diff --git a/utils/mount/error.c b/utils/mount/error.c index 1b64bd7..83ad1d2 100644 --- a/utils/mount/error.c +++ b/utils/mount/error.c @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * * To Do: * + Proper support for internationalization diff --git a/utils/mount/error.h b/utils/mount/error.h index 42b28cf..ef80fd0 100644 --- a/utils/mount/error.h +++ b/utils/mount/error.h @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/mount_libmount.c b/utils/mount/mount_libmount.c index cf6e58c..e450d79 100644 --- a/utils/mount/mount_libmount.c +++ b/utils/mount/mount_libmount.c @@ -15,8 +15,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/network.c b/utils/mount/network.c index d1f91dc..e7bd522 100644 --- a/utils/mount/network.c +++ b/utils/mount/network.c @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/network.h b/utils/mount/network.h index 81c6f22..9c75856 100644 --- a/utils/mount/network.h +++ b/utils/mount/network.h @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/parse_dev.c b/utils/mount/parse_dev.c index c8a58b1..d64b83d 100644 --- a/utils/mount/parse_dev.c +++ b/utils/mount/parse_dev.c @@ -15,8 +15,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/parse_dev.h b/utils/mount/parse_dev.h index a1288c2..f9857bc 100644 --- a/utils/mount/parse_dev.h +++ b/utils/mount/parse_dev.h @@ -15,8 +15,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/parse_opt.c b/utils/mount/parse_opt.c index ab869d9..75a0daa 100644 --- a/utils/mount/parse_opt.c +++ b/utils/mount/parse_opt.c @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/parse_opt.h b/utils/mount/parse_opt.h index 2c0b5f4..5037207 100644 --- a/utils/mount/parse_opt.h +++ b/utils/mount/parse_opt.h @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c index 4d023d6..7a2edab 100644 --- a/utils/mount/stropts.c +++ b/utils/mount/stropts.c @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/stropts.h b/utils/mount/stropts.h index b4fd888..37316eb 100644 --- a/utils/mount/stropts.h +++ b/utils/mount/stropts.h @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/token.c b/utils/mount/token.c index 5ef9604..d7e2f4a 100644 --- a/utils/mount/token.c +++ b/utils/mount/token.c @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/token.h b/utils/mount/token.h index 5a675ed..17a9c15 100644 --- a/utils/mount/token.h +++ b/utils/mount/token.h @@ -16,8 +16,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/utils.c b/utils/mount/utils.c index 298db39..2778ed7 100644 --- a/utils/mount/utils.c +++ b/utils/mount/utils.c @@ -13,8 +13,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/utils.h b/utils/mount/utils.h index 3fcd504..224918a 100644 --- a/utils/mount/utils.h +++ b/utils/mount/utils.h @@ -15,8 +15,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/mount/version.h b/utils/mount/version.h index 531cf68..d7cf680 100644 --- a/utils/mount/version.h +++ b/utils/mount/version.h @@ -15,8 +15,8 @@ * * 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., 59 Temple Place - Suite 330, - * Boston, MA 021110-1307, USA. + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/nfsd/nfssvc.h b/utils/nfsd/nfssvc.h index 1a01cec..08de0fe 100644 --- a/utils/nfsd/nfssvc.h +++ b/utils/nfsd/nfssvc.h @@ -16,7 +16,7 @@ * * 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. + * 51 Franklin Street, Fifth Floor, Boston, MA 0211-1301 USA * */ diff --git a/utils/statd/COPYRIGHT b/utils/statd/COPYRIGHT deleted file mode 100644 index 47ff720..0000000 --- a/utils/statd/COPYRIGHT +++ /dev/null @@ -1,25 +0,0 @@ -rpc.statd -- Network Status Monitor (NSM) protocol daemon for Linux. -Copyright (C) 1995-1999, 2002, 2005 Jeffrey A. Uphoff - -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. - -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, write to the Free Software -Foundation, Inc., 675 Massachusetts Ave, Cambridge, MA 02139, USA. - -Jeffrey A. Uphoff -Orion Multisystems, Inc. -3090 Oakmead Village Drive -Santa Clara, CA 95051 -USA - -Phone: +1-408-844-8481 -Internet: juphoff@users.sourceforge.net -- cgit