IPFire-SCM April 2013

ipfire-scm@lists.ipfire.org

1 participants
35 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4ac2d1561a07c8188644825cc303a95dda16ae67
by git＠ipfire.org 30 Apr '13

30 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 4ac2d1561a07c8188644825cc303a95dda16ae67 (commit) from 7aea4958781434960bf793d56317e2d65ca1a1b6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4ac2d1561a07c8188644825cc303a95dda16ae67 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 17:11:56 2013 +0200 core68: Regenerate font cache ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/68/update.sh | 3 +++ 1 file changed, 3 insertions(+) Difference in files: diff --git a/config/rootfiles/core/68/update.sh b/config/rootfiles/core/68/update.sh index 19a4b80..11cab10 100644 --- a/config/rootfiles/core/68/update.sh +++ b/config/rootfiles/core/68/update.sh @@ -51,6 +51,9 @@ extract_files #Update Language cache perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# Regenerate font cache +fc-cache -f &>/dev/null + sync # This update need a reboot... hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7aea4958781434960bf793d56317e2d65ca1a1b6
by git＠ipfire.org 30 Apr '13

30 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 7aea4958781434960bf793d56317e2d65ca1a1b6 (commit) from f898e6ac5d5a5f852c80c572e9ffedf9b188bda9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7aea4958781434960bf793d56317e2d65ca1a1b6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 17:09:16 2013 +0200 dejavu-fonts: Add mono space fonts for rrdtool ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/dejavu-fonts-ttf | 8 ++++---- .../rootfiles/{oldcore/66 => core/68}/filelists/dejavu-fonts-ttf | 0 2 files changed, 4 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/66 => core/68}/filelists/dejavu-fonts-ttf (100%) Difference in files: diff --git a/config/rootfiles/common/dejavu-fonts-ttf b/config/rootfiles/common/dejavu-fonts-ttf index bfdfed8..0dfb503 100644 --- a/config/rootfiles/common/dejavu-fonts-ttf +++ b/config/rootfiles/common/dejavu-fonts-ttf @@ -8,10 +8,10 @@ usr/share/fonts/DejaVuSans.ttf #usr/share/fonts/DejaVuSansCondensed-BoldOblique.ttf #usr/share/fonts/DejaVuSansCondensed-Oblique.ttf #usr/share/fonts/DejaVuSansCondensed.ttf -#usr/share/fonts/DejaVuSansMono-Bold.ttf -#usr/share/fonts/DejaVuSansMono-BoldOblique.ttf -#usr/share/fonts/DejaVuSansMono-Oblique.ttf -#usr/share/fonts/DejaVuSansMono.ttf +usr/share/fonts/DejaVuSansMono-Bold.ttf +usr/share/fonts/DejaVuSansMono-BoldOblique.ttf +usr/share/fonts/DejaVuSansMono-Oblique.ttf +usr/share/fonts/DejaVuSansMono.ttf #usr/share/fonts/DejaVuSerif-Bold.ttf #usr/share/fonts/DejaVuSerif-BoldItalic.ttf #usr/share/fonts/DejaVuSerif-Italic.ttf diff --git a/config/rootfiles/core/68/filelists/dejavu-fonts-ttf b/config/rootfiles/core/68/filelists/dejavu-fonts-ttf new file mode 120000 index 0000000..0007a8b --- /dev/null +++ b/config/rootfiles/core/68/filelists/dejavu-fonts-ttf @@ -0,0 +1 @@ +../../../common/dejavu-fonts-ttf \ No newline at end of file hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f898e6ac5d5a5f852c80c572e9ffedf9b188bda9
by git＠ipfire.org 30 Apr '13

30 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via f898e6ac5d5a5f852c80c572e9ffedf9b188bda9 (commit) from 76988c142d927837915fe6c0844c7b86302b9676 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f898e6ac5d5a5f852c80c572e9ffedf9b188bda9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 14:19:28 2013 +0200 strongswan: Update to 5.0.4. http://www.strongswan.org/blog/2013/04/30/strongswan-5.0.4-released-%28cve-… ----------------------------------------------------------------------- Summary of changes: lfs/strongswan | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/strongswan b/lfs/strongswan index 1b7877c..b3ce846 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.0.3 +VER = 5.0.4 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = c37d841f8b0d11b14cf7f29fcdd20621 +$(DL_FILE)_MD5 = 7085ac1d28dcc250096553fa51c3a4ea install : $(TARGET) @@ -104,5 +104,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) ln -sf $(CONFIG_ROOT)/certs /etc/ipsec.d/certs ln -sf $(CONFIG_ROOT)/crls /etc/ipsec.d/crls - #@rm -rf $(DIR_APP) + @rm -rf $(DIR_APP) @$(POSTBUILD) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 76988c142d927837915fe6c0844c7b86302b9676
by git＠ipfire.org 30 Apr '13

30 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 76988c142d927837915fe6c0844c7b86302b9676 (commit) via 67fd2a703ddad53ad8045ecd9a03abe0aefbcc23 (commit) from c5259fab54427a6e39279aa6661db14f26974b94 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 76988c142d927837915fe6c0844c7b86302b9676 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 12:29:12 2013 +0200 Fix broken language strings. commit 67fd2a703ddad53ad8045ecd9a03abe0aefbcc23 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 12:28:34 2013 +0200 Fix spacing in new uptime bar. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 9 ++-- doc/language_issues.en | 6 +-- doc/language_issues.es | 19 +++++++- doc/language_issues.fr | 19 +++++++- doc/language_issues.nl | 19 +++++++- doc/language_issues.pl | 19 +++++++- doc/language_issues.ru | 19 +++++++- doc/language_missings | 68 ++++++++++++++++++++++++++++ html/html/themes/ipfire/include/functions.pl | 2 +- html/html/themes/maniac/include/functions.pl | 2 +- langs/de/cgi-bin/de.pl | 14 +++--- langs/en/cgi-bin/en.pl | 18 ++++---- 12 files changed, 178 insertions(+), 36 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index e3c8842..9179964 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -368,8 +368,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -437,9 +435,8 @@ WARNING: translation string unused: updates is old1 WARNING: translation string unused: updates is old2 WARNING: translation string unused: updxlrtr children WARNING: translation string unused: updxlrtr invalid num of children +WARNING: translation string unused: updxlrtr to delete WARNING: translation string unused: updxlrtr unknown -WARNING: translation string unused: updxlrtr update information -WARNING: translation string unused: updxlrtr update notification WARNING: translation string unused: upload file WARNING: translation string unused: upload static key WARNING: translation string unused: upload successful @@ -448,6 +445,7 @@ WARNING: translation string unused: upload update file WARNING: translation string unused: upstream password WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username +WARNING: translation string unused: uptime WARNING: translation string unused: uptime and users WARNING: translation string unused: urlfilter background image WARNING: translation string unused: urlfilter background text @@ -483,4 +481,7 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr configuration WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.en b/doc/language_issues.en index 6c1fc21..0b27a19 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -399,8 +399,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -468,9 +466,8 @@ WARNING: translation string unused: updates is old1 WARNING: translation string unused: updates is old2 WARNING: translation string unused: updxlrtr children WARNING: translation string unused: updxlrtr invalid num of children +WARNING: translation string unused: updxlrtr to delete WARNING: translation string unused: updxlrtr unknown -WARNING: translation string unused: updxlrtr update information -WARNING: translation string unused: updxlrtr update notification WARNING: translation string unused: upload fcdsl.o WARNING: translation string unused: upload file WARNING: translation string unused: upload static key @@ -480,6 +477,7 @@ WARNING: translation string unused: upload update file WARNING: translation string unused: upstream password WARNING: translation string unused: upstream proxy host:port WARNING: translation string unused: upstream username +WARNING: translation string unused: uptime WARNING: translation string unused: uptime and users WARNING: translation string unused: urlfilter background image WARNING: translation string unused: urlfilter background text diff --git a/doc/language_issues.es b/doc/language_issues.es index 2468981..9bdd62f 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -396,8 +396,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -509,6 +507,11 @@ WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -616,6 +619,18 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 70dbdc1..dfb6551 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -395,8 +395,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -508,6 +506,11 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -601,7 +604,19 @@ WARNING: untranslated string: server restart WARNING: untranslated string: snort working WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by WARNING: untranslated string: upload new ruleset +WARNING: untranslated string: uptime load average WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block WARNING: untranslated string: visit us at diff --git a/doc/language_issues.nl b/doc/language_issues.nl index f17d07d..caf1286 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -399,8 +399,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -508,6 +506,11 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: bytes WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: new @@ -517,3 +520,15 @@ WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by +WARNING: untranslated string: uptime load average diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 2468981..9bdd62f 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -396,8 +396,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -509,6 +507,11 @@ WARNING: untranslated string: Set time on boot WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -616,6 +619,18 @@ WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_issues.ru b/doc/language_issues.ru index d59f4f6..3d9fe2d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -389,8 +389,6 @@ WARNING: translation string unused: shutdown2 WARNING: translation string unused: shutting down WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload -WARNING: translation string unused: sort ascending -WARNING: translation string unused: sort descending WARNING: translation string unused: squid extension methods WARNING: translation string unused: squid extension methods invalid WARNING: translation string unused: squid fix cache @@ -500,6 +498,11 @@ WARNING: untranslated string: Scan for Songs WARNING: untranslated string: advproxy cache-digest WARNING: untranslated string: advproxy errmsg cache WARNING: untranslated string: advproxy errmsg invalid upstream proxy +WARNING: untranslated string: age second +WARNING: untranslated string: age seconds +WARNING: untranslated string: age shour +WARNING: untranslated string: age sminute +WARNING: untranslated string: age ssecond WARNING: untranslated string: attention WARNING: untranslated string: bytes WARNING: untranslated string: ccd add @@ -580,6 +583,18 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: server restart WARNING: untranslated string: static routes +WARNING: untranslated string: updxlrtr cache overview +WARNING: untranslated string: updxlrtr cache settings +WARNING: untranslated string: updxlrtr current view +WARNING: untranslated string: updxlrtr no pending downloads attime +WARNING: untranslated string: updxlrtr notice dlrate +WARNING: untranslated string: updxlrtr overview +WARNING: untranslated string: updxlrtr settings +WARNING: untranslated string: updxlrtr sources +WARNING: untranslated string: updxlrtr standard view +WARNING: untranslated string: updxlrtr total used +WARNING: untranslated string: updxlrtr used by +WARNING: untranslated string: uptime load average WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap country diff --git a/doc/language_missings b/doc/language_missings index ac650b3..6f0f3a6 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -14,6 +14,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -104,7 +109,19 @@ < snort working < static routes < system information +< updxlrtr current view +< updxlrtr no pending downloads attime +< updxlrtr notice dlrate +< updxlrtr overview +< updxlrtr settings +< updxlrtr sources +< updxlrtr standard view +< updxlrtr to delete +< updxlrtr total used +< updxlrtr used by < upload new ruleset +< uptime +< uptime load average < urlfilter file ext block < urlfilter mode block < visit us at @@ -138,6 +155,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < Async logging enabled < attention < ccd add @@ -244,6 +266,18 @@ < Set time on boot < static routes < system information +< updxlrtr current view +< updxlrtr no pending downloads attime +< updxlrtr notice dlrate +< updxlrtr overview +< updxlrtr settings +< updxlrtr sources +< updxlrtr standard view +< updxlrtr to delete +< updxlrtr total used +< updxlrtr used by +< uptime +< uptime load average < visit us at < vpn keyexchange ############################################################################ @@ -255,6 +289,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -336,6 +375,18 @@ < qos enter bandwidths < server restart < static routes +< updxlrtr current view +< updxlrtr no pending downloads attime +< updxlrtr notice dlrate +< updxlrtr overview +< updxlrtr settings +< updxlrtr sources +< updxlrtr standard view +< updxlrtr to delete +< updxlrtr total used +< updxlrtr used by +< uptime +< uptime load average < visit us at < vpn keyexchange ############################################################################ @@ -348,6 +399,11 @@ < advproxy cache-digest < advproxy errmsg cache < advproxy errmsg invalid upstream proxy +< age second +< age seconds +< age shour +< age sminute +< age ssecond < attention < ccd add < ccd choose net @@ -433,6 +489,18 @@ < qos enter bandwidths < server restart < static routes +< updxlrtr current view +< updxlrtr no pending downloads attime +< updxlrtr notice dlrate +< updxlrtr overview +< updxlrtr settings +< updxlrtr sources +< updxlrtr standard view +< updxlrtr to delete +< updxlrtr total used +< updxlrtr used by +< uptime +< uptime load average < visit us at < vpn keyexchange < week-graph diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index d4f8bf7..086ff18 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -348,7 +348,7 @@ END </div> <br class="clear" /> <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b>$uptime + <b>Status:</b> $status <b>Uptime:</b> $uptime END ; if ($settings{'SPEED'} ne 'off') { diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index 2a40be2..e072d3b 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -345,7 +345,7 @@ END </div> <br class="clear" /> <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b>$uptime + <b>Status:</b> $status <b>Uptime:</b> $uptime END ; if ($settings{'SPEED'} ne 'off') { diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 00053b0..e513fb5 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -6,11 +6,6 @@ 'Add Port Rule' => 'Port-Regel hinzufÃŒgen', 'Add Rule' => 'Regel hinzufÃŒgen', 'Add a route' => 'Eine Route hinzufÃŒgen', -'age smin' => 'Min.', -'age ssec' => 'Sek.', -'age second' => 'Sekunde', -'age seconds' => 'Sekunden', -'age shour' => 'Std.', 'Async logging enabled' => 'Aktiviere asynchrones Schreiben des Syslogs', 'Choose Rule' => 'WÃ€hlen Sie <u>eine</u> der untenstehenden Regeln aus.', 'Class' => 'Klasse', @@ -328,6 +323,11 @@ 'advproxy web browser' => 'Web-Browser', 'advproxy wednesday' => 'Mit', 'again' => 'Wiederholung:', +'age second' => 'Sekunde', +'age seconds' => 'Sekunden', +'age shour' => 'Std.', +'age sminute' => 'Min.', +'age ssecond' => 'Sek.', 'aktiv' => 'aktiv', 'album' => 'Album', 'alcatelusb help' => 'Um das Speedtouch-USB-Modem zu verwenden, mÃŒssen Sie die Firmware in Ihre IPFire Box hochladen. Bitte laden Sie das <b>Embedded Firmware</b> Paket von speedtouch.com herunter, entpacken es und laden dann die passende Datei fÃŒr Ihr Modem hoch: KQD6_3.xxx fÃŒr Revisionsnummern <4 oder ZZZL_3.xxx fÃŒr Rev.=4 mittels des unten angegebenen Formulars.', @@ -1903,9 +1903,9 @@ 'updxlrtr save and restart' => 'Speichern und neu starten', 'updxlrtr settings' => 'Einstellungen', 'updxlrtr source' => 'Quelle', -'updxlrtr sources' => 'Quellen', 'updxlrtr source checkup' => 'QuellenprÃŒfung', 'updxlrtr source checkup schedule' => 'Zeitplanung der QuellenprÃŒfung', +'updxlrtr sources' => 'Quellen', 'updxlrtr standard view' => 'Standard-Ansicht', 'updxlrtr statistics' => 'Statistik', 'updxlrtr statistics by source' => 'Statistik pro Quelle', @@ -1940,8 +1940,8 @@ 'upstream proxy host:port' => 'Vorgelagerter Proxy (hostname:port)', 'upstream username' => 'Proxy-Benutzername:', 'uptime' => 'Betriebszeit', -'uptime load average' => 'Ã Systemlast', 'uptime and users' => 'Uptime und Benutzer:', +'uptime load average' => 'Systemlast', 'url filter' => 'URL-Filter', 'urlfilter access' => 'Zugriff', 'urlfilter activity detection' => 'AktivitÃ€tserkennung', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 5431e64..e915696 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -6,11 +6,6 @@ 'Add Port Rule' => 'Add port rule', 'Add Rule' => 'Add rule', 'Add a route' => 'Add a route', -'age smin' => 'min', -'age ssec' => 'sec', -'age second' => 'second', -'age seconds' => 'seconds', -'age shour' => 'h', 'Async logging enabled' => 'Enable asynchronous writing of the syslog file', 'Choose Rule' => 'Choose <u>one</u> of the following rules.', 'Class' => 'Class', @@ -329,6 +324,11 @@ 'advproxy web browser' => 'Web browser', 'advproxy wednesday' => 'Wed', 'again' => 'Again:', +'age second' => 'second', +'age seconds' => 'seconds', +'age shour' => 'h', +'age sminute' => 'min', +'age ssecond' => 'sec', 'aktiv' => 'Active', 'album' => 'Album', 'alcatelusb help' => 'To utilise the Speedtouch 330 or Speedtouch USB modem you must upload the firmware to your IPFire box. Please download the <b>Embedded Firmware</b> package for SpeedTouch 330 from speedtouch.com, unzip and then upload the appropriate file for your modem : KQD6_3.xxx when Rev<4 or ZZZL_3.xxx for Rev=4 using the form below.', @@ -976,7 +976,7 @@ 'hostname not set' => 'Hostname not set.', 'hosts config added' => 'Hosts config added', 'hosts config changed' => 'Hosts config changed', -'hour' => 'Hour', +'hour' => 'hour', 'hour-graph' => 'Hour', 'hours' => 'hours', 'hours2' => 'Hours', @@ -1938,9 +1938,9 @@ 'updxlrtr save and restart' => 'Save and Restart', 'updxlrtr settings' => 'Settings', 'updxlrtr source' => 'Source', -'updxlrtr sources' => 'Sources', 'updxlrtr source checkup' => 'Source checkup', 'updxlrtr source checkup schedule' => 'Source checkup schedule', +'updxlrtr sources' => 'Sources', 'updxlrtr standard view' => 'Standard view', 'updxlrtr statistics' => 'Statistics', 'updxlrtr statistics by source' => 'Statistics by source', @@ -1951,8 +1951,8 @@ 'updxlrtr total files' => 'Total files in cache', 'updxlrtr total used' => 'Total used', 'updxlrtr unknown' => 'Unknown', -'updxlrtr used by' => 'Used by', 'updxlrtr update accelerator' => 'Update Accelerator', +'updxlrtr used by' => 'Used by', 'updxlrtr web proxy service required' => 'Web proxy service must be enabled to use Update Accelerator', 'updxlrtr week' => 'one week', 'updxlrtr weekly' => 'weekly', @@ -1976,8 +1976,8 @@ 'upstream proxy host:port' => 'Upstream proxy (host:port)', 'upstream username' => 'Upstream username:', 'uptime' => 'Uptime', -'uptime load average' => 'Ø Load average', 'uptime and users' => 'Uptime and users:', +'uptime load average' => 'Load average', 'url filter' => 'Content Filter', 'urlfilter access' => 'Access', 'urlfilter activity detection' => 'Activity detection', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c5259fab54427a6e39279aa6661db14f26974b94
by git＠ipfire.org 30 Apr '13

30 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via c5259fab54427a6e39279aa6661db14f26974b94 (commit) via ea3224abc7b7cac5e7d40a8e89b629960e32ed2e (commit) via a9959ef3ea42e0874734c5ecb6e3b563a8b5091e (commit) via 311f1c634c1f902c92776afb9ef54c4d0c1623cb (commit) via 8e4c5bff4261fc2de5ae261bebc3e53f62122718 (commit) via e200ab58cc9a8e2c756c504de0e7403d195fe0c2 (commit) via f5fc6d319e0450155dec20c2516cbf02021ee345 (commit) via ab76260b918bd4caa8eb774a4e124e2d3ea203ef (commit) via 58ccbbd4f276050f7f2b5930725eae4cf5957887 (commit) via 514da48192e1e06449b9551a19a58211cf6eeecc (commit) via d2a94495fb8fe62ace4a86756a73106701c7c24f (commit) via 08434343ee20012f5c22f7fadc65181ad035b386 (commit) via 9709b039880baf9731f8270665db01ee704cee45 (commit) via 55afc9854f7b70ee31aca3753892736b9fce8991 (commit) via 22f94778487e86b3244c7f65af500598db4656f0 (commit) via fc0ecdda316ebda14177049a9b384c5c43bccae3 (commit) via c232d1b59a1882211479dea12a39bc066d6b1c5e (commit) via 2cec0cefc084bcd5c98dcf16cbd5219e4a5b7af9 (commit) via 12b8b77430dff255252c06414cdb6cf1c6d4f6c1 (commit) via 9b75c7cc65e4afddfd5a0d9ec780b2b8d7d8562a (commit) via 3ca08d602292f6183bda999df4d62aef86b7e1be (commit) via 48069b782eb549586b53db03f67ee0bf41c24096 (commit) via c99048fd983627e5a63e3fbe73da5233d3bbb9fe (commit) via 6641e7a1f0007c998c8301a7f74a9790ad3909f7 (commit) via 8832801c08263f3442eb1b2902b129ee687c33ec (commit) via 9d9479b5c15ffb88bbc229150df60deb4c34eaf9 (commit) via b8013a57adfbf8e9977e38c425e8bd0cdcfca047 (commit) via 5386d69ca03900fbd0218509b04874dd44592cd1 (commit) via 19d61ef8f4595948c2b7f59e3ffea1e91fc4e1eb (commit) via f6fdef38ca0a73caf56eadb246850c0214033973 (commit) via cf068ec48255c96cc5263c907143c7f6c0fbdcbb (commit) via 60a4bfc125fb89a5ee679ee7d5a6249662ea5b82 (commit) via 90dc87b7de182ae1b82179a1fb1dfab38bf80bb9 (commit) via e16ed29cb0cf2fd29f396e55473e47528d38e0f7 (commit) via 0e421e2723a5079ac39616e91abd07ddc05d427d (commit) via 37882beab7980b029ca777621157658956b6a0eb (commit) via 1580ba11750e3c5885becfbbbbb427535b799eb6 (commit) via c435d7dc16c0e5c83842be62e6a8681db6abe253 (commit) via e20d949dd89ec9ec8dde455a9c0a4b8f5e385a57 (commit) via d2be7786f155aeaff75bccb47a6be8b8c1ed4dca (commit) from fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c5259fab54427a6e39279aa6661db14f26974b94 Merge: fd073ae ea3224a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 12:11:16 2013 +0200 Merge branch 'vdr-next' into next Conflicts: config/rootfiles/core/68/filelists/files commit ea3224abc7b7cac5e7d40a8e89b629960e32ed2e Merge: a9959ef e200ab5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 12:08:08 2013 +0200 Merge remote-tracking branch 'ms/vdr-next' into vdr-next commit a9959ef3ea42e0874734c5ecb6e3b563a8b5091e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 12:07:35 2013 +0200 vdr: Remove old configuration directory from backup. commit 311f1c634c1f902c92776afb9ef54c4d0c1623cb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 12:07:02 2013 +0200 vdr: Migrate old configuration files. commit 8e4c5bff4261fc2de5ae261bebc3e53f62122718 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 30 12:02:19 2013 +0200 vdr: Convert netmask to CIDR notation on install. commit e200ab58cc9a8e2c756c504de0e7403d195fe0c2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 30 11:53:04 2013 +0200 w_scan: add atsc support. commit f5fc6d319e0450155dec20c2516cbf02021ee345 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 29 17:05:05 2013 +0200 vdr_streamdev: use full 64-bit from stat for recordings. commit ab76260b918bd4caa8eb774a4e124e2d3ea203ef Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 29 14:27:38 2013 +0200 vdr_streamdev: fix recordings urls. commit 58ccbbd4f276050f7f2b5930725eae4cf5957887 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 23 21:25:36 2013 +0200 vdr: fix packages names for updating from 1.6 to 2.x. commit 514da48192e1e06449b9551a19a58211cf6eeecc Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 23 18:20:45 2013 +0200 vdr_epgsearch: update to 1.0.1beta5. commit d2a94495fb8fe62ace4a86756a73106701c7c24f Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 20 22:18:22 2013 +0200 w_scan: change path to channels.conf for vdr 2.x. commit 08434343ee20012f5c22f7fadc65181ad035b386 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 20 22:11:45 2013 +0200 vdr: change vdrplugin version back to 2.0.0. commit 9709b039880baf9731f8270665db01ee704cee45 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 18 14:23:42 2013 +0200 vdr: Fix path to readhash. commit 55afc9854f7b70ee31aca3753892736b9fce8991 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 18 14:04:03 2013 +0200 vdr: Update to 2.0.1. commit 22f94778487e86b3244c7f65af500598db4656f0 Author: Daniel Weismüller <whytea(a)ipfire.org> Date: Wed Apr 17 13:13:34 2013 +0200 The script w_scan_start now generates a channel.conf which is compatible to vdr >1.7 commit fc0ecdda316ebda14177049a9b384c5c43bccae3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 12 16:17:13 2013 +0200 vdr-streamdev: Fix configuration file name. commit c232d1b59a1882211479dea12a39bc066d6b1c5e Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Apr 12 12:05:39 2013 +0200 vdr: Remove dependency to freefont. commit 2cec0cefc084bcd5c98dcf16cbd5219e4a5b7af9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 11 16:45:49 2013 +0200 vdr: Auto-allow access from GREEN subnet. commit 12b8b77430dff255252c06414cdb6cf1c6d4f6c1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Apr 3 19:54:15 2013 +0200 vdr: Update to 2.0.0. commit 9b75c7cc65e4afddfd5a0d9ec780b2b8d7d8562a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Fri Mar 29 11:49:40 2013 +0000 vdr-vnsiserver: Fix wrong directory creation. commit 3ca08d602292f6183bda999df4d62aef86b7e1be Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 27 14:57:03 2013 +0100 vdradmin: Change VDR configuration directory. commit 48069b782eb549586b53db03f67ee0bf41c24096 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 27 14:02:25 2013 +0100 vdr-vnsiserver: Update rootfile. commit c99048fd983627e5a63e3fbe73da5233d3bbb9fe Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 27 13:58:35 2013 +0100 vdr-vnsiserver3: Reuse svdrphosts.conf as well. commit 6641e7a1f0007c998c8301a7f74a9790ad3909f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 27 13:57:37 2013 +0100 vdr-streamdev: Reuse svdrphosts.conf. commit 8832801c08263f3442eb1b2902b129ee687c33ec Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 27 13:53:38 2013 +0100 vdradmin: Oops. Wrong variable name. commit 9d9479b5c15ffb88bbc229150df60deb4c34eaf9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 27 13:53:15 2013 +0100 vdradmin: Update configuration. commit b8013a57adfbf8e9977e38c425e8bd0cdcfca047 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 27 13:50:16 2013 +0100 vdr: Add /var/video if it does not exist, yet. commit 5386d69ca03900fbd0218509b04874dd44592cd1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 27 13:04:32 2013 +0100 vdradmin: Update configuration for new versions of VDR. commit 19d61ef8f4595948c2b7f59e3ffea1e91fc4e1eb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 22:48:33 2013 +0100 Add /usr/bin/locale to the distribution. This is needed by vdradmin. commit f6fdef38ca0a73caf56eadb246850c0214033973 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 22:47:51 2013 +0100 vdr-streamdev: Fix compilation. commit cf068ec48255c96cc5263c907143c7f6c0fbdcbb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 22:47:17 2013 +0100 vdr-vnsiserver3: Change plugin. commit 60a4bfc125fb89a5ee679ee7d5a6249662ea5b82 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 13:24:40 2013 +0100 vdr: Update initscript. commit 90dc87b7de182ae1b82179a1fb1dfab38bf80bb9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 13:00:22 2013 +0100 vdr: Small adjustments. * Make links for config.h and device.h to easily build plugins outside the VDR source tree. * Add vdr configuration file. * Remove some unused stuff from runvdr script. commit e16ed29cb0cf2fd29f396e55473e47528d38e0f7 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 12:59:05 2013 +0100 vdr-vnsiserver3: Add configuration file. commit 0e421e2723a5079ac39616e91abd07ddc05d427d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 12:57:38 2013 +0100 vdradmin: Update to 3.6.9. commit 37882beab7980b029ca777621157658956b6a0eb Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 12:56:55 2013 +0100 vdr: Include new configuration directory in backup. commit 1580ba11750e3c5885becfbbbbb427535b799eb6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Mar 23 18:50:16 2013 +0100 strip: Don't strip VDR binaries. commit c435d7dc16c0e5c83842be62e6a8681db6abe253 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 20 17:30:09 2013 +0100 vdr: Add plugins: -streamdev, -epgsearch, -vnsiserver3. commit e20d949dd89ec9ec8dde455a9c0a4b8f5e385a57 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Mar 20 13:41:44 2013 +0100 vdr: Forgot to add runvdr. commit d2be7786f155aeaff75bccb47a6be8b8c1ed4dca Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Mar 19 20:46:06 2013 +0100 vdr: Update to 1.7.41. ----------------------------------------------------------------------- Summary of changes: config/backup/includes/vdr | 2 +- config/rootfiles/packages/vdr | 340 +++++----------------- config/rootfiles/packages/vdr_epgsearch | 39 +-- config/rootfiles/packages/vdr_softdevice | 26 -- config/rootfiles/packages/vdr_streamdev | 8 + config/rootfiles/packages/vdr_vnsiserver3 | 4 + config/vdr/bin/runvdr | 53 ---- config/vdr/bin/runvdr-soft | 5 - config/vdr/plugins.d/conflictcheckonly.conf | 7 + config/vdr/plugins.d/epgsearch.conf | 6 + config/vdr/plugins.d/epgsearchonly.conf | 7 + config/vdr/plugins.d/quickepgsearch.conf | 7 + config/vdr/plugins.d/streamdev-server.conf | 5 + config/vdr/plugins.d/vnsiserver3.conf | 5 + config/vdr/runvdr | 94 ++++++ config/vdr/vdr.sysconfig | 39 +++ config/vdradmin/install-ipfire.sh | 2 +- config/vdradmin/vdradmind.conf | 6 +- config/w_scan/w_scan_start | 38 ++- lfs/strip | 6 +- lfs/vdr | 111 +++---- lfs/vdr_epgsearch | 77 ++++- lfs/vdr_softdevice | 52 ---- lfs/{transmission => vdr_streamdev} | 54 ++-- lfs/{transmission => vdr_vnsiserver3} | 47 +-- lfs/vdradmin | 16 +- lfs/w_scan | 2 +- make.sh | 3 + src/initscripts/init.d/vdr | 20 +- src/paks/{transmission => vdr}/install.sh | 96 +++++- src/paks/{cacti => vdr}/uninstall.sh | 0 src/paks/{transmission => vdr}/update.sh | 11 +- src/paks/{default => vdradmin}/install.sh | 0 src/paks/{cacti => vdradmin}/uninstall.sh | 0 src/paks/{transmission => vdradmin}/update.sh | 10 + src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch | 82 ++++++ src/patches/vdr-streamdev_recordings-64.patch | 29 ++ 37 files changed, 729 insertions(+), 580 deletions(-) delete mode 100644 config/rootfiles/packages/vdr_softdevice create mode 100644 config/rootfiles/packages/vdr_streamdev create mode 100644 config/rootfiles/packages/vdr_vnsiserver3 delete mode 100755 config/vdr/bin/runvdr delete mode 100755 config/vdr/bin/runvdr-soft create mode 100644 config/vdr/plugins.d/conflictcheckonly.conf create mode 100644 config/vdr/plugins.d/epgsearch.conf create mode 100644 config/vdr/plugins.d/epgsearchonly.conf create mode 100644 config/vdr/plugins.d/quickepgsearch.conf create mode 100644 config/vdr/plugins.d/streamdev-server.conf create mode 100644 config/vdr/plugins.d/vnsiserver3.conf create mode 100644 config/vdr/runvdr create mode 100644 config/vdr/vdr.sysconfig delete mode 100644 lfs/vdr_softdevice copy lfs/{transmission => vdr_streamdev} (69%) copy lfs/{transmission => vdr_vnsiserver3} (76%) copy src/paks/{transmission => vdr}/install.sh (55%) copy src/paks/{cacti => vdr}/uninstall.sh (100%) copy src/paks/{transmission => vdr}/update.sh (89%) copy src/paks/{default => vdradmin}/install.sh (100%) copy src/paks/{cacti => vdradmin}/uninstall.sh (100%) copy src/paks/{transmission => vdradmin}/update.sh (86%) create mode 100644 src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch create mode 100644 src/patches/vdr-streamdev_recordings-64.patch Difference in files: diff --git a/config/backup/includes/vdr b/config/backup/includes/vdr index d8d58a5..38bd82a 100644 --- a/config/backup/includes/vdr +++ b/config/backup/includes/vdr @@ -1 +1 @@ -/opt/vdr/etc/ +/etc/vdr diff --git a/config/rootfiles/packages/vdr b/config/rootfiles/packages/vdr index eee440e..4b6eaff 100644 --- a/config/rootfiles/packages/vdr +++ b/config/rootfiles/packages/vdr @@ -1,264 +1,84 @@ -#opt/vdr/etc -#opt/vdr/etc/plugins -#opt/vdr/locale/ca_ES -#opt/vdr/locale/ca_ES/LC_MESSAGES -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr.mo -#opt/vdr/locale/cs_CZ -#opt/vdr/locale/cs_CZ/LC_MESSAGES -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr.mo -#opt/vdr/locale/da_DK -#opt/vdr/locale/da_DK/LC_MESSAGES -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr.mo -#opt/vdr/locale/de_DE -#opt/vdr/locale/de_DE/LC_MESSAGES -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr-epgsearch.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-hello.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-pictures.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/de_DE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/el_GR -#opt/vdr/locale/el_GR/LC_MESSAGES -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/es_ES -#opt/vdr/locale/es_ES/LC_MESSAGES -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr.mo -#opt/vdr/locale/et_EE -#opt/vdr/locale/et_EE/LC_MESSAGES -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/fi_FI -#opt/vdr/locale/fi_FI/LC_MESSAGES -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr.mo -#opt/vdr/locale/fr_FR -#opt/vdr/locale/fr_FR/LC_MESSAGES -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/hr_HR -#opt/vdr/locale/hr_HR/LC_MESSAGES -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/hu_HU -#opt/vdr/locale/hu_HU/LC_MESSAGES -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr.mo -#opt/vdr/locale/it_IT -#opt/vdr/locale/it_IT/LC_MESSAGES -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr.mo -#opt/vdr/locale/nl_NL -#opt/vdr/locale/nl_NL/LC_MESSAGES -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr.mo -#opt/vdr/locale/nn_NO -#opt/vdr/locale/nn_NO/LC_MESSAGES -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr.mo -#opt/vdr/locale/pl_PL -#opt/vdr/locale/pl_PL/LC_MESSAGES -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr.mo -#opt/vdr/locale/pt_PT -#opt/vdr/locale/pt_PT/LC_MESSAGES -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr.mo -#opt/vdr/locale/ro_RO -#opt/vdr/locale/ro_RO/LC_MESSAGES -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr.mo -#opt/vdr/locale/ru_RU -#opt/vdr/locale/ru_RU/LC_MESSAGES -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr.mo -#opt/vdr/locale/sl_SI -#opt/vdr/locale/sl_SI/LC_MESSAGES -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr.mo -#opt/vdr/locale/sv_SE -#opt/vdr/locale/sv_SE/LC_MESSAGES -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr.mo -#opt/vdr/locale/tr_TR -#opt/vdr/locale/tr_TR/LC_MESSAGES -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr.mo -#opt/vdr/locale/uk_UA -#opt/vdr/locale/uk_UA/LC_MESSAGES -#opt/vdr/locale/uk_UA/LC_MESSAGES/vdr.mo -#opt/vdr/locale/zh_CN -#opt/vdr/locale/zh_CN/LC_MESSAGES -#opt/vdr/locale/zh_CN/LC_MESSAGES/vdr.mo -#opt/vdr -#opt/vdr/PLUGINS -#opt/vdr/PLUGINS/lib -#opt/vdr/PLUGINS/lib/libsoftdevice-dfb.so.1.6.0 -#opt/vdr/PLUGINS/lib/libsoftdevice-fb.so.1.6.0 -#opt/vdr/PLUGINS/lib/libsoftdevice-shm.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-conflictcheckonly.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-epgsearch.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-epgsearchonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-hello.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-osddemo.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-pictures.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-quickepgsearch.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-skincurses.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-sky.so.1.6.0 -#opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-status.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-streamdev-client.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-streamdev-server.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svccli.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svcsvr.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-svdrpdemo.so.1.6.0 -#opt/vdr/bin -opt/vdr/bin/runvdr -#opt/vdr/bin/runvdr-soft -opt/vdr/bin/svdrpsend.pl -opt/vdr/bin/vdr -#opt/vdr/locale -#opt/vdr/locale/ca_ES -#opt/vdr/locale/ca_ES/LC_MESSAGES -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/cs_CZ -#opt/vdr/locale/cs_CZ/LC_MESSAGES -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/da_DK -#opt/vdr/locale/da_DK/LC_MESSAGES -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/de_DE -#opt/vdr/locale/de_DE/LC_MESSAGES -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-hello.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-pictures.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/el_GR -#opt/vdr/locale/el_GR/LC_MESSAGES -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/es_ES -#opt/vdr/locale/es_ES/LC_MESSAGES -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/et_EE -#opt/vdr/locale/et_EE/LC_MESSAGES -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI -#opt/vdr/locale/fi_FI/LC_MESSAGES -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/fr_FR -#opt/vdr/locale/fr_FR/LC_MESSAGES -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/hr_HR -#opt/vdr/locale/hr_HR/LC_MESSAGES -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/hu_HU -#opt/vdr/locale/hu_HU/LC_MESSAGES -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT -#opt/vdr/locale/it_IT/LC_MESSAGES -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/nl_NL -#opt/vdr/locale/nl_NL/LC_MESSAGES -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/nn_NO -#opt/vdr/locale/nn_NO/LC_MESSAGES -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pl_PL -#opt/vdr/locale/pl_PL/LC_MESSAGES -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/pt_PT -#opt/vdr/locale/pt_PT/LC_MESSAGES -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ro_RO -#opt/vdr/locale/ro_RO/LC_MESSAGES -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU -#opt/vdr/locale/ru_RU/LC_MESSAGES -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-pictures.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-skincurses.mo -#opt/vdr/locale/sl_SI -#opt/vdr/locale/sl_SI/LC_MESSAGES -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/sv_SE -#opt/vdr/locale/sv_SE/LC_MESSAGES -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-hello.mo -#opt/vdr/locale/tr_TR -#opt/vdr/locale/tr_TR/LC_MESSAGES -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-hello.mo -#opt/vdr/share -#opt/vdr/share/man -#opt/vdr/share/man/man1 -#opt/vdr/share/man/man1/vdr.1.gz -#opt/vdr/share/man/man5 -#opt/vdr/share/man/man5/vdr.5.gz -#opt/vdr/video -#var/video -opt/vdr/etc/channels.conf -opt/vdr/etc/diseqc.conf -opt/vdr/etc/keymacros.conf -#var/video/plugins -opt/vdr/etc/plugins/streamdevhosts.conf -opt/vdr/etc/setup.conf -opt/vdr/etc/sources.conf -opt/vdr/etc/svdrphosts.conf etc/rc.d/init.d/vdr -etc/rc.d/rc3.d/S60vdr etc/rc.d/rc0.d/K40vdr +etc/rc.d/rc3.d/S60vdr etc/rc.d/rc6.d/K40vdr +etc/sysconfig/vdr +#etc/sysconfig/vdr-plugins.d +etc/vdr +etc/vdr/channels.conf +etc/vdr/diseqc.conf +etc/vdr/keymacros.conf +etc/vdr/scr.conf +etc/vdr/sources.conf +etc/vdr/svdrphosts.conf +usr/bin/svdrpsend +#usr/include/libsi +#usr/include/libsi/descriptor.h +#usr/include/libsi/headers.h +#usr/include/libsi/section.h +#usr/include/libsi/si.h +#usr/include/libsi/util.h +#usr/include/vdr +#usr/include/vdr/audio.h +#usr/include/vdr/channels.h +#usr/include/vdr/ci.h +#usr/include/vdr/config.h +#usr/include/vdr/cutter.h +#usr/include/vdr/device.h +#usr/include/vdr/diseqc.h +#usr/include/vdr/dvbci.h +#usr/include/vdr/dvbdevice.h +#usr/include/vdr/dvbplayer.h +#usr/include/vdr/dvbspu.h +#usr/include/vdr/dvbsubtitle.h +#usr/include/vdr/eit.h +#usr/include/vdr/eitscan.h +#usr/include/vdr/epg.h +#usr/include/vdr/filter.h +#usr/include/vdr/font.h +#usr/include/vdr/i18n.h +#usr/include/vdr/interface.h +#usr/include/vdr/keys.h +#usr/include/vdr/lirc.h +#usr/include/vdr/menu.h +#usr/include/vdr/menuitems.h +#usr/include/vdr/nit.h +#usr/include/vdr/osd.h +#usr/include/vdr/osdbase.h +#usr/include/vdr/pat.h +#usr/include/vdr/player.h +#usr/include/vdr/plugin.h +#usr/include/vdr/receiver.h +#usr/include/vdr/recorder.h +#usr/include/vdr/recording.h +#usr/include/vdr/remote.h +#usr/include/vdr/remux.h +#usr/include/vdr/ringbuffer.h +#usr/include/vdr/sdt.h +#usr/include/vdr/sections.h +#usr/include/vdr/shutdown.h +#usr/include/vdr/skinclassic.h +#usr/include/vdr/skinlcars.h +#usr/include/vdr/skins.h +#usr/include/vdr/skinsttng.h +#usr/include/vdr/sourceparams.h +#usr/include/vdr/sources.h +#usr/include/vdr/spu.h +#usr/include/vdr/status.h +#usr/include/vdr/svdrp.h +#usr/include/vdr/themes.h +#usr/include/vdr/thread.h +#usr/include/vdr/timers.h +#usr/include/vdr/tools.h +#usr/include/vdr/transfer.h +#usr/include/vdr/videodir.h +#usr/lib/vdr +#usr/lib/vdr/Make.global +#usr/lib/vdr/config.h +#usr/lib/vdr/device.h +usr/sbin/runvdr +usr/sbin/vdr +usr/share/vdr +var/cache/vdr var/ipfire/backup/addons/includes/vdr +#var/video diff --git a/config/rootfiles/packages/vdr_epgsearch b/config/rootfiles/packages/vdr_epgsearch index 1485d75..193d79f 100644 --- a/config/rootfiles/packages/vdr_epgsearch +++ b/config/rootfiles/packages/vdr_epgsearch @@ -1,25 +1,14 @@ -opt/vdr/PLUGINS/lib/libvdr-conflictcheckonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-epgsearch.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-epgsearchonly.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-quickepgsearch.so.1.6.0 -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-epgsearch.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-epgsearch.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-epgsearch.mo +etc/sysconfig/vdr-plugins.d/conflictcheckonly.conf +etc/sysconfig/vdr-plugins.d/epgsearch.conf +etc/sysconfig/vdr-plugins.d/epgsearchonly.conf +etc/sysconfig/vdr-plugins.d/quickepgsearch.conf +etc/vdr/plugins/epgsearch +etc/vdr/plugins/epgsearch/conf.d +usr/bin/createcats +usr/lib/vdr/libvdr-conflictcheckonly.so.2.0.0 +usr/lib/vdr/libvdr-epgsearch.so.2.0.0 +usr/lib/vdr/libvdr-epgsearchonly.so.2.0.0 +usr/lib/vdr/libvdr-quickepgsearch.so.2.0.0 +#var/lib/vdr +#var/lib/vdr/data +var/lib/vdr/data/epgsearch diff --git a/config/rootfiles/packages/vdr_softdevice b/config/rootfiles/packages/vdr_softdevice deleted file mode 100644 index de66a77..0000000 --- a/config/rootfiles/packages/vdr_softdevice +++ /dev/null @@ -1,26 +0,0 @@ -opt/vdr/bin/runvdr-soft -opt/vdr/PLUGINS/lib/libsoftdevice-dfb.so.1.6.0 -opt/vdr/PLUGINS/lib/libsoftdevice-fb.so.1.6.0 -opt/vdr/PLUGINS/lib/libsoftdevice-shm.so.1.6.0 -opt/vdr/PLUGINS/lib/libvdr-softdevice.so.1.6.0 -#opt/vdr/locale/ca_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/cs_CZ/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/da_DK/LC_MESSAGES/vdr-softdevice.mo -opt/vdr/locale/de_DE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/el_GR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/es_ES/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/et_EE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fi_FI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/fr_FR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hr_HR/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/hu_HU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/it_IT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nl_NL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/nn_NO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pl_PL/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/pt_PT/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ro_RO/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/ru_RU/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sl_SI/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/sv_SE/LC_MESSAGES/vdr-softdevice.mo -#opt/vdr/locale/tr_TR/LC_MESSAGES/vdr-softdevice.mo diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev new file mode 100644 index 0000000..458e7d8 --- /dev/null +++ b/config/rootfiles/packages/vdr_streamdev @@ -0,0 +1,8 @@ +etc/sysconfig/vdr-plugins.d/streamdev-server.conf +#etc/vdr/plugins +etc/vdr/plugins/streamdev-server +etc/vdr/plugins/streamdev-server/streamdevhosts.conf +#usr/lib/vdr +#usr/lib/vdr/bin +usr/lib/vdr/bin/externremux.sh +usr/lib/vdr/libvdr-streamdev-server.so.2.0.0 diff --git a/config/rootfiles/packages/vdr_vnsiserver3 b/config/rootfiles/packages/vdr_vnsiserver3 new file mode 100644 index 0000000..4eee282 --- /dev/null +++ b/config/rootfiles/packages/vdr_vnsiserver3 @@ -0,0 +1,4 @@ +etc/sysconfig/vdr-plugins.d/vnsiserver3.conf +etc/vdr/plugins/vnsiserver3 +etc/vdr/plugins/vnsiserver3/allowed_hosts.conf +usr/lib/vdr/libvdr-vnsiserver3.so.2.0.0 diff --git a/config/vdr/bin/runvdr b/config/vdr/bin/runvdr deleted file mode 100755 index f17b70c..0000000 --- a/config/vdr/bin/runvdr +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -# runvdr: Loads the DVB driver and runs VDR -# -# If VDR exits abnormally, the driver will be reloaded -# and VDR restarted. -# -# Any command line parameters will be passed on to the -# actual 'vdr' program. -# - -PLUGOPTS="-Pstreamdev-server" - -VDRPRG="./bin/vdr" -VDRCMD="/bin/nice --11 $VDRPRG -w 60 -c /opt/vdr/etc $PLUGOPTS $*" - -KILL="killall -q -TERM" - -if [ "$(ps -A | grep " vdr$")" != "" ]; then - echo Error! VDR is already running! - exit 1 -fi - -mkdir -p /var/video -cd /opt/vdr -while (true) do -# -# If you have stability Problems at tuning or similar -# unload and reload the dvb-modules here ... -# Example is for Hauppauge Nexus 2.0 -# -# rmmod dvb_ttpci -# rmmod stv0299 -# rmmod dvb_core -# modprobe dvb_ttpci -# sleep 5 -# -# Check if DVB device is present / remove this check if you -# would use vdr as streaming client only -# - if [ ! -e /dev/dvb/adapter0/frontend0 ]; then - echo No DVB tuner found! - exit 1 - fi -# -# Run VDR -# - eval "$VDRCMD" - if test $? -eq 0 -o $? -eq 2; then exit; fi - $KILL $VDRPRG - sleep 10 - echo "`date` restarting VDR" -done diff --git a/config/vdr/bin/runvdr-soft b/config/vdr/bin/runvdr-soft deleted file mode 100755 index 6f187eb..0000000 --- a/config/vdr/bin/runvdr-soft +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -clear -runvdr -P\'softdevice -vo fb:\' > /tmp/vdrsoft.log 2>&1 -tail /tmp/vdrsoft.log -rm /tmp/vdrsoft.log diff --git a/config/vdr/plugins.d/conflictcheckonly.conf b/config/vdr/plugins.d/conflictcheckonly.conf new file mode 100644 index 0000000..d514694 --- /dev/null +++ b/config/vdr/plugins.d/conflictcheckonly.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-conflictcheckonly -*- sh -*- +# +# Add command line options to pass to the conflictcheckonly plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/epgsearch.conf b/config/vdr/plugins.d/epgsearch.conf new file mode 100644 index 0000000..3c73119 --- /dev/null +++ b/config/vdr/plugins.d/epgsearch.conf @@ -0,0 +1,6 @@ +# Configuration snippet for vdr-epgsearch -*- sh -*- +# +# Add command line options to pass to the epgsearch plugin to PLUGIN_OPTIONS, +# see the epgsearch(1) man page for information about available options. + +PLUGIN_OPTIONS="-l /var/log/vdr/epgsearch.log" diff --git a/config/vdr/plugins.d/epgsearchonly.conf b/config/vdr/plugins.d/epgsearchonly.conf new file mode 100644 index 0000000..9208556 --- /dev/null +++ b/config/vdr/plugins.d/epgsearchonly.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-epgsearchonly -*- sh -*- +# +# Add command line options to pass to the epgsearchonly plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/quickepgsearch.conf b/config/vdr/plugins.d/quickepgsearch.conf new file mode 100644 index 0000000..e302850 --- /dev/null +++ b/config/vdr/plugins.d/quickepgsearch.conf @@ -0,0 +1,7 @@ +# Configuration snippet for vdr-quickepgsearch -*- sh -*- +# +# Add command line options to pass to the quickepgsearch plugin to +# PLUGIN_OPTIONS, enable it by commenting out PLUGIN_ENABLED. + +PLUGIN_ENABLED=false +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/streamdev-server.conf b/config/vdr/plugins.d/streamdev-server.conf new file mode 100644 index 0000000..52c11cf --- /dev/null +++ b/config/vdr/plugins.d/streamdev-server.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-streamdev-server -*- sh -*- +# +# Add command line options to pass to the streamdev-server plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/config/vdr/plugins.d/vnsiserver3.conf b/config/vdr/plugins.d/vnsiserver3.conf new file mode 100644 index 0000000..7c9706d --- /dev/null +++ b/config/vdr/plugins.d/vnsiserver3.conf @@ -0,0 +1,5 @@ +# Configuration snippet for vdr-vnsiserver3 -*- sh -*- +# +# Add command line options to pass to the vnsiserver3 plugin to PLUGIN_OPTIONS. + +PLUGIN_OPTIONS="" diff --git a/config/vdr/runvdr b/config/vdr/runvdr new file mode 100644 index 0000000..5dcfd6c --- /dev/null +++ b/config/vdr/runvdr @@ -0,0 +1,94 @@ +#!/bin/bash + +# runvdr - VDR launcher +# +# runvdr [VDROPTION]... + +shopt -s extglob nocasematch nullglob + +VDR=/usr/sbin/vdr +PLUGINDIR=/usr/lib/vdr +PLUGINVER=VDR_PLUGIN_VERSION +PLUGINSUF=${PLUGINVER:+.$PLUGINVER} + +log() +{ + type -P logger &>/dev/null && \ + logger -s -p daemon.info -t ${0##*/} "$1" 2>&1 || echo "INFO: $1" +} + +plugconf() +{ + local plugin=$1 PLUGIN_OPTIONS= PLUGIN_ENABLED= + if [[ -e /etc/sysconfig/vdr-plugins.d/$plugin.conf ]] ; then + . /etc/sysconfig/vdr-plugins.d/$plugin.conf + case $PLUGIN_ENABLED in no|false|0) return ;; esac + fi + if [[ $PLUGIN_OPTIONS ]] ; then + VDR_OPTIONS+=( --plugin="$plugin $PLUGIN_OPTIONS" ) + else + VDR_OPTIONS+=( --plugin=$plugin ) + fi +} + +build_cmdline() +{ + local plugin= p= + # Add "priority" plugins. + for plugin in $VDR_PLUGIN_ORDER ; do + [[ -e $PLUGINDIR/libvdr-${plugin}.so$PLUGINSUF ]] && plugconf $plugin + done + # Add the rest available. + for plugin in $PLUGINDIR/libvdr-*.so$PLUGINSUF ; do + plugin=${plugin##*/libvdr-} + plugin=${plugin%.so$PLUGINSUF} + for p in $VDR_PLUGIN_ORDER ; do + if [[ $plugin == $p ]] ; then + # Already added. + continue 2 + fi + done + plugconf $plugin + done +} + +reload_dvb() +{ + local modules=$( /sbin/lsmod | \ + awk '/^dvb_core/ { gsub(","," ",$4) ; print $4 }' ) + if [[ $modules ]] ; then + log "Reloading DVB modules" + /sbin/modprobe -r $modules dvb_core + for module in $modules ; do + /sbin/modprobe $module + done + fi +} + +rc= +while true ; do + VDR_OPTIONS=() + [[ -f /etc/sysconfig/vdr ]] && . /etc/sysconfig/vdr + [[ $DAEMON_COREFILE_LIMIT ]] && \ + ulimit -S -c $DAEMON_COREFILE_LIMIT &>/dev/null && \ + VDR_OPTIONS+=( --userdump ) && cd ${TMPDIR:-/tmp} + build_cmdline + + $VDR "$@" "${VDR_OPTIONS[@]}" + rc=$? + + # 137: "kill -KILL" eg in killproc(), others: "man vdr" + case $rc in + 0|2|137) + log "VDR exited with status $rc, exiting" + break + ;; + *) + log "VDR exited with status $rc, attempting restart" + case $RELOAD_DVB in yes|true|1) reload_dvb ;; esac + ;; + esac + +done + +exit $rc diff --git a/config/vdr/vdr.sysconfig b/config/vdr/vdr.sysconfig new file mode 100644 index 0000000..a1cebf1 --- /dev/null +++ b/config/vdr/vdr.sysconfig @@ -0,0 +1,39 @@ +# System configuration for VDR -*- sh -*- + +# The "master" options. Some examples of options you may want to set +# here are -r, -t, and --rcu. See the vdr(1) man page for more info. +# +VDR_OPTIONS=(--vfat) + +# VDR_PLUGIN_ORDER is a space separated list of plugins that should be +# loaded in a specific order. This affects eg. the order the plugins' +# menu entries are displayed OSD menus by default. The plugins in this +# list don't need to be installed, but if they are, they will be loaded +# before other possibly installed plugins. Note that it is recommended +# to load output plugins before others so that all necessary features are +# present when needed by other plugins at startup/shutdown. +# +VDR_PLUGIN_ORDER=" +streamdev-server +epgsearch +vnsiserver3 +" + +# PATH where to find the internally used executables. +# +PATH="/usr/lib/vdr/bin:$PATH" + +# How many minutes before a recording should the VDR box wake up? +# Some CI/CAM combinations can take quite a long time to initialize, so +# we default to a pretty generous value here. +# +WAKEUP_BEFORE_RECORDING=10 + +# Try reloading DVB modules on unexpected exits? +# +#RELOAD_DVB=yes + +# For debugging: allow vdr to dump core. Note that depending on the operating +# environment, core dumps from setuid processes may be a security issue. +# +#DAEMON_COREFILE_LIMIT="unlimited" diff --git a/config/vdradmin/install-ipfire.sh b/config/vdradmin/install-ipfire.sh index 8eceaac..9a6655b 100755 --- a/config/vdradmin/install-ipfire.sh +++ b/config/vdradmin/install-ipfire.sh @@ -18,7 +18,7 @@ CACHEDIR=${CACHEDIR:-$DESTDIR/var/cache/vdradmin} PIDFILE=${PIDFILE:-$DESTDIR/var/run/vdradmind.pid} VIDEODIR=${VIDEODIR:-/var/video} EPGIMAGES=${EPGIMAGES:-$VIDEODIR/epgimages} -VDRCONF=${VDRCONF:-/opt/vdr/etc} +VDRCONF=${VDRCONF:-/etc/vdr} function usage() { diff --git a/config/vdradmin/vdradmind.conf b/config/vdradmin/vdradmind.conf index 022efe7..a3b2d48 100644 --- a/config/vdradmin/vdradmind.conf +++ b/config/vdradmin/vdradmind.conf @@ -31,7 +31,7 @@ ES_SORTBY = pattern GUEST_ACCOUNT = 0 GUI_POPUP_HEIGHT = 250 GUI_POPUP_WIDTH = 500 -LANG = +LANG = en_US.utf8 LOCAL_NET = 0.0.0.0/32 LOGFILE = vdradmind.log LOGGING = 0 @@ -81,8 +81,8 @@ TV_MIMETYPE = video/x-mpegurl TV_SIZE = half USERNAME = vdradmin USERNAME_GUEST = guest -VDRCONFDIR = /opt/vdr/etc +VDRCONFDIR = /etc/vdr VDR_HOST = localhost -VDR_PORT = 2001 +VDR_PORT = 6419 VIDEODIR = /var/video ZEITRAHMEN = 1 diff --git a/config/w_scan/w_scan_start b/config/w_scan/w_scan_start index 0f624ac..05d9a78 100755 --- a/config/w_scan/w_scan_start +++ b/config/w_scan/w_scan_start @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -19,7 +19,9 @@ # # ############################################################################### ############################################################################### -# w_scan_start for IPFire v 1.00 - 2012-11-15 Arne Fitzenreiter - inital vers.# +# w_scan_start for IPFire v 1.02 - 2013-04-30 Arne Fitzenreiter - add atsc # +# - 2013-04-20 Arne Fitzenreiter - path vdr 2 # +# - 2012-11-15 Arne Fitzenreiter - inital vers.# ############################################################################### err_msg () @@ -64,17 +66,19 @@ if [ "$(ps -A | grep " runvdr$")" != "" ] ;then /etc/init.d/vdr stop fi -# Select DVB type -whiptail --checklist "\nSelect DVB type" 12 40 3 \ +# Select system type +whiptail --checklist "\nSelect system type" 12 40 5 \ DVB-T "Terrestrial" yes \ - DVB-C "Cable" no \ - DVB-S "Satellite" no \ + DVB-C "Cable" no \ + DVB-S "Satellite" no \ + ATSC-T "Terrestrial" no \ + ATSC-C "Cable" no \ 2>/tmp/w_scan_type chk_cancel W_SCAN_TYPE=$(cat /tmp/w_scan_type) rm /tmp/w_scan_type -if [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then +if [[ "$W_SCAN_TYPE" == *ATSC* ]] || [[ "$W_SCAN_TYPE" == *DVB-T* ]] || [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then # Generate and run separate country menubox and default germany echo '#!/bin/bash' > /tmp/w_scan_countryselect.sh echo 'whiptail --radiolist "\nSelect country" 19 70 10 \' >> /tmp/w_scan_countryselect.sh @@ -105,19 +109,27 @@ clear rm -rf /tmp/channels.conf if [[ "$W_SCAN_TYPE" == *DVB-T* ]]; then echo ":->W-SCAN DVB-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf + $WSCAN -f t -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf fi if [[ "$W_SCAN_TYPE" == *DVB-C* ]]; then echo ":->W-SCAN DVB-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 >>/tmp/channels.conf + $WSCAN -f c -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf fi if [[ "$W_SCAN_TYPE" == *DVB-S* ]]; then for SATELLITE in $W_SCAN_SATELLITE; do echo ":->W-SCAN DVB-S $SATELLITE $(date +%Y%m%d%H%M)" >>/tmp/channels.conf - $WSCAN -f s -s $SATELLITE -C UTF-8 >>/tmp/channels.conf + $WSCAN -f s -s $SATELLITE -C UTF-8 -o 7 >>/tmp/channels.conf done fi +if [[ "$W_SCAN_TYPE" == *ATSC-T* ]]; then + echo ":->W-SCAN ATSC-T $(date +%Y%m%d%H%M)" >>/tmp/channels.conf + $WSCAN -f a -A 1 -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf +fi +if [[ "$W_SCAN_TYPE" == *ATSC-C* ]]; then + echo ":->W-SCAN ATSC-C $(date +%Y%m%d%H%M)" >>/tmp/channels.conf + $WSCAN -f a -A 2 -c $W_SCAN_COUNTRY -C UTF-8 -o 7 >>/tmp/channels.conf +fi # Save result to current dir. cp /tmp/channels.conf w_scan-$(date +%Y%m%d%H%M).channels.conf @@ -127,9 +139,9 @@ echo Results saved to w_scan-$(date +%Y%m%d%H%M).channels.conf if [ -e /opt/pakfire/db/installed/meta-vdr ]; then yes_no "Install new channels-conf for VDR." # Backup old channels conf... - cp -f /opt/vdr/etc/channels.conf \ - /opt/vdr/etc/channels.conf.backup$(date +%Y%m%d%H%M) - cp -f /tmp/channels.conf /opt/vdr/etc/ + cp -f /etc/vdr/channels.conf \ + /etc/vdr/channels.conf.backup$(date +%Y%m%d%H%M) + cp -f /tmp/channels.conf /etc/vdr/ yes_no "Should i start the VDR?" clear /etc/init.d/vdr start diff --git a/lfs/strip b/lfs/strip index 30cb9b3..d07ff43 100644 --- a/lfs/strip +++ b/lfs/strip @@ -46,5 +46,9 @@ md5 : ############################################################################### $(TARGET) : + # Don't strip VDR binaries, because they use a weird plugin system + # which does not work when unneeded symbols get stripped from + # /usr/sbin/vdr. STRIP="/tools/bin/strip" $(DIR_SRC)/src/stripper / \ - --exclude=/usr/src --exclude=/tools + --exclude=/usr/src --exclude=/tools \ + --exclude=/usr/sbin/vdr --exclude=/usr/lib/vdr diff --git a/lfs/vdr b/lfs/vdr index 46ea5d3..0dd2c0f 100644 --- a/lfs/vdr +++ b/lfs/vdr @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,39 +24,44 @@ include Config -VER = 1.6.0 +VER = 2.0.1 +VDRPLUGVER = 2.0.0 THISAPP = vdr-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FILE1 = vdr-streamdev-20080325-http-0_4.tgz -DL_FILE2 = vdr-softdevice-0.5.0.tgz -DL_FILE3 = vidix-1.0.0.tar.bz2 -DL_FILE4 = vdr-epgsearch-0.9.24.tgz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr -PAK_VER = 5 - -DEPS = "freefont" +PAK_VER = 6 + +DEPS = "vdr_streamdev" + +MAKE_OPTIONS = \ + PREFIX=/usr \ + BINDIR=/usr/bin \ + CACHEDIR=/var/cache/vdr \ + CONFDIR=/etc/vdr \ + INCDIR=/usr/include \ + LIBDIR=/usr/lib/vdr \ + LOCDIR=/usr/share/locale \ + MANDIR=/usr/share/man \ + RESDIR=/usr/share/vdr \ + RUNDIR=/var/run \ + VARDIR=/var \ + VIDEODIR=/var/video \ + CFLAGS="$(CFLAGS)" \ + CXXFLAGS="$(CXXFLAGS)" ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) $(DL_FILE1) $(DL_FILE2) $(DL_FILE3) $(DL_FILE4) +objects = $(DL_FILE) -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1) -$(DL_FILE2) = $(DL_FROM)/$(DL_FILE2) -$(DL_FILE3) = $(DL_FROM)/$(DL_FILE3) -$(DL_FILE4) = $(DL_FROM)/$(DL_FILE4) +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 76f4ebe6525a35e33313d27a3f8e80c0 -$(DL_FILE1)_MD5 = 874026c643601692077c42ee7a70b720 -$(DL_FILE2)_MD5 = e106876497db478f3b9ba4da0e5532f8 -$(DL_FILE3)_MD5 = 3471d1f385871f7e00e6e178ccdfff0b -$(DL_FILE4)_MD5 = 4f0b1d7bdc6f24478f2670769547d7db +$(DL_FILE)_MD5 = e1b7a76c57c96300829dccd39eb20e7d install : $(TARGET) @@ -90,42 +95,44 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - # Install obsolete V4L1 videodev header. - cp $(DIR_SRC)/config/include/obsolete_videodev.h /usr/include/linux/videodev.h - - # Accept also DVB_API_VERSION 5 - cd $(DIR_APP) && sed -i -e "s|DVB_API_VERSION != 3|& \&\& DVB_API_VERSION != 5|g" dvbdevice.h - - cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE1) - cd $(DIR_APP)/PLUGINS/src && ln -s streamdev-0.3.3-20080325-http streamdev - cd $(DIR_APP)/PLUGINS/src && tar zxf $(DIR_DL)/$(DL_FILE2) - cd $(DIR_APP)/PLUGINS/src && ln -s softdevice-0.5.0 softdevice - cd $(DIR_APP)/PLUGINS/src/softdevice && ./configure - cd $(DIR_APP)/PLUGINS/src && tar jxf $(DIR_DL)/$(DL_FILE3) - cd $(DIR_APP)/PLUGINS/src && ln -s vidix-1.0.0 vidix - cd $(DIR_APP)/PLUGINS/src/vidix && ./configure - cd $(DIR_APP)/PLUGINS/src && tar xvf $(DIR_DL)/$(DL_FILE4) - cd $(DIR_APP)/PLUGINS/src && ln -s epgsearch-0.9.24 epgsearch - cd $(DIR_APP) && patch -Np1 -i PLUGINS/src/epgsearch/patches/MainMenuHooks-v1_0.patch - cd $(DIR_APP)/PLUGINS/src/epgsearch && sed -i '/include/a #include <langinfo.h>/' \ - epgsearch.c - cd $(DIR_APP)/PLUGINS/src/epgsearch && patch -Np1 < $(DIR_SRC)/src/patches/vdr-plugin-epgsearch-gcc44.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-1.6.0-gcc44-fixes.patch - cd $(DIR_APP) && make VIDEODIR=/var/video plugins $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make VIDEODIR=/var/video vdr $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make DFB_SUPPORT=1 FB_SUPPORT=1 VIDIX_SUPPORT=1 $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make PREFIX=. DESTDIR=/opt/vdr/ install - -mkdir -p /opt/vdr/etc - cd $(DIR_APP) && install *.conf /opt/vdr/etc/ - cp -Rvf $(DIR_SRC)/config/vdr /opt + # Compile main package. + cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir + + # Compile bundled plugins. + #cd $(DIR_APP) && for plugin in ...; do \ + # make $(MAKETUNING) -C PLUGINS/src/$$plugin VDRDIR=$(DIR_APP) \ + # CFLAGS="$(CFLAGS) -I$(DIR_APP)/include" \ + # CXXFLAGS="$(CXXFLAGS) -I$(DIR_APP)/include" \ + # PLGCFG=$(DIR_APP)/plugins.mk all || exit 1; \ + #done + + # Install main package. + cd $(DIR_APP) && make install-bin install-dirs install-includes $(MAKE_OPTIONS) + mv -v /usr/bin/vdr /usr/sbin/vdr + + sed -e "s/VDR_PLUGIN_VERSION/$(VDRPLUGVER)/" \ + < $(DIR_SRC)/config/vdr/runvdr > /usr/sbin/runvdr + chmod 755 /usr/sbin/runvdr + + # Install configuration. + mkdir -pv /etc/vdr + mkdir -pv /etc/sysconfig/vdr-plugins.d + cd $(DIR_APP) && install -m 644 $(DIR_SRC)/config/vdr/vdr.sysconfig \ + /etc/sysconfig/vdr + cd $(DIR_APP) && install -m 644 *.conf /etc/vdr + + # Link development files. + mkdir -pv /usr/lib/vdr + cd $(DIR_APP) && cp -vf Make.global /usr/lib/vdr + ln -svf ../../include/vdr/config.h /usr/lib/vdr/config.h + ln -svf ../../include/vdr/device.h /usr/lib/vdr/device.h + + # Install start links and backup include file. ln -sf ../init.d/vdr /etc/rc.d/rc3.d/S60vdr ln -sf ../init.d/vdr /etc/rc.d/rc0.d/K40vdr ln -sf ../init.d/vdr /etc/rc.d/rc6.d/K40vdr install -v -m 644 $(DIR_SRC)/config/backup/includes/vdr \ - /var/ipfire/backup/addons/includes/vdr - - # Remove obsolete V4L1 videodev header. - rm -f /usr/include/linux/videodev.h + /var/ipfire/backup/addons/includes/vdr @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/vdr_epgsearch b/lfs/vdr_epgsearch index ead59a1..dfda864 100644 --- a/lfs/vdr_epgsearch +++ b/lfs/vdr_epgsearch @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,29 +24,86 @@ include Config -VER = plugin +VER = 1.0.1.beta5 +THISAPP = vdr-epgsearch-$(VER) +DL_FILE = $(THISAPP).tgz -THISAPP = vdr_epgsearch-$(VER) -DIR_APP = $(DIR_SRC)/$(THISAPP) +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/epgsearch-$(VER) +TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_epgsearch -PAK_VER = 5 +PAK_VER = 6 DEPS = "vdr" +VDRPLUGVER = 2.0.0 + ############################################################################### # Top-level Rules ############################################################################### +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 6e63cc29df02f48fabf6e12e1e71b2fc -install : +install : $(TARGET) -check : +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) -download : +download : $(patsubst %,$(DIR_DL)/%,$(objects)) -md5 : +md5 : $(subst %,%_MD5,$(objects)) dist: - $(PAK) + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) ############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch + + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + LOCALEDIR=$$(pwd)/locale all + + cd $(DIR_APP) && install -m 755 libvdr-conflictcheckonly.so \ + /usr/lib/vdr/libvdr-conflictcheckonly.so.$(VDRPLUGVER) + cd $(DIR_APP) && install -m 755 libvdr-epgsearchonly.so \ + /usr/lib/vdr/libvdr-epgsearchonly.so.$(VDRPLUGVER) + cd $(DIR_APP) && install -m 755 libvdr-epgsearch.so \ + /usr/lib/vdr/libvdr-epgsearch.so.$(VDRPLUGVER) + cd $(DIR_APP) && install -m 755 libvdr-quickepgsearch.so \ + /usr/lib/vdr/libvdr-quickepgsearch.so.$(VDRPLUGVER) + + install -m 644 \ + $(DIR_SRC)/config/vdr/plugins.d/epgsearch.conf \ + $(DIR_SRC)/config/vdr/plugins.d/epgsearchonly.conf \ + $(DIR_SRC)/config/vdr/plugins.d/conflictcheckonly.conf \ + $(DIR_SRC)/config/vdr/plugins.d/quickepgsearch.conf \ + /etc/sysconfig/vdr-plugins.d + + -mkdir -pv /etc/vdr/plugins/epgsearch/conf.d + -mkdir -pv /var/lib/vdr/data/epgsearch + + cd $(DIR_APP) && install -m 755 createcats /usr/bin/createcats + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdr_softdevice b/lfs/vdr_softdevice deleted file mode 100644 index c836e2e..0000000 --- a/lfs/vdr_softdevice +++ /dev/null @@ -1,52 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = plugin - -THISAPP = vdr_softdevice-$(VER) -DIR_APP = $(DIR_SRC)/$(THISAPP) -PROG = vdr_softdevice -PAK_VER = 5 - -DEPS = "vdr ffmpeg sdl alsa dfb++" - -############################################################################### -# Top-level Rules -############################################################################### - - -install : - -check : - -download : - -md5 : - -dist: - $(PAK) - -############################################################################### diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev new file mode 100644 index 0000000..59dbd04 --- /dev/null +++ b/lfs/vdr_streamdev @@ -0,0 +1,106 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 0.6.1 +GIT_VER = 10db11ac +THISAPP = vdr-streamdev-$(GIT_VER) +DL_FILE = $(THISAPP).tar.xz + +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr_streamdev +PAK_VER = 1 + +DEPS = "vdr" + +VDRPLUGVER = 2.0.0 + +EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +CFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch + + cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + LOCALEDIR=$$(pwd)/locale all + + -mkdir -pv /etc/vdr/plugins/streamdev-server /usr/lib/vdr/bin + cd $(DIR_APP) && install -m 755 server/libvdr-streamdev-server.so \ + /usr/lib/vdr/libvdr-streamdev-server.so.$(VDRPLUGVER) + ln -svf ../../svdrphosts.conf \ + /etc/vdr/plugins/streamdev-server/streamdevhosts.conf + cd $(DIR_APP) && install -m 755 streamdev-server/externremux.sh \ + /usr/lib/vdr/bin/externremux.sh + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/streamdev-server.conf \ + /etc/sysconfig/vdr-plugins.d + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdr_vnsiserver3 b/lfs/vdr_vnsiserver3 new file mode 100644 index 0000000..73ee5e9 --- /dev/null +++ b/lfs/vdr_vnsiserver3 @@ -0,0 +1,99 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = cc03615 +THISAPP = vdr-vnsiserver3-$(VER) +DL_FILE = $(THISAPP).tar.xz + +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdr_vnsiserver3 +PAK_VER = 1 + +DEPS = "vdr" + +VDRPLUGVER = 2.0.0 + +EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE +CFLAGS += $(EXTRA_FLAGS) +CXXFLAGS += $(EXTRA_FLAGS) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = 5100b1cb1ee936f64b99a76c492fbc3f + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download : $(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, md5sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_MD5,$(objects)) : + @$(MD5) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ + CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ + LOCALEDIR=$$(pwd)/locale all + + -mkdir -pv /etc/vdr/plugins/vnsiserver3 + cd $(DIR_APP) && install -m 755 libvdr-vnsiserver3.so \ + /usr/lib/vdr/libvdr-vnsiserver3.so.$(VDRPLUGVER) + ln -svf ../../svdrphosts.conf /etc/vdr/plugins/vnsiserver3/allowed_hosts.conf + install -m 644 $(DIR_SRC)/config/vdr/plugins.d/vnsiserver3.conf \ + /etc/sysconfig/vdr-plugins.d + + @rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/lfs/vdradmin b/lfs/vdradmin index 3bd788f..b38ecca 100644 --- a/lfs/vdradmin +++ b/lfs/vdradmin @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,7 +25,7 @@ include Config -VER = 3.6.7 +VER = 3.6.9 THISAPP = vdradmin-am-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdradmin -PAK_VER = 4 +PAK_VER = 5 -DEPS = "perl-gettext vdr" +DEPS = "perl-gettext vdr vdr_epgsearch" ############################################################################### # Top-level Rules @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8b1b2f8bbff26cbb47e79d5b55dbd3c1 +$(DL_FILE)_MD5 = d5cd89325f5a5dca5846a905b17d0bc2 install : $(TARGET) @@ -83,8 +83,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && ./install-ipfire.sh install -v -m 644 $(DIR_SRC)/config/vdradmin/vdradmind.conf \ /etc/vdradmin/vdradmind.conf - mkdir /var/log/vdradmin - mkdir /var/run/vdradmin - mkdir /var/cache/vdradmin + mkdir -pv /var/log/vdradmin + mkdir -pv /var/run/vdradmin + mkdir -pv /var/cache/vdradmin @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/w_scan b/lfs/w_scan index 7df4b42..a18a08a 100644 --- a/lfs/w_scan +++ b/lfs/w_scan @@ -33,7 +33,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = w_scan -PAK_VER = 3 +PAK_VER = 4 DEPS = "" diff --git a/make.sh b/make.sh index c6211ad..8a2d4f8 100755 --- a/make.sh +++ b/make.sh @@ -664,6 +664,9 @@ buildipfire() { ipfiremake faad2 ipfiremake ffmpeg ipfiremake vdr + ipfiremake vdr_streamdev + ipfiremake vdr_vnsiserver3 + ipfiremake vdr_epgsearch ipfiremake w_scan ipfiremake icecast ipfiremake icegenerator diff --git a/src/initscripts/init.d/vdr b/src/initscripts/init.d/vdr index e42887f..759ad34 100644 --- a/src/initscripts/init.d/vdr +++ b/src/initscripts/init.d/vdr @@ -18,23 +18,13 @@ case "${1}" in start) boot_mesg "Starting Video Disk Recorder..." - if [ "$(ps -A | grep runvdr)" != "" ]; then - boot_mesg "Error! Already running!" - echo_failure - exit 1; - fi - if [ ! -e /dev/dvb/adapter0/frontend0 ]; then - boot_mesg "Error! No DVB tuner found." - echo_failure - exit 0; - fi - loadproc screen -dmS vdr /opt/vdr/bin/runvdr + /usr/sbin/runvdr >/dev/null 2>&1 & + evaluate_retval ;; stop) boot_mesg "Stopping Video Disk Recorder..." - killall -s KILL -w runvdr - killproc /opt/vdr/bin/vdr + killproc /usr/sbin/vdr ;; restart) @@ -44,8 +34,8 @@ case "${1}" in ;; status) - statusproc /opt/vdr/bin/runvdr - statusproc /opt/vdr/bin/vdr + statusproc /usr/sbin/runvdr + statusproc /usr/sbin/vdr ;; *) diff --git a/src/paks/vdr/install.sh b/src/paks/vdr/install.sh new file mode 100644 index 0000000..3e92d32 --- /dev/null +++ b/src/paks/vdr/install.sh @@ -0,0 +1,115 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} + +# Automatically add the GREEN network to svdrphosts.conf +( + eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) + + GREEN_PREFIX= + case "${GREEN_NETMASK}" in + 255.255.255.252) + GREEN_PREFIX=30 + ;; + 255.255.255.248) + GREEN_PREFIX=29 + ;; + 255.255.255.240) + GREEN_PREFIX=28 + ;; + 255.255.255.224) + GREEN_PREFIX=27 + ;; + 255.255.255.192) + GREEN_PREFIX=26 + ;; + 255.255.255.128) + GREEN_PREFIX=25 + ;; + 255.255.255.0) + GREEN_PREFIX=24 + ;; + 255.255.254.0) + GREEN_PREFIX=23 + ;; + 255.255.252.0) + GREEN_PREFIX=22 + ;; + 255.255.248.0) + GREEN_PREFIX=21 + ;; + 255.255.240.0) + GREEN_PREFIX=20 + ;; + 255.255.224.0) + GREEN_PREFIX=19 + ;; + 255.255.192.0) + GREEN_PREIFX=18 + ;; + 255.255.128.0) + GREEN_PREFIX=17 + ;; + 255.255.0.0) + GREEN_PREFIX=16 + ;; + 255.254.0.0) + GREEN_PREFIX=15 + ;; + 255.252.0.0) + GREEN_PREFIX=14 + ;; + 255.248.0.0) + GREEN_PREFIX=13 + ;; + 255.240.0.0) + GREEN_PREFIX=12 + ;; + 255.224.0.0) + GREEN_PREFIX=11 + ;; + 255.192.0.0) + GREEN_PREFIX=10 + ;; + 255.128.0.0) + GREEN_PREFIX=9 + ;; + 255.0.0.0) + GREEN_PREFIX=8 + ;; + esac + + if [ -n "${GREEN_NETADDRESS}" ] && [ -n "${GREEN_PREFIX}" ]; then + echo "${GREEN_NETADDRESS}/${GREEN_PREFIX}" >> /etc/vdr/svdrphosts.conf + fi +) || : + +start_service --background ${NAME} + +# Create video directory if it does not exist, yet. +if [ ! -e "/var/video" ]; then + mkdir -p /var/video +fi diff --git a/src/paks/vdr/uninstall.sh b/src/paks/vdr/uninstall.sh new file mode 100644 index 0000000..a7b8a53 --- /dev/null +++ b/src/paks/vdr/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/vdr/update.sh b/src/paks/vdr/update.sh new file mode 100644 index 0000000..2e11608 --- /dev/null +++ b/src/paks/vdr/update.sh @@ -0,0 +1,36 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +./uninstall.sh +./install.sh + +OLD_DIR="/opt/vdr/etc" +NEW_DIR="/etc/vdr" + +for conf in ${OLD_DIR}/*.conf; do + [ -f "${conf}" ] && continue + + conf="$(basename ${conf})" + mv -b "${OLD_DIR}/${conf}" "${NEW_DIR}/${conf}" +done diff --git a/src/paks/vdradmin/install.sh b/src/paks/vdradmin/install.sh new file mode 100644 index 0000000..31c5fec --- /dev/null +++ b/src/paks/vdradmin/install.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +extract_files +restore_backup ${NAME} +start_service --background ${NAME} diff --git a/src/paks/vdradmin/uninstall.sh b/src/paks/vdradmin/uninstall.sh new file mode 100644 index 0000000..a7b8a53 --- /dev/null +++ b/src/paks/vdradmin/uninstall.sh @@ -0,0 +1,27 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +stop_service ${NAME} +make_backup ${NAME} +remove_files diff --git a/src/paks/vdradmin/update.sh b/src/paks/vdradmin/update.sh new file mode 100644 index 0000000..72d3185 --- /dev/null +++ b/src/paks/vdradmin/update.sh @@ -0,0 +1,37 @@ +#!/bin/bash +############################################################################ +# # +# This file is part of the IPFire Firewall. # +# # +# IPFire is free software; you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation; either version 2 of the License, or # +# (at your option) any later version. # +# # +# IPFire is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with IPFire; if not, write to the Free Software # +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +# # +# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh + +./uninstall.sh +./install.sh + +# Update configuration options for new versions of VDR. +stop_service ${NAME} + +sed -i /etc/vdradmin/vdradmind.conf \ + -e "s@^LANG = .*@LANG = en_US.utf8@g" \ + -e "s@^VDR_PORT = .*@VDR_PORT = 6419@g" \ + -e "s@^VDRCONFDIR = .*@VDRCONFDIR = /etc/vdr@g" + +start_service ${NAME} diff --git a/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch new file mode 100644 index 0000000..d8319c0 --- /dev/null +++ b/src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch @@ -0,0 +1,82 @@ +diff -up epgsearch-1.0.1.beta2/epgsearch.c~ epgsearch-1.0.1.beta2/epgsearch.c +--- epgsearch-1.0.1.beta2/epgsearch.c~ 2012-06-11 20:01:54.000000000 +0300 ++++ epgsearch-1.0.1.beta2/epgsearch.c 2012-06-12 22:20:38.740086339 +0300 +@@ -446,16 +446,16 @@ bool cPluginEpgsearch::Start(void) + LoadConfD(); + LoadUserVars(); + +- ChannelGroups.Load(AddDirectory(CONFIGDIR, "epgsearchchangrps.conf"), true); +- Blacklists.Load(AddDirectory(CONFIGDIR, "epgsearchblacklists.conf")); +- SearchExts.Load(AddDirectory(CONFIGDIR, "epgsearch.conf")); +- SearchTemplates.Load(AddDirectory(CONFIGDIR, "epgsearchtemplates.conf")); +- RecsDone.Load(AddDirectory(CONFIGDIR, "epgsearchdone.data")); +- SwitchTimers.Load(AddDirectory(CONFIGDIR, "epgsearchswitchtimers.conf")); +- NoAnnounces.Load(AddDirectory(CONFIGDIR, "noannounce.conf")); +- DefTimerCheckModes.Load(AddDirectory(CONFIGDIR, "deftimerchkmodes.conf")); +- TimersDone.Load(AddDirectory(CONFIGDIR, "timersdone.conf")); +- PendingNotifications.Load(AddDirectory(CONFIGDIR, "pendingnotifications.conf")); ++ ChannelGroups.Load("/var/lib/vdr/data/epgsearch/epgsearchchangrps.conf", true); ++ Blacklists.Load("/var/lib/vdr/data/epgsearch/epgsearchblacklists.conf"); ++ SearchExts.Load("/var/lib/vdr/data/epgsearch/epgsearch.conf"); ++ SearchTemplates.Load("/var/lib/vdr/data/epgsearch/epgsearchtemplates.conf"); ++ RecsDone.Load("/var/lib/vdr/data/epgsearch/epgsearchdone.data"); ++ SwitchTimers.Load("/var/lib/vdr/data/epgsearch/epgsearchswitchtimers.conf"); ++ NoAnnounces.Load("/var/lib/vdr/data/epgsearch/noannounce.conf"); ++ DefTimerCheckModes.Load("/var/lib/vdr/data/epgsearch/deftimerchkmodes.conf"); ++ TimersDone.Load("/var/lib/vdr/data/epgsearch/timersdone.conf"); ++ PendingNotifications.Load("/var/lib/vdr/data/epgsearch/pendingnotifications.conf"); + + cSearchTimerThread::Init(this); + cSwitchTimerThread::Init(); +diff -up epgsearch-1.0.1.beta2/epgsearchcfg.c~ epgsearch-1.0.1.beta2/epgsearchcfg.c +--- epgsearch-1.0.1.beta2/epgsearchcfg.c~ 2012-06-11 19:43:52.000000000 +0300 ++++ epgsearch-1.0.1.beta2/epgsearchcfg.c 2012-06-12 22:20:39.169055465 +0300 +@@ -80,7 +80,7 @@ cEPGSearchConfig::cEPGSearchConfig(void) + strcpy(MailAuthUser, ""); + strcpy(MailAuthPass, ""); + strcpy(LastMailConflicts, ""); +- mailViaScript = 1; ++ mailViaScript = 0; + manualTimerCheckDefault = 0; + noAnnounceWhileReplay = 0; + TimerProgRepeat = 0; +diff -up epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ epgsearch-1.0.1.beta2/scripts/recordingdone.sh +--- epgsearch-1.0.1.beta2/scripts/recordingdone.sh~ 2012-06-12 22:19:28.570878733 +0300 ++++ epgsearch-1.0.1.beta2/scripts/recordingdone.sh 2012-06-12 22:20:39.536029167 +0300 +@@ -60,10 +60,10 @@ CTIME_FROM_RECORDING=yes + SVDRPSEND=svdrpsend + + # Home of EPGsearch +-EPGSEARCH_HOME="/etc/vdr/plugins" ++EPGSEARCH_HOME="/var/lib/vdr/data/epgsearch" + + # Video root +-VIDEO_ROOT="/video" ++VIDEO_ROOT="/var/video" + + # do not edit below this line + #------------------------------------------------------------------------------ +diff -up epgsearch-1.0.1.beta2/scripts/recrep.sh~ epgsearch-1.0.1.beta2/scripts/recrep.sh +--- epgsearch-1.0.1.beta2/scripts/recrep.sh~ 2012-06-11 19:43:51.000000000 +0300 ++++ epgsearch-1.0.1.beta2/scripts/recrep.sh 2012-06-12 22:20:39.914002061 +0300 +@@ -15,7 +15,7 @@ + # adjust the following lines to your config + + # your plugins config dir +-PLUGINCONFDIR=/var/lib/vdr/plugins/epgsearch ++PLUGINCONFDIR=/etc/vdr/plugins/epgsearch + # path to svdrpsend + SVDRPSEND=svdrpsend + # the key used to call epgsearch +diff -up epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh +--- epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh~ 2012-06-11 19:43:51.000000000 +0300 ++++ epgsearch-1.0.1.beta2/scripts/timercmds-auxinfo.sh 2012-06-12 22:20:40.723944345 +0300 +@@ -15,7 +15,7 @@ + #<Configuration> + + # Your timers.conf +-TIMERS="/video/timers.conf" ++TIMERS="/etc/vdr/timers.conf" + + #</Configuration> + diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch new file mode 100644 index 0000000..2dc5250 --- /dev/null +++ b/src/patches/vdr-streamdev_recordings-64.patch @@ -0,0 +1,29 @@ +diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c +--- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100 ++++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200 +@@ -455,11 +455,11 @@ + return NULL; + + char *p = NULL; +- unsigned long l = strtoul(FileBase, &p, 0); ++ unsigned long long l = strtoull(FileBase, &p, 0); + if (p != FileBase && l > 0L) { + if (*p == ':') { + // get recording by dev:inode +- unsigned long inode = strtoul(p + 1, &p, 0); ++ unsigned long long inode = strtoull(p + 1, &p, 0); + if (*p == 0 && inode > 0) { + struct stat st; + cThreadLock RecordingsLock(&Recordings); +diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c +--- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100 ++++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200 +@@ -28,7 +28,7 @@ + { + struct stat st; + if (stat(current->FileName(), &st) == 0) +- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino); ++ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino); + return ""; + } + hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c
by git＠ipfire.org 30 Apr '13

30 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c (commit) from 5d73f5158c1903ac9bbd697e956083ae5c986238 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fd073ae24070bb7ca5b9e2d70e7bcf8650b6c67c Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Mar 24 22:48:33 2013 +0100 Add /usr/bin/locale to the distribution. This is needed by vdradmin. Conflicts: config/rootfiles/core/68/filelists/files ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/glibc | 2 +- config/rootfiles/common/i586/glibc | 2 +- config/rootfiles/core/68/filelists/files | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc index 42ae490..2810389 100644 --- a/config/rootfiles/common/armv5tel/glibc +++ b/config/rootfiles/common/armv5tel/glibc @@ -52,7 +52,7 @@ sbin/ldconfig #usr/bin/getent #usr/bin/iconv usr/bin/ldd -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc index ca62948..d17d7da 100644 --- a/config/rootfiles/common/i586/glibc +++ b/config/rootfiles/common/i586/glibc @@ -53,7 +53,7 @@ sbin/ldconfig #usr/bin/iconv usr/bin/ldd #usr/bin/lddlibc4 -#usr/bin/locale +usr/bin/locale #usr/bin/localedef #usr/bin/mtrace #usr/bin/pcprofiledump diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index 46ea0b8..65e46ae 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -38,6 +38,7 @@ srv/web/ipfire/html/themes/maniac/include/style.css srv/web/ipfire/html/themes/maniac/include/upxlr.css srv/web/ipfire/html/themes/maniac/images/updxl-icons.gif srv/web/ipfire/html/include/jquery-1.9.1.min.js +usr/bin/locale usr/local/bin/consort.sh var/ipfire/backup/include var/ipfire/header.pl hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 5d46c29e5afab019a7b160e344affec047ff0f91
by git＠ipfire.org 30 Apr '13

30 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, master has been updated via 5d46c29e5afab019a7b160e344affec047ff0f91 (commit) from 5215ebe18a55fe1d8c498a5814d6730a3aa36c47 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5d46c29e5afab019a7b160e344affec047ff0f91 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Apr 30 10:16:19 2013 +0200 clamav: update to 0.97.8. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/packages/clamav | 6 +++--- lfs/clamav | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) Difference in files: diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index db38453..1f09b8d 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -10,15 +10,15 @@ usr/bin/sigtool #usr/lib/libclamav.la usr/lib/libclamav.so usr/lib/libclamav.so.6 -usr/lib/libclamav.so.6.1.15 +usr/lib/libclamav.so.6.1.17 #usr/lib/libclamunrar.la usr/lib/libclamunrar.so usr/lib/libclamunrar.so.6 -usr/lib/libclamunrar.so.6.1.15 +usr/lib/libclamunrar.so.6.1.17 #usr/lib/libclamunrar_iface.la usr/lib/libclamunrar_iface.so usr/lib/libclamunrar_iface.so.6 -usr/lib/libclamunrar_iface.so.6.1.15 +usr/lib/libclamunrar_iface.so.6.1.17 #usr/lib/pkgconfig/libclamav.pc usr/sbin/clamd usr/share/clamav diff --git a/lfs/clamav b/lfs/clamav index a2ed1f0..bae350c 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 0.97.6 +VER = 0.97.8 THISAPP = clamav-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = clamav -PAK_VER = 21 +PAK_VER = 22 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 1dbdd803b37c0d9d222e4316049f46a2 +$(DL_FILE)_MD5 = ac52bcbad3ea72eac08fedb9772f648b install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0a0354580a87301af07e283200439d7478da0ade
by git＠ipfire.org 29 Apr '13

29 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 0a0354580a87301af07e283200439d7478da0ade (commit) from 0acd4b81cc0b6de5cdaa17bbedab36ff5b1e448f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0a0354580a87301af07e283200439d7478da0ade Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Sun Apr 28 21:11:36 2013 +0200 libpng: Update to 1.6.2. This is a major release to the 1.6.x branch of libpng. I've created a compat package for those binaries who are still linked against the old 1.5 version. Fixes #10307. ----------------------------------------------------------------------- Summary of changes: libpng/libpng.nm | 36 +++++++++++++++++++++++++++++-- libpng/patches/libpng-1.4.2-pngconf.patch | 29 ------------------------- 2 files changed, 34 insertions(+), 31 deletions(-) delete mode 100644 libpng/patches/libpng-1.4.2-pngconf.patch Difference in files: diff --git a/libpng/libpng.nm b/libpng/libpng.nm index 55268a8..cb08080 100644 --- a/libpng/libpng.nm +++ b/libpng/libpng.nm @@ -4,9 +4,11 @@ ############################################################################### name = libpng -version = 1.5.9 +version = 1.6.2 release = 1 +compat_ver = 1.5.15 + groups = System/Libraries url = http://www.libpng.org/pub/png/ license = zlib @@ -20,14 +22,36 @@ description data compression algorithm. end -source_dl = http://downloads.sourceforge.net/project/libpng/libpng15/%{version}/ +source_dl = http://downloads.sourceforge.net/project/libpng/libpng16/%{version}/ + +# Source URL for comat package. +source_dl += http://downloads.sourceforge.net/project/libpng/libpng15/%{compat_ver}/ + sources = %{thisapp}.tar.xz +# File for compat package. +sources += %{name}-%{compat_ver}.tar.xz + build requires pkg-config zlib-devel end + + # Build compat package. + build_cmds + cd %{DIR_SRC}/%{name}-%{compat_ver} + ./configure %{configure_options} + + make %{PARALLELISMFLAGS} + end + + # Install compat package. + install_cmds + cd %{DIR_SRC}/%{name}-%{compat_ver} + install -m 755 .libs/libpng15.so.15.15.0 %{BUILDROOT}%{libdir} + ln -svf libpng15.so.15.15.0 %{BUILDROOT}%{libdir}/libpng15.so.15 + end end packages @@ -39,6 +63,14 @@ packages requires = zlib-devel end + package %{name}-compat + summary = Compat libraries of %{thisapp}. + + files + %{libdir}/%{name}15.so* + end + end + package %{name}-debuginfo template DEBUGINFO end diff --git a/libpng/patches/libpng-1.4.2-pngconf.patch b/libpng/patches/libpng-1.4.2-pngconf.patch deleted file mode 100644 index 4f1e581..0000000 --- a/libpng/patches/libpng-1.4.2-pngconf.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Nur a/pngconf.h b/pngconf.h ---- a/pngconf.h 2010-05-06 12:30:09.000000000 +0200 -+++ b/pngconf.h 2010-05-09 13:19:16.000000000 +0200 -@@ -35,6 +35,25 @@ - # ifdef HAVE_CONFIG_H - # include "config.h" - # endif -+# else -+/* pngconf.h is part of the exported API. When a libpng-using application -+ includes us, PNG_CONFIGURE_LIBPNG is of course not defined as we do not have -+ libpng's config.h available in this case. This means that we do not have the -+ defines added to config.h and the commandline by libpng's ./configure . -+ -+ For all defines from config.h not having them set is not a problem, however -+ ./configure also adds -DPNG_NO_ASSEMBLER_CODE to the CFLAGS when compiling -+ on a platform on which the MMX and SSE asm code in libpng is not supported. -+ -+ We do need this define as this define is used to determine whether or not -+ to define PNG_ASSEMBLER_CODE_SUPPORTED and other assembler related defines -+ and prototypes. PNG_ASSEMBLER_CODE_SUPPORTED in turn is used by applications -+ (ImageMagick for example) to determine whether or not they can use the asm -+ functions. Thus we need to define PNG_NO_ASSEMBLER_CODE here on platforms -+ on which the MMX and SSE asm code in libpng is not supported: */ -+# ifndef __i386__ /* change this if MMX/SSE become supported on x86_64! */ -+# define PNG_NO_ASSEMBLER_CODE -+# endif - #endif - - /* hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5d73f5158c1903ac9bbd697e956083ae5c986238
by git＠ipfire.org 29 Apr '13

