[CLEANUP] O'Reilly has clarified its license

O'Reilly has clarified its license affecting 6 files contained in
haproxy up to and including 1.3.12.X. The updated license has been
included within these files.

These files are no longer present in versions starting from 1.3.13,
but it was better to clear any doubt about the redistribution
conditions at least for 1.3.12.

Special thanks to the people at the Fedora Project for their efforts
in getting in touch with O'Reilly to clarify the license.

diff --git a/include/common/chtbl.h b/include/common/chtbl.h
index cddb20796003581777cc9a283088cb6f7cf39f8c..ff76422a49d571a24588ad9c8861e0a523ebda90 100644 (file)
--- a/include/common/chtbl.h
+++ b/include/common/chtbl.h
@@ -7,6 +7,31 @@
   ISBN: 1-56592-453-3
   Publishd by O'Reilly
   
+  Updated O'Reilly's copyright notice follows :
+
+  Copyright (c) 1999 O'Reilly & Associates, Inc.
+
+  Mastering Algorithms with C
+  Kyle Loudon
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE, OR ANY OTHER
+  DEALINGS IN THE SOFTWARE.
+
  */
 
 /*****************************************************************************

diff --git a/include/common/hashpjw.h b/include/common/hashpjw.h
index 8d3998c6a1a27a97fe2c4c18b84534e0216342bd..80a570bb27f9c7f320d5bb1d75856eea415bdcde 100644 (file)
--- a/include/common/hashpjw.h
+++ b/include/common/hashpjw.h
@@ -8,6 +8,32 @@
   Publishd by O'Reilly
 
   We have added our own struct to these function.
+
+  Updated O'Reilly's copyright notice follows :
+
+  Copyright (c) 1999 O'Reilly & Associates, Inc.
+
+  Mastering Algorithms with C
+  Kyle Loudon
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE, OR ANY OTHER
+  DEALINGS IN THE SOFTWARE.
+
  */
 
 /*****************************************************************************

diff --git a/include/common/list.h b/include/common/list.h
index 91a5084ddaceddcd82a7ca6c839137e6323f5919..d3569359a858d880f17249196fbe83c7d2f26c15 100644 (file)
--- a/include/common/list.h
+++ b/include/common/list.h
@@ -7,6 +7,31 @@
   ISBN: 1-56592-453-3
   Publishd by O'Reilly
   
+  Updated O'Reilly's copyright notice follows :
+
+  Copyright (c) 1999 O'Reilly & Associates, Inc.
+
+  Mastering Algorithms with C
+  Kyle Loudon
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE, OR ANY OTHER
+  DEALINGS IN THE SOFTWARE.
+
  */
 
 /*****************************************************************************

diff --git a/src/chtbl.c b/src/chtbl.c
index 08eebb819535071497e7b09a7c4903abe13e2339..172f959f52e230243440dee76dc55a459bc46665 100644 (file)
--- a/src/chtbl.c
+++ b/src/chtbl.c
@@ -7,6 +7,31 @@
   ISBN: 1-56592-453-3
   Publishd by O'Reilly
   
+  Updated O'Reilly's copyright notice follows :
+
+  Copyright (c) 1999 O'Reilly & Associates, Inc.
+
+  Mastering Algorithms with C
+  Kyle Loudon
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE, OR ANY OTHER
+  DEALINGS IN THE SOFTWARE.
+
  */
 
 /*****************************************************************************

diff --git a/src/hashpjw.c b/src/hashpjw.c
index 17ef3a2859afb4b5f115ef55eb8527f51be9ffb3..0c064a4c2ef5b91af9eaf52bd4d2105bc2f28548 100644 (file)
--- a/src/hashpjw.c
+++ b/src/hashpjw.c
@@ -8,6 +8,32 @@
   Publishd by O'Reilly
 
   We have added our own struct to these function.
+
+  Updated O'Reilly's copyright notice follows :
+
+  Copyright (c) 1999 O'Reilly & Associates, Inc.
+
+  Mastering Algorithms with C
+  Kyle Loudon
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE, OR ANY OTHER
+  DEALINGS IN THE SOFTWARE.
+
  */
 
 /*****************************************************************************

diff --git a/src/list.c b/src/list.c
index f23686aa36b8d3193bfbd91ef72cb1c43e8a49ac..a2062a3f73e84414b7be18783ce004fd71278b74 100644 (file)
--- a/src/list.c
+++ b/src/list.c
@@ -7,6 +7,31 @@
   ISBN: 1-56592-453-3
   Publishd by O'Reilly
   
+  Updated O'Reilly's copyright notice follows :
+
+  Copyright (c) 1999 O'Reilly & Associates, Inc.
+
+  Mastering Algorithms with C
+  Kyle Loudon
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE, AND NONINFRINGEMENT. IN NO EVENT SHALL
+  THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES, OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE, OR ANY OTHER
+  DEALINGS IN THE SOFTWARE.
+
  */
 
 /*****************************************************************************