From: Vincent Bernat Date: Fri, 20 May 2011 15:18:24 +0000 (+0200) Subject: Update ISC license wording. X-Git-Tag: 0.5.4~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=514341259194dbff7dd8992c57d932f01413c99c;p=thirdparty%2Flldpd.git Update ISC license wording. See: http://en.wikipedia.org/wiki/ISC_license --- diff --git a/README.md b/README.md index 8eef6da3..f33ca980 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ More information: lldpd is distributed under the following license: - > Permission to use, copy, modify, and distribute this software for any + > Permission to use, copy, modify, and/or 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. > diff --git a/debian/copyright b/debian/copyright index c76687e4..bf3f7dc9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Copyright: © 2008 Vincent Bernat © 2003 Can Erkin Acar © 2003 Anil Madhavapeddy License: MIT - Permission to use, copy, modify, and distribute this software for any + Permission to use, copy, modify, and/or 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. diff --git a/man/lldpctl.8 b/man/lldpctl.8 index eb7040d5..9025632e 100644 --- a/man/lldpctl.8 +++ b/man/lldpctl.8 @@ -1,7 +1,7 @@ .\" Copyright (c) 2006 Pierre-Yves Ritschard .\" Copyright (c) 2008 Vincent Bernat .\" -.\" Permission to use, copy, modify, and distribute this software for any +.\" Permission to use, copy, modify, and/or 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. .\" diff --git a/man/lldpd.8 b/man/lldpd.8 index 3df1d5d7..6d5fcbce 100644 --- a/man/lldpd.8 +++ b/man/lldpd.8 @@ -1,7 +1,7 @@ .\" Copyright (c) 2006 Pierre-Yves Ritschard .\" Copyright (c) 2008 Vincent Bernat .\" -.\" Permission to use, copy, modify, and distribute this software for any +.\" Permission to use, copy, modify, and/or 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. .\" diff --git a/src/agent.c b/src/agent.c index 47eeac85..cb829dee 100644 --- a/src/agent.c +++ b/src/agent.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/agent_priv.c b/src/agent_priv.c index a74bc760..ab6b065a 100644 --- a/src/agent_priv.c +++ b/src/agent_priv.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/cdp.c b/src/cdp.c index d8717151..063315fb 100644 --- a/src/cdp.c +++ b/src/cdp.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/cdp.h b/src/cdp.h index 8f2e087f..904506da 100644 --- a/src/cdp.h +++ b/src/cdp.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/client.c b/src/client.c index 8d87f018..7a9e7ab0 100644 --- a/src/client.c +++ b/src/client.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/ctl-server.c b/src/ctl-server.c index 8f45df67..090db258 100644 --- a/src/ctl-server.c +++ b/src/ctl-server.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/ctl.c b/src/ctl.c index 60937206..3bf38030 100644 --- a/src/ctl.c +++ b/src/ctl.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/display.c b/src/display.c index cde5fa02..c417ec6f 100644 --- a/src/display.c +++ b/src/display.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/dmi.c b/src/dmi.c index ccef56de..367ae0d0 100644 --- a/src/dmi.c +++ b/src/dmi.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2009 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/edp.c b/src/edp.c index 810cab67..ee210065 100644 --- a/src/edp.c +++ b/src/edp.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/edp.h b/src/edp.h index 9a4f6c28..ffa92ddf 100644 --- a/src/edp.h +++ b/src/edp.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/frame.c b/src/frame.c index a0ee59a0..d091e596 100644 --- a/src/frame.c +++ b/src/frame.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2009 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/frame.h b/src/frame.h index 497f6502..c7edb6b0 100644 --- a/src/frame.h +++ b/src/frame.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2009 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/interfaces.c b/src/interfaces.c index eded64da..6dc319a0 100644 --- a/src/interfaces.c +++ b/src/interfaces.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/kv_writer.c b/src/kv_writer.c index ec0b4e5c..efc8ec77 100644 --- a/src/kv_writer.c +++ b/src/kv_writer.c @@ -2,7 +2,7 @@ * Copyright (c) 2010 Andreas Hofmeister * 2010 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/lldp.c b/src/lldp.c index 28680f28..9d7cc4d1 100644 --- a/src/lldp.c +++ b/src/lldp.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/lldp.h b/src/lldp.h index 06a15d67..273cb730 100644 --- a/src/lldp.h +++ b/src/lldp.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/lldpctl.c b/src/lldpctl.c index bab295de..0c2b3788 100644 --- a/src/lldpctl.c +++ b/src/lldpctl.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/lldpd.c b/src/lldpd.c index b620b203..b19af112 100644 --- a/src/lldpd.c +++ b/src/lldpd.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/lldpd.h b/src/lldpd.h index f03bd142..9543d73e 100644 --- a/src/lldpd.h +++ b/src/lldpd.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/log.c b/src/log.c index 8e0c0de4..2b110f43 100644 --- a/src/log.c +++ b/src/log.c @@ -3,7 +3,7 @@ /* * Copyright (c) 2003, 2004 Henning Brauer * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/priv.c b/src/priv.c index 1129e375..6e715e97 100644 --- a/src/priv.c +++ b/src/priv.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * @@ -573,7 +573,7 @@ priv_init(char *chrootdir) * Copyright (c) 2003 Can Erkin Acar * Copyright (c) 2003 Anil Madhavapeddy * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/sonmp.c b/src/sonmp.c index c2a9a378..a7a8f13e 100644 --- a/src/sonmp.c +++ b/src/sonmp.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/sonmp.h b/src/sonmp.h index f2051ac4..68502dc7 100644 --- a/src/sonmp.h +++ b/src/sonmp.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2008 Vincent Bernat * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/strlcpy.c b/src/strlcpy.c index d32b6590..c30566a7 100644 --- a/src/strlcpy.c +++ b/src/strlcpy.c @@ -3,7 +3,7 @@ /* * Copyright (c) 1998 Todd C. Miller * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/text_writer.c b/src/text_writer.c index b83ec9c6..b76cdcb5 100644 --- a/src/text_writer.c +++ b/src/text_writer.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2010 Andreas Hofmeister * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/writer.h b/src/writer.h index dadc2017..b2479c35 100644 --- a/src/writer.h +++ b/src/writer.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2010 Andreas Hofmeister * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. * diff --git a/src/xml_writer.c b/src/xml_writer.c index cfcef7e9..de404fba 100644 --- a/src/xml_writer.c +++ b/src/xml_writer.c @@ -1,7 +1,7 @@ /* * Copyright (c) 2010 Andreas Hofmeister * - * Permission to use, copy, modify, and distribute this software for any + * Permission to use, copy, modify, and/or 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. *