Skip to content

Commit

Permalink
Move license from ESF to APACHE20
Browse files Browse the repository at this point in the history
  • Loading branch information
Treer committed Dec 10, 2016
1 parent b10ce7c commit ad76a83
Show file tree
Hide file tree
Showing 3 changed files with 65 additions and 89 deletions.
50 changes: 21 additions & 29 deletions sysutils/pfSense-pkg-LCDproc/files/usr/local/pkg/lcdproc.inc
Original file line number Diff line number Diff line change
@@ -1,34 +1,26 @@
<?php
/*
lcdproc.inc
part of pfSense (https://www.pfSense.org/)
Copyright (C) 2007-2009 Seth Mos <[email protected]>
Copyright (C) 2009 Scott Ullrich
Copyright (C) 2012 Michele Di Maria
Copyright (C) 2015 ESF, LLC
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.
THIS SOFTWARE IS PROVIDED ``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
AUTHOR 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.
*/
* lcdproc.inc
*
* part of pfSense (http://www.pfsense.org/)
* Copyright (c) 2015 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2012 Michele Di Maria
* Copyright (c) 2009 Scott Ullrich
* Copyright (c) 2007-2009 Seth Mos <[email protected]>
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
require_once("config.inc");
require_once("functions.inc");
require_once("service-utils.inc");
Expand Down
52 changes: 22 additions & 30 deletions sysutils/pfSense-pkg-LCDproc/files/usr/local/pkg/lcdproc_client.php
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
<?php
/*
lcdproc_client.php
part of pfSense (https://www.pfSense.org/)
Copyright (C) 2007-2009 Seth Mos <[email protected]>
Copyright (C) 2009 Scott Ullrich
Copyright (C) 2011 Michele Di Maria
Copyright (C) 2016 Treer
Copyright (C) 2016 ESF, LLC
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.
THIS SOFTWARE IS PROVIDED ``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
AUTHOR 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.
*/
* lcdproc_client.php
*
* part of pfSense (https://www.pfsense.org/)
* Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2016 Treer
* Copyright (c) 2011 Michele Di Maria
* Copyright (c) 2009 Scott Ullrich
* Copyright (c) 2007-2009 Seth Mos <[email protected]>
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
require_once("config.inc");
require_once("functions.inc");
require_once("interfaces.inc");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,35 +1,27 @@
<?php
/*
lcdproc.php
part of pfSense (https://www.pfSense.org/)
Copyright (C) 2008 Mark J Crane
Copyright (C) 2007-2009 Seth Mos <[email protected]>
Copyright (C) 2009 Scott Ullrich
Copyright (C) 2011 Michele Di Maria
Copyright (C) 2016 ESF, LLC
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.
THIS SOFTWARE IS PROVIDED ``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
AUTHOR 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.
*/
* lcdproc.php
*
* part of pfSense (https://www.pfsense.org/)
* Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2011 Michele Di Maria
* Copyright (c) 2009 Scott Ullrich
* Copyright (c) 2007-2009 Seth Mos <[email protected]>
* Copyright (c) 2008 Mark J Crane
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
require_once("guiconfig.inc");
require_once("/usr/local/pkg/lcdproc.inc");

Expand Down

0 comments on commit ad76a83

Please sign in to comment.