From dbd5adf0d985c2ca2f278e8b18e597a7abc3df56 Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Tue, 9 Jan 2007 08:12:17 +0000 Subject: [PATCH] Correct the copyright messages: Make this a standard vanilla 2-clause BSD license, update the year to 2007. --- usr.bin/tar/COPYING | 5 ++--- usr.bin/tar/bsdtar.1 | 2 +- usr.bin/tar/bsdtar.c | 5 ++--- usr.bin/tar/bsdtar.h | 8 ++------ usr.bin/tar/bsdtar_platform.h | 5 ++--- usr.bin/tar/matching.c | 5 ++--- usr.bin/tar/read.c | 5 ++--- usr.bin/tar/tree.c | 5 ++--- usr.bin/tar/tree.h | 5 ++--- usr.bin/tar/util.c | 5 ++--- usr.bin/tar/write.c | 5 ++--- 11 files changed, 21 insertions(+), 34 deletions(-) diff --git a/usr.bin/tar/COPYING b/usr.bin/tar/COPYING index c7024826841e..6d66cdab3c72 100644 --- a/usr.bin/tar/COPYING +++ b/usr.bin/tar/COPYING @@ -1,15 +1,14 @@ All of the C source code and documentation in this package is subject to the following: -Copyright (c) 2003-2004 Tim Kientzle +Copyright (c) 2003-2007 Tim Kientzle All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer - in this position and unchanged. + notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. diff --git a/usr.bin/tar/bsdtar.1 b/usr.bin/tar/bsdtar.1 index fb26d0a4e46f..02a12b26f0c4 100644 --- a/usr.bin/tar/bsdtar.1 +++ b/usr.bin/tar/bsdtar.1 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2003 Tim Kientzle +.\" Copyright (c) 2003-2007 Tim Kientzle .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/tar/bsdtar.c b/usr.bin/tar/bsdtar.c index 8d5b5fa0c02f..b9d554744636 100644 --- a/usr.bin/tar/bsdtar.c +++ b/usr.bin/tar/bsdtar.c @@ -1,13 +1,12 @@ /*- - * Copyright (c) 2003-2005 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. diff --git a/usr.bin/tar/bsdtar.h b/usr.bin/tar/bsdtar.h index 24397092c3ed..5962ea9bae1d 100644 --- a/usr.bin/tar/bsdtar.h +++ b/usr.bin/tar/bsdtar.h @@ -1,19 +1,15 @@ /*- - * Copyright (c) 2003-2004 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name(s) of the author(s) may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/usr.bin/tar/bsdtar_platform.h b/usr.bin/tar/bsdtar_platform.h index f8b3d2cfd140..b254b208a5e2 100644 --- a/usr.bin/tar/bsdtar_platform.h +++ b/usr.bin/tar/bsdtar_platform.h @@ -1,13 +1,12 @@ /*- - * Copyright (c) 2003-2004 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. diff --git a/usr.bin/tar/matching.c b/usr.bin/tar/matching.c index 0aaff9265536..3997b54b080d 100644 --- a/usr.bin/tar/matching.c +++ b/usr.bin/tar/matching.c @@ -1,13 +1,12 @@ /*- - * Copyright (c) 2003-2004 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. diff --git a/usr.bin/tar/read.c b/usr.bin/tar/read.c index 56a87f8ab36d..661d2c258979 100644 --- a/usr.bin/tar/read.c +++ b/usr.bin/tar/read.c @@ -1,13 +1,12 @@ /*- - * Copyright (c) 2003-2004 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. diff --git a/usr.bin/tar/tree.c b/usr.bin/tar/tree.c index 6ecb5deaede0..84a1e2d995c1 100644 --- a/usr.bin/tar/tree.c +++ b/usr.bin/tar/tree.c @@ -1,13 +1,12 @@ /*- - * Copyright (c) 2003-2004 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. diff --git a/usr.bin/tar/tree.h b/usr.bin/tar/tree.h index 06eab8ea08f1..ff38f5346c1c 100644 --- a/usr.bin/tar/tree.h +++ b/usr.bin/tar/tree.h @@ -1,13 +1,12 @@ /*- - * Copyright (c) 2003-2004 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. diff --git a/usr.bin/tar/util.c b/usr.bin/tar/util.c index 2b7e9a7ffcfb..a3bbb4f6ccce 100644 --- a/usr.bin/tar/util.c +++ b/usr.bin/tar/util.c @@ -1,13 +1,12 @@ /*- - * Copyright (c) 2003-2004 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. diff --git a/usr.bin/tar/write.c b/usr.bin/tar/write.c index f3827502360b..b9c854bfec91 100644 --- a/usr.bin/tar/write.c +++ b/usr.bin/tar/write.c @@ -1,13 +1,12 @@ /*- - * Copyright (c) 2003-2004 Tim Kientzle + * Copyright (c) 2003-2007 Tim Kientzle * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution.