diff -Nru vdr-epg-daemon-1.1.140/debian/changelog vdr-epg-daemon-1.1.141/debian/changelog --- vdr-epg-daemon-1.1.140/debian/changelog 2018-04-22 14:44:30.000000000 +0000 +++ vdr-epg-daemon-1.1.141/debian/changelog 2018-05-24 06:28:19.000000000 +0000 @@ -1,3 +1,9 @@ +vdr-epg-daemon (1.1.141-0yavdr0~bionic) bionic; urgency=medium + + * new upstream version + + -- Alexander Grothe Thu, 24 May 2018 06:28:19 +0000 + vdr-epg-daemon (1.1.140-0yavdr0~bionic) bionic; urgency=medium * new upstream version diff -Nru vdr-epg-daemon-1.1.140/HISTORY.h vdr-epg-daemon-1.1.141/HISTORY.h --- vdr-epg-daemon-1.1.140/HISTORY.h 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/HISTORY.h 2018-05-24 06:13:55.000000000 +0000 @@ -4,8 +4,8 @@ * ----------------------------------- */ -#define _VERSION "1.1.140" -#define VERSION_DATE "21.04.2018" +#define _VERSION "1.1.141" +#define VERSION_DATE "14.05.2018" #define DB_API 7 #ifdef GIT_REV @@ -18,9 +18,13 @@ * ------------------------------------ * +2018-05-14: version 1.1.141 (horchi) + added: Compatibility for newer MariaBD librarys (patch by provided by marco) + added: execution shell to scripts + 2018-04-21: version 1.1.140 (rechner) - change: Added UI for Prepared search timer filter by channel number - + change: Added UI for Prepared search timer filter by channel number + 2018-04-18: version 1.1.139 (horchi) change: Prepared search timer filter by channel number (to be added to WEBIF) diff -Nru vdr-epg-daemon-1.1.140/lib/db.c vdr-epg-daemon-1.1.141/lib/db.c --- vdr-epg-daemon-1.1.140/lib/db.c 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/lib/db.c 2018-05-24 06:13:55.000000000 +0000 @@ -1376,11 +1376,19 @@ if (error == CR_SERVER_LOST || error == CR_SERVER_GONE_ERROR || +// for compatibility with newer versions of MariaBD library +#ifdef CR_INVALID_CONN_HANDLE error == CR_INVALID_CONN_HANDLE || +#endif error == CR_COMMANDS_OUT_OF_SYNC || error == CR_SERVER_LOST_EXTENDED || error == CR_STMT_CLOSED || +// for compatibility with newer versions of MariaBD library +#ifdef CR_CONN_UNKNOW_PROTOCOL error == CR_CONN_UNKNOW_PROTOCOL || +#else + error == CR_CONN_UNKNOWN_PROTOCOL || +#endif error == CR_UNSUPPORTED_PARAM_TYPE || error == CR_NO_PREPARE_STMT || error == CR_SERVER_HANDSHAKE_ERR || diff -Nru vdr-epg-daemon-1.1.140/lib/db.h vdr-epg-daemon-1.1.141/lib/db.h --- vdr-epg-daemon-1.1.140/lib/db.h 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/lib/db.h 2018-05-24 06:13:55.000000000 +0000 @@ -1296,7 +1296,7 @@ int created() { if (!connection || !connection->getMySql()) - return fail; + return no; cDbStatement stmt(connection); diff -Nru vdr-epg-daemon-1.1.140/scripts/epgd-conflictsof vdr-epg-daemon-1.1.141/scripts/epgd-conflictsof --- vdr-epg-daemon-1.1.140/scripts/epgd-conflictsof 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/scripts/epgd-conflictsof 2018-05-24 06:13:55.000000000 +0000 @@ -1,3 +1,4 @@ +#!/bin/bash export MYSQL_PWD=epg @@ -28,4 +29,4 @@ and t.day + t.endtime div 100 * 60 * 60 + t.endtime % 100 * 60 <= ti.day + ti.endtime div 100 * 60 * 60 + ti.endtime % 100 * 60) \ ) \ and t.vdruuid = ti.vdruuid \ - order by t.day, start;" + order by t.day, start;" diff -Nru vdr-epg-daemon-1.1.140/scripts/epgd-showdones vdr-epg-daemon-1.1.141/scripts/epgd-showdones --- vdr-epg-daemon-1.1.140/scripts/epgd-showdones 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/scripts/epgd-showdones 2018-05-24 06:13:55.000000000 +0000 @@ -1,3 +1,4 @@ +#!/bin/bash export MYSQL_PWD=epg diff -Nru vdr-epg-daemon-1.1.140/scripts/epgd-showmerge vdr-epg-daemon-1.1.141/scripts/epgd-showmerge --- vdr-epg-daemon-1.1.140/scripts/epgd-showmerge 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/scripts/epgd-showmerge 2018-05-24 06:13:55.000000000 +0000 @@ -1,3 +1,5 @@ +#!/bin/bash + export MYSQL_PWD=epg if [ "$1" == "-h" ]; then diff -Nru vdr-epg-daemon-1.1.140/scripts/epgd-showtimer vdr-epg-daemon-1.1.141/scripts/epgd-showtimer --- vdr-epg-daemon-1.1.140/scripts/epgd-showtimer 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/scripts/epgd-showtimer 2018-05-24 06:13:55.000000000 +0000 @@ -1,3 +1,5 @@ +#!/bin/bash + export MYSQL_PWD=epg if [ -z $1 ]; then diff -Nru vdr-epg-daemon-1.1.140/scripts/epgd-showtimerat vdr-epg-daemon-1.1.141/scripts/epgd-showtimerat --- vdr-epg-daemon-1.1.140/scripts/epgd-showtimerat 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/scripts/epgd-showtimerat 2018-05-24 06:13:55.000000000 +0000 @@ -1,3 +1,4 @@ +#!/bin/bash export MYSQL_PWD=epg @@ -11,4 +12,4 @@ v.uuid = t.vdruuid and t.active = 1 and t.state in ('P','R') \ and ('$1' between from_unixtime(t.day + t.starttime div 100 * 60 * 60 + t.starttime % 100 * 60) and from_unixtime(t.day + t.endtime div 100 * 60 * 60 + t.endtime % 100 * 60)) \ and v.name = '$2' \ - order by t.day, start;" + order by t.day, start;" diff -Nru vdr-epg-daemon-1.1.140/update.c vdr-epg-daemon-1.1.141/update.c --- vdr-epg-daemon-1.1.140/update.c 2018-04-21 19:40:41.000000000 +0000 +++ vdr-epg-daemon-1.1.141/update.c 2018-05-24 06:13:55.000000000 +0000 @@ -1395,6 +1395,9 @@ asprintf(¶m, "%s.md5", name); p = fp ? fp : new cDbProcedure(connection, name, type); + if (!connection || !connection->getMySql()) + return fail; + if (p->created()) { getParameter("epgd", param, md5);