File project.diff of Package pihole-admin-lte

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package pihole-admin-lte (Revision 4dd8d762fa6ee146121604793920eba8)

Currently displaying revision 4dd8d762fa6ee146121604793920eba8 , Show latest

--- FTL.php-improve-get-response-ftl.patch.orig
+++ FTL.php-improve-get-response-ftl.patch
@@ -1,12 +1,11 @@
-Index: AdminLTE-4.3.2/scripts/pi-hole/php/FTL.php
+Index: AdminLTE-5.1.1/scripts/pi-hole/php/FTL.php
 ===================================================================
---- AdminLTE-4.3.2.orig/scripts/pi-hole/php/FTL.php
-+++ AdminLTE-4.3.2/scripts/pi-hole/php/FTL.php
-@@ -46,6 +46,13 @@ function connectFTL($address, $port=4711
- 
+--- AdminLTE-5.1.1.orig/scripts/pi-hole/php/FTL.php
++++ AdminLTE-5.1.1/scripts/pi-hole/php/FTL.php
+@@ -51,6 +51,12 @@ function connectFTL($address, $port=4711
  	return $socket;
  }
-+
+ 
 +/**
 + * Sends a request to pihole-FTL, or send to 127.0.0.1 and the port
 + * from PORTFILE specified in config.
@@ -16,8 +15,8 @@ Index: AdminLTE-4.3.2/scripts/pi-hole/ph
  function sendRequestFTL($requestin)
  {
  	global $socket;
-@@ -54,6 +61,12 @@ function sendRequestFTL($requestin)
- 	fwrite($socket, $request) or die("Could not send data to server\n");
+@@ -59,6 +65,12 @@ function sendRequestFTL($requestin)
+ 	fwrite($socket, $request) or die('{"error":"Could not send data to server"}');
  }
  
 +/**
--- FTL.php-socket-error-handling.patch.orig
+++ FTL.php-socket-error-handling.patch
@@ -1,8 +1,8 @@
-Index: AdminLTE-4.3.2/scripts/pi-hole/php/FTL.php
+Index: AdminLTE-5.1.1/scripts/pi-hole/php/FTL.php
 ===================================================================
---- AdminLTE-4.3.2.orig/scripts/pi-hole/php/FTL.php
-+++ AdminLTE-4.3.2/scripts/pi-hole/php/FTL.php
-@@ -42,7 +42,7 @@ function connectFTL($address, $port=4711
+--- AdminLTE-5.1.1.orig/scripts/pi-hole/php/FTL.php
++++ AdminLTE-5.1.1/scripts/pi-hole/php/FTL.php
+@@ -46,7 +46,7 @@ function connectFTL($address, $port=4711
  	}
  
  	// Open Internet socket connection
--- api_FTL.php-handle-errors.patch.orig
+++ api_FTL.php-handle-errors.patch
@@ -1,15 +1,15 @@
-Index: AdminLTE-4.3.2/api_FTL.php
+Index: AdminLTE-5.1.1/api_FTL.php
 ===================================================================
---- AdminLTE-4.3.2.orig/api_FTL.php
-+++ AdminLTE-4.3.2/api_FTL.php
+--- AdminLTE-5.1.1.orig/api_FTL.php
++++ AdminLTE-5.1.1/api_FTL.php
 @@ -104,6 +104,10 @@ else
  		foreach($return as $line)
  		{
  			$tmp = explode(" ",$line);
 +			// In some error cases, there is no domain in response.
 +			if(!isset($tmp[2])) {
-+                $tmp[2] = "(empty)";
++				$tmp[2] = "(empty)";
 +			}
- 			$top_queries[$tmp[2]] = intval($tmp[1]);
+ 			$domain = utf8_encode($tmp[2]);
+ 			$top_queries[$domain] = intval($tmp[1]);
  		}
- 
--- pihole-admin-lte.changes.orig
+++ pihole-admin-lte.changes
@@ -1,3 +1,163 @@
+--------------------------------------------------------------------
+Tue Sep 15 07:41:44 UTC 2020 - pihole-suse-packages@smar.fi
+
+- Update to version v5.1.1
+  + Add .gitattributes file
+  + Remove glyphicons again.
+  + Update settings.js
+  + index.php: make query charts smaller on md
+  + Improve user info markup
+  + Properly delete the `persistentlogin` cookie
+  + JS: Enforce camelcase.
+  + Enable xo's `new-cap` rule.
+  + Rename groups-common.js to utils.js.
+  + Rename function.
+  + Add staveSave property bool to DHCP tables to remember last used sort direction/column
+  + Add saveState/loadState callbacks
+  + Move some duplicated code to utils.js
+  + Fix queries Clear Filters button
+  + Remove redundant variable.
+  + Use `.hidden`/`.show` for showing/hiding the reset buttons
+  + db_graph.js: move variable where it's used
+  + Assorted Markdown tweaks
+  + HTML `hidden` attribute does not need a value.
+  + Clean up table classes.
+  + Remove the obsolete `cellspacing="0"` attribute.
+  + Remove the invalid `width="100%` attribute
+  + Revert "Remove the invalid `width="100%` attribute"
+  + Use `fa5` class on the sidebar toggle
+  + Minor HTML markup fixes.
+  + Regenerate package-lock.json (#1365)
+  + Always use `!== -1` to check for a string's existence
+  + footer.js: remove duplicate function.
+  + pi-hole.css: fix glow to use the current color
+  + Tweak footer.php
+  + Update settings.js
+  + Replace custom httpGet() with $.ajax()" (#1371)
+  + Replace `$.each` with native methods.
+  + Update npm scripts
+  + Update pi-hole.css
+  + default-dark.css: don't use 8-digit hex color
+  + Re-implement api.php?list actions for add, sub and get.
+  + Allow for ; in adlist urls
+  + Remove obsolete add.php script, use groups.php everywhere instead.
+  + Remove break after die as it cannot be reached.
+  + Remove version number from the Font Awesome folder.
+  + Use `$` instead of `jQuery`.
+  + Update bootstrap-select to v1.3.17.
+  + Add the missing bootstrap-toggle.min.js.map file.
+  + gravity.php: add missing space (#1395)
+  + add some blurb, replace confusing placeholder on adlist page
+  + Check `data` for null before trying to manipulate it. Closes #1391
+  + Reduce CSS duplication a bit
+  + Move `escapeHtml` to utils.
+  + Move JS files where they are used.
+  + network.php: move the scripts above footer
+  + Remove duplicate token `div`
+  + Remove the unused jQuery UI.
+  + index.php: remove duplicate `class` attribute
+  + Guard `gethostname()` calls
+  + Move the `gethostname()` call to a variable.
+  + Enable ESLint's `no-console` rule
+  + Remove unneeded `console.log`
+  + Ignore the remaining console errors for now.
+  + Move `objectToArray()` to utils.
+  + Move `padNumber()` to utils.
+  + index.js: assorted simplifications
+  + Update CI config
+  + Add `eslint-plugin-compat`
+  + Ignore the `EventSource()` errors
+  + Make IE 11 the minimum supported version
+  + remove outdated local help page, link to docs instead
+  + Update daterangepicker to v3.1.0.
+  + Use minified daterangepicker builds.
+  + Make daterangepicker use the same font as everywhere else.
+  + Move animate.min.css style in the pages that use it
+  + Fix sidebar docs link
+  + Use `prop()` for the `disabled` attribute.
+  + gravity.js: replace `removeAttr()` with `prop()`
+  + Use `$(fn)`
+  + final null check on stateLoadCallBack (#1411)
+  + network.js: minor consistency changes
+  + Revert "header: Move license header at the top"
+  + Change "Permanently" toggle to "Indefinitely" (#1416)
+  + Include hostname in backup filename. Will add nothing if no hostname detected.
+  + create utils.getGraphType() function.
+  + Use all the new Pi-hole v5.0 blocking status code also in the long-term data where it was forgotten to add them.
+  + Improve warnings on the domain management pages.
+  + On fast machines, cache replies can be served within less than 100 nanoseconds. The query log should show "(0.0ms)" in this case instead of hiding the value altogether.
+  + Implement per-browser checkbox and radio button styling using icheck-material.
+  + Add per-browser boxed layout setting
+  + Fix login page check box
+  + Add per-browser theme selection
+  + Add per-browser temp unit selection
+  + Simplify code
+  + Further tweaks and optimization
+  + Fix message and debug pages.
+  + Fix tor-right dropdown menu styling
+  + xo adjustments
+  + No not use per-browser settings for the theme to avoid flashing pages on navigation.
+  + Remove saving backend for settings moved into local storage.
+  + Revert "Add per-browser boxed layout setting"
+  + xo
+  + Minor style changes for the dark theme.
+  + Update Chart.js to v2.9.3.
+  + Specify `animation: false` for the bar graphs
+  + Remove unneeded `chart.update()` calls.
+  + Use PHP builtin to split the input by space. Automatically takes into account " chars
+  + Add support for HOSTNAME diagnostics message
+  + Simplify code for space generation and use HTML entities.
+  + Use new Array().join() for space generation.
+  + Add note that IPv6 is supported as well.
+  + Simplify button by removing the description of what we are filtering.
+  + Add tooltip and click cursor to enhance accessibility of the click filtering feature.
+  + Reduce agressiveness of highlight color.
+  + Use classes instead of manipulating CSS directly for getting the pointer.
+  + Remove parseInt() from values guaranteed to be int from the API.
+  + Add placeholder to the search field to highlight what can be searched for
+  + Modify how we add data to the stacked bar charts on the dashboard.
+  + Update jQuery to v3.5.1.
+  + Fix `.context` usage in our code
+  + queryads.js: fix off by one in the viewport check.
+  + Unlike the standard PHP engine, others might actually be case-sensitive. (#1428)
+  + Fix tailog pages IDs
+  + Update xo to v0.32.0 and regenerate package-lock.json
+  + Extend warning shown on server-side data processing errors.
+  + Tailog pages: make checkboxes use the same markup as everywhere else. (#1432)
+  + Improve CSP config (#1377)
+  + Enable radix ESLint rule
+  + Add missing radix information in parseInt().
+  + Fix typo "Long term" -> "Long-term"
+  + Store NULL for emtpty descriptions and comments in the groups database tables.
+  + Change INSERT statement to INSERT OR IGNORE on adlist management as a workaround for now
+  + Remove the unused iCheck.min.js
+  + enable IP sorting on the query/long-term query pages. Appears to work with a mixture of hostnames/IP's
+  + Tweak CSP (#1445)
+  + network.js: use `utils.datetime()`
+  + footer.js: remove dead code.
+  + change button type on dhcp static lease removal back to submit (#1456)
+  + #1227 Test if file exists instead of silencing errors
+  + make use of utils.escapeHtml on the JS side of things, and html_entity_decode/htmlentities in PHP
+  + Bump autoprefixer from 9.8.0 to 9.8.1
+  + CSS: Use rgba() instead of hex-color.
+  + Review comments on code style
+  + Remove HTML from titles when not needed.
+  + Update settings.php
+  + response is expected to be empty here, as far as I can tell. Reverting this logic change prevents a misleading message being displayed to the user
+  + Don't add #53 to any passed IP value by default, only add custom port if it is specified by the user
+  + Only show query types for which the count is larger than zero.
+  + Update scripts/pi-hole/php/savesettings.php
+  + Add CodeQL Action (#1476)
+  + Update devDependencies and regenerate package-lock.json
+  + Bump xo from 0.32.0 to 0.32.1
+  + Update devDependencies and regenerate package-lock.json (#1483)
+  + fix a complaint from the CI
+  + Fix arpflush command
+  + Replace "." by "_" in hostnames to work around a PHP Phar bug.
+  + Fix audit log button doing nothing (resp. wrongthing)
+  + Fix query types links on the dashboard (Query Types pie chart)
+  + Do not require first element to be a hex value at any costs. It may also be a : in the valid address ::1
+
 -------------------------------------------------------------------
 Sat Jan 25 08:16:07 UTC 2020 - Samu Voutilainen <smar@smar.fi>
 
--- pihole-admin-lte.spec.orig
+++ pihole-admin-lte.spec
@@ -24,8 +24,8 @@
 
 Name:           pihole-admin-lte
 %define         official_name AdminLTE
-Version:        v4.3.2
-%define         real_version 4.3.2
+Version:        v5.1.1
+%define         real_version 5.1.1
 %define         real_nameversion %{official_name}-%{real_version}
 Release:        0
 Summary:        Pi-hole Dashboard for stats and more
@@ -39,11 +39,7 @@ Source2:        lighttpd.conf
 Source3:        SUSE.readme
 Source5:        php-fpm-www.conf
 # TODO: contribute patches to upstream
-#Patch0:         parse_ftl_port_from_config.patch
-Patch0:         0001-FTL.php-parse-port-path-from-pihole-FTL.conf.patch
 Patch1:         savesettings.php-better-error-handling.patch
-Patch2:         configurable-pihole-exe.patch
-Patch3:         0002-Use-piholeFTLConfig-to-resolve-pihole-FTL.conf-conte.patch
 Patch4:         FTL.php-socket-error-handling.patch
 Patch5:         FTL.php-improve-get-response-ftl.patch
 Patch6:         api_FTL.php-handle-errors.patch
@@ -101,10 +97,7 @@ to run AdminLTE via PHP-FPM.
 
 %prep
 %setup -q -n %{real_nameversion}
-%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -135,6 +128,11 @@ install -D -m 0644 %{S:1} %{buildroot}%{
 install -D -m 0644 %{S:5} %{buildroot}%{_sysconfdir}/php%{php_ver}/fpm/php-fpm.d/%{name}.conf.in
 install -dm775 %{buildroot}/var/log/pihole
 
+# These probably are useless for end user.
+rm %{buildroot}%{web_files_location}/admin/scripts/vendor/daterangepicker.min.js.map
+rm %{buildroot}%{web_files_location}/admin/scripts/vendor/bootstrap-select.min.js.map
+rm %{buildroot}%{web_files_location}/admin/scripts/vendor/bootstrap-toggle.min.js.map
+
 %fdupes %buildroot
 
 %files
@@ -150,11 +148,20 @@ install -dm775 %{buildroot}/var/log/piho
 %dir %{web_files_location}
 %dir %{web_files_location}/admin
 
+# TODO: these maybe shouldn’t be bundled?`
+%{web_files_location}/admin/package-lock.json
+%{web_files_location}/admin/package.json
+
 %{web_files_location}/admin/*.php
 %dir %{web_files_location}/admin/img
 %{web_files_location}/admin/img/boxed-bg.jpg
+%{web_files_location}/admin/img/boxed-bg-dark.jpg
 %{web_files_location}/admin/img/donate.gif
-%{web_files_location}/admin/img/favicon.png
+%dir %{web_files_location}/admin/img/favicons
+%{web_files_location}/admin/img/favicons/*.png
+%{web_files_location}/admin/img/favicons/*.svg
+%{web_files_location}/admin/img/favicons/favicon.ico
+%{web_files_location}/admin/img/favicons/manifest.json
 %{web_files_location}/admin/img/logo.svg
 %dir %{web_files_location}/admin/scripts/pi-hole
 %dir %{web_files_location}/admin/scripts/pi-hole/js
@@ -172,23 +179,28 @@ install -dm775 %{buildroot}/var/log/piho
 %license %{web_files_location}/admin/scripts/vendor/LICENSE
 %{web_files_location}/admin/scripts/vendor/qrcode.php
 
+%dir %{web_files_location}/admin/style/themes/
+%{web_files_location}/admin/style/themes/default-dark.css
+%{web_files_location}/admin/style/themes/default-light.css
+
 %dir %{web_files_location}/admin/style/vendor
 %{web_files_location}/admin/style/vendor/AdminLTE.min.css
-%{web_files_location}/admin/style/vendor/dataTables.bootstrap.min.css
+%{web_files_location}/admin/style/vendor/datatables.min.css
+%{web_files_location}/admin/style/vendor/animate.min.css
 %license %{web_files_location}/admin/style/vendor/LICENSE
 %{web_files_location}/admin/style/vendor/js-warn.css
-%{web_files_location}/admin/style/vendor/skin-blue.min.css
-%{web_files_location}/admin/style/vendor/daterangepicker.css
-%dir %{web_files_location}/admin/style/vendor/font-awesome-*
-%dir %{web_files_location}/admin/style/vendor/font-awesome-*/css
-%dir %{web_files_location}/admin/style/vendor/font-awesome-*/webfonts
-%{web_files_location}/admin/style/vendor/font-awesome-*/css/all.min.css
-%{web_files_location}/admin/style/vendor/font-awesome-*/webfonts/fa-*
-%dir %{web_files_location}/admin/style/vendor/ionicons-*
-%dir %{web_files_location}/admin/style/vendor/ionicons-*/css
-%dir %{web_files_location}/admin/style/vendor/ionicons-*/fonts
-%{web_files_location}/admin/style/vendor/ionicons-*/css/ionicons.min.css
-%{web_files_location}/admin/style/vendor/ionicons-*/fonts/ionicons.*
+#%{web_files_location}/admin/style/vendor/skin-blue.min.css
+%{web_files_location}/admin/style/vendor/daterangepicker.min.css
+%dir %{web_files_location}/admin/style/vendor/font-awesome
+%dir %{web_files_location}/admin/style/vendor/font-awesome/css
+%dir %{web_files_location}/admin/style/vendor/font-awesome/webfonts
+%{web_files_location}/admin/style/vendor/font-awesome/css/all.min.css
+%{web_files_location}/admin/style/vendor/font-awesome/webfonts/fa-*
+#%dir %{web_files_location}/admin/style/vendor/ionicons-*
+#%dir %{web_files_location}/admin/style/vendor/ionicons-*/css
+#%dir %{web_files_location}/admin/style/vendor/ionicons-*/fonts
+#%{web_files_location}/admin/style/vendor/ionicons-*/css/ionicons.min.css
+#%{web_files_location}/admin/style/vendor/ionicons-*/fonts/ionicons.*
 
 %dir %{web_files_location}/admin/style/vendor/bootstrap
 %dir %{web_files_location}/admin/style/vendor/bootstrap/js
@@ -199,9 +211,16 @@ install -dm775 %{buildroot}/var/log/piho
 %dir %{web_files_location}/admin/style/vendor/bootstrap/fonts
 %{web_files_location}/admin/style/vendor/bootstrap/fonts/glyphicons-halflings-*
 
+%{web_files_location}/admin/style/vendor/bootstrap-select.min.css
+%{web_files_location}/admin/style/vendor/bootstrap-toggle.min.css
+
+%{web_files_location}/admin/style/vendor/icheck-bootstrap.min.css
+%{web_files_location}/admin/style/vendor/icheck-material.min.css
+
 %dir %{web_files_location}/admin/style/vendor/SourceSansPro
-%license %{web_files_location}/admin/style/vendor/SourceSansPro/OFL.txt
-%{web_files_location}/admin/style/vendor/SourceSansPro/SourceSansPro-*.ttf
+#%license %{web_files_location}/admin/style/vendor/SourceSansPro/OFL.txt
+%{web_files_location}/admin/style/vendor/SourceSansPro/source-sans-pro-*.woff
+%{web_files_location}/admin/style/vendor/SourceSansPro/source-sans-pro-*.woff2
 %{web_files_location}/admin/style/vendor/SourceSansPro/SourceSansPro.css
 
 %changelog
--- savesettings.php-better-error-handling.patch.orig
+++ savesettings.php-better-error-handling.patch
@@ -1,27 +1,26 @@
-Index: AdminLTE-4.3.2/scripts/pi-hole/php/savesettings.php
+Index: AdminLTE-5.1.1/scripts/pi-hole/php/savesettings.php
 ===================================================================
---- AdminLTE-4.3.2.orig/scripts/pi-hole/php/savesettings.php
-+++ AdminLTE-4.3.2/scripts/pi-hole/php/savesettings.php
-@@ -71,15 +71,13 @@ function readStaticLeasesFile()
- {
- 	global $dhcp_static_leases;
- 	$dhcp_static_leases = array();
--	try
--	{
--		$dhcpstatic = @fopen('/etc/dnsmasq.d/04-pihole-static-dhcp.conf', 'r');
--	}
--	catch(Exception $e)
-+	$static_conf_file_path = '/etc/dnsmasq.d/04-pihole-static-dhcp.conf';
-+	if(!is_readable($static_conf_file_path) || is_dir($static_conf_file_path))
- 	{
- 		echo "Warning: Failed to read /etc/dnsmasq.d/04-pihole-static-dhcp.conf, this is not an error";
+--- AdminLTE-5.1.1.orig/scripts/pi-hole/php/savesettings.php
++++ AdminLTE-5.1.1/scripts/pi-hole/php/savesettings.php
+@@ -27,7 +27,7 @@ function validCIDRIP($address){
+ 		$v6elem = "[0-9A-Fa-f]{1,4}";
+ 		// CIDR for IPv6 is any multiple of 4 from 4 up to 128 bit
+ 		$v6cidr = "(4";
+-		for ($i=8; $i <= 128; $i+=4) { 
++		for ($i=8; $i <= 128; $i+=4) {
+ 			$v6cidr .= "|$i";
+ 		}
+ 		$v6cidr .= ")";
+@@ -106,7 +106,7 @@ function readStaticLeasesFile($origin_fi
+ 	if(!file_exists($origin_file) || !is_readable($origin_file))
  		return false;
- 	}
-+	$dhcpstatic = fopen('/etc/dnsmasq.d/04-pihole-static-dhcp.conf', 'r');
  
+-	$dhcpstatic = @fopen($origin_file, 'r');
++	$dhcpstatic = fopen($origin_file, 'r');
  	if(!is_resource($dhcpstatic))
  		return false;
-@@ -137,7 +135,7 @@ function readDNSserversList()
+ 
+@@ -163,7 +163,7 @@ function readDNSserversList()
  {
  	// Reset list
  	$list = [];
@@ -30,8 +29,8 @@ Index: AdminLTE-4.3.2/scripts/pi-hole/ph
  	if ($handle)
  	{
  		while (($line = fgets($handle)) !== false)
-@@ -158,7 +156,7 @@ function readDNSserversList()
- 			if (!empty($line[4])) {
+@@ -184,7 +184,7 @@ function readDNSserversList()
+ 			if (!empty($line[4]) && validIP($line[4])) {
  				$values["v6_2"] = $line[4];
  			}
 -            $list[$name] = $values;
@@ -39,16 +38,7 @@ Index: AdminLTE-4.3.2/scripts/pi-hole/ph
  		}
  		fclose($handle);
  	}
-@@ -170,7 +168,7 @@ function readAdlists()
- {
- 	// Reset list
- 	$list = [];
--	$handle = @fopen("/etc/pihole/adlists.list", "r");
-+	$handle = fopen("/etc/pihole/adlists.list", "r");
- 	if ($handle)
- 	{
- 		while (($line = fgets($handle)) !== false)
-@@ -224,7 +222,7 @@ function readAdlists()
+@@ -273,7 +273,7 @@ function addStaticDHCPLease($mac, $ip, $
  				{
  					foreach(["v4_1", "v4_2", "v6_1", "v6_2"] as $type)
  					{

Places

File project.diff of Package pihole-admin-lte (Revision 4dd8d762fa6ee146121604793920eba8)

Places