29 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 5d73f5158c1903ac9bbd697e956083ae5c986238 (commit) via 5cf2c339680b6922a08ebf1d44dab5c90ba2d5d4 (commit) via b376fae45ca8a9b5250a974b2b5247c854ed2782 (commit) from 910209a1e506e2ca70083ba02d3fd2bf1f8fbbc2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5d73f5158c1903ac9bbd697e956083ae5c986238 Merge: 5cf2c33 b376fae Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 29 13:14:46 2013 +0200 Merge remote-tracking branch 'amarx/10352' into next commit 5cf2c339680b6922a08ebf1d44dab5c90ba2d5d4 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 29 13:13:07 2013 +0200 Update accelerator changes from Jörn-Ingo Weigert. Conflicts: config/rootfiles/core/68/filelists/files commit b376fae45ca8a9b5250a974b2b5247c854ed2782 Author: Alexander Marx <amarx(a)ipfire.org> Date: Mon Apr 29 12:57:01 2013 +0200 OpenVPN: Bugfix 10352: When opening advanced server options all fields are disabled under IE10 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/68/filelists/files | 30 + html/cgi-bin/ovpnmain.cgi | 2 +- html/cgi-bin/updatexlrator.cgi | 2425 +++++++++----------- html/html/images/updbooster/updxl-globe.gif | Bin 1124 -> 0 bytes html/html/images/updbooster/updxl-gr.gif | Bin 898 -> 0 bytes html/html/images/updbooster/updxl-led-blue.gif | Bin 158 -> 0 bytes html/html/images/updbooster/updxl-led-gray.gif | Bin 158 -> 0 bytes html/html/images/updbooster/updxl-led-green.gif | Bin 898 -> 0 bytes html/html/images/updbooster/updxl-led-red.gif | Bin 898 -> 0 bytes html/html/images/updbooster/updxl-led-yellow.gif | Bin 158 -> 0 bytes html/html/images/updbooster/updxl-rd.gif | Bin 898 -> 0 bytes html/html/images/updbooster/updxl-src-adobe.gif | Bin 1000 -> 1135 bytes .../images/updbooster/updxl-src-ageofconan.gif | Bin 0 -> 1171 bytes html/html/images/updbooster/updxl-src-avira.gif | Bin 1045 -> 1127 bytes html/html/images/updbooster/updxl-src-curse.gif | Bin 0 -> 1090 bytes .../html/images/updbooster/updxl-src-diabloiii.gif | Bin 0 -> 979 bytes .../html/images/updbooster/updxl-src-eveonline.gif | Bin 0 -> 411 bytes html/html/images/updbooster/updxl-src-google.gif | Bin 0 -> 586 bytes html/html/images/updbooster/updxl-src-ipfire.gif | Bin 0 -> 1036 bytes .../html/images/updbooster/updxl-src-kaspersky.gif | Bin 996 -> 628 bytes html/html/images/updbooster/updxl-src-mozilla.gif | Bin 0 -> 1092 bytes html/html/images/updbooster/updxl-src-nvidia.gif | Bin 0 -> 1000 bytes html/html/images/updbooster/updxl-src-opera.gif | Bin 0 -> 1016 bytes html/html/images/updbooster/updxl-src-secunia.gif | Bin 0 -> 316 bytes html/html/images/updbooster/updxl-src-swtor.gif | Bin 0 -> 1101 bytes html/html/images/updbooster/updxl-src-wot.gif | Bin 0 -> 114 bytes html/html/images/updbooster/updxl-src-wow.gif | Bin 0 -> 1111 bytes html/html/images/updbooster/updxl-yl.gif | Bin 158 -> 0 bytes html/html/themes/ipfire/images/updxl-icons.gif | Bin 0 -> 2358 bytes html/html/themes/ipfire/include/functions.pl | 122 +- html/html/themes/ipfire/include/upxlr.css | 384 ++++ html/html/themes/maniac/images/Thumbs.db | Bin 13312 -> 0 bytes html/html/themes/maniac/images/updxl-icons.gif | Bin 0 -> 2358 bytes html/html/themes/maniac/include/functions.pl | 214 +- html/html/themes/maniac/include/upxlr.css | 390 ++++ langs/de/cgi-bin/de.pl | 23 +- langs/en/cgi-bin/en.pl | 22 +- 37 files changed, 2132 insertions(+), 1480 deletions(-) delete mode 100644 html/html/images/updbooster/updxl-globe.gif delete mode 100644 html/html/images/updbooster/updxl-gr.gif delete mode 100644 html/html/images/updbooster/updxl-led-blue.gif delete mode 100644 html/html/images/updbooster/updxl-led-gray.gif delete mode 100644 html/html/images/updbooster/updxl-led-green.gif delete mode 100644 html/html/images/updbooster/updxl-led-red.gif delete mode 100644 html/html/images/updbooster/updxl-led-yellow.gif delete mode 100644 html/html/images/updbooster/updxl-rd.gif create mode 100644 html/html/images/updbooster/updxl-src-ageofconan.gif create mode 100644 html/html/images/updbooster/updxl-src-curse.gif create mode 100644 html/html/images/updbooster/updxl-src-diabloiii.gif create mode 100644 html/html/images/updbooster/updxl-src-eveonline.gif create mode 100644 html/html/images/updbooster/updxl-src-google.gif create mode 100644 html/html/images/updbooster/updxl-src-ipfire.gif create mode 100644 html/html/images/updbooster/updxl-src-mozilla.gif create mode 100644 html/html/images/updbooster/updxl-src-nvidia.gif create mode 100644 html/html/images/updbooster/updxl-src-opera.gif create mode 100644 html/html/images/updbooster/updxl-src-secunia.gif create mode 100644 html/html/images/updbooster/updxl-src-swtor.gif create mode 100644 html/html/images/updbooster/updxl-src-wot.gif create mode 100644 html/html/images/updbooster/updxl-src-wow.gif delete mode 100644 html/html/images/updbooster/updxl-yl.gif create mode 100644 html/html/themes/ipfire/images/updxl-icons.gif create mode 100644 html/html/themes/ipfire/include/upxlr.css delete mode 100644 html/html/themes/maniac/images/Thumbs.db create mode 100644 html/html/themes/maniac/images/updxl-icons.gif create mode 100644 html/html/themes/maniac/include/upxlr.css Difference in files: diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index bfd6746..46ea0b8 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -4,9 +4,39 @@ etc/modprobe.d/blacklist srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/html/images/updbooster/updxl-src-adobe.gif +srv/web/ipfire/html/images/updbooster/updxl-src-ageofconan.gif +srv/web/ipfire/html/images/updbooster/updxl-src-apple.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avast.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avg.gif +srv/web/ipfire/html/images/updbooster/updxl-src-avira.gif +srv/web/ipfire/html/images/updbooster/updxl-src-curse.gif +srv/web/ipfire/html/images/updbooster/updxl-src-diabloiii.gif +srv/web/ipfire/html/images/updbooster/updxl-src-eveonline.gif +srv/web/ipfire/html/images/updbooster/updxl-src-google.gif +srv/web/ipfire/html/images/updbooster/updxl-src-ipfire.gif +srv/web/ipfire/html/images/updbooster/updxl-src-kaspersky.gif +srv/web/ipfire/html/images/updbooster/updxl-src-linux.gif +srv/web/ipfire/html/images/updbooster/updxl-src-microsoft.gif +srv/web/ipfire/html/images/updbooster/updxl-src-mozilla.gif +srv/web/ipfire/html/images/updbooster/updxl-src-nvidia.gif +srv/web/ipfire/html/images/updbooster/updxl-src-opera.gif +srv/web/ipfire/html/images/updbooster/updxl-src-secunia.gif +srv/web/ipfire/html/images/updbooster/updxl-src-swtor.gif +srv/web/ipfire/html/images/updbooster/updxl-src-symantec.gif +srv/web/ipfire/html/images/updbooster/updxl-src-trendmicro.gif +srv/web/ipfire/html/images/updbooster/updxl-src-unknown.gif +srv/web/ipfire/html/images/updbooster/updxl-src-windows.gif +srv/web/ipfire/html/images/updbooster/updxl-src-wot.gif +srv/web/ipfire/html/images/updbooster/updxl-src-wow.gif srv/web/ipfire/html/themes/ipfire/include/style.css +srv/web/ipfire/html/themes/ipfire/include/upxlr.css srv/web/ipfire/html/themes/ipfire/include/functions.pl +srv/web/ipfire/html/themes/ipfire/images/updxl-icons.gif srv/web/ipfire/html/themes/maniac/include/style.css +srv/web/ipfire/html/themes/maniac/include/upxlr.css +srv/web/ipfire/html/themes/maniac/images/updxl-icons.gif srv/web/ipfire/html/include/jquery-1.9.1.min.js usr/local/bin/consort.sh var/ipfire/backup/include diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 1cfade6..a4953ff 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2375,7 +2375,7 @@ ADV_ERROR: } &Header::openbox('100%', 'LEFT', $Lang::tr{'advanced server'}); print <<END - <form method='post' enctype='multipart/form-data' disabled> + <form method='post' enctype='multipart/form-data'> <table width='100%' border=0> <tr> <td colspan='4'><b>$Lang::tr{'dhcp-options'}</b></td> diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index df77a86..42362c2 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -36,8 +36,8 @@ use strict; # enable only the following on debugging purpose -#use warnings; no warnings 'once';# 'redefine', 'uninitialized'; -#use CGI::Carp 'fatalsToBrowser'; +use warnings; # no warnings 'once';# 'redefine', 'uninitialized'; +use CGI::Carp 'fatalsToBrowser'; use IO::Socket; @@ -45,7 +45,6 @@ require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; -my %color = (); my %checked=(); my %selected=(); my %netsettings=(); @@ -56,6 +55,8 @@ my %dlinfo=(); my $id=0; my @dfdata=(); my $dfstr=''; +my $dudata=''; +my $dustr=''; my @updatelist=(); my @sources=(); my $sourceurl=''; @@ -63,6 +64,7 @@ my $vendorid=''; my $uuid=''; my $status=0; my $updatefile=''; +my $cachefile=''; my $shortname=''; my $time=''; my $filesize=0; @@ -78,11 +80,11 @@ my $cachehits=0; my $efficiency='0.0'; my @vendors=(); my %vendorstats=(); +my %vendimg = (); -my $repository = "/var/updatecache/"; -my $webhome = "/srv/web/ipfire/html"; -my $hintcolour = '#FFFFCC'; -my $colourgray = '#808080'; +my $repository = '/var/updatecache/'; +my $webhome = '/srv/web/ipfire/html'; +my $webimgdir = '/images/updbooster'; my $sfUnknown='0'; my $sfOk='1'; @@ -91,7 +93,7 @@ my $sfNoSource='3'; my $not_accessed_last=''; -my $errormessage=''; +my @errormessages=(); my @repositorylist=(); my @repositoryfiles=(); @@ -103,7 +105,6 @@ my @metadata=(); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings); &General::readhash("${General::swroot}/proxy/settings", \%proxysettings); -&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color); $xlratorsettings{'ACTION'} = ''; $xlratorsettings{'ENABLE_LOG'} = 'off'; @@ -116,1451 +117,1305 @@ $xlratorsettings{'FULL_AUTOSYNC'} = 'off'; $xlratorsettings{'NOT_ACCESSED_LAST'} = 'month1'; $xlratorsettings{'REMOVE_NOSOURCE'} = 'off'; $xlratorsettings{'REMOVE_OUTDATED'} = 'off'; -$xlratorsettings{'REMOVE_OBSOLETE'} = 'off'; +$xlratorsettings{'REMOVE_UNKNOWN'} = 'off'; +$xlratorsettings{'REMOVE_TODELETE'} = 'off'; +$xlratorsettings{'TODELETE'} = 'off'; +$xlratorsettings{'show'} = ''; &Header::getcgihash(\%xlratorsettings); -$xlratorsettings{'EXTENDED_GUI'} = ''; - -if ($xlratorsettings{'ACTION'} eq "$Lang::tr{'updxlrtr statistics'} >>") -{ - $xlratorsettings{'EXTENDED_GUI'} = 'statistics'; -} - -if ($xlratorsettings{'ACTION'} eq "$Lang::tr{'updxlrtr maintenance'} >>") -{ - $xlratorsettings{'EXTENDED_GUI'} = 'maintenance'; -} - -if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr purge'}) -{ - $xlratorsettings{'EXTENDED_GUI'} = 'maintenance'; - - if (($xlratorsettings{'REMOVE_OBSOLETE'} eq 'on') || ($xlratorsettings{'REMOVE_NOSOURCE'} eq 'on') || ($xlratorsettings{'REMOVE_OUTDATED'} eq 'on')) - { - undef (@sources); - undef @repositoryfiles; - foreach (<$repository/*>) - { - if (-d $_) - { - unless (/^$repository\/download$/) { push(@sources,$_); } - } - } - - foreach (@sources) - { - @updatelist=<$_/*>; - $vendorid = substr($_,rindex($_,"/")+1); - foreach(@updatelist) - { - $uuid = substr($_,rindex($_,"/")+1); - if (-e "$_/source.url") - { - open (FILE,"$_/source.url"); - $sourceurl=<FILE>; - close FILE; - chomp($sourceurl); - $updatefile = substr($sourceurl,rindex($sourceurl,'/')+1,length($sourceurl)); - $updatefile = "$vendorid/$uuid/$updatefile"; - push(@repositoryfiles,$updatefile); - } - } - } - - foreach (@repositoryfiles) - { - ($vendorid,$uuid,$updatefile) = split('/'); - - if (-e "$repository/$vendorid/$uuid/status") - { - open (FILE,"$repository/$vendorid/$uuid/status"); - @metadata = <FILE>; - close FILE; - chomp(@metadata); - $status = $metadata[-1]; - } - - if (-e "$repository/$vendorid/$uuid/access.log") - { - open (FILE,"$repository/$vendorid/$uuid/access.log"); - @metadata = <FILE>; - close FILE; - chomp(@metadata); - $lastaccess = $metadata[-1]; - } - - if (($xlratorsettings{'REMOVE_NOSOURCE'} eq 'on') && ($status == $sfNoSource)) - { - if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r $repository/$vendorid/$uuid"); } - } - if (($xlratorsettings{'REMOVE_OUTDATED'} eq 'on') && ($status == $sfOutdated)) - { - if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r $repository/$vendorid/$uuid"); } - } - if ($xlratorsettings{'REMOVE_OBSOLETE'} eq 'on') - { - if (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'week') && ($lastaccess < (time - 604800))) - { - if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r $repository/$vendorid/$uuid"); } - } - if (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'month1') && ($lastaccess < (time - 2505600))) - { - if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r $repository/$vendorid/$uuid"); } - } - if (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'month3') && ($lastaccess < (time - 7516800))) - { - if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r $repository/$vendorid/$uuid"); } - } - if (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'month6') && ($lastaccess < (time - 15033600))) - { - if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r $repository/$vendorid/$uuid"); } - } - if (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'year') && ($lastaccess < (time - 31536000))) - { - if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r $repository/$vendorid/$uuid"); } - } - } - } - } -} +# ------------------------------------------------------ +# Check if some ACTION is required +# ------------------------------------------------------ if ($xlratorsettings{'ACTION'} eq $Lang::tr{'save'}) -{ - if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) || ($xlratorsettings{'MAX_DISK_USAGE'} > 100)) - { - $errormessage = $Lang::tr{'updxlrtr invalid disk usage'}; - goto ERROR; - } - if (($xlratorsettings{'MAX_DOWNLOAD_RATE'} ne '') && ((!($xlratorsettings{'MAX_DOWNLOAD_RATE'} =~ /^\d+$/)) || ($xlratorsettings{'MAX_DOWNLOAD_RATE'} < 1))) - { - $errormessage = $Lang::tr{'updxlrtr invalid download rate'}; - goto ERROR; - } - - &savesettings; -} + { &chksettings('save',\@errormessages); + $xlratorsettings{'show'} = 'settings'; + } +elsif ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr save and restart'}) + { &chksettings('saverestart',\@errormessages); + $xlratorsettings{'show'} = 'settings'; + } +elsif ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr cancel download'}) + { &canceldownload($xlratorsettings{'ID'}); + $xlratorsettings{'show'} = 'overview'; + } +elsif (($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr purge'}) + && (($xlratorsettings{'REMOVE_UNKNOWN'} eq 'on') + || ($xlratorsettings{'REMOVE_NOSOURCE'} eq 'on') + || ($xlratorsettings{'REMOVE_OUTDATED'} eq 'on') + || ($xlratorsettings{'REMOVE_TODELETE'} eq 'on'))) + { &delolddata(); + $xlratorsettings{'show'} = 'maintenance'; + } -if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr save and restart'}) -{ - if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) || ($xlratorsettings{'MAX_DISK_USAGE'} > 100)) - { - $errormessage = $Lang::tr{'updxlrtr invalid disk usage'}; - goto ERROR; - } - if (($xlratorsettings{'MAX_DOWNLOAD_RATE'} ne '') && ((!($xlratorsettings{'MAX_DOWNLOAD_RATE'} =~ /^\d+$/)) || ($xlratorsettings{'MAX_DOWNLOAD_RATE'} < 1))) - { - $errormessage = $Lang::tr{'updxlrtr invalid download rate'}; - goto ERROR; - } - if ((!(-e "${General::swroot}/proxy/enable")) && (!(-e "${General::swroot}/proxy/enable_blue"))) - { - $errormessage = $Lang::tr{'updxlrtr web proxy service required'}; - goto ERROR; - } - if (!($proxysettings{'ENABLE_UPDXLRATOR'} eq 'on')) - { - $errormessage = $Lang::tr{'updxlrtr not enabled'}; - goto ERROR; - } +# ------------------------------------------------------ +# ACTION Check - End +# ------------------------------------------------------ - &savesettings; +$not_accessed_last = $xlratorsettings{'NOT_ACCESSED_LAST'}; +undef($xlratorsettings{'NOT_ACCESSED_LAST'}); - system('/usr/local/bin/squidctrl restart >/dev/null 2>&1'); +if (-e "${General::swroot}/updatexlrator/settings") { + &General::readhash("${General::swroot}/updatexlrator/settings", \%xlratorsettings); } -if ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr remove file'}) -{ - $xlratorsettings{'EXTENDED_GUI'} = 'maintenance'; +if ($xlratorsettings{'NOT_ACCESSED_LAST'} eq '') { $xlratorsettings{'NOT_ACCESSED_LAST'} = $not_accessed_last; } - $updatefile = $xlratorsettings{'ID'}; +if ($xlratorsettings{'show'} eq 'overview') { $xlratorsettings{'EXTENDED_GUI'} = 'overview'; } +elsif ($xlratorsettings{'show'} eq 'statistics') { $xlratorsettings{'EXTENDED_GUI'} = 'statistics'; } +elsif ($xlratorsettings{'show'} eq 'settings') { $xlratorsettings{'EXTENDED_GUI'} = 'settings'; } +elsif ($xlratorsettings{'show'} eq 'maintenance') { $xlratorsettings{'EXTENDED_GUI'} = 'maintenance'; } +else { $xlratorsettings{'EXTENDED_GUI'} = $xlratorsettings{'VIEW_SETTING'}?$xlratorsettings{'VIEW_SETTING'}:'overview'; } - unless ($updatefile =~ /^download\//) - { - ($vendorid,$uuid,$updatefile) = split('/',$updatefile); - if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r $repository/$vendorid/$uuid"); } - } -} +&initvendimg; -if (($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr cancel download'}) || ($xlratorsettings{'ACTION'} eq $Lang::tr{'updxlrtr remove file'})) -{ - $updatefile = $xlratorsettings{'ID'}; - - if ($updatefile =~ /^download\//) - { - ($uuid,$vendorid,$updatefile) = split('/',$updatefile); +# ---------------------------------------------------- +# Start Page Output +# ---------------------------------------------------- - if (-e "$repository/download/$vendorid/$updatefile.info") - { - &General::readhash("$repository/download/$vendorid/$updatefile.info", \%dlinfo); +&Header::showhttpheaders(); +&Header::openpage($Lang::tr{'updxlrtr configuration'}, 1, '<link rel=\'stylesheet\' type=\'text/css\' href=\'/themes/'.$mainsettings{'THEME'}.'/include/upxlr.css\' />' ); +&Header::openbigbox('100%', 'left', '', scalar(@errormessages)); - $id = &getPID("\\s${General::swroot}/updatexlrator/bin/download\\s.*\\s".quotemeta($dlinfo{'SRCURL'})."\\s\\d\\s\\d\$"); - if ($id) { system("/bin/kill -9 $id"); } - $id = &getPID("\\s/usr/bin/wget\\s.*\\s".quotemeta($dlinfo{'SRCURL'})."\$"); - if ($id) { system("/bin/kill -9 $id"); } +# ===================================================================================== +# CACHE OVERVIEW +# ===================================================================================== - system("rm $repository/download/$vendorid/$updatefile.info"); - } +if ($xlratorsettings{'EXTENDED_GUI'} eq 'overview') { + &Header::openbox('100%', 'left', $Lang::tr{'updxlrtr cache overview'}); + &printfrmview(); + &printerrormsgs(\@errormessages); + &printtbldiskusage ($Lang::tr{'updxlrtr disk usage'},\$repository); + &initdownloaddata(\@downloadfiles); + &printtbldownloads(\@downloadfiles); + &Header::closebox(); + } - if (-e "$repository/download/$vendorid/$updatefile") - { - system("rm $repository/download/$vendorid/$updatefile"); - } - } +# ===================================================================================== +# CACHE STATISTICS +# ===================================================================================== -} +if ($xlratorsettings{'EXTENDED_GUI'} eq 'statistics') { + &Header::openbox('100%', 'left', "$Lang::tr{'updxlrtr cache statistics'}"); + &printfrmview(); + &printerrormsgs(\@errormessages); + &initcachestats(); + &printcachestatistics(); + &Header::closebox(); + } -$not_accessed_last = $xlratorsettings{'NOT_ACCESSED_LAST'}; -undef($xlratorsettings{'NOT_ACCESSED_LAST'}); +# ===================================================================================== +# CACHE MAINTENANCE +# ===================================================================================== -if (-e "${General::swroot}/updatexlrator/settings") -{ - &General::readhash("${General::swroot}/updatexlrator/settings", \%xlratorsettings); -} +if ($xlratorsettings{'EXTENDED_GUI'} eq 'maintenance') { + &Header::openbox('100%', 'left', "$Lang::tr{'updxlrtr cache maintenance'}"); + &printfrmview(); + &printerrormsgs(\@errormessages); + &initfrmmaintenance(); + &inittblreposdata(); + &printfrmmaintenance('withfiles', \@repositoryfiles); + &Header::closebox(); + } -if ($xlratorsettings{'NOT_ACCESSED_LAST'} eq '') -{ - $xlratorsettings{'NOT_ACCESSED_LAST'} = $not_accessed_last; -} +# ===================================================================================== +# CACHE SETTINGS +# ===================================================================================== -ERROR: - -$checked{'ENABLE_LOG'}{'off'} = ''; -$checked{'ENABLE_LOG'}{'on'} = ''; -$checked{'ENABLE_LOG'}{$xlratorsettings{'ENABLE_LOG'}} = "checked='checked'"; -$checked{'PASSIVE_MODE'}{'off'} = ''; -$checked{'PASSIVE_MODE'}{'on'} = ''; -$checked{'PASSIVE_MODE'}{$xlratorsettings{'PASSIVE_MODE'}} = "checked='checked'"; -$checked{'LOW_DOWNLOAD_PRIORITY'}{'off'} = ''; -$checked{'LOW_DOWNLOAD_PRIORITY'}{'on'} = ''; -$checked{'LOW_DOWNLOAD_PRIORITY'}{$xlratorsettings{'LOW_DOWNLOAD_PRIORITY'}} = "checked='checked'"; -$checked{'ENABLE_AUTOCHECK'}{'off'} = ''; -$checked{'ENABLE_AUTOCHECK'}{'on'} = ''; -$checked{'ENABLE_AUTOCHECK'}{$xlratorsettings{'ENABLE_AUTOCHECK'}} = "checked='checked'"; -$checked{'FULL_AUTOSYNC'}{'off'} = ''; -$checked{'FULL_AUTOSYNC'}{'on'} = ''; -$checked{'FULL_AUTOSYNC'}{$xlratorsettings{'FULL_AUTOSYNC'}} = "checked='checked'"; -$checked{'REMOVE_NOSOURCE'}{'off'} = ''; -$checked{'REMOVE_NOSOURCE'}{'on'} = ''; -$checked{'REMOVE_NOSOURCE'}{$xlratorsettings{'REMOVE_NOSOURCE'}} = "checked='checked'"; -$checked{'REMOVE_OUTDATED'}{'off'} = ''; -$checked{'REMOVE_OUTDATED'}{'on'} = ''; -$checked{'REMOVE_OUTDATED'}{$xlratorsettings{'REMOVE_OUTDATED'}} = "checked='checked'"; -$checked{'REMOVE_OBSOLETE'}{'off'} = ''; -$checked{'REMOVE_OBSOLETE'}{'on'} = ''; -$checked{'REMOVE_OBSOLETE'}{$xlratorsettings{'REMOVE_OBSOLETE'}} = "checked='checked'"; - - -$selected{'AUTOCHECK_SCHEDULE'}{'daily'} = ''; -$selected{'AUTOCHECK_SCHEDULE'}{'weekly'} = ''; -$selected{'AUTOCHECK_SCHEDULE'}{'monthly'} = ''; -$selected{'AUTOCHECK_SCHEDULE'}{$xlratorsettings{'AUTOCHECK_SCHEDULE'}} = "selected='selected'"; - -$selected{'NOT_ACCESSED_LAST'}{'week'} = ''; -$selected{'NOT_ACCESSED_LAST'}{'month1'} = ''; -$selected{'NOT_ACCESSED_LAST'}{'month3'} = ''; -$selected{'NOT_ACCESSED_LAST'}{'month6'} = ''; -$selected{'NOT_ACCESSED_LAST'}{'year'} = ''; -$selected{'NOT_ACCESSED_LAST'}{$xlratorsettings{'NOT_ACCESSED_LAST'}} = "selected='selected'"; +if ($xlratorsettings{'EXTENDED_GUI'} eq 'settings') { + &Header::openbox('100%', 'left', $Lang::tr{'updxlrtr cache settings'}); + &printfrmview(); + &printerrormsgs(\@errormessages); + &initfrmsettings(); + &printfrmsettings(); + &Header::closebox(); + } # ---------------------------------------------------- -# Settings dialog +# End Page Output # ---------------------------------------------------- +&Header::closebigbox(); +&Header::closepage(); -&Header::showhttpheaders(); - -&Header::openpage($Lang::tr{'updxlrtr configuration'}, 1, ''); - -&Header::openbigbox('100%', 'left', '', $errormessage); - -if ($errormessage) { - &Header::openbox('100%', 'left', $Lang::tr{'error messages'}); - print "<font class='base'>$errormessage </font>\n"; - &Header::closebox(); -} - -print "<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'>\n"; - -&Header::openbox('100%', 'left', "$Lang::tr{'updxlrtr update accelerator'}"); +# ------------------------------------------------------------------- +# Print Form to switch view +# ------------------------------------------------------------------- -print <<END -<table width='100%'> -<tr> - <td colspan='4'><b>$Lang::tr{'updxlrtr common settings'}</b></td> -</tr> -<tr> - <td class='base' width='25%'>$Lang::tr{'updxlrtr enable log'}:</td> - <td class='base' width='20%'><input type='checkbox' name='ENABLE_LOG' $checked{'ENABLE_LOG'}{'on'} /></td> - <td class='base' width='25%'></td> - <td class='base' width='30%'></td> -</tr> -<tr> - <td class='base'>$Lang::tr{'updxlrtr passive mode'}:</td> - <td class='base'><input type='checkbox' name='PASSIVE_MODE' $checked{'PASSIVE_MODE'}{'on'} /></td> - <td class='base'>$Lang::tr{'updxlrtr max disk usage'}:</td> - <td class='base'><input type='text' name='MAX_DISK_USAGE' value='$xlratorsettings{'MAX_DISK_USAGE'}' size='1' /> %</td> -</tr> -</table> -<hr size='1'> -<table width='100%'> -<tr> - <td colspan='4'><b>$Lang::tr{'updxlrtr performance options'}</b></td> -</tr> -<tr> - <td class='base' width='25%'>$Lang::tr{'updxlrtr low download priority'}:</td> - <td class='base' width='20%'><input type='checkbox' name='LOW_DOWNLOAD_PRIORITY' $checked{'LOW_DOWNLOAD_PRIORITY'}{'on'} /></td> - <td class='base' width='25%'>$Lang::tr{'updxlrtr max download rate'}: <img src='/blob.gif' alt='*' </td> - <td class='base' width='30%'><input type='text' name='MAX_DOWNLOAD_RATE' value='$xlratorsettings{'MAX_DOWNLOAD_RATE'}' size='5' /></td> -</tr> -</table> -<hr size='1'> -<table width='100%'> -<tr> - <td colspan='4'><b>$Lang::tr{'updxlrtr source checkup'}</b></td> -</tr> -<tr> - <td class='base' width='25%'>$Lang::tr{'updxlrtr enable autocheck'}:</td> - <td class='base' width='20%'><input type='checkbox' name='ENABLE_AUTOCHECK' $checked{'ENABLE_AUTOCHECK'}{'on'} /></td> - <td class='base' width='25%'>$Lang::tr{'updxlrtr source checkup schedule'}:</td> - <td class='base' width='30%'> - <select name='AUTOCHECK_SCHEDULE'> - <option value='daily' $selected{'AUTOCHECK_SCHEDULE'}{'daily'}>$Lang::tr{'updxlrtr daily'}</option> - <option value='weekly' $selected{'AUTOCHECK_SCHEDULE'}{'weekly'}>$Lang::tr{'updxlrtr weekly'}</option> - <option value='monthly' $selected{'AUTOCHECK_SCHEDULE'}{'monthly'}>$Lang::tr{'updxlrtr monthly'}</option> - </select> - </td> -</tr> -<tr> - <td class='base'>$Lang::tr{'updxlrtr full autosync'}:</td> - <td class='base'><input type='checkbox' name='FULL_AUTOSYNC' $checked{'FULL_AUTOSYNC'}{'on'} /></td> - <td> </td> - <td> </td> -</tr> -</table> -<hr size='1'> -<table width='100%'> -<tr> - <td align='center' width='20%'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td> - <td align='center' width='20%'><input type='submit' name='ACTION' value='$Lang::tr{'updxlrtr save and restart'}' /></td> - <td> </td> +sub printfrmview { + print <<END +<form class='frmshow' method='get' action='$ENV{'SCRIPT_NAME'}'> +<fieldset class='noborder'> +<legend><span>$Lang::tr{'updxlrtr current view'}:</span></legend> END ; - -print" <td align='center' width='20%'><input type='submit' name='ACTION' value='$Lang::tr{'updxlrtr statistics'}"; -if ($xlratorsettings{'EXTENDED_GUI'} eq 'statistics') { print " <<' "; } else { print " >>' "; } -print "/></td>\n"; - -print" <td align='center' width='20%'><input type='submit' name='ACTION' value='$Lang::tr{'updxlrtr maintenance'}"; -if ($xlratorsettings{'EXTENDED_GUI'} eq 'maintenance') { print " <<' "; } else { print " >>' "; } -print "/></td>\n"; - -print <<END -</tr> -</table> + if ($xlratorsettings{'EXTENDED_GUI'} eq 'overview') + { print "<button id='oview' class='symbols' disabled='disabled'>$Lang::tr{'updxlrtr overview'}</button>\n"; } + else + { print "<button id='oview' class='symbols' type='submit' name='show' value='overview'>$Lang::tr{'updxlrtr overview'}</button>\n"; } + + if ($xlratorsettings{'EXTENDED_GUI'} eq 'statistics') + { print "<button id='stat' class='symbols' disabled='disabled'>$Lang::tr{'updxlrtr statistics'}</button>\n"; } + else + { print "<button id='stat' class='symbols' type='submit' name='show' value='statistics'>$Lang::tr{'updxlrtr statistics'}</button>\n"; } + + if ($xlratorsettings{'EXTENDED_GUI'} eq 'maintenance') + { print "<button id='wrench' class='symbols' disabled='disabled'>$Lang::tr{'updxlrtr maintenance'}</button>\n"; } + else + { print "<button id='wrench' class='symbols' type='submit' name='show' value='maintenance'>$Lang::tr{'updxlrtr maintenance'}</button>\n"; } + + if ($xlratorsettings{'EXTENDED_GUI'} eq 'settings') + { print "<button id='set' class='symbols' disabled='disabled'>$Lang::tr{'updxlrtr settings'}</button>\n"; } + else + { print "<button id='set' class='symbols' type='submit' name='show' value='settings'>$Lang::tr{'updxlrtr settings'}</button>\n"; } + print <<END +</fieldset> +</form> END ; + return; +} -&Header::closebox(); - -print "</form>\n"; - -# ---------------------------------------------------- -# List pending downloads - if any -# ---------------------------------------------------- - -if (($xlratorsettings{'EXTENDED_GUI'} ne 'statistics') && ($xlratorsettings{'EXTENDED_GUI'} ne 'maintenance')) -{ - @downloadlist = <$repository/download/*>; - - undef(@downloadfiles); - foreach (@downloadlist) - { - if (-d) - { - my @filelist = <$_/*>; - $vendorid = substr($_,rindex($_,"/")+1); - foreach(@filelist) - { - next if(/\.info$/); - $updatefile = substr($_,rindex($_,"/")+1); - $updatefile .= ":download/$vendorid/$updatefile"; - $updatefile = " ".$updatefile; - push(@downloadfiles, $updatefile); - } - } - } - - if (@downloadfiles) - { - &Header::openbox('100%', 'left', "$Lang::tr{'updxlrtr pending downloads'}"); +# ------------------------------------------------------------------- +# Print Error Messages - printerrormsgs(\@errormsgs) +# ------------------------------------------------------------------- +sub printerrormsgs { + my $errmsgs_ref = shift; + unless (@$errmsgs_ref == 0) { + &Header::openbox('100%', 'left', ''); print <<END -<table> - <tr><td class='boldbase'><b>$Lang::tr{'updxlrtr current downloads'}</b></td></tr> -</table> -<table width='100%'> -<colgroup span='3' width='2%'></colgroup> -<colgroup span='1' width='0*'></colgroup> -<colgroup span='3' width='5%'></colgroup> -<colgroup span='1' width='2%'></colgroup> -<tr> - <td class='base' align='center'> </td> - <td class='base' align='left' colspan='2'><i>$Lang::tr{'updxlrtr source'}</i></td> - <td class='base' align='center'><i>$Lang::tr{'updxlrtr filename'}</i></td> - <td class='base' align='center'><i>$Lang::tr{'updxlrtr filesize'}</i></td> - <td class='base' align='center'><i>$Lang::tr{'date'}</i></td> - <td class='base' align='center'><i>$Lang::tr{'updxlrtr progress'}</i></td> - <td class='base' align='center'> </td> -</tr> + <div id='errors'><strong>$Lang::tr{'error messages'}</strong><br /> END ; - $id = 0; - foreach $updatefile (@downloadfiles) - { - $updatefile =~ s/.*://; - my $size_updatefile = 0; - my $mtime = 0; - if(-e "$repository/$updatefile") { - $size_updatefile = (-s "$repository/$updatefile"); - $mtime = &getmtime("$repository/$updatefile"); - } - if (-e "$repository/$updatefile.info") { - &General::readhash("$repository/$updatefile.info", \%dlinfo); - } else { - undef(%dlinfo); - } - - $id++; - if ($id % 2) { - print "<tr bgcolor='$Header::table1colour'>\n"; } - else { - print "<tr bgcolor='$Header::table2colour'>\n"; } - - $filesize = $size_updatefile; - 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; - - my ($SECdt,$MINdt,$HOURdt,$DAYdt,$MONTHdt,$YEARdt) = localtime($mtime); - $DAYdt = sprintf ("%.02d",$DAYdt); - $MONTHdt = sprintf ("%.02d",$MONTHdt+1); - $YEARdt = sprintf ("%.04d",$YEARdt+1900); - $filedate = $YEARdt."-".$MONTHdt."-".$DAYdt; - - ($uuid,$vendorid,$shortname) = split('/',$updatefile); - - print "\t\t<td align='center' nowrap='nowrap'> "; - if (&getPID("\\s/usr/bin/wget\\s.*\\s".quotemeta($dlinfo{'SRCURL'})."\$")) - { - print "<img src='/images/updbooster/updxl-led-blue.gif' alt='$Lang::tr{'updxlrtr condition download'}' /> </td>\n"; - } else { - print "<img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition suspended'}' /> </td>\n"; - } - - print "\t\t<td align='center' nowrap='nowrap'> "; + foreach (@$errmsgs_ref) { print "$_<br />"; } + undef(@$errmsgs_ref); + print "\t\t\t</div>\n"; + &Header::closebox(); + } +} - if (($vendorid ne '') && (-e "$webhome/images/updbooster/updxl-src-$vendorid.gif")) - { - print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; - } else { - print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; - } +# ------------------------------------------------------------------- +# Initialize Downloaddata +# ------------------------------------------------------------------- - $shortname = substr($updatefile,rindex($updatefile,"/")+1); - $shortname =~ s/(.*)_[\da-f]*(\.(exe|cab|psf)$)/$1_*$2/i; +sub initdownloaddata { + @downloadlist = <$repository/download/*>; + my $updfile; + my $dlfiles_ref = shift; + undef(@$dlfiles_ref); + foreach (@downloadlist) { + if (-d) { + my @filelist = <$_/*>; + $vendorid = substr($_,rindex($_,"/")+1); + foreach(@filelist) { + next if(/\.info$/); + $updfile = substr($_,rindex($_,"/")+1); + $updfile .= ":download/$vendorid/$updfile"; + $updfile = " ".$updfile; + push(@$dlfiles_ref, $updfile); + } + } + } +} - $filesize = $dlinfo{'REMOTESIZE'}; - 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; - $dlinfo{'VENDORID'} = ucfirst $vendorid; +# ------------------------------------------------------------------- +# Print pending Downloadlist +# ------------------------------------------------------------------- - print <<END - <td class='base' align='center'> $dlinfo{'VENDORID'} </td> - <td class='base' align='left' title='cache:/$updatefile'>$shortname</td> - <td class='base' align='right' nowrap='nowrap'> $filesize </td> - <td class='base' align='center' nowrap='nowrap'> $filedate </td> - <td class='base' align='center' nowrap='nowrap'> +sub printtbldownloads { + my $dllist_ref = shift; + print <<END +<table id='listuploads'> +<caption>$Lang::tr{'updxlrtr current downloads'}</caption> +<thead> + <tr> + <th>$Lang::tr{'status'}</th> + <th>$Lang::tr{'updxlrtr source'}</th> + <th>$Lang::tr{'updxlrtr filename'}</th> + <th>$Lang::tr{'updxlrtr filesize'}</th> + <th>$Lang::tr{'date'}</th> + <th>$Lang::tr{'updxlrtr progress'}</th> + <th> </th> + </tr> +</thead> +<tfoot> + <tr> + <td colspan='7' id='legenddownload'> END ; - my $percent="0%"; - if ($dlinfo{'REMOTESIZE'} && $size_updatefile) - { - $percent=int(100 / ($dlinfo{'REMOTESIZE'} / $size_updatefile))."%"; - } - print $percent; &percentbar($percent); - print <<END - </td> - <td align='center'> - <form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'> - <input type='image' name='$Lang::tr{'updxlrtr cancel download'}' src='/images/delete.gif' title='$Lang::tr{'updxlrtr cancel download'}' alt='$Lang::tr{'updxlrtr cancel download'}' /> - <input type='hidden' name='ID' value='$updatefile' /> - <input type='hidden' name='ACTION' value='$Lang::tr{'updxlrtr cancel download'}' /> - </form> + &printlegenddownload(); + print <<END </td> </tr> +</tfoot> +<tbody> +END +; + &printtbldldata($dllist_ref); + print <<END +</tbody> +</table> END ; - } - - print "</table>\n<br>\n<table>\n"; - &printlegenddownload(); - print "</table>\n"; - - &Header::closebox(); - } } -# ===================================================================================== -# CACHE STATISTICS -# ===================================================================================== -if ($xlratorsettings{'EXTENDED_GUI'} eq 'statistics') -{ - -# ---------------------------------------------------- -# Get statistics -# ---------------------------------------------------- +# ------------------------------------------------------------------- +# Print Download Files - printdlfiles(\@dlfiles) +# ------------------------------------------------------------------- -@sources=(); -foreach (<$repository/*>) -{ - if (-d $_) - { - unless ((/^$repository\/download$/) || (/^$repository\/lost\+found$/)) { push(@sources,$_); } - } +sub printtbldldata { + my $dlfiles_ref = shift; + unless (@$dlfiles_ref) + { print "<tr>\n<th colspan=\"7\">".$Lang::tr{'updxlrtr no pending downloads attime'}."</th>\n</tr>\n"; } + else { + $id = 0; + foreach $updatefile (@$dlfiles_ref) { + print "<tr>\n"; + $updatefile =~ s/.*://; + my $size_updatefile = 0; + my $mtime = 0; + + if(-e "$repository/$updatefile") { + $size_updatefile = (-s "$repository/$updatefile"); + $mtime = &getmtime("$repository/$updatefile"); + } + + if (-e "$repository/$updatefile.info") { &General::readhash("$repository/$updatefile.info", \%dlinfo); } + else { undef(%dlinfo); } + + $filesize = $size_updatefile; + 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; + my ($SECdt,$MINdt,$HOURdt,$DAYdt,$MONTHdt,$YEARdt) = localtime($mtime); + my $percent = '0'; + $DAYdt = sprintf ("%.02d",$DAYdt); + $MONTHdt = sprintf ("%.02d",$MONTHdt+1); + $YEARdt = sprintf ("%.04d",$YEARdt+1900); + $filedate = $DAYdt.".".$MONTHdt.".".$YEARdt; + ($uuid,$vendorid,$shortname) = split('/',$updatefile); + $shortname = substr($updatefile,rindex($updatefile,"/")+1); + $shortname =~ s/(.*)_([\da-f]{8})*(\.(exe|cab|psf|msu)$)/$1_$2*$3/i; + unless (length($shortname) <= 50) { + my $fext = substr($shortname,rindex("$shortname",'.')); + $shortname = substr($shortname,0,44-length($fext)); + $shortname .= "[...] $fext"; + } + $filesize = $dlinfo{'REMOTESIZE'}; + 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; + $dlinfo{'VENDORID'} = ucfirst $vendorid; + if ($dlinfo{'REMOTESIZE'} && $size_updatefile) { $percent = int(100 / ($dlinfo{'REMOTESIZE'} / $size_updatefile)); } + + if (&getPID("\\s/usr/bin/wget\\s.*\\s".quotemeta($dlinfo{'SRCURL'})."\$")) + { print '<th><span id="ledbl" class="symbols" title="'.$Lang::tr{'updxlrtr condition download'}."\"></span></th>\n"; } + else { print '<th><span id="ledgy" class="symbols" title="'.$Lang::tr{'updxlrtr condition suspended'}."\"></span></th>\n"; } + + if ($vendimg{$vendorid}) + { print '<th><span id="vd$id" class="vendimg" style="background-image: url('.$vendimg{$vendorid}.');" title="'.ucfirst $vendorid.'">'.ucfirst $dlinfo{'VENDORID'}."</span></th>\n"; } + else { print '<th><span id="vd$id" class="vendimg" style="background-image: url('.$vendimg{'unknown'}.');" title="'.ucfirst $vendorid.'">'.ucfirst $dlinfo{'VENDORID'}."</span></th>\n"; } + print <<END +<td title="cache:/$updatefile">$shortname</td> +<td>$filesize</td> +<td>$filedate</td> +<td> +END +; + &percentbar($percent); + print <<END + </td> + <th> + <form method='post' id='del$id' action='$ENV{'SCRIPT_NAME'}'> + <div> + <button id='del$id' class='symbols' type='submit' title='$Lang::tr{'updxlrtr cancel download'}'></button> + <input type='hidden' name='ID' value='$updatefile' /> + <input type='hidden' name='ACTION' value='$Lang::tr{'updxlrtr cancel download'}' /> + </div> + </form> + </th> + </tr> +END +; + $id += 1; + } + } } -@vendors=(); -foreach (@sources) -{ - $vendorid=substr($_,rindex($_,'/')+1,length($_)); - push(@vendors,$vendorid); - $vendorstats{$vendorid."_filesize"} = 0; - $vendorstats{$vendorid."_requests"} = 0; - $vendorstats{$vendorid."_files"} = 0; - $vendorstats{$vendorid."_cachehits"} = 0; - $vendorstats{$vendorid."_0"} = 0; - $vendorstats{$vendorid."_1"} = 0; - $vendorstats{$vendorid."_2"} = 0; - $vendorstats{$vendorid."_3"} = 0; - @updatelist=<$_/*>; - foreach $data (@updatelist) - { - if (-e "$data/source.url") - { - open (FILE,"$data/source.url"); - $sourceurl=<FILE>; - close FILE; - chomp($sourceurl); - $updatefile = substr($sourceurl,rindex($sourceurl,'/')+1,length($sourceurl)); - - my $size_updatefile = 0; - if(-e "$data/$updatefile") { - $size_updatefile = (-s "$data/$updatefile"); - } - else - { - # DEBUG - #die "file not found: $data/$updatefile\n"; - } - # - # Total file size - # - $filesize += $size_updatefile; - # - # File size for this source - # - $vendorstats{$vendorid."_filesize"} += $size_updatefile; - # - # Number of requests from cache for this source - # - open (FILE,"$data/access.log"); - @requests=<FILE>; - close FILE; - chomp(@requests); - $counts = @requests; - $counts--; - $vendorstats{$vendorid."_requests"} += $counts; - $cachehits += $counts; - # - # Total number of files in cache - # - $numfiles++; - # - # Number of files for this source - # - $vendorstats{$vendorid."_files"}++; - # - # Count cache status occurences - # - open (FILE,"$data/status"); - $_=<FILE>; - close FILE; - chomp; - $vendorstats{$vendorid."_".$_}++; - # - # Calculate cached traffic for this source - # - $vendorstats{$vendorid."_cachehits"} += $counts * $size_updatefile; - # - # Calculate total cached traffic - # - $cachedtraffic += $counts * $size_updatefile; +# ------------------------------------------------------------------- +# Initialize Cachestats +# ------------------------------------------------------------------- - } - } +sub initcachestats { + @sources=(); + foreach (<$repository/*>) { + if (-d $_) { + unless ((/^$repository\/download$/) || (/^$repository\/lost\+found$/)) { push(@sources,$_); } + } + } + @vendors=(); + foreach (@sources) + { + $vendorid=substr($_,rindex($_,'/')+1,length($_)); + push(@vendors,$vendorid); + $vendorstats{$vendorid."_filesize"} = 0; + $vendorstats{$vendorid."_requests"} = 0; + $vendorstats{$vendorid."_files"} = 0; + $vendorstats{$vendorid."_cachehits"} = 0; + $vendorstats{$vendorid."_0"} = 0; + $vendorstats{$vendorid."_1"} = 0; + $vendorstats{$vendorid."_2"} = 0; + $vendorstats{$vendorid."_3"} = 0; + @updatelist=<$_/*>; + foreach $data (@updatelist) { + if (-e "$data/source.url") { + open (FILE,"$data/source.url"); + $sourceurl=<FILE>; + close FILE; + chomp($sourceurl); + $updatefile = substr($sourceurl,rindex($sourceurl,'/')+1,length($sourceurl)); + my $size_updatefile = 0; + if(-e "$data/$updatefile") { + $size_updatefile = (-s "$data/$updatefile"); + } + else { + # DEBUG + #die "file not found: $data/$updatefile\n"; + } + # + # Total file size + # + $filesize += $size_updatefile; + # + # File size for this source + # + $vendorstats{$vendorid."_filesize"} += $size_updatefile; + # + # Number of requests from cache for this source + # + open (FILE,"$data/access.log"); + @requests=<FILE>; + close FILE; + chomp(@requests); + $counts = @requests; + $counts--; + $vendorstats{$vendorid."_requests"} += $counts; + $cachehits += $counts; + # + # Total number of files in cache + # + $numfiles++; + # + # Number of files for this source + # + $vendorstats{$vendorid."_files"}++; + # + # Count cache status occurences + # + open (FILE,"$data/status"); + $_=<FILE>; + close FILE; + chomp; + $vendorstats{$vendorid."_".$_}++; + # + # Calculate cached traffic for this source + # + $vendorstats{$vendorid."_cachehits"} += $counts * $size_updatefile; + # + # Calculate total cached traffic + # + $cachedtraffic += $counts * $size_updatefile; + } + } + } + if ($numfiles) { $efficiency = sprintf("%.1f", $cachehits / $numfiles); } } -if ($numfiles) { $efficiency = sprintf("%.1f", $cachehits / $numfiles); } - -1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; -1 while $cachedtraffic =~ s/^(-?\d+)(\d{3})/$1.$2/; - # ---------------------------------------------------- -# Show statistics +# Print statistics # ---------------------------------------------------- -&Header::openbox('100%', 'left', "$Lang::tr{'updxlrtr cache statistics'}"); - -unless ($numfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>\n<hr size='1'>\n"; } - -print <<END -<table> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr> +sub printcachestatistics { + if ($numfiles) { + $filesize = &format_size($filesize); + $cachedtraffic = &format_size($cachedtraffic); + print <<END +<table id='summary'> +<caption>$Lang::tr{'updxlrtr summary'}</caption> +<tbody> + <tr> + <th>$Lang::tr{'updxlrtr total files'}:</th> + <td>$numfiles</td> + <th>$Lang::tr{'updxlrtr total cache size'}:</th> + <td align='right'>$filesize</td> + </tr> + <tr> + <th>$Lang::tr{'updxlrtr efficiency index'}:</th> + <td>$efficiency</td> + <th>$Lang::tr{'updxlrtr total data from cache'}:</th> + <td>$cachedtraffic</td> + </tr> +</tbody> </table> -<table cellpadding='3'> -<tr> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td> -</tr> -END -; - -open(DF,"/bin/df -h $repository|"); -@dfdata = <DF>; -close DF; -shift(@dfdata); -chomp(@dfdata); -$dfstr = join(' ',@dfdata); -my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr); - -print <<END -<tr> -<td>[$repository]</td> -<td align='right'>$size</td> -<td align='right'>$used</td> -<td align='right'>$free</td> -<td> +<hr /> +<table id='liststatbysrc'> +<caption>$Lang::tr{'updxlrtr statistics by source'}</caption> +<colgroup> +<col></col> +<col></col> +<col></col> +<col></col> +<col span='4' style='width: 40px'></col> +</colgroup> +<thead> + <tr> + <th>$Lang::tr{'updxlrtr source'}</th> + <th>$Lang::tr{'updxlrtr files'}</th> + <th>$Lang::tr{'updxlrtr cache size'}</th> + <th>$Lang::tr{'updxlrtr data from cache'}</th> + <th><span id='ledgr' class='symbols' title='$Lang::tr{'updxlrtr condition ok'}'></span></th> + <th><span id='ledye' class='symbols' title='$Lang::tr{'updxlrtr condition nosource'}'></span></th> + <th><span id='ledrd' class='symbols' title='$Lang::tr{'updxlrtr condition outdated'}'></span></th> + <th><span id='ledgy' class='symbols' title='$Lang::tr{'updxlrtr condition unknown'}'></span></th> + </tr> +</thead> +<tfoot> + <tr> + <td colspan='8' id='legendstatus'> END ; -&percentbar($percent); -print <<END -</td> -<td align='right'>$percent</td> -</tr> -</table> + &printlegendstatus(); + print <<END + </td> + </tr> +</tfoot> +<tbody> END ; - -if ($numfiles) -{ + &printtblstatdata(\@vendors); print <<END -<hr size='1'> -<table width='100%'> -<tr> - <td colspan='5'><b>$Lang::tr{'updxlrtr summary'}</b></td> -</tr> -<tr> - <td class='base' width='25%'>$Lang::tr{'updxlrtr total files'}:</td> - <td class='base' width='20%'><font color='$colourgray'>$numfiles</font></td> - <td class='base' width='25%'>$Lang::tr{'updxlrtr total cache size'}:</td> - <td class='base' width='15%' align='right'><font color='$colourgray'>$filesize</font></td> - <td class='base'></td> -</tr> -<tr> - <td class='base'>$Lang::tr{'updxlrtr efficiency index'}:</td> - <td class='base'><font color='$colourgray'>$efficiency</font></td> - <td class='base'>$Lang::tr{'updxlrtr total data from cache'}:</td> - <td class='base' align='right'><font color='$colourgray'>$cachedtraffic</font></td> - <td class='base'></td> -</tr> +</tbody> </table> -<hr size='1'> -<table> -<tr> - <td colspan='17'><b>$Lang::tr{'updxlrtr statistics by source'}</b></td> -</tr> -<tr> - <td class='base' colspan='2'><i>$Lang::tr{'updxlrtr source'}</i></td> - <td class='base' width='7%'> </td> - <td class='base' align='right'><i>$Lang::tr{'updxlrtr files'}</i></td> - <td class='base' width='7%'> </td> - <td class='base' align='right'><nobr><i>$Lang::tr{'updxlrtr cache size'}</i></nobr></td> - <td class='base' width='7%'> </td> - <td class='base' align='right'><nobr><i>$Lang::tr{'updxlrtr data from cache'}</i></nobr></td> - <td class='base' width='15%'> </td> - <td class='base'><img src="/images/updbooster/updxl-led-green.gif" /></td> - <td class='base' width='15%'> </td> - <td class='base'><img src="/images/updbooster/updxl-led-yellow.gif" /></td> - <td class='base' width='15%'> </td> - <td class='base'><img src="/images/updbooster/updxl-led-red.gif" /></td> - <td class='base' width='15%'> </td> - <td class='base'><img src="/images/updbooster/updxl-led-gray.gif" /></td> - <td class='base' width='90%'> </td> -</tr> END ; +} -$id = 0; - -foreach (@vendors) -{ - $vendorid = $_; - - unless ($vendorstats{$vendorid . "_files"}) { next; } - - $id++; - if ($id % 2) { - print "<tr bgcolor=''$color{'color20'}'>\n"; } +sub printtblstatdata { + my $vendlst_ref = shift; + my $vendorid; + $id = 0; + unless (@$vendlst_ref) { print "<tr>\n<th colspan='8'>$Lang::tr{'updxlrtr empty repository'}.</th>\n</tr>\n"; } else { - print "<tr bgcolor=''$color{'color22'}'>\n"; } - - print "<td class='base' align='center'><nobr> "; - - if ($vendorid =~ /^Adobe$/i) - { - print "<img src='/images/updbooster/updxl-src-adobe.gif' alt='Adobe'}' /> </nobr></td>\n"; - print "<td class='base'> Adobe </td>\n"; - } elsif ($vendorid =~ /^Microsoft$/i) - { - print "<img src='/images/updbooster/updxl-src-windows.gif' alt='Microsoft'}' /> </nobr></td>\n"; - print "<td class='base'> Microsoft </td>\n"; - } elsif ($vendorid =~ /^Symantec$/i) - { - print "<img src='/images/updbooster/updxl-src-symantec.gif' alt='Symantec'}' /> </nobr></td>\n"; - print "<td class='base'> Symantec </td>\n"; - } elsif ($vendorid =~ /^Linux$/i) - { - print "<img src='/images/updbooster/updxl-src-linux.gif' alt='Linux'}' /> </nobr></td>\n"; - print "<td class='base'> Linux </td>\n"; - } elsif ($vendorid =~ /^TrendMicro$/i) - { - print "<img src='/images/updbooster/updxl-src-trendmicro.gif' alt='Trend Micro'}' /> </nobr></td>\n"; - print "<td class='base'> Trend Micro </td>\n"; - } elsif ($vendorid =~ /^Apple$/i) - { - print "<img src='/images/updbooster/updxl-src-apple.gif' alt='Apple'}' /> </nobr></td>\n"; - print "<td class='base'> Apple </td>\n"; - } elsif ($vendorid =~ /^Avast$/i) - { - print "<img src='/images/updbooster/updxl-src-avast.gif' alt='Avast'}' /> </nobr></td>\n"; - print "<td class='base'> Avast </td>\n"; - } elsif ($vendorid =~ /^Avira$/i) - { - print "<img src='/images/updbooster/updxl-src-avira.gif' alt='Avira' /> </td>\n"; - print "<td class='base'> Avira </td>\n"; - } elsif ($vendorid =~ /^AVG$/i) - { - print "<img src='/images/updbooster/updxl-src-avg.gif' alt='AVG' /> </td>\n"; - print "<td class='base'> AVG </td>\n"; - } elsif ($vendorid =~ /^Ipfire$/i) - { - print "<img src='/images/IPFire.png' width='18' height='18' alt='IPFire' /> </td>\n"; - print "<td class='base'> IPFire </td>\n"; - } else - { - if (-e "/srv/web/ipfire/html/images/updbooster/updxl-src-" . $vendorid . ".gif") - { - print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' /> </nobr></td>\n"; - } else { - print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' /> </nobr></td>\n"; + foreach (@$vendlst_ref) { + $vendorid = $_; + unless ($vendorstats{$vendorid . "_files"}) { next; } + print "\t<tr>\n"; + if ($vendimg{$vendorid}) + { print "\t\t<th><span id='vd$id' class='vendimg' style='background-image: url($vendimg{$vendorid});' title='".ucfirst $vendorid."'>". ucfirst $vendorid ."</span></th>\n"; } + else { print "\t\t<th><span id='vd$id' class='vendimg' style='background-image: url($vendimg{'unknown'});' title='".ucfirst $vendorid."'>". ucfirst $vendorid ."</span></th>\n"; } + print "\t\t<td>"; + printf "%5d", $vendorstats{$vendorid."_files"}; + print "</td>\n"; + unless ($vendorstats{$vendorid."_filesize"}) { $vendorstats{$vendorid."_filesize"} = '0'; } + print "\t\t<td>"; + print &format_size($vendorstats{$vendorid."_filesize"}); + print "</td>\n"; + unless ($vendorstats{$vendorid."_cachehits"}) { $vendorstats{$vendorid."_cachehits"} = '0'; } + print "\t\t<td>"; + print &format_size($vendorstats{$vendorid."_cachehits"}); + print "</td>\n"; + print "\t\t<td>"; + printf "%5d", $vendorstats{$vendorid."_1"}; + print "</td>\n"; + print "\t\t<td>"; + printf "%5d", $vendorstats{$vendorid."_3"}; + print "</td>\n"; + print "\t\t<td>"; + printf "%5d", $vendorstats{$vendorid."_2"}; + print "</td>\n"; + print "\t\t<td>"; + printf "%5d", $vendorstats{$vendorid."_0"}; + print "</td>\n"; + print "\t</tr>\n"; + $id += 1; } - print "<td class='base'> " . ucfirst $vendorid . " </td>\n"; } - - print "<td class='base' colspan=2 align='right'>"; - printf "%5d", $vendorstats{$vendorid."_files"}; - print " </td>\n"; - - unless ($vendorstats{$vendorid."_filesize"}) { $vendorstats{$vendorid."_filesize"} = '0'; } - 1 while $vendorstats{$vendorid."_filesize"} =~ s/^(-?\d+)(\d{3})/$1.$2/; - print "<td class='base' colspan=2 align='right'>"; - printf "%15s", $vendorstats{$vendorid."_filesize"}; - print " </td>\n"; - - unless ($vendorstats{$vendorid."_cachehits"}) { $vendorstats{$vendorid."_cachehits"} = '0'; } - 1 while $vendorstats{$vendorid."_cachehits"} =~ s/^(-?\d+)(\d{3})/$1.$2/; - print "<td class='base' colspan=2 align='right'>"; - printf "%15s", $vendorstats{$vendorid."_cachehits"}; - print " </td>\n"; - - print "<td class='base' colspan=2 align='right'>"; - printf "%5d", $vendorstats{$vendorid."_1"}; - print "  </td>\n"; - - print "<td class='base' colspan=2 align='right'>"; - printf "%5d", $vendorstats{$vendorid."_3"}; - print "  </td>\n"; - - print "<td class='base' colspan=2 align='right'>"; - printf "%5d", $vendorstats{$vendorid."_2"}; - print "  </td>\n"; - - print "<td class='base' colspan=2 align='right'>"; - printf "%5d", $vendorstats{$vendorid."_0"}; - print "  </td>\n"; - - print "<td class='base'> </td>\n"; - print "</tr>\n"; + } } +# ------------------------------------------------------------------- +# Initialize Repositorydata +# ------------------------------------------------------------------- -print "</table>\n"; - -print <<END -<br> -<table> - <tr> - <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-led-green.gif' alt='$Lang::tr{'updxlrtr condition ok'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition ok'}</td> - <td class='base'>   </td> - <td align='center'><img src='/images/updbooster/updxl-led-yellow.gif' alt='$Lang::tr{'updxlrtr condition nosource'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition nosource'}</td> - <td class='base'>   </td> - <td align='center'><img src='/images/updbooster/updxl-led-red.gif' alt='$Lang::tr{'updxlrtr condition outdated'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition outdated'}</td> - <td class='base'>   </td> - <td align='center'><img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition unknown'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition unknown'}</td> - <td class='base'>   </td> - </tr> -</table> -END -; - -} +sub inittblreposdata { + @sources = <$repository/download/*>; + undef @repositoryfiles; + foreach (@sources) { + if (-d) { + @updatelist = <$_/*>; + $vendorid = substr($_,rindex($_,"/")+1); + foreach(@updatelist) { + next if(/\.info$/); + $updatefile = substr($_,rindex($_,"/")+1); + $updatefile .= ":download/$vendorid/$updatefile"; + $updatefile = " ".$updatefile; + push(@repositoryfiles,$updatefile); + } + } + } -&Header::closebox(); + undef (@sources); + foreach (<$repository/*>) { + if (-d $_) { + unless (/^$repository\/download$/) { push(@sources,$_); } + } + } + foreach (@sources) { + @updatelist=<$_/*>; + $vendorid = substr($_,rindex($_,"/")+1); + foreach(@updatelist) { + $uuid = substr($_,rindex($_,"/")+1); + if (-e "$_/source.url") { + open (FILE,"$_/source.url"); + $sourceurl=<FILE>; + close FILE; + chomp($sourceurl); + $updatefile = substr($sourceurl,rindex($sourceurl,'/')+1,length($sourceurl)); + $_ = $updatefile; tr/[A-Z]/[a-z]/; + $updatefile = "$_:$vendorid/$uuid/$updatefile"; + push(@repositoryfiles,$updatefile); + } + } + } + @repositoryfiles = sort { ($a =~ /.*?:(.*\/).*?/)[0] cmp ($b =~ /.*?:(.*\/).*?/)[0] } @repositoryfiles; } -# ===================================================================================== -# CACHE MAINTENANCE -# ===================================================================================== - -if ($xlratorsettings{'EXTENDED_GUI'} eq 'maintenance') -{ - - -# ---------------------------------------------------- -# File list dialog -# ---------------------------------------------------- - -&Header::openbox('100%', 'left', "$Lang::tr{'updxlrtr cache maintenance'}"); - -@sources= <$repository/download/*>; +# ------------------------------------------------------------------- +# Initialize Cache-Maintenance Form +# ------------------------------------------------------------------- -undef @repositoryfiles; -foreach (@sources) -{ - if (-d) - { - @updatelist = <$_/*>; - $vendorid = substr($_,rindex($_,"/")+1); - foreach(@updatelist) - { - next if(/\.info$/); - $updatefile = substr($_,rindex($_,"/")+1); - $updatefile .= ":download/$vendorid/$updatefile"; - $updatefile = " ".$updatefile; - push(@repositoryfiles,$updatefile); - } - } +sub initfrmmaintenance { + $selected{'NOT_ACCESSED_LAST'}{'week'} = ''; + $selected{'NOT_ACCESSED_LAST'}{'month1'} = ''; + $selected{'NOT_ACCESSED_LAST'}{'month3'} = ''; + $selected{'NOT_ACCESSED_LAST'}{'month6'} = ''; + $selected{'NOT_ACCESSED_LAST'}{'year'} = ''; + $selected{'NOT_ACCESSED_LAST'}{$xlratorsettings{'NOT_ACCESSED_LAST'}} = "selected='selected'"; + $checked{'REMOVE_NOSOURCE'}{'off'} = ''; + $checked{'REMOVE_NOSOURCE'}{'on'} = ''; + $checked{'REMOVE_NOSOURCE'}{$xlratorsettings{'REMOVE_NOSOURCE'}} = "checked='checked'"; + $checked{'REMOVE_OUTDATED'}{'off'} = ''; + $checked{'REMOVE_OUTDATED'}{'on'} = ''; + $checked{'REMOVE_OUTDATED'}{$xlratorsettings{'REMOVE_OUTDATED'}} = "checked='checked'"; + $checked{'REMOVE_UNKNOWN'}{'off'} = ''; + $checked{'REMOVE_UNKNOWN'}{'on'} = ''; + $checked{'REMOVE_UNKNOWN'}{$xlratorsettings{'REMOVE_UNKNOWN'}} = "checked='checked'"; + $checked{'REMOVE_TODELETE'}{'off'} = ''; + $checked{'REMOVE_TODELETE'}{'on'} = ''; + $checked{'REMOVE_TODELETE'}{$xlratorsettings{'REMOVE_TODELETE'}} = "checked='checked'"; + $checked{'TODELETE'}{'off'} = ''; + $checked{'TODELETE'}{'on'} = ''; + $checked{'TODELETE'}{$xlratorsettings{'TODELETE'}} = "checked='checked'"; } -undef (@sources); -foreach (<$repository/*>) -{ - if (-d $_) -{ - unless (/^$repository\/download$/) { push(@sources,$_); } - } -} +# ------------------------------------------------------------------- +# Print Cache-Maintenance Form - printfrmmaintenance('withfiles', \@repositoryfiles) +# ------------------------------------------------------------------- -foreach (@sources) -{ - @updatelist=<$_/*>; - $vendorid = substr($_,rindex($_,"/")+1); - foreach(@updatelist) - { - $uuid = substr($_,rindex($_,"/")+1); - if (-e "$_/source.url") - { - open (FILE,"$_/source.url"); - $sourceurl=<FILE>; - close FILE; - chomp($sourceurl); - $updatefile = substr($sourceurl,rindex($sourceurl,'/')+1,length($sourceurl)); - $_ = $updatefile; tr/[A-Z]/[a-z]/; - $updatefile = "$_:$vendorid/$uuid/$updatefile"; - push(@repositoryfiles,$updatefile); - } - } +sub printfrmmaintenance { + my $param = shift; + my $repos_ref = shift; + my $disabled = ''; + unless (@$repos_ref) { $disabled = "disabled='disabled'"; } + print <<END +<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'> + <fieldset> + <legend>$Lang::tr{'updxlrtr all files'}</legend> + <input id='check08' type='checkbox' name='REMOVE_UNKNOWN' $checked{'REMOVE_UNKNOWN'}{'on'} $disabled/> + <label for='check08'>$Lang::tr{'updxlrtr not accessed'}:</label> + <select id='select02' name='NOT_ACCESSED_LAST' $disabled> + <option value='week' $selected{'NOT_ACCESSED_LAST'}{'week'}>$Lang::tr{'updxlrtr week'}</option> + <option value='month1' $selected{'NOT_ACCESSED_LAST'}{'month1'}>$Lang::tr{'updxlrtr month'}</option> + <option value='month3' $selected{'NOT_ACCESSED_LAST'}{'month3'}>$Lang::tr{'updxlrtr 3 months'}</option> + <option value='month6' $selected{'NOT_ACCESSED_LAST'}{'month6'}>$Lang::tr{'updxlrtr 6 months'}</option> + <option value='year' $selected{'NOT_ACCESSED_LAST'}{'year'}>$Lang::tr{'updxlrtr year'}</option> + </select> + </fieldset> + <fieldset> + <legend>$Lang::tr{'updxlrtr marked as'} ...</legend> + <input id='check09' type='checkbox' name='REMOVE_NOSOURCE' $disabled/> + <label id='lbledye' class='symbols' for='check09'>$Lang::tr{'updxlrtr condition nosource'}</label> + <input id='check10' type='checkbox' name='REMOVE_OUTDATED' $disabled/> + <label id='lbledrd' class='symbols' for='check10'>$Lang::tr{'updxlrtr condition outdated'}</label> + <input id='check11' type='checkbox' name='REMOVE_UNKNOWN' $disabled/> + <label id='lbledgy' class='symbols' for='check11'>$Lang::tr{'updxlrtr condition unknown'}</label> + <input id='check12' type='checkbox' name='REMOVE_TODELETE' $disabled/> + <label id='lbdel' class='symbols' for='check12'>$Lang::tr{'updxlrtr remove file'}</label> + </fieldset> + <fieldset class='noborder'> + <input type='submit' name='ACTION' value='$Lang::tr{'updxlrtr purge'}' $disabled/> + </fieldset> +END +; + if ($param =~ /withfiles/i) + { &printtblrepository($Lang::tr{'updxlrtr current files'}, $repos_ref); } + print "</form>\n"; } -@repositoryfiles = sort(@repositoryfiles); - -unless (@repositoryfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>\n<hr size='1'>\n"; } +# ------------------------------------------------------------------- +# Print current files in repository - printreposfiles($title, \@files) +# ------------------------------------------------------------------- -print <<END -<table> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr> -</table> -<table cellpadding='3'> -<tr> -<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td> -<td align='center' class='base'><i>$Lang::tr{'size'}</i></td> -<td align='center' class='base'><i>$Lang::tr{'used'}</i></td> -<td align='center' class='base'><i>$Lang::tr{'free'}</i></td> -<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td> -</tr> +sub printtblrepository { + my $title = shift; + my $files = shift; + + print <<END +<hr /> +<table id='listcurrfiles'> +<caption>$title</caption> +<colgroup> +<col></col> +<col></col> +<col style='width: 0*'></col> +<col span='5' style='min-width: 20px'></col> +</colgroup> +<thead> + <tr> + <th>$Lang::tr{'status'}</th> + <th>$Lang::tr{'updxlrtr source'}</th> + <th>$Lang::tr{'updxlrtr filename'}</th> + <th>$Lang::tr{'updxlrtr filesize'}</th> + <th>$Lang::tr{'date'}</th> + <th><span id='rel' class='symbols' title='$Lang::tr{'updxlrtr last access'}'></span></th> + <th><span id='glo' class='symbols' title='$Lang::tr{'updxlrtr last checkup'}'></span></th> + <th><span id='del' class='symbols' title='$Lang::tr{'updxlrtr remove file'}'></span></th> + </tr> +</thead> +<tfoot> + <tr> + <td colspan='9' id='legend'> END ; - -open(DF,"/bin/df -h $repository|"); -@dfdata = <DF>; -close DF; -shift(@dfdata); -chomp(@dfdata); -$dfstr = join(' ',@dfdata); -my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr); - +&printlegendicons(); +&printlegendstatus(); +&printlegendsource(); print <<END -<tr> -<td>[$repository]</td> -<td align='right'>$size</td> -<td align='right'>$used</td> -<td align='right'>$free</td> -<td> + </td> + </tr> +</tfoot> +<tbody> END ; -&percentbar($percent); -print <<END -</td> -<td align='right'>$percent</td> -</tr> -</table> + unless (@$files) { print "\t<tr>\n\t\t<th colspan='8'>$Lang::tr{'updxlrtr empty repository'}.</th>\n\t</tr>\n"; } + else { + $id = 0; + foreach $updatefile (@$files) { + $updatefile =~ s/.*://; + my $size_updatefile = 0; + my $mtime = 0; + if(-e "$repository/$updatefile") { + $size_updatefile = (-s "$repository/$updatefile"); + $mtime = &getmtime("$repository/$updatefile"); + } + print "\t<tr>\n"; + $filesize = &format_size($size_updatefile); + my ($SECdt,$MINdt,$HOURdt,$DAYdt,$MONTHdt,$YEARdt) = localtime($mtime); + $DAYdt = sprintf ("%.02d",$DAYdt); + $MONTHdt = sprintf ("%.02d",$MONTHdt+1); + $YEARdt = sprintf ("%.04d",$YEARdt+1900); + $filedate = $DAYdt.".".$MONTHdt.".".$YEARdt; + $lastaccess = "n/a"; + $lastcheck = "n/a"; + $status = $sfUnknown; + unless ($updatefile =~ /^download\//) { + ($vendorid,$uuid,$shortname) = split('/',$updatefile); + if (-e "$repository/$vendorid/$uuid/access.log") { + open (FILE,"$repository/$vendorid/$uuid/access.log"); + @metadata = <FILE>; + close(FILE); + chomp @metadata; + ($SECdt,$MINdt,$HOURdt,$DAYdt,$MONTHdt,$YEARdt) = localtime($metadata[-1]); + $DAYdt = sprintf ("%.02d",$DAYdt); + $MONTHdt = sprintf ("%.02d",$MONTHdt+1); + $YEARdt = sprintf ("%.04d",$YEARdt+1900); + if (($metadata[-1] =~ /^\d+/) && ($metadata[-1] >= 1)) + { $lastaccess = $DAYdt.".".$MONTHdt.".".$YEARdt; } + } + if (-e "$repository/$vendorid/$uuid/checkup.log") { + open (FILE,"$repository/$vendorid/$uuid/checkup.log"); + @metadata = <FILE>; + close(FILE); + chomp @metadata; + ($SECdt,$MINdt,$HOURdt,$DAYdt,$MONTHdt,$YEARdt) = localtime($metadata[-1]); + $DAYdt = sprintf ("%.02d",$DAYdt); + $MONTHdt = sprintf ("%.02d",$MONTHdt+1); + $YEARdt = sprintf ("%.04d",$YEARdt+1900); + if (($metadata[-1] =~ /^\d+/) && ($metadata[-1] >= 1)) + { $lastcheck = $DAYdt.".".$MONTHdt.".".$YEARdt; } + } + if (-e "$repository/$vendorid/$uuid/status") { + open (FILE,"$repository/$vendorid/$uuid/status"); + @metadata = <FILE>; + close(FILE); + chomp @metadata; + $status = $metadata[-1]; + } + } + else { + ($uuid,$vendorid,$shortname) = split('/',$updatefile); + $status = $sfOutdated; + } + + if ($status == $sfUnknown) + { print "\t\t<th><span id='ledgy$id' class='symbols' title='$Lang::tr{'updxlrtr condition unknown'}'> </span></th>\n"; } + elsif ($status == $sfOk) + { print "\t\t<th><span id='ledgr$id' class='symbols' title='$Lang::tr{'updxlrtr condition ok'}'></span> </th>\n"; } + elsif ($status == $sfNoSource) + { print "\t\t<th><span id='ledye$id' class='symbols' title='$Lang::tr{'updxlrtr condition nosource'}'> </span></th>\n"; } + elsif (($status == $sfOutdated) && (!($updatefile =~ /^download\//i))) + { print "\t\t<th><span id='ledrd$id' class='symbols' title='$Lang::tr{'updxlrtr condition outdated'}'> </span></th>\n"; } + elsif (($status == $sfOutdated) && ($updatefile =~ /^download\//i)) + { print "\t\t<th><span id='ledbl$id' class='symbols' title='$Lang::tr{'updxlrtr condition download'}'> </span></th>\n"; } + if ($vendimg{$vendorid}) { + print "\t\t<th><span class='vendimg' style='background-image: url($vendimg{$vendorid});' title='".ucfirst $vendorid."'> </span></th>\n"; } + else { + print "\t\t<th><span class='vendimg' style='background-image: url($vendimg{unknown});' title='".ucfirst $vendorid."'> </span></th>\n"; + } + $shortname = substr($updatefile,rindex($updatefile,"/")+1); + unless ($vendorid ne 'microsoft') { $shortname =~ s/(.*)_[\da-f]*(\.(exe|cab|psf)$)/$1\[...\] $2/i; } + unless (length($shortname) <= 50) { + my $fext = substr($shortname,rindex("$shortname",'.')); + $shortname = substr($shortname,0,44-length($fext)); + $shortname .= "[...] $fext"; + } + print <<END + <td title='cache:/$updatefile'><a href="/updatecache/$updatefile">$shortname</a></td> + <td>$filesize</td> + <td>$filedate</td> + <td>$lastaccess</td> + <td>$lastcheck</td> + <th><input id='frm$id' type='checkbox' name='TODELETE' value='$updatefile' title='$Lang::tr{'updxlrtr remove file'}' /></th> + </tr> END ; - -if (@repositoryfiles) -{ - print <<END -<hr size='1'> -<form method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'> -<table width='100%'> -<tr> - <td class='base' colspan='3'><input type='submit' name='ACTION' value='$Lang::tr{'updxlrtr purge'}' />  $Lang::tr{'updxlrtr all files'}</td> - <td class='base' width='25%'> - <input type='checkbox' name='REMOVE_OBSOLETE' $checked{'REMOVE_OBSOLETE'}{'on'} /> $Lang::tr{'updxlrtr not accessed'} - </td> - <td class='base' colspan='3'> - <select name='NOT_ACCESSED_LAST'> - <option value='week' $selected{'NOT_ACCESSED_LAST'}{'week'}>$Lang::tr{'updxlrtr week'}</option> - <option value='month1' $selected{'NOT_ACCESSED_LAST'}{'month1'}>$Lang::tr{'updxlrtr month'}</option> - <option value='month3' $selected{'NOT_ACCESSED_LAST'}{'month3'}>$Lang::tr{'updxlrtr 3 months'}</option> - <option value='month6' $selected{'NOT_ACCESSED_LAST'}{'month6'}>$Lang::tr{'updxlrtr 6 months'}</option> - <option value='year' $selected{'NOT_ACCESSED_LAST'}{'year'}>$Lang::tr{'updxlrtr year'}</option> - </select> - </td> -</tr> -<tr> -</tr> -<tr> - <td class='base' width='25%'> - <input type='checkbox' name='REMOVE_NOSOURCE' $checked{'REMOVE_NOSOURCE'}{'on'} /> $Lang::tr{'updxlrtr marked as'} - </td> - <td class='base' width='3%'><img src='/images/updbooster/updxl-led-yellow.gif' alt='$Lang::tr{'updxlrtr condition nosource'}' /></td> - <td class='base' width='17%'>[<i>$Lang::tr{'updxlrtr condition nosource'}</i>]</td> - <td class='base' width='25%'> - <input type='checkbox' name='REMOVE_OUTDATED' $checked{'REMOVE_OUTDATED'}{'on'} /> $Lang::tr{'updxlrtr marked as'} - </td> - <td class='base' width='3%'><img src='/images/updbooster/updxl-led-red.gif' alt='$Lang::tr{'updxlrtr condition outdated'}' /></td> - <td class='base' width='27%'>[<i>$Lang::tr{'updxlrtr condition outdated'}</i>]</td> -</tr> + $id += 1; + } + } + print <<END +</tbody> </table> </form> -<hr size='1'> END ; - - &printcurrentfiles($Lang::tr{'updxlrtr current files'}, @repositoryfiles); - print "<br>\n<table>\n"; - &printlegendicons(); - &printlegendspacer(); - &printlegendstatus(); - &printlegendspacer(); - &printlegendsource(); - print "</table>\n"; } -&Header::closebox(); +# ------------------------------------------------------------------- +# cancels pending download - need updatefile(-ID) +# ------------------------------------------------------------------- +sub canceldownload { + $updatefile = shift; + if ($updatefile =~ /^download\//) { + ($uuid,$vendorid,$updatefile) = split('/',$updatefile); + if (-e "$repository/download/$vendorid/$updatefile.info") { + &General::readhash("$repository/download/$vendorid/$updatefile.info", \%dlinfo); + $id = &getPID("\\s${General::swroot}/updatexlrator/bin/download\\s.*\\s".quotemeta($dlinfo{'SRCURL'})."\\s\\d\\s\\d\$"); + if ($id) { system("/bin/kill -9 $id"); } + $id = &getPID("\\s/usr/bin/wget\\s.*\\s".quotemeta($dlinfo{'SRCURL'})."\$"); + if ($id) { system("/bin/kill -9 $id"); } + system("rm \"$repository/download/$vendorid/$updatefile.info\""); + } + + if (-e "$repository/download/$vendorid/$updatefile") { + system("rm \"$repository/download/$vendorid/$updatefile\""); + } + } } -# ===================================================================================== - -&Header::closebigbox(); - -&Header::closepage(); - +# ------------------------------------------------------------------- +# Delete old and selected cached files # ------------------------------------------------------------------- -sub printcurrentfiles -{ - my $title = shift; - my @files = @_; - - print <<END -<table> -<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr current files'}</b></td></tr> -</table> -<table width='100%'> -<colgroup span='2' width='2%'></colgroup> -<colgroup span='1' width='0*'></colgroup> -<colgroup span='4' width='5%'></colgroup> -<colgroup span='1' width='2%'></colgroup> -<tr> - <td class='base' align='center'> </td> - <td class='base' align='center'> </td> - <td class='base' align='center'><i>$Lang::tr{'updxlrtr filename'}</i></td> - <td class='base' align='center'><i>$Lang::tr{'updxlrtr filesize'}</i></td> - <td class='base' align='center'><i>$Lang::tr{'date'}</i></td> - <td class='base' align='center'><img src='/images/reload.gif' alt='$Lang::tr{'updxlrtr last access'}' /></td> - <td class='base' align='center'><img src='/images/updbooster/updxl-globe.gif' alt='$Lang::tr{'updxlrtr last checkup'}' /></td> - <td class='base' align='center'> </td> -</tr> -END -; - $id = 0; - foreach $updatefile (@files) - { - $updatefile =~ s/.*://; - my $size_updatefile = 0; - my $mtime = 0; - if(-e "$repository/$updatefile") { - $size_updatefile = (-s "$repository/$updatefile"); - $mtime = &getmtime("$repository/$updatefile"); - } +sub delolddata { + undef (@sources); + undef @repositoryfiles; + foreach (<$repository/*>) { + if (-d $_) { + unless (/^$repository\/download$/) { push(@sources,$_); } + } + } + + foreach (@sources) { + @updatelist=<$_/*>; + $vendorid = substr($_,rindex($_,"/")+1); + foreach(@updatelist) { + $uuid = substr($_,rindex($_,"/")+1); + if (-e "$_/source.url") { + open (FILE,"$_/source.url"); + $sourceurl=<FILE>; + close FILE; + chomp($sourceurl); + $updatefile = substr($sourceurl,rindex($sourceurl,'/')+1,length($sourceurl)); + $updatefile = "$vendorid/$uuid/$updatefile"; + push(@repositoryfiles,$updatefile); + } + } + } + + foreach (@repositoryfiles) { + ($vendorid,$uuid,$updatefile) = split('/'); + if (-e "$repository/$vendorid/$uuid/status") { + open (FILE,"$repository/$vendorid/$uuid/status"); + @metadata = <FILE>; + close FILE; + chomp(@metadata); + $status = $metadata[-1]; + } + + if (-e "$repository/$vendorid/$uuid/access.log") { + open (FILE,"$repository/$vendorid/$uuid/access.log"); + @metadata = <FILE>; + close FILE; + chomp(@metadata); + $lastaccess = $metadata[-1]; + } + + if (($xlratorsettings{'REMOVE_NOSOURCE'} eq 'on') && ($status == $sfNoSource)) { + if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } + + if (($xlratorsettings{'REMOVE_OUTDATED'} eq 'on') && ($status == $sfOutdated)) { + if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } + + if (($xlratorsettings{'REMOVE_UNKNOWN'} eq 'on') && ($status == $sfUnknown)) { + if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } - $id++; - if ($id % 2) { - print "<tr bgcolor='$Header::table1colour'>\n"; } - else { - print "<tr bgcolor='$Header::table2colour'>\n"; } - - $filesize = $size_updatefile; - 1 while $filesize =~ s/^(-?\d+)(\d{3})/$1.$2/; - - my ($SECdt,$MINdt,$HOURdt,$DAYdt,$MONTHdt,$YEARdt) = localtime($mtime); - $DAYdt = sprintf ("%.02d",$DAYdt); - $MONTHdt = sprintf ("%.02d",$MONTHdt+1); - $YEARdt = sprintf ("%.04d",$YEARdt+1900); - $filedate = $YEARdt."-".$MONTHdt."-".$DAYdt; - - $lastaccess = "n/a"; - $lastcheck = "n/a"; - - $status = $sfUnknown; - - unless ($updatefile =~ /^download\//) - { - ($vendorid,$uuid,$shortname) = split('/',$updatefile); - - if (-e "$repository/$vendorid/$uuid/access.log") - { - open (FILE,"$repository/$vendorid/$uuid/access.log"); - @metadata = <FILE>; - close(FILE); - chomp @metadata; - - ($SECdt,$MINdt,$HOURdt,$DAYdt,$MONTHdt,$YEARdt) = localtime($metadata[-1]); - $DAYdt = sprintf ("%.02d",$DAYdt); - $MONTHdt = sprintf ("%.02d",$MONTHdt+1); - $YEARdt = sprintf ("%.04d",$YEARdt+1900); - if (($metadata[-1] =~ /^\d+/) && ($metadata[-1] >= 1)) { $lastaccess = $YEARdt."-".$MONTHdt."-".$DAYdt; } - } - if (-e "$repository/$vendorid/$uuid/checkup.log") - { - open (FILE,"$repository/$vendorid/$uuid/checkup.log"); - @metadata = <FILE>; - close(FILE); - chomp @metadata; - - ($SECdt,$MINdt,$HOURdt,$DAYdt,$MONTHdt,$YEARdt) = localtime($metadata[-1]); - $DAYdt = sprintf ("%.02d",$DAYdt); - $MONTHdt = sprintf ("%.02d",$MONTHdt+1); - $YEARdt = sprintf ("%.04d",$YEARdt+1900); - if (($metadata[-1] =~ /^\d+/) && ($metadata[-1] >= 1)) { $lastcheck = $YEARdt."-".$MONTHdt."-".$DAYdt; } - } - if (-e "$repository/$vendorid/$uuid/status") - { - open (FILE,"$repository/$vendorid/$uuid/status"); - @metadata = <FILE>; - close(FILE); - chomp @metadata; - $status = $metadata[-1]; - } - } else { - ($uuid,$vendorid,$shortname) = split('/',$updatefile); - $status = $sfOutdated; - } + if (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'week') && ($lastaccess < (time - 604800))) { + if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } + elsif (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'month1') && ($lastaccess < (time - 2505600))) { + if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } + elsif (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'month3') && ($lastaccess < (time - 7516800))) { + if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } + elsif (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'month6') && ($lastaccess < (time - 15033600))) { + if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } + elsif (($xlratorsettings{'NOT_ACCESSED_LAST'} eq 'year') && ($lastaccess < (time - 31536000))) { + if (-e "$repository/$vendorid/$uuid/$updatefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } - print "\t\t<td align='center' nowrap='nowrap'> "; - if ($status == $sfUnknown) - { - print "<img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition unknown'}' /> </td>\n"; - } - if ($status == $sfOk) - { - print "<img src='/images/updbooster/updxl-led-green.gif' alt='$Lang::tr{'updxlrtr condition ok'}' /> </td>\n"; - } - if ($status == $sfNoSource) - { - print "<img src='/images/updbooster/updxl-led-yellow.gif' alt='$Lang::tr{'updxlrtr condition nosource'}' /> </td>\n"; - } - if (($status == $sfOutdated) && (!($updatefile =~ /^download\//i))) - { - print "<img src='/images/updbooster/updxl-led-red.gif' alt='$Lang::tr{'updxlrtr condition outdated'}' /> </td>\n"; - } - if (($status == $sfOutdated) && ($updatefile =~ /^download\//i)) - { - print "<img src='/images/updbooster/updxl-led-blue.gif' alt='$Lang::tr{'updxlrtr condition download'}' /> </td>\n"; - } + + if (($xlratorsettings{'REMOVE_TODELETE'} eq 'on') && ($xlratorsettings{'TODELETE'} ne 'off')) { + my @todelete = split(/\|/, $xlratorsettings{'TODELETE'}); + foreach (@todelete) { + unless ($_ =~ /^download\//) { + ($vendorid,$uuid,$cachefile) = split(/\//, $_); + if (-e "$repository/$vendorid/$uuid/$cachefile") { system("rm -r \"$repository/$vendorid/$uuid\""); } + } + } + } + } +} - print "\t\t<td align='center' nowrap='nowrap'> "; - if ($vendorid =~ /^Adobe$/i) - { - print "<img src='/images/updbooster/updxl-src-adobe.gif' alt='Adobe'}' /> </td>\n"; - } elsif ($vendorid =~ /^Microsoft$/i) - { - print "<img src='/images/updbooster/updxl-src-windows.gif' alt='Microsoft'}' /> </td>\n"; - } elsif ($vendorid =~ /^Symantec$/i) - { - print "<img src='/images/updbooster/updxl-src-symantec.gif' alt='Symantec'}' /> </td>\n"; - } elsif ($vendorid =~ /^Linux$/i) - { - print "<img src='/images/updbooster/updxl-src-linux.gif' alt='Linux'}' /> </td>\n"; - } elsif ($vendorid =~ /^TrendMicro$/i) - { - print "<img src='/images/updbooster/updxl-src-trendmicro.gif' alt='Trend Micro'}' /> </td>\n"; - } elsif ($vendorid =~ /^Apple$/i) - { - print "<img src='/images/updbooster/updxl-src-apple.gif' alt='Apple'}' /> </td>\n"; - } elsif ($vendorid =~ /^Avast$/i) - { - print "<img src='/images/updbooster/updxl-src-avast.gif' alt='Avast'}' /> </td>\n"; - } elsif ($vendorid =~ /^Avira$/i) - { - print "<img src='/images/updbooster/updxl-src-avira.gif' alt='Avira' /> </td>\n"; - } elsif ($vendorid =~ /^AVG$/i) - { - print "<img src='/images/updbooster/updxl-src-avg.gif' alt='AVG' /> </td>\n"; - } elsif ($vendorid =~ /^Ipfire$/i) - { - print "<img src='/images/IPFire.png' width='18' height='18' alt='IPFire' /> </td>\n"; - } - else - { - if (-e "/srv/web/ipfire/html/images/updbooster/updxl-src-" . $vendorid . ".gif") - { - print "<img src='/images/updbooster/updxl-src-" . $vendorid . ".gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; - } else { - print "<img src='/images/updbooster/updxl-src-unknown.gif' alt='" . ucfirst $vendorid . "' /> </td>\n"; - } - } - $shortname = substr($updatefile,rindex($updatefile,"/")+1); - $shortname =~ s/(.*)_[\da-f]*(\.(exe|cab|psf)$)/$1_*$2/i; +# ------------------------------------------------------------------- -print <<END - <td class='base' align='left' title='cache:/$updatefile'><a href="/updatecache/$updatefile">$shortname</a></td> - <td class='base' align='right' nowrap='nowrap'> $filesize </td> - <td class='base' align='center' nowrap='nowrap'> $filedate </td> - <td class='base' align='center' nowrap='nowrap'> $lastaccess </td> - <td class='base' align='center' nowrap='nowrap'> $lastcheck </td> - <td align='center'> - <form method='post' name='frma$id' action='$ENV{'SCRIPT_NAME'}'> - <input type='image' name='$Lang::tr{'updxlrtr remove file'}' src='/images/delete.gif' title='$Lang::tr{'updxlrtr remove file'}' alt='$Lang::tr{'updxlrtr remove file'}' /> - <input type='hidden' name='ID' value='$updatefile' /> - <input type='hidden' name='ACTION' value='$Lang::tr{'updxlrtr remove file'}' /> - </form> - </td> - </tr> +sub printlegenddownload { + print <<END +<h5>$Lang::tr{'legend'}:</h5> +<ul> + <li id='liledbl' class='symbols' title='$Lang::tr{'updxlrtr condition download'}'>$Lang::tr{'updxlrtr condition download'}</li> + <li id='liledgy' class='symbols' title='$Lang::tr{'updxlrtr condition suspended'}'>$Lang::tr{'updxlrtr condition suspended'}</li> + <li id='lidel' class='symbols' title='$Lang::tr{'updxlrtr cancel download'}'>$Lang::tr{'updxlrtr cancel download'}</li> +</ul> END ; - } - - print "</table>\n"; - } # ------------------------------------------------------------------- -sub printlegenddownload -{ - print <<END - <tr> - <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> - <td class='base'> </td> - <td><img src='/images/updbooster/updxl-led-blue.gif' alt='$Lang::tr{'updxlrtr condition download'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition download'}</td> - <td class='base'> </td> - <td class='base'> </td> - <td><img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition suspended'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition suspended'}</td> - <td class='base'> </td> - <td class='base'> </td> - <td><img src='/images/delete.gif' alt='$Lang::tr{'updxlrtr cancel download'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr cancel download'}</td> - </tr> +sub printlegendicons { + print <<END +<h5>$Lang::tr{'legend'}:</h5> +<ul> + <li id='lirel' class='symbols' title='$Lang::tr{'updxlrtr last access'}'>$Lang::tr{'updxlrtr last access'}</li> + <li id='liglo' class='symbols' title='$Lang::tr{'updxlrtr last checkup'}'>$Lang::tr{'updxlrtr last checkup'}</li> + <li id='lidel' class='symbols' title='$Lang::tr{'updxlrtr remove file'}'>$Lang::tr{'updxlrtr remove file'}</li> +</ul> END ; } # ------------------------------------------------------------------- -sub printlegendicons -{ - print <<END - - - - <tr> - <td class='boldbase'>  <b>$Lang::tr{'legend'}:</b></td> - <td class='base'> </td> - <td><img src='/images/reload.gif' alt='$Lang::tr{'updxlrtr last access'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr last access'}</td> - <td class='base'> </td> - <td><img src='/images/updbooster/updxl-globe.gif' alt='$Lang::tr{'updxlrtr last checkup'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr last checkup'}</td> - <td class='base'> </td> - <td><img src='/images/delete.gif' alt='$Lang::tr{'updxlrtr remove file'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr remove file'}</td> - <td class='base'> </td> - <td class='base'> </td> - <td class='base'> </td> - </tr> +sub printlegendstatus { + print <<END +<h5>$Lang::tr{'status'}:</h5> +<ul> + <li id='liledgr' class='symbols' title='$Lang::tr{'updxlrtr condition ok'}'>$Lang::tr{'updxlrtr condition ok'}</li> + <li id='liledye' class='symbols' title='$Lang::tr{'updxlrtr condition nosource'}'>$Lang::tr{'updxlrtr condition nosource'}</li> + <li id='liledrd' class='symbols' title='$Lang::tr{'updxlrtr condition outdated'}'>$Lang::tr{'updxlrtr condition outdated'}</li> + <li id='liledbl' class='symbols' title='$Lang::tr{'updxlrtr condition download'}'>$Lang::tr{'updxlrtr condition download'}</li> + <li id='liledgy' class='symbols' title='$Lang::tr{'updxlrtr condition unknown'}'>$Lang::tr{'updxlrtr condition unknown'}</li> +</ul> END ; } # ------------------------------------------------------------------- -sub printlegendstatus -{ - print <<END - <tr> - <td class='base'>  $Lang::tr{'status'}:</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-led-green.gif' alt='$Lang::tr{'updxlrtr condition ok'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition ok'}</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-led-yellow.gif' alt='$Lang::tr{'updxlrtr condition nosource'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition nosource'}</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-led-red.gif' alt='$Lang::tr{'updxlrtr condition outdated'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition outdated'}</td> - <td class='base'> </td> - <td class='base'> </td> - - <td class='base'> </td> - </tr> - <tr> - <td class='base'> </td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-led-blue.gif' alt='$Lang::tr{'updxlrtr condition download'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition download'}</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-led-gray.gif' alt='$Lang::tr{'updxlrtr condition unknown'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr condition unknown'}</td> - <td class='base'> </td> - <td class='base'> </td> - <td class='base'> </td> - <td class='base'> </td> - <td class='base'> </td> - - <td class='base'> </td> - </tr> +sub printlegendsource { + print <<END +<h5>$Lang::tr{'updxlrtr sources'}:</h5> +<ul> END ; + foreach my $name (sort keys %vendimg) { + if ($name =~ /^unknown$/i) { + print "\t<li class='vendimg' style='background-image: url($vendimg{$name})' title='". ucfirst $Lang::tr{$name} ."'>". ucfirst $Lang::tr{$name} ."</li>\n"; + } else { + print "\t<li class='vendimg' style='background-image: url($vendimg{$name})' title='". ucfirst $name ."'>". ucfirst $name ."</li>\n"; + } + } + print "</ul>\n"; } # ------------------------------------------------------------------- +# 2012-12-18: +# Seaching updbooster-image dir for all available images of format "updxl-src-<vendor>.gif" +# Build a hash in format '<vendor(name)>' -> '/images/updbooster/updxl-src-<vendor>.gif' + +sub initvendimg { + if (opendir(DIR, "$webhome$webimgdir")) { + my @files = grep { /updxl-src-/ } readdir(DIR); + my @vendor = (); + closedir(DIR); + foreach (@files) { + @vendor = split (/[.-]/, $_); + $vendimg{$vendor[2]} = "$webimgdir/$_"; + } + } + else { + die "updxlrtr: Can't access \"$webhome$webimgdir\". Error was: $!\n"; + } +} +# ------------------------------------------------------------------- -sub printlegendsource -{ - print <<END - <tr> - - - - <td class='base'>  $Lang::tr{'updxlrtr source'}:</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-adobe.gif' alt='Adobe' /></td> - <td class='base'>Adobe</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-apple.gif' alt='Apple' /></td> - <td class='base'>Apple</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-avast.gif' alt='Avast' /></td> - <td class='base'>Avast</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-linux.gif' alt='Linux' /></td> - <td class='base'>Linux</td> - </tr> - <tr> - <td colspan='13'></td> - </tr> +sub printtbldiskusage { + my $tabletitle = shift; + my $repos_ref=shift; + print <<END +<table id='diskusage'> +<caption>$tabletitle</caption> +<thead> <tr> - <td class='base'> </td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-windows.gif' alt='Microsoft' /></td> - <td class='base'>Microsoft</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-symantec.gif' alt='Symantec' /></td> - <td class='base'>Symantec</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-trendmicro.gif' alt='Trend Micro' /></td> - <td class='base'>Trend Micro</td> - <td class='base'> </td> - <td align='center'><img src='/images/IPFire.png' width='18' height='18' alt='IPFire' /></td> - <td class='base'>IPFire</td> + <th>$Lang::tr{'updxlrtr cache dir'}</th> + <th>$Lang::tr{'size'}</th> + <th>$Lang::tr{'updxlrtr total used'}</th> + <th>$Lang::tr{'updxlrtr used by'}<br />[$repository]</th> + <th>$Lang::tr{'free'}</th> + <th>$Lang::tr{'percentage'}</th> </tr> +</thead> +END +; + open(DF,"/bin/df -h $repository|"); + @dfdata = <DF>; + $dudata = `/usr/bin/du -hs $repository`; + close DF; + shift(@dfdata); + chomp(@dfdata); + chomp($dudata); + $dfstr = join(' ',@dfdata); + my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr); + my ($duused,$tmp) = split(' ',$dudata); + print <<END +<tbody> <tr> - <td class='base'> </td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-avira.gif' alt='Avira' /></td> - <td class='base'>Avira</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-avg.gif' alt='AVG' /></td> - <td class='base'>AVG</td> - <td class='base'> </td> - <td align='center'><img src='/images/updbooster/updxl-src-unknown.gif' alt='$Lang::tr{'updxlrtr other'}' /></td> - <td class='base'>$Lang::tr{'updxlrtr other'}</td> - <td class='base'> </td> - <td align='center'></td> - <td class='base'> </td> + <td>[$repository]</td> + <td>$size</td> + <td><span id="used">$used</span></td> + <td><span id="duused">$duused</span></td> + <td><span id="free">$free</span></td> + <td> +END +; + &percentbar(&cpof($duused,$size),&cpof($used,$size)); + print <<END + </td> </tr> - +</tbody> +</table> END ; +} +# ------------------------------------------------------------------- +# Initialize Cache-Settings Form +# ------------------------------------------------------------------- + +sub initfrmsettings { + $checked{'ENABLE_LOG'}{'off'} = ''; + $checked{'ENABLE_LOG'}{'on'} = ''; + $checked{'ENABLE_LOG'}{$xlratorsettings{'ENABLE_LOG'}} = "checked='checked'"; + $checked{'PASSIVE_MODE'}{'off'} = ''; + $checked{'PASSIVE_MODE'}{'on'} = ''; + $checked{'PASSIVE_MODE'}{$xlratorsettings{'PASSIVE_MODE'}} = "checked='checked'"; + $checked{'LOW_DOWNLOAD_PRIORITY'}{'off'} = ''; + $checked{'LOW_DOWNLOAD_PRIORITY'}{'on'} = ''; + $checked{'LOW_DOWNLOAD_PRIORITY'}{$xlratorsettings{'LOW_DOWNLOAD_PRIORITY'}} = "checked='checked'"; + $checked{'ENABLE_AUTOCHECK'}{'off'} = ''; + $checked{'ENABLE_AUTOCHECK'}{'on'} = ''; + $checked{'ENABLE_AUTOCHECK'}{$xlratorsettings{'ENABLE_AUTOCHECK'}} = "checked='checked'"; + $checked{'FULL_AUTOSYNC'}{'off'} = ''; + $checked{'FULL_AUTOSYNC'}{'on'} = ''; + $checked{'FULL_AUTOSYNC'}{$xlratorsettings{'FULL_AUTOSYNC'}} = "checked='checked'"; + $selected{'VIEW_SETTING'}{'overview'} = ''; + $selected{'VIEW_SETTING'}{'statistics'} = ''; + $selected{'VIEW_SETTING'}{'maintenance'} = ''; + $selected{'VIEW_SETTING'}{'settings'} = ''; + $selected{'VIEW_SETTING'}{$xlratorsettings{'VIEW_SETTING'}} = "checked='checked'"; + $selected{'AUTOCHECK_SCHEDULE'}{'daily'} = ''; + $selected{'AUTOCHECK_SCHEDULE'}{'weekly'} = ''; + $selected{'AUTOCHECK_SCHEDULE'}{'monthly'} = ''; + $selected{'AUTOCHECK_SCHEDULE'}{$xlratorsettings{'AUTOCHECK_SCHEDULE'}} = "selected='selected'"; } # ------------------------------------------------------------------- +# Print Cache-Settings Form +# ------------------------------------------------------------------- -sub printlegendspacer -{ - print <<END - <tr> - <td colspan='13'> <br></td> - </tr> +sub printfrmsettings { + print <<END +<form id='frmsettings' method='post' action='$ENV{'SCRIPT_NAME'}' enctype='multipart/form-data'> + <fieldset> + <legend>$Lang::tr{'updxlrtr standard view'}</legend> + <input id='radio01' type='radio' name='VIEW_SETTING' value='overview' $selected{'VIEW_SETTING'}{'overview'} /> + <label for='radio01'>$Lang::tr{'updxlrtr overview'}</label> + <input id='radio02' type='radio' name='VIEW_SETTING' value='statistics' $selected{'VIEW_SETTING'}{'statistics'} /> + <label for='radio02'>$Lang::tr{'updxlrtr statistics'}</label> + <input id='radio03' type='radio' name='VIEW_SETTING' value='maintenance' $selected{'VIEW_SETTING'}{'maintenance'} /> + <label for='radio03'>$Lang::tr{'updxlrtr maintenance'}</label> + <input id='radio04' type='radio' name='VIEW_SETTING' value='settings' $selected{'VIEW_SETTING'}{'settings'} /> + <label for='radio04'>$Lang::tr{'updxlrtr settings'}</label> + </fieldset> + <fieldset> + <legend>$Lang::tr{'updxlrtr common settings'}</legend> + <input id='check01' type='checkbox' name='ENABLE_LOG' $checked{'ENABLE_LOG'}{'on'} /> + <label for='check01'>$Lang::tr{'updxlrtr enable log'}</label> + <input id='check02' type='checkbox' name='PASSIVE_MODE' $checked{'PASSIVE_MODE'}{'on'} /> + <label for='check02'>$Lang::tr{'updxlrtr passive mode'}</label> + <label for='text01'>$Lang::tr{'updxlrtr max disk usage'} (<output id='duval'>$xlratorsettings{'MAX_DISK_USAGE'}</output>%):</label> + <input id='text01' type='range' name='MAX_DISK_USAGE' min='0' max='100' step='1' onchange='duval.value=value' value='$xlratorsettings{'MAX_DISK_USAGE'}' size='3' maxlength='4'/> + </fieldset> + <fieldset> + <legend>$Lang::tr{'updxlrtr performance options'}</legend> + <input id='check04' type='checkbox' name='LOW_DOWNLOAD_PRIORITY' $checked{'LOW_DOWNLOAD_PRIORITY'}{'on'} /> + <label for='check04'>$Lang::tr{'updxlrtr low download priority'}</label> + <label for='text02' >$Lang::tr{'updxlrtr max download rate'}:</label> + <input id='text02' type='number' name='MAX_DOWNLOAD_RATE' title='$Lang::tr{'updxlrtr notice dlrate'}' min='0' max='1000000' step='16' value='$xlratorsettings{'MAX_DOWNLOAD_RATE'}' size='5' /> + </fieldset> + <fieldset> + <legend>$Lang::tr{'updxlrtr source checkup'}</legend> + <input id='check06' type='checkbox' name='ENABLE_AUTOCHECK' $checked{'ENABLE_AUTOCHECK'}{'on'} /> + <label for='check06'>$Lang::tr{'updxlrtr enable autocheck'}</label> + <label for='select01'>$Lang::tr{'updxlrtr source checkup schedule'}:</label> + <select id='select01' name='AUTOCHECK_SCHEDULE'> + <option value='daily' $selected{'AUTOCHECK_SCHEDULE'}{'daily'}>$Lang::tr{'updxlrtr daily'}</option> + <option value='weekly' $selected{'AUTOCHECK_SCHEDULE'}{'weekly'}>$Lang::tr{'updxlrtr weekly'}</option> + <option value='monthly' $selected{'AUTOCHECK_SCHEDULE'}{'monthly'}>$Lang::tr{'updxlrtr monthly'}</option> + </select> + <br /> + <input id='check07' type='checkbox' name='FULL_AUTOSYNC' $checked{'FULL_AUTOSYNC'}{'on'} /> + <label for='check07'>$Lang::tr{'updxlrtr full autosync'}</label> + </fieldset> + <fieldset style='border:0'> + <input type='submit' name='ACTION' value='$Lang::tr{'save'}' /> + <input type='submit' name='ACTION' value='$Lang::tr{'updxlrtr save and restart'}' /> + </fieldset> +</form> END ; } # ------------------------------------------------------------------- +# chksettings([save|restart]) - Check settings and/or restart proxy +# ------------------------------------------------------------------- -sub savesettings -{ - - if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'daily')) - { - system('/usr/local/bin/updxlratorctrl cron daily >/dev/null 2>&1'); - } - if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'weekly')) - { - system('/usr/local/bin/updxlratorctrl cron weekly >/dev/null 2>&1'); - } - if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'monthly')) - { - system('/usr/local/bin/updxlratorctrl cron monthly >/dev/null 2>&1'); - } +sub chksettings { + my $param = shift; + my $error_ref = shift; + if ( $param =~ /save/i ) { + if (!($xlratorsettings{'MAX_DISK_USAGE'} =~ /^\d+$/) + || ($xlratorsettings{'MAX_DISK_USAGE'} < 1) + || ($xlratorsettings{'MAX_DISK_USAGE'} > 100)) { + push(@$error_ref, $Lang::tr{'updxlrtr invalid disk usage'}); + } + if (($xlratorsettings{'MAX_DOWNLOAD_RATE'} ne '') && ((!($xlratorsettings{'MAX_DOWNLOAD_RATE'} =~ /^\d+$/)) + || ($xlratorsettings{'MAX_DOWNLOAD_RATE'} < 1))) { + push(@$error_ref, $Lang::tr{'updxlrtr invalid download rate'}); + } + unless (@$error_ref >= 1) { &savesettings; } + } + if ($param =~ /restart/i ) { + if ((!(-e "${General::swroot}/proxy/enable")) && (!(-e "${General::swroot}/proxy/enable_blue"))) { + push(@$error_ref, $Lang::tr{'updxlrtr web proxy service required'}); + } + if ($proxysettings{'ENABLE_UPDXLRATOR'} ne 'on') { + push(@$error_ref, $Lang::tr{'updxlrtr not enabled'}); + } + unless (@$error_ref >= 1) { system('/usr/local/bin/squidctrl restart > /dev/null 2>&1'); } + } + unless (@$error_ref == 0) { &initfrmsettings; } +} - # don't save those variable to the settings file, - # but we wan't to have them in the hash again after saving to file - my $obsolete = $xlratorsettings{'REMOVE_OBSOLETE'}; - my $nosource = $xlratorsettings{'REMOVE_NOSOURCE'}; - my $outdated = $xlratorsettings{'REMOVE_OUTDATED'}; - my $gui = $xlratorsettings{'EXTENDED_GUI'}; +# ------------------------------------------------------------------- - delete($xlratorsettings{'REMOVE_OBSOLETE'}); - delete($xlratorsettings{'REMOVE_NOSOURCE'}); - delete($xlratorsettings{'REMOVE_OUTDATED'}); +sub savesettings { + if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'daily')) + { system('/usr/local/bin/updxlratorctrl cron daily >/dev/null 2>&1'); } + if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'weekly')) + { system('/usr/local/bin/updxlratorctrl cron weekly >/dev/null 2>&1'); } + if (($xlratorsettings{'ENABLE_AUTOCHECK'} eq 'on') && ($xlratorsettings{'AUTOCHECK_SCHEDULE'} eq 'monthly')) + { system('/usr/local/bin/updxlratorctrl cron monthly >/dev/null 2>&1'); } + + # don't save those variable to the settings file, + # but we wan't to have them in the hash again after saving to file + my $obsolete = $xlratorsettings{'REMOVE_UNKNOWN'}; + my $nosource = $xlratorsettings{'REMOVE_NOSOURCE'}; + my $outdated = $xlratorsettings{'REMOVE_OUTDATED'}; + my $todelete = $xlratorsettings{'REMOVE_TODELETE'}; + my $gui = $xlratorsettings{'EXTENDED_GUI'}; + my $show = $xlratorsettings{'show'}; + + delete($xlratorsettings{'REMOVE_UNKNOWN'}); + delete($xlratorsettings{'REMOVE_NOSOURCE'}); + delete($xlratorsettings{'REMOVE_OUTDATED'}); + delete($xlratorsettings{'REMOVE_TODELETE'}); + delete($xlratorsettings{'TODELETE'}); + delete($xlratorsettings{'EXTENDED_GUI'}); + delete($xlratorsettings{'show'}); + + &General::writehash("${General::swroot}/updatexlrator/settings", \%xlratorsettings); + + # put temp variables back into the hash + $xlratorsettings{'REMOVE_UNKNOWN'} = $obsolete; + $xlratorsettings{'REMOVE_NOSOURCE'} = $nosource; + $xlratorsettings{'REMOVE_OUTDATED'} = $outdated; + $xlratorsettings{'REMOVE_TODELETE'} = $todelete; + $xlratorsettings{'EXTENDED_GUI'} = $gui; + $xlratorsettings{'show'} = $show; +} - delete($xlratorsettings{'EXTENDED_GUI'}); - &General::writehash("${General::swroot}/updatexlrator/settings", \%xlratorsettings); +# ------------------------------------------------------------------- +# percentbar(number[, number2, number(n)) - need absolute values +# - print relative bars ([##1][##2(number2-number1)][#n-#2-#1]...) +# ------------------------------------------------------------------- - # put temp variables back into the hash - $xlratorsettings{'REMOVE_OBSOLETE'} = $obsolete; - $xlratorsettings{'REMOVE_NOSOURCE'} = $nosource; - $xlratorsettings{'REMOVE_OUTDATED'} = $outdated; - $xlratorsettings{'EXTENDED_GUI'} = $gui; +sub percentbar { + $counts = '0'; + my $width = '-0'; # width of value bar + my $widthmax = '-0'; # overall width + my $tmp = ''; + my @tmplst; + my $sf = 1; # scale-factor + print "<div id='pbar'>"; + @_ = sort{ $a <=> $b } @_; + for (@_) { + unless ($widthmax <= 100.0) { next; }; + $width = $_-($widthmax); + $widthmax = $_; + if (($width > 0) && ($width < 1)) { $width=1; } + $tmp .= "<div id='bar$counts' style='width:".(sprintf("%0.2f",$width))*$sf."%'></div>\n"; + $counts = $counts + 1; + } + $widthmax = sprintf("%0d",$widthmax); + if ( $widthmax < 79) { $tmp .= "<span id='percent'>$widthmax%</span>\n"; } + else { $tmp .= "<span id='max'>$widthmax%</span>\n"; } + + print "\t\t$tmp</div>\n"; + return; } # ------------------------------------------------------------------- +# Format given filesize in Bits +# into values of more human readable format like kB, MB, GB, etc +# take filesize in Bit, returns formatted string in example "xx.xx kB" +# No roundings are happened, +# so counting with the output may result in wrong values +# ------------------------------------------------------------------- -sub percentbar -{ - my $percent = $_[0]; - my $fg = '#a0a0a0'; - my $bg = '#e2e2e2'; - - if ($percent =~ m/^(\d+)%$/ ) - { - print <<END -<table width='100' border='1' cellspacing='0' cellpadding='0' style='border-width:1px;border-style:solid;border-color:$fg;width:100px;height:10px;'> -<tr> -END -; - if ($percent eq "100%") { - print "<td width='100%' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'>" - } elsif ($percent eq "0%") { - print "<td width='100%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>" - } else { - print "<td width='$percent' bgcolor='$fg' style='background-color:$fg;border-style:solid;border-width:1px;border-color:$bg'></td><td width='" . (100-$1) . "%' bgcolor='$bg' style='background-color:$bg;border-style:solid;border-width:1px;border-color:$bg'>" - } - print <<END -<img src='/images/null.gif' width='1' height='1' alt='' /></td></tr></table> -END -; - } +sub format_size{ + my $fsize = shift; + + if ($fsize > 2**60) # EB: 1024 PB + { return sprintf("%.2f EB", $fsize / 2**40); } + elsif ($fsize > 2**50) # PB: 1024 TB + { return sprintf("%.2f PB", $fsize / 2**40); } + elsif ($fsize > 2**40) # TB: 1024 GB + { return sprintf("%.2f TB", $fsize / 2**40); } + elsif ($fsize > 2**30) # GB: 1024 MB + { return sprintf("%.2f GB", $fsize / 2**30); } + elsif ($fsize > 2**20) # MB: 1024 kB + { return sprintf("%.2f MB", $fsize / 2**20); } + elsif ($fsize > 2**10) # kB: 1024 B + { return sprintf("%.2f KB", $fsize / 2**10); } + else # Bytes + { return "$fsize B"; } } # ------------------------------------------------------------------- sub getmtime { - my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat($_[0]); - - return $mtime; + my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,$blksize,$blocks) = stat($_[0]); + return $mtime; } # ------------------------------------------------------------------- sub getPID { - my $pid=''; - my @psdata=`ps ax --no-heading`; - - foreach (@psdata) - { - if (/$_[0]/) { ($pid)=/^\s*(\d+)/; } - } + my $pid=''; + my @psdata=`ps ax --no-heading`; - return $pid; + foreach (@psdata) + { if (/$_[0]/) { ($pid)=/^\s*(\d+)/; } } + return $pid; } # ------------------------------------------------------------------- +# Calculating Percentage of 2 Values (for percentbar) +# ------------------------------------------------------------------- + +sub cpof { + my $Value; + my $MValue; + my $result; + my $Vsize; + my $MVsize; + my $corf; + my $callme = "cpof$value[B|K|M|G|T|P|E], maxvalue[B|K|M|G|T|P|E]$"; + $Value = shift; + $MValue = shift; + my %cf = ('B'=>0,'K'=>1,'M'=>2,'G'=>3,'T'=>4,'P'=>5,'E'=>6); + unless ('$Value' ne '') { die "updxlrtr sub cpof: value not given: $!\n$callme"; } + unless ('$MValue' ne '') { die "updxlrtr sub cpof: maxvalue not given: $!\n$callme"; } + + unless ($Value =~ /\d+(B|K|M|G|T|P|E)/) { die "updxlrtr: cpof() - value has no size!\nPossible Values: 'number[B|K|M|G|T|P|E]'\n"; } + else { $Vsize = chop $Value; } + unless ($MValue =~ /\d+(B|K|M|G|T|P|E)/) { die "updxlrtr: cpof(): maxvalue has no size!\nPossible Values: 'number[B|K|M|G|T|P|E]'\n"; } + else { $MVsize = chop $MValue; } + + if ('$Vsize' eq '$MVsize') { $result = (100/$MValue)*$Value; } + else { + if ($Value =~ /^0\.d+/) { $corf = 1; } + else { $corf = '0'; } + } + my $tmp = (100/($MValue*(2**(10*$cf{$MVsize}))))*($Value*(2**(10*($cf{$Vsize}-$corf)))); + $tmp = sprintf ("%.2f", $tmp); + return $tmp; +} diff --git a/html/html/images/updbooster/updxl-globe.gif b/html/html/images/updbooster/updxl-globe.gif deleted file mode 100644 index 54e49fc..0000000 Binary files a/html/html/images/updbooster/updxl-globe.gif and /dev/null differ diff --git a/html/html/images/updbooster/updxl-gr.gif b/html/html/images/updbooster/updxl-gr.gif deleted file mode 100644 index f8b8ec0..0000000 Binary files a/html/html/images/updbooster/updxl-gr.gif and /dev/null differ diff --git a/html/html/images/updbooster/updxl-led-blue.gif b/html/html/images/updbooster/updxl-led-blue.gif deleted file mode 100644 index 80424c9..0000000 Binary files a/html/html/images/updbooster/updxl-led-blue.gif and /dev/null differ diff --git a/html/html/images/updbooster/updxl-led-gray.gif b/html/html/images/updbooster/updxl-led-gray.gif deleted file mode 100644 index ccac733..0000000 Binary files a/html/html/images/updbooster/updxl-led-gray.gif and /dev/null differ diff --git a/html/html/images/updbooster/updxl-led-green.gif b/html/html/images/updbooster/updxl-led-green.gif deleted file mode 100644 index f8b8ec0..0000000 Binary files a/html/html/images/updbooster/updxl-led-green.gif and /dev/null differ diff --git a/html/html/images/updbooster/updxl-led-red.gif b/html/html/images/updbooster/updxl-led-red.gif deleted file mode 100644 index 4bce21f..0000000 Binary files a/html/html/images/updbooster/updxl-led-red.gif and /dev/null differ diff --git a/html/html/images/updbooster/updxl-led-yellow.gif b/html/html/images/updbooster/updxl-led-yellow.gif deleted file mode 100644 index f7e4f9a..0000000 Binary files a/html/html/images/updbooster/updxl-led-yellow.gif and /dev/null differ diff --git a/html/html/images/updbooster/updxl-rd.gif b/html/html/images/updbooster/updxl-rd.gif deleted file mode 100644 index 4bce21f..0000000 Binary files a/html/html/images/updbooster/updxl-rd.gif and /dev/null differ diff --git a/html/html/images/updbooster/updxl-src-adobe.gif b/html/html/images/updbooster/updxl-src-adobe.gif index ebcd551..1152105 100644 Binary files a/html/html/images/updbooster/updxl-src-adobe.gif and b/html/html/images/updbooster/updxl-src-adobe.gif differ diff --git a/html/html/images/updbooster/updxl-src-ageofconan.gif b/html/html/images/updbooster/updxl-src-ageofconan.gif new file mode 100644 index 0000000..99b301a Binary files /dev/null and b/html/html/images/updbooster/updxl-src-ageofconan.gif differ diff --git a/html/html/images/updbooster/updxl-src-avira.gif b/html/html/images/updbooster/updxl-src-avira.gif index 1ed0d81..86e2bb7 100644 Binary files a/html/html/images/updbooster/updxl-src-avira.gif and b/html/html/images/updbooster/updxl-src-avira.gif differ diff --git a/html/html/images/updbooster/updxl-src-curse.gif b/html/html/images/updbooster/updxl-src-curse.gif new file mode 100644 index 0000000..72fab86 Binary files /dev/null and b/html/html/images/updbooster/updxl-src-curse.gif differ diff --git a/html/html/images/updbooster/updxl-src-diabloiii.gif b/html/html/images/updbooster/updxl-src-diabloiii.gif new file mode 100644 index 0000000..c4f3fdf Binary files /dev/null and b/html/html/images/updbooster/updxl-src-diabloiii.gif differ diff --git a/html/html/images/updbooster/updxl-src-eveonline.gif b/html/html/images/updbooster/updxl-src-eveonline.gif new file mode 100644 index 0000000..12f5ffa Binary files /dev/null and b/html/html/images/updbooster/updxl-src-eveonline.gif differ diff --git a/html/html/images/updbooster/updxl-src-google.gif b/html/html/images/updbooster/updxl-src-google.gif new file mode 100644 index 0000000..e62e292 Binary files /dev/null and b/html/html/images/updbooster/updxl-src-google.gif differ diff --git a/html/html/images/updbooster/updxl-src-ipfire.gif b/html/html/images/updbooster/updxl-src-ipfire.gif new file mode 100644 index 0000000..2db1276 Binary files /dev/null and b/html/html/images/updbooster/updxl-src-ipfire.gif differ diff --git a/html/html/images/updbooster/updxl-src-kaspersky.gif b/html/html/images/updbooster/updxl-src-kaspersky.gif index 687a6c3..dab09a8 100644 Binary files a/html/html/images/updbooster/updxl-src-kaspersky.gif and b/html/html/images/updbooster/updxl-src-kaspersky.gif differ diff --git a/html/html/images/updbooster/updxl-src-mozilla.gif b/html/html/images/updbooster/updxl-src-mozilla.gif new file mode 100644 index 0000000..1d1e3d0 Binary files /dev/null and b/html/html/images/updbooster/updxl-src-mozilla.gif differ diff --git a/html/html/images/updbooster/updxl-src-nvidia.gif b/html/html/images/updbooster/updxl-src-nvidia.gif new file mode 100644 index 0000000..f25c41e Binary files /dev/null and b/html/html/images/updbooster/updxl-src-nvidia.gif differ diff --git a/html/html/images/updbooster/updxl-src-opera.gif b/html/html/images/updbooster/updxl-src-opera.gif new file mode 100644 index 0000000..0cbf9b6 Binary files /dev/null and b/html/html/images/updbooster/updxl-src-opera.gif differ diff --git a/html/html/images/updbooster/updxl-src-secunia.gif b/html/html/images/updbooster/updxl-src-secunia.gif new file mode 100644 index 0000000..fc980b1 Binary files /dev/null and b/html/html/images/updbooster/updxl-src-secunia.gif differ diff --git a/html/html/images/updbooster/updxl-src-swtor.gif b/html/html/images/updbooster/updxl-src-swtor.gif new file mode 100644 index 0000000..13fe222 Binary files /dev/null and b/html/html/images/updbooster/updxl-src-swtor.gif differ diff --git a/html/html/images/updbooster/updxl-src-wot.gif b/html/html/images/updbooster/updxl-src-wot.gif new file mode 100644 index 0000000..e76f48c Binary files /dev/null and b/html/html/images/updbooster/updxl-src-wot.gif differ diff --git a/html/html/images/updbooster/updxl-src-wow.gif b/html/html/images/updbooster/updxl-src-wow.gif new file mode 100644 index 0000000..e64432e Binary files /dev/null and b/html/html/images/updbooster/updxl-src-wow.gif differ diff --git a/html/html/images/updbooster/updxl-yl.gif b/html/html/images/updbooster/updxl-yl.gif deleted file mode 100644 index f7e4f9a..0000000 Binary files a/html/html/images/updbooster/updxl-yl.gif and /dev/null differ diff --git a/html/html/themes/ipfire/images/updxl-icons.gif b/html/html/themes/ipfire/images/updxl-icons.gif new file mode 100644 index 0000000..bae5cb6 Binary files /dev/null and b/html/html/themes/ipfire/images/updxl-icons.gif differ diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 7bf2189..d4f8bf7 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -161,6 +161,7 @@ END print <<END <link rel="shortcut icon" href="/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/themes/ipfire/include/style.css" /> + $extrahead <script language="javascript" type="text/javascript"> function swapVisibility(id) { @@ -223,38 +224,36 @@ END ; } else { -print "</head><body>";} + print "</head><body>";} print <<END  <div id="header"> - - <div id="header_inner" class="fixed"> - - <div id="logo"> + <div id="header_inner" class="fixed"> + <div id="logo"> END ; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; - } else { - print "<h1><span>IPFire</span></h1><br />"; - } - print <<END - <h2>$h2</h2> - </div> - +if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { + print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; +} +else { + print "<h1><span>IPFire</span></h1><br />"; +} +print <<END + <h2>$h2</h2> + </div> END ; - &showmenu(); +&showmenu(); print <<END - </div> + </div> </div> <div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> + <div id="main_inner" class="fixed"> + <div id="primaryContent_2columns"> + <div id="columnA_2columns"> END ; } @@ -280,8 +279,7 @@ sub openpagewithoutmenu { <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> <html xmlns='http://www.w3.org/1999/xhtml'> <head> - <title>$title</title> - $extrahead + <title>$title</title> END ; if ($settings{'FX'} ne 'off') { @@ -294,6 +292,7 @@ END print <<END <link rel="shortcut icon" href="/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/include/style.css" /> + $extrahead <script language="javascript" type="text/javascript"> function swapVisibility(id) { @@ -306,26 +305,21 @@ END } } </script> - </head> <body>  - -<div id="header"> - - <div id="header_inner" class="fixed"> - - <div id="logo"> - <h1><span>IPFire</span></h1> - <h2>$h2</h2> - </div> - </div> -</div> - -<div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> + <div id="header"> + <div id="header_inner" class="fixed"> + <div id="logo"> + <h1><span>IPFire</span></h1> + <h2>$h2</h2> + </div> + </div> + </div> + <div id="main"> + <div id="main_inner" class="fixed"> + <div id="primaryContent_2columns"> + <div id="columnA_2columns"> END ; } @@ -340,39 +334,35 @@ sub closepage () { $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; print <<END - </div> - </div> - - <div id="secondaryContent_2columns"> - - <div id="columnC_2columns"> + </div> + </div> + <div id="secondaryContent_2columns"> + <div id="columnC_2columns"> END ; &showsubsection($menu); &showsubsubsection($menu); print <<END - </div> - </div> - - <br class="clear" /> - <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b>$uptime + </div> + </div> + <br class="clear" /> + <div id="footer" class="fixed"> + <b>Status:</b> $status <b>Uptime:</b>$uptime END ; if ($settings{'SPEED'} ne 'off') { print <<END - <br /> - <b>$Lang::tr{'bandwidth usage'}:</b> + <br /> + <b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> - END ; } print <<END - </div> - </div> -</div> + </div> + </div> + </div> </body> </html> END @@ -389,25 +379,25 @@ sub closebigbox sub openbox { - $width = $_[0]; - $align = $_[1]; - $caption = $_[2]; + $width = $_[0]; + $align = $_[1]; + $caption = $_[2]; - print <<END + print <<END  - <div class="post" align="$align"> + <div class="post" style="text-align:$align"> END ; - if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; } + if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; } } sub closebox { - print <<END - </div> - <br class="clear" /> -  + print <<END + </div> + <br class="clear" /> +  END ; } diff --git a/html/html/themes/ipfire/include/upxlr.css b/html/html/themes/ipfire/include/upxlr.css new file mode 100644 index 0000000..e7cc9fd --- /dev/null +++ b/html/html/themes/ipfire/include/upxlr.css @@ -0,0 +1,384 @@ +span[id^=ledgr],li#liledgr,label#lbledgr +{ + background-position:0 0; +} + +span[id^=ledbl],li#liledbl,label#lbledbl +{ + background-position:0 -20px; +} + +span[id^=ledye],li#liledye,label#lbledye +{ + background-position:0 -40px; +} + +span[id^=ledrd],li#liledrd,label#lbledrd +{ + background-position:0 -60px; +} + +span[id^=ledgy],li#liledgy,label#lbledgy +{ + background-position:0 -80px; +} + +span#rel,li#lirel +{ + background-position:0 -100px; +} + +span#glo,li#liglo +{ + background-position:0 -120px; +} + +span#del,li#lidel,label#lbdel,button[id^=del] +{ + background-position:0 -140px; +} + +span#blo,li#liblo +{ + background-position:0 -160px; +} + +#stat +{ + background-position:0 -180px; +} + +#wrench +{ + background-position:0 -200px; +} + +#set +{ + background-position:0 -220px; +} + +#oview +{ + background-position:0 -240px; +} + +.symbols +{ + background:transparent url(/themes/ipfire/images/updxl-icons.gif) no-repeat; + height:20px; + width:20px; +} + +.vendimg +{ + background-repeat:no-repeat; + height:18px; + width:18px; +} + +.noborder +{ + border:none; +} + +fieldset +{ + padding: 0 0 .5em; + margin-bottom: .5em; + border: 1px dotted #E1E1E1; + border-top: none; + border-left: none; + border-right: none; +} + +legend +{ + margin-left:0; + padding-left:0; + padding-right:.5em; + font-weight: bolder; +} + +label +{ + cursor:pointer; + padding-right:1em; +} + +label[for^=text],label[for^=select] +{ + padding-right:.2em; +} + +label.symbols +{ + display:inline-block; + min-height:20px; + padding-left:25px; + width:auto; +} + +button[id^=del] +{ + border-style:none; +} + +input:invalid +{ + border:2px solid red; +} + +input#text01 +{ + height:1em; + max-width:120px; +} + +input#text02 +{ + width:7em; +} + +input[type=submit] { + margin-right: 3em; + margin-left: 3em; +} + +output#duval +{ + display:inline-block; + min-width:2em; + text-align:right; +} + +.frmshow +{ + position:absolute; + right:0; + top:0; +} + +.frmshow fieldset +{ + display:inline-block; + position:relative; +} + +.frmshow legend +{ + display:inline-block; +} + +.frmshow legend span +{ + left:-100px; + position:absolute; + top:.2em; +} + +.frmshow button +{ + border:1px solid; + display:inline; + height:22px; + padding-left:25px; + padding-right:5px; + width:auto; + cursor: pointer; +} + +.frmshow button:disabled +{ + border:1px solid #D90000; + color:#D90000; + cursor: default; +} + +span.symbols,span.vendimg +{ + display:inline-block; +} + +caption +{ + margin-top:.5em; + font-weight:bolder; +} + +table +{ + width:100%; +} + +#diskusage td +{ + text-align:center; +} + +#summary +{ + background-color:none!important; +} + +[id^=list] thead tr th +{ + border-bottom:1px dotted #E1E1E1; +} + +th +{ + text-align:center; +} + +td,th +{ + padding:3px; +} + +tbody tr:nth-child(even) +{ + background:#D6D6D6; +} + +tbody tr:nth-child(odd) +{ + background:#F0F0F0; +} + +th span.symbols,th span.vendimg +{ + vertical-align:middle!important; +} + +th span[id^=vd].vendimg +{ + display:block; + padding-left:27px; + text-align:left!important; + width:auto; +} + +tbody tr td +{ + text-align:right; +} + +tfoot tr td +{ + border-top:1px dotted #E1E1E1; +} + +tfoot ul +{ + list-style-type:none; + margin-left:1em; + padding-left:0; +} + +li.symbols +{ + padding-left:23px; +} + +li.vendimg +{ + padding-left:25px; +} + +tfoot ul li +{ + background-repeat:no-repeat; + display:inline; + margin-bottom:.3em; + padding-right:1em; +} + +li.symbols,li.vendimg +{ + display:inline-block; + width:auto; +} + +td[id^=legend] h5 +{ + font-size:.9em; +} + +div#pbar +{ + background-color:#90EE90; + border:1px solid #a0a0a0; + height:15px; + min-width:100px; + padding-right:2px; + position:relative; + text-align:left; + width:auto; +} + +div[id^=bar] +{ + background-color:red; + border:1px solid #e2e2e2; + border-left:none; + border-right:none; + float:left; + height:13px; +} + +div#bar1 +{ + background-color:orange; +} + +div#bar2 +{ + background-color:blue; +} + +div#bar3 +{ + background-color:#FF0; +} + +span#duused +{ + color: red; + font-weight: bolder; +} + +span#free +{ + color: green; + font-weight: bolder; +} + +span#percent +{ + font-weight:bolder; + position:relative; +} + +span#max +{ + position:absolute; + right:2px; +} + +span#used +{ + color: orange; + font-weight: bolder; +} + +hr +{ + margin-bottom:1em; +} + +#errors +{ + color:#CA2F2F; + font-weight:bolder; +} \ No newline at end of file diff --git a/html/html/themes/maniac/images/Thumbs.db b/html/html/themes/maniac/images/Thumbs.db deleted file mode 100644 index 37ec790..0000000 Binary files a/html/html/themes/maniac/images/Thumbs.db and /dev/null differ diff --git a/html/html/themes/maniac/images/updxl-icons.gif b/html/html/themes/maniac/images/updxl-icons.gif new file mode 100644 index 0000000..bae5cb6 Binary files /dev/null and b/html/html/themes/maniac/images/updxl-icons.gif differ diff --git a/html/html/themes/maniac/include/functions.pl b/html/html/themes/maniac/include/functions.pl index 05c3b94..2a40be2 100644 --- a/html/html/themes/maniac/include/functions.pl +++ b/html/html/themes/maniac/include/functions.pl @@ -147,8 +147,7 @@ sub openpage { <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> <html xmlns='http://www.w3.org/1999/xhtml'> <head> - <title>$title</title> - $extrahead + <title>$title</title> END ; if ($settings{'FX'} ne 'off') { @@ -161,87 +160,84 @@ END print <<END <link rel="shortcut icon" href="/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/themes/maniac/include/style.css" /> + $extrahead <script language="javascript" type="text/javascript"> - - function swapVisibility(id) { - el = document.getElementById(id); - if(el.style.display != 'block') { - el.style.display = 'block' - } - else { - el.style.display = 'none' - } + function swapVisibility(id) { + el = document.getElementById(id); + if(el.style.display != 'block') { + el.style.display = 'block' + } + else { + el.style.display = 'none' + } } - </script> + </script> END ; if ($settings{'SPEED'} ne 'off') { print <<END - <script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script> - <script type="text/javascript"> - var t_current; - var t_last; - var rxb_current; - var rxb_last; - var txb_current; - var txb_last; - function refreshInetInfo() { - \$.ajax({ - url: '/cgi-bin/speed.cgi', - success: function(xml){ - t_current = new Date(); - var t_diff = t_current - t_last; - t_last = t_current; - - rxb_current = \$("rxb",xml).text(); - var rxb_diff = rxb_current - rxb_last; - rxb_last = rxb_current; - - var rx_kbs = rxb_diff/t_diff; - rx_kbs = Math.round(rx_kbs*10)/10; - - txb_current = \$("txb",xml).text(); - var txb_diff = txb_current - txb_last; - txb_last = txb_current; - - var tx_kbs = txb_diff/t_diff; - tx_kbs = Math.round(tx_kbs*10)/10; - - \$("#rx_kbs").text(rx_kbs + ' kb/s'); - \$("#tx_kbs").text(tx_kbs + ' kb/s'); - } - }); - window.setTimeout("refreshInetInfo()", 3000); - } - \$(document).ready(function(){ - refreshInetInfo(); + <script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script> + <script type="text/javascript"> + var t_current; + var t_last; + var rxb_current; + var rxb_last; + var txb_current; + var txb_last; + function refreshInetInfo() { + \$.ajax({ + url: '/cgi-bin/speed.cgi', + success: function(xml){ + t_current = new Date(); + var t_diff = t_current - t_last; + t_last = t_current; + + rxb_current = \$("rxb",xml).text(); + var rxb_diff = rxb_current - rxb_last; + rxb_last = rxb_current; + + var rx_kbs = rxb_diff/t_diff; + rx_kbs = Math.round(rx_kbs*10)/10; + + txb_current = \$("txb",xml).text(); + var txb_diff = txb_current - txb_last; + txb_last = txb_current; + + var tx_kbs = txb_diff/t_diff; + tx_kbs = Math.round(tx_kbs*10)/10; + + \$("#rx_kbs").text(rx_kbs + ' kb/s'); + \$("#tx_kbs").text(tx_kbs + ' kb/s'); + } }); - </script> - </head> - <body> + window.setTimeout("refreshInetInfo()", 3000); + } + \$(document).ready(function(){ + refreshInetInfo(); + }); + </script> +</head> +<body> END ; } else { -print "</head>\n<body>";} + print "</head>\n<body>";} print <<END  - -<div id="header"> - - <div id="header_inner" class="fixed"> - - <div id="logo"> + <div id="header"> + <div id="header_inner" class="fixed"> + <div id="logo"> END ; - if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { - print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; - } else { - print "<h1><span>-= IPFire =-</span></h1><br />"; - } - print <<END - <h2>+ $h2 +</h2> - </div> +if ($settings{'WINDOWWITHHOSTNAME'} eq 'on') { + print "<h1><span>$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}</span></h1><br />"; +} else { + print "<h1><span>-= IPFire =-</span></h1><br />"; +} +print <<END + <h2>+ $h2 +</h2> + </div> END ; @@ -281,7 +277,6 @@ sub openpagewithoutmenu { <html xmlns='http://www.w3.org/1999/xhtml'> <head> <title>$title</title> - $extrahead END ; if ($settings{'FX'} ne 'off') { @@ -294,38 +289,34 @@ END print <<END <link rel="shortcut icon" href="/favicon.ico" /> <link rel="stylesheet" type="text/css" href="/include/style.css" /> + $extrahead <script language="javascript" type="text/javascript"> - - function swapVisibility(id) { - el = document.getElementById(id); - if(el.style.display != 'block') { - el.style.display = 'block' - } - else { - el.style.display = 'none' - } - } + function swapVisibility(id) { + el = document.getElementById(id); + if(el.style.display != 'block') { + el.style.display = 'block' + } + else { + el.style.display = 'none' + } + } </script> - </head> - <body> +</head> +<body>  - -<div id="header"> - - <div id="header_inner" class="fixed"> - - <div id="logo"> - <h1><span>-= IPFire =-</span></h1> - <h2>+ $h2 +</h2> - </div> + <div id="header"> + <div id="header_inner" class="fixed"> + <div id="logo"> + <h1><span>-= IPFire =-</span></h1> + <h2>+ $h2 +</h2> + </div> + </div> </div> -</div> - -<div id="main"> - <div id="main_inner" class="fixed"> - <div id="primaryContent_2columns"> - <div id="columnA_2columns"> + <div id="main"> + <div id="main_inner" class="fixed"> + <div id="primaryContent_2columns"> + <div id="columnA_2columns"> END ; } @@ -340,39 +331,35 @@ sub closepage () { $uptime =~ s/load average/$Lang::tr{'uptime load average'}/; print <<END + </div> </div> - </div> - - <div id="secondaryContent_2columns"> - - <div id="columnC_2columns"> + <div id="secondaryContent_2columns"> + <div id="columnC_2columns"> END ; &showsubsection($menu); &showsubsubsection($menu); print <<END + </div> </div> - </div> - - <br class="clear" /> - <div id="footer" class="fixed"> - <b>Status:</b> $status <b>Uptime:</b>$uptime + <br class="clear" /> + <div id="footer" class="fixed"> + <b>Status:</b> $status <b>Uptime:</b>$uptime END ; if ($settings{'SPEED'} ne 'off') { print <<END - <br /> - <b>$Lang::tr{'bandwidth usage'}:</b> + <br /> + <b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}: <span id="rx_kbs"></span> $Lang::tr{'outgoing'}: <span id="tx_kbs"></span> - END ; } print <<END - </div> - </div> -</div> + </div> + </div> + </div> </body> </html> END @@ -395,10 +382,9 @@ sub openbox print <<END  - <div class="post" align="$align"> + <div class="post" style="text-align:$align"> END ; - if ($caption) { print "<h3>$caption</h3>\n"; } else { print " "; } } diff --git a/html/html/themes/maniac/include/upxlr.css b/html/html/themes/maniac/include/upxlr.css new file mode 100644 index 0000000..a2b2c05 --- /dev/null +++ b/html/html/themes/maniac/include/upxlr.css @@ -0,0 +1,390 @@ +span[id^=ledgr],li#liledgr,label#lbledgr +{ + background-position:0 0; +} + +span[id^=ledbl],li#liledbl,label#lbledbl +{ + background-position:0 -20px; +} + +span[id^=ledye],li#liledye,label#lbledye +{ + background-position:0 -40px; +} + +span[id^=ledrd],li#liledrd,label#lbledrd +{ + background-position:0 -60px; +} + +span[id^=ledgy],li#liledgy,label#lbledgy +{ + background-position:0 -80px; +} + +span#rel,li#lirel +{ + background-position:0 -100px; +} + +span#glo,li#liglo +{ + background-position:0 -120px; +} + +span#del,li#lidel,label#lbdel,button[id^=del] +{ + background-position:0 -140px; +} + +span#blo,li#liblo +{ + background-position:0 -160px; +} + +#stat +{ + background-position:0 -180px; +} + +#wrench +{ + background-position:0 -200px; +} + +#set +{ + background-position:0 -220px; +} + +#oview +{ + background-position:0 -240px; +} + +.symbols +{ + background:transparent url(/themes/maniac/images/updxl-icons.gif) no-repeat; + height:20px; + width:20px; +} + +.vendimg +{ + background-repeat:no-repeat; + height:18px; + width:18px; +} + +.noborder +{ + border:none; +} + +fieldset +{ + padding: 0 0 .5em; + margin-bottom: .5em; + border: 1px dotted #E1E1E1; + border-top: none; + border-left: none; + border-right: none; +} + +legend +{ + margin-left:0; + padding-left:0; + padding-right:.5em; + font-weight: bolder; +} + +label +{ + cursor:pointer; + padding-right:1em; +} + +label[for^=text],label[for^=select] +{ + padding-right:.2em; +} + +label.symbols +{ + display:inline-block; + min-height:20px; + padding-left:25px; + width:auto; +} + +button[id^=del] +{ + border-style:none; +} + +input:invalid +{ + border:2px solid red; +} + +input#text01 +{ + height:1em; + max-width:120px; +} + +input#text02 +{ + width:7em; +} + +input[type=submit] +{ + border:1px solid #2941BC; + margin-right: 3em; + margin-left: 3em; +} + +output#duval +{ + display:inline-block; + min-width:2em; + text-align:right; +} + +.frmshow +{ + position:absolute; + right:0; + top:0; +} + +.frmshow fieldset +{ + display:inline-block; + position:relative; +} + +.frmshow legend +{ + display:inline-block; +} + +.frmshow legend span +{ + left:-100px; + position:absolute; + top:.2em; +} + +.frmshow button +{ + background-color:#CA2F2F; + border:1px solid #2941BC; + color:#000; + display:inline; + height:22px; + padding-left:25px; + padding-right:5px; + width:auto; + cursor: pointer; +} + +.frmshow button:disabled +{ + border:1px solid #fff; + color:#F1F1F1; + cursor: default; +} + +span.symbols,span.vendimg +{ + display:inline-block; +} + +caption +{ + margin-top:.5em; + font-weight:bolder; +} + +table +{ + width:100%; +} + +#diskusage td +{ + text-align:center; +} + +#summary +{ + background-color:none!important; +} + +[id^=list] thead tr th +{ + border-bottom:1px dotted #fff; +} + +th +{ + text-align:center; +} + +td,th +{ + padding:3px; +} + +tbody tr:nth-child(even) +{ + background:#1C1C1C; +} + +tbody tr:nth-child(odd) +{ + background:#4F4F4F; +} + +th span.symbols,th span.vendimg +{ + vertical-align:middle!important; +} + +th span[id^=vd].vendimg +{ + display:block; + padding-left:27px; + text-align:left!important; + width:auto; +} + +tbody tr td +{ + text-align:right; +} + +tfoot tr td +{ + border-top:1px dotted #E1E1E1; +} + +tfoot ul +{ + list-style-type:none; + margin-left:1em; + padding-left:0; +} + +li.symbols +{ + padding-left:23px; +} + +li.vendimg +{ + padding-left:25px; +} + +tfoot ul li +{ + background-repeat:no-repeat; + display:inline; + margin-bottom:.3em; + padding-right:1em; +} + +li.symbols,li.vendimg +{ + display:inline-block; + width:auto; +} + +td[id^=legend] h5 +{ + font-size:.9em; +} + +div#pbar +{ + background-color:#90EE90; + border:1px solid #a0a0a0; + color:#000; + font-weight:bolder; + height:15px; + min-width:100px; + padding-right:2px; + position:relative; + text-align:left; + width:auto; +} + +div[id^=bar] +{ + background-color:red; + border:1px solid #e2e2e2; + border-left:none; + border-right:none; + float:left; + height:13px; +} + +div#bar1 +{ + background-color:orange; +} + +div#bar2 +{ + background-color:blue; +} + +div#bar3 +{ + background-color:#FF0; +} + +span#duused +{ + color: red; + font-weight: bolder; +} + +span#free +{ + color: green; + font-weight: bolder; +} + +span#percent +{ + font-weight:bolder; + position:relative; +} + +span#max +{ + position:absolute; + right:2px; +} + +span#used +{ + color: orange; + font-weight: bolder; +} + +hr +{ + margin-bottom:1em; +} + +#errors +{ + color:#CA2F2F; + font-weight:bolder; +} \ No newline at end of file diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index aaf4d27..00053b0 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1851,7 +1851,7 @@ 'updxlrtr all files' => 'alle Dateien ...', 'updxlrtr cache dir' => 'Cache-Verzeichnis', 'updxlrtr cache maintenance' => 'Cache-Wartung', -'updxlrtr cache size' => 'Cachegröße (Bytes)', +'updxlrtr cache size' => 'Cachegröße', 'updxlrtr cache statistics' => 'Cache-Statistik', 'updxlrtr cancel download' => 'Download abbrechen', 'updxlrtr children' => 'Anzahl der Accelerator-Prozesse', @@ -1862,11 +1862,11 @@ 'updxlrtr condition outdated' => 'Veraltet', 'updxlrtr condition suspended' => 'Ausgesetzt', 'updxlrtr condition unknown' => 'Unbekannt', -'updxlrtr configuration' => 'Update-Accelerator-Konfiguration', 'updxlrtr current downloads' => 'Dateien beim Download in den lokalen Cache', 'updxlrtr current files' => 'Aktuelle Dateien im lokalen Cache', +'updxlrtr current view' => 'Aktuelle Ansicht', 'updxlrtr daily' => 'täglich', -'updxlrtr data from cache' => 'Daten vom Cache (Bytes)', +'updxlrtr data from cache' => 'Daten vom Cache', 'updxlrtr disk usage' => 'Festplattennutzung', 'updxlrtr efficiency index' => 'Cache-Effizienz-Index', 'updxlrtr empty repository' => 'Der lokale Cache ist leer', @@ -1888,29 +1888,36 @@ 'updxlrtr max download rate' => 'Max. externe Downloadrate (kBit/s)', 'updxlrtr month' => 'einem Monat', 'updxlrtr monthly' => 'monatlich', +'updxlrtr no pending downloads attime' => 'Keine Downloads zur Zeit', 'updxlrtr not accessed' => 'nicht zugegriffen seit', 'updxlrtr not enabled' => 'Der Update-Accelerator ist auf der Web-Proxy-Seite nicht aktiviert', +'updxlrtr notice dlrate' => 'Wert zwischen 0 und 1000000 in 16er Abständen.', 'updxlrtr other' => 'Sonstige', +'updxlrtr overview' => 'Übersicht', 'updxlrtr passive mode' => 'Aktiviere Passiv-Modus', 'updxlrtr pending downloads' => 'Anstehende Downloads', 'updxlrtr performance options' => 'Leistungsoptionen', 'updxlrtr progress' => 'Fortschritt', -'updxlrtr purge' => 'Entferne', +'updxlrtr purge' => 'Entfernen', 'updxlrtr remove file' => 'Entferne vom Cache', 'updxlrtr save and restart' => 'Speichern und neu starten', +'updxlrtr settings' => 'Einstellungen', 'updxlrtr source' => 'Quelle', +'updxlrtr sources' => 'Quellen', 'updxlrtr source checkup' => 'Quellenprüfung', 'updxlrtr source checkup schedule' => 'Zeitplanung der Quellenprüfung', +'updxlrtr standard view' => 'Standard-Ansicht', 'updxlrtr statistics' => 'Statistik', 'updxlrtr statistics by source' => 'Statistik pro Quelle', 'updxlrtr summary' => 'Zusammenfassung', -'updxlrtr total cache size' => 'Gesamtgröße des Cache (Bytes)', -'updxlrtr total data from cache' => 'Daten insgesamt vom Cache ausgeliefert (Bytes)', +'updxlrtr to delete' => 'zum Löschen', +'updxlrtr total cache size' => 'Gesamtgröße des Cache', +'updxlrtr total data from cache' => 'Daten insgesamt vom Cache ausgeliefert', 'updxlrtr total files' => 'Gesamtanzahl Dateien im Cache', +'updxlrtr total used' => 'Insgesamt belegt', 'updxlrtr unknown' => 'Unbekannt', 'updxlrtr update accelerator' => 'Update-Accelerator', -'updxlrtr update information' => 'Eine aktualisierte Version steht zum Download bereit. Besuchen Sie <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> für weitere Informationen.', -'updxlrtr update notification' => 'Update-Benachrichtigung!', +'updxlrtr used by' => 'Belegt von', 'updxlrtr web proxy service required' => 'Der Web-Proxy muss aktiviert sein, um den Update-Accelerator zu verwenden', 'updxlrtr week' => 'einer Woche', 'updxlrtr weekly' => 'wöchentlich', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 729f309..5431e64 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1883,7 +1883,9 @@ 'updxlrtr all files' => 'all files ...', 'updxlrtr cache dir' => 'Cache directory', 'updxlrtr cache maintenance' => 'Cache maintenance', -'updxlrtr cache size' => 'Cache size (bytes)', +'updxlrtr cache overview' => 'Cache overview', +'updxlrtr cache settings' => 'Cache settings', +'updxlrtr cache size' => 'Cache size', 'updxlrtr cache statistics' => 'Cache statistics', 'updxlrtr cancel download' => 'Cancel download', 'updxlrtr children' => 'Number of accelerator processes', @@ -1897,8 +1899,9 @@ 'updxlrtr configuration' => 'Update accelerator configuration', 'updxlrtr current downloads' => 'Files being downloaded into the local cache', 'updxlrtr current files' => 'Current files in local cache', +'updxlrtr current view' => 'Current view', 'updxlrtr daily' => 'daily', -'updxlrtr data from cache' => 'Data from cache (bytes)', +'updxlrtr data from cache' => 'Data from cache', 'updxlrtr disk usage' => 'Disk usage', 'updxlrtr efficiency index' => 'Cache efficiency index', 'updxlrtr empty repository' => 'Local cache is empty', @@ -1920,9 +1923,12 @@ 'updxlrtr max download rate' => 'Max. external download rate (kBit/s)', 'updxlrtr month' => 'one month', 'updxlrtr monthly' => 'monthly', +'updxlrtr no pending downloads attime' => 'No pending downloads at moment', 'updxlrtr not accessed' => 'not accessed since', 'updxlrtr not enabled' => 'Update Accelerator is not enabled on the web proxy page', +'updxlrtr notice dlrate' => 'Value must between 0 and 1000000 in steps of 16.', 'updxlrtr other' => 'Other', +'updxlrtr overview' => 'Overview', 'updxlrtr passive mode' => 'Enable passive mode', 'updxlrtr pending downloads' => 'Pending downloads', 'updxlrtr performance options' => 'Performance options', @@ -1930,19 +1936,23 @@ 'updxlrtr purge' => 'Purge', 'updxlrtr remove file' => 'Remove from cache', 'updxlrtr save and restart' => 'Save and Restart', +'updxlrtr settings' => 'Settings', 'updxlrtr source' => 'Source', +'updxlrtr sources' => 'Sources', 'updxlrtr source checkup' => 'Source checkup', 'updxlrtr source checkup schedule' => 'Source checkup schedule', +'updxlrtr standard view' => 'Standard view', 'updxlrtr statistics' => 'Statistics', 'updxlrtr statistics by source' => 'Statistics by source', 'updxlrtr summary' => 'Summary', -'updxlrtr total cache size' => 'Total cache size (bytes)', -'updxlrtr total data from cache' => 'Total data delivered from cache (bytes)', +'updxlrtr to delete' => 'To delete', +'updxlrtr total cache size' => 'Total cache size', +'updxlrtr total data from cache' => 'Total data delivered from cache', 'updxlrtr total files' => 'Total files in cache', +'updxlrtr total used' => 'Total used', 'updxlrtr unknown' => 'Unknown', +'updxlrtr used by' => 'Used by', 'updxlrtr update accelerator' => 'Update Accelerator', -'updxlrtr update information' => 'There is an updated version available for download. Visit <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> for more information.', -'updxlrtr update notification' => 'Update notification!', 'updxlrtr web proxy service required' => 'Web proxy service must be enabled to use Update Accelerator', 'updxlrtr week' => 'one week', 'updxlrtr weekly' => 'weekly', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 910209a1e506e2ca70083ba02d3fd2bf1f8fbbc2
by git＠ipfire.org 29 Apr '13

