Skip to content
This repository has been archived by the owner on Feb 28, 2021. It is now read-only.

Commit

Permalink
Changed the license from LGPL to a BSD-style license.
Browse files Browse the repository at this point in the history
The new license is essentially the same as the "2 clause" BSD-style
licenses used in NetBSD.  See the file LICENSE for details.

darcs-hash:20090522153207-ced27-79d98fb8ae6f948fc734e183acb36febae9cad84.gz
  • Loading branch information
Ville Laurikari committed May 22, 2009
1 parent 5d46899 commit 0087a2a
Show file tree
Hide file tree
Showing 31 changed files with 85 additions and 940 deletions.
504 changes: 0 additions & 504 deletions COPYING.LESSER

This file was deleted.

42 changes: 25 additions & 17 deletions LICENSE
@@ -1,21 +1,29 @@
This software is free; you can redistribute it and/or modify it under
the terms of the GNU Lesser General Public License as published by the
Free Software Foundation; either version 2.1 of the License, or (at
your option) any later version. See the file `COPYING' for the
entire license.
This is the license, copyright notice, and disclaimer for TRE, a regex
matching package (library and tools) with support for approximate
matching.

This software is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
Copyright (c) 2001-2009 Ville Laurikari <vl@iki.fi>
All rights reserved.

You should have received a copy of the GNU Lesser General Public
License along with this software; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:

If you cannot accept the GNU LGPL, it may be possible that you can
persuade me to give or sell you a version which is licensed
differently. Please contact me for more information.
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

Ville Laurikari <vl@iki.fi>
http://www.iki.fi/vl/
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.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER 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
HOLDER 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.
11 changes: 3 additions & 8 deletions README
Expand Up @@ -139,14 +139,9 @@ Portable

Free

TRE is free; you can redistribute it and/or modify it under the
terms of the GNU Lesser General Public License as published by the
Free Software Foundation. See the file COPYING, included in the
distribution packages, for the complete license.

If you cannot accept the GNU LGPL, it may be possible that you can
persuade me to give or sell you a version which is licensed
differently. Please contact me for more information.
TRE is released under a license which is essentially the same as
the "2 clause" BSD-style license used in NetBSD. See the file
LICENSE for details.

Roadmap

Expand Down
17 changes: 2 additions & 15 deletions lib/regcomp.c
@@ -1,21 +1,8 @@
/*
regcomp.c - TRE POSIX compatible regex compilation functions.
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/regerror.c
@@ -1,21 +1,8 @@
/*
regerror.c - POSIX regerror() implementation for TRE.
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/regex.h
@@ -1,21 +1,8 @@
/*
regex.h - POSIX.2 compatible regexp interface and TRE extensions
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/regexec.c
@@ -1,21 +1,8 @@
/*
regexec.c - TRE POSIX compatible matching functions (and more).
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/tre-ast.c
@@ -1,21 +1,8 @@
/*
tre-ast.c - Abstract syntax tree (AST) routines
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/tre-ast.h
@@ -1,21 +1,8 @@
/*
tre-ast.h - Abstract syntax tree (AST) definitions
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
19 changes: 3 additions & 16 deletions lib/tre-compile.c
@@ -1,21 +1,8 @@
/*
tre-compile.c - TRE regex compiler
Copyright (c) 2001-2007 Ville Laurikari <vl@iki.fi>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down Expand Up @@ -2252,7 +2239,7 @@ tre_version(void)
if (str[0] == 0)
{
(void) tre_config(TRE_CONFIG_VERSION, &version);
(void) snprintf(str, sizeof(str), "TRE %s (LGPL)", version);
(void) snprintf(str, sizeof(str), "TRE %s (BSD)", version);
}
return str;
}
Expand Down
17 changes: 2 additions & 15 deletions lib/tre-compile.h
@@ -1,21 +1,8 @@
/*
tre-compile.h: Regex compilation definitions
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/tre-filter.c
@@ -1,21 +1,8 @@
/*
tre-filter.c: Histogram filter to quickly find regexp match candidates
Copyright (c) 2004-2006 Ville Laurikari <vl@iki.fi>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/tre-internal.h
@@ -1,21 +1,8 @@
/*
tre-internal.h - TRE internal definitions
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/tre-match-approx.c
@@ -1,21 +1,8 @@
/*
tre-match-approx.c - TRE approximate regex matching engine
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/tre-match-backtrack.c
@@ -1,21 +1,8 @@
/*
tre-match-backtrack.c - TRE backtracking regex matching engine
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down
17 changes: 2 additions & 15 deletions lib/tre-match-parallel.c
@@ -1,21 +1,8 @@
/*
tre-match-parallel.c - TRE parallel regex matching engine
Copyright (c) 2001-2006 Ville Laurikari <vl@iki.fi>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
This software is released under a BSD-style license.
See the file LICENSE for details and copyright.
*/

Expand Down

0 comments on commit 0087a2a

Please sign in to comment.