From d4ec06ec5839350bd728da0e92a8cb2e1c37d880 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Fri, 20 Dec 2024 12:15:01 +1100 Subject: [PATCH] Update my copyright notices and remove old RCS tags Make my copyright notices all consistently have a 2-clause BSD licence. Signed-off-by: Paul Mackerras --- PLUGINS | 2 -- chat/chat.8 | 1 - include/linux/ppp-comp.h | 25 +------------------- include/linux/ppp_defs.h | 25 +------------------- pppd/auth.c | 16 ++++--------- pppd/ccp.c | 16 ++++--------- pppd/ccp.h | 16 ++++--------- pppd/chap-md5.c | 16 ++++--------- pppd/chap-md5.h | 14 ++++------- pppd/chap.c | 18 +++++--------- pppd/chap.h | 16 +++++-------- pppd/chap_ms.c | 2 -- pppd/chap_ms.h | 2 -- pppd/demand.c | 16 ++++--------- pppd/eap.h | 2 -- pppd/ecp.c | 14 ++++------- pppd/ecp.h | 2 -- pppd/fsm.h | 2 -- pppd/main.c | 14 ++++------- pppd/mppe.h | 9 ------- pppd/multilink.c | 14 ++++------- pppd/multilink.h | 14 ++++------- pppd/options.c | 2 +- pppd/options.h | 14 ++++------- pppd/pathnames.h | 14 ++++------- pppd/plugins/minconn.c | 11 +-------- pppd/plugins/pppoe/common.c | 3 --- pppd/plugins/pppoe/discovery.c | 3 --- pppd/plugins/pppoe/if.c | 3 --- pppd/plugins/pppoe/plugin.c | 3 --- pppd/plugins/pppoe/pppoe.h | 2 -- pppd/plugins/radius/avpair.c | 2 -- pppd/plugins/radius/buildreq.c | 2 -- pppd/plugins/radius/clientid.c | 2 -- pppd/plugins/radius/config.c | 2 -- pppd/plugins/radius/dict.c | 2 -- pppd/plugins/radius/etc/dictionary.microsoft | 2 -- pppd/plugins/radius/includes.h | 2 -- pppd/plugins/radius/ip_util.c | 2 -- pppd/plugins/radius/lock.c | 2 -- pppd/plugins/radius/md5.c | 3 --- pppd/plugins/radius/options.h | 2 -- pppd/plugins/radius/pathnames.h | 2 -- pppd/plugins/radius/pppd-radattr.8 | 1 - pppd/plugins/radius/pppd-radius.8 | 1 - pppd/plugins/radius/radattr.c | 3 --- pppd/plugins/radius/radius.c | 2 -- pppd/plugins/radius/radiusclient.h | 2 -- pppd/plugins/radius/radrealms.c | 3 --- pppd/plugins/radius/sendserver.c | 2 -- pppd/plugins/radius/util.c | 2 -- pppd/pppd-private.h | 2 -- pppd/pppd.8 | 2 +- pppd/srp-entry.8 | 1 - pppd/sys-linux.c | 14 ++++------- pppd/sys-solaris.c | 14 ++++------- pppd/tty.c | 14 ++++------- pppd/utils.c | 14 ++++------- pppdump/pppdump.8 | 1 - pppdump/pppdump.c | 11 +-------- pppstats/pppstats.8 | 1 - pppstats/pppstats.c | 4 ---- scripts/poff | 1 - 63 files changed, 98 insertions(+), 333 deletions(-) diff --git a/PLUGINS b/PLUGINS index bcaa5f099..96292ed47 100644 --- a/PLUGINS +++ b/PLUGINS @@ -327,5 +327,3 @@ access the MPPE keys directly via the: variables. The 2.5.0 release prohibits the direct access of these variables by making them static and private in favor of using the new API. - -## $Id: PLUGINS,v 1.8 2008/06/15 07:02:18 paulus Exp $ ## \ No newline at end of file diff --git a/chat/chat.8 b/chat/chat.8 index 6d10836c4..2d1b74b45 100644 --- a/chat/chat.8 +++ b/chat/chat.8 @@ -1,6 +1,5 @@ .\" -*- nroff -*- .\" manual page [] for chat 1.8 -.\" $Id: chat.8,v 1.11 2004/11/13 12:22:49 paulus Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h index 8758e34e8..b1ed76d2a 100644 --- a/include/linux/ppp-comp.h +++ b/include/linux/ppp-comp.h @@ -1,7 +1,7 @@ /* * ppp-comp.h - Definitions for doing PPP packet compression. * - * Copyright (c) 1994 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,15 +15,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY @@ -31,20 +22,6 @@ * 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. - * - * $Id: ppp-comp.h,v 1.10 2002/12/06 09:49:15 paulus Exp $ - */ - -/* - * ==FILEVERSION 20020319== - * - * NOTE TO MAINTAINERS: - * If you modify this file at all, please set the above date. - * ppp-comp.h is shipped with a PPP distribution as well as with the kernel; - * if everyone increases the FILEVERSION number above, then scripts - * can do the right thing when deciding whether to install a new ppp-comp.h - * file. Don't change the format of that line otherwise, so the - * installation script can recognize it. */ #ifndef _NET_PPP_COMP_H diff --git a/include/linux/ppp_defs.h b/include/linux/ppp_defs.h index 807d681b8..5f20649ca 100644 --- a/include/linux/ppp_defs.h +++ b/include/linux/ppp_defs.h @@ -1,9 +1,7 @@ -/* $Id: ppp_defs.h,v 1.11 2002/12/06 09:49:15 paulus Exp $ */ - /* * ppp_defs.h - PPP definitions. * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -17,15 +15,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY @@ -35,18 +24,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* - * ==FILEVERSION 20020521== - * - * NOTE TO MAINTAINERS: - * If you modify this file at all, please set the above date. - * ppp_defs.h is shipped with a PPP distribution as well as with the kernel; - * if everyone increases the FILEVERSION number above, then scripts - * can do the right thing when deciding whether to install a new ppp_defs.h - * file. Don't change the format of that line otherwise, so the - * installation script can recognize it. - */ - #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ diff --git a/pppd/auth.c b/pppd/auth.c index f69492ea9..a8fd1e637 100644 --- a/pppd/auth.c +++ b/pppd/auth.c @@ -1,7 +1,7 @@ /* * auth.c - PPP authentication and phase control. * - * Copyright (c) 1993-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1993-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -68,8 +64,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: auth.c,v 1.117 2008/07/01 12:27:56 paulus Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/ccp.c b/pppd/ccp.c index f0311b0be..732091f60 100644 --- a/pppd/ccp.c +++ b/pppd/ccp.c @@ -1,7 +1,7 @@ /* * ccp.c - PPP Compression Control Protocol. * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -32,8 +28,6 @@ #include "config.h" #endif -#define RCSID "$Id: ccp.c,v 1.50 2005/06/26 19:34:41 carlsonj Exp $" - #include #include #if defined(SOL2) diff --git a/pppd/ccp.h b/pppd/ccp.h index 0a5668675..785f70276 100644 --- a/pppd/ccp.h +++ b/pppd/ccp.h @@ -1,7 +1,7 @@ /* * ccp.h - Definitions for PPP Compression Control Protocol. * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -26,8 +22,6 @@ * 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. - * - * $Id: ccp.h,v 1.12 2004/11/04 10:02:26 paulus Exp $ */ #ifndef PPP_CCP_H #define PPP_CCP_H diff --git a/pppd/chap-md5.c b/pppd/chap-md5.c index b928ce9f7..7b66ae259 100644 --- a/pppd/chap-md5.c +++ b/pppd/chap-md5.c @@ -1,7 +1,7 @@ /* * chap-md5.c - New CHAP/MD5 implementation. * - * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * Copyright (c) 2003-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -28,8 +24,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: chap-md5.c,v 1.4 2004/11/09 22:39:25 paulus Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/chap-md5.h b/pppd/chap-md5.h index e5ced4eb1..62fca9e8e 100644 --- a/pppd/chap-md5.h +++ b/pppd/chap-md5.h @@ -1,7 +1,7 @@ /* * chap-md5.h - New CHAP/MD5 implementation. * - * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * Copyright (c) 2003-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/chap.c b/pppd/chap.c index d0009e8ba..7af79912d 100644 --- a/pppd/chap.c +++ b/pppd/chap.c @@ -1,7 +1,7 @@ /* - * chap-new.c - New CHAP implementation. + * chap.c - New CHAP implementation. * - * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * Copyright (c) 2003-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -28,8 +24,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: chap-new.c,v 1.9 2007/06/19 02:08:35 carlsonj Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/chap.h b/pppd/chap.h index 2c69e778f..77c077e7a 100644 --- a/pppd/chap.h +++ b/pppd/chap.h @@ -1,7 +1,7 @@ /* - * chap-new.c - New CHAP implementation. + * chap.h - New CHAP implementation. * - * Copyright (c) 2003 Paul Mackerras. All rights reserved. + * Copyright (c) 2003-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/chap_ms.c b/pppd/chap_ms.c index e3d808fd8..6c8ef9196 100644 --- a/pppd/chap_ms.c +++ b/pppd/chap_ms.c @@ -74,8 +74,6 @@ * */ -#define RCSID "$Id: chap_ms.c,v 1.38 2007/12/01 20:10:51 carlsonj Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/chap_ms.h b/pppd/chap_ms.h index b3fdae615..7bcbbfcce 100644 --- a/pppd/chap_ms.h +++ b/pppd/chap_ms.h @@ -26,8 +26,6 @@ * 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. - * - * $Id: chap_ms.h,v 1.13 2004/11/15 22:13:26 paulus Exp $ */ #ifndef PPP_CHAPMS_H diff --git a/pppd/demand.c b/pppd/demand.c index b7f95083e..d8c46fea0 100644 --- a/pppd/demand.c +++ b/pppd/demand.c @@ -1,7 +1,7 @@ /* * demand.c - Support routines for demand-dialling. * - * Copyright (c) 1996-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1996-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY @@ -28,8 +24,6 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#define RCSID "$Id: demand.c,v 1.20 2005/08/25 12:14:18 paulus Exp $" - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/eap.h b/pppd/eap.h index 50c652acf..a9a1d82dd 100644 --- a/pppd/eap.h +++ b/pppd/eap.h @@ -16,8 +16,6 @@ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * * Original version by James Carlson - * - * $Id: eap.h,v 1.2 2003/06/11 23:56:26 paulus Exp $ */ #ifndef PPP_EAP_H diff --git a/pppd/ecp.c b/pppd/ecp.c index ffd28017a..44c06d9e5 100644 --- a/pppd/ecp.c +++ b/pppd/ecp.c @@ -30,7 +30,7 @@ * * Derived from ccp.c, which is: * - * Copyright (c) 1994-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -39,14 +39,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/ecp.h b/pppd/ecp.h index 975d79b87..b01969bb6 100644 --- a/pppd/ecp.h +++ b/pppd/ecp.h @@ -27,8 +27,6 @@ * 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. - * - * $Id: ecp.h,v 1.2 2003/01/10 07:12:36 fcusack Exp $ */ #ifndef PPP_ECP_H #define PPP_ECP_H diff --git a/pppd/fsm.h b/pppd/fsm.h index 50f75e69a..92f024ab0 100644 --- a/pppd/fsm.h +++ b/pppd/fsm.h @@ -38,8 +38,6 @@ * 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. - * - * $Id: fsm.h,v 1.10 2004/11/13 02:28:15 paulus Exp $ */ #ifndef PPP_FSM_H #define PPP_FSM_H diff --git a/pppd/main.c b/pppd/main.c index a4bc77767..32ad489c2 100644 --- a/pppd/main.c +++ b/pppd/main.c @@ -39,7 +39,7 @@ * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * Copyright (c) 1999-2020 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -48,14 +48,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/mppe.h b/pppd/mppe.h index 376eb62e9..f2a4cb244 100644 --- a/pppd/mppe.h +++ b/pppd/mppe.h @@ -15,15 +15,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY diff --git a/pppd/multilink.c b/pppd/multilink.c index b44d2bbe5..d5423da57 100644 --- a/pppd/multilink.c +++ b/pppd/multilink.c @@ -1,7 +1,7 @@ /* * multilink.c - support routines for multilink. * - * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 2000-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/multilink.h b/pppd/multilink.h index 8afdadd24..07ea4b24b 100644 --- a/pppd/multilink.h +++ b/pppd/multilink.h @@ -1,7 +1,7 @@ /* * multilink.h - support routines for multilink. * - * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 2000-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/options.c b/pppd/options.c index 36f59a943..879223d16 100644 --- a/pppd/options.c +++ b/pppd/options.c @@ -1177,7 +1177,7 @@ usage(void) FILE *fp = stderr; if (in_phase(PHASE_INITIALIZE)) { fprintf(fp, "%s v%s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf(fp, "Copyright (C) 1999-2022 Paul Mackerras, and others. All rights reserved.\n\n"); + fprintf(fp, "Copyright (C) 1999-2024 Paul Mackerras, and others. All rights reserved.\n\n"); fprintf(fp, "License BSD: The 3 clause BSD license \n"); diff --git a/pppd/options.h b/pppd/options.h index 8634e877d..4ed08921a 100644 --- a/pppd/options.h +++ b/pppd/options.h @@ -1,7 +1,7 @@ /* * options.h - header declarations for option processing for PPP. * - * Copyright (c) 2000-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 2000-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/pathnames.h b/pppd/pathnames.h index d08e8efc3..ddc5e76db 100644 --- a/pppd/pathnames.h +++ b/pppd/pathnames.h @@ -1,7 +1,7 @@ /* * pathnames.h - define default paths for pppd * - * Copyright (c) 1999-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/plugins/minconn.c b/pppd/plugins/minconn.c index cd61ccd76..016526d59 100644 --- a/pppd/plugins/minconn.c +++ b/pppd/plugins/minconn.c @@ -1,7 +1,7 @@ /* * minconn.c - pppd plugin to implement a `minconnect' option. * - * Copyright (c) 1999 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -15,15 +15,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY diff --git a/pppd/plugins/pppoe/common.c b/pppd/plugins/pppoe/common.c index 31811f59a..8d3b21a14 100644 --- a/pppd/plugins/pppoe/common.c +++ b/pppd/plugins/pppoe/common.c @@ -13,9 +13,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: common.c,v 1.3 2008/06/09 08:34:23 paulus Exp $"; - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/plugins/pppoe/discovery.c b/pppd/plugins/pppoe/discovery.c index c1df4ffad..86bda611b 100644 --- a/pppd/plugins/pppoe/discovery.c +++ b/pppd/plugins/pppoe/discovery.c @@ -8,9 +8,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: discovery.c,v 1.6 2008/06/15 04:35:50 paulus Exp $"; - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/plugins/pppoe/if.c b/pppd/plugins/pppoe/if.c index d5a4624fc..8a0f608b9 100644 --- a/pppd/plugins/pppoe/if.c +++ b/pppd/plugins/pppoe/if.c @@ -13,9 +13,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: if.c,v 1.2 2008/06/09 08:34:23 paulus Exp $"; - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/plugins/pppoe/plugin.c b/pppd/plugins/pppoe/plugin.c index 00e68d54a..b429a2fdf 100644 --- a/pppd/plugins/pppoe/plugin.c +++ b/pppd/plugins/pppoe/plugin.c @@ -22,9 +22,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: plugin.c,v 1.17 2008/06/15 04:35:50 paulus Exp $"; - #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pppd/plugins/pppoe/pppoe.h b/pppd/plugins/pppoe/pppoe.h index 2eb97bd1c..1952dcb2e 100644 --- a/pppd/plugins/pppoe/pppoe.h +++ b/pppd/plugins/pppoe/pppoe.h @@ -9,8 +9,6 @@ * This program may be distributed according to the terms of the GNU * General Public License, version 2 or (at your option) any later version. * -* $Id: pppoe.h,v 1.4 2008/06/15 04:35:50 paulus Exp $ -* ***********************************************************************/ #include /* For FILE */ diff --git a/pppd/plugins/radius/avpair.c b/pppd/plugins/radius/avpair.c index c1e6d2898..5ad1cc902 100644 --- a/pppd/plugins/radius/avpair.c +++ b/pppd/plugins/radius/avpair.c @@ -1,6 +1,4 @@ /* - * $Id: avpair.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/buildreq.c b/pppd/plugins/radius/buildreq.c index c1fda5abb..fe6a8543a 100644 --- a/pppd/plugins/radius/buildreq.c +++ b/pppd/plugins/radius/buildreq.c @@ -1,6 +1,4 @@ /* - * $Id: buildreq.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1997 Lars Fenneberg * * See the file COPYRIGHT for the respective terms and conditions. diff --git a/pppd/plugins/radius/clientid.c b/pppd/plugins/radius/clientid.c index bf26947a0..94a23a6f9 100644 --- a/pppd/plugins/radius/clientid.c +++ b/pppd/plugins/radius/clientid.c @@ -1,6 +1,4 @@ /* - * $Id: clientid.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * See the file COPYRIGHT for the respective terms and conditions. diff --git a/pppd/plugins/radius/config.c b/pppd/plugins/radius/config.c index e1a481487..0499911d0 100644 --- a/pppd/plugins/radius/config.c +++ b/pppd/plugins/radius/config.c @@ -1,6 +1,4 @@ /* - * $Id: config.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/dict.c b/pppd/plugins/radius/dict.c index 6f2657d71..fca8a8baf 100644 --- a/pppd/plugins/radius/dict.c +++ b/pppd/plugins/radius/dict.c @@ -1,6 +1,4 @@ /* - * $Id: dict.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 2002 Roaring Penguin Software Inc. * * Copyright (C) 1995,1996,1997 Lars Fenneberg diff --git a/pppd/plugins/radius/etc/dictionary.microsoft b/pppd/plugins/radius/etc/dictionary.microsoft index da3a317c0..8c7d33cbd 100644 --- a/pppd/plugins/radius/etc/dictionary.microsoft +++ b/pppd/plugins/radius/etc/dictionary.microsoft @@ -1,8 +1,6 @@ # # Microsoft's VSA's, from RFC 2548 # -# $Id: dictionary.microsoft,v 1.1 2004/11/14 07:26:26 paulus Exp $ -# VENDOR Microsoft 311 Microsoft diff --git a/pppd/plugins/radius/includes.h b/pppd/plugins/radius/includes.h index 1e6d87a91..dae1b3b9b 100644 --- a/pppd/plugins/radius/includes.h +++ b/pppd/plugins/radius/includes.h @@ -1,6 +1,4 @@ /* - * $Id: includes.h,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/ip_util.c b/pppd/plugins/radius/ip_util.c index f443185c7..43a7ff0d2 100644 --- a/pppd/plugins/radius/ip_util.c +++ b/pppd/plugins/radius/ip_util.c @@ -1,6 +1,4 @@ /* - * $Id: ip_util.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/lock.c b/pppd/plugins/radius/lock.c index 482e97cdb..50e54faa1 100644 --- a/pppd/plugins/radius/lock.c +++ b/pppd/plugins/radius/lock.c @@ -1,6 +1,4 @@ /* - * $Id: lock.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1997 Lars Fenneberg * * See the file COPYRIGHT for the respective terms and conditions. diff --git a/pppd/plugins/radius/md5.c b/pppd/plugins/radius/md5.c index ec3a7dd78..5038c9ae7 100644 --- a/pppd/plugins/radius/md5.c +++ b/pppd/plugins/radius/md5.c @@ -1,6 +1,3 @@ -/* - * $Id: md5.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - */ #include #include diff --git a/pppd/plugins/radius/options.h b/pppd/plugins/radius/options.h index f4ad986a0..484288250 100644 --- a/pppd/plugins/radius/options.h +++ b/pppd/plugins/radius/options.h @@ -1,6 +1,4 @@ /* - * $Id: options.h,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1996 Lars Fenneberg * * See the file COPYRIGHT for the respective terms and conditions. diff --git a/pppd/plugins/radius/pathnames.h b/pppd/plugins/radius/pathnames.h index 3a00d2c1e..0a8495e71 100644 --- a/pppd/plugins/radius/pathnames.h +++ b/pppd/plugins/radius/pathnames.h @@ -1,6 +1,4 @@ /* - * $Id: pathnames.h,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/pppd-radattr.8 b/pppd/plugins/radius/pppd-radattr.8 index 1346fdd30..5c54d2eb4 100644 --- a/pppd/plugins/radius/pppd-radattr.8 +++ b/pppd/plugins/radius/pppd-radattr.8 @@ -1,5 +1,4 @@ .\" manual page [] for RADATTR plugin for pppd 2.4 -.\" $Id: pppd-radattr.8,v 1.2 2003/04/25 07:33:20 fcusack Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/pppd/plugins/radius/pppd-radius.8 b/pppd/plugins/radius/pppd-radius.8 index 8628d08c3..939385116 100644 --- a/pppd/plugins/radius/pppd-radius.8 +++ b/pppd/plugins/radius/pppd-radius.8 @@ -1,5 +1,4 @@ .\" manual page [] for RADIUS plugin for pppd 2.4 -.\" $Id: pppd-radius.8,v 1.5 2004/03/26 13:27:17 kad Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/pppd/plugins/radius/radattr.c b/pppd/plugins/radius/radattr.c index 802cb66c3..69ee766c1 100644 --- a/pppd/plugins/radius/radattr.c +++ b/pppd/plugins/radius/radattr.c @@ -14,9 +14,6 @@ * ***********************************************************************/ -static char const RCSID[] = -"$Id: radattr.c,v 1.2 2004/10/28 00:24:40 paulus Exp $"; - #include #include #include diff --git a/pppd/plugins/radius/radius.c b/pppd/plugins/radius/radius.c index e99bc7511..cec02f4e6 100644 --- a/pppd/plugins/radius/radius.c +++ b/pppd/plugins/radius/radius.c @@ -23,8 +23,6 @@ * General Public License, version 2 or (at your option) any later version. * ***********************************************************************/ -static char const RCSID[] = -"$Id: radius.c,v 1.32 2008/05/26 09:18:08 paulus Exp $"; #include #include diff --git a/pppd/plugins/radius/radiusclient.h b/pppd/plugins/radius/radiusclient.h index 5292ce11b..0af23ac34 100644 --- a/pppd/plugins/radius/radiusclient.h +++ b/pppd/plugins/radius/radiusclient.h @@ -1,6 +1,4 @@ /* - * $Id: radiusclient.h,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997,1998 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/radrealms.c b/pppd/plugins/radius/radrealms.c index ab923cc11..2702a40b0 100644 --- a/pppd/plugins/radius/radrealms.c +++ b/pppd/plugins/radius/radrealms.c @@ -14,9 +14,6 @@ * */ -static char const RCSID[] = - "$Id: radrealms.c,v 1.2 2004/11/14 07:26:26 paulus Exp $"; - #include #include #include diff --git a/pppd/plugins/radius/sendserver.c b/pppd/plugins/radius/sendserver.c index 6553b0ea5..54648958c 100644 --- a/pppd/plugins/radius/sendserver.c +++ b/pppd/plugins/radius/sendserver.c @@ -1,6 +1,4 @@ /* - * $Id: sendserver.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/plugins/radius/util.c b/pppd/plugins/radius/util.c index 406572492..aaadb283d 100644 --- a/pppd/plugins/radius/util.c +++ b/pppd/plugins/radius/util.c @@ -1,6 +1,4 @@ /* - * $Id: util.c,v 1.1 2004/11/14 07:26:26 paulus Exp $ - * * Copyright (C) 1995,1996,1997 Lars Fenneberg * * Copyright 1992 Livingston Enterprises, Inc. diff --git a/pppd/pppd-private.h b/pppd/pppd-private.h index a1db34d36..d8ec443e6 100644 --- a/pppd/pppd-private.h +++ b/pppd/pppd-private.h @@ -38,8 +38,6 @@ * 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. - * - * $Id: pppd.h,v 1.96 2008/06/23 11:47:18 paulus Exp $ */ #ifndef PPP_PPPD_PRIVATE_H diff --git a/pppd/pppd.8 b/pppd/pppd.8 index 3279e4b94..d2c88e3cf 100644 --- a/pppd/pppd.8 +++ b/pppd/pppd.8 @@ -5,7 +5,7 @@ .\" IP indented paragraph .\" TP hanging label .\" -.\" Copyright (c) 1993-2003 Paul Mackerras +.\" Copyright (c) 1993-2024 Paul Mackerras .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above diff --git a/pppd/srp-entry.8 b/pppd/srp-entry.8 index 097281a2c..7564c08b9 100644 --- a/pppd/srp-entry.8 +++ b/pppd/srp-entry.8 @@ -1,5 +1,4 @@ .\" manual page [] for srp-entry -.\" $Id: srp-entry.8,v 1.2 2004/11/13 12:22:49 paulus Exp $ .\" SH section heading .\" SS subsection heading .\" LP paragraph diff --git a/pppd/sys-linux.c b/pppd/sys-linux.c index b4972317b..b94f3ecc7 100644 --- a/pppd/sys-linux.c +++ b/pppd/sys-linux.c @@ -2,7 +2,7 @@ * sys-linux.c - System-dependent procedures for setting up * PPP interfaces on Linux systems * - * Copyright (c) 1994-2004 Paul Mackerras. All rights reserved. + * Copyright (c) 1994-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -11,14 +11,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/sys-solaris.c b/pppd/sys-solaris.c index eecf50f09..e44210899 100644 --- a/pppd/sys-solaris.c +++ b/pppd/sys-solaris.c @@ -18,7 +18,7 @@ * ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR * DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES * - * Copyright (c) 1995-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1995-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,14 +27,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/tty.c b/pppd/tty.c index d22ded751..2531ce1e3 100644 --- a/pppd/tty.c +++ b/pppd/tty.c @@ -1,7 +1,7 @@ /* * tty.c - code for handling serial ports in pppd. * - * Copyright (C) 2000-2004 Paul Mackerras. All rights reserved. + * Copyright (C) 2000-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppd/utils.c b/pppd/utils.c index edda5038f..c995e3c81 100644 --- a/pppd/utils.c +++ b/pppd/utils.c @@ -1,7 +1,7 @@ /* * utils.c - various utility functions used in pppd. * - * Copyright (c) 1999-2002 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -10,14 +10,10 @@ * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * - * 2. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 3. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". + * 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. * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY diff --git a/pppdump/pppdump.8 b/pppdump/pppdump.8 index 1116b8561..c3f29f9c8 100644 --- a/pppdump/pppdump.8 +++ b/pppdump/pppdump.8 @@ -1,4 +1,3 @@ -.\" @(#) $Id: pppdump.8,v 1.2 2004/11/13 12:22:49 paulus Exp $ .TH PPPDUMP 8 "1 April 1999" .SH NAME pppdump \- convert PPP record file to readable format diff --git a/pppdump/pppdump.c b/pppdump/pppdump.c index 16a5ffb7f..c24208af5 100644 --- a/pppdump/pppdump.c +++ b/pppdump/pppdump.c @@ -2,7 +2,7 @@ * pppdump - print out the contents of a record file generated by * pppd in readable form. * - * Copyright (c) 1999 Paul Mackerras. All rights reserved. + * Copyright (c) 1999-2024 Paul Mackerras. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -16,15 +16,6 @@ * the documentation and/or other materials provided with the * distribution. * - * 3. The name(s) of the authors of this software must not be used to - * endorse or promote products derived from this software without - * prior written permission. - * - * 4. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by Paul Mackerras - * ". - * * THE AUTHORS OF THIS SOFTWARE DISCLAIM ALL WARRANTIES WITH REGARD TO * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY * AND FITNESS, IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY diff --git a/pppstats/pppstats.8 b/pppstats/pppstats.8 index cabf4d7ab..94c6fc552 100644 --- a/pppstats/pppstats.8 +++ b/pppstats/pppstats.8 @@ -1,4 +1,3 @@ -.\" @(#) $Id: pppstats.8,v 1.4 2004/11/13 12:22:49 paulus Exp $ .TH PPPSTATS 8 "26 June 1995" .SH NAME pppstats \- print PPP statistics diff --git a/pppstats/pppstats.c b/pppstats/pppstats.c index 22d115463..606ea51e3 100644 --- a/pppstats/pppstats.c +++ b/pppstats/pppstats.c @@ -35,10 +35,6 @@ #define const #endif -#ifndef lint -static const char rcsid[] = "$Id: pppstats.c,v 1.29 2002/10/27 12:56:26 fcusack Exp $"; -#endif - #include #include #include diff --git a/scripts/poff b/scripts/poff index 5b45d98a2..38b888b3c 100644 --- a/scripts/poff +++ b/scripts/poff @@ -1,6 +1,5 @@ #!/bin/sh -# $Id: poff,v 1.1 2002/11/24 23:30:44 etbe Exp $ # Written by John Hasler and based on work # by Phil Hands . Distributed under the GNU GPL