Skip to content
Permalink
Browse files

Update to CCU firmware 3.51.6

  • Loading branch information
alexreinert committed Feb 8, 2020
1 parent 3177824 commit 6dd552b2c28481c79ff1bb8b67f8a9af6fbea85f
Showing with 52 additions and 52 deletions.
  1. +3 −3 create_debmatic.sh
  2. +49 −49 debmatic.patch
@@ -1,15 +1,15 @@
#!/bin/bash

CCU_VERSION="3.49.17"
CCU_VERSION="3.51.6"

ARCHIVE_TAG="89fdb94d0f9ab99df3bfd875f3007de53dfb15eb"
ARCHIVE_TAG="b6bbbbab0d159a7caad9b7251fe06a1abeb65b26"

OCCU_DOWNLOAD_URL="https://github.com/eq-3/occu/archive/$ARCHIVE_TAG.tar.gz"

CCU_DOWNLOAD_SPLASH_URL="https://www.eq-3.de/service/downloads.html"
CCU_DOWNLOAD_URL="https://www.eq-3.de/downloads/software/firmware/ccu3-firmware/ccu3-$CCU_VERSION.tgz"

PKG_BUILD=41
PKG_BUILD=42

CURRENT_DIR=$(pwd)
WORK_DIR=$(mktemp -d)
@@ -1,6 +1,6 @@
diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/session/create.tcl fw.3.49.17.debmatic/www/api/methods/session/create.tcl
--- fw.3.49.17.orig/www/api/methods/session/create.tcl 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/api/methods/session/create.tcl 2019-12-19 10:45:34.370764540 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/api/methods/session/create.tcl fw.3.51.6.debmatic/www/api/methods/session/create.tcl
--- fw.3.51.6.orig/www/api/methods/session/create.tcl 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/api/methods/session/create.tcl 2020-02-08 19:10:14.540580343 +0100
@@ -11,7 +11,7 @@

package require http
@@ -10,9 +10,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/session/create.tcl fw

##
# getHttpHeader
diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/session/login.tcl fw.3.49.17.debmatic/www/api/methods/session/login.tcl
--- fw.3.49.17.orig/www/api/methods/session/login.tcl 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/api/methods/session/login.tcl 2019-12-19 10:45:34.370764540 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/api/methods/session/login.tcl fw.3.51.6.debmatic/www/api/methods/session/login.tcl
--- fw.3.51.6.orig/www/api/methods/session/login.tcl 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/api/methods/session/login.tcl 2020-02-08 19:10:14.540580343 +0100
@@ -12,7 +12,7 @@

package require http
@@ -22,9 +22,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/session/login.tcl fw.

##
# getHttpHeader
diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/session/renew.tcl fw.3.49.17.debmatic/www/api/methods/session/renew.tcl
--- fw.3.49.17.orig/www/api/methods/session/renew.tcl 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/api/methods/session/renew.tcl 2019-12-19 10:45:34.370764540 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/api/methods/session/renew.tcl fw.3.51.6.debmatic/www/api/methods/session/renew.tcl
--- fw.3.51.6.orig/www/api/methods/session/renew.tcl 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/api/methods/session/renew.tcl 2020-02-08 19:10:14.540580343 +0100
@@ -12,7 +12,7 @@
package require http

@@ -34,9 +34,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/session/renew.tcl fw.

::http::cleanup [::http::geturl $url]

diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/user/restarthmipserver.tcl fw.3.49.17.debmatic/www/api/methods/user/restarthmipserver.tcl
--- fw.3.49.17.orig/www/api/methods/user/restarthmipserver.tcl 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/api/methods/user/restarthmipserver.tcl 2019-12-19 10:45:34.370764540 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/api/methods/user/restarthmipserver.tcl fw.3.51.6.debmatic/www/api/methods/user/restarthmipserver.tcl
--- fw.3.51.6.orig/www/api/methods/user/restarthmipserver.tcl 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/api/methods/user/restarthmipserver.tcl 2020-02-08 19:10:14.540580343 +0100
@@ -7,6 +7,5 @@
#
# Rückgabewert: true
@@ -45,9 +45,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/user/restarthmipserve
-exec -- /usr/bin/nohup /etc/init.d/S62HMServer restart >/dev/null &
+exec systemctl restart debmatic-hmserver.service
jsonrpc_response true
diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/user/restartlighttpd.tcl fw.3.49.17.debmatic/www/api/methods/user/restartlighttpd.tcl
--- fw.3.49.17.orig/www/api/methods/user/restartlighttpd.tcl 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/api/methods/user/restartlighttpd.tcl 2019-12-19 10:45:34.370764540 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/api/methods/user/restartlighttpd.tcl fw.3.51.6.debmatic/www/api/methods/user/restartlighttpd.tcl
--- fw.3.51.6.orig/www/api/methods/user/restartlighttpd.tcl 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/api/methods/user/restartlighttpd.tcl 2020-02-08 19:10:14.540580343 +0100
@@ -7,8 +7,7 @@
#
# Rückgabewert: true
@@ -59,9 +59,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/api/methods/user/restartlighttpd.
+exec systemctl restart debmatic-lighttpd.service

jsonrpc_response true
diff -ruN --no-dereference fw.3.49.17.orig/www/config/control_panel.cgi fw.3.49.17.debmatic/www/config/control_panel.cgi
--- fw.3.49.17.orig/www/config/control_panel.cgi 2019-12-02 18:08:53.000000000 +0100
+++ fw.3.49.17.debmatic/www/config/control_panel.cgi 2019-12-19 10:45:34.398764675 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/config/control_panel.cgi fw.3.51.6.debmatic/www/config/control_panel.cgi
--- fw.3.51.6.orig/www/config/control_panel.cgi 2020-01-31 10:03:15.000000000 +0100
+++ fw.3.51.6.debmatic/www/config/control_panel.cgi 2020-02-08 19:10:14.604580702 +0100
@@ -102,16 +102,6 @@
}
}
@@ -140,9 +140,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/config/control_panel.cgi fw.3.49.

puts {
<!-- Kopplungen -->
diff -ruN --no-dereference fw.3.49.17.orig/www/config/cp_maintenance.cgi fw.3.49.17.debmatic/www/config/cp_maintenance.cgi
--- fw.3.49.17.orig/www/config/cp_maintenance.cgi 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/config/cp_maintenance.cgi 2019-12-19 11:03:55.080126336 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/config/cp_maintenance.cgi fw.3.51.6.debmatic/www/config/cp_maintenance.cgi
--- fw.3.51.6.orig/www/config/cp_maintenance.cgi 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/config/cp_maintenance.cgi 2020-02-08 19:10:14.604580702 +0100
@@ -395,151 +395,10 @@
# The available version will be set further down with "jQuery('#availableSWVersion').html(homematic.com.getLatestVersion());"
}
@@ -322,7 +322,7 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/config/cp_maintenance.cgi fw.3.49
var opts = {
postBody: pb,
sendXML: false,
@@ -1215,16 +1066,16 @@
@@ -1217,16 +1068,16 @@
puts "Failure"
return
}
@@ -343,9 +343,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/config/cp_maintenance.cgi fw.3.49

puts "Content-Type:application/x-download"
puts "Content-Disposition:attachment;filename=[set HOSTNAME]-$year-$month-$day.log\n"
diff -ruN --no-dereference fw.3.49.17.orig/www/config/cp_security.cgi fw.3.49.17.debmatic/www/config/cp_security.cgi
--- fw.3.49.17.orig/www/config/cp_security.cgi 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/config/cp_security.cgi 2019-12-19 10:45:34.402764694 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/config/cp_security.cgi fw.3.51.6.debmatic/www/config/cp_security.cgi
--- fw.3.51.6.orig/www/config/cp_security.cgi 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/config/cp_security.cgi 2020-02-08 19:10:14.608580724 +0100
@@ -296,7 +296,6 @@
} else {
exec touch /usr/local/.doFactoryReset
@@ -554,9 +554,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/config/cp_security.cgi fw.3.49.17
}

