changelog for new upstream version

[debian/sudo] / debian / copyright

diff --git a/debian/copyright b/debian/copyright
index dc138e87dee773e491220fcf8816a94971304996..8e76500035dd491b7b240ee8a7c8f7aece6f47e3 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,51 +1,36 @@
 This is the Debian GNU/Linux prepackaged version of sudo.  sudo is
 used to provide limited super user privileges to specific users.
 
 This is the Debian GNU/Linux prepackaged version of sudo.  sudo is
 used to provide limited super user privileges to specific users.
 

-This package was put together by Bdale Garbee <bdale@gag.com> using sources
-from 
-       ftp://ftp.cs.colorado.edu/pub/sudo/
+Bdale Garbee <bdale@gag.com> maintains this package using sources from 

 
 

-Sudo is distributed under the following BSD-style license:
+       http://www.sudo.ws/

 
 

-   Copyright (c) 1994-1996,1998-2002 Todd C. Miller <Todd.Miller@courtesan.com>
-   All rights reserved.
+Sudo is distributed under the following ISC-style license:

 
 

-   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.
-
-   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 of the author may not be used to endorse or promote products
-      derived from this software without specific prior written permission
-      from the author.
+   Copyright (c) 1994-1996, 1998-2008
+        Todd C. Miller <Todd.Miller@courtesan.com>

 
 

-   4. Products derived from this software may not be called "Sudo" nor
-      may "Sudo" appear in their names without specific prior written
-      permission from the author.
+   Permission to use, copy, modify, and distribute this software for any
+   purpose with or without fee is hereby granted, provided that the above
+   copyright notice and this permission notice appear in all copies.

 
 

-   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
-   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-   AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-   THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-   OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-   WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-   OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-   ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+   WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+   MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+   ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 
 

+   Sponsored in part by the Defense Advanced Research Projects
+   Agency (DARPA) and Air Force Research Laboratory, Air Force
+   Materiel Command, USAF, under agreement number F39502-99-1-0512.

 
 

-Additionally, lsearch.c, fnmatch.c, getcwd.c, snprintf.c, strcasecmp.c
-and fnmatch.3 bear the following UCB license:
+Additionally, fnmatch.c, fnmatch.h, getcwd.c, glob.c, glob.h and snprintf.c
+bear the following UCB license:

 
 

-   Copyright (c) 1987, 1989, 1990, 1991, 1993, 1994
-       The Regents of the University of California.  All rights reserved.
+   Copyright (c) 1987, 1989, 1990, 1991, 1992, 1993, 1994
+        The Regents of the University of California.  All rights reserved.

 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions