webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 08:22:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next'

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-05-11 12:46:34 +02:00
parent 5d46c29e5a 3877f8174a
commit 099f4a9ec7
98 changed files with 5612 additions and 2156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/backup/include
View File

@@ -19,6 +19,9 @@
/var/ipfire/outgoing/macgroups
/var/ipfire/outgoing/rules
/var/ipfire/outgoing/p2protocols
/var/ipfire/dmzholes
/var/ipfire/xtaccess
/var/ipfire/portfw
/var/ipfire/ovpn
/var/ipfire/ppp
/var/ipfire/proxy

2
config/backup/includes/vdr
View File

@@ -1 +1 @@
/opt/vdr/etc/
/etc/vdr

49
config/cfgroot/general-functions.pl
View File

@@ -144,6 +144,10 @@ sub age
my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
$atime, $mtime, $ctime, $blksize, $blocks) = stat $_[0];
my $now = time;
my $timestring = '';
my $dset = 0; # Day is set, when > 0
my $hset = 0; # Hour is set, when > 0
my $mset = 0; # Minute is set, when > 0
my $totalsecs = $now - $mtime;
my $days = int($totalsecs / 86400);
@@ -153,7 +157,50 @@ sub age
my $mins = $totalmins % 60;
my $secs = $totalsecs % 60;
return "${days}d ${hours}h ${mins}m ${secs}s";
if ($days > 1) {
${timestring} .= ${days}.' '.$Lang::tr{'days'}.', ';
$dset = 1;
}
elsif ($days == 1) {
${timestring} .= ${days}.' '.$Lang::tr{'day'}.', ';
$dset = 1;
}
if (($hours > 1) && !($dset)) {
${timestring} .= ${hours}.' '.$Lang::tr{'hours'}.', ';
$hset = 1;
}
elsif (($hours == 1) && !($dset)) {
${timestring} .= ${hours}.' '.$Lang::tr{'hour'}.', ';
$hset = 1;
}
elsif ($dset) {
${timestring} .= ${hours}.' '.$Lang::tr{'age shour'}.', ';
$hset = 1;
}
if ((($mins > 1) || ($mins == 0)) && !($dset || $hset)) {
${timestring} .= ${mins}.' '.$Lang::tr{'minutes'}.', ';
$mset = 1;
}
elsif (($mins == 1) && !($dset || $hset)) {
${timestring} .= ${mins}.' '.$Lang::tr{'minute'}.', ';
$mset = 1;
}
else {
${timestring} .= ${mins}.' '.$Lang::tr{'age sminute'}.', ';
$mset = 1;
}
if ((($secs > 1) || ($secs == 0)) && !($dset || $hset || $mset)) {
${timestring} .= ${secs}.' '.$Lang::tr{'age seconds'};
}
elsif (($secs == 1) && !($dset || $hset || $mset)) {
${timestring} .= $secs.' '.$Lang::tr{'age second'};
}
else { ${timestring} .= $secs.' '.$Lang::tr{'age ssecond'}; }
return ${timestring};
}
sub validip

5
config/cfgroot/header.pl
View File

@@ -161,10 +161,9 @@ sub genmenu {
sub showhttpheaders
{
print "Pragma: no-cache\n";
print "Cache-control: no-cache\n";
print "Cache-control: private\n";
print "Connection: close\n";
print "Content-type: text/html\n\n";
print "Content-type: text/html; charset=UTF-8\n\n";
}
sub is_menu_visible($) {

70
config/ovpn/verify
View File

@@ -1,12 +1,58 @@
#!/bin/sh
if [ $1 -eq 0 ]; then
name2=`echo $2`
name3=${name2##*/}
name4=${name3##*CN=}
clientdisabled=`/bin/grep -iwc off,.*,$name4 /var/ipfire/ovpn/ovpnconfig`
if [ "$clientdisabled" = "1" ]; then
exit 1
fi
exit 0
fi
exit 0
#!/usr/bin/perl
############################################################################
# #
# 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) 2013 IPFire Team <info@ipfire.org>. #
# #
############################################################################
require '/var/ipfire/general-functions.pl';
my $DEPTH = $ARGV[0];
my $CN = $ARGV[1];
# Exit immediately for every certificate depth other than 0.
exit 0 unless ($DEPTH eq "0");
# Strip the CN from the X509 identifier.
$CN =~ /\/CN=(.*)$/i;
$CN = $1;
my %confighash = ();
if (-f "${General::swroot}/ovpn/ovpnconfig"){
&General::readhasharray("${General::swroot}/ovpn/ovpnconfig", \%confighash);
foreach my $key (keys %confighash) {
my $cn = $confighash{$key}[2];
# Skip disabled connections.
next unless ($confighash{$key}[0] eq "on");
# Skip non-roadwarrior connections.
next unless ($confighash{$key}[3] eq "host");
# Search for a matching CN.
exit 0 if ($cn eq $CN);
# Compatibility code for incorrectly saved CNs.
$cn =~ s/\ /_/;
exit 0 if ($cn eq $CN);
}
}
# Return an error if ovpnconfig could not be found.
exit 1;

2
config/rootfiles/common/armv5tel/glibc
View File

@@ -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

8
config/rootfiles/common/dejavu-fonts-ttf
View File

@@ -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

0
config/rootfiles/packages/freefont → config/rootfiles/common/freefont
View File

2
config/rootfiles/common/i586/glibc
View File

@@ -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

6
config/rootfiles/common/perl-Sort-Naturally Normal file
View File

@@ -0,0 +1,6 @@
usr/lib/perl5/site_perl/5.12.3/Sort
usr/lib/perl5/site_perl/5.12.3/Sort/Naturally.pm
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort/Naturally
#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Sort/Naturally/.packlist
usr/share/man/man3/Sort::Naturally.3

4
config/rootfiles/common/smartmontools
View File

@@ -2,13 +2,15 @@
#usr/etc/rc.d/init.d
#usr/etc/rc.d/init.d/smartd
#usr/etc/smartd.conf
#usr/etc/smartd_warning.sh
usr/sbin/smartctl
#usr/sbin/smartd
usr/sbin/update-smart-drivedb
#usr/share/doc/smartmontools
#usr/share/doc/smartmontools/AUTHORS
#usr/share/doc/smartmontools/CHANGELOG
#usr/share/doc/smartmontools/COPYING
#usr/share/doc/smartmontools/ChangeLog
#usr/share/doc/smartmontools/ChangeLog-5.0-6.0
#usr/share/doc/smartmontools/INSTALL
#usr/share/doc/smartmontools/NEWS
#usr/share/doc/smartmontools/README

1
config/rootfiles/common/stage2
View File

@@ -71,6 +71,7 @@ usr/lib/libstdc++.so.6
#usr/local/bin/archive.files
usr/local/bin/backupiso
usr/local/bin/connscheduler
usr/local/bin/consort.sh
usr/local/bin/dialctrl.pl
usr/local/bin/hddshutdown
usr/local/bin/httpscert

17
config/rootfiles/core/68/exclude Normal file
View File

@@ -0,0 +1,17 @@
srv/web/ipfire/html/proxy.pac
boot/config.txt
etc/udev/rules.d/30-persistent-network.rules
etc/collectd.custom
etc/shadow
etc/ipsec.conf
etc/ipsec.secrets
etc/ipsec.user.conf
etc/ipsec.user.secrets
var/log/cache
var/updatecache
etc/localtime
var/ipfire/ovpn
etc/ssh/ssh_config
etc/ssh/sshd_config
etc/ssl/openssl.cnf
var/state/dhcp/dhcpd.leases

1
config/rootfiles/core/68/filelists/GeoIP Normal file
View File

@@ -0,0 +1 @@
usr/local/share/GeoIP/GeoIP.dat

1
config/rootfiles/core/68/filelists/dejavu-fonts-ttf Symbolic link
View File

@@ -0,0 +1 @@
../../../common/dejavu-fonts-ttf

19
config/rootfiles/core/68/filelists/files Normal file
View File

@@ -0,0 +1,19 @@
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/cgi-bin/vpnmain.cgi
srv/web/ipfire/html/themes/ipfire/include/functions.pl
srv/web/ipfire/html/themes/ipfire/include/style.css
srv/web/ipfire/html/themes/maniac/include/functions.pl
srv/web/ipfire/html/themes/maniac/include/style.css
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
var/ipfire/general-functions.pl
var/ipfire/langs
var/ipfire/ovpn/verify

1
config/rootfiles/core/68/filelists/freefont Symbolic link
View File

@@ -0,0 +1 @@
../../../common/freefont

2
config/rootfiles/core/68/filelists/hwdata Normal file
View File

@@ -0,0 +1,2 @@
usr/share/hwdata/pci.ids
usr/share/hwdata/usb.ids

1
config/rootfiles/core/68/filelists/perl-Sort-Naturally Symbolic link
View File

@@ -0,0 +1 @@
../../../common/perl-Sort-Naturally

1
config/rootfiles/core/68/filelists/smartmontools Symbolic link
View File

@@ -0,0 +1 @@
../../../common/smartmontools

1
config/rootfiles/core/68/filelists/strongswan Symbolic link
View File

@@ -0,0 +1 @@
../../../common/strongswan

1
config/rootfiles/core/68/filelists/vlan Symbolic link
View File

@@ -0,0 +1 @@
../../../common/vlan

1
config/rootfiles/core/68/meta Normal file
View File

@@ -0,0 +1 @@
DEPS=""

75
config/rootfiles/core/68/update.sh Normal file
View File

@@ -0,0 +1,75 @@
#!/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 3 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) 2013 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
#
# Remove old core updates from pakfire cache to save space...
core=68
for (( i=1; i<=$core; i++ ))
do
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
done
#
# Remove meta's of packages that are now common...
#
rm -rf /opt/pakfire/db/*/meta-freefont
#
#Stop services
/etc/init.d/ipsec stop
#
#Extract files
extract_files
# Regenerate ipsec configuration files.
/srv/web/ipfire/cgi-bin/vpnmain.cgi
#
#Start services
if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
/etc/init.d/ipsec start
fi
#
#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...
#touch /var/run/need_reboot
#
#Finish
/etc/init.d/fireinfo start
sendprofile
#Don't report the exitcode last command
exit 0

1
config/rootfiles/installer/network-modules
View File

@@ -1 +0,0 @@
lib/modules/KVER-ipfire/kernel/drivers/net

1
config/rootfiles/packages/samba
View File

@@ -114,6 +114,7 @@ usr/sbin/winbindd
#usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
#usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
#usr/share/man/man1/dbwrap_tool.1
#usr/share/man/man1/findsmb.1
#usr/share/man/man1/log2pcap.1
#usr/share/man/man1/nmblookup.1

1
config/rootfiles/packages/sysbench Normal file
View File

@@ -0,0 +1 @@
usr/bin/sysbench

340
config/rootfiles/packages/vdr
View File

@@ -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

39
config/rootfiles/packages/vdr_epgsearch
View File

@@ -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

26
config/rootfiles/packages/vdr_softdevice
View File

@@ -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

8
config/rootfiles/packages/vdr_streamdev Normal file
View File

@@ -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

4
config/rootfiles/packages/vdr_vnsiserver3 Normal file
View File

@@ -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

4
config/udev/blacklist
View File

@@ -1,2 +1,6 @@
blacklist crc_ccitt
blacklist slhc
# Intel MEI controllers
# makes some systems hang on reboot
blacklist mei

18
config/updxlrator/updxlrator
View File

@@ -155,12 +155,28 @@ while (<>) {
# Section: Avast Downloads
# -----------------------------------------------------------
if ($source_url =~ m@^http://download[\d]+\.avast\.com/.*\.(exe|vpu)$@i)
if ($source_url =~ m@^http://(ion|download)[\d]+\.avast\.com/.*\.(exe|vpu|vpx)$@i)
{
$xlrator_url = &check_cache($source_url,$hostaddr,$username,"Avast",$mirror);
}
# -----------------------------------------------------------
# Section: Mozilla Downloads
# -----------------------------------------------------------
if ($source_url=~ m@^http://.*\.mozilla\.net/.*\.((complete|partial)\.mar|exe)$@i)
{
$xlrator_url = &check_cache($source_url,$hostaddr,$username,"Mozilla",$unique);
}
# -----------------------------------------------------------
# Section: Mcafee
# -----------------------------------------------------------
if ($source_url =~ m@^http://update\.nai\.com/.*\.(mcs|z|gem|dat|zip)$@i)
{
$xlrator_url = &check_cache($source_url,$hostaddr,$username,"mcafee",$mirror);
}
# -----------------------------------------------------------
# Section: Avira Downloads

53
config/vdr/bin/runvdr
View File

@@ -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

5
config/vdr/bin/runvdr-soft
View File

@@ -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

7
config/vdr/plugins.d/conflictcheckonly.conf Normal file
View File

@@ -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=""

6
config/vdr/plugins.d/epgsearch.conf Normal file
View File

@@ -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"

7
config/vdr/plugins.d/epgsearchonly.conf Normal file
View File

@@ -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=""

7
config/vdr/plugins.d/quickepgsearch.conf Normal file
View File

@@ -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=""

5
config/vdr/plugins.d/streamdev-server.conf Normal file
View File

@@ -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=""

5
config/vdr/plugins.d/vnsiserver3.conf Normal file
View File

@@ -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=""

94
config/vdr/runvdr Normal file
View File

@@ -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

39
config/vdr/vdr.sysconfig Normal file
View File

@@ -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"

2
config/vdradmin/install-ipfire.sh
View File

@@ -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()
{

6
config/vdradmin/vdradmind.conf
View File

@@ -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

38
config/w_scan/w_scan_start
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@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

5
doc/language_issues.de
View File

@@ -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,6 +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 sources
WARNING: translation string unused: updxlrtr standard view
WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
@@ -448,6 +448,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

6
doc/language_issues.en
View File

@@ -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,12 @@ 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 sources
WARNING: translation string unused: updxlrtr standard view
WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
WARNING: translation string unused: updxlrtr used by
WARNING: translation string unused: upload fcdsl.o
WARNING: translation string unused: upload file
WARNING: translation string unused: upload static key
@@ -480,6 +481,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

8
doc/language_issues.es
View File

@@ -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,7 @@ WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: static routes
WARNING: untranslated string: system information
WARNING: untranslated string: uptime load average
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap country

8
doc/language_issues.fr
View File

@@ -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
@@ -602,6 +605,7 @@ WARNING: untranslated string: snort working
WARNING: untranslated string: static routes
WARNING: untranslated string: system information
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

8
doc/language_issues.nl
View File

@@ -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,4 @@ 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: uptime load average

8
doc/language_issues.pl
View File

@@ -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,7 @@ WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: static routes
WARNING: untranslated string: system information
WARNING: untranslated string: uptime load average
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap country

8
doc/language_issues.ru
View File

@@ -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,7 @@ WARNING: untranslated string: routing config changed
WARNING: untranslated string: routing table
WARNING: untranslated string: server restart
WARNING: untranslated string: static routes
WARNING: untranslated string: uptime load average
WARNING: untranslated string: visit us at
WARNING: untranslated string: vpn keyexchange
WARNING: untranslated string: wlanap country

36
doc/language_missings
View File

@@ -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,11 @@
< snort working
< static routes
< system information
< updxlrtr sources
< updxlrtr standard view
< upload new ruleset
< uptime
< uptime load average
< urlfilter file ext block
< urlfilter mode block
< visit us at
@@ -138,6 +147,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 +258,10 @@
< Set time on boot
< static routes
< system information
< updxlrtr sources
< updxlrtr standard view
< uptime
< uptime load average
< visit us at
< vpn keyexchange
############################################################################
@@ -255,6 +273,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 +359,10 @@
< qos enter bandwidths
< server restart
< static routes
< updxlrtr sources
< updxlrtr standard view
< uptime
< uptime load average
< visit us at
< vpn keyexchange
############################################################################
@@ -348,6 +375,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 +465,10 @@
< qos enter bandwidths
< server restart
< static routes
< updxlrtr sources
< updxlrtr standard view
< uptime
< uptime load average
< visit us at
< vpn keyexchange
< week-graph

127
html/cgi-bin/connections.cgi
View File

@@ -34,6 +34,31 @@ require "${General::swroot}/header.pl";
my $colour_multicast = "#A0A0A0";
# sort arguments for connection tracking table
# the sort field. eg. 1=src IP, 2=dst IP, 3=src port, 4=dst port
my $SORT_FIELD = 0;
# the sort order. (a)scending orr (d)escending
my $SORT_ORDER = 0;
# cgi query arguments
my %cgiin;
# debug mode
my $debug = 0;
# retrieve query arguments
# note: let a-z A-Z and 0-9 pass as value only
if (length ($ENV{'QUERY_STRING'}) > 0){
my $name;
my $value;
my $buffer = $ENV{'QUERY_STRING'};
my @pairs = split(/&/, $buffer);
foreach my $pair (@pairs){
($name, $value) = split(/=/, $pair);
$value =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg; # e.g. "%20" => " "
$value =~ s/[^a-zA-Z0-9]*//g; # a-Z 0-9 will pass
$cgiin{$name} = $value;
}
}
&Header::showhttpheaders();
my @network=();
@@ -43,12 +68,40 @@ my @colour=();
my %netsettings=();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
# output cgi query arrguments to browser on debug
if ( $debug ){
&Header::openbox('100%', 'center', 'DEBUG');
my $debugCount = 0;
foreach my $line (sort keys %cgiin) {
print "$line = '$cgiin{$line}'<br />\n";
$debugCount++;
}
print "&nbsp;Count: $debugCount\n";
&Header::closebox();
}
#workaround to suppress a warning when a variable is used only once
my @dummy = ( ${Header::table1colour} );
undef (@dummy);
# Read the connection tracking table.
open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table";
# check sorting arguments
if ( $cgiin{'sort_field'} ~~ [ '1','2','3','4','5','6','7','8','9' ] ) {
$SORT_FIELD = $cgiin{'sort_field'};
if ( $cgiin{'sort_order'} ~~ [ 'a','d','A','D' ] ) {
$SORT_ORDER = lc($cgiin{'sort_order'});
}
}
# Read and sort the connection tracking table
# do sorting
if ($SORT_FIELD and $SORT_ORDER) {
# field sorting when sorting arguments are sane
open(CONNTRACK, "/usr/local/bin/getconntracktable | /usr/local/bin/consort.sh $SORT_FIELD $SORT_ORDER |") or die "Unable to read conntrack table";
} else {
# default sorting with no query arguments
open(CONNTRACK, "/usr/local/bin/getconntracktable | sort -k 5,5 --numeric-sort --reverse |") or die "Unable to read conntrack table";
}
my @conntrack = <CONNTRACK>;
close(CONNTRACK);
@@ -263,21 +316,81 @@ print <<END;
<br>
END
if ($SORT_FIELD and $SORT_ORDER) {
my @sort_field_name = (
$Lang::tr{'source ip'},
$Lang::tr{'destination ip'},
$Lang::tr{'source port'},
$Lang::tr{'destination port'},
$Lang::tr{'protocol'},
$Lang::tr{'connection'}.' '.$Lang::tr{'status'},
$Lang::tr{'expires'}.' ('.$Lang::tr{'seconds'}.')',
$Lang::tr{'download'},
$Lang::tr{'upload'}
);
my $sort_order_name;
if (lc($SORT_ORDER) eq "a") {
$sort_order_name = $Lang::tr{'sort ascending'};
} else {
$sort_order_name = $Lang::tr{'sort descending'};
}
print <<END
<div style="font-weight:bold;margin:10px;font-size: 70%">
$sort_order_name: $sort_field_name[$SORT_FIELD-1]
</div>
END
;
}
# Print table header.
print <<END;
<table width='100%'>
<tr>
<tr valign="top"">
<th align='center'>
<a href="?sort_field=5&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=5&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
</th>
<th align='center' colspan="2">
<a href="?sort_field=1&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=1&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="?sort_field=3&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=3&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
</th>
<th align='center' colspan="2">
<a href="?sort_field=2&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=2&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<a href="?sort_field=4&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=4&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
</th>
<th align='center'>
<a href="?sort_field=8&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=8&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a href="?sort_field=9&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=9&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
</th>
<th align='center'>
<a href="?sort_field=6&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=6&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
</th>
<th align='center'>
<a href="?sort_field=7&sort_order=d"><img style="width:10px" src="/images/up.gif"></a>
<a href="?sort_field=7&sort_order=a"><img style="width:10px" src="/images/down.gif"></a>
</th>
</tr>
<tr valign="top"">
<th align='center'>
$Lang::tr{'protocol'}
</th>
<th align='center'>
<th align='center' colspan="2">
$Lang::tr{'source ip and port'}
</th>
<th>&nbsp;</th>
<th align='center'>
<th align='center' colspan="2">
$Lang::tr{'dest ip and port'}
</th>
<th>&nbsp;</th>
<th align='center'>
$Lang::tr{'download'} /
<br>$Lang::tr{'upload'}

21
html/cgi-bin/ovpnmain.cgi
View File

@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2011 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@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 #
@@ -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>
@@ -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) {

6
html/cgi-bin/samba.cgi
View File

@@ -99,7 +99,7 @@ $sambasettings{'SYSLOGONLY'} = 'on';
$sambasettings{'DOSCHARSET'} = 'CP850';
$sambasettings{'UNIXCHARSET'} = 'UTF8';
$sambasettings{'DISPLAYCHARSET'} = 'CP850';
$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE';
$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
$sambasettings{'WIDELINKS'} = 'on';
$sambasettings{'UNIXEXTENSION'} = 'off';
$sambasettings{'SMB2'} = 'off';
@@ -149,7 +149,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
system("/usr/local/bin/sambactrl smbglobalreset");
$sambasettings{'WORKGRP'} = 'homeip.net';
$sambasettings{'NETBIOSNAME'} = 'IPFire';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.0';
$sambasettings{'SRVSTRING'} = 'Samba running on IPFire 2.x';
$sambasettings{'INTERFACES'} = '';
$sambasettings{'SECURITY'} = 'share';
$sambasettings{'OSLEVEL'} = '65';
@@ -183,7 +183,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes')
$sambasettings{'LOCALMASTER'} = 'off';
$sambasettings{'DOMAINMASTER'} = 'off';
$sambasettings{'PREFERREDMASTER'} = 'off';
$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=8192 SO_SNDBUF=8192 SO_KEEPALIVE';
$sambasettings{'SOCKETOPTIONS'} = 'TCP_NODELAY SO_RCVBUF=819200 SO_SNDBUF=819200 SO_KEEPALIVE';
$sambasettings{'WIDELINKS'} = 'on';
$sambasettings{'UNIXEXTENSION'} = 'off';
$sambasettings{'SMB2'} = 'off';

4
html/cgi-bin/services.cgi
View File

@@ -125,11 +125,11 @@ END
$lines++;
if ($lines % 2){
print "<tr bgcolor='$color{'color22'}'>\n<td align='left'>";
print %link->{$key};
print $link{$key};
print "</td>\n";
}else{
print "<tr bgcolor='$color{'color20'}'>\n<td align='left'>";
print %link->{$key};
print $link{$key};
print "</td>\n";
}

7
html/cgi-bin/vpnmain.cgi
View File

@@ -245,9 +245,6 @@ sub writeipsecfiles {
flock CONF, 2;
flock SECRETS, 2;
print CONF "version 2\n\n";
print CONF "config setup\n";
print CONF "\tcharondebug=\"dmn 0, mgr 0, ike 0, chd 0, job 0, cfg 0, knl 0, net 0, asn 0, enc 0, lib 0, esp 0, tls 0, tnc 0, imc 0, imv 0, pts 0\"\n";
print CONF "\n";
print CONF "conn %default\n";
print CONF "\tkeyingtries=%forever\n";
print CONF "\n";
@@ -1832,11 +1829,11 @@ END
$cgiparams{'IKE_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[18];
$cgiparams{'IKE_INTEGRITY'} = 'sha2_256|sha|md5'; #[19];
$cgiparams{'IKE_GROUPTYPE'} = '8192|6144|4096|3072|2048|1536|1024'; #[20];
$cgiparams{'IKE_LIFETIME'} = '1'; #[16];
$cgiparams{'IKE_LIFETIME'} = '3'; #[16];
$cgiparams{'ESP_ENCRYPTION'} = 'aes256|aes192|aes128|3des'; #[21];
$cgiparams{'ESP_INTEGRITY'} = 'sha2_256|sha1|md5'; #[22];
$cgiparams{'ESP_GROUPTYPE'} = ''; #[23];
$cgiparams{'ESP_KEYLIFE'} = '8'; #[17];
$cgiparams{'ESP_KEYLIFE'} = '1'; #[17];
$cgiparams{'COMPRESSION'} = 'on'; #[13];
$cgiparams{'ONLY_PROPOSED'} = 'off'; #[24];
$cgiparams{'PFS'} = 'on'; #[28];

32
html/html/include/jquery-1.2.6.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
html/html/include/jquery-1.9.1.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

50
html/html/themes/ipfire/include/functions.pl
View File

@@ -143,14 +143,12 @@ sub openpage {
}
print <<END
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>$title</title>
<?xml version='1.0' encoding='UTF-8'?>
<!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
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
END
;
if ($settings{'FX'} ne 'off') {
@@ -179,7 +177,7 @@ END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<script type="text/javascript" src="/include/jquery-1.2.6.min.js"></script>
<script type="text/javascript" src="/include/jquery-1.9.1.min.js"></script>
<script type="text/javascript">
var t_current;
var t_last;
@@ -278,14 +276,12 @@ sub openpagewithoutmenu {
}
print <<END
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>$title</title>
$extrahead
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<?xml version='1.0' encoding='UTF-8'?>
<!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
END
;
if ($settings{'FX'} ne 'off') {
@@ -335,9 +331,14 @@ END
}
sub closepage () {
my $status = &connectionstatus();
$uptime = `/usr/bin/uptime`;
my $status = &connectionstatus();
my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`;
$uptime =~ s/year(s|)/$Lang::tr{'year'}/;
$uptime =~ s/month(s|)/$Lang::tr{'month'}/;
$uptime =~ s/day(s|)/$Lang::tr{'day'}/;
$uptime =~ s/user(s|)/$Lang::tr{'user'}/;
$uptime =~ s/load average/$Lang::tr{'uptime load average'}/;
print <<END
</div>
</div>
@@ -351,12 +352,11 @@ END
&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') {

8
html/html/themes/ipfire/include/style.css
View File

@@ -249,7 +249,7 @@ position: relative;
{
position: relative;
font-size: 1.7em;
padding-bottom: 1.2em;
padding-bottom: 0.4em;
}
#main_inner .post ul.post_info
@@ -433,3 +433,9 @@ max-width: 2.5em;
position: relative;
width: 100%;
}
/* FOOTER COLORIZE BANDWIDTH */
#rx_kbs { color: green; }
#tx_kbs { color: red; }

149
html/html/themes/maniac/include/functions.pl
View File

@@ -143,14 +143,12 @@ sub openpage {
}
print <<END
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>$title</title>
<?xml version='1.0' encoding='UTF-8'?>
<!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
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
END
;
if ($settings{'FX'} ne 'off') {
@@ -179,66 +177,53 @@ END
;
if ($settings{'SPEED'} ne 'off') {
print <<END
<script type="text/javascript" language="javascript">
var http_request = false;
function LoadInetInfo(url) {
http_request = false;
if (window.XMLHttpRequest) { // Mozilla, Safari,...
http_request = new XMLHttpRequest();
if (http_request.overrideMimeType) {
http_request.overrideMimeType('text/xml');
// zu dieser Zeile siehe weiter unten
}
} else if (window.ActiveXObject) { // IE
try {
http_request = new ActiveXObject("Msxml2.XMLHTTP");
} catch (e) {
try {
http_request = new ActiveXObject("Microsoft.XMLHTTP");
} catch (e) {}
}
}
if (!http_request) {
alert('Ende :( Kann keine XMLHTTP-Instanz erzeugen');
return false;
}
http_request.onreadystatechange = DisplayInetInfo;
http_request.open('GET', url, true);
http_request.send(null);
}
function DisplayInetInfo() {
if (http_request.readyState == 4) {
var xmldoc = http_request.responseXML;
var root1_node = xmldoc.getElementsByTagName('rx_kbs').item(0);
var root2_node = xmldoc.getElementsByTagName('tx_kbs').item(0);
var root3_node = xmldoc.getElementsByTagName('rxb').item(0);
var root4_node = xmldoc.getElementsByTagName('txb').item(0);
document.forms['speed'].txkb.value = root1_node.firstChild.data;
document.forms['speed'].rxkb.value = root2_node.firstChild.data;
// document.getElementsByTagName("input")[0].style.color = "#00FF00";
url = "/cgi-bin/speed.cgi?rxb_last=" + root3_node.firstChild.data + "&txb_last=" + root4_node.firstChild.data;
window.setTimeout("LoadInetInfo(url)", 3000);
}
}
</script>
<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>
</head>
<body onLoad="LoadInetInfo('/cgi-bin/speed.cgi')">
<body>
END
;
}
else {
print "</head><body>";}
print "</head>\n<body>";}
print <<END
<!-- IPFIRE HEADER -->
@@ -291,14 +276,12 @@ sub openpagewithoutmenu {
}
print <<END
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html>
<head>
<title>$title</title>
$extrahead
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<?xml version='1.0' encoding='UTF-8'?>
<!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
END
;
if ($settings{'FX'} ne 'off') {
@@ -348,9 +331,14 @@ END
}
sub closepage () {
my $status = &connectionstatus();
$uptime = `/usr/bin/uptime`;
my $status = &connectionstatus();
my $uptime = `/usr/bin/uptime|cut -d \" \" -f 4-`;
$uptime =~ s/year(s|)/$Lang::tr{'year'}/;
$uptime =~ s/month(s|)/$Lang::tr{'month'}/;
$uptime =~ s/day(s|)/$Lang::tr{'day'}/;
$uptime =~ s/user(s|)/$Lang::tr{'user'}/;
$uptime =~ s/load average/$Lang::tr{'uptime load average'}/;
print <<END
</div>
</div>
@@ -365,20 +353,17 @@ END
print <<END
</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 />
<form name='speed'>
<b>$Lang::tr{'bandwidth usage'}:</b> $Lang::tr{'incoming'}:<input type="text" name="rxkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:green; border: none; padding: 0; background-color: #000000; vertical-align: middle" />
$Lang::tr{'outgoing'}: <input type="text" name="txkb" size="5" value="0 kb/s" style="font-size: 12px; font-family: Arial, Helvetica;text-align: center;color:red; border: none; padding: 0; background-color: #000000; vertical-align: middle"/>
</form>
<b>$Lang::tr{'bandwidth usage'}:</b>
$Lang::tr{'incoming'}: <span id="rx_kbs"></span>&nbsp;$Lang::tr{'outgoing'}: <span id="tx_kbs"></span>
END
;
}

10
html/html/themes/maniac/include/style.css
View File

@@ -227,13 +227,13 @@ padding-top: 3.5em;
{
border-bottom: dotted 1px #E1E1E1;
position: relative;
padding-bottom: 0.4em;
}
#main_inner h3
{
font-size: 2.1em;
padding-bottom: 0.1em;
margin-bottom: 0.8em;
}
#main_inner h4
@@ -253,7 +253,7 @@ position: relative;
{
position: relative;
font-size: 1.7em;
padding-bottom: 1.2em;
padding-bottom: 0.4em;
}
#main_inner .post ul.post_info
@@ -462,3 +462,9 @@ max-width: 2.5em;
position: relative;
width: 100%;
}
/* FOOTER COLORIZE BANDWIDTH */
#rx_kbs { color: green; }
#tx_kbs { color: red; }

9
langs/de/cgi-bin/de.pl
View File

@@ -323,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.',
@@ -1896,6 +1901,8 @@
'updxlrtr source' => 'Quelle',
'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',
'updxlrtr summary' => 'Zusammenfassung',
@@ -1927,7 +1934,9 @@
'upstream password' => 'Proxy-Passwort:',
'upstream proxy host:port' => 'Vorgelagerter Proxy (hostname:port)',
'upstream username' => 'Proxy-Benutzername:',
'uptime' => 'Betriebszeit',
'uptime and users' => 'Uptime und Benutzer:',
'uptime load average' => 'Systemlast',
'url filter' => 'URL-Filter',
'urlfilter access' => 'Zugriff',
'urlfilter activity detection' => 'Aktivitätserkennung',

12
langs/en/cgi-bin/en.pl
View File

@@ -324,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.',
@@ -971,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',
@@ -1928,6 +1933,8 @@
'updxlrtr source' => 'Source',
'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',
'updxlrtr summary' => 'Summary',
@@ -1938,6 +1945,7 @@
'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 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',
@@ -1960,7 +1968,9 @@
'upstream password' => 'Upstream password:',
'upstream proxy host:port' => 'Upstream proxy (host:port)',
'upstream username' => 'Upstream username:',
'uptime' => 'Uptime',
'uptime and users' => 'Uptime and users:',
'uptime load average' => 'Load average',
'url filter' => 'Content Filter',
'urlfilter access' => 'Access',
'urlfilter activity detection' => 'Activity detection',

4
lfs/GeoIP
View File

@@ -25,7 +25,7 @@
include Config
VER = 1.17
DATVER = 05122012
DATVER = 07052013
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
GeoIP.dat-$(DATVER).gz_MD5 = ab0f52a35128d1aced906ac4cbfbed9c
GeoIP.dat-$(DATVER).gz_MD5 = 634d72f4ffbb2de57efa468add572d38
install : $(TARGET)

6
lfs/initrd
View File

@@ -64,6 +64,12 @@ $(TARGET) :
-cd / && cpio -d -p /install/initrd < /tmp/ROOTFILES
# Copy hid and network modules
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/hid \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cp -aRf /lib/modules/$(KVER)-ipfire/kernel/drivers/net \
/install/initrd/lib/modules/$(KVER)-ipfire/kernel/drivers/
cd /install/initrd/etc && rm -f fstab
cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/
rm -rf /install/initrd/usr/share/man

52
lfs/vdr_softdevice → lfs/perl-Sort-Naturally
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2013 IPFire Team <info@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 #
@@ -18,35 +18,61 @@
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = plugin
VER = 1.03
THISAPP = vdr_softdevice-$(VER)
THISAPP = Sort-Naturally-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
PROG = vdr_softdevice
PAK_VER = 5
DEPS = "vdr ffmpeg sdl alsa dfb++"
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
install :
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
check :
$(DL_FILE)_MD5 = fef2e36d1b1ea23ee79ec68b5872453f
download :
install : $(TARGET)
md5 :
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
dist:
$(PAK)
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# 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 zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && perl Makefile.PL
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/samba
View File

@@ -24,7 +24,7 @@
include Config
VER = 3.6.12
VER = 3.6.15
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
PAK_VER = 46
PAK_VER = 49
DEPS = "cups"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 430fd21a1acd26964d3ccf366df8709a
$(DL_FILE)_MD5 = d9424e9badb089bd51e6cfc752b21dfa
install : $(TARGET)

4
lfs/smartmontools
View File

@@ -24,7 +24,7 @@
include Config
VER = 6.0
VER = 6.1
THISAPP = smartmontools-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 5646a07f5f4bee8e2e649de8c6b7ae87
$(DL_FILE)_MD5 = 83a3a681f8183ed858392d550ae1cca6
install : $(TARGET)

6
lfs/squidclamav
View File

@@ -24,7 +24,7 @@
include Config
VER = 5.7
VER = 5.11
THISAPP = squidclamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = squidclamav
PAK_VER = 14
PAK_VER = 15
DEPS = "clamav"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 02207a95e2968998574e30d35e0d1f0e
$(DL_FILE)_MD5 = 87aef2eb48a41fa1e466c0174f2bac40
install : $(TARGET)

6
lfs/strip
View File

@@ -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

10
lfs/strongswan
View File

@@ -24,10 +24,10 @@
include Config
VER = 5.0.2
VER = 5.0.4
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 77dc16443fd141f46183d3a4f60986ef
$(DL_FILE)_MD5 = 7085ac1d28dcc250096553fa51c3a4ea
install : $(TARGET)
@@ -75,7 +75,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
@@ -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)

72
lfs/sysbench Normal file
View File

@@ -0,0 +1,72 @@
###############################################################################
# IPFire.org - An Open Source Firewall Solution #
# Copyright (C) - IPFire Development Team <info@ipfire.org> #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 0.4.12
THISAPP = sysbench-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = sysbench
PAK_VER = 1
DEPS = ""
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 3a6d54fdd3fe002328e4458206392b9d
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 zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && touch AUTHORS NEWS
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && ./configure --prefix=/usr --without-mysql
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
rm -rvf /usr/share/doc/sysbench
@rm -rf $(DIR_APP)
@$(POSTBUILD)

6
lfs/transmission
View File

@@ -24,7 +24,7 @@
include Config
VER = 2.76
VER = 2.77
THISAPP = transmission-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = transmission
PAK_VER = 5
PAK_VER = 6
DEPS = "libevent2"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9abbffe29ce9b5ee68a116d293c51111
$(DL_FILE)_MD5 = 60c0e77a1852656215f7102a437b2a3d
install : $(TARGET)

107
lfs/vdr
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
# Copyright (C) 2007-2013 IPFire Team <info@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
PAK_VER = 6
DEPS = "freefont"
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
# Compile main package.
cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir
# 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 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)

77
lfs/vdr_epgsearch
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2013 IPFire Team <info@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)
install :
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
check :
$(DL_FILE)_MD5 = 6e63cc29df02f48fabf6e12e1e71b2fc
download :
install : $(TARGET)
md5 :
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download : $(patsubst %,$(DIR_DL)/%,$(objects))
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)

106
lfs/vdr_streamdev Normal file
View File

@@ -0,0 +1,106 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@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)

