From 5980ffbc8d34c2be3a1a90f578dce4d237a92a2e Mon Sep 17 00:00:00 2001 From: Miroslav Kubelik Date: Mon, 14 Nov 2011 17:21:20 +0000 Subject: [PATCH] license changed to the BSD license git-svn-id: http://svn.php.net/repository/pecl/rrd/trunk@319181 c90b9560-bf6c-de11-be94-00142212c4b1 --- LICENSE | 82 ++++++++++++---------------------------------------- package.xml | 25 ++++++++++++---- php_rrd.h | 28 +++++++----------- rrd.c | 27 ++++++----------- rrd_create.c | 26 ++++++----------- rrd_create.h | 26 ++++++----------- rrd_graph.c | 26 ++++++----------- rrd_graph.h | 26 ++++++----------- rrd_info.c | 26 ++++++----------- rrd_info.h | 26 ++++++----------- rrd_update.c | 26 ++++++----------- rrd_update.h | 26 ++++++----------- 12 files changed, 129 insertions(+), 241 deletions(-) diff --git a/LICENSE b/LICENSE index 3cc8b77..60d2ca9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,68 +1,22 @@ --------------------------------------------------------------------- - The PHP License, version 3.01 -Copyright (c) 1999 - 2010 The PHP Group. All rights reserved. --------------------------------------------------------------------- +Copyright (c) 2010 - 2011, Miroslav Kubelík +All rights reserved. Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: +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 "PHP" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact group@php.net. - - 4. Products derived from this software may not be called "PHP", nor - may "PHP" appear in their name, without prior written permission - from group@php.net. You may indicate that your software works in - conjunction with PHP by saying "Foo for PHP" instead of calling - it "PHP Foo" or "phpfoo" - - 5. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the terms - of that version. You may also choose to use such covered code - under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. +* Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +* 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 - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP software, freely available from - ". - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND -ANY EXPRESSED 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 PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS 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. - --------------------------------------------------------------------- - -This software consists of voluntary contributions made by many -individuals on behalf of the PHP Group. - -The PHP Group can be contacted via Email at group@php.net. - -For more information on the PHP Group and the PHP project, -please see . - -PHP includes the Zend Engine, freely available at -. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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. diff --git a/package.xml b/package.xml index db3975a..45bef9d 100644 --- a/package.xml +++ b/package.xml @@ -11,18 +11,18 @@ yes - 2011-09-27 + 2011-11-15 - 1.0.5RC2 + 1.0.5 1.0.5 - beta + stable stable - PHP License + BSD @@ -84,6 +84,21 @@ rrd + + + 1.0.5 + 1.0.5 + + + stable + stable + + + + 2011-11-15 + 1.0.5RC2 diff --git a/php_rrd.h b/php_rrd.h index c4b0f71..ea25276 100644 --- a/php_rrd.h +++ b/php_rrd.h @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifndef PHP_RRD_H #define PHP_RRD_H @@ -22,7 +14,7 @@ extern zend_module_entry rrd_module_entry; #define phpext_rrd_ptr &rrd_module_entry -#define PHP_RRD_VERSION "1.0.5RC2" +#define PHP_RRD_VERSION "1.0.5" #ifdef ZTS #include "TSRM.h" diff --git a/rrd.c b/rrd.c index 58e31ba..5d0bae9 100644 --- a/rrd.c +++ b/rrd.c @@ -1,21 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ - +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/rrd_create.c b/rrd_create.c index 9e9ee3e..9be82e7 100644 --- a/rrd_create.c +++ b/rrd_create.c @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/rrd_create.h b/rrd_create.h index 3b8742a..7c876d9 100644 --- a/rrd_create.h +++ b/rrd_create.h @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifndef RRD_CREATE_H #define RRD_CREATE_H diff --git a/rrd_graph.c b/rrd_graph.c index 6e62296..380325a 100644 --- a/rrd_graph.c +++ b/rrd_graph.c @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/rrd_graph.h b/rrd_graph.h index 0f204ea..83cc2ee 100644 --- a/rrd_graph.h +++ b/rrd_graph.h @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifndef RRD_GRAPH_H #define RRD_GRAPH_H diff --git a/rrd_info.c b/rrd_info.c index 08589af..3c2cc2f 100644 --- a/rrd_info.c +++ b/rrd_info.c @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/rrd_info.h b/rrd_info.h index cca30d5..7f1818e 100644 --- a/rrd_info.h +++ b/rrd_info.h @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifndef RRD_INFO_H #define RRD_INFO_H diff --git a/rrd_update.c b/rrd_update.c index 4bbe3a6..5a2112b 100644 --- a/rrd_update.c +++ b/rrd_update.c @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/rrd_update.h b/rrd_update.h index 47c8783..01bbbca 100644 --- a/rrd_update.h +++ b/rrd_update.h @@ -1,20 +1,12 @@ -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2011 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Author: Miroslav Kubelik | - +----------------------------------------------------------------------+ -*/ +/** + * PHP bindings to the rrdtool + * + * This source file is subject to the BSD license that is bundled + * with this package in the file LICENSE. + * --------------------------------------------------------------- + * Author: Miroslav Kubelik + * --------------------------------------------------------------- + */ #ifndef RRD_UPDATE_H #define RRD_UPDATE_H