IPFire-SCM November 2012

ipfire-scm@lists.ipfire.org

1 participants
100 discussions

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 5e30738231ced6bfbfb603742a40265e7eef1113
by git＠ipfire.org 07 Nov '12

07 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via 5e30738231ced6bfbfb603742a40265e7eef1113 (commit) via 0d3e1e8c1da5b0ae9e56ac320be02bdb043485d4 (commit) via 9724a0bcd4e962d109fa3effb7b4a82aa7d420b6 (commit) via ab74c839ddf125b73f7b79e925c31d03e92aa079 (commit) via 55ecfab2b7d879554df2b5027865b4cdff9b95b1 (commit) via fb874f2e7cb3a251d16b0555e51a45e219b9e46b (commit) from f0a4269bfee8bce9904abe62144bc377ca7aab14 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 5e30738231ced6bfbfb603742a40265e7eef1113 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 7 21:13:45 2012 +0100 updater: remove double files from backup. Add some missed files. commit 0d3e1e8c1da5b0ae9e56ac320be02bdb043485d4 Merge: f0a4269 9724a0b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Nov 7 00:01:32 2012 +0100 Merge remote-tracking branch 'origin/next' into thirteen ----------------------------------------------------------------------- Summary of changes: config/outgoingfw/outgoingfw.pl | 61 +++++++++++------------------ config/rootfiles/core/64/filelists/files | 2 + config/rootfiles/core/65/filelists/files | 2 +- config/rootfiles/core/65/filelists/setup | 1 + config/rootfiles/core/65/update.sh | 33 ++++++++++++---- doc/language_issues.de | 3 + doc/language_issues.en | 3 + doc/language_issues.es | 8 +++- doc/language_issues.fr | 8 +++- doc/language_issues.pl | 8 +++- doc/language_issues.ru | 8 +++- doc/language_missings | 20 ++++++++++ html/cgi-bin/credits.cgi | 43 +++++++++++---------- langs/de/cgi-bin/de.pl | 13 ++++-- langs/en/cgi-bin/en.pl | 13 ++++-- langs/es/cgi-bin/es.pl | 8 ++-- langs/fr/cgi-bin/fr.pl | 8 ++-- langs/pl/cgi-bin/pl.pl | 8 ++-- langs/ru/cgi-bin/ru.pl | 8 ++-- src/initscripts/init.d/firewall | 1 - 20 files changed, 155 insertions(+), 104 deletions(-) create mode 120000 config/rootfiles/core/65/filelists/setup Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index 8bb49e0..7dd1430 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -181,6 +181,7 @@ foreach $configentry (sort @configs) @PROTO = ("tcp","udp"); } + my $macrule = 0; foreach $PROTO (@PROTO){ foreach $SOURCE (@SOURCE) { $SOURCE =~ s/\s//gi; @@ -189,9 +190,10 @@ foreach $configentry (sort @configs) if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; - $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; + $CMD = "-m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; + $macrule = 1; } else { - $CMD = "/sbin/iptables -A OUTGOINGFW -s $SOURCE -d $DESTINATION -p $PROTO"; + $CMD = "-s $SOURCE -d $DESTINATION -p $PROTO"; } if ($configline[8] && ( $configline[3] ne 'esp' || $configline[3] ne 'gre') ) { @@ -218,24 +220,12 @@ foreach $configentry (sort @configs) $CMD = "$CMD -o $netsettings{'RED_DEV'}"; if ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE1' ) { - if ($DEBUG) { - print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '\n"; - } else { - system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '"); - } + applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '", $macrule); } elsif ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE2' ) { - if ($DEBUG) { - print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n"; - } else { - system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '"); - } + applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '", $macrule); } - if ($DEBUG) { - print "$CMD -j $DO\n"; - } else { - system("$CMD -j $DO"); - } + applyrule("$CMD -j $DO", $macrule); } } } @@ -246,10 +236,9 @@ open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile"; @p2ps = <FILE>; close FILE; -$CMD = "/sbin/iptables -A OUTGOINGFW -m ipp2p"; +$CMD = "-m ipp2p"; -foreach $p2pentry (sort @p2ps) -{ +foreach $p2pentry (sort @p2ps) { @p2pline = split( /\;/, $p2pentry ); if ( $outfwsettings{'POLICY'} eq 'MODE2' ) { $DO = "DROP"; @@ -264,27 +253,23 @@ foreach $p2pentry (sort @p2ps) } } if ($P2PSTRING) { - if ($DEBUG) { - print "$CMD $P2PSTRING -j $DO\n"; - } else { - system("$CMD $P2PSTRING -j $DO"); - } + applyrule("$CMD $P2PSTRING -j $DO", 0); } if ( $outfwsettings{'POLICY'} eq 'MODE1' ) { - if ( $outfwsettings{'MODE1LOG'} eq 'on' ) { - $CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '"; - if ($DEBUG) { - print "$CMD\n"; - } else { - system("$CMD"); - } - } + if ( $outfwsettings{'MODE1LOG'} eq 'on' ) { + applyrule("-o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '", 0); + } - $CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '"; - if ($DEBUG) { - print "$CMD\n"; - } else { - system("$CMD"); + applyrule("-o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '", 0); +} + +sub applyrule($$) { + my $cmd = shift; + my $macrule = shift; + + system("/sbin/iptables -A OUTGOINGFWMAC $cmd"); + if ($macrule == 0) { + system("/sbin/iptables -A OUTGOINGFW $cmd"); } } diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files index 26308b4..a3b99c8 100644 --- a/config/rootfiles/core/64/filelists/files +++ b/config/rootfiles/core/64/filelists/files @@ -1,4 +1,6 @@ etc/system-release etc/issue +etc/rc.d/init.d/firewall srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi +var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files index 6d0030e..62756fa 100644 --- a/config/rootfiles/core/65/filelists/files +++ b/config/rootfiles/core/65/filelists/files @@ -15,6 +15,6 @@ srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/services.cgi srv/web/ipfire/cgi-bin/updatexlrator.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/local/sbin/setup var/ipfire/langs var/ipfire/qos/bin/makeqosscripts.pl +usr/local/bin/readhash diff --git a/config/rootfiles/core/65/filelists/setup b/config/rootfiles/core/65/filelists/setup new file mode 120000 index 0000000..209374b --- /dev/null +++ b/config/rootfiles/core/65/filelists/setup @@ -0,0 +1 @@ +../../../common/setup \ No newline at end of file diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh index 6335e1d..0f1d431 100644 --- a/config/rootfiles/core/65/update.sh +++ b/config/rootfiles/core/65/update.sh @@ -24,6 +24,15 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 +function add_to_backup () +{ + # Add path to ROOTFILES but remove old entries to prevent double + # files in the tar + grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp + mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES + echo $1 >> /opt/pakfire/tmp/ROOTFILES +} + # # Remove old core updates from pakfire cache to save space... core=65 @@ -52,12 +61,13 @@ fi echo First we made a backup of all files that was inside of the echo update archive. This may take a while ... # Add some files that are not in the package to backup -echo lib/modules >> /opt/pakfire/tmp/ROOTFILES -echo etc/udev >> /opt/pakfire/tmp/ROOTFILES -echo lib/udev >> /opt/pakfire/tmp/ROOTFILES -echo boot >> /opt/pakfire/tmp/ROOTFILES -echo etc/snort >> /opt/pakfire/tmp/ROOTFILES -echo usr/lib/snort_* >> /opt/pakfire/tmp/ROOTFILES +add_to_backup lib/modules +add_to_backup etc/udev +add_to_backup lib/udev +add_to_backup boot +add_to_backup etc/snort +add_to_backup usr/lib/snort_* +add_to_backup usr/share/zoneinfo # Backup the files tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ @@ -76,12 +86,16 @@ rm -rf /lib/modules/*-ipfire # # Remove old udev rules. # -cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then + cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +fi cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ rm -rf /etc/udev rm -rf /lib/udev mkdir -p /etc/udev/rules.d -mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ +if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then + mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ +fi mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ # @@ -95,9 +109,10 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org /etc/init.d/squid stop /etc/init.d/ipsec stop -#Remove old snort +#Remove old snort and zoneinfo rm -rf /etc/snort rm -rf /usr/lib/snort_* +rm -rf /usr/share/zoneinfo # #Extract files diff --git a/doc/language_issues.de b/doc/language_issues.de index d182dbb..5a42ae5 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -117,6 +117,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client WARNING: translation string unused: eciadsl help @@ -279,6 +280,8 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red +WARNING: translation string unused: openvpn disabled +WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning diff --git a/doc/language_issues.en b/doc/language_issues.en index 3ae364c..6d6a2a6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -307,6 +308,8 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red +WARNING: translation string unused: openvpn disabled +WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning diff --git a/doc/language_issues.es b/doc/language_issues.es index 6b2ab8e..6bcbf86 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -520,14 +523,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group @@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b1a94a1..189932f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -497,7 +498,9 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -522,14 +525,14 @@ WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed @@ -542,6 +545,7 @@ WARNING: untranslated string: system information WARNING: untranslated string: upload new ruleset WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap access point WARNING: untranslated string: wlanap channel diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 6b2ab8e..6bcbf86 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -520,14 +523,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group @@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.ru b/doc/language_issues.ru index ee67873..e25d81d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -139,6 +139,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -489,7 +490,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount @@ -503,14 +506,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: route config changed @@ -518,4 +521,5 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_missings b/doc/language_missings index 16e3ba5..55e0e40 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -10,6 +10,8 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< advproxy errmsg invalid upstream proxy +< deprecated fs warn < dns address deleted txt < fireinfo ipfire version < fireinfo is disabled @@ -41,12 +43,15 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < snort working < static routes < system information < upload new ruleset < urlfilter file ext block < urlfilter mode block +< visit us at < vpn keyexchange < wlanap access point < wlanap channel @@ -74,7 +79,9 @@ ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ +< advproxy errmsg invalid upstream proxy < Async logging enabled +< deprecated fs warn < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -103,6 +110,8 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < outgoing firewall add ip group < outgoing firewall add mac group < outgoing firewall edit ip group @@ -120,6 +129,7 @@ < Set time on boot < static routes < system information +< visit us at < vpn keyexchange ############################################################################ # Checking install/setup translations for language: pl # @@ -127,6 +137,8 @@ ############################################################################ # Checking cgi-bin translations for language: pl # ############################################################################ +< advproxy errmsg invalid upstream proxy +< deprecated fs warn < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -147,7 +159,10 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < static routes +< visit us at < vpn keyexchange ############################################################################ # Checking install/setup translations for language: ru # @@ -156,7 +171,9 @@ # Checking cgi-bin translations for language: ru # ############################################################################ < Add a route +< advproxy errmsg invalid upstream proxy < day-graph +< deprecated fs warn < disk access per < Edit an existing route < extrahd because there is already a device mounted @@ -183,8 +200,11 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < outgoing traffic in bytes per second < static routes +< visit us at < vpn keyexchange < week-graph < year-graph diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 0d091a2..3224267 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -41,9 +41,16 @@ print <<END $Lang::tr{'donation-text'} <div align="center"> - <a href="http://www.ipfire.org/donate">$Lang::tr{'donation'}</a> + <a href="http://www.ipfire.org/donate"> + $Lang::tr{'donation'} + </a> </div> - + <hr> + + $Lang::tr{'our donors'}: + + <a href="http://www.irrsinn.de" target="_blank">irrsinn.de gmbh</a> + END ; &Header::closebox(); @@ -51,12 +58,11 @@ END &Header::openbox('100%', 'left', $Lang::tr{'credits'}); print <<END - <center><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></center> - - - IPFire is based on IPCop and Smoothwall. Many thanks to its developers. - We want to say thank you to all of the developers who ever contributed anything to IPFire. - + +<center> + $Lang::tr{'visit us at'}: <a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a> +</center> + <hr> Development: @@ -90,23 +96,18 @@ Peter Schälchli Jan Paul Tücking (<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\(a)ipfire.org</a>) - -This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. - END ; &Header::closebox(); -&Header::openbox('100%', 'left', 'General Public License v3'); -if ( -e "/usr/share/doc/licenses/GPLv3" ) { - print '<textarea rows="25" cols="75" readonly="true">'; - print `cat "/usr/share/doc/licenses/GPLv3"`; - print '</textarea>'; -} -else { - print ' <a href="http://www.gnu.org/licenses/gpl-3.0.txt" target="_blank">GENERAL PUBLIC LICENSE</a> '; -} - +&Header::openbox("100%", "left", $Lang::tr{'other'}); +print <<END + + This product includes GeoLite data created by MaxMind, available from + <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. + +END +; &Header::closebox(); &Header::closebigbox(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3ec57eb..f686c30 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -222,8 +222,8 @@ 'advproxy errmsg invalid mac' => 'Ungültige MAC-Adresse', 'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller', 'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port', -'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy', 'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy', +'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy', 'advproxy errmsg invalid user' => 'Benutzername existiert nicht', 'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich', @@ -1311,10 +1311,12 @@ 'organization too long' => 'Organisation ist zu lang; sie sollte nicht länger als 60 Zeichen lang sein.', 'original' => 'Original', 'os level' => 'OS Level', +'other' => 'Sonstiges', 'other countries' => 'Andere Länder', 'other login script' => 'Anderes Anmeldeskript', 'otherip' => 'Andere IP', 'otherport' => 'Anderer Port', +'our donors' => 'Unsere Unterstützer', 'out' => 'Aus', 'outgoing' => 'ausgehend', 'outgoing firewall' => 'Ausgehende Firewall', @@ -1345,10 +1347,14 @@ 'ovpn config' => 'OVPN-Konfiguration', 'ovpn device' => 'OpenVPN Gerät', 'ovpn dl' => 'OVPN-Konfiguration downloaden', +'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', +'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN auf BLAU', 'ovpn on orange' => 'OpenVPN auf ORANGE', 'ovpn on red' => 'OpenVPN auf ROT', +'ovpn routes push' => 'Routen (eine pro Zeile)', +'ovpn routes push options' => 'Route push Optionen', 'ovpn server status' => 'OpenVPN Server Status', 'ovpn subnet' => 'OpenVPN Subnetz (z.B. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Das OpenVPN Subnetz ist ungültig.', @@ -1369,10 +1375,6 @@ 'ovpn_processprioVH' => 'Sehr Hoch', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push Optionen', -'ovpn routes push' => 'Routen (eine pro Zeile)', -'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', -'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?', @@ -2096,6 +2098,7 @@ 'virtual address' => 'Virtuelle Addresse', 'virtual private networking' => 'Virtuelles Privates Netzwerk', 'visible in browselist' => 'Sichtbar in der Verzeichnisliste', +'visit us at' => 'Besuchen Sie uns auf', 'voldown10' => 'Laustärke um 10 verringern', 'voldown5' => 'Laustärke um 5 verringern', 'volup10' => 'Laustärke um 10 erhöhen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 003056f..5fe2391 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -222,8 +222,8 @@ 'advproxy errmsg invalid mac' => 'Invalid MAC address', 'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller', 'advproxy errmsg invalid proxy port' => 'Invalid proxy port', -'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', 'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP', +'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', 'advproxy errmsg invalid user' => 'Username does not exist', 'advproxy errmsg ldap base dn' => 'LDAP base DN required', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required', @@ -1339,10 +1339,12 @@ 'organization too long' => 'Organization is too long; it should not be longer than 60 characters.', 'original' => 'Original', 'os level' => 'OS Level', +'other' => 'Other', 'other countries' => 'Other countries', 'other login script' => 'Other login script', 'otherip' => 'other IP', 'otherport' => 'other Port', +'our donors' => 'Our donors', 'out' => 'Out', 'outgoing' => 'outgoing', 'outgoing firewall' => 'Outgoing Firewall', @@ -1373,10 +1375,14 @@ 'ovpn config' => 'OVPN-Config', 'ovpn device' => 'OpenVPN device:', 'ovpn dl' => 'OVPN-Config Download', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN on BLUE', 'ovpn on orange' => 'OpenVPN on ORANGE', 'ovpn on red' => 'OpenVPN on RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Current OpenVPN server status:', 'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.', @@ -1397,10 +1403,6 @@ 'ovpn_processprioVH' => 'Very high', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', @@ -2130,6 +2132,7 @@ 'virtual address' => 'Virtual Address', 'virtual private networking' => 'Virtual Private Networking', 'visible in browselist' => 'visible in browselist', +'visit us at' => 'Visit us at', 'voldown10' => 'Decrease volume by 10', 'voldown5' => 'Decrease volume by 5', 'volup10' => 'Increase volume by 10', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 387ab4a..f96284f 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1328,10 +1328,14 @@ 'ovpn config' => 'Configruación de OVPN', 'ovpn device' => 'Dispositivo OpenVPN', 'ovpn dl' => 'Configuración de descargas OVPN', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'Registro de log de OVPN', 'ovpn on blue' => 'OpenVPN en BLUE', 'ovpn on orange' => 'OpenVPN en ORANGE', 'ovpn on red' => 'OpenVPN en RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Status actual del servidor OpenVPN:', 'ovpn subnet' => 'Subred de OpenVPN (ej. 10.0.10.0/255.255.255.0', 'ovpn subnet is invalid' => 'Subred de OpenVPN no es válida.', @@ -1352,10 +1356,6 @@ 'ovpn_processprioVH' => 'Muy alto', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Falló la instalación del paquete', 'pagerefresh' => 'La página se está actualiszando, por favor espere.', 'pakfire accept all' => '¿Desea instalar todos los paquetes?', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index a537459..e91191d 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1340,10 +1340,14 @@ 'ovpn config' => 'OVPN-Config', 'ovpn device' => 'Périphérique OpenVPN :', 'ovpn dl' => 'Télécharger OVPN-Config', +'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e', +'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN sur BLEU', 'ovpn on orange' => 'OpenVPN sur ORANGE', 'ovpn on red' => 'OpenVPN sur RED', +'ovpn routes push' => 'Routes (une par ligne):', +'ovpn routes push options' => 'Options de Route push', 'ovpn server status' => 'Statut actuel du serveur OpenVPN :', 'ovpn subnet' => 'Sous-réseau OpenVPN (c.a.d. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Sous-réseau OpenVPN non valide.', @@ -1364,10 +1368,6 @@ 'ovpn_processprioVH' => 'Très haute', 'ovpnstatus log' => 'Journal statut OVPN', 'ovpnsys log' => 'Journal système OVPN', -'ovpn routes push options' => 'Options de Route push', -'ovpn routes push' => 'Routes (une par ligne):', -'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide', -'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e', 'package failed to install' => 'L\'installation du paquet a échoué.', 'pagerefresh' => 'La page est entrain d\'être rafraichie, veuillez attendre.', 'pakfire accept all' => 'Voulez-vous installer tout les paquets?', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index d8f1890..e0d64a0 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1351,10 +1351,14 @@ 'ovpn config' => 'OVPN-Konfig', 'ovpn device' => 'Urządzenie OpenVPN:', 'ovpn dl' => 'Pobierz konfig OVPN', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'Log OVPN', 'ovpn on blue' => 'OpenVPN na int. BLUE', 'ovpn on orange' => 'OpenVPN na int. ORANGE', 'ovpn on red' => 'OpenVPN na int. RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Stan serwera OpenVPN:', 'ovpn subnet' => 'Podsieć OpenVPN (np. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Podsieć OpenVPN jest niepoprawna.', @@ -1375,10 +1379,6 @@ 'ovpn_processprioVH' => 'Bardzo wysoki', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Błąd instalacji pakietu.', 'pagerefresh' => 'Strona jest odświeżana, proszę czekać.', 'pakfire accept all' => 'Czy chcesz zainstalować wszystkie pakiety?', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index c1afd01..4619983 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1342,10 +1342,14 @@ 'ovpn config' => 'Настройки OVPN', 'ovpn device' => 'Устройство OpenVPN:', 'ovpn dl' => 'Загрузка настроек OVPN', +'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён', +'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти', 'ovpn log' => 'Журнал OVPN', 'ovpn on blue' => 'OpenVPN на BLUE', 'ovpn on orange' => 'OpenVPN на ORANGE', 'ovpn on red' => 'OpenVPN на RED', +'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)', +'ovpn routes push options' => 'Настройки маршрутизации', 'ovpn server status' => 'Текущий статус сервера OpenVPN:', 'ovpn subnet' => 'Подсеть OpenVPN (e.g. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Подсеть OpenVPN задана неверно.', @@ -1366,10 +1370,6 @@ 'ovpn_processprioVH' => 'Very high', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Настройки маршрутизации', -'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)', -'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти', -'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён', 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index c90687c..7478978 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -188,7 +188,6 @@ case "$1" in # Outgoing Firewall /sbin/iptables -A FORWARD -j OUTGOINGFWMAC - /sbin/iptables -A FORWARD -j OUTGOINGFW # localhost and ethernet. /sbin/iptables -A INPUT -i lo -m state --state NEW -j ACCEPT hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. f0a4269bfee8bce9904abe62144bc377ca7aab14
by git＠ipfire.org 06 Nov '12

06 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via f0a4269bfee8bce9904abe62144bc377ca7aab14 (commit) via 1d4a8e4b0d7b33078ea11fcac113fcf4365ca987 (commit) from 0721f5a634db267d7c43504dfc8e86861a7ce72b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f0a4269bfee8bce9904abe62144bc377ca7aab14 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 6 23:59:30 2012 +0100 started updater from 2.11 to 2.13. commit 1d4a8e4b0d7b33078ea11fcac113fcf4365ca987 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 6 19:37:14 2012 +0100 deleted strongswan testupdater. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/{strongswan => 65}/exclude | 3 + .../rootfiles/core/65/filelists/armv5tel/binutils | 1 + config/rootfiles/core/65/filelists/armv5tel/dracut | 1 + config/rootfiles/core/65/filelists/armv5tel/gcc | 1 + config/rootfiles/core/65/filelists/armv5tel/glibc | 1 + .../core/65/filelists/armv5tel/linux-kirkwood | 1 + .../core/65/filelists/armv5tel/linux-omap | 1 + .../rootfiles/core/65/filelists/armv5tel/linux-rpi | 1 + .../core/65/filelists/armv5tel/rpi-firmware | 1 + config/rootfiles/core/65/filelists/armv5tel/u-boot | 1 + .../core/65/filelists/armv5tel/util-linux | 1 + config/rootfiles/core/65/filelists/autoconf | 1 + config/rootfiles/core/65/filelists/automake | 1 + config/rootfiles/core/65/filelists/bash | 1 + config/rootfiles/core/65/filelists/cairo | 1 + config/rootfiles/core/65/filelists/capi4k-utils | 1 + config/rootfiles/core/65/filelists/cmake | 1 + .../{oldcore/38 => core/65}/filelists/collectd | 0 .../28 => core/65}/filelists/compat-wireless | 0 config/rootfiles/core/65/filelists/coreutils | 1 + .../{oldcore/28 => core/65}/filelists/curl | 0 .../{oldcore/36 => core/65}/filelists/cyrus-sasl | 0 config/rootfiles/core/{64 => 65}/filelists/daq | 0 .../rootfiles/core/65/filelists/dejavu-fonts-ttf | 1 + config/rootfiles/core/{63 => 65}/filelists/dhcp | 0 config/rootfiles/core/65/filelists/dvb-firmwares | 1 + .../{oldcore/38 => core/65}/filelists/e2fsprogs | 0 config/rootfiles/core/65/filelists/file | 1 + config/rootfiles/core/65/filelists/files | 20 ++ config/rootfiles/core/65/filelists/fontconfig | 1 + config/rootfiles/core/65/filelists/gawk | 1 + .../{oldcore/50 => core/65}/filelists/gettext | 0 config/rootfiles/core/65/filelists/glib | 1 + .../{oldcore/53 => core/65}/filelists/gmp | 0 config/rootfiles/core/65/filelists/gmp-compat | 1 + config/rootfiles/core/65/filelists/gnupg | 1 + config/rootfiles/core/65/filelists/grep | 1 + config/rootfiles/core/65/filelists/hdparm | 1 + config/rootfiles/core/65/filelists/i586/acpid | 1 + config/rootfiles/core/65/filelists/i586/binutils | 1 + config/rootfiles/core/65/filelists/i586/dracut | 1 + .../{oldcore/53 => core/65}/filelists/i586/gcc | 0 .../{oldcore/53 => core/65}/filelists/i586/glibc | 0 config/rootfiles/core/65/filelists/i586/grub | 2 + config/rootfiles/core/65/filelists/i586/linux | 1 + .../core/65/filelists/i586/strongswan-padlock | 1 + config/rootfiles/core/65/filelists/i586/util-linux | 1 + .../rootfiles/core/{63 => 65}/filelists/inetutils | 0 config/rootfiles/core/65/filelists/iproute2 | 1 + .../{oldcore/28 => core/65}/filelists/iptables | 0 config/rootfiles/core/65/filelists/kbd | 1 + config/rootfiles/core/65/filelists/less | 1 + config/rootfiles/core/65/filelists/libffi | 1 + .../{oldcore/28 => core/65}/filelists/libnl | 0 config/rootfiles/core/65/filelists/libsigc++ | 1 + config/rootfiles/core/65/filelists/libtool | 1 + config/rootfiles/core/65/filelists/linux-atm | 1 + .../28 => core/65}/filelists/linux-firmware | 0 config/rootfiles/core/65/filelists/m4 | 1 + .../{oldcore/28 => core/65}/filelists/mISDNuser | 0 config/rootfiles/core/65/filelists/man | 1 + config/rootfiles/core/65/filelists/misc-progs | 1 + config/rootfiles/core/65/filelists/mpfr | 1 + .../{oldcore/34 => core/65}/filelists/ncurses | 0 config/rootfiles/core/65/filelists/newt | 1 + config/rootfiles/core/65/filelists/openldap | 1 + .../{oldcore/28 => core/65}/filelists/openssl | 0 config/rootfiles/core/{61 => 65}/filelists/pam | 0 config/rootfiles/core/65/filelists/pango | 1 + config/rootfiles/core/65/filelists/pciutils | 1 + config/rootfiles/core/65/filelists/pcmciautils | 1 + .../{oldcore/38 => core/65}/filelists/pcre | 0 config/rootfiles/core/65/filelists/pcre-compat | 1 + config/rootfiles/core/65/filelists/pixman | 1 + config/rootfiles/core/65/filelists/popt | 1 + config/rootfiles/core/65/filelists/pptp | 1 + config/rootfiles/core/65/filelists/readline | 1 + config/rootfiles/core/65/filelists/readline-compat | 1 + .../38 => core/65}/filelists/reiserfsprogs | 0 .../{oldcore/38 => core/65}/filelists/rrdtool | 0 config/rootfiles/core/65/filelists/screen | 1 + config/rootfiles/core/65/filelists/sdparm | 1 + config/rootfiles/core/65/filelists/sed | 1 + config/rootfiles/core/65/filelists/shadow | 1 + config/rootfiles/core/65/filelists/slang | 1 + .../34 => core/65}/filelists/smartmontools | 0 config/rootfiles/core/{64 => 65}/filelists/snort | 0 .../core/{strongswan => 65}/filelists/strongswan | 0 config/rootfiles/core/65/filelists/sysfsutils | 1 + config/rootfiles/core/65/filelists/sysvinit | 1 + config/rootfiles/core/65/filelists/texinfo | 1 + .../{oldcore/54 => core/65}/filelists/tzdata | 0 .../{oldcore/28 => core/65}/filelists/udev | 0 config/rootfiles/core/65/filelists/usbutils | 1 + config/rootfiles/core/65/filelists/wget | 1 + .../28 => core/65}/filelists/wpa_supplicant | 0 .../rootfiles/{oldcore/38 => core/65}/filelists/xz | 0 .../{oldcore/38 => core/65}/filelists/zlib | 0 config/rootfiles/core/{strongswan => 65}/meta | 0 config/rootfiles/core/65/update.sh | 201 ++++++++++++++++++++ config/rootfiles/core/strongswan/filelists/files | 6 - config/rootfiles/core/strongswan/update.sh | 89 --------- 102 files changed, 291 insertions(+), 95 deletions(-) rename config/rootfiles/core/{strongswan => 65}/exclude (81%) create mode 120000 config/rootfiles/core/65/filelists/armv5tel/binutils create mode 120000 config/rootfiles/core/65/filelists/armv5tel/dracut create mode 120000 config/rootfiles/core/65/filelists/armv5tel/gcc create mode 120000 config/rootfiles/core/65/filelists/armv5tel/glibc create mode 120000 config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood create mode 120000 config/rootfiles/core/65/filelists/armv5tel/linux-omap create mode 120000 config/rootfiles/core/65/filelists/armv5tel/linux-rpi create mode 120000 config/rootfiles/core/65/filelists/armv5tel/rpi-firmware create mode 120000 config/rootfiles/core/65/filelists/armv5tel/u-boot create mode 120000 config/rootfiles/core/65/filelists/armv5tel/util-linux create mode 120000 config/rootfiles/core/65/filelists/autoconf create mode 120000 config/rootfiles/core/65/filelists/automake create mode 120000 config/rootfiles/core/65/filelists/bash create mode 120000 config/rootfiles/core/65/filelists/cairo create mode 120000 config/rootfiles/core/65/filelists/capi4k-utils create mode 120000 config/rootfiles/core/65/filelists/cmake copy config/rootfiles/{oldcore/38 => core/65}/filelists/collectd (100%) copy config/rootfiles/{oldcore/28 => core/65}/filelists/compat-wireless (100%) create mode 120000 config/rootfiles/core/65/filelists/coreutils copy config/rootfiles/{oldcore/28 => core/65}/filelists/curl (100%) copy config/rootfiles/{oldcore/36 => core/65}/filelists/cyrus-sasl (100%) copy config/rootfiles/core/{64 => 65}/filelists/daq (100%) create mode 120000 config/rootfiles/core/65/filelists/dejavu-fonts-ttf copy config/rootfiles/core/{63 => 65}/filelists/dhcp (100%) create mode 120000 config/rootfiles/core/65/filelists/dvb-firmwares copy config/rootfiles/{oldcore/38 => core/65}/filelists/e2fsprogs (100%) create mode 120000 config/rootfiles/core/65/filelists/file create mode 100644 config/rootfiles/core/65/filelists/files create mode 120000 config/rootfiles/core/65/filelists/fontconfig create mode 120000 config/rootfiles/core/65/filelists/gawk copy config/rootfiles/{oldcore/50 => core/65}/filelists/gettext (100%) create mode 120000 config/rootfiles/core/65/filelists/glib copy config/rootfiles/{oldcore/53 => core/65}/filelists/gmp (100%) create mode 120000 config/rootfiles/core/65/filelists/gmp-compat create mode 120000 config/rootfiles/core/65/filelists/gnupg create mode 120000 config/rootfiles/core/65/filelists/grep create mode 120000 config/rootfiles/core/65/filelists/hdparm create mode 120000 config/rootfiles/core/65/filelists/i586/acpid create mode 120000 config/rootfiles/core/65/filelists/i586/binutils create mode 120000 config/rootfiles/core/65/filelists/i586/dracut copy config/rootfiles/{oldcore/53 => core/65}/filelists/i586/gcc (100%) copy config/rootfiles/{oldcore/53 => core/65}/filelists/i586/glibc (100%) create mode 100644 config/rootfiles/core/65/filelists/i586/grub create mode 120000 config/rootfiles/core/65/filelists/i586/linux create mode 120000 config/rootfiles/core/65/filelists/i586/strongswan-padlock create mode 120000 config/rootfiles/core/65/filelists/i586/util-linux copy config/rootfiles/core/{63 => 65}/filelists/inetutils (100%) create mode 120000 config/rootfiles/core/65/filelists/iproute2 copy config/rootfiles/{oldcore/28 => core/65}/filelists/iptables (100%) create mode 120000 config/rootfiles/core/65/filelists/kbd create mode 120000 config/rootfiles/core/65/filelists/less create mode 120000 config/rootfiles/core/65/filelists/libffi copy config/rootfiles/{oldcore/28 => core/65}/filelists/libnl (100%) create mode 120000 config/rootfiles/core/65/filelists/libsigc++ create mode 120000 config/rootfiles/core/65/filelists/libtool create mode 120000 config/rootfiles/core/65/filelists/linux-atm copy config/rootfiles/{oldcore/28 => core/65}/filelists/linux-firmware (100%) create mode 120000 config/rootfiles/core/65/filelists/m4 copy config/rootfiles/{oldcore/28 => core/65}/filelists/mISDNuser (100%) create mode 120000 config/rootfiles/core/65/filelists/man create mode 120000 config/rootfiles/core/65/filelists/misc-progs create mode 120000 config/rootfiles/core/65/filelists/mpfr copy config/rootfiles/{oldcore/34 => core/65}/filelists/ncurses (100%) create mode 120000 config/rootfiles/core/65/filelists/newt create mode 120000 config/rootfiles/core/65/filelists/openldap copy config/rootfiles/{oldcore/28 => core/65}/filelists/openssl (100%) copy config/rootfiles/core/{61 => 65}/filelists/pam (100%) create mode 120000 config/rootfiles/core/65/filelists/pango create mode 120000 config/rootfiles/core/65/filelists/pciutils create mode 120000 config/rootfiles/core/65/filelists/pcmciautils copy config/rootfiles/{oldcore/38 => core/65}/filelists/pcre (100%) create mode 120000 config/rootfiles/core/65/filelists/pcre-compat create mode 120000 config/rootfiles/core/65/filelists/pixman create mode 120000 config/rootfiles/core/65/filelists/popt create mode 120000 config/rootfiles/core/65/filelists/pptp create mode 120000 config/rootfiles/core/65/filelists/readline create mode 120000 config/rootfiles/core/65/filelists/readline-compat copy config/rootfiles/{oldcore/38 => core/65}/filelists/reiserfsprogs (100%) copy config/rootfiles/{oldcore/38 => core/65}/filelists/rrdtool (100%) create mode 120000 config/rootfiles/core/65/filelists/screen create mode 120000 config/rootfiles/core/65/filelists/sdparm create mode 120000 config/rootfiles/core/65/filelists/sed create mode 120000 config/rootfiles/core/65/filelists/shadow create mode 120000 config/rootfiles/core/65/filelists/slang copy config/rootfiles/{oldcore/34 => core/65}/filelists/smartmontools (100%) copy config/rootfiles/core/{64 => 65}/filelists/snort (100%) rename config/rootfiles/core/{strongswan => 65}/filelists/strongswan (100%) create mode 120000 config/rootfiles/core/65/filelists/sysfsutils create mode 120000 config/rootfiles/core/65/filelists/sysvinit create mode 120000 config/rootfiles/core/65/filelists/texinfo copy config/rootfiles/{oldcore/54 => core/65}/filelists/tzdata (100%) copy config/rootfiles/{oldcore/28 => core/65}/filelists/udev (100%) create mode 120000 config/rootfiles/core/65/filelists/usbutils create mode 120000 config/rootfiles/core/65/filelists/wget copy config/rootfiles/{oldcore/28 => core/65}/filelists/wpa_supplicant (100%) copy config/rootfiles/{oldcore/38 => core/65}/filelists/xz (100%) copy config/rootfiles/{oldcore/38 => core/65}/filelists/zlib (100%) rename config/rootfiles/core/{strongswan => 65}/meta (100%) create mode 100644 config/rootfiles/core/65/update.sh delete mode 100644 config/rootfiles/core/strongswan/filelists/files delete mode 100644 config/rootfiles/core/strongswan/update.sh Difference in files: diff --git a/config/rootfiles/core/65/exclude b/config/rootfiles/core/65/exclude new file mode 100644 index 0000000..0b54d05 --- /dev/null +++ b/config/rootfiles/core/65/exclude @@ -0,0 +1,15 @@ +srv/web/ipfire/html/proxy.pac +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/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/65/filelists/armv5tel/binutils b/config/rootfiles/core/65/filelists/armv5tel/binutils new file mode 120000 index 0000000..ac971f9 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/dracut b/config/rootfiles/core/65/filelists/armv5tel/dracut new file mode 120000 index 0000000..861df3f --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/dracut @@ -0,0 +1 @@ +../../../../common/armv5tel/dracut \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/gcc b/config/rootfiles/core/65/filelists/armv5tel/gcc new file mode 120000 index 0000000..84f7b93 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/glibc b/config/rootfiles/core/65/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-omap b/config/rootfiles/core/65/filelists/armv5tel/linux-omap new file mode 120000 index 0000000..50bf786 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/linux-omap @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-omap \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-rpi b/config/rootfiles/core/65/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware new file mode 120000 index 0000000..428fdf8 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware @@ -0,0 +1 @@ +../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/u-boot b/config/rootfiles/core/65/filelists/armv5tel/u-boot new file mode 120000 index 0000000..3df31a8 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/u-boot @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/util-linux b/config/rootfiles/core/65/filelists/armv5tel/util-linux new file mode 120000 index 0000000..2596908 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/util-linux @@ -0,0 +1 @@ +../../../../common/armv5tel/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/autoconf b/config/rootfiles/core/65/filelists/autoconf new file mode 120000 index 0000000..aa39ce6 --- /dev/null +++ b/config/rootfiles/core/65/filelists/autoconf @@ -0,0 +1 @@ +../../../common/autoconf \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/automake b/config/rootfiles/core/65/filelists/automake new file mode 120000 index 0000000..df3ee42 --- /dev/null +++ b/config/rootfiles/core/65/filelists/automake @@ -0,0 +1 @@ +../../../common/automake \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/bash b/config/rootfiles/core/65/filelists/bash new file mode 120000 index 0000000..de970cb --- /dev/null +++ b/config/rootfiles/core/65/filelists/bash @@ -0,0 +1 @@ +../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cairo b/config/rootfiles/core/65/filelists/cairo new file mode 120000 index 0000000..bf48d25 --- /dev/null +++ b/config/rootfiles/core/65/filelists/cairo @@ -0,0 +1 @@ +../../../common/cairo \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/capi4k-utils b/config/rootfiles/core/65/filelists/capi4k-utils new file mode 120000 index 0000000..82982c4 --- /dev/null +++ b/config/rootfiles/core/65/filelists/capi4k-utils @@ -0,0 +1 @@ +../../../common/capi4k-utils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cmake b/config/rootfiles/core/65/filelists/cmake new file mode 120000 index 0000000..491d25f --- /dev/null +++ b/config/rootfiles/core/65/filelists/cmake @@ -0,0 +1 @@ +../../../common/cmake \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/collectd b/config/rootfiles/core/65/filelists/collectd new file mode 120000 index 0000000..871b32f --- /dev/null +++ b/config/rootfiles/core/65/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/compat-wireless b/config/rootfiles/core/65/filelists/compat-wireless new file mode 120000 index 0000000..5b5ac9e --- /dev/null +++ b/config/rootfiles/core/65/filelists/compat-wireless @@ -0,0 +1 @@ +../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/coreutils b/config/rootfiles/core/65/filelists/coreutils new file mode 120000 index 0000000..7351ed2 --- /dev/null +++ b/config/rootfiles/core/65/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/curl b/config/rootfiles/core/65/filelists/curl new file mode 120000 index 0000000..4b84bef --- /dev/null +++ b/config/rootfiles/core/65/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cyrus-sasl b/config/rootfiles/core/65/filelists/cyrus-sasl new file mode 120000 index 0000000..bb51b4c --- /dev/null +++ b/config/rootfiles/core/65/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/daq b/config/rootfiles/core/65/filelists/daq new file mode 120000 index 0000000..d0e0956 --- /dev/null +++ b/config/rootfiles/core/65/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dejavu-fonts-ttf b/config/rootfiles/core/65/filelists/dejavu-fonts-ttf new file mode 120000 index 0000000..0007a8b --- /dev/null +++ b/config/rootfiles/core/65/filelists/dejavu-fonts-ttf @@ -0,0 +1 @@ +../../../common/dejavu-fonts-ttf \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dhcp b/config/rootfiles/core/65/filelists/dhcp new file mode 120000 index 0000000..32d8da4 --- /dev/null +++ b/config/rootfiles/core/65/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dvb-firmwares b/config/rootfiles/core/65/filelists/dvb-firmwares new file mode 120000 index 0000000..69d0cdc --- /dev/null +++ b/config/rootfiles/core/65/filelists/dvb-firmwares @@ -0,0 +1 @@ +../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/e2fsprogs b/config/rootfiles/core/65/filelists/e2fsprogs new file mode 120000 index 0000000..37b55de --- /dev/null +++ b/config/rootfiles/core/65/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/file b/config/rootfiles/core/65/filelists/file new file mode 120000 index 0000000..0c60e43 --- /dev/null +++ b/config/rootfiles/core/65/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files new file mode 100644 index 0000000..6d0030e --- /dev/null +++ b/config/rootfiles/core/65/filelists/files @@ -0,0 +1,20 @@ +etc/system-release +etc/issue +etc/sysctl.conf +etc/securetty +opt/pakfire/etc/pakfire.conf +etc/rc.d/init.d/partresize +etc/rc.d/init.d/fsresize +etc/rc.d/init.d/setclock +etc/rc.d/init.d/tmpfs +etc/rc.d/rc0.d/K47setclock +etc/rc.d/rc6.d/K47setclock +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/ids.cgi +srv/web/ipfire/cgi-bin/qos.cgi +srv/web/ipfire/cgi-bin/services.cgi +srv/web/ipfire/cgi-bin/updatexlrator.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +usr/local/sbin/setup +var/ipfire/langs +var/ipfire/qos/bin/makeqosscripts.pl diff --git a/config/rootfiles/core/65/filelists/fontconfig b/config/rootfiles/core/65/filelists/fontconfig new file mode 120000 index 0000000..6daeffd --- /dev/null +++ b/config/rootfiles/core/65/filelists/fontconfig @@ -0,0 +1 @@ +../../../common/fontconfig \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gawk b/config/rootfiles/core/65/filelists/gawk new file mode 120000 index 0000000..a3bbe32 --- /dev/null +++ b/config/rootfiles/core/65/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gettext b/config/rootfiles/core/65/filelists/gettext new file mode 120000 index 0000000..b6c6c6f --- /dev/null +++ b/config/rootfiles/core/65/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/glib b/config/rootfiles/core/65/filelists/glib new file mode 120000 index 0000000..4466574 --- /dev/null +++ b/config/rootfiles/core/65/filelists/glib @@ -0,0 +1 @@ +../../../common/glib \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gmp b/config/rootfiles/core/65/filelists/gmp new file mode 120000 index 0000000..8662a89 --- /dev/null +++ b/config/rootfiles/core/65/filelists/gmp @@ -0,0 +1 @@ +../../../common/gmp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gmp-compat b/config/rootfiles/core/65/filelists/gmp-compat new file mode 120000 index 0000000..10093cd --- /dev/null +++ b/config/rootfiles/core/65/filelists/gmp-compat @@ -0,0 +1 @@ +../../../common/gmp-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gnupg b/config/rootfiles/core/65/filelists/gnupg new file mode 120000 index 0000000..a1a1564 --- /dev/null +++ b/config/rootfiles/core/65/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/grep b/config/rootfiles/core/65/filelists/grep new file mode 120000 index 0000000..ab5ef8b --- /dev/null +++ b/config/rootfiles/core/65/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/hdparm b/config/rootfiles/core/65/filelists/hdparm new file mode 120000 index 0000000..b644751 --- /dev/null +++ b/config/rootfiles/core/65/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/acpid b/config/rootfiles/core/65/filelists/i586/acpid new file mode 120000 index 0000000..21d36ee --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/binutils b/config/rootfiles/core/65/filelists/i586/binutils new file mode 120000 index 0000000..78695d7 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/dracut b/config/rootfiles/core/65/filelists/i586/dracut new file mode 120000 index 0000000..9a09010 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/dracut @@ -0,0 +1 @@ +../../../../common/i586/dracut \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/gcc b/config/rootfiles/core/65/filelists/i586/gcc new file mode 120000 index 0000000..ba328e3 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/glibc b/config/rootfiles/core/65/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/grub b/config/rootfiles/core/65/filelists/i586/grub new file mode 100644 index 0000000..1fc2d19 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/grub @@ -0,0 +1,2 @@ +#boot/grub +boot/grub/grub.conf diff --git a/config/rootfiles/core/65/filelists/i586/linux b/config/rootfiles/core/65/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/strongswan-padlock b/config/rootfiles/core/65/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/util-linux b/config/rootfiles/core/65/filelists/i586/util-linux new file mode 120000 index 0000000..c973106 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/util-linux @@ -0,0 +1 @@ +../../../../common/i586/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/inetutils b/config/rootfiles/core/65/filelists/inetutils new file mode 120000 index 0000000..bcd329b --- /dev/null +++ b/config/rootfiles/core/65/filelists/inetutils @@ -0,0 +1 @@ +../../../common/inetutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/iproute2 b/config/rootfiles/core/65/filelists/iproute2 new file mode 120000 index 0000000..05f0f71 --- /dev/null +++ b/config/rootfiles/core/65/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/iptables b/config/rootfiles/core/65/filelists/iptables new file mode 120000 index 0000000..8caf12b --- /dev/null +++ b/config/rootfiles/core/65/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/kbd b/config/rootfiles/core/65/filelists/kbd new file mode 120000 index 0000000..9b85839 --- /dev/null +++ b/config/rootfiles/core/65/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/less b/config/rootfiles/core/65/filelists/less new file mode 120000 index 0000000..65c0e07 --- /dev/null +++ b/config/rootfiles/core/65/filelists/less @@ -0,0 +1 @@ +../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libffi b/config/rootfiles/core/65/filelists/libffi new file mode 120000 index 0000000..c391acd --- /dev/null +++ b/config/rootfiles/core/65/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libnl b/config/rootfiles/core/65/filelists/libnl new file mode 120000 index 0000000..7181849 --- /dev/null +++ b/config/rootfiles/core/65/filelists/libnl @@ -0,0 +1 @@ +../../../common/libnl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libsigc++ b/config/rootfiles/core/65/filelists/libsigc++ new file mode 120000 index 0000000..51f4c75 --- /dev/null +++ b/config/rootfiles/core/65/filelists/libsigc++ @@ -0,0 +1 @@ +../../../common/libsigc++ \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libtool b/config/rootfiles/core/65/filelists/libtool new file mode 120000 index 0000000..54f5666 --- /dev/null +++ b/config/rootfiles/core/65/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/linux-atm b/config/rootfiles/core/65/filelists/linux-atm new file mode 120000 index 0000000..8adccaf --- /dev/null +++ b/config/rootfiles/core/65/filelists/linux-atm @@ -0,0 +1 @@ +../../../common/linux-atm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/linux-firmware b/config/rootfiles/core/65/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/core/65/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/m4 b/config/rootfiles/core/65/filelists/m4 new file mode 120000 index 0000000..3f009cc --- /dev/null +++ b/config/rootfiles/core/65/filelists/m4 @@ -0,0 +1 @@ +../../../common/m4 \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/mISDNuser b/config/rootfiles/core/65/filelists/mISDNuser new file mode 120000 index 0000000..78537d4 --- /dev/null +++ b/config/rootfiles/core/65/filelists/mISDNuser @@ -0,0 +1 @@ +../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/man b/config/rootfiles/core/65/filelists/man new file mode 120000 index 0000000..b04d65c --- /dev/null +++ b/config/rootfiles/core/65/filelists/man @@ -0,0 +1 @@ +../../../common/man \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/misc-progs b/config/rootfiles/core/65/filelists/misc-progs new file mode 120000 index 0000000..7223cad --- /dev/null +++ b/config/rootfiles/core/65/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/mpfr b/config/rootfiles/core/65/filelists/mpfr new file mode 120000 index 0000000..c8468bf --- /dev/null +++ b/config/rootfiles/core/65/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/ncurses b/config/rootfiles/core/65/filelists/ncurses new file mode 120000 index 0000000..512faef --- /dev/null +++ b/config/rootfiles/core/65/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/newt b/config/rootfiles/core/65/filelists/newt new file mode 120000 index 0000000..fb3eb20 --- /dev/null +++ b/config/rootfiles/core/65/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/openldap b/config/rootfiles/core/65/filelists/openldap new file mode 120000 index 0000000..80c324f --- /dev/null +++ b/config/rootfiles/core/65/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/openssl b/config/rootfiles/core/65/filelists/openssl new file mode 120000 index 0000000..e011a92 --- /dev/null +++ b/config/rootfiles/core/65/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pam b/config/rootfiles/core/65/filelists/pam new file mode 120000 index 0000000..660a1d8 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pam @@ -0,0 +1 @@ +../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pango b/config/rootfiles/core/65/filelists/pango new file mode 120000 index 0000000..6c37231 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pango @@ -0,0 +1 @@ +../../../common/pango \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pciutils b/config/rootfiles/core/65/filelists/pciutils new file mode 120000 index 0000000..aeb45e7 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pciutils @@ -0,0 +1 @@ +../../../common/pciutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcmciautils b/config/rootfiles/core/65/filelists/pcmciautils new file mode 120000 index 0000000..7cbf821 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pcmciautils @@ -0,0 +1 @@ +../../../common/pcmciautils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcre b/config/rootfiles/core/65/filelists/pcre new file mode 120000 index 0000000..b390d9a --- /dev/null +++ b/config/rootfiles/core/65/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcre-compat b/config/rootfiles/core/65/filelists/pcre-compat new file mode 120000 index 0000000..eff8a7d --- /dev/null +++ b/config/rootfiles/core/65/filelists/pcre-compat @@ -0,0 +1 @@ +../../../common/pcre-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pixman b/config/rootfiles/core/65/filelists/pixman new file mode 120000 index 0000000..fdb6346 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pixman @@ -0,0 +1 @@ +../../../common/pixman \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/popt b/config/rootfiles/core/65/filelists/popt new file mode 120000 index 0000000..d71a9ab --- /dev/null +++ b/config/rootfiles/core/65/filelists/popt @@ -0,0 +1 @@ +../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pptp b/config/rootfiles/core/65/filelists/pptp new file mode 120000 index 0000000..2b3dfad --- /dev/null +++ b/config/rootfiles/core/65/filelists/pptp @@ -0,0 +1 @@ +../../../common/pptp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/readline b/config/rootfiles/core/65/filelists/readline new file mode 120000 index 0000000..84209f1 --- /dev/null +++ b/config/rootfiles/core/65/filelists/readline @@ -0,0 +1 @@ +../../../common/readline \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/readline-compat b/config/rootfiles/core/65/filelists/readline-compat new file mode 120000 index 0000000..f96bc80 --- /dev/null +++ b/config/rootfiles/core/65/filelists/readline-compat @@ -0,0 +1 @@ +../../../common/readline-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/reiserfsprogs b/config/rootfiles/core/65/filelists/reiserfsprogs new file mode 120000 index 0000000..008c3e8 --- /dev/null +++ b/config/rootfiles/core/65/filelists/reiserfsprogs @@ -0,0 +1 @@ +../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/rrdtool b/config/rootfiles/core/65/filelists/rrdtool new file mode 120000 index 0000000..7a82e41 --- /dev/null +++ b/config/rootfiles/core/65/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/screen b/config/rootfiles/core/65/filelists/screen new file mode 120000 index 0000000..81008f4 --- /dev/null +++ b/config/rootfiles/core/65/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sdparm b/config/rootfiles/core/65/filelists/sdparm new file mode 120000 index 0000000..86d9c24 --- /dev/null +++ b/config/rootfiles/core/65/filelists/sdparm @@ -0,0 +1 @@ +../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sed b/config/rootfiles/core/65/filelists/sed new file mode 120000 index 0000000..fc5f5c6 --- /dev/null +++ b/config/rootfiles/core/65/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/shadow b/config/rootfiles/core/65/filelists/shadow new file mode 120000 index 0000000..c0824b7 --- /dev/null +++ b/config/rootfiles/core/65/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/slang b/config/rootfiles/core/65/filelists/slang new file mode 120000 index 0000000..228e45e --- /dev/null +++ b/config/rootfiles/core/65/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/smartmontools b/config/rootfiles/core/65/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/65/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/snort b/config/rootfiles/core/65/filelists/snort new file mode 120000 index 0000000..9406ce0 --- /dev/null +++ b/config/rootfiles/core/65/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/strongswan b/config/rootfiles/core/65/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/65/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sysfsutils b/config/rootfiles/core/65/filelists/sysfsutils new file mode 120000 index 0000000..8f3ee3e --- /dev/null +++ b/config/rootfiles/core/65/filelists/sysfsutils @@ -0,0 +1 @@ +../../../common/sysfsutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sysvinit b/config/rootfiles/core/65/filelists/sysvinit new file mode 120000 index 0000000..f3fb330 --- /dev/null +++ b/config/rootfiles/core/65/filelists/sysvinit @@ -0,0 +1 @@ +../../../common/sysvinit \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/texinfo b/config/rootfiles/core/65/filelists/texinfo new file mode 120000 index 0000000..fa9df02 --- /dev/null +++ b/config/rootfiles/core/65/filelists/texinfo @@ -0,0 +1 @@ +../../../common/texinfo \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/tzdata b/config/rootfiles/core/65/filelists/tzdata new file mode 120000 index 0000000..5a6e325 --- /dev/null +++ b/config/rootfiles/core/65/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/udev b/config/rootfiles/core/65/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/core/65/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/usbutils b/config/rootfiles/core/65/filelists/usbutils new file mode 120000 index 0000000..31db5a7 --- /dev/null +++ b/config/rootfiles/core/65/filelists/usbutils @@ -0,0 +1 @@ +../../../common/usbutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/wget b/config/rootfiles/core/65/filelists/wget new file mode 120000 index 0000000..fcb57df --- /dev/null +++ b/config/rootfiles/core/65/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/wpa_supplicant b/config/rootfiles/core/65/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/core/65/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/xz b/config/rootfiles/core/65/filelists/xz new file mode 120000 index 0000000..734e926 --- /dev/null +++ b/config/rootfiles/core/65/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/zlib b/config/rootfiles/core/65/filelists/zlib new file mode 120000 index 0000000..e345663 --- /dev/null +++ b/config/rootfiles/core/65/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/65/meta b/config/rootfiles/core/65/meta new file mode 100644 index 0000000..d547fa8 --- /dev/null +++ b/config/rootfiles/core/65/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh new file mode 100644 index 0000000..6335e1d --- /dev/null +++ b/config/rootfiles/core/65/update.sh @@ -0,0 +1,201 @@ +#!/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) 2012 IPFire-Team <info(a)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=65 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +KVER="3.2.33" +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi + +# +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.xz ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ + /var/ipfire/backup/core-upgrade_$KVER-old.tar.xz +fi +echo First we made a backup of all files that was inside of the +echo update archive. This may take a while ... +# Add some files that are not in the package to backup +echo lib/modules >> /opt/pakfire/tmp/ROOTFILES +echo etc/udev >> /opt/pakfire/tmp/ROOTFILES +echo lib/udev >> /opt/pakfire/tmp/ROOTFILES +echo boot >> /opt/pakfire/tmp/ROOTFILES +echo etc/snort >> /opt/pakfire/tmp/ROOTFILES +echo usr/lib/snort_* >> /opt/pakfire/tmp/ROOTFILES + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /lib/modules/*-ipfire +# +# Remove old udev rules. +# +cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +cp /etc/udev/rules.d/30-persistent-network.rules /tmp/ +rm -rf /etc/udev +rm -rf /lib/udev +mkdir -p /etc/udev/rules.d +mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/ +mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ + +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop + +#Remove old snort +rm -rf /etc/snort +rm -rf /usr/lib/snort_* + +# +#Extract files +extract_files + +# +# Start services +# +/etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi + +# +# Rebuild qosscript if enabled +# +if [ -e /var/ipfire/qos/enable ]; then + /usr/local/bin/qosctrl stop + /usr/local/bin/qosctrl generate + /usr/local/bin/qosctrl start +fi + +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +ROOT=`mount | grep " / " | cut -d" " -f1` + +if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` +fi + +if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf +else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf +fi +sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf +sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + +if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." +else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +# Remove meta's of packages that are now common... +# +rm -rf /opt/pakfire/db/*/meta-fontconfig +rm -rf /opt/pakfire/db/*/meta-glib + +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +/etc/init.d/fireinfo start +sendprofile + +echo +echo Please wait until pakfire has ended... +echo +#Don't report the exitcode last command +exit 0 + diff --git a/config/rootfiles/core/strongswan/exclude b/config/rootfiles/core/strongswan/exclude deleted file mode 100644 index 7360266..0000000 --- a/config/rootfiles/core/strongswan/exclude +++ /dev/null @@ -1,12 +0,0 @@ -srv/web/ipfire/html/proxy.pac -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache -etc/localtime -var/ipfire/ovpn -etc/ssh/ssh_config -etc/ssh/sshd_config -etc/ssl/openssl.cnf diff --git a/config/rootfiles/core/strongswan/filelists/files b/config/rootfiles/core/strongswan/filelists/files deleted file mode 100644 index 4aa5440..0000000 --- a/config/rootfiles/core/strongswan/filelists/files +++ /dev/null @@ -1,6 +0,0 @@ -etc/system-release -etc/issue -etc/rc.d/init.d/tmpfs -srv/web/ipfire/cgi-bin/services.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -usr/local/bin/ipsecctrl diff --git a/config/rootfiles/core/strongswan/filelists/strongswan b/config/rootfiles/core/strongswan/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/strongswan/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/strongswan/meta b/config/rootfiles/core/strongswan/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/strongswan/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/strongswan/update.sh b/config/rootfiles/core/strongswan/update.sh deleted file mode 100644 index c1d5975..0000000 --- a/config/rootfiles/core/strongswan/update.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/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) 2012 IPFire-Team <info(a)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=61 -for (( i=1; i<=$core; i++ )) -do - rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire -done - -# -#Stop services -/usr/local/bin/ipsecctrl D - -# -#Extract files -extract_files - -# Remove old pluto binaries. -rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack} -rm -f /usr/local/bin/vpn-watch - -# -#Start services - -# Call the CGI script to regenerate the configuration files. -/srv/web/ipfire/cgi-bin/vpnmain.cgi -/usr/local/bin/ipsecctrl S - -# -#Update Language cache -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" - -#Rebuild module dep's -#arch=`uname -m` -#if [ ${arch::3} == "arm" ]; then -# depmod -a 2.6.32.45-ipfire-versatile >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-kirkwood >/dev/null 2>&1 -#else -# depmod -a 2.6.32.45-ipfire >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-pae >/dev/null 2>&1 -# depmod -a 2.6.32.45-ipfire-xen >/dev/null 2>&1 -#fi - - -#Rebuild initrd's because some compat-wireless modules are inside -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45.img 2.6.32.45-ipfire -#if [ -e /boot/ipfirerd-2.6.32.45-pae.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-pae.img 2.6.32.45-ipfire-pae -#fi -#if [ -e /boot/ipfirerd-2.6.32.45-xen.img ]; then -#/sbin/dracut --force --verbose /boot/ipfirerd-2.6.32.45-xen.img 2.6.32.45-ipfire-xen -#fi - -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 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 9724a0bcd4e962d109fa3effb7b4a82aa7d420b6
by git＠ipfire.org 06 Nov '12

