[sork] Change license of Horde sork modules
Gregory Colpart
reg at evolix.fr
Tue Jun 20 01:34:23 PDT 2006
Hi,
On Sun, Jun 11, 2006 at 10:16:30PM -0400, Chuck Hagenbuch wrote:
> Quoting Gregory Colpart <reg at evolix.fr>:
>
> >Then changing license of Forward sork modules to BSD-like
> >license (in LICENSE file and headers of PHP files) seems okay.
> >I can make a trivial patch if you want.
>
> Yes, please. It is trivial, but as long as you're willing to save me
> some time I'm going to say yes. :)
Patch on attachment.
Regards,
--
Gregory Colpart <reg at evolix.fr> GnuPG:1024D/C1027A0E
Evolix - Informatique et Logiciels Libres http://www.evolix.fr/
-------------- next part --------------
diff -rcP forwards.ori/docs/CHANGES forwards/docs/CHANGES
*** forwards.ori/docs/CHANGES 2006-06-20 10:00:41.000000000 +0200
--- forwards/docs/CHANGES 2006-06-20 10:17:28.000000000 +0200
***************
*** 2,8 ****
v3.1-cvs
----------
!
----------
--- 2,8 ----
v3.1-cvs
----------
! [reg] Switch to BSD-like license.
----------
diff -rcP forwards.ori/index.php forwards/index.php
*** forwards.ori/index.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/index.php 2006-06-20 10:13:37.000000000 +0200
***************
*** 4,11 ****
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*/
@define('FORWARDS_BASE', dirname(__FILE__));
--- 4,11 ----
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*/
@define('FORWARDS_BASE', dirname(__FILE__));
diff -rcP forwards.ori/lib/base.php forwards/lib/base.php
*** forwards.ori/lib/base.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/base.php 2006-06-20 10:17:57.000000000 +0200
***************
*** 9,16 ****
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*/
// Check for a prior definition of HORDE_BASE (perhaps by an auto_prepend_file
--- 9,16 ----
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*/
// Check for a prior definition of HORDE_BASE (perhaps by an auto_prepend_file
diff -rcP forwards.ori/lib/Driver/customsql.php forwards/lib/Driver/customsql.php
*** forwards.ori/lib/Driver/customsql.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/Driver/customsql.php 2006-06-20 10:19:50.000000000 +0200
***************
*** 6,13 ****
*
* Copyright 2004-2006 Kendrick Vargas <ken at hudat.com>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*
* @author Kendrick Vargas <ken at hudat.com>
* @since Forwards 3.0
--- 6,13 ----
*
* Copyright 2004-2006 Kendrick Vargas <ken at hudat.com>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*
* @author Kendrick Vargas <ken at hudat.com>
* @since Forwards 3.0
diff -rcP forwards.ori/lib/Driver/forwards.php forwards/lib/Driver/forwards.php
*** forwards.ori/lib/Driver/forwards.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/Driver/forwards.php 2006-06-20 10:20:52.000000000 +0200
***************
*** 7,14 ****
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*
* @author Eric Rostetter <eric.rostetter at physics.utexas.edu>
* @since Forwards 2.1
--- 7,14 ----
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*
* @author Eric Rostetter <eric.rostetter at physics.utexas.edu>
* @since Forwards 2.1
diff -rcP forwards.ori/lib/Driver/ldap.php forwards/lib/Driver/ldap.php
*** forwards.ori/lib/Driver/ldap.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/Driver/ldap.php 2006-06-20 10:20:13.000000000 +0200
***************
*** 7,14 ****
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*
* @author Eric Rostetter <eric.rostetter at physics.utexas.edu>
* @package Forwards
--- 7,14 ----
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*
* @author Eric Rostetter <eric.rostetter at physics.utexas.edu>
* @package Forwards
diff -rcP forwards.ori/lib/Driver/mdaemon.php forwards/lib/Driver/mdaemon.php
*** forwards.ori/lib/Driver/mdaemon.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/Driver/mdaemon.php 2006-06-20 10:21:09.000000000 +0200
***************
*** 7,14 ****
*
* Copyright 2001-2006 Mike Cochrane <mike at graftonhall.co.nz>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*
* @author Mike Cochrane <mike at graftonhall.co.nz>
* @since Forwards 2.1
--- 7,14 ----
*
* Copyright 2001-2006 Mike Cochrane <mike at graftonhall.co.nz>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*
* @author Mike Cochrane <mike at graftonhall.co.nz>
* @since Forwards 2.1
diff -rcP forwards.ori/lib/Driver/qmail.php forwards/lib/Driver/qmail.php
*** forwards.ori/lib/Driver/qmail.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/Driver/qmail.php 2006-06-20 10:23:36.000000000 +0200
***************
*** 7,14 ****
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*
* @author Eric Rostetter <eric.rostetter at physics.utexas.edu>
* @since Forwards 2.2
--- 7,14 ----
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*
* @author Eric Rostetter <eric.rostetter at physics.utexas.edu>
* @since Forwards 2.2
diff -rcP forwards.ori/lib/Driver/soap.php forwards/lib/Driver/soap.php
*** forwards.ori/lib/Driver/soap.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/Driver/soap.php 2006-06-20 10:21:31.000000000 +0200
***************
*** 10,17 ****
*
* Copyright 2004-2006 Marc Jauvin <marc at r4l.com>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*
* @author Marc Jauvin <marc at r4l.com>
* @since Forwards 3.0
--- 10,17 ----
*
* Copyright 2004-2006 Marc Jauvin <marc at r4l.com>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*
* @author Marc Jauvin <marc at r4l.com>
* @since Forwards 3.0
diff -rcP forwards.ori/lib/Driver/sql.php forwards/lib/Driver/sql.php
*** forwards.ori/lib/Driver/sql.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/Driver/sql.php 2006-06-20 10:20:32.000000000 +0200
***************
*** 7,14 ****
* Copyright 2001-2006 Ilya Krel <mail at krel.org>
* Copyright 2001-2006 Mike Cochrane <mike at graftonhall.co.nz>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*
* @author Ilya Krel <mail at krel.org>
* @author Mike Cochrane <mike at graftonhall.co.nz>
--- 7,14 ----
* Copyright 2001-2006 Ilya Krel <mail at krel.org>
* Copyright 2001-2006 Mike Cochrane <mike at graftonhall.co.nz>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*
* @author Ilya Krel <mail at krel.org>
* @author Mike Cochrane <mike at graftonhall.co.nz>
diff -rcP forwards.ori/lib/Driver.php forwards/lib/Driver.php
*** forwards.ori/lib/Driver.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/lib/Driver.php 2006-06-20 10:18:22.000000000 +0200
***************
*** 7,14 ****
*
* Copyright 2001-2006 Mike Cochrane <mike at graftonhall.co.nz>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*
* @author Mike Cochrane <mike at graftonhall.co.nz>
* @since Forwards 2.1
--- 7,14 ----
*
* Copyright 2001-2006 Mike Cochrane <mike at graftonhall.co.nz>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*
* @author Mike Cochrane <mike at graftonhall.co.nz>
* @since Forwards 2.1
diff -rcP forwards.ori/LICENSE forwards/LICENSE
*** forwards.ori/LICENSE 2006-06-20 10:12:16.000000000 +0200
--- forwards/LICENSE 2006-06-20 10:11:35.000000000 +0200
***************
*** 1,48 ****
! Version 1.0
!
! Copyright (c) 2001-2006 The Horde Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
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 end-user documentation included with the redistribution, if
! any, must include the following acknowledgment:
!
! "This product includes software developed by the Horde Project
! (http://www.horde.org/)."
!
! Alternately, this acknowledgment may appear in the software itself, if
! and wherever such third-party acknowledgments normally appear.
!
! 4. The names "Horde", "The Horde Project", and "Forwards" must not be
! used to endorse or promote products derived from this software without
! prior written permission. For written permission, please contact
! core at horde.org.
!
! 5. Products derived from this software may not be called "Horde" or
! "Forwards", nor may "Horde" or "Forwards" appear in their name, without
! prior written permission of the Horde Project.
! THIS SOFTWARE IS PROVIDED "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 HORDE PROJECT 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 Horde Project. For more information on
- the Horde Project, please see <http://www.horde.org/>.
--- 1,25 ----
! Copyright (c) i The Horde Project. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
! - 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.
!
! 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 HORDE PROJECT
! 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 -rcP forwards.ori/main.php forwards/main.php
*** forwards.ori/main.php 2006-06-20 10:00:41.000000000 +0200
--- forwards/main.php 2006-06-20 10:14:03.000000000 +0200
***************
*** 4,11 ****
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (ASL). If you
! * did not receive this file, see http://www.horde.org/licenses/asl.php.
*/
@define('FORWARDS_BASE', dirname(__FILE__));
--- 4,11 ----
*
* Copyright 2001-2006 Eric Rostetter <eric.rostetter at physics.utexas.edu>
*
! * See the enclosed file LICENSE for license information (BSDL). If you
! * did not receive this file, see http://www.horde.org/licenses/bsdl.php.
*/
@define('FORWARDS_BASE', dirname(__FILE__));
diff -rcP forwards.ori/README forwards/README
*** forwards.ori/README 2006-06-20 10:00:41.000000000 +0200
--- forwards/README 2006-06-20 10:23:14.000000000 +0200
***************
*** 82,88 ****
.. _README: ?f=README.html
! .. _LICENSE: http://www.horde.org/licenses/asl.php
.. _docs/CHANGES: ?f=CHANGES.html
.. _docs/CREDITS: ?f=CREDITS.html
.. _INSTALL:
--- 82,88 ----
.. _README: ?f=README.html
! .. _LICENSE: http://www.horde.org/licenses/bsdl.php
.. _docs/CHANGES: ?f=CHANGES.html
.. _docs/CREDITS: ?f=CREDITS.html
.. _INSTALL:
More information about the sork
mailing list