99
lfs/vdr_vnsiserver3 Normal file
View File

@@ -0,0 +1,99 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@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)

16
lfs/vdradmin
View File

@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
# Copyright (C) 2007-2013 IPFire Team <info@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)

2
lfs/vlan
View File

@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make purge vconfig
cd $(DIR_APP) && install -c -p -m 0755 vconfig /sbin
@rm -rf $(DIR_APP)
@$(POSTBUILD)

2
lfs/w_scan
View File

@@ -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 = ""

9
make.sh
View File

@@ -25,8 +25,8 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.13" # Version number
CORE="67" # Core Level (Filename)
PAKFIRE_CORE="67" # Core Level (PAKFIRE)
CORE="68" # Core Level (Filename)
PAKFIRE_CORE="68" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -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
@@ -697,6 +700,7 @@ buildipfire() {
ipfiremake mediatomb
ipfiremake sslh
ipfiremake perl-gettext
ipfiremake perl-Sort-Naturally
ipfiremake vdradmin
ipfiremake miau
ipfiremake netsnmpd
@@ -760,6 +764,7 @@ buildipfire() {
ipfiremake avahi
ipfiremake nginx
ipfiremake sendEmail
ipfiremake sysbench
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild

4040
src/hwdata/pci.ids
View File

File diff suppressed because it is too large Load Diff

1064
src/hwdata/usb.ids
View File

File diff suppressed because it is too large Load Diff

20
src/initscripts/init.d/vdr
View File

@@ -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
;;
*)

115
src/paks/vdr/install.sh Normal file
View File

@@ -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@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

27
src/paks/vdr/uninstall.sh Normal file
View File

@@ -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@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
make_backup ${NAME}
remove_files

36
src/paks/vdr/update.sh Normal file
View File

@@ -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@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

27
src/paks/vdradmin/install.sh Normal file
View File

@@ -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@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
extract_files
restore_backup ${NAME}
start_service --background ${NAME}

27
src/paks/vdradmin/uninstall.sh Normal file
View File

@@ -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@ipfire.org>. #
# #
############################################################################
#
. /opt/pakfire/lib/functions.sh
stop_service ${NAME}
make_backup ${NAME}
remove_files

37
src/paks/vdradmin/update.sh Normal file
View File

@@ -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@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}