06 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 9724a0bcd4e962d109fa3effb7b4a82aa7d420b6 (commit) via ab74c839ddf125b73f7b79e925c31d03e92aa079 (commit) from 55ecfab2b7d879554df2b5027865b4cdff9b95b1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 9724a0bcd4e962d109fa3effb7b4a82aa7d420b6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 6 22:59:20 2012 +0100 Add recently changed files to core update. commit ab74c839ddf125b73f7b79e925c31d03e92aa079 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 6 22:57:22 2012 +0100 Fix outgoing firewall problems with MAC rules. Bug #10223. ----------------------------------------------------------------------- Summary of changes: config/outgoingfw/outgoingfw.pl | 61 +++++++++++------------------ config/rootfiles/core/64/filelists/files | 2 + src/initscripts/init.d/firewall | 1 - 3 files changed, 25 insertions(+), 39 deletions(-) Difference in files: diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl index 8bb49e0..7dd1430 100644 --- a/config/outgoingfw/outgoingfw.pl +++ b/config/outgoingfw/outgoingfw.pl @@ -181,6 +181,7 @@ foreach $configentry (sort @configs) @PROTO = ("tcp","udp"); } + my $macrule = 0; foreach $PROTO (@PROTO){ foreach $SOURCE (@SOURCE) { $SOURCE =~ s/\s//gi; @@ -189,9 +190,10 @@ foreach $configentry (sort @configs) if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[2] ne 'all'){ $SOURCE =~ s/[^a-zA-Z0-9]/:/gi; - $CMD = "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; + $CMD = "-m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO"; + $macrule = 1; } else { - $CMD = "/sbin/iptables -A OUTGOINGFW -s $SOURCE -d $DESTINATION -p $PROTO"; + $CMD = "-s $SOURCE -d $DESTINATION -p $PROTO"; } if ($configline[8] && ( $configline[3] ne 'esp' || $configline[3] ne 'gre') ) { @@ -218,24 +220,12 @@ foreach $configentry (sort @configs) $CMD = "$CMD -o $netsettings{'RED_DEV'}"; if ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE1' ) { - if ($DEBUG) { - print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '\n"; - } else { - system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '"); - } + applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOINGFW '", $macrule); } elsif ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq 'MODE2' ) { - if ($DEBUG) { - print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '\n"; - } else { - system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '"); - } + applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '", $macrule); } - if ($DEBUG) { - print "$CMD -j $DO\n"; - } else { - system("$CMD -j $DO"); - } + applyrule("$CMD -j $DO", $macrule); } } } @@ -246,10 +236,9 @@ open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfile"; @p2ps = <FILE>; close FILE; -$CMD = "/sbin/iptables -A OUTGOINGFW -m ipp2p"; +$CMD = "-m ipp2p"; -foreach $p2pentry (sort @p2ps) -{ +foreach $p2pentry (sort @p2ps) { @p2pline = split( /\;/, $p2pentry ); if ( $outfwsettings{'POLICY'} eq 'MODE2' ) { $DO = "DROP"; @@ -264,27 +253,23 @@ foreach $p2pentry (sort @p2ps) } } if ($P2PSTRING) { - if ($DEBUG) { - print "$CMD $P2PSTRING -j $DO\n"; - } else { - system("$CMD $P2PSTRING -j $DO"); - } + applyrule("$CMD $P2PSTRING -j $DO", 0); } if ( $outfwsettings{'POLICY'} eq 'MODE1' ) { - if ( $outfwsettings{'MODE1LOG'} eq 'on' ) { - $CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '"; - if ($DEBUG) { - print "$CMD\n"; - } else { - system("$CMD"); - } - } + if ( $outfwsettings{'MODE1LOG'} eq 'on' ) { + applyrule("-o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '", 0); + } - $CMD = "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '"; - if ($DEBUG) { - print "$CMD\n"; - } else { - system("$CMD"); + applyrule("-o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OUTGOINGFW '", 0); +} + +sub applyrule($$) { + my $cmd = shift; + my $macrule = shift; + + system("/sbin/iptables -A OUTGOINGFWMAC $cmd"); + if ($macrule == 0) { + system("/sbin/iptables -A OUTGOINGFW $cmd"); } } diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core/64/filelists/files index 26308b4..a3b99c8 100644 --- a/config/rootfiles/core/64/filelists/files +++ b/config/rootfiles/core/64/filelists/files @@ -1,4 +1,6 @@ etc/system-release etc/issue +etc/rc.d/init.d/firewall srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/ids.cgi +var/ipfire/outgoing/bin/outgoingfw.pl diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index c90687c..7478978 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -188,7 +188,6 @@ case "$1" in # Outgoing Firewall /sbin/iptables -A FORWARD -j OUTGOINGFWMAC - /sbin/iptables -A FORWARD -j OUTGOINGFW # localhost and ethernet. /sbin/iptables -A INPUT -i lo -m state --state NEW -j ACCEPT hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 0721f5a634db267d7c43504dfc8e86861a7ce72b
by git＠ipfire.org 06 Nov '12

