From d21be44c0c63d02a9cf4efff92a1646f76d27540 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 26 Feb 2009 22:47:47 +0100 Subject: [PATCH 01/11] qos/imq is now in input and forward tables --- config/qos/makeqosscripts.pl | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index d12e8b39d..e4ce34f8a 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -502,10 +502,14 @@ print </dev/null 2>&1 # STOP IMQ-DEVICE ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1 - iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0 + iptables -t mangle --delete FORWATD -i $qossettings{'RED_DEV'} -j IMQ --todev 0 + iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j IMQ --todev 0 # rmmod imq # this crash on 2.6.25.xx # REMOVE & FLUSH CHAINS iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1 @@ -664,6 +669,8 @@ print </dev/null 2>&1 iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS + iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j QOS-INC + iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j QOS-TOS iptables -t mangle --flush QOS-INC >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1 iptables -t mangle --flush QOS-TOS >/dev/null 2>&1 From ce9fac5bfd040f87bb5002eabe3a7fc365aff9a6 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 26 Feb 2009 23:17:52 +0100 Subject: [PATCH 02/11] Revert "Remove load of ide_generic module at installer" Without this cdrom doesnt work. This reverts commit 5f03692030dacd1b225207ed8c11fcd0e562ec3e. --- src/install+setup/install/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 84cc51e99..9f0d0b08b 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -104,7 +104,7 @@ int main(int argc, char *argv[]) } } - // mysystem("/sbin/modprobe ide-generic"); + mysystem("/sbin/modprobe ide-generic"); // mysystem("/sbin/modprobe generic"); mysystem("/sbin/modprobe ide-cd"); mysystem("/sbin/modprobe ide-disk"); From 01f255d949c3f911fade12d1a02cd3d9180dee18 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 26 Feb 2009 23:22:21 +0100 Subject: [PATCH 03/11] Add ide-generic to initrd --- lfs/mkinitcpio | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lfs/mkinitcpio b/lfs/mkinitcpio index 0c6e70ebf..0251d5786 100644 --- a/lfs/mkinitcpio +++ b/lfs/mkinitcpio @@ -74,7 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) sed -i 's|^FILELIST=.*|FILELIST="$$(mktemp)"|g' /sbin/mkinitcpio sed -i 's|^HOOKS=.*|HOOKS="base udev autodetect ide usb scsi pata sata filesystems"|g' /etc/mkinitcpio.conf sed -i 's|^MODULES=.*|MODULES="reiser4 reiserfs ext3"|g' /etc/mkinitcpio.conf -# sed -i 's|ide-cd|ide-cd_mod|g' /lib/initcpio/install/ide + sed -i 's|ide-cd|ide-cd ide-generic|g' /lib/initcpio/install/ide @rm -rf $(DIR_APP) @$(POSTBUILD) From 2847f5f168992693ea155e4684827e366121d8cc Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 27 Feb 2009 08:09:08 +0100 Subject: [PATCH 04/11] Change filename for backupiso to core27 --- config/rootfiles/core/27/files | 1 + src/scripts/backupiso | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config/rootfiles/core/27/files b/config/rootfiles/core/27/files index b69e5bfe9..97aef8eff 100644 --- a/config/rootfiles/core/27/files +++ b/config/rootfiles/core/27/files @@ -57,3 +57,4 @@ usr/bin/wpakey usr/local/bin/rebuild-initrd var/ipfire/menu.d/20-status.menu srv/web/ipfire/cgi-bin/atm-status.cgi +usr/local/bin/backupiso diff --git a/src/scripts/backupiso b/src/scripts/backupiso index ba1725213..bbcfe29c9 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -2,7 +2,7 @@ # FIXME: edit this lines before release URL=http://download.ipfire.org/iso/ -ISO=ipfire-2.3.i586-full.iso +ISO=ipfire-2.3.i586-full-core27.iso #URL=http://www.rowie.at/ipfire/builds/v2.3test/Beta3/20081001-17uhr/ #ISO=ipfire-2.3-test.i586-full.iso From d2855e1849fec08ced5e3b423ce920307957ca4c Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 27 Feb 2009 18:50:26 +0100 Subject: [PATCH 05/11] Revert "qos/imq is now in input and forward tables" This reverts commit d21be44c0c63d02a9cf4efff92a1646f76d27540. This dosnt work --- config/qos/makeqosscripts.pl | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index e4ce34f8a..d12e8b39d 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -502,14 +502,10 @@ print </dev/null 2>&1 # STOP IMQ-DEVICE ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1 - iptables -t mangle --delete FORWATD -i $qossettings{'RED_DEV'} -j IMQ --todev 0 - iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j IMQ --todev 0 + iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0 # rmmod imq # this crash on 2.6.25.xx # REMOVE & FLUSH CHAINS iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1 @@ -669,8 +664,6 @@ print </dev/null 2>&1 iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS - iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j QOS-INC - iptables -t mangle --delete INPUT -i $qossettings{'RED_DEV'} -j QOS-TOS iptables -t mangle --flush QOS-INC >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1 iptables -t mangle --flush QOS-TOS >/dev/null 2>&1 From 88b8ffac6b258e7b7687eb26111134bf435e23ca Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 27 Feb 2009 20:33:02 +0100 Subject: [PATCH 06/11] Make IMQ Switchable between PREROUTING and POSTROUTING --- config/qos/makeqosscripts.pl | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index d12e8b39d..a374a383b 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -75,6 +75,7 @@ $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`; $qossettings{'IMQ_DEV'} = 'imq0'; $qossettings{'TOS'} = ''; $qossettings{'VALID'} = 'yes'; +$qossettings{'IMQ_MODE'} = 'PREROUTING'; &General::readhash("${General::swroot}/qos/settings", \%qossettings); @@ -498,6 +499,9 @@ foreach $subclassentry (sort @subclasses) { print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n"; } } + +if ( $qossettings{'IMQ_MODE'} eq 'POSTROUTING' ) +{ print </dev/null 2>&1 # STOP IMQ-DEVICE ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1 - iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0 + iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 -o ! $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1 + iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1 # rmmod imq # this crash on 2.6.25.xx # REMOVE & FLUSH CHAINS iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/dev/null 2>&1 iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 iptables -t mangle --flush QOS-OUT >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1 - iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC - iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS + iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1 + iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 + iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1 + iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1 iptables -t mangle --flush QOS-INC >/dev/null 2>&1 iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1 iptables -t mangle --flush QOS-TOS >/dev/null 2>&1 From 7ea444c881488046643f59ecf02d7d258620f1ad Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 28 Feb 2009 14:08:46 +0100 Subject: [PATCH 07/11] Fix installer for ATOM / ICH7 boards Fix Slogan an Windowname at first dialogwindows of the installer --- src/install+setup/install/main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 9f0d0b08b..60bfa35d1 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -90,7 +90,9 @@ int main(int argc, char *argv[]) newtInit(); newtCls(); - /* Do usb detection first for usb keyboard */ + newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN ); + sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN); + if (! (cmdfile = fopen("/proc/cmdline", "r"))) { fprintf(flog, "Couldn't open commandline: /proc/cmdline\n"); @@ -104,8 +106,11 @@ int main(int argc, char *argv[]) } } + // Starting hardware detection + runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ..."); + + // Load common modules mysystem("/sbin/modprobe ide-generic"); - // mysystem("/sbin/modprobe generic"); mysystem("/sbin/modprobe ide-cd"); mysystem("/sbin/modprobe ide-disk"); mysystem("/sbin/modprobe uhci-hcd"); @@ -138,12 +143,7 @@ int main(int argc, char *argv[]) ctr = langtrs[choice]; strcpy(shortlangname, shortlangnames[choice]); - newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN ); newtPushHelpLine(ctr[TR_HELPLINE]); - sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN); - - // Starting hardware detection - runcommandwithstatus("/bin/probehw.sh", ctr[TR_PROBING_HARDWARE]); sprintf(message, ctr[TR_WELCOME], NAME); newtWinMessage(title, ctr[TR_OK], message); From 5c95fd4076cfca2444c78a3d3e525336da2922b7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 1 Mar 2009 00:36:43 +0100 Subject: [PATCH 08/11] Load ata_piix prior kudzu hardware detection because kudzu select ata_generic for ich7 --- src/install+setup/install/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 60bfa35d1..8c7f06436 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -106,6 +106,9 @@ int main(int argc, char *argv[]) } } + // Load ata-piix prior kudzu because kudzu use ata-generic for ich7 + mysystem("/sbin/modprobe ata_piix"); + // Starting hardware detection runcommandwithstatus("/bin/probehw.sh", "Probing Hardware ..."); From a61948ad39106d185b71ae93c93348c200188385 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Sun, 1 Mar 2009 09:56:48 +0100 Subject: [PATCH 09/11] Added guardian bugfix to snort init skript --- src/initscripts/init.d/snort | 1 + 1 file changed, 1 insertion(+) diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index 16f7953ef..a2db0de0f 100644 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -74,6 +74,7 @@ case "$1" in IFACE=`/bin/cat /var/ipfire/red/iface 2>/dev/null | /usr/bin/tr -d '\012'` sed -e "s/^Interface.*/Interface ${IFACE}/" /var/ipfire/guardian/guardian.conf > temp mv temp /var/ipfire/guardian/guardian.conf + chown nobody.root /var/ipfire/guardian/guardian.conf boot_mesg "Starting Guardian..." loadproc /usr/local/bin/guardian.pl -c /var/ipfire/guardian/guardian.conf From c4a45281a16b45e0c69a1f5851995e6d34b2e150 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sun, 1 Mar 2009 13:10:32 +0100 Subject: [PATCH 10/11] Added new package: perl-gettext. --- config/rootfiles/packages/perl-gettext | 7 +++ doc/packages-list.txt | 1 + lfs/perl-gettext | 81 ++++++++++++++++++++++++++ make.sh | 1 + 4 files changed, 90 insertions(+) create mode 100644 config/rootfiles/packages/perl-gettext create mode 100644 lfs/perl-gettext diff --git a/config/rootfiles/packages/perl-gettext b/config/rootfiles/packages/perl-gettext new file mode 100644 index 000000000..26eead626 --- /dev/null +++ b/config/rootfiles/packages/perl-gettext @@ -0,0 +1,7 @@ +/usr/lib/perl5/site_perl/5.8.8/i586-linux/Locale +/usr/lib/perl5/site_perl/5.8.8/i586-linux/Locale/gettext.pm +/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale +/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale/gettext +/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale/gettext/.packlist +/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale/gettext/gettext.bs +/usr/lib/perl5/site_perl/5.8.8/i586-linux/auto/Locale/gettext/gettext.so diff --git a/doc/packages-list.txt b/doc/packages-list.txt index cea1aabfa..47e9d4603 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -235,6 +235,7 @@ * pcmciautils-014 * pcre-7.7 * perl-5.8.8 +* perl-gettext-1.05 * php-5.2.4 * phpSANE-0.3.3 * pkg-config-0.20 diff --git a/lfs/perl-gettext b/lfs/perl-gettext new file mode 100644 index 000000000..60f664be3 --- /dev/null +++ b/lfs/perl-gettext @@ -0,0 +1,81 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.05 + +THISAPP = perl-gettext-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ccd91913079d5f7318335158a2858518 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +md5 : $(subst %,%_MD5,$(objects)) + +#dist: +# make-packages.sh Archive-Tar $(THISAPP)-ipfire-beta-1 + +############################################################################### +# 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) diff --git a/make.sh b/make.sh index cc1f540d4..b008bdb98 100755 --- a/make.sh +++ b/make.sh @@ -590,6 +590,7 @@ buildipfire() { ipfiremake taglib ipfiremake mediatomb ipfiremake sslh + ipfiremake perl-gettext echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild From 7c328e6e60bbce72bc3bec2839675e08565ffd88 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sun, 1 Mar 2009 18:32:11 +0100 Subject: [PATCH 11/11] Added new package: vdradmin. --- config/rootfiles/packages/vdradmin | 243 +++++++++++++++++++++++++++++ doc/packages-list.txt | 1 + lfs/vdradmin | 83 ++++++++++ make.sh | 1 + src/initscripts/init.d/vdradmin | 50 ++++++ 5 files changed, 378 insertions(+) create mode 100644 config/rootfiles/packages/vdradmin create mode 100644 lfs/vdradmin create mode 100644 src/initscripts/init.d/vdradmin diff --git a/config/rootfiles/packages/vdradmin b/config/rootfiles/packages/vdradmin new file mode 100644 index 000000000..19ba6d89c --- /dev/null +++ b/config/rootfiles/packages/vdradmin @@ -0,0 +1,243 @@ +opt/vdradmin +#opt/vdradmin/COPYING +#opt/vdradmin/CREDITS +#opt/vdradmin/ChangeLog +#opt/vdradmin/FAQ +#opt/vdradmin/HISTORY +#opt/vdradmin/INSTALL +#opt/vdradmin/LGPL.txt +#opt/vdradmin/README +#opt/vdradmin/README.translators +#opt/vdradmin/REQUIREMENTS +opt/vdradmin/autotimer2searchtimer.pl +opt/vdradmin/contrib +opt/vdradmin/contrib/HISTORY +opt/vdradmin/contrib/HISTORY.bigpatch +opt/vdradmin/contrib/HISTORY.ct +opt/vdradmin/contrib/HISTORY.macfly +opt/vdradmin/contrib/README.Streaming +opt/vdradmin/contrib/user.css.example +opt/vdradmin/contrib/vdradmind.bl_example +opt/vdradmin/convert.pl +#opt/vdradmin/install.sh +opt/vdradmin/lib +opt/vdradmin/lib/File +opt/vdradmin/lib/File/Temp.pm +opt/vdradmin/lib/MIME +opt/vdradmin/lib/MIME/Base64.pm +opt/vdradmin/lib/Template +opt/vdradmin/lib/Template.pm +opt/vdradmin/lib/Template/Base.pm +opt/vdradmin/lib/Template/Config.pm +opt/vdradmin/lib/Template/Constants.pm +opt/vdradmin/lib/Template/Context.pm +opt/vdradmin/lib/Template/Directive.pm +opt/vdradmin/lib/Template/Document.pm +opt/vdradmin/lib/Template/Exception.pm +opt/vdradmin/lib/Template/Filters.pm +opt/vdradmin/lib/Template/Grammar.pm +opt/vdradmin/lib/Template/Iterator.pm +opt/vdradmin/lib/Template/Namespace +opt/vdradmin/lib/Template/Namespace/Constants.pm +opt/vdradmin/lib/Template/Parser.pm +opt/vdradmin/lib/Template/Plugin +opt/vdradmin/lib/Template/Plugin.pm +opt/vdradmin/lib/Template/Plugin/Date.pm +opt/vdradmin/lib/Template/Plugin/HTML.pm +opt/vdradmin/lib/Template/Plugin/JavaScript.pm +opt/vdradmin/lib/Template/Plugins.pm +opt/vdradmin/lib/Template/Provider.pm +opt/vdradmin/lib/Template/Service.pm +opt/vdradmin/lib/Template/Stash +opt/vdradmin/lib/Template/Stash.pm +opt/vdradmin/lib/Template/Stash/Context.pm +opt/vdradmin/lib/Template/Stash/XS.pm +opt/vdradmin/lib/Template/Test.pm +opt/vdradmin/lib/Template/View.pm +opt/vdradmin/lib/URI +opt/vdradmin/lib/URI/Escape.pm +opt/vdradmin/locale +opt/vdradmin/locale/cs +opt/vdradmin/locale/cs/LC_MESSAGES +opt/vdradmin/locale/cs/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/cs_CZ.utf8 +opt/vdradmin/locale/cs_CZ.utf8/LC_MESSAGES +opt/vdradmin/locale/cs_CZ.utf8/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/de +opt/vdradmin/locale/de/LC_MESSAGES +opt/vdradmin/locale/de/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/de_DE.utf8 +opt/vdradmin/locale/de_DE.utf8/LC_MESSAGES +opt/vdradmin/locale/de_DE.utf8/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/en_US.utf8 +opt/vdradmin/locale/en_US.utf8/LC_MESSAGES +opt/vdradmin/locale/en_US.utf8/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/es +opt/vdradmin/locale/es/LC_MESSAGES +opt/vdradmin/locale/es/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/es_ES.utf8 +opt/vdradmin/locale/es_ES.utf8/LC_MESSAGES +opt/vdradmin/locale/es_ES.utf8/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/fi +opt/vdradmin/locale/fi/LC_MESSAGES +opt/vdradmin/locale/fi/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/fi_FI.utf8 +opt/vdradmin/locale/fi_FI.utf8/LC_MESSAGES +opt/vdradmin/locale/fi_FI.utf8/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/fr +opt/vdradmin/locale/fr/LC_MESSAGES +opt/vdradmin/locale/fr/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/fr_FR.utf8 +opt/vdradmin/locale/fr_FR.utf8/LC_MESSAGES +opt/vdradmin/locale/fr_FR.utf8/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/it +opt/vdradmin/locale/it/LC_MESSAGES +opt/vdradmin/locale/it/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/it_IT.utf8 +opt/vdradmin/locale/it_IT.utf8/LC_MESSAGES +opt/vdradmin/locale/it_IT.utf8/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/nl +opt/vdradmin/locale/nl/LC_MESSAGES +opt/vdradmin/locale/nl/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/nl_NL.utf8 +opt/vdradmin/locale/nl_NL.utf8/LC_MESSAGES +opt/vdradmin/locale/nl_NL.utf8/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/ru +opt/vdradmin/locale/ru/LC_MESSAGES +opt/vdradmin/locale/ru/LC_MESSAGES/vdradmin.mo +opt/vdradmin/locale/ru_RU.utf8 +opt/vdradmin/locale/ru_RU.utf8/LC_MESSAGES +opt/vdradmin/locale/ru_RU.utf8/LC_MESSAGES/vdradmin.mo +#opt/vdradmin/make.sh +opt/vdradmin/po +opt/vdradmin/po/cs.po +opt/vdradmin/po/cs_CZ.utf8.po +opt/vdradmin/po/de.po +opt/vdradmin/po/de_DE.utf8.po +opt/vdradmin/po/en_US.utf8.po +opt/vdradmin/po/es.po +opt/vdradmin/po/es_ES.utf8.po +opt/vdradmin/po/fi.po +opt/vdradmin/po/fi_FI.utf8.po +opt/vdradmin/po/fr.po +opt/vdradmin/po/fr_FR.utf8.po +opt/vdradmin/po/it.po +opt/vdradmin/po/it_IT.utf8.po +opt/vdradmin/po/nl.po +opt/vdradmin/po/nl_NL.utf8.po +opt/vdradmin/po/ru.po +opt/vdradmin/po/ru_RU.utf8.po +opt/vdradmin/po/vdradmin.pot +opt/vdradmin/template +opt/vdradmin/template/default +opt/vdradmin/template/default/about.html +opt/vdradmin/template/default/at_timer_list.html +opt/vdradmin/template/default/at_timer_new.html +opt/vdradmin/template/default/config.html +opt/vdradmin/template/default/default +opt/vdradmin/template/default/default/aktion.png +opt/vdradmin/template/default/default/close.png +opt/vdradmin/template/default/default/configure.png +opt/vdradmin/template/default/default/cut.png +opt/vdradmin/template/default/default/delete.png +opt/vdradmin/template/default/default/edit.png +opt/vdradmin/template/default/default/fern_03.jpg +opt/vdradmin/template/default/default/fern_05.jpg +opt/vdradmin/template/default/default/fern_06.jpg +opt/vdradmin/template/default/default/fern_07.jpg +opt/vdradmin/template/default/default/fern_08.jpg +opt/vdradmin/template/default/default/fern_09.jpg +opt/vdradmin/template/default/default/fern_10.jpg +opt/vdradmin/template/default/default/fern_11.jpg +opt/vdradmin/template/default/default/fern_12.jpg +opt/vdradmin/template/default/default/fern_13.jpg +opt/vdradmin/template/default/default/fern_15.jpg +opt/vdradmin/template/default/default/fern_18.jpg +opt/vdradmin/template/default/default/fern_19.jpg +opt/vdradmin/template/default/default/fern_22.jpg +opt/vdradmin/template/default/default/fern_23.jpg +opt/vdradmin/template/default/default/fern_24.jpg +opt/vdradmin/template/default/default/fern_25.jpg +opt/vdradmin/template/default/default/fern_28.jpg +opt/vdradmin/template/default/default/fern_31.jpg +opt/vdradmin/template/default/default/fern_32.jpg +opt/vdradmin/template/default/default/fern_33.jpg +opt/vdradmin/template/default/default/fern_36.jpg +opt/vdradmin/template/default/default/fern_39.jpg +opt/vdradmin/template/default/default/fern_40.jpg +opt/vdradmin/template/default/default/fern_41.jpg +opt/vdradmin/template/default/default/fern_42.jpg +opt/vdradmin/template/default/default/fern_43.jpg +opt/vdradmin/template/default/default/fern_44.jpg +opt/vdradmin/template/default/default/fern_45.jpg +opt/vdradmin/template/default/default/fern_46.jpg +opt/vdradmin/template/default/default/fern_47.jpg +opt/vdradmin/template/default/default/fern_48.jpg +opt/vdradmin/template/default/default/fern_back.jpg +opt/vdradmin/template/default/default/fern_mute.jpg +opt/vdradmin/template/default/default/find.png +opt/vdradmin/template/default/default/folder_video.png +opt/vdradmin/template/default/default/help.png +opt/vdradmin/template/default/default/imdb.png +opt/vdradmin/template/default/default/info_button.png +opt/vdradmin/template/default/default/info_button_disabled.png +opt/vdradmin/template/default/default/logo.png +opt/vdradmin/template/default/default/noise.gif +opt/vdradmin/template/default/default/pfeile_nachlinks.png +opt/vdradmin/template/default/default/pfeile_nachlinks_soft.png +opt/vdradmin/template/default/default/pfeile_nachrechts.png +opt/vdradmin/template/default/default/pfeile_nachrechts_soft.png +opt/vdradmin/template/default/default/play.png +opt/vdradmin/template/default/default/poempl_gelb.png +opt/vdradmin/template/default/default/poempl_grau.png +opt/vdradmin/template/default/default/poempl_gruen.png +opt/vdradmin/template/default/default/poempl_rot.png +opt/vdradmin/template/default/default/rec.gif +opt/vdradmin/template/default/default/rec_button.png +opt/vdradmin/template/default/default/sortiert_asc.gif +opt/vdradmin/template/default/default/sortiert_desc.gif +opt/vdradmin/template/default/default/spacer.gif +opt/vdradmin/template/default/default/stream.png +opt/vdradmin/template/default/default/sum_find.png +opt/vdradmin/template/default/default/tv_bottom.gif +opt/vdradmin/template/default/default/udef_search.png +opt/vdradmin/template/default/default/view.png +opt/vdradmin/template/default/epgsearch_config.html +opt/vdradmin/template/default/epgsearch_list.html +opt/vdradmin/template/default/epgsearch_new.html +opt/vdradmin/template/default/error.html +opt/vdradmin/template/default/favicon.ico +opt/vdradmin/template/default/help_at_timer_list.html +opt/vdradmin/template/default/help_at_timer_new.html +opt/vdradmin/template/default/help_config.html +opt/vdradmin/template/default/help_edit_epg.html +opt/vdradmin/template/default/help_no.html +opt/vdradmin/template/default/help_rec_list.html +opt/vdradmin/template/default/help_timer_list.html +opt/vdradmin/template/default/help_timer_new.html +opt/vdradmin/template/default/index.html +opt/vdradmin/template/default/infobox.js +opt/vdradmin/template/default/library.js +opt/vdradmin/template/default/navigation.html +opt/vdradmin/template/default/noauth.html +opt/vdradmin/template/default/noperm.html +opt/vdradmin/template/default/prog_detail.html +opt/vdradmin/template/default/prog_detail_form.html +opt/vdradmin/template/default/prog_list.html +opt/vdradmin/template/default/prog_list2.html +opt/vdradmin/template/default/prog_summary.html +opt/vdradmin/template/default/prog_summary2.html +opt/vdradmin/template/default/prog_timeline.html +opt/vdradmin/template/default/rc.html +opt/vdradmin/template/default/rec_edit.html +opt/vdradmin/template/default/rec_list.html +opt/vdradmin/template/default/style.css +opt/vdradmin/template/default/timeline.js +opt/vdradmin/template/default/timer_list.html +opt/vdradmin/template/default/timer_new.html +opt/vdradmin/template/default/tv.html +opt/vdradmin/template/default/vdr_cmds.html +#opt/vdradmin/uninstall.sh +opt/vdradmin/vdradmind +opt/vdradmin/vdradmind.pl +#opt/vdradmin/vdradmind.pl.1 diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 47e9d4603..7e658a422 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -303,6 +303,7 @@ * util-linux-2.12r * v4l-dvb-e9a442d3b53a-kmod-2.6.25.19 * vdr-1.6.0 +* vdradmin-am-3.6.4 * vim-7.0 * vlan.1.9 * vlc-0.8.6i diff --git a/lfs/vdradmin b/lfs/vdradmin new file mode 100644 index 000000000..4636cd892 --- /dev/null +++ b/lfs/vdradmin @@ -0,0 +1,83 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 3.6.4 + +THISAPP = vdradmin-am-$(VER) +DL_FILE = $(THISAPP).tar.bz2 +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = vdradmin +PAK_VER = 1 + +DEPS = perl-gettext vdr + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_MD5 = ae3efed3f803d8524098f15a365c7838 + +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 jxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_SRC) && mv -vf vdradmin-am-$(VER) vdradmin && mv -vf vdradmin /opt + #@rm -rf $(DIR_APP) + @$(POSTBUILD) diff --git a/make.sh b/make.sh index b008bdb98..95eec7e97 100755 --- a/make.sh +++ b/make.sh @@ -591,6 +591,7 @@ buildipfire() { ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext + ipfiremake vdradmin echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild echo >> $BASEDIR/build/var/ipfire/firebuild diff --git a/src/initscripts/init.d/vdradmin b/src/initscripts/init.d/vdradmin new file mode 100644 index 000000000..e0ef0612e --- /dev/null +++ b/src/initscripts/init.d/vdradmin @@ -0,0 +1,50 @@ +#!/bin/sh +######################################################################## +# Begin $rc_base/init.d/vdradmind +# +# Description : This is a script that starts vdradmind as deamon +# +# Authors : Arne Fitzenreiter (arne@ipfire.org) +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +. /etc/sysconfig/rc +. ${rc_functions} + +case "${1}" in + start) + boot_mesg "Starting VDR Webadministration Tool..." + if [ "$(ps -A | grep vdradmind)" != "" ]; then + boot_mesg "Error! Already running!" + echo_failure + exit 1; + fi + loadproc /opt/vdradmin/vdradmind.pl + ;; + + stop) + boot_mesg "Stopping VDR Webadministration Tool..." + killproc /opt/vdradmin/vdradmind.pl + ;; + + restart) + ${0} stop + sleep 1 + ${0} start + ;; + + status) + statusproc /usr/bin/vdradmind + ;; + + *) + echo "Usage: ${0} {start|stop|restart|status}" + exit 1 + ;; +esac + +# End $rc_base/init.d/vdr