82
src/patches/vdr-epgsearch-1.0.1.beta3-paths.patch Normal file
View File

@@ -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>

29
src/patches/vdr-streamdev_recordings-64.patch Normal file
View File

@@ -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 "";
}

158
src/scripts/consort.sh Normal file
View File

@@ -0,0 +1,158 @@
#/bin/bash
###############################################################################
# #
# IPFire.org - A linux based firewall #
# Copyright (C) 2007-2013 IPFire Team <info@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/>. #
# #
###############################################################################
# sort conntrack table entries based on ip addresses
# @parm sort field
do_ip_sort() {
sed \
-r \
's/.*src=([0-9\.]+).*dst=([0-9\.]+).*src=.*/\'$1'#\0/' $FILE_NAME \
| sort \
-t. \
-k 1,1n$SORT_ORDER -k 2,2n$SORT_ORDER -k 3,3n$SORT_ORDER -k 4,4n$SORT_ORDER \
| sed \
-r \
's/.*#(.*)/\1/'
}
# sort conntrack table entries based on port addresses
# @parm sort field
do_port_sort() {
sed \
-r \
's/.*sport=([0-9]+).*dport=([0-9]+).*src=.*/\'$1'#\0/' $FILE_NAME \
| sort \
-t# \
-k 1,1n$SORT_ORDER \
| sed \
-r \
's/.*#(.*)/\1/'
}
# sort conntrack table entries based on protocol
do_protocol_sort() {
sed \
-r \
's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+([a-zA-Z0-9]+)/\1#\0/' $FILE_NAME \
| sort \
-t# \
-k 1,1$SORT_ORDER \
| sed \
-r \
's/.*#(.*)/\1/'
}
# sort conntrack table entries based on connection status
do_status_sort() {
sed \
-r \
's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+[0-9]+[ ]+([a-zA-Z_0-9]+)[ ]+|^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+[0-9]+([ ]+)/\1#\0/' $FILE_NAME \
| sort \
-t# \
-k 1,1$SORT_ORDER \
| sed \
-r \
's/.*#(.*)/\1/'
}
# sort conntrack table entries based on connection time to life
do_ttl_sort() {
sed \
-r \
's/^[0-9a-zA-Z]+[ ]+[0-9]+[ ]+[a-zA-Z0-9]+[ ]+[0-9]+[ ]+([0-9]+)[ ]+/\1#\0/' $FILE_NAME \
| sort \
-t# \
-k 1,1n$SORT_ORDER \
| sed \
-r \
's/.*#(.*)/\1/'
}
# sort conntrack table entries based on downloaded bytes
do_downloaded_bytes_sort() {
sed \
-r \
's/.*src=.*bytes=([0-9]+).*src=/\1#\0/' $FILE_NAME \
| sort \
-t# \
-k 1,1n$SORT_ORDER \
| sed \
-r \
's/.*#(.*)/\1/'
}
# sort conntrack table entries based on uploaded bytes
do_uploaded_bytes_sort() {
sed \
-r \
's/.*src=.*bytes=([0-9]+).*/\1#\0/' $FILE_NAME \
| sort \
-t# \
-k 1,1n$SORT_ORDER \
| sed \
-r \
's/.*#(.*)/\1/'
}
SORT_ORDER=
FILE_NAME=
if [ $# -lt 2 ]; then
echo "Usage: consort <sort criteria 1=srcIp,2=dstIp,3=srcPort,4=dstPort,5=protocol,6=connection status> <a=ascending,d=descending> [input file]"
echo " consort.sh 1 a a.txt"
echo " cat a.txt | consort 1 d"
exit;
fi
if [[ 'a d A D' =~ $2 ]]; then
if [[ 'd D' =~ $2 ]]; then
SORT_ORDER=r
fi
else
echo "Unknown sort order \"$2\""
exit;
fi
if [ $# == 3 ]; then
if [ ! -f $3 ]; then
echo "File not found."
exit;
fi
FILE_NAME=$3
fi
if [[ '1 2' =~ $1 ]]; then
do_ip_sort $1
elif [[ '3 4' =~ $1 ]]; then
do_port_sort $(($1-2))
elif [[ '5' =~ $1 ]]; then
do_protocol_sort
elif [[ '6' =~ $1 ]]; then
do_status_sort
elif [[ '7' =~ $1 ]]; then
do_ttl_sort
elif [[ '8' =~ $1 ]]; then
do_downloaded_bytes_sort
elif [[ '9' =~ $1 ]]; then
do_uploaded_bytes_sort
else
echo "Unknown sort criteria \"$1\""
fi