06 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via 0721f5a634db267d7c43504dfc8e86861a7ce72b (commit) from bff7ad01c47f9d4cb58042345c530f1ef12ee1ac (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0721f5a634db267d7c43504dfc8e86861a7ce72b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 6 16:23:33 2012 +0100 setclock: save systemclock to hwclock at shutdown. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 2 ++ config/rootfiles/common/i586/initscripts | 2 ++ lfs/initscripts | 2 ++ src/initscripts/init.d/setclock | 2 +- 4 files changed, 7 insertions(+), 1 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index 770c4f7..89e8b22 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -140,6 +140,7 @@ etc/rc.d/rc0.d/K28apache etc/rc.d/rc0.d/K30sshd #etc/rc.d/rc0.d/K34client175 etc/rc.d/rc0.d/K45random +etc/rc.d/rc0.d/K47setclock etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds @@ -185,6 +186,7 @@ etc/rc.d/rc6.d/K28apache etc/rc.d/rc6.d/K30sshd #etc/rc.d/rc6.d/K34client175 etc/rc.d/rc6.d/K45random +etc/rc.d/rc6.d/K47setclock etc/rc.d/rc6.d/K49cyrus-sasl etc/rc.d/rc6.d/K78snort etc/rc.d/rc6.d/K79leds diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index cd61860..3799487 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -142,6 +142,7 @@ etc/rc.d/rc0.d/K28apache etc/rc.d/rc0.d/K30sshd #etc/rc.d/rc0.d/K34client175 etc/rc.d/rc0.d/K45random +etc/rc.d/rc0.d/K47setclock etc/rc.d/rc0.d/K49cyrus-sasl etc/rc.d/rc0.d/K78snort etc/rc.d/rc0.d/K79leds @@ -187,6 +188,7 @@ etc/rc.d/rc6.d/K28apache etc/rc.d/rc6.d/K30sshd #etc/rc.d/rc6.d/K34client175 etc/rc.d/rc6.d/K45random +etc/rc.d/rc6.d/K47setclock etc/rc.d/rc6.d/K49cyrus-sasl etc/rc.d/rc6.d/K78snort etc/rc.d/rc6.d/K79leds diff --git a/lfs/initscripts b/lfs/initscripts index 7210c0d..573c81e 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -166,6 +166,8 @@ $(TARGET) : ln -sf ../init.d/udev_retry /etc/rc.d/rcsysinit.d/S45udev_retry ln -sf ../init.d/cleanfs /etc/rc.d/rcsysinit.d/S50cleanfs ln -sf ../init.d/setclock /etc/rc.d/rcsysinit.d/S60setclock + ln -sf ../init.d/setclock /etc/rc.d/rc0.d/K47setclock + ln -sf ../init.d/setclock /etc/rc.d/rc6.d/K47setclock ln -sf ../init.d/console /etc/rc.d/rcsysinit.d/S70console ln -sf ../init.d/firstsetup /etc/rc.d/rcsysinit.d/S75firstsetup ln -sf ../init.d/localnet /etc/rc.d/rcsysinit.d/S80localnet diff --git a/src/initscripts/init.d/setclock b/src/initscripts/init.d/setclock index 50e4503..6083108 100644 --- a/src/initscripts/init.d/setclock +++ b/src/initscripts/init.d/setclock @@ -38,7 +38,7 @@ case ${1} in ;; *) - echo "Usage: ${0} {start}" + echo "Usage: ${0} {start} {stop}" ;; esac hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. bff7ad01c47f9d4cb58042345c530f1ef12ee1ac
by git＠ipfire.org 06 Nov '12

06 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via bff7ad01c47f9d4cb58042345c530f1ef12ee1ac (commit) via 2877336122bf64107050cf924e82d5d822b1cc72 (commit) from 4de2df1e0c8dc103c5b845b1b538a6a303c6691c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bff7ad01c47f9d4cb58042345c530f1ef12ee1ac Merge: 2877336 4de2df1 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 6 13:39:05 2012 +0100 Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen commit 2877336122bf64107050cf924e82d5d822b1cc72 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Nov 6 12:38:49 2012 +0100 kernel: build rtc-cmos into i586 kernel. ----------------------------------------------------------------------- Summary of changes: config/kernel/kernel.config.i586-ipfire | 2 +- config/kernel/kernel.config.i586-ipfire-pae | 70 ++++++++++++++++++++++++-- config/rootfiles/common/i586/linux | 1 - config/rootfiles/packages/linux-pae | 36 +++++++++++++- 4 files changed, 98 insertions(+), 11 deletions(-) Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire index 97cc119..4482c9b 100644 --- a/config/kernel/kernel.config.i586-ipfire +++ b/config/kernel/kernel.config.i586-ipfire @@ -3929,7 +3929,7 @@ CONFIG_RTC_DRV_RV3029C2=m # # Platform RTC drivers # -CONFIG_RTC_DRV_CMOS=m +CONFIG_RTC_DRV_CMOS=y CONFIG_RTC_DRV_DS1286=m CONFIG_RTC_DRV_DS1511=m CONFIG_RTC_DRV_DS1553=m diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index e50ea0b..2298c53 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -2452,9 +2452,6 @@ CONFIG_HW_RANDOM_GEODE=m CONFIG_HW_RANDOM_VIA=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_NVRAM=m -CONFIG_RTC=m -CONFIG_GEN_RTC=m -CONFIG_GEN_RTC_X=y # CONFIG_DTLK is not set # CONFIG_R3964 is not set # CONFIG_APPLICOM is not set @@ -3459,8 +3456,6 @@ CONFIG_SND_PCM_OSS=m CONFIG_SND_PCM_OSS_PLUGINS=y CONFIG_SND_SEQUENCER_OSS=y # CONFIG_SND_HRTIMER is not set -CONFIG_SND_RTCTIMER=m -CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set CONFIG_SND_VERBOSE_PROCFS=y @@ -3955,7 +3950,70 @@ CONFIG_LEDS_TRIGGER_NETDEV=m # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set # CONFIG_EDAC is not set -# CONFIG_RTC_CLASS is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_DEBUG is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +CONFIG_RTC_INTF_PROC=y +CONFIG_RTC_INTF_DEV=y +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +CONFIG_RTC_DRV_DS1307=m +CONFIG_RTC_DRV_DS1374=m +CONFIG_RTC_DRV_DS1672=m +CONFIG_RTC_DRV_DS3232=m +CONFIG_RTC_DRV_MAX6900=m +CONFIG_RTC_DRV_RS5C372=m +CONFIG_RTC_DRV_ISL1208=m +CONFIG_RTC_DRV_ISL12022=m +CONFIG_RTC_DRV_X1205=m +CONFIG_RTC_DRV_PCF8563=m +CONFIG_RTC_DRV_PCF8583=m +CONFIG_RTC_DRV_M41T80=m +CONFIG_RTC_DRV_M41T80_WDT=y +CONFIG_RTC_DRV_BQ32K=m +CONFIG_RTC_DRV_S35390A=m +CONFIG_RTC_DRV_FM3130=m +CONFIG_RTC_DRV_RX8581=m +CONFIG_RTC_DRV_RX8025=m +CONFIG_RTC_DRV_EM3027=m +CONFIG_RTC_DRV_RV3029C2=m + +# +# SPI RTC drivers +# + +# +# Platform RTC drivers +# +CONFIG_RTC_DRV_CMOS=y +CONFIG_RTC_DRV_DS1286=m +CONFIG_RTC_DRV_DS1511=m +CONFIG_RTC_DRV_DS1553=m +CONFIG_RTC_DRV_DS1742=m +CONFIG_RTC_DRV_STK17TA8=m +CONFIG_RTC_DRV_M48T86=m +CONFIG_RTC_DRV_M48T35=m +CONFIG_RTC_DRV_M48T59=m +CONFIG_RTC_DRV_MSM6242=m +CONFIG_RTC_DRV_BQ4802=m +CONFIG_RTC_DRV_RP5C01=m +CONFIG_RTC_DRV_V3020=m +CONFIG_RTC_DRV_PCF50633=m + +# +# on-CPU RTC drivers +# CONFIG_DMADEVICES=y # CONFIG_DMADEVICES_DEBUG is not set diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 0f5498a..03ecc63 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -1378,7 +1378,6 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/rtc #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq32k.ko #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-bq4802.ko -#lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-cmos.ko #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1286.ko #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1307.ko #lib/modules/KVER-ipfire/kernel/drivers/rtc/rtc-ds1374.ko diff --git a/config/rootfiles/packages/linux-pae b/config/rootfiles/packages/linux-pae index 7bb598d..a75c461 100644 --- a/config/rootfiles/packages/linux-pae +++ b/config/rootfiles/packages/linux-pae @@ -244,7 +244,6 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/sis-agp.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/sworks-agp.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/char/agp/via-agp.ko -#lib/modules/KVER-ipfire-pae/kernel/drivers/char/genrtc.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/char/hangcheck-timer.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random #lib/modules/KVER-ipfire-pae/kernel/drivers/char/hw_random/amd-rng.ko @@ -270,7 +269,6 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia #lib/modules/KVER-ipfire-pae/kernel/drivers/char/pcmcia/synclink_cs.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/char/ppdev.ko -#lib/modules/KVER-ipfire-pae/kernel/drivers/char/rtc.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/char/scx200_gpio.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/char/toshiba.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/clocksource @@ -1393,6 +1391,39 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/drivers/regulator #lib/modules/KVER-ipfire-pae/kernel/drivers/regulator/fixed.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/regulator/gpio-regulator.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-bq32k.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-bq4802.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1286.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1307.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1374.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1511.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1553.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1672.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds1742.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-ds3232.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-em3027.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-fm3130.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-isl12022.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-isl1208.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m41t80.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t35.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t59.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-m48t86.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-max6900.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-msm6242.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf50633.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf8563.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-pcf8583.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rp5c01.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rs5c372.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rv3029c2.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rx8025.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-rx8581.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-s35390a.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-stk17ta8.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-v3020.ko +#lib/modules/KVER-ipfire-pae/kernel/drivers/rtc/rtc-x1205.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/scsi #lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/3w-9xxx.ko #lib/modules/KVER-ipfire-pae/kernel/drivers/scsi/3w-sas.ko @@ -2238,7 +2269,6 @@ lib/modules/KVER-ipfire-pae #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-page-alloc.ko #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-pcm.ko #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-rawmidi.ko -#lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-rtctimer.ko #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd-timer.ko #lib/modules/KVER-ipfire-pae/kernel/sound/core/snd.ko #lib/modules/KVER-ipfire-pae/kernel/sound/drivers hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 55ecfab2b7d879554df2b5027865b4cdff9b95b1
by git＠ipfire.org 06 Nov '12

06 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 55ecfab2b7d879554df2b5027865b4cdff9b95b1 (commit) via fb874f2e7cb3a251d16b0555e51a45e219b9e46b (commit) from 90d9b6049288301dedb3173f51b470ce141bad2e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 55ecfab2b7d879554df2b5027865b4cdff9b95b1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 6 11:45:01 2012 +0100 Update translations. commit fb874f2e7cb3a251d16b0555e51a45e219b9e46b Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Nov 6 11:44:45 2012 +0100 Update credits.cgi. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 3 +++ doc/language_issues.en | 3 +++ doc/language_issues.es | 8 ++++++-- doc/language_issues.fr | 8 ++++++-- doc/language_issues.pl | 8 ++++++-- doc/language_issues.ru | 8 ++++++-- doc/language_missings | 20 ++++++++++++++++++++ html/cgi-bin/credits.cgi | 43 ++++++++++++++++++++++--------------------- langs/de/cgi-bin/de.pl | 13 ++++++++----- langs/en/cgi-bin/en.pl | 13 ++++++++----- langs/es/cgi-bin/es.pl | 8 ++++---- langs/fr/cgi-bin/fr.pl | 8 ++++---- langs/pl/cgi-bin/pl.pl | 8 ++++---- langs/ru/cgi-bin/ru.pl | 8 ++++---- 14 files changed, 104 insertions(+), 55 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index d182dbb..5a42ae5 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -117,6 +117,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client WARNING: translation string unused: eciadsl help @@ -279,6 +280,8 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red +WARNING: translation string unused: openvpn disabled +WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning diff --git a/doc/language_issues.en b/doc/language_issues.en index 3ae364c..6d6a2a6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -307,6 +308,8 @@ WARNING: translation string unused: o-no WARNING: translation string unused: o-yes WARNING: translation string unused: online help en WARNING: translation string unused: only red +WARNING: translation string unused: openvpn disabled +WARNING: translation string unused: openvpn enabled WARNING: translation string unused: optional data WARNING: translation string unused: optionsfw portlist hint WARNING: translation string unused: optionsfw warning diff --git a/doc/language_issues.es b/doc/language_issues.es index 6b2ab8e..6bcbf86 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -520,14 +523,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group @@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.fr b/doc/language_issues.fr index b1a94a1..189932f 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -497,7 +498,9 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled @@ -522,14 +525,14 @@ WARNING: untranslated string: ntp common settings WARNING: untranslated string: ntp sync WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: pakfire ago WARNING: untranslated string: route config changed @@ -542,6 +545,7 @@ WARNING: untranslated string: system information WARNING: untranslated string: upload new ruleset WARNING: untranslated string: urlfilter file ext block WARNING: untranslated string: urlfilter mode block +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange WARNING: untranslated string: wlanap access point WARNING: untranslated string: wlanap channel diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 6b2ab8e..6bcbf86 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Async logging enabled WARNING: untranslated string: Scan for Songs WARNING: untranslated string: Set time on boot +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: fireinfo ipfire version WARNING: untranslated string: fireinfo is disabled WARNING: untranslated string: fireinfo is enabled @@ -520,14 +523,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall add ip group WARNING: untranslated string: outgoing firewall add mac group WARNING: untranslated string: outgoing firewall edit ip group @@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes WARNING: untranslated string: system information +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_issues.ru b/doc/language_issues.ru index ee67873..e25d81d 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -139,6 +139,7 @@ WARNING: translation string unused: disconnect WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: donation-link WARNING: translation string unused: done WARNING: translation string unused: driver WARNING: translation string unused: dynamic dns client @@ -489,7 +490,9 @@ WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Add a route WARNING: untranslated string: Edit an existing route WARNING: untranslated string: Scan for Songs +WARNING: untranslated string: advproxy errmsg invalid upstream proxy WARNING: untranslated string: bytes +WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per WARNING: untranslated string: extrahd because there is already a device mounted WARNING: untranslated string: extrahd cant umount @@ -503,14 +506,14 @@ WARNING: untranslated string: minute WARNING: untranslated string: new WARNING: untranslated string: openvpn default WARNING: untranslated string: openvpn destination port used -WARNING: untranslated string: openvpn disabled -WARNING: untranslated string: openvpn enabled WARNING: untranslated string: openvpn fragment allowed with udp WARNING: untranslated string: openvpn mssfix allowed with udp WARNING: untranslated string: openvpn prefix local subnet WARNING: untranslated string: openvpn prefix openvpn subnet WARNING: untranslated string: openvpn prefix remote subnet WARNING: untranslated string: openvpn subnet is used +WARNING: untranslated string: other +WARNING: untranslated string: our donors WARNING: untranslated string: outgoing firewall reserved groupname WARNING: untranslated string: outgoing traffic in bytes per second WARNING: untranslated string: route config changed @@ -518,4 +521,5 @@ WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table WARNING: untranslated string: static routes +WARNING: untranslated string: visit us at WARNING: untranslated string: vpn keyexchange diff --git a/doc/language_missings b/doc/language_missings index 16e3ba5..55e0e40 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -10,6 +10,8 @@ ############################################################################ # Checking cgi-bin translations for language: fr # ############################################################################ +< advproxy errmsg invalid upstream proxy +< deprecated fs warn < dns address deleted txt < fireinfo ipfire version < fireinfo is disabled @@ -41,12 +43,15 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < snort working < static routes < system information < upload new ruleset < urlfilter file ext block < urlfilter mode block +< visit us at < vpn keyexchange < wlanap access point < wlanap channel @@ -74,7 +79,9 @@ ############################################################################ # Checking cgi-bin translations for language: es # ############################################################################ +< advproxy errmsg invalid upstream proxy < Async logging enabled +< deprecated fs warn < fireinfo ipfire version < fireinfo is disabled < fireinfo is enabled @@ -103,6 +110,8 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < outgoing firewall add ip group < outgoing firewall add mac group < outgoing firewall edit ip group @@ -120,6 +129,7 @@ < Set time on boot < static routes < system information +< visit us at < vpn keyexchange ############################################################################ # Checking install/setup translations for language: pl # @@ -127,6 +137,8 @@ ############################################################################ # Checking cgi-bin translations for language: pl # ############################################################################ +< advproxy errmsg invalid upstream proxy +< deprecated fs warn < extrahd because there is already a device mounted < extrahd cant umount < extrahd install or load driver @@ -147,7 +159,10 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < static routes +< visit us at < vpn keyexchange ############################################################################ # Checking install/setup translations for language: ru # @@ -156,7 +171,9 @@ # Checking cgi-bin translations for language: ru # ############################################################################ < Add a route +< advproxy errmsg invalid upstream proxy < day-graph +< deprecated fs warn < disk access per < Edit an existing route < extrahd because there is already a device mounted @@ -183,8 +200,11 @@ < openvpn prefix openvpn subnet < openvpn prefix remote subnet < openvpn subnet is used +< other +< our donors < outgoing traffic in bytes per second < static routes +< visit us at < vpn keyexchange < week-graph < year-graph diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 0d091a2..3224267 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -41,9 +41,16 @@ print <<END $Lang::tr{'donation-text'} <div align="center"> - <a href="http://www.ipfire.org/donate">$Lang::tr{'donation'}</a> + <a href="http://www.ipfire.org/donate"> + $Lang::tr{'donation'} + </a> </div> - + <hr> + + $Lang::tr{'our donors'}: + + <a href="http://www.irrsinn.de" target="_blank">irrsinn.de gmbh</a> + END ; &Header::closebox(); @@ -51,12 +58,11 @@ END &Header::openbox('100%', 'left', $Lang::tr{'credits'}); print <<END - <center><a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a></center> - - - IPFire is based on IPCop and Smoothwall. Many thanks to its developers. - We want to say thank you to all of the developers who ever contributed anything to IPFire. - + +<center> + $Lang::tr{'visit us at'}: <a href='http://www.ipfire.org/' target="_blank">http://www.ipfire.org/</a> +</center> + <hr> Development: @@ -90,23 +96,18 @@ Peter Schälchli Jan Paul Tücking (<a href='mailto:jan.tuecking\@ipfire.org'>jan.tuecking\(a)ipfire.org</a>) - -This product includes GeoLite data created by MaxMind, available from <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. - END ; &Header::closebox(); -&Header::openbox('100%', 'left', 'General Public License v3'); -if ( -e "/usr/share/doc/licenses/GPLv3" ) { - print '<textarea rows="25" cols="75" readonly="true">'; - print `cat "/usr/share/doc/licenses/GPLv3"`; - print '</textarea>'; -} -else { - print ' <a href="http://www.gnu.org/licenses/gpl-3.0.txt" target="_blank">GENERAL PUBLIC LICENSE</a> '; -} - +&Header::openbox("100%", "left", $Lang::tr{'other'}); +print <<END + + This product includes GeoLite data created by MaxMind, available from + <a href='http://www.maxmind.com/' target="_blank">http://www.maxmind.com/</a>. + +END +; &Header::closebox(); &Header::closebigbox(); diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 3ec57eb..f686c30 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -222,8 +222,8 @@ 'advproxy errmsg invalid mac' => 'Ungültige MAC-Adresse', 'advproxy errmsg invalid pdc' => 'Ungültiger Hostname für den Primary Domain Controller', 'advproxy errmsg invalid proxy port' => 'Ungültiger Proxy-Port', -'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy', 'advproxy errmsg invalid upstream proxy' => 'Ungültige IP für Upstream-Proxy', +'advproxy errmsg invalid upstream proxy username or password setting' => 'Ungültiger Benutzername oder ungültiges Kennwort für Upstream Proxy', 'advproxy errmsg invalid user' => 'Benutzername existiert nicht', 'advproxy errmsg ldap base dn' => 'LDAP base DN erforderlich', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN Benutzername und Passwort erforderlich', @@ -1311,10 +1311,12 @@ 'organization too long' => 'Organisation ist zu lang; sie sollte nicht länger als 60 Zeichen lang sein.', 'original' => 'Original', 'os level' => 'OS Level', +'other' => 'Sonstiges', 'other countries' => 'Andere Länder', 'other login script' => 'Anderes Anmeldeskript', 'otherip' => 'Andere IP', 'otherport' => 'Anderer Port', +'our donors' => 'Unsere Unterstützer', 'out' => 'Aus', 'outgoing' => 'ausgehend', 'outgoing firewall' => 'Ausgehende Firewall', @@ -1345,10 +1347,14 @@ 'ovpn config' => 'OVPN-Konfiguration', 'ovpn device' => 'OpenVPN Gerät', 'ovpn dl' => 'OVPN-Konfiguration downloaden', +'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', +'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN auf BLAU', 'ovpn on orange' => 'OpenVPN auf ORANGE', 'ovpn on red' => 'OpenVPN auf ROT', +'ovpn routes push' => 'Routen (eine pro Zeile)', +'ovpn routes push options' => 'Route push Optionen', 'ovpn server status' => 'OpenVPN Server Status', 'ovpn subnet' => 'OpenVPN Subnetz (z.B. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Das OpenVPN Subnetz ist ungültig.', @@ -1369,10 +1375,6 @@ 'ovpn_processprioVH' => 'Sehr Hoch', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push Optionen', -'ovpn routes push' => 'Routen (eine pro Zeile)', -'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske', -'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt', 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 'pagerefresh' => 'Seite wird aktualisiert. Bitte warten.', 'pakfire accept all' => 'Möchten Sie der Installation aller Pakete zustimmen?', @@ -2096,6 +2098,7 @@ 'virtual address' => 'Virtuelle Addresse', 'virtual private networking' => 'Virtuelles Privates Netzwerk', 'visible in browselist' => 'Sichtbar in der Verzeichnisliste', +'visit us at' => 'Besuchen Sie uns auf', 'voldown10' => 'Laustärke um 10 verringern', 'voldown5' => 'Laustärke um 5 verringern', 'volup10' => 'Laustärke um 10 erhöhen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 003056f..5fe2391 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -222,8 +222,8 @@ 'advproxy errmsg invalid mac' => 'Invalid MAC address', 'advproxy errmsg invalid pdc' => 'Invalid hostname for primary domain controller', 'advproxy errmsg invalid proxy port' => 'Invalid proxy port', -'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', 'advproxy errmsg invalid upstream proxy' => 'Invalid upstream proxy IP', +'advproxy errmsg invalid upstream proxy username or password setting' => 'Invalid upstream proxy username or password setting', 'advproxy errmsg invalid user' => 'Username does not exist', 'advproxy errmsg ldap base dn' => 'LDAP base DN required', 'advproxy errmsg ldap bind dn' => 'LDAP bind DN username and password required', @@ -1339,10 +1339,12 @@ 'organization too long' => 'Organization is too long; it should not be longer than 60 characters.', 'original' => 'Original', 'os level' => 'OS Level', +'other' => 'Other', 'other countries' => 'Other countries', 'other login script' => 'Other login script', 'otherip' => 'other IP', 'otherport' => 'other Port', +'our donors' => 'Our donors', 'out' => 'Out', 'outgoing' => 'outgoing', 'outgoing firewall' => 'Outgoing Firewall', @@ -1373,10 +1375,14 @@ 'ovpn config' => 'OVPN-Config', 'ovpn device' => 'OpenVPN device:', 'ovpn dl' => 'OVPN-Config Download', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN on BLUE', 'ovpn on orange' => 'OpenVPN on ORANGE', 'ovpn on red' => 'OpenVPN on RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Current OpenVPN server status:', 'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.', @@ -1397,10 +1403,6 @@ 'ovpn_processprioVH' => 'Very high', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', @@ -2130,6 +2132,7 @@ 'virtual address' => 'Virtual Address', 'virtual private networking' => 'Virtual Private Networking', 'visible in browselist' => 'visible in browselist', +'visit us at' => 'Visit us at', 'voldown10' => 'Decrease volume by 10', 'voldown5' => 'Decrease volume by 5', 'volup10' => 'Increase volume by 10', diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl index 387ab4a..f96284f 100644 --- a/langs/es/cgi-bin/es.pl +++ b/langs/es/cgi-bin/es.pl @@ -1328,10 +1328,14 @@ 'ovpn config' => 'Configruación de OVPN', 'ovpn device' => 'Dispositivo OpenVPN', 'ovpn dl' => 'Configuración de descargas OVPN', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'Registro de log de OVPN', 'ovpn on blue' => 'OpenVPN en BLUE', 'ovpn on orange' => 'OpenVPN en ORANGE', 'ovpn on red' => 'OpenVPN en RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Status actual del servidor OpenVPN:', 'ovpn subnet' => 'Subred de OpenVPN (ej. 10.0.10.0/255.255.255.0', 'ovpn subnet is invalid' => 'Subred de OpenVPN no es válida.', @@ -1352,10 +1356,6 @@ 'ovpn_processprioVH' => 'Muy alto', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Falló la instalación del paquete', 'pagerefresh' => 'La página se está actualiszando, por favor espere.', 'pakfire accept all' => '¿Desea instalar todos los paquetes?', diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl index a537459..e91191d 100644 --- a/langs/fr/cgi-bin/fr.pl +++ b/langs/fr/cgi-bin/fr.pl @@ -1340,10 +1340,14 @@ 'ovpn config' => 'OVPN-Config', 'ovpn device' => 'Périphérique OpenVPN :', 'ovpn dl' => 'Télécharger OVPN-Config', +'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e', +'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide', 'ovpn log' => 'OVPN-Log', 'ovpn on blue' => 'OpenVPN sur BLEU', 'ovpn on orange' => 'OpenVPN sur ORANGE', 'ovpn on red' => 'OpenVPN sur RED', +'ovpn routes push' => 'Routes (une par ligne):', +'ovpn routes push options' => 'Options de Route push', 'ovpn server status' => 'Statut actuel du serveur OpenVPN :', 'ovpn subnet' => 'Sous-réseau OpenVPN (c.a.d. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Sous-réseau OpenVPN non valide.', @@ -1364,10 +1368,6 @@ 'ovpn_processprioVH' => 'Très haute', 'ovpnstatus log' => 'Journal statut OVPN', 'ovpnsys log' => 'Journal système OVPN', -'ovpn routes push options' => 'Options de Route push', -'ovpn routes push' => 'Routes (une par ligne):', -'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide', -'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e', 'package failed to install' => 'L\'installation du paquet a échoué.', 'pagerefresh' => 'La page est entrain d\'être rafraichie, veuillez attendre.', 'pakfire accept all' => 'Voulez-vous installer tout les paquets?', diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl index d8f1890..e0d64a0 100644 --- a/langs/pl/cgi-bin/pl.pl +++ b/langs/pl/cgi-bin/pl.pl @@ -1351,10 +1351,14 @@ 'ovpn config' => 'OVPN-Konfig', 'ovpn device' => 'Urządzenie OpenVPN:', 'ovpn dl' => 'Pobierz konfig OVPN', +'ovpn errmsg green already pushed' => 'Route for green network is always set', +'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', 'ovpn log' => 'Log OVPN', 'ovpn on blue' => 'OpenVPN na int. BLUE', 'ovpn on orange' => 'OpenVPN na int. ORANGE', 'ovpn on red' => 'OpenVPN na int. RED', +'ovpn routes push' => 'Routes (one per line):', +'ovpn routes push options' => 'Route push options', 'ovpn server status' => 'Stan serwera OpenVPN:', 'ovpn subnet' => 'Podsieć OpenVPN (np. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Podsieć OpenVPN jest niepoprawna.', @@ -1375,10 +1379,6 @@ 'ovpn_processprioVH' => 'Bardzo wysoki', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Route push options', -'ovpn routes push' => 'Routes (one per line):', -'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask', -'ovpn errmsg green already pushed' => 'Route for green network is always set', 'package failed to install' => 'Błąd instalacji pakietu.', 'pagerefresh' => 'Strona jest odświeżana, proszę czekać.', 'pakfire accept all' => 'Czy chcesz zainstalować wszystkie pakiety?', diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl index c1afd01..4619983 100644 --- a/langs/ru/cgi-bin/ru.pl +++ b/langs/ru/cgi-bin/ru.pl @@ -1342,10 +1342,14 @@ 'ovpn config' => 'Настройки OVPN', 'ovpn device' => 'Устройство OpenVPN:', 'ovpn dl' => 'Загрузка настроек OVPN', +'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён', +'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти', 'ovpn log' => 'Журнал OVPN', 'ovpn on blue' => 'OpenVPN на BLUE', 'ovpn on orange' => 'OpenVPN на ORANGE', 'ovpn on red' => 'OpenVPN на RED', +'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)', +'ovpn routes push options' => 'Настройки маршрутизации', 'ovpn server status' => 'Текущий статус сервера OpenVPN:', 'ovpn subnet' => 'Подсеть OpenVPN (e.g. 10.0.10.0/255.255.255.0)', 'ovpn subnet is invalid' => 'Подсеть OpenVPN задана неверно.', @@ -1366,10 +1370,6 @@ 'ovpn_processprioVH' => 'Very high', 'ovpnstatus log' => 'OVPN-Status-Log', 'ovpnsys log' => 'OVPN-System-Log', -'ovpn routes push options' => 'Настройки маршрутизации', -'ovpn routes push' => 'Маршрутизаторы (по одному на строчку)', -'ovpn errmsg invalid ip or mask' => 'Неправильный адрес или маска подсти', -'ovpn errmsg green already pushed' => 'Маршрут для зелёной сети всегда включён', 'package failed to install' => 'Package failed to install.', 'pagerefresh' => 'Page is beeing refreshed, please wait.', 'pakfire accept all' => 'Do you want to install all packages?', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 4de2df1e0c8dc103c5b845b1b538a6a303c6691c
by git＠ipfire.org 05 Nov '12

05 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via 4de2df1e0c8dc103c5b845b1b538a6a303c6691c (commit) via ed879161a868e9a9afe5f93ff1625a729eddb510 (commit) via 90d9b6049288301dedb3173f51b470ce141bad2e (commit) via 438a331f3d8879fd508863ef7943271cd1ee3b97 (commit) from 1313b031a8e057b580525d4429ad485571844086 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 4de2df1e0c8dc103c5b845b1b538a6a303c6691c Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 20:11:19 2012 +0100 kernel: updated patch for ipg drivername to kernel 3.2. commit ed879161a868e9a9afe5f93ff1625a729eddb510 Merge: 438a331 90d9b60 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 19:50:35 2012 +0100 Merge remote-tracking branch 'origin/next' into thirteen commit 438a331f3d8879fd508863ef7943271cd1ee3b97 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 18:42:56 2012 +0100 Revert "installer: Make kernel silent at boot time." This reverts commit a23305b8a2869414e40d7a49bafd2bbc764ea925. ----------------------------------------------------------------------- Summary of changes: config/syslinux/syslinux.cfg | 6 +++--- lfs/linux | 2 +- lfs/samba | 6 +++--- src/patches/linux-3.2.33_ipg-fix-driver-name.patch | 15 +++++++++++++++ 4 files changed, 22 insertions(+), 7 deletions(-) create mode 100644 src/patches/linux-3.2.33_ipg-fix-driver-name.patch Difference in files: diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg index ee258cc..68ad82a 100644 --- a/config/syslinux/syslinux.cfg +++ b/config/syslinux/syslinux.cfg @@ -2,13 +2,13 @@ TIMEOUT 5000 DISPLAY boot.msg PROMPT 1 DEFAULT vmlinuz - APPEND initrd=instroot vga=791 quiet rhgb ro + APPEND initrd=instroot vga=791 splash=silent ro LABEL novga KERNEL vmlinuz - APPEND initrd=instroot quiet rhgb ro + APPEND initrd=instroot ro LABEL unattended KERNEL vmlinuz - APPEND initrd=instroot vga=791 quiet rhgb unattended ro + APPEND initrd=instroot vga=791 splash=silent unattended ro LABEL memtest KERNEL memtest APPEND - diff --git a/lfs/linux b/lfs/linux index d9e617a..80050cc 100644 --- a/lfs/linux +++ b/lfs/linux @@ -124,7 +124,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33-ledtrig-netdev-1.patch # Fix uevent PHYSDEVDRIVER -# cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_ipg-fix-driver-name.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.2.33_ipg-fix-driver-name.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.27_mcs7830-fix-driver-name.patch ifeq "$(KCFG)" "-kirkwood" diff --git a/lfs/samba b/lfs/samba index 4741754..84a8a2b 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.5.18 +VER = 3.5.19 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 = 42 +PAK_VER = 43 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4bdb6d7ef23369d1c7d0199f0ebe012a +$(DL_FILE)_MD5 = 48718ed4fbc0f0fa7fcc38d52ca3cfff install : $(TARGET) diff --git a/src/patches/linux-3.2.33_ipg-fix-driver-name.patch b/src/patches/linux-3.2.33_ipg-fix-driver-name.patch new file mode 100644 index 0000000..95e6107 --- /dev/null +++ b/src/patches/linux-3.2.33_ipg-fix-driver-name.patch @@ -0,0 +1,15 @@ +Patch by Arne Fitzenreiter <arne_f(a)ipfire.org> +Fix PHYSDEVDRIVER from "Sundance IPG ..." to the modulname (ipg) + +diff -Naur linux-3.2.33.org/drivers/net/ethernet/icplus/ipg.c linux-3.2.33/drivers/net/ethernet/icplus/ipg.c +--- linux-3.2.33.org/drivers/net/ethernet/icplus/ipg.c 2012-10-31 00:27:11.000000000 +0100 ++++ linux-3.2.33/drivers/net/ethernet/icplus/ipg.c 2012-11-05 20:02:36.529101528 +0100 +@@ -2304,7 +2304,7 @@ + } + + static struct pci_driver ipg_pci_driver = { +- .name = IPG_DRIVER_NAME, ++ .name = DRV_NAME, + .id_table = ipg_pci_tbl, + .probe = ipg_probe, + .remove = __devexit_p(ipg_remove), hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 90d9b6049288301dedb3173f51b470ce141bad2e
by git＠ipfire.org 05 Nov '12

05 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, next has been updated via 90d9b6049288301dedb3173f51b470ce141bad2e (commit) from eead8d2e01061b462f1758e06e7082ca5d18e523 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 90d9b6049288301dedb3173f51b470ce141bad2e Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 19:49:18 2012 +0100 samba: updated to 3.5.19. ----------------------------------------------------------------------- Summary of changes: lfs/samba | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/samba b/lfs/samba index 4741754..84a8a2b 100644 --- a/lfs/samba +++ b/lfs/samba @@ -24,7 +24,7 @@ include Config -VER = 3.5.18 +VER = 3.5.19 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 = 42 +PAK_VER = 43 DEPS = "cups" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 4bdb6d7ef23369d1c7d0199f0ebe012a +$(DL_FILE)_MD5 = 48718ed4fbc0f0fa7fcc38d52ca3cfff install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 1313b031a8e057b580525d4429ad485571844086
by git＠ipfire.org 05 Nov '12

05 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree". The branch, thirteen has been updated via 1313b031a8e057b580525d4429ad485571844086 (commit) via cec995ab18935deccb2d2c84d2be9f29c407763a (commit) via 34b0e6cb1f1c0a4e624f7d1d72e6b0ec88371026 (commit) via 3eb54d929ec220763bd6ec8ace56753198d0d8ab (commit) via edd741eb13c696e028f375dc65cc49a187b4d2e6 (commit) via 8ebe10284f3d074a16524abe8418091d23ae17e8 (commit) from a415ec92ea3745ac5efe32fdbfc5ef11f86408f9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1313b031a8e057b580525d4429ad485571844086 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 15:15:57 2012 +0100 setclock: create /dev/rtc symlink if it not exist. commit cec995ab18935deccb2d2c84d2be9f29c407763a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 15:10:31 2012 +0100 videolan: removed. this package is outdated and we have not the resources to update and maintain it. commit 34b0e6cb1f1c0a4e624f7d1d72e6b0ec88371026 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 13:03:55 2012 +0100 ipfireseeder: removed. commit 3eb54d929ec220763bd6ec8ace56753198d0d8ab Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 10:57:39 2012 +0100 xz: updated to 5.0.4. commit edd741eb13c696e028f375dc65cc49a187b4d2e6 Merge: 8ebe102 a415ec9 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 10:26:35 2012 +0100 Merge branch 'thirteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into thirteen commit 8ebe10284f3d074a16524abe8418091d23ae17e8 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Nov 5 11:18:03 2012 +0100 installer: updated number of files. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/initscripts | 1 - config/rootfiles/common/i586/initscripts | 1 - config/rootfiles/common/xz | 20 +- config/rootfiles/packages/ipfireseeder | 5 - config/rootfiles/packages/videolan | 415 -------------------------- lfs/ipfireseeder | 84 ------ lfs/videolan | 104 ------- lfs/xz | 6 +- make.sh | 2 - src/initscripts/init.d/ipfireseeder | 64 ---- src/initscripts/init.d/setclock | 7 + src/install+setup/install/main.c | 2 +- src/paks/ipfireseeder/install.sh | 29 -- src/paks/ipfireseeder/uninstall.sh | 42 --- src/paks/ipfireseeder/update.sh | 26 -- 15 files changed, 28 insertions(+), 780 deletions(-) delete mode 100644 config/rootfiles/packages/ipfireseeder delete mode 100644 config/rootfiles/packages/videolan delete mode 100644 lfs/ipfireseeder delete mode 100644 lfs/videolan delete mode 100644 src/initscripts/init.d/ipfireseeder delete mode 100644 src/paks/ipfireseeder/install.sh delete mode 100644 src/paks/ipfireseeder/uninstall.sh delete mode 100644 src/paks/ipfireseeder/update.sh Difference in files: diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index ccb7bfb..770c4f7 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -36,7 +36,6 @@ etc/rc.d/init.d/halt #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/icecream #etc/rc.d/init.d/imspector -#etc/rc.d/init.d/ipfireseeder etc/rc.d/init.d/ipsec #etc/rc.d/init.d/lcd4linux #etc/rc.d/init.d/lcr diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 653060f..cd61860 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -37,7 +37,6 @@ etc/rc.d/init.d/halt #etc/rc.d/init.d/hostapd #etc/rc.d/init.d/icecream #etc/rc.d/init.d/imspector -#etc/rc.d/init.d/ipfireseeder etc/rc.d/init.d/ipsec #etc/rc.d/init.d/lcd4linux #etc/rc.d/init.d/lcr diff --git a/config/rootfiles/common/xz b/config/rootfiles/common/xz index ef419c5..a8fa20b 100644 --- a/config/rootfiles/common/xz +++ b/config/rootfiles/common/xz @@ -30,18 +30,18 @@ usr/bin/xzmore #usr/include/lzma/container.h #usr/include/lzma/delta.h #usr/include/lzma/filter.h +#usr/include/lzma/hardware.h #usr/include/lzma/index.h #usr/include/lzma/index_hash.h #usr/include/lzma/lzma.h #usr/include/lzma/stream_flags.h -#usr/include/lzma/subblock.h #usr/include/lzma/version.h #usr/include/lzma/vli.h #usr/lib/liblzma.a #usr/lib/liblzma.la usr/lib/liblzma.so -usr/lib/liblzma.so.0 -usr/lib/liblzma.so.0.0.0 +usr/lib/liblzma.so.5 +usr/lib/liblzma.so.5.0.4 #usr/lib/pkgconfig/liblzma.pc #usr/share/doc/xz #usr/share/doc/xz/AUTHORS @@ -51,10 +51,24 @@ usr/lib/liblzma.so.0.0.0 #usr/share/doc/xz/README #usr/share/doc/xz/THANKS #usr/share/doc/xz/TODO +#usr/share/doc/xz/examples +#usr/share/doc/xz/examples/00_README.txt +#usr/share/doc/xz/examples/01_compress_easy.c +#usr/share/doc/xz/examples/02_decompress.c +#usr/share/doc/xz/examples/03_compress_custom.c +#usr/share/doc/xz/examples/Makefile +#usr/share/doc/xz/examples_old +#usr/share/doc/xz/examples_old/xz_pipe_comp.c +#usr/share/doc/xz/examples_old/xz_pipe_decomp.c #usr/share/doc/xz/faq.txt #usr/share/doc/xz/history.txt #usr/share/doc/xz/lzma-file-format.txt #usr/share/doc/xz/xz-file-format.txt +#usr/share/locale/cs/LC_MESSAGES/xz.mo +#usr/share/locale/de/LC_MESSAGES/xz.mo +#usr/share/locale/fr/LC_MESSAGES/xz.mo +#usr/share/locale/it/LC_MESSAGES/xz.mo +#usr/share/locale/pl/LC_MESSAGES/xz.mo #usr/share/man/man1/lzcat.1 #usr/share/man/man1/lzcmp.1 #usr/share/man/man1/lzdiff.1 diff --git a/config/rootfiles/packages/ipfireseeder b/config/rootfiles/packages/ipfireseeder deleted file mode 100644 index 0577ade..0000000 --- a/config/rootfiles/packages/ipfireseeder +++ /dev/null @@ -1,5 +0,0 @@ -etc/rc.d/init.d/ipfireseeder -#var/ipfire/seeder -var/ipfire/seeder/ipfire-2.9.MACHINE-full-core51.iso.torrent -#var/log/seeder -var/log/seeder/info diff --git a/config/rootfiles/packages/videolan b/config/rootfiles/packages/videolan deleted file mode 100644 index 2b980f9..0000000 --- a/config/rootfiles/packages/videolan +++ /dev/null @@ -1,415 +0,0 @@ -usr/bin/vlc -usr/bin/vlc-config -#usr/include/vlc -#usr/include/vlc/aout.h -#usr/include/vlc/decoder.h -#usr/include/vlc/input.h -#usr/include/vlc/intf.h -#usr/include/vlc/libvlc.h -#usr/include/vlc/mediacontrol.h -#usr/include/vlc/mediacontrol_structures.h -#usr/include/vlc/sout.h -#usr/include/vlc/vlc.h -#usr/include/vlc/vout.h -#usr/lib/libvlc.a -#usr/lib/vlc -#usr/lib/vlc/access -usr/lib/vlc/access/libaccess_directory_plugin.so -usr/lib/vlc/access/libaccess_fake_plugin.so -usr/lib/vlc/access/libaccess_file_plugin.so -usr/lib/vlc/access/libaccess_ftp_plugin.so -usr/lib/vlc/access/libaccess_http_plugin.so -usr/lib/vlc/access/libaccess_mms_plugin.so -usr/lib/vlc/access/libaccess_smb_plugin.so -usr/lib/vlc/access/libaccess_tcp_plugin.so -usr/lib/vlc/access/libaccess_udp_plugin.so -usr/lib/vlc/access/libcdda_plugin.so -usr/lib/vlc/access/libdvb_plugin.so -usr/lib/vlc/access/libv4l_plugin.so -usr/lib/vlc/access/libvcd_plugin.so -#usr/lib/vlc/access_filter -usr/lib/vlc/access_filter/libaccess_filter_dump_plugin.so -usr/lib/vlc/access_filter/libaccess_filter_record_plugin.so -usr/lib/vlc/access_filter/libaccess_filter_timeshift_plugin.so -#usr/lib/vlc/access_output -usr/lib/vlc/access_output/libaccess_output_dummy_plugin.so -usr/lib/vlc/access_output/libaccess_output_file_plugin.so -usr/lib/vlc/access_output/libaccess_output_http_plugin.so -usr/lib/vlc/access_output/libaccess_output_shout_plugin.so -usr/lib/vlc/access_output/libaccess_output_udp_plugin.so -#usr/lib/vlc/audio_filter -usr/lib/vlc/audio_filter/liba52tospdif_plugin.so -usr/lib/vlc/audio_filter/libaudio_format_plugin.so -usr/lib/vlc/audio_filter/libbandlimited_resampler_plugin.so -usr/lib/vlc/audio_filter/libdolby_surround_decoder_plugin.so -usr/lib/vlc/audio_filter/libdtstospdif_plugin.so -usr/lib/vlc/audio_filter/libequalizer_plugin.so -usr/lib/vlc/audio_filter/libfixed32tofloat32_plugin.so -usr/lib/vlc/audio_filter/libfixed32tos16_plugin.so -usr/lib/vlc/audio_filter/libfloat32tos16_plugin.so -usr/lib/vlc/audio_filter/libfloat32tos8_plugin.so -usr/lib/vlc/audio_filter/libfloat32tou16_plugin.so -usr/lib/vlc/audio_filter/libfloat32tou8_plugin.so -usr/lib/vlc/audio_filter/libheadphone_channel_mixer_plugin.so -usr/lib/vlc/audio_filter/liblinear_resampler_plugin.so -usr/lib/vlc/audio_filter/libmpgatofixed32_plugin.so -usr/lib/vlc/audio_filter/libnormvol_plugin.so -usr/lib/vlc/audio_filter/libparam_eq_plugin.so -usr/lib/vlc/audio_filter/libs16tofixed32_plugin.so -usr/lib/vlc/audio_filter/libs16tofloat32_plugin.so -usr/lib/vlc/audio_filter/libs16tofloat32swab_plugin.so -usr/lib/vlc/audio_filter/libs8tofloat32_plugin.so -usr/lib/vlc/audio_filter/libsimple_channel_mixer_plugin.so -usr/lib/vlc/audio_filter/libtrivial_channel_mixer_plugin.so -usr/lib/vlc/audio_filter/libtrivial_resampler_plugin.so -usr/lib/vlc/audio_filter/libu8tofixed32_plugin.so -usr/lib/vlc/audio_filter/libu8tofloat32_plugin.so -usr/lib/vlc/audio_filter/libugly_resampler_plugin.so -#usr/lib/vlc/audio_mixer -usr/lib/vlc/audio_mixer/libfloat32_mixer_plugin.so -usr/lib/vlc/audio_mixer/libspdif_mixer_plugin.so -usr/lib/vlc/audio_mixer/libtrivial_mixer_plugin.so -#usr/lib/vlc/audio_output -usr/lib/vlc/audio_output/libalsa_plugin.so -usr/lib/vlc/audio_output/libaout_file_plugin.so -usr/lib/vlc/audio_output/libaout_sdl_plugin.so -usr/lib/vlc/audio_output/liboss_plugin.so -#usr/lib/vlc/codec -usr/lib/vlc/codec/liba52_plugin.so -usr/lib/vlc/codec/libadpcm_plugin.so -usr/lib/vlc/codec/libaraw_plugin.so -usr/lib/vlc/codec/libcinepak_plugin.so -usr/lib/vlc/codec/libcmml_plugin.so -usr/lib/vlc/codec/libcvdsub_plugin.so -usr/lib/vlc/codec/libdts_plugin.so -usr/lib/vlc/codec/libdvbsub_plugin.so -usr/lib/vlc/codec/libfaad_plugin.so -usr/lib/vlc/codec/libfake_plugin.so -usr/lib/vlc/codec/libflacdec_plugin.so -usr/lib/vlc/codec/liblibmpeg2_plugin.so -usr/lib/vlc/codec/liblpcm_plugin.so -usr/lib/vlc/codec/libmpeg_audio_plugin.so -usr/lib/vlc/codec/libpng_plugin.so -usr/lib/vlc/codec/librawvideo_plugin.so -usr/lib/vlc/codec/libspudec_plugin.so -usr/lib/vlc/codec/libsubsdec_plugin.so -usr/lib/vlc/codec/libsvcdsub_plugin.so -usr/lib/vlc/codec/libtelx_plugin.so -usr/lib/vlc/codec/libvorbis_plugin.so -#usr/lib/vlc/control -usr/lib/vlc/control/libgestures_plugin.so -usr/lib/vlc/control/libhotkeys_plugin.so -usr/lib/vlc/control/libhttp_plugin.so -usr/lib/vlc/control/libnetsync_plugin.so -usr/lib/vlc/control/librc_plugin.so -usr/lib/vlc/control/libshowintf_plugin.so -usr/lib/vlc/control/libtelnet_plugin.so -#usr/lib/vlc/demux -usr/lib/vlc/demux/liba52sys_plugin.so -usr/lib/vlc/demux/libaiff_plugin.so -usr/lib/vlc/demux/libasf_plugin.so -usr/lib/vlc/demux/libau_plugin.so -usr/lib/vlc/demux/libavi_plugin.so -usr/lib/vlc/demux/libdemuxdump_plugin.so -usr/lib/vlc/demux/libdtssys_plugin.so -usr/lib/vlc/demux/libflac_plugin.so -usr/lib/vlc/demux/libh264_plugin.so -usr/lib/vlc/demux/libid3tag_plugin.so -usr/lib/vlc/demux/libm3u_plugin.so -usr/lib/vlc/demux/libm4a_plugin.so -usr/lib/vlc/demux/libm4v_plugin.so -usr/lib/vlc/demux/libmjpeg_plugin.so -usr/lib/vlc/demux/libmp4_plugin.so -usr/lib/vlc/demux/libmpga_plugin.so -usr/lib/vlc/demux/libmpgv_plugin.so -usr/lib/vlc/demux/libnsc_plugin.so -usr/lib/vlc/demux/libnsv_plugin.so -usr/lib/vlc/demux/libnuv_plugin.so -usr/lib/vlc/demux/libogg_plugin.so -usr/lib/vlc/demux/libplaylist_plugin.so -usr/lib/vlc/demux/libps_plugin.so -usr/lib/vlc/demux/libpva_plugin.so -usr/lib/vlc/demux/librawdv_plugin.so -usr/lib/vlc/demux/libreal_plugin.so -usr/lib/vlc/demux/libsgimb_plugin.so -usr/lib/vlc/demux/libsubtitle_plugin.so -usr/lib/vlc/demux/libts_plugin.so -usr/lib/vlc/demux/libtta_plugin.so -usr/lib/vlc/demux/libty_plugin.so -usr/lib/vlc/demux/libvobsub_plugin.so -usr/lib/vlc/demux/libvoc_plugin.so -usr/lib/vlc/demux/libwav_plugin.so -usr/lib/vlc/demux/libxa_plugin.so -#usr/lib/vlc/gui -usr/lib/vlc/gui/libncurses_plugin.so -#usr/lib/vlc/libffmpeg.a -#usr/lib/vlc/libi420_rgb_mmx.a -#usr/lib/vlc/libi420_ymga_mmx.a -#usr/lib/vlc/libi420_yuy2_mmx.a -#usr/lib/vlc/libi422_yuy2_mmx.a -#usr/lib/vlc/libmemcpy3dn.a -#usr/lib/vlc/libmemcpymmx.a -#usr/lib/vlc/libmemcpymmxext.a -#usr/lib/vlc/libmux_ts.a -#usr/lib/vlc/libstream_out_switcher.a -#usr/lib/vlc/misc -usr/lib/vlc/misc/libdummy_plugin.so -usr/lib/vlc/misc/libexport_plugin.so -usr/lib/vlc/misc/libfreetype_plugin.so -usr/lib/vlc/misc/libgrowl_plugin.so -usr/lib/vlc/misc/libipv4_plugin.so -usr/lib/vlc/misc/libipv6_plugin.so -usr/lib/vlc/misc/liblogger_plugin.so -usr/lib/vlc/misc/libmemcpy_plugin.so -usr/lib/vlc/misc/libscreensaver_plugin.so -usr/lib/vlc/misc/libvod_rtsp_plugin.so -usr/lib/vlc/misc/libxml_plugin.so -usr/lib/vlc/misc/libxtag_plugin.so -#usr/lib/vlc/mux -usr/lib/vlc/mux/libmux_asf_plugin.so -usr/lib/vlc/mux/libmux_avi_plugin.so -usr/lib/vlc/mux/libmux_dummy_plugin.so -usr/lib/vlc/mux/libmux_mp4_plugin.so -usr/lib/vlc/mux/libmux_mpjpeg_plugin.so -usr/lib/vlc/mux/libmux_ogg_plugin.so -usr/lib/vlc/mux/libmux_ps_plugin.so -usr/lib/vlc/mux/libmux_wav_plugin.so -#usr/lib/vlc/packetizer -usr/lib/vlc/packetizer/libpacketizer_copy_plugin.so -usr/lib/vlc/packetizer/libpacketizer_h264_plugin.so -usr/lib/vlc/packetizer/libpacketizer_mpeg4audio_plugin.so -usr/lib/vlc/packetizer/libpacketizer_mpeg4video_plugin.so -usr/lib/vlc/packetizer/libpacketizer_mpegvideo_plugin.so -#usr/lib/vlc/services_discovery -usr/lib/vlc/services_discovery/libpodcast_plugin.so -usr/lib/vlc/services_discovery/libsap_plugin.so -usr/lib/vlc/services_discovery/libshout_plugin.so -usr/lib/vlc/services_discovery/libupnp_intel_plugin.so -#usr/lib/vlc/stream_out -usr/lib/vlc/stream_out/libstream_out_bridge_plugin.so -usr/lib/vlc/stream_out/libstream_out_description_plugin.so -usr/lib/vlc/stream_out/libstream_out_display_plugin.so -usr/lib/vlc/stream_out/libstream_out_dummy_plugin.so -usr/lib/vlc/stream_out/libstream_out_duplicate_plugin.so -usr/lib/vlc/stream_out/libstream_out_es_plugin.so -usr/lib/vlc/stream_out/libstream_out_gather_plugin.so -usr/lib/vlc/stream_out/libstream_out_mosaic_bridge_plugin.so -usr/lib/vlc/stream_out/libstream_out_rtp_plugin.so -usr/lib/vlc/stream_out/libstream_out_standard_plugin.so -usr/lib/vlc/stream_out/libstream_out_transcode_plugin.so -#usr/lib/vlc/video_chroma -usr/lib/vlc/video_chroma/libi420_rgb_plugin.so -usr/lib/vlc/video_chroma/libi420_ymga_plugin.so -usr/lib/vlc/video_chroma/libi420_yuy2_plugin.so -usr/lib/vlc/video_chroma/libi422_yuy2_plugin.so -#usr/lib/vlc/video_filter -usr/lib/vlc/video_filter/libadjust_plugin.so -usr/lib/vlc/video_filter/libblend_plugin.so -usr/lib/vlc/video_filter/libclone_plugin.so -usr/lib/vlc/video_filter/libcrop_plugin.so -usr/lib/vlc/video_filter/libdeinterlace_plugin.so -usr/lib/vlc/video_filter/libdistort_plugin.so -usr/lib/vlc/video_filter/libinvert_plugin.so -usr/lib/vlc/video_filter/liblogo_plugin.so -usr/lib/vlc/video_filter/libmagnify_plugin.so -usr/lib/vlc/video_filter/libmarq_plugin.so -usr/lib/vlc/video_filter/libmosaic_plugin.so -usr/lib/vlc/video_filter/libmotionblur_plugin.so -usr/lib/vlc/video_filter/libmotiondetect_plugin.so -usr/lib/vlc/video_filter/libosdmenu_plugin.so -usr/lib/vlc/video_filter/librss_plugin.so -usr/lib/vlc/video_filter/librv32_plugin.so -usr/lib/vlc/video_filter/libscale_plugin.so -usr/lib/vlc/video_filter/libtime_plugin.so -usr/lib/vlc/video_filter/libtransform_plugin.so -usr/lib/vlc/video_filter/libwall_plugin.so -#usr/lib/vlc/video_output -usr/lib/vlc/video_output/libdirectfb_plugin.so -usr/lib/vlc/video_output/libfb_plugin.so -usr/lib/vlc/video_output/libimage_plugin.so -usr/lib/vlc/video_output/libvout_sdl_plugin.so -#usr/lib/vlc/visualization -usr/lib/vlc/visualization/libvisual_plugin.so -#usr/share/applications/vlc.desktop -#usr/share/doc/vlc -#usr/share/doc/vlc/bugreport-howto.txt -#usr/share/doc/vlc/fortunes.txt -#usr/share/doc/vlc/intf-cdda.txt -#usr/share/doc/vlc/intf-vcd.txt -#usr/share/vlc -#usr/share/vlc/http -usr/share/vlc/http/.hosts -#usr/share/vlc/http/dialogs -usr/share/vlc/http/dialogs/.hosts -usr/share/vlc/http/dialogs/browse -usr/share/vlc/http/dialogs/footer -usr/share/vlc/http/dialogs/input -usr/share/vlc/http/dialogs/main -usr/share/vlc/http/dialogs/mosaic -usr/share/vlc/http/dialogs/playlist -usr/share/vlc/http/dialogs/sout -usr/share/vlc/http/dialogs/vlm -usr/share/vlc/http/favicon.ico -usr/share/vlc/http/iehacks.css -#usr/share/vlc/http/images -usr/share/vlc/http/images/delete.png -usr/share/vlc/http/images/delete_small.png -usr/share/vlc/http/images/eject.png -usr/share/vlc/http/images/empty.png -usr/share/vlc/http/images/fullscreen.png -usr/share/vlc/http/images/help.png -usr/share/vlc/http/images/info.png -usr/share/vlc/http/images/loop.png -usr/share/vlc/http/images/minus.png -usr/share/vlc/http/images/next.png -usr/share/vlc/http/images/pause.png -usr/share/vlc/http/images/play.png -usr/share/vlc/http/images/playlist.png -usr/share/vlc/http/images/playlist_small.png -usr/share/vlc/http/images/plus.png -usr/share/vlc/http/images/prev.png -usr/share/vlc/http/images/refresh.png -usr/share/vlc/http/images/repeat.png -usr/share/vlc/http/images/sd.png -usr/share/vlc/http/images/shuffle.png -usr/share/vlc/http/images/slider_bar.png -usr/share/vlc/http/images/slider_left.png -usr/share/vlc/http/images/slider_point.png -usr/share/vlc/http/images/slider_right.png -usr/share/vlc/http/images/slow.png -usr/share/vlc/http/images/snapshot.png -usr/share/vlc/http/images/sort.png -usr/share/vlc/http/images/sout.png -usr/share/vlc/http/images/speaker.png -usr/share/vlc/http/images/speaker_mute.png -usr/share/vlc/http/images/stop.png -usr/share/vlc/http/images/vlc16x16.png -usr/share/vlc/http/images/volume_down.png -usr/share/vlc/http/images/volume_up.png -usr/share/vlc/http/images/white.png -usr/share/vlc/http/images/white_cross_small.png -usr/share/vlc/http/index.html -#usr/share/vlc/http/js -usr/share/vlc/http/js/functions.js -usr/share/vlc/http/js/mosaic.js -usr/share/vlc/http/js/vlm.js -usr/share/vlc/http/mosaic.html -#usr/share/vlc/http/old -usr/share/vlc/http/old/.hosts -#usr/share/vlc/http/old/admin -usr/share/vlc/http/old/admin/.access -usr/share/vlc/http/old/admin/browse.html -usr/share/vlc/http/old/admin/dboxfiles.html -usr/share/vlc/http/old/admin/index.html -usr/share/vlc/http/old/cone_minus.png -usr/share/vlc/http/old/cone_plus.png -usr/share/vlc/http/old/index.html -usr/share/vlc/http/old/info.html -usr/share/vlc/http/old/style.css -#usr/share/vlc/http/old/vlm -usr/share/vlc/http/old/vlm/edit.html -usr/share/vlc/http/old/vlm/index.html -usr/share/vlc/http/old/vlm/new.html -usr/share/vlc/http/old/vlm/show.html -usr/share/vlc/http/old/webcam.html -#usr/share/vlc/http/requests -usr/share/vlc/http/requests/browse.xml -usr/share/vlc/http/requests/playlist.xml -usr/share/vlc/http/requests/readme -usr/share/vlc/http/requests/status.xml -usr/share/vlc/http/requests/vlm.xml -usr/share/vlc/http/requests/vlm_cmd.xml -usr/share/vlc/http/style.css -usr/share/vlc/http/vlm.html -usr/share/vlc/http/vlm_export.html -#usr/share/vlc/osdmenu -#usr/share/vlc/osdmenu/default -usr/share/vlc/osdmenu/default.cfg -#usr/share/vlc/osdmenu/default/selected -usr/share/vlc/osdmenu/default/selected/bw.png -usr/share/vlc/osdmenu/default/selected/esc.png -usr/share/vlc/osdmenu/default/selected/fw.png -usr/share/vlc/osdmenu/default/selected/next.png -usr/share/vlc/osdmenu/default/selected/play_pause.png -usr/share/vlc/osdmenu/default/selected/previous.png -usr/share/vlc/osdmenu/default/selected/stop.png -usr/share/vlc/osdmenu/default/selected/volume.png -#usr/share/vlc/osdmenu/default/selection -usr/share/vlc/osdmenu/default/selection/bw.png -usr/share/vlc/osdmenu/default/selection/esc.png -usr/share/vlc/osdmenu/default/selection/fw.png -usr/share/vlc/osdmenu/default/selection/next.png -usr/share/vlc/osdmenu/default/selection/play_pause.png -usr/share/vlc/osdmenu/default/selection/previous.png -usr/share/vlc/osdmenu/default/selection/stop.png -usr/share/vlc/osdmenu/default/selection/volume.png -usr/share/vlc/osdmenu/default/unselected.png -#usr/share/vlc/osdmenu/default/volume -usr/share/vlc/osdmenu/default/volume/volume_00.png -usr/share/vlc/osdmenu/default/volume/volume_01.png -usr/share/vlc/osdmenu/default/volume/volume_02.png -usr/share/vlc/osdmenu/default/volume/volume_03.png -usr/share/vlc/osdmenu/default/volume/volume_04.png -usr/share/vlc/osdmenu/default/volume/volume_05.png -usr/share/vlc/osdmenu/default/volume/volume_06.png -usr/share/vlc/osdmenu/default/volume/volume_07.png -usr/share/vlc/osdmenu/default/volume/volume_08.png -usr/share/vlc/osdmenu/default/volume/volume_09.png -usr/share/vlc/osdmenu/default/volume/volume_10.png -#usr/share/vlc/osdmenu/dvd -usr/share/vlc/osdmenu/dvd.cfg -#usr/share/vlc/osdmenu/dvd/selected -usr/share/vlc/osdmenu/dvd/selected/bw.png -usr/share/vlc/osdmenu/dvd/selected/esc.png -usr/share/vlc/osdmenu/dvd/selected/fw.png -usr/share/vlc/osdmenu/dvd/selected/mute.png -usr/share/vlc/osdmenu/dvd/selected/next.png -usr/share/vlc/osdmenu/dvd/selected/pause.png -usr/share/vlc/osdmenu/dvd/selected/play.png -usr/share/vlc/osdmenu/dvd/selected/previous.png -usr/share/vlc/osdmenu/dvd/selected/slow.png -usr/share/vlc/osdmenu/dvd/selected/stop.png -usr/share/vlc/osdmenu/dvd/selected/volume.png -#usr/share/vlc/osdmenu/dvd/selection -usr/share/vlc/osdmenu/dvd/selection/bw.png -usr/share/vlc/osdmenu/dvd/selection/esc.png -usr/share/vlc/osdmenu/dvd/selection/fw.png -usr/share/vlc/osdmenu/dvd/selection/mute.png -usr/share/vlc/osdmenu/dvd/selection/next.png -usr/share/vlc/osdmenu/dvd/selection/pause.png -usr/share/vlc/osdmenu/dvd/selection/play.png -usr/share/vlc/osdmenu/dvd/selection/previous.png -usr/share/vlc/osdmenu/dvd/selection/slow.png -usr/share/vlc/osdmenu/dvd/selection/stop.png -#usr/share/vlc/osdmenu/dvd/unselect -usr/share/vlc/osdmenu/dvd/unselect/barroff.png -#usr/share/vlc/osdmenu/dvd/volume -usr/share/vlc/osdmenu/dvd/volume/volume00.png -usr/share/vlc/osdmenu/dvd/volume/volume01.png -usr/share/vlc/osdmenu/dvd/volume/volume02.png -usr/share/vlc/osdmenu/dvd/volume/volume03.png -usr/share/vlc/osdmenu/dvd/volume/volume04.png -usr/share/vlc/osdmenu/dvd/volume/volume05.png -usr/share/vlc/pda-forwardb16x16.xpm -usr/share/vlc/pda-openb16x16.xpm -usr/share/vlc/pda-pauseb16x16.xpm -usr/share/vlc/pda-playb16x16.xpm -usr/share/vlc/pda-playlistb16x16.xpm -usr/share/vlc/pda-preferencesb16x16.xpm -usr/share/vlc/pda-rewindb16x16.xpm -usr/share/vlc/pda-stopb16x16.xpm -#usr/share/vlc/skins2 -usr/share/vlc/skins2/default.vlt -#usr/share/vlc/skins2/fonts -usr/share/vlc/skins2/fonts/FreeSans.ttf -usr/share/vlc/skins2/fonts/FreeSansBold.ttf -usr/share/vlc/skins2/skin.catalog -usr/share/vlc/skins2/skin.dtd -usr/share/vlc/skins2/winamp2.xml -usr/share/vlc/vlc128x128.png -usr/share/vlc/vlc16x16.png -usr/share/vlc/vlc16x16.xpm -usr/share/vlc/vlc32x32.png -usr/share/vlc/vlc32x32.xpm -usr/share/vlc/vlc48x48.ico -usr/share/vlc/vlc48x48.png diff --git a/lfs/ipfireseeder b/lfs/ipfireseeder deleted file mode 100644 index 8834bbc..0000000 --- a/lfs/ipfireseeder +++ /dev/null @@ -1,84 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2011 IPFire Team <info(a)ipfire.org> # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 1.00 - -THISAPP = ipfireseeder-$(VER) -DL_FILE = ipfire-2.9.i586-full-core51.iso.torrent - -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -SUP_ARCH = i586 -PROG = ipfireseeder -PAK_VER = 27 - -DEPS = "rtorrent" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_MD5 = fa40cd03e4b0a11f8f703595a5c01a76 - -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) - -mkdir -p /var/log/seeder /var/ipfire/seeder - cp -vf $(DIR_DL)/$(DL_FILE) /var/ipfire/seeder - echo "Folder for IPFireseeder data" > /var/log/seeder/info - @$(POSTBUILD) diff --git a/lfs/videolan b/lfs/videolan deleted file mode 100644 index 17a9f7a..0000000 --- a/lfs/videolan +++ /dev/null @@ -1,104 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see <http://www.gnu.org/licenses/>. # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.8.6i -THISAPP = vlc-$(VER) -DL_FILE = $(THISAPP).tar.bz2 -DL_FILE1 = $(THISAPP)-bugfix-080903.patch.bz2 - -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = videolan -PAK_VER = 5 - -DEPS = "libshout libmpeg2 libmad libdvbpsi directfb ffmpeg faad2" - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) $(DL_FILE1) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE1) = $(DL_FROM)/$(DL_FILE1) - -$(DL_FILE)_MD5 = 3c90520c9f22a68d287458d5a8af989e -$(DL_FILE1)_MD5 = 36ea293b5ebb604778b321b5e3e3cdc4 - -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) - #Apply some patched from videolan 8.6-bugfix branch, - #ignore the error because one patch is already applied - -cd $(DIR_APP) && bzip2 -d -c $(DIR_DL)/$(DL_FILE1) | patch -p1 - cd $(DIR_APP) && ./configure --prefix=/usr --enable-shared --with-ffmpeg-tree=/usr/src/ffmpeg \ - --with-ffmpeg-config=/usr/src/ffmpeg \ - --disable-wxwidgets --disable-skins2 \ - --enable-httpd --enable-pth --enable-shout \ - --enable-smb --enable-cddax --enable-ncurses \ - --enable-a52 --enable-dts --enable-alsa \ - --enable-unicode-utf8 --enable-v4l --enable-vcd \ - --enable-ogg --enable-vorbis --enable-theora \ - --enable-mad --enable-v4l --enable-dvb \ - --with-dvb=/usr/src/v4l-dvb \ - --with-v4l=/usr/src/v4l-dvb \ - --enable-libdvbpsi --enable-faac --enable-mkv \ - --enable-x264 --enable-release --enable-sout \ - --disable-nls --enable-faad \ - --enable-directfb --with-directfb=/usr/src/directfb - cd $(DIR_APP) && make $(MAKETUNING) - cd $(DIR_APP) && make install - @rm -rf $(DIR_APP) - @$(POSTBUILD) diff --git a/lfs/xz b/lfs/xz index cff9bb3..7a56c72 100644 --- a/lfs/xz +++ b/lfs/xz @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2012 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 4.999.9beta +VER = 5.0.4 THISAPP = xz-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -47,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = cc4044fcc073b8bcf3164d1d0df82161 +$(DL_FILE)_MD5 = 741cd3a5f64b23b7bac56ec5b2258715 install : $(TARGET) diff --git a/make.sh b/make.sh index 55684d5..278c807 100755 --- a/make.sh +++ b/make.sh @@ -624,7 +624,6 @@ buildipfire() { ipfiremake libsigc++ ipfiremake libtorrent ipfiremake rtorrent - ipfiremake ipfireseeder ipfiremake rsync ipfiremake tcpwrapper ipfiremake libevent @@ -662,7 +661,6 @@ buildipfire() { ipfiremake dfb++ ipfiremake faad2 ipfiremake ffmpeg - ipfiremake videolan ipfiremake vdr ipfiremake w_scan ipfiremake icecast diff --git a/src/initscripts/init.d/ipfireseeder b/src/initscripts/init.d/ipfireseeder deleted file mode 100644 index 5ce5cdf..0000000 --- a/src/initscripts/init.d/ipfireseeder +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -######################################################################## -# Begin $rc_base/init.d/ipfireseeder -# -# Description : This is a script that starts the torrent-seeder on your -# local IPFire. -# -# Authors : Michael Tremer (mitch(a)ipfire.org) -# -# Version : 01.00 -# -# Notes : -# -######################################################################## - -. /etc/sysconfig/rc -. ${rc_functions} - -case "${1}" in - start) - boot_mesg "Starting IPFire Seeder..." - cd /var/log/seeder - # loadproc - screen -dmS seeder /usr/bin/rtorrent -o port_range=35700-35700 \ - -o download_rate=180 -o upload_rate=15 \ - -o min_peers=10 -o max_peers=30 \ - -o min_peers_seed=1 -o max_peers_seed=5 \ - -o max_uploads=3 \ - /var/ipfire/seeder/*.torrent & - evaluate_retval - if ! grep -q "35700:35700" /var/ipfire/xtaccess/config ; then - echo "tcp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config - echo "udp,0.0.0.0/0,35700:35700,on,0.0.0.0,IPFireSeeder" >> /var/ipfire/xtaccess/config - /usr/local/bin/setxtaccess - fi - ;; - - stop) - boot_mesg "Stopping IPFire Seeder..." - killproc /usr/bin/rtorrent - ;; - - reload) - boot_mesg "Reloading IPFire Seeder..." - reloadproc /usr/bin/rtorrent - ;; - - restart) - ${0} stop - sleep 1 - ${0} start - ;; - - status) - statusproc /usr/bin/rtorrent - ;; - - *) - echo "Usage: ${0} {start|stop|reload|restart|status}" - exit 1 - ;; -esac - -# End $rc_base/init.d/ipfireseeder diff --git a/src/initscripts/init.d/setclock b/src/initscripts/init.d/setclock index 908d490..50e4503 100644 --- a/src/initscripts/init.d/setclock +++ b/src/initscripts/init.d/setclock @@ -19,7 +19,14 @@ CLOCKPARAMS= case ${1} in start) + boot_mesg "Setting system clock..." + + # udev not create the rtc symlink if rtc is in the kernel + if [ ! -e /dev/rtc ]; then + ln -s rtc0 /dev/rtc + fi + hwclock --hctosys ${CLOCKPARAMS} &>/dev/null evaluate_retval ;; diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index 6a50044..b1d512a 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -12,7 +12,7 @@ #include "install.h" #define _GNU_SOURCE -#define INST_FILECOUNT 10700 +#define INST_FILECOUNT 14400 #define UNATTENDED_CONF "/cdrom/boot/unattended.conf" #define LICENSE_FILE "/cdrom/COPYING" diff --git a/src/paks/ipfireseeder/install.sh b/src/paks/ipfireseeder/install.sh deleted file mode 100644 index 81abf5a..0000000 --- a/src/paks/ipfireseeder/install.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -extract_files -ln -s ../../ipfireseeder /etc/rc.d/init.d/networking/red.up/90-S-ipfireseeder -ln -s ../../ipfireseeder /etc/rc.d/init.d/networking/red.down/01-K-ipfireseeder - -start_service --delay 90 --background ${NAME} diff --git a/src/paks/ipfireseeder/uninstall.sh b/src/paks/ipfireseeder/uninstall.sh deleted file mode 100644 index 888c701..0000000 --- a/src/paks/ipfireseeder/uninstall.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -stop_service ${NAME} - -#prevent erasing the downloaded data at uninstall/update -cat /opt/pakfire/db/rootfiles/ipfireseeder | \ - grep -v "var/ipfire/seeder" | \ - grep -v "var/log/seeder" > /opt/pakfire/db/rootfiles/ipfireseeder.tmp -mv /opt/pakfire/db/rootfiles/ipfireseeder.tmp \ - /opt/pakfire/db/rootfiles/ipfireseeder - -grep -v "IPFireSeeder" /var/ipfire/xtaccess/config > /var/ipfire/xtaccess/config.tmp -mv /var/ipfire/xtaccess/config.tmp /var/ipfire/xtaccess/config -chown nobody:nobody /var/ipfire/xtaccess/config -chmod 644 /var/ipfire/xtaccess/config - -rm -f /etc/rc.d/rc?.d/???ipfireseeder -rm -f /etc/rc.d/init.d/networking/red.*/??-?-ipfireseeder - -remove_files diff --git a/src/paks/ipfireseeder/update.sh b/src/paks/ipfireseeder/update.sh deleted file mode 100644 index 89c40d0..0000000 --- a/src/paks/ipfireseeder/update.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -./uninstall.sh -./install.sh hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. a415ec92ea3745ac5efe32fdbfc5ef11f86408f9
by git＠ipfire.org 05 Nov '12

05 Nov '12

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM November 2012