proc _version_compare { v1 v2 } {
diff -ruN --no-dereference fw.3.49.17.orig/www/config/cp_time.cgi fw.3.49.17.debmatic/www/config/cp_time.cgi
--- fw.3.49.17.orig/www/config/cp_time.cgi 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/config/cp_time.cgi 2019-12-19 10:45:34.402764694 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/config/cp_time.cgi fw.3.51.6.debmatic/www/config/cp_time.cgi
--- fw.3.51.6.orig/www/config/cp_time.cgi 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/config/cp_time.cgi 2020-02-08 19:10:14.608580724 +0100
@@ -144,7 +144,7 @@
global env LOCATIONS TIMEZONES

@@ -667,9 +667,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/config/cp_time.cgi fw.3.49.17.deb
set country ""
foreach location $LOCATIONS {
if { [lindex $location 0] == "-" } {
diff -ruN --no-dereference fw.3.49.17.orig/www/config/help.cgi fw.3.49.17.debmatic/www/config/help.cgi
--- fw.3.49.17.orig/www/config/help.cgi 2019-12-02 18:08:54.000000000 +0100
+++ fw.3.49.17.debmatic/www/config/help.cgi 2019-12-19 11:10:41.754127765 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/config/help.cgi fw.3.51.6.debmatic/www/config/help.cgi
--- fw.3.51.6.orig/www/config/help.cgi 2020-01-31 10:03:16.000000000 +0100
+++ fw.3.51.6.debmatic/www/config/help.cgi 2020-02-08 19:10:14.608580724 +0100
@@ -3,8 +3,8 @@
source common.tcl
load tclrega.so
@@ -689,21 +689,21 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/config/help.cgi fw.3.49.17.debmat
puts "<li><a target='_blank' href='/licenseinfo.htm'>\${lblLicenseInformation}</a></li>"
puts "</ul>"
puts "</td>"
diff -ruN --no-dereference fw.3.49.17.orig/www/rega/pages/index.htm fw.3.49.17.debmatic/www/rega/pages/index.htm
--- fw.3.49.17.orig/www/rega/pages/index.htm 2019-12-02 18:12:24.000000000 +0100
+++ fw.3.49.17.debmatic/www/rega/pages/index.htm 2019-12-19 10:52:10.844685676 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/rega/pages/index.htm fw.3.51.6.debmatic/www/rega/pages/index.htm
--- fw.3.51.6.orig/www/rega/pages/index.htm 2020-01-31 10:06:55.000000000 +0100
+++ fw.3.51.6.debmatic/www/rega/pages/index.htm 2020-02-08 19:10:14.608580724 +0100
@@ -69,7 +69,7 @@
/*########################################################################*/

PLATFORM = "Central";
- WEBUI_VERSION = "3.49.17"
- WEBUI_VERSION = "3.51.6"
+ WEBUI_VERSION = "{PKG_VERSION}"

/**
* Flags
diff -ruN --no-dereference fw.3.49.17.orig/www/tcl/eq3/session.tcl fw.3.49.17.debmatic/www/tcl/eq3/session.tcl
--- fw.3.49.17.orig/www/tcl/eq3/session.tcl 2019-12-02 18:08:53.000000000 +0100
+++ fw.3.49.17.debmatic/www/tcl/eq3/session.tcl 2019-12-19 10:45:34.402764694 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/tcl/eq3/session.tcl fw.3.51.6.debmatic/www/tcl/eq3/session.tcl
--- fw.3.51.6.orig/www/tcl/eq3/session.tcl 2020-01-31 10:03:15.000000000 +0100
+++ fw.3.51.6.debmatic/www/tcl/eq3/session.tcl 2020-02-08 19:10:14.608580724 +0100
@@ -5,8 +5,8 @@

package require http
@@ -715,9 +715,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/tcl/eq3/session.tcl fw.3.49.17.de

##
# session_getHttpHeader
diff -ruN --no-dereference fw.3.49.17.orig/www/webui/js/lang/de/translate.lang.js fw.3.49.17.debmatic/www/webui/js/lang/de/translate.lang.js
--- fw.3.49.17.orig/www/webui/js/lang/de/translate.lang.js 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/webui/js/lang/de/translate.lang.js 2019-12-19 10:45:34.406764713 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/webui/js/lang/de/translate.lang.js fw.3.51.6.debmatic/www/webui/js/lang/de/translate.lang.js
--- fw.3.51.6.orig/www/webui/js/lang/de/translate.lang.js 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/webui/js/lang/de/translate.lang.js 2020-02-08 19:10:14.612580747 +0100
@@ -459,6 +459,7 @@
"dialogSettingsCMTDCCUSafeMode" : "Abgesicherter<br/>Modus",
"dialogSettingsCMTDErrorProtocol" : "Fehler-<br/>protokoll",
@@ -726,9 +726,9 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/webui/js/lang/de/translate.lang.j
"dialogSettingsCMLblAvailableSoftwareVersion" : "Verf%FCgbare Software-Version:",
"dialogSettingsCMLblPerformSoftwareUpdate" : "Software-Update durchf%FChren",
"dialogSettingsCMLblPerformSoftwareUpdateStep1" : "Schritt 1: Neue Software herunterladen",
diff -ruN --no-dereference fw.3.49.17.orig/www/webui/js/lang/en/translate.lang.js fw.3.49.17.debmatic/www/webui/js/lang/en/translate.lang.js
--- fw.3.49.17.orig/www/webui/js/lang/en/translate.lang.js 2019-12-02 18:08:56.000000000 +0100
+++ fw.3.49.17.debmatic/www/webui/js/lang/en/translate.lang.js 2019-12-19 10:45:34.406764713 +0100
diff -ruN --no-dereference fw.3.51.6.orig/www/webui/js/lang/en/translate.lang.js fw.3.51.6.debmatic/www/webui/js/lang/en/translate.lang.js
--- fw.3.51.6.orig/www/webui/js/lang/en/translate.lang.js 2020-01-31 10:03:18.000000000 +0100
+++ fw.3.51.6.debmatic/www/webui/js/lang/en/translate.lang.js 2020-02-08 19:10:14.612580747 +0100
@@ -458,6 +458,7 @@
"dialogSettingsCMTDCCUSafeMode" : "Safe<br/>mode",
"dialogSettingsCMTDErrorProtocol" : "Error<br/>log",
@@ -737,10 +737,10 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/webui/js/lang/en/translate.lang.j
"dialogSettingsCMLblAvailableSoftwareVersion" : "Available software version:",
"dialogSettingsCMLblPerformSoftwareUpdate" : "Perform software update",
"dialogSettingsCMLblPerformSoftwareUpdateStep1" : "Step 1: Download new software",
diff -ruN --no-dereference fw.3.49.17.orig/www/webui/webui.js fw.3.49.17.debmatic/www/webui/webui.js
--- fw.3.49.17.orig/www/webui/webui.js 2019-12-02 18:08:57.000000000 +0100
+++ fw.3.49.17.debmatic/www/webui/webui.js 2019-12-19 10:45:34.414764752 +0100
@@ -6208,12 +6208,7 @@
diff -ruN --no-dereference fw.3.51.6.orig/www/webui/webui.js fw.3.51.6.debmatic/www/webui/webui.js
--- fw.3.51.6.orig/www/webui/webui.js 2020-01-31 10:03:19.000000000 +0100
+++ fw.3.51.6.debmatic/www/webui/webui.js 2020-02-08 19:10:14.620580791 +0100
@@ -6225,12 +6225,7 @@
WebUI.resize();
jQuery(".Layer0").show();
homematic("CCU.setSecurityHint");
@@ -754,7 +754,7 @@ diff -ruN --no-dereference fw.3.49.17.orig/www/webui/webui.js fw.3.49.17.debmati
}
}, "html");
});
@@ -23224,7 +23219,7 @@
@@ -23247,7 +23242,7 @@
var script = document.createElement("script");
script.id = "homematic_com_script";
script.type = "text/javascript";

0 comments on commit 6dd552b

Please sign in to comment.
You can’t perform that action at this time.