diff --git a/Makefile b/Makefile
index 0fa3b2346..c61cd88e6 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ lint: force
sweep: force
find ${.CURDIR}/src ! -name "*.min.*" ! -name "*.svg" \
- ! -name "*.map" -type f -print0 | \
+ ! -name "*.map" ! -name "*.ser" -type f -print0 | \
xargs -0 -n1 scripts/cleanfile
find ${.CURDIR}/lang -type f -print0 | \
xargs -0 -n1 scripts/cleanfile
diff --git a/src/opnsense/contrib/simplepie/LICENSE.txt b/src/opnsense/contrib/simplepie/LICENSE.txt
index a822a4bd9..48f11bffe 100755
--- a/src/opnsense/contrib/simplepie/LICENSE.txt
+++ b/src/opnsense/contrib/simplepie/LICENSE.txt
@@ -1,26 +1,26 @@
Copyright (c) 2004-2007, Ryan Parman and Geoffrey Sneddon.
All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are
+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
+ * 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
+ * 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.
- * Neither the name of the SimplePie Team nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific prior
+ * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific prior
written permission.
-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 HOLDERS
-AND 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.
\ No newline at end of file
+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 HOLDERS
+AND 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/src/opnsense/contrib/simplepie/autoloader.php b/src/opnsense/contrib/simplepie/autoloader.php
index c16a8f8b5..bd57d150c 100755
--- a/src/opnsense/contrib/simplepie/autoloader.php
+++ b/src/opnsense/contrib/simplepie/autoloader.php
@@ -11,16 +11,16 @@
* 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 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.
+ * * 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.
*
- * * Neither the name of the SimplePie Team nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific prior
- * written permission.
+ * * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific prior
+ * written permission.
*
* 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
@@ -83,4 +83,4 @@ class SimplePie_Autoloader
$filename = $this->path . DIRECTORY_SEPARATOR . str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php';
include $filename;
}
-}
\ No newline at end of file
+}
diff --git a/src/opnsense/contrib/simplepie/build/charset.php b/src/opnsense/contrib/simplepie/build/charset.php
index ff4588d89..f91cb4c35 100755
--- a/src/opnsense/contrib/simplepie/build/charset.php
+++ b/src/opnsense/contrib/simplepie/build/charset.php
@@ -18,7 +18,7 @@ function build_character_set_list()
{
$data = explode("\n", $file->body);
unset($file);
-
+
foreach ($data as $line)
{
// New character set
@@ -34,7 +34,7 @@ function build_character_set_list()
$charsets[$preferred] = array_unique($aliases);
natsort($charsets[$preferred]);
}
-
+
$aliases = array($match[1]);
$preferred = $match[1];
}
@@ -51,7 +51,7 @@ function build_character_set_list()
}
}
}
-
+
// Compatibility replacements
// From http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#misinterpreted-for-compatibility
$compat = array(
@@ -66,7 +66,7 @@ function build_character_set_list()
'TIS-620' => 'windows-874',
//'US-ASCII' => 'windows-1252',
);
-
+
foreach ($compat as $real => $replace)
{
if (isset($charsets[$real]) && isset($charsets[$replace]))
@@ -87,10 +87,10 @@ function build_character_set_list()
$charsets[$replace] = array_unique($charsets[$replace]);
natsort($charsets[$replace]);
}
-
+
// Sort it
uksort($charsets, 'strnatcasecmp');
-
+
// Check that nothing matches more than one
$all = call_user_func_array('array_merge', $charsets);
$all_count = array_count_values($all);
@@ -105,7 +105,7 @@ function build_character_set_list()
}
}
}
-
+
// And we're done!
return $charsets;
}
diff --git a/src/opnsense/contrib/simplepie/build/compile.php b/src/opnsense/contrib/simplepie/build/compile.php
index 34a29d4c7..affad3760 100755
--- a/src/opnsense/contrib/simplepie/build/compile.php
+++ b/src/opnsense/contrib/simplepie/build/compile.php
@@ -66,4 +66,4 @@ $compiled = str_replace(
);
// Finally, save
-file_put_contents(COMPILED, $compiled);
\ No newline at end of file
+file_put_contents(COMPILED, $compiled);
diff --git a/src/opnsense/contrib/simplepie/build/header.txt b/src/opnsense/contrib/simplepie/build/header.txt
index 9446b5ce5..87e57354f 100755
--- a/src/opnsense/contrib/simplepie/build/header.txt
+++ b/src/opnsense/contrib/simplepie/build/header.txt
@@ -14,16 +14,16 @@
* 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 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.
+ * * 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.
*
- * * Neither the name of the SimplePie Team nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific prior
- * written permission.
+ * * Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific prior
+ * written permission.
*
* 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
diff --git a/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt b/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt
index 5b2498992..174bbc14d 100755
--- a/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt
+++ b/src/opnsense/contrib/simplepie/compatibility_test/COMPATIBILITY README.txt
@@ -1,7 +1,7 @@
SIMPLEPIE COMPATIBILITY TEST
1) Upload sp_compatibility_test.php to the web-accessible root of your website.
-For example, if your website is www.example.com, upload it so that you can get
+For example, if your website is www.example.com, upload it so that you can get
to it at www.example.com/sp_compatibility_test.php
-2) Open your web browser and go to the page you just uploaded.
\ No newline at end of file
+2) Open your web browser and go to the page you just uploaded.
diff --git a/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php b/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php
index 10ad60bb5..bda8602b6 100755
--- a/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php
+++ b/src/opnsense/contrib/simplepie/compatibility_test/sp_compatibility_test.php
@@ -140,7 +140,7 @@ table#chart tr.enabled td {
/* Leave this alone */
}
-table#chart tr.disabled td,
+table#chart tr.disabled td,
table#chart tr.disabled td a {
color:#999;
font-style:italic;
@@ -269,13 +269,13 @@ function fnLoadPngs() {
cURL: The cURL extension is not available. SimplePie will use fsockopen() instead.
-
+
Zlib: You have Zlib enabled. This allows SimplePie to support GZIP-encoded feeds. No problems here.
Zlib: The Zlib extension is not available. SimplePie will ignore any GZIP-encoding, and instead handle feeds as uncompressed text.
-
+
mbstring and iconv: You have both mbstring and iconv installed! This will allow SimplePie to handle the greatest number of languages. Check the Supported Character Encodings chart to see what's supported on your webhost.
@@ -326,4 +326,4 @@ function fnLoadPngs() {
-