29 Apr '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 910209a1e506e2ca70083ba02d3fd2bf1f8fbbc2 (commit) via ab4cf06cff961d50dbe1ac5ff37d1aaa6299e8a6 (commit) from 9a883f3f53819fcf0f7de3c6596451cfbc3bcd60 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 910209a1e506e2ca70083ba02d3fd2bf1f8fbbc2 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 29 10:22:29 2013 +0200 Add ovpnmain.cgi to core update 68. commit ab4cf06cff961d50dbe1ac5ff37d1aaa6299e8a6 Author: Alexander Marx <amarx(a)ipfire.org> Date: Sun Apr 28 05:47:50 2013 +0200 OpenVPN: Bugfix 10357, now when chaning an VPN N2N or editing an old one the ports are checked. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/68/filelists/files | 1 + html/cgi-bin/ovpnmain.cgi | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) Difference in files: diff --git a/config/rootfiles/core/68/filelists/files b/config/rootfiles/core/68/filelists/files index ad6864a..bfd6746 100644 --- a/config/rootfiles/core/68/filelists/files +++ b/config/rootfiles/core/68/filelists/files @@ -2,6 +2,7 @@ etc/system-release etc/issue etc/modprobe.d/blacklist srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/ovpnmain.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/html/themes/ipfire/include/style.css srv/web/ipfire/html/themes/ipfire/include/functions.pl diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index cbaecd9..1cfade6 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2011 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -3498,18 +3498,25 @@ if ($cgiparams{'TYPE'} eq 'host') { ### if ($cgiparams{'TYPE'} eq 'net') { - - if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { + if ($cgiparams{'DEST_PORT'} eq $vpnsettings{'DDEST_PORT'}) { $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } - - if ($cgiparams{'DEST_PORT'} eq '') { + #Bugfix 10357 + foreach my $key (sort keys %confighash){ + if ( ($confighash{$key}[22] eq $cgiparams{'DEST_PORT'} && $cgiparams{'NAME'} ne $confighash{$key}[1]) || ($confighash{$key}[29] eq $cgiparams{'DEST_PORT'} && $cgiparams{'NAME'} ne $confighash{$key}[1])){ $errormessage = $Lang::tr{'openvpn destination port used'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; + goto VPNCONF_ERROR; + } + } + if ($cgiparams{'DEST_PORT'} eq '') { + $errormessage = $Lang::tr{'invalid port'}; + unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; + rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; goto VPNCONF_ERROR; } @@ -3920,7 +3927,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } } - # Save the config + # Save the config my $key = $cgiparams{'KEY'}; if (! $key) { hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM April 2013