diff --git a/LICENSE b/LICENSE index 3e48203..b225cf5 100644 --- a/LICENSE +++ b/LICENSE @@ -1,68 +1,22 @@ --------------------------------------------------------------------- - The PHP License, version 3.01 -Copyright (c) 1999 - 2005 The PHP Group. All rights reserved. --------------------------------------------------------------------- +Copyright (c) 2005, Thilo Raufeisen . +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/gnupg.c b/gnupg.c index 8257648..f15eba8 100644 --- a/gnupg.c +++ b/gnupg.c @@ -1,15 +1,13 @@ /* - +----------------------------------------------------------------------+ - | Copyright (c) 2005 Thilo Raufeisen | - +----------------------------------------------------------------------+ - | 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. | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: gnupg | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2005, Thilo Raufeisen | + +--------------------------------------------------------------------+ */ /* $Id$ */ diff --git a/gnupg_keylistiterator.c b/gnupg_keylistiterator.c index 3b5b7b9..703b320 100644 --- a/gnupg_keylistiterator.c +++ b/gnupg_keylistiterator.c @@ -1,15 +1,13 @@ /* - +----------------------------------------------------------------------+ - | Copyright (c) 2005 Thilo Raufeisen | - +----------------------------------------------------------------------+ - | 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. | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: gnupg | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2005, Thilo Raufeisen | + +--------------------------------------------------------------------+ */ /* $Id$ */ diff --git a/package.xml b/package.xml index c5fa7e3..509107f 100644 --- a/package.xml +++ b/package.xml @@ -15,10 +15,10 @@ 0.7 - 2005-11-28 - PHP License 3.01 + 2005-11-29 + BSD, revised beta - changed licence to PHP Licence 3.01 + changed licence to BSD, revised fixed error during keyimport when the keyring is not writeable fixed error when an invalid errormode is passed to seterrormode @@ -47,9 +47,9 @@ fixed error when an invalid errormode is passed to seterrormode 0.7 - 2005-11-28 + 2005-11-29 beta - changed licence to PHP Licence 3.01 + changed licence to BSD, revised fixed error during keyimport when the keyring is not writeable fixed error when an invalid errormode is passed to seterrormode diff --git a/package2.xml b/package2.xml index 22b1851..d03d389 100644 --- a/package2.xml +++ b/package2.xml @@ -15,8 +15,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> traufeisen@php.net yes - 2005-11-28 - + 2005-11-29 + 0.7 0.7 @@ -25,8 +25,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta beta - PHP License 3.01 - changed licence to PHP Licence 3.01 + BSD, revised + changed licence to BSD, revised fixed error during keyimport when the keyring is not writeable fixed error when an invalid errormode is passed to seterrormode @@ -75,9 +75,9 @@ fixed error when an invalid errormode is passed to seterrormode beta beta - 2005-11-28 - PHP License 3.01 - changed licence to PHP Licence 3.01 + 2005-11-29 + BSD, revised + changed licence to BSD, revised fixed error during keyimport when the keyring is not writeable fixed error when an invalid errormode is passed to seterrormode @@ -92,7 +92,7 @@ fixed error when an invalid errormode is passed to seterrormode beta 2005-11-12 - PHP License 3.01 + BSD, revised fixed zts build @@ -106,7 +106,7 @@ fixed error when an invalid errormode is passed to seterrormode beta 2005-11-12 - PHP License 3.01 + BSD, revised + added seterrormode - various memory optimizations @@ -121,7 +121,7 @@ fixed error when an invalid errormode is passed to seterrormode beta 2005-10-25 - PHP License 3.01 + BSD, revised now supports multiple keys. added getsignatures. verify can now handle all signature types. therefore the API has changed. @@ -135,7 +135,7 @@ fixed error when an invalid errormode is passed to seterrormode beta 2005-10-17 - PHP License 3.01 + BSD, revised added procedual usage and lowered min PHP Version to 4.3 @@ -149,7 +149,7 @@ fixed error when an invalid errormode is passed to seterrormode beta 2005-10-15 - PHP License 3.01 + BSD, revised added import/export methods and better errormessages @@ -163,7 +163,7 @@ fixed error when an invalid errormode is passed to seterrormode beta 2005-10-10 - PHP License 3.01 + BSD, revised added keylistiterator, encryptsign and decryptverify @@ -177,7 +177,7 @@ fixed error when an invalid errormode is passed to seterrormode beta 2005-10-07 - PHP License 3.01 + BSD, revised initial release diff --git a/php_gnupg.h b/php_gnupg.h index cdeb048..a785b4c 100644 --- a/php_gnupg.h +++ b/php_gnupg.h @@ -1,15 +1,13 @@ /* - +----------------------------------------------------------------------+ - | Copyright (c) 2005 Thilo Raufeisen | - +----------------------------------------------------------------------+ - | 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. | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: gnupg | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2005, Thilo Raufeisen | + +--------------------------------------------------------------------+ */ /* $Id$ */ diff --git a/php_gnupg_keylistiterator.h b/php_gnupg_keylistiterator.h index 18e15b2..eda055c 100644 --- a/php_gnupg_keylistiterator.h +++ b/php_gnupg_keylistiterator.h @@ -1,15 +1,13 @@ /* - +----------------------------------------------------------------------+ - | Copyright (c) 2005 Thilo Raufeisen | - +----------------------------------------------------------------------+ - | 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. | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: gnupg | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2005, Thilo Raufeisen | + +--------------------------------------------------------------------+ */ /* $Id$ */