# Make some nice graphs
*/5 * * * * /usr/local/bin/makegraphs >/dev/null
-* 05 * * * /etc/init.d/tmpfs backup >/dev/null
+17 5 * * * /etc/init.d/tmpfs backup >/dev/null
# Force update the dynamic dns registration once a week
# Force update even if IP has not changed once a month if 'minimize update' selected in GUI
#
##########################################################
-
-################### VOLUME MIXER #########################
-#
-# Examples:
-# ALSA Mixer
-mixer_type "alsa"
-mixer_device "default"
-mixer_control "PCM"
-#
-# OSS Mixer
-#mixer_type "oss"
-#mixer_device "/dev/mixer"
-#mixer_control "PCM"
-#
-# Software Mixer
-#mixer_type "software"
-#
-##########################################################
-
-
################## AUDIO OUTPUT ##########################
#
audio_output {
--- /dev/null
+../../../common/Net_SSLeay
\ No newline at end of file
--- /dev/null
+etc/system-release
+bin/probenic.sh
+etc/rc.d/init.d/networking/red
+opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
+var/ipfire/langs/de.pl
+var/ipfire/langs/en.pl
--- /dev/null
+#!/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) 2009 IPFire-Team <info@ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+extract_files
+#
+# Fix tmpfs Backup cronjob entry
+grep -v "tmpfs backup" /var/spool/cron/root.orig > /var/tmp/root.tmp
+echo "17 5 * * * /etc/init.d/tmpfs backup >/dev/null" >> /var/tmp/root.tmp
+fcrontab /var/tmp/root.tmp
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+#Remove some non compat-wireless modules
+rm -rf /lib/modules/2.6.27.31-ipfire/kernel/drivers/net/wireless/ath?k
+rm -rf /lib/modules/2.6.27.31-ipfire/kernel/drivers/net/wireless/rtl818?.ko
+rm -rf /lib/modules/2.6.27.31-ipfire-xen/kernel/drivers/net/wireless/ath?k
+rm -rf /lib/modules/2.6.27.31-ipfire-xen/kernel/drivers/net/wireless/rtl818?.ko
+#Rebuild module dep's
+depmod -a
+#Don't report the exitcode of depmod
+exit 0
usr/bin/mpc
#usr/share/doc/mpc
#usr/share/doc/mpc/AUTHORS
+#usr/share/doc/mpc/COPYING
+#usr/share/doc/mpc/NEWS
#usr/share/doc/mpc/README
-#usr/share/doc/mpc/m3u-handler.sh
#usr/share/doc/mpc/mpc-bashrc
+#usr/share/doc/mpc/mpd-m3u-handler.sh
+#usr/share/doc/mpc/mpd-pls-handler.sh
#usr/share/doc/mpc/mppledit
-#usr/share/doc/mpc/pls-handler.sh
#usr/share/man/man1/mpc.1
-usr/share/mpc
--- /dev/null
+etc/nut.conf.sample
+etc/ups.conf.sample
+etc/upsd.conf.sample
+etc/upsd.users.sample
+etc/upsmon.conf.sample
+etc/upssched.conf.sample
+#lib/udev/rules.d
+lib/udev/rules.d/52-nut-usbups.rules
+usr/bin/apcsmart
+usr/bin/bcmxcp
+usr/bin/bcmxcp_usb
+usr/bin/belkin
+usr/bin/belkinunv
+usr/bin/bestfcom
+usr/bin/bestuferrups
+usr/bin/bestups
+usr/bin/blazer_ser
+usr/bin/blazer_usb
+usr/bin/cyberpower
+usr/bin/dummy-ups
+usr/bin/etapro
+usr/bin/everups
+usr/bin/gamatronic
+usr/bin/genericups
+usr/bin/isbmex
+usr/bin/liebert
+usr/bin/masterguard
+usr/bin/megatec
+usr/bin/megatec_usb
+usr/bin/metasys
+usr/bin/mge-shut
+usr/bin/mge-utalk
+usr/bin/microdowell
+usr/bin/newmge-shut
+usr/bin/oneac
+usr/bin/optiups
+usr/bin/powercom
+usr/bin/powerpanel
+usr/bin/rhino
+usr/bin/richcomm_usb
+usr/bin/safenet
+usr/bin/skel
+usr/bin/snmp-ups
+usr/bin/solis
+usr/bin/tripplite
+usr/bin/tripplite_usb
+usr/bin/tripplitesu
+usr/bin/upsc
+usr/bin/upscmd
+usr/bin/upscode2
+usr/bin/upsdrvctl
+usr/bin/upslog
+usr/bin/upsrw
+usr/bin/upssched-cmd
+usr/bin/usbhid-ups
+usr/bin/victronups
+#usr/cgi-bin
+#usr/html
+#usr/lib/libupsclient.la
+#usr/lib/libupsclient.so
+usr/lib/libupsclient.so.1
+usr/lib/libupsclient.so.1.0.0
+usr/sbin/upsd
+usr/sbin/upsmon
+usr/sbin/upssched
+usr/share/cmdvartab
+usr/share/driver.list
+#usr/share/man/man5/ups.conf.5
+#usr/share/man/man5/upsd.conf.5
+#usr/share/man/man5/upsd.users.5
+#usr/share/man/man5/upsmon.conf.5
+#usr/share/man/man5/upssched.conf.5
+#usr/share/man/man8/apcsmart.8
+#usr/share/man/man8/bcmxcp.8
+#usr/share/man/man8/bcmxcp_usb.8
+#usr/share/man/man8/belkin.8
+#usr/share/man/man8/belkinunv.8
+#usr/share/man/man8/bestfcom.8
+#usr/share/man/man8/bestuferrups.8
+#usr/share/man/man8/bestups.8
+#usr/share/man/man8/blazer.8
+#usr/share/man/man8/cyberpower.8
+#usr/share/man/man8/dummy-ups.8
+#usr/share/man/man8/etapro.8
+#usr/share/man/man8/everups.8
+#usr/share/man/man8/gamatronic.8
+#usr/share/man/man8/genericups.8
+#usr/share/man/man8/isbmex.8
+#usr/share/man/man8/liebert.8
+#usr/share/man/man8/masterguard.8
+#usr/share/man/man8/megatec.8
+#usr/share/man/man8/megatec_usb.8
+#usr/share/man/man8/metasys.8
+#usr/share/man/man8/mge-shut.8
+#usr/share/man/man8/mge-utalk.8
+#usr/share/man/man8/microdowell.8
+#usr/share/man/man8/nutupsdrv.8
+#usr/share/man/man8/oneac.8
+#usr/share/man/man8/optiups.8
+#usr/share/man/man8/powercom.8
+#usr/share/man/man8/powerpanel.8
+#usr/share/man/man8/rhino.8
+#usr/share/man/man8/richcomm_usb.8
+#usr/share/man/man8/safenet.8
+#usr/share/man/man8/snmp-ups.8
+#usr/share/man/man8/solis.8
+#usr/share/man/man8/tripplite.8
+#usr/share/man/man8/tripplite_usb.8
+#usr/share/man/man8/tripplitesu.8
+#usr/share/man/man8/upsc.8
+#usr/share/man/man8/upscmd.8
+#usr/share/man/man8/upscode2.8
+#usr/share/man/man8/upsd.8
+#usr/share/man/man8/upsdrvctl.8
+#usr/share/man/man8/upslog.8
+#usr/share/man/man8/upsmon.8
+#usr/share/man/man8/upsrw.8
+#usr/share/man/man8/upssched.8
+#usr/share/man/man8/usbhid-ups.8
+#usr/share/man/man8/victronups.8
* MailTools-1.74
* Net-DNS-0.47
* Net-IPv4Addr-0.10
+* Net-SSLeay-1.35
* Net-Server-0.93
-* Net_SSLeay.pm-1.25
* Python-2.4.3
* SDL-1.2.11
* Text-Tabs+Wrap-2005.0824
* clamav-0.95.2
* cmake-2.4.8
* collectd-4.5.3
-* compat-wireless-2009-06-17-kmod-2.6.27.31-ipfire
-* compat-wireless-2009-06-17-kmod-2.6.27.31-ipfire-xen
+* compat-wireless-2009-05-30-kmod-2.6.27.31-ipfire
+* compat-wireless-2009-05-30-kmod-2.6.27.31-ipfire-xen
* coreutils-5.96
* cpio-2.6
* cpufrequtils-005
* mldonkey-3.0.0
* module-init-tools-3.5
* motion-3.2.11
-* mpc-0.14
-* mpd-0.14.2
+* mpc-0.17
+* mpd-0.15.3
* mpeg2dec-0.4.0b
* mpfire-ipfire
* mtd-CVS-20070507
* noip_updater_v1.6
* ntfs-3g-2009.2.1
* ntp-4.2.4p7
+* nut-2.4.1
* ocaml-3.09.2
* oinkmaster-2.0
* open-vm-tools-2009.05.22-167859
* rssdler-0.4.0a
* rsync-3.0.6
* rtorrent-0.8.4
-* samba-3.3.7
+* samba-3.3.8
* sane-1.0.19
* screen-4.0.3
* sdparm-1.01
####################### End added for snort rules control #################################
if ($snortsettings{'RULES'} eq 'subscripted') {
- $url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
+ $url="http://dl.snort.org/sub-rules/snortrules-snapshot-2.8_s.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
#$url="http://www.snort.org/pub-bin/oinkmaster.cgi/$snortsettings{'OINKCODE'}/snortrules-snapshot-2.8_s.tar.gz";
} elsif ($snortsettings{'RULES'} eq 'registered') {
$url="http://dl.snort.org/reg-rules/snortrules-snapshot-2.8.tar.gz?oink_code=$snortsettings{'OINKCODE'}";
$macsettings{'MAC'} =~ s/\-/:/g;
my @mac = split(/:/,$macsettings{"MAC"});
if ($#mac == 5) {
- if (($mac[0] eq "00")||($mac[0] eq "0")){
+ foreach (@mac) {
+ unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) {
+ $errormessage = $Lang::tr{'mac address error not valid'};
+ last;
+ }
+ }
+ } else {
+ $errormessage = $Lang::tr{'mac address error not valid'};
+ }
+ $macsettings{'MAC2'} =~ s/\-/:/g;
+
+ if ( not ($macsettings{'MAC2'} eq "" )) {
+ my @mac = split(/:/,$macsettings{"MAC2"});
+ if ($#mac == 5) {
foreach (@mac) {
unless ($_ =~ /^[a-fA-F0-9]{1,2}$/) {
$errormessage = $Lang::tr{'mac address error not valid'};
last;
- }
+ }
}
- } else {
- $errormessage = $Lang::tr{'mac address error not 00'};
- }
- if ($errormessage eq "") {
- $macsettings{'MAC'} =~ s/\:/-/g;
- &General::writehash("${General::swroot}/mac/settings", \%macsettings);
- &Header::openbox('100%', 'left', $Lang::tr{'mac address saved'});
- print "<font class='base'>$Lang::tr{'mac address saved txt'}</font>\n";
- &Header::closebox();
+ } else {
+ $errormessage = $Lang::tr{'mac address error not valid'};
}
- } else {
- $errormessage = $Lang::tr{'mac address error not valid'};
+ }
+ if ($errormessage eq "") {
+ $macsettings{'MAC'} =~ s/\:/-/g;
+ $macsettings{'MAC2'} =~ s/\:/-/g;
+ &General::writehash("${General::swroot}/mac/settings", \%macsettings);
+ &Header::openbox('100%', 'left', $Lang::tr{'mac address saved'});
+ print "<font class='base'>$Lang::tr{'mac address saved txt'}</font>\n";
+ &Header::closebox();
}
}
if ($macsettings{'ACTION'} eq $Lang::tr{'reconnect'}) {
<table border="0" width='100%'>
<tr>
- <td><font class='base'>$Lang::tr{'mac desc'}</font></td>
+ <td colspan=2><font class='base'>$Lang::tr{'mac desc'}</font></td>
</tr>
<tr>
- <td> </td>
+ <td colspan=2> </td><td> </td>
</tr>
<tr>
- <td><font class='base'>$Lang::tr{'mac new'} </font>
+ <td><font class='base'>$Lang::tr{'mac new'} </font></td><td>
END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
print <<END
</tr>
<tr>
- <td><hr /></td>
+ <td colspan=2> </td><td> </td>
+ </tr>
+ <tr>
+ <td><font class='base'>$Lang::tr{'mac2 new'} </font></td><td>
+END
+;
+if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
+print <<END
+ <input type="text" name="MAC2" maxlength="17" value=''/></td>
+END
+;
+} else {
+print <<END
+ <input type="text" name="MAC2" maxlength="17" value='$macsettings{"MAC2"}'/></td>
+END
+;
+}
+print <<END
+ </tr>
+ <tr>
+ <td colspan=2> </td><td> </td>
+ </tr>
+ <tr>
+ <td colspan=2><hr /></td>
</tr>
<tr>
- <td><div align="center">
+ <td
colspan=2><div align="center">
END
;
if ($macsettings{'ACTION'} eq $Lang::tr{'delete'} ) {
$pakfiresettings{'DELPAKS'} = '';
$pakfiresettings{'AUTOUPDATE'} = 'off';
$pakfiresettings{'AUTOUPGRADE'} = 'off';
+$pakfiresettings{'HEALTHCHECK'} = 'on';
$pakfiresettings{'UUID'} = 'on';
sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
$checked{'AUTOUPGRADE'}{'off'} = '';
$checked{'AUTOUPGRADE'}{'on'} = '';
$checked{'AUTOUPGRADE'}{$pakfiresettings{'AUTOUPGRADE'}} = "checked='checked'";
+$checked{'HEALTHCHECK'}{'off'} = '';
+$checked{'HEALTHCHECK'}{'on'} = '';
+$checked{'HEALTHCHECK'}{$pakfiresettings{'HEALTHCHECK'}} = "checked='checked'";
$checked{'UUID'}{'off'} = '';
$checked{'UUID'}{'on'} = '';
$checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'";
<tr><td align='left' width='45%'>$Lang::tr{'pakfire core update auto'}</td><td align="left">
on <input type='radio' name='AUTOUPGRADE' value='on' $checked{'AUTOUPGRADE'}{'on'} /> |
<input type='radio' name='AUTOUPGRADE' value='off' $checked{'AUTOUPGRADE'}{'off'} /> off </td></tr>
+ <tr><td align='left' width='45%'>$Lang::tr{'pakfire health check'}</td><td align="left">
+ on <input type='radio' name='HEALTHCHECK' value='on' $checked{'HEALTHCHECK'}{'on'} /> |
+ <input type='radio' name='HEALTHCHECK' value='off' $checked{'HEALTHCHECK'}{'off'} /> off </td></tr>
<tr><td align='left' width='45%'>$Lang::tr{'pakfire register'}</td><td align="left">
on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} /> |
<input type='radio' name='UUID' value='off' $checked{'UUID'}{'off'} /> off </td></tr>
'mac address done' => 'Die MAC-Adressen Einstellungen werden übernommen',
'mac desc' => 'Sie können an dieser Stelle die MAC-Adresse von red0 ändern. Die Adresse muss in hexadezimal (0-9,a-f) eingegeben werden, eine gültige Eingaben ist z.B. 00-01-02-0e-b8-d6 oder 00:01:02:0e:b8:d6.',
'mac new' => 'Neue MAC-Adresse:',
-'mac new' => 'Neue MAC-Adresse:',
+'mac2 new' => 'Neue MAC-Adresse 2 (vdsl-iptv):',
'magic packet send to:' => 'Sende WOL-Paket an',
'mailmethod' => 'Mail Methode',
'mailprogramm' => 'Mail Programm',
'pakfire configuration' => 'Pakfire Konfiguration',
'pakfire core update auto' => 'Core und Addon Updates automatisch installieren:',
'pakfire core update level' => 'Core-Update-Level',
+'pakfire health check' => 'Mirrors auf Erreichbarkeit prüfen(ping)',
'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus Symbol.',
'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
'pakfire installed addons' => 'Installierte Addons:',
'mac address recon' => 'Trying to reconnect!',
'mac address done' => 'The MAC address settings are going to be saved.',
'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is <br />e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.',
-'mac new' => 'new MAC addresse:',
+'mac new' => 'new MAC address:',
+'mac2 new' => 'new MAC address 2 (vdsl-iptv):',
'magic packet send to:' => 'Magic packet send to:',
'mailmethod' => 'Mailmethod',
'mailprogramm' => 'Mailprogramm',
'pakfire configuration' => 'Pakfire Configuration',
'pakfire core update auto' => 'Install core and addon updates automatically:',
'pakfire core update level' => 'Core-Update-Level',
+'pakfire health check' => 'Check if mirror is reachable(ping)',
'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
'pakfire install package' => 'You want to install the following packages: ',
'pakfire installed addons' => 'Installed Addons:',
include Config
-VER = 1.25
+VER = 1.35
-THISAPP = Net_SSLeay.pm-$(VER)
+THISAPP = Net-SSLeay-$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 87de8a06802fbb63c7c85e89eedbe139
+$(DL_FILE)_MD5 = 1e4ec37a4467eb66a62d3c090ac9029b
install : $(TARGET)
# Set Regulatory Domain to "EU" (use Channel 1-14 max. 20db)
echo options cfg80211 ieee80211_regdom=EU > /etc/modprobe.d/cfg80211
- # Remove original kernel rtl818x modules (compat wireless use the
- # place of newer kernels and so not overwrite it...
+ # Remove original kernel modules (compat wireless use the
+ # place of newer kernels and so not overwrite it...)
+ -rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/ath?k
-rm -rf /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/wireless/rtl818?.ko
-rm -rf $(DIR_APP)
include Config
-VER = 0.14
+VER = 0.17
THISAPP = mpc-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpc
-PAK_VER = 2
+PAK_VER = 3
DEPS = "mpd"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f4218602342cf322872a41dfe0cc72e1
+$(DL_FILE)_MD5 = 3f642c2c2ad7a57a9be7a03351c8c558
install : $(TARGET)
include Config
-VER = 0.14.2
+VER = 0.15.3
THISAPP = mpd-$(VER)
DL_FILE = $(THISAPP).tar.bz2
DIR_APP = $(DIR_SRC)/${THISAPP}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd
-PAK_VER = 7
+PAK_VER = 8
DEPS = "alsa ffmpeg glib libshout libogg libmad libid3tag libvorbis"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 66817a4b4c05454e6488f6b821f2a6a3
+$(DL_FILE)_MD5 = 40f01c53333885f86aace5a37ae55bd1
install : $(TARGET)
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2009 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.4.1
+
+THISAPP = nut-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = nut
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 609ebaf2123fc7171d25a6c742dd7d66
+
+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) && ./configure --prefix=/usr --sysconfdir=/etc
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
include Config
-VER = 3.3.7
+VER = 3.3.8
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = samba
-PAK_VER = 18
+PAK_VER = 19
DEPS = "cups cyrus-sasl"
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bc7228cc686986353df67ff42b1b2b1e
+$(DL_FILE)_MD5 = f4563c7dfca803c6d56a4948f0af05a8
install : $(TARGET)
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
VERSION="2.5"
-CORE="31"
+CORE="32"
GIT_BRANCH=master:master # Version number
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
ipfiremake iftop
ipfiremake motion
ipfiremake joe
+ ipfiremake nut
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild
boot_mesg -n " in read-only mode.\n\nAfter you"
boot_mesg -n " press Enter, this system will be"
boot_mesg -n " halted and powered off."
- boot_mesg -n "\n\nPress enter to continue..." ${INFO}
+ boot_mesg -n "\n\nPress enter to continue or wait a minute..." ${INFO}
boot_mesg "" ${NORMAL}
- read ENTER
+ read -t 60 ENTER
${rc_base}/init.d/halt stop
fi
boot_mesg -n " errors require this system to be"
boot_mesg -n " rebooted.\n\nAfter you press enter,"
boot_mesg -n " this system will be rebooted"
- boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
+ boot_mesg -n "\n\nPress Enter to continue or wait a minute..." ${INFO}
boot_mesg "" ${NORMAL}
- read ENTER
+ read -t 60 ENTER
reboot -f
fi
boot_mesg -n " System Administrator.\n\nAfter you"
boot_mesg -n " press Enter, this system will be"
boot_mesg -n " halted and powered off."
- boot_mesg -n "\n\nPress Enter to continue..." ${INFO}
+ boot_mesg -n "\n\nPress Enter to continue or wait a minute..." ${INFO}
boot_mesg "" ${NORMAL}
- read ENTER
+ read -t 60 ENTER
${rc_base}/init.d/halt stop
fi
boot_mesg -n " ipfire, please be so kind to inform us at"
boot_mesg " info@ipfire.org.\n"
boot_mesg_flush
- boot_mesg -n "Press Enter to continue or wait 3 minutes..." ${INFO}
+ boot_mesg -n "Press Enter to continue or wait a minute..." ${INFO}
boot_mesg "" ${NORMAL}
- read -t 180 ENTER
+ read -t 60 ENTER
}
check_script_status()
eval $(/usr/local/bin/readhash /var/ipfire/mac/settings)
MAC=$(tr - : <<<$MAC)
+MAC2=$(tr - : <<<$MAC2)
TYPE="${RED_TYPE}"
DEVICE="${RED_DEV}"
echo_failure
exit 1
fi
-
-elif [ "${TYPE}" == "DHCP" ]; then
-
- PIDFILE="/var/run/dhcpcd-${DEVICE}.pid"
- LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info"
- DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
- DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
-
fi
+PIDFILE="/var/run/dhcpcd-${DEVICE}.pid"
+LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.info"
+DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
+DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
+
case "${1}" in
start)
if [ "${DEVICE}" != "${GREEN_DEV}" ] && [ "${DEVICE}" != "" ]; then
if [ -n "$MAC" ]; then
boot_mesg "Setting mac address on ${DEVICE} to ${MAC}"
ip link set dev ${DEVICE} address ${MAC}
- evaluate_retval
+ evaluate_retval
fi
-
ip link set ${DEVICE} up
fi
fi
sleep 0.2
ip link set ${PPP_NIC} up
TYPE="pppoe"
-
if [ "${RED_VDSL_IPTV_DISABLE}" == "0" ]; then
PIDFILE="/var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid"
LEASEINFO="/var/ipfire/dhcpc/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.info"
- DHCP_START="-N -R -L /var/ipfire/dhcpc -c /var/ipfire/dhcpc/dhcpcd.exe "
- DHCP_STOP="-k -c /var/ipfire/dhcpc/dhcpcd.exe "
-
+ DHCP_START="-N -R -L /var/ipfire/dhcpc "
+ DHCP_STOP="-k "
# Test to see if there is a stale pid file
if [ -f "$PIDFILE" ]; then
ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
if [ ! -f "$PIDFILE" ]; then
boot_mesg "Createing VLAN Interface ${DEVICE}.${RED_VDSL_IPTV_VLAN} ..."
vconfig add ${DEVICE} ${RED_VDSL_IPTV_VLAN}
+ if [ -n "$MAC2" ]; then
+ boot_mesg "Setting mac address on ${DEVICE}.${RED_VDSL_IPTV_VLAN} to ${MAC2}"
+ ip link set dev ${DEVICE}.${RED_VDSL_IPTV_VLAN} address ${MAC2}
+ evaluate_retval
+ fi
boot_mesg -n "Starting dhcpcd on the ${DEVICE}.${RED_VDSL_IPTV_VLAN} interface..."
/sbin/dhcpcd ${DEVICE}.${RED_VDSL_IPTV_VLAN} ${DHCP_START} >/dev/null 2>&1
RET="$?"
boot_mesg "Bringing up the $TYPE interface on $PPP_NIC ..."
ip addr flush dev $PPP_NIC >/dev/null 2>&1
if [ "$TYPE" == "pptp" ]; then
- ip addr add $PPTP_NICCFG dev $PPP_NIC
+ if [ "$PPTP_NICCFG" == "dhcp" ]; then
+ DHCP_START="-N -R -L /var/ipfire/dhcpc "
+ DHCP_STOP="-k "
+
+ # Test to see if there is a stale pid file
+ if [ -f "$PIDFILE" ]; then
+ ps `cat "$PIDFILE"` | grep dhcpcd > /dev/null
+ if [ $? != 0 ]; then
+ rm -f /var/run/dhcpcd-${DEVICE}.${RED_VDSL_IPTV_VLAN}.pid > /dev/null
+ fi
+ fi
+
+ if [ ! -f "$PIDFILE" ]; then
+ boot_mesg -n "Starting dhcpcd on the ${DEVICE} interface..."
+ /sbin/dhcpcd ${DEVICE} -G ${DHCP_START} >/dev/null 2>&1
+ RET="$?"
+
+ if [ "$RET" = "0" ]; then
+ . /var/ipfire/dhcpc/dhcpcd-${DEVICE}.info
+ echo ""
+ echo_ok
+ boot_mesg " DHCP Assigned Settings for ${DEVICE}:"
+ boot_mesg_flush
+ boot_mesg " IP Address: $IPADDR"
+ boot_mesg_flush
+ boot_mesg " Hostname: $RED_DHCP_HOSTNAME"
+ boot_mesg_flush
+ boot_mesg " Subnet Mask: $NETMASK"
+ boot_mesg_flush
+ boot_mesg " Default Gateway: $GATEWAY"
+ boot_mesg_flush
+ boot_mesg " DNS Server: $DNS"
+ boot_mesg_flush
+
+ else
+ echo ""
+ $(exit "$RET")
+ evaluate_retval
+ fi
+ fi
+ else
+ ip addr add $PPTP_NICCFG dev $PPP_NIC
+ fi
fi
ip link set ${PPP_NIC} up
else
fi
run_subdir ${rc_base}/init.d/networking/red.down/
- elif [ "$TYPE" == "DHCP" ]; then
- boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
- if [ -e $LEASEINFO ]; then
- . $LEASEINFO
- if [ "$LEASETIME" = "4294967295" ]; then
- # do nothing, just echo ok
- echo ""
- echo_ok
- else
- if [ -n "$DHCP_STOP" ]; then
- /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null
- RET="$?"
- if [ "$RET" -eq 0 ]; then
- echo ""
- echo_ok
- elif [ "$RET" -eq 1 ]; then
- boot_mesg "dhcpcd not running!" ${WARNING}
- echo_warning
- else
- echo ""
- echo_failure
- fi
- else
- echo ""
- killproc dhcpcd
- fi
- fi
- else
- boot_mesg -n "LEASEINFO Test failed! - " ${WARNING}
- boot_mesg "dhcpcd is not running!" ${WARNING}
- echo_warning
- fi
-
elif [ "$TYPE" == "PPPOE" ]; then
boot_mesg "Bringing down the PPP interface ..."
## Disable vnstat collection
$(date +%s):: > /dev/null 2>&1
fi
+ if [ -e $LEASEINFO ]; then
+ boot_mesg -n "Stopping dhcpcd on the ${DEVICE} interface..."
+ . $LEASEINFO
+ if [ "$LEASETIME" = "4294967295" ]; then
+ # do nothing, just echo ok
+ echo ""
+ echo_ok
+ else
+ if [ -n "$DHCP_STOP" ]; then
+ /sbin/dhcpcd ${DEVICE} $DHCP_STOP &> /dev/null
+ RET="$?"
+ if [ "$RET" -eq 0 ]; then
+ echo ""
+ echo_ok
+ elif [ "$RET" -eq 1 ]; then
+ boot_mesg "dhcpcd not running!" ${WARNING}
+ echo_warning
+ else
+ echo ""
+ echo_failure
+ fi
+ else
+ echo ""
+ killproc dhcpcd
+ fi
+ fi
+ fi
+
if [ "$DEVICE" != "${GREEN_DEV}" ] && [ "$DEVICE" != "" ]; then
link_status=`ip link show $DEVICE.${RED_VDSL_INET_VLAN} 2> /dev/null`
if [ -n "${link_status}" ]; then
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2009 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 #
# #
###############################################################################
-kudzu -qps -c NETWORK | egrep "desc|network.hwaddr|driver" > /var/ipfire/ethernet/scanned_nics 2>/dev/null
+if [ -e /var/ipfire/ethernet/scanned_nics ]; then
+ rm -f /var/ipfire/ethernet/scanned_nics
+fi
+touch /var/ipfire/ethernet/scanned_nics
+
+for card in `ls /sys/class/net`; do
+
+ #Check if this is an Ethernet device (type=1)
+ if [ `cat /sys/class/net/$card/type` == "1" ]; then
+ hwaddr=`cat /sys/class/net/$card/address`
+
+ #Check if mac is valid (not 00:00... or FF:FF...)
+ if [ ! "$hwaddr" == "00:00:00:00:00:00" ];then
+ if [ ! "$hwaddr" == "ff:ff:ff:ff:ff:ff" ];then
+
+ driver=`grep PHYSDEVDRIVER= /sys/class/net/$card/uevent | cut -d"=" -f2`
+ type=`grep PHYSDEVBUS= /sys/class/net/$card/uevent | cut -d"=" -f2`
+
+ #Default if not avaiable in /sys/class/net
+ if [ "a$type" == "a" ]; then
+ type="???"
+ fi
+ if [ "a$driver" == "a" ]; then
+ driver="Unknown Network card"
+ fi
+ description=`echo $type: $driver`
+
+ #Get more details for pci and usb devices
+ if [ "$type" == "pci" ]; then
+ slotname=`grep PCI_SLOT_NAME= /sys/class/net/$card/device/uevent | cut -d"=" -f2`
+ name=`lspci -s $slotname | cut -d':' -f3 | cut -c 2-`
+ description=`echo $type: $name`
+ fi
+ if [ "$type" == "usb" ]; then
+ bus=`grep DEVICE= /sys/class/net/$card/device/uevent | cut -d"/" -f5`
+ dev=`grep DEVICE= /sys/class/net/$card/device/uevent | cut -d"/" -f6`
+ #work around the base8 convert
+ let bus=`echo 1$bus`-1000
+ let dev=`echo 1$dev`-1000
+ name=`lsusb -s $bus:$dev | cut -d':' -f3 | cut -c 6-`
+ description=`echo $type: $name`
+ fi
+
+ echo desc: \"$description\" >>/var/ipfire/ethernet/scanned_nics
+ echo driver: $driver >>/var/ipfire/ethernet/scanned_nics
+ echo network.hwaddr: $hwaddr >>/var/ipfire/ethernet/scanned_nics
+ fi
+ fi
+ fi
+done
# Revert Accesspoint marking at mac address
sed -i 's|hwaddr: 06:|hwaddr: 00:|g' /var/ipfire/ethernet/scanned_nics
$proto = $templine[0];
$host = $templine[1];
$path = $templine[2];
- if (pinghost("$host")) {
+ if ($pakfiresettings{'HEALTHCHECK'} eq "off") {
+ logger("PING INFO: Healthcheck is disabled");
+ $found = 1;
+ return ($proto, $host, $path);
+ }
+ elsif (pinghost("$host")) {
$found = 1;
return ($proto, $host, $path);
}
projects / people / pmueller / ipfire-2.x.git / commitdiff
