IPFire-SCM February 2014

ipfire-scm@lists.ipfire.org

1 participants
75 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. fffb777ee6f9c62f29966677045a6bdc705aece0
by git＠ipfire.org 21 Feb '14

21 Feb '14

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 fffb777ee6f9c62f29966677045a6bdc705aece0 (commit) from 1b8327f50e2d4daf7860bc39a864c1bdeea0a4ae (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 fffb777ee6f9c62f29966677045a6bdc705aece0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Fri Feb 21 09:48:33 2014 +0100 Intel-lan: updated e1000 and igb vendor driver. igb v5.0.6 and e1000e v2.5.4 ----------------------------------------------------------------------- Summary of changes: lfs/e1000e | 13 ++++--------- lfs/igb | 15 +++++---------- make.sh | 8 ++++---- 3 files changed, 13 insertions(+), 23 deletions(-) Difference in files: diff --git a/lfs/e1000e b/lfs/e1000e index 04765a0..58c99c4 100644 --- a/lfs/e1000e +++ b/lfs/e1000e @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,14 +25,9 @@ include Config VERSUFIX = ipfire$(KCFG) -ifeq "$(KCFG)" "-xen" - KVER = 2.6.32.61 - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e -else - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/e1000e -endif +MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/e1000e -VER = 2.4.14 +VER = 2.5.4 THISAPP = e1000e-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -48,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 05bae01409bb699f14297d726df2aa23 +$(DL_FILE)_MD5 = 8a57fc73335bf1ab0e16a02ecccdae76 install : $(TARGET) diff --git a/lfs/igb b/lfs/igb index a7c136a..9303ffb 100644 --- a/lfs/igb +++ b/lfs/igb @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org> # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -25,14 +25,9 @@ include Config VERSUFIX = ipfire$(KCFG) -ifeq "$(KCFG)" "-xen" - KVER = 2.6.32.61 - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/igb/ -else - MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/ -endif +MODPATH = /lib/modules/$(KVER)-$(VERSUFIX)/kernel/drivers/net/ethernet/intel/igb/ -VER = 4.3.0 +VER = 5.0.6 THISAPP = igb-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -48,7 +43,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = dcbf7271c016bdb71102eb623b807f83 +$(DL_FILE)_MD5 = 701717fbbba6065af4ff5138bd3a3a9c install : $(TARGET) @@ -82,7 +77,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) #Save original igb module -mv $(MODPATH)/igb.ko \ - $(MODPATH)//igb.ko.org + $(MODPATH)/igb.ko.org @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP)/src && make BUILD_KERNEL=$(KVER)-$(VERSUFIX) cd $(DIR_APP)/src && install -m 644 igb.ko $(MODPATH) diff --git a/make.sh b/make.sh index fc1d9c8..74c02a7 100755 --- a/make.sh +++ b/make.sh @@ -411,8 +411,8 @@ buildipfire() { # ipfiremake r8169 KCFG="-pae" # ipfiremake r8168 KCFG="-pae" # ipfiremake r8101 KCFG="-pae" -# ipfiremake e1000e KCFG="-pae" -# ipfiremake igb KCFG="-pae" + ipfiremake e1000e KCFG="-pae" + ipfiremake igb KCFG="-pae" # x86 kernel build ipfiremake linux KCFG="" @@ -424,8 +424,8 @@ buildipfire() { # ipfiremake r8169 KCFG="" # ipfiremake r8168 KCFG="" # ipfiremake r8101 KCFG="" -# ipfiremake e1000e KCFG="" -# ipfiremake igb KCFG="" + ipfiremake e1000e KCFG="" + ipfiremake igb KCFG="" else # arm-rpi (Raspberry Pi) kernel build hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1b8327f50e2d4daf7860bc39a864c1bdeea0a4ae
by git＠ipfire.org 20 Feb '14

20 Feb '14

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 1b8327f50e2d4daf7860bc39a864c1bdeea0a4ae (commit) from cc21b588df77bfc807720c1456f901614e98e382 (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 1b8327f50e2d4daf7860bc39a864c1bdeea0a4ae Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Thu Feb 20 23:37:22 2014 +0100 kernel: update to 3.10.31. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/i586/linux | 1 + lfs/linux | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) Difference in files: diff --git a/config/rootfiles/common/i586/linux b/config/rootfiles/common/i586/linux index 3ec81ec..1a08e17 100644 --- a/config/rootfiles/common/i586/linux +++ b/config/rootfiles/common/i586/linux @@ -1879,6 +1879,7 @@ lib/modules/KVER-ipfire #lib/modules/KVER-ipfire/kernel/drivers/scsi/hpsa.ko #lib/modules/KVER-ipfire/kernel/drivers/scsi/hptiop.ko #lib/modules/KVER-ipfire/kernel/drivers/scsi/hv_storvsc.ko +#lib/modules/KVER-ipfire/kernel/drivers/scsi/imm.ko #lib/modules/KVER-ipfire/kernel/drivers/scsi/in2000.ko #lib/modules/KVER-ipfire/kernel/drivers/scsi/initio.ko #lib/modules/KVER-ipfire/kernel/drivers/scsi/ipr.ko diff --git a/lfs/linux b/lfs/linux index d460708..0bbfa10 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@ include Config -VER = 3.10.30 +VER = 3.10.31 RPI_PATCHES = linux-3.10.27-grsec-943b563 -GRS_PATCHES = grsecurity-2.9.1-3.10.30-ipfire1.patch.xz +GRS_PATCHES = grsecurity-2.9.1-3.10.31-ipfire1.patch.xz THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -36,7 +36,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS = -PAK_VER = 35 +PAK_VER = 36 DEPS = "" VERSUFIX=ipfire$(KCFG) @@ -74,9 +74,9 @@ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES) -$(DL_FILE)_MD5 = f48ca7dd9f2eb14a2903cb6a4fbe07ed +$(DL_FILE)_MD5 = 19e2b31f6883822ef35b974813e8e98e rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 8cf81f48408306d93ccee59b58af2e92 -$(GRS_PATCHES)_MD5 = 044e29280d4717441e89e8d80abba563 +$(GRS_PATCHES)_MD5 = ac71d9a1a5b7fabeb76ddef95518acd0 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. cc21b588df77bfc807720c1456f901614e98e382
by git＠ipfire.org 20 Feb '14

20 Feb '14

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 cc21b588df77bfc807720c1456f901614e98e382 (commit) via bcf1a62476de2dc720426aafe1e893f06608b9d5 (commit) via 29201ca84b722e08aaaf6b6dee0b622bf393f143 (commit) from 317638e7534c995fd3866467fab17b057e28f76a (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 cc21b588df77bfc807720c1456f901614e98e382 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 20 13:03:28 2014 +0100 firewall: Remove rule that allows access to everything. commit bcf1a62476de2dc720426aafe1e893f06608b9d5 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 20 13:01:48 2014 +0100 firewall: Fix proper check for BLUE and ORANGE devices. commit 29201ca84b722e08aaaf6b6dee0b622bf393f143 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 20 13:01:36 2014 +0100 firewall: Remove redundant rule. ----------------------------------------------------------------------- Summary of changes: config/firewall/firewall-policy | 4 ++-- config/firewall/rules.pl | 1 - src/initscripts/init.d/firewall | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) Difference in files: diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy index 773e5ce..bd1e40d 100755 --- a/config/firewall/firewall-policy +++ b/config/firewall/firewall-policy @@ -41,10 +41,10 @@ HAVE_ORANGE="false" case "${CONFIG_TYPE}" in 2) - HAVE_BLUE="true" + HAVE_ORANGE="true" ;; 3) - HAVE_ORANGE="true" + HAVE_BLUE="true" ;; 4) HAVE_BLUE="true" diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl index 09e8ae6..377483e 100755 --- a/config/firewall/rules.pl +++ b/config/firewall/rules.pl @@ -111,7 +111,6 @@ if($param eq 'flush'){ system ("/usr/sbin/firewall-policy"); }elsif($fwdfwsettings{'POLICY'} eq 'MODE2'){ &p2pblock; - system ("iptables --wait -A $CHAIN -m conntrack --ctstate NEW -j ACCEPT"); system ("/usr/sbin/firewall-policy"); system ("/etc/sysconfig/firewall.local reload"); } diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall index 4c9d875..2b3b91c 100644 --- a/src/initscripts/init.d/firewall +++ b/src/initscripts/init.d/firewall @@ -238,7 +238,6 @@ iptables_init() { if [ "$DROPFORWARD" == "on" ]; then iptables -A FORWARD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD" fi - iptables -A FORWARD -j DROP -m comment --comment "DROP_FORWARD" } iptables_red() { hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 317638e7534c995fd3866467fab17b057e28f76a
by git＠ipfire.org 20 Feb '14

20 Feb '14

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 317638e7534c995fd3866467fab17b057e28f76a (commit) from 5e1ee0e6e688da9623c27e27574395fefe8a33e3 (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 317638e7534c995fd3866467fab17b057e28f76a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Feb 20 10:55:08 2014 +0100 index.cgi: Change display of DNS servers. Add missing colon and put them into one column in the table. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.de | 1 + doc/language_issues.en | 1 + doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 4 ++++ html/cgi-bin/index.cgi | 31 ++++++++++++++++--------------- langs/de/cgi-bin/de.pl | 3 ++- langs/en/cgi-bin/en.pl | 1 + 12 files changed, 37 insertions(+), 16 deletions(-) Difference in files: diff --git a/doc/language_issues.de b/doc/language_issues.de index 11b6336..881d318 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -140,6 +140,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +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 diff --git a/doc/language_issues.en b/doc/language_issues.en index 017a2c4..611a0de 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -161,6 +161,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +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 diff --git a/doc/language_issues.es b/doc/language_issues.es index 366af44..636b05f 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +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 @@ -618,6 +619,7 @@ WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 0560b2b..30cc1f1 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +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 @@ -629,6 +630,7 @@ WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dnat address WARNING: untranslated string: dns address deleted txt +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 934c538..e04aae3 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -156,6 +156,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +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 @@ -594,6 +595,7 @@ WARNING: untranslated string: ccd iroute2 WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 366af44..636b05f 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -154,6 +154,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +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 @@ -618,6 +619,7 @@ WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.ru b/doc/language_issues.ru index dff15bb..195ffc1 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -153,6 +153,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +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 @@ -623,6 +624,7 @@ WARNING: untranslated string: default ip WARNING: untranslated string: deprecated fs warn WARNING: untranslated string: disk access per WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward WARNING: untranslated string: dnsforward add a new entry WARNING: untranslated string: dnsforward configuration diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 620c787..3f27ba2 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -161,6 +161,7 @@ WARNING: translation string unused: dmz pinhole configuration WARNING: translation string unused: dmz pinhole rule added WARNING: translation string unused: dmz pinhole rule removed WARNING: translation string unused: dmzpinholes for same net not necessary +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 @@ -638,6 +639,7 @@ WARNING: untranslated string: bytes WARNING: untranslated string: dead peer detection WARNING: untranslated string: default ip WARNING: untranslated string: dnat address +WARNING: untranslated string: dns servers WARNING: untranslated string: dpd delay WARNING: untranslated string: dpd timeout WARNING: untranslated string: drop action diff --git a/doc/language_missings b/doc/language_missings index 1d57464..2ca9bf6 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -74,6 +74,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -516,6 +517,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -950,6 +952,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action @@ -1363,6 +1366,7 @@ < dnsforward entries < dnsforward forward_server < dnsforward zone +< dns servers < dpd delay < dpd timeout < drop action diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 14eceac..ca98e72 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -190,28 +190,29 @@ END <tr><td><b>$Lang::tr{'gateway'}:</b><td align='center'>$GATEWAY</td><td></td></tr> END } - #Read DNS server 1 - open (DNS1, "<${General::swroot}/red/dns1"); - my $DNS1 = <DNS1>; - chomp($DNS1); - close DNS1; - #Read DNS server 2 - open (DNS2, "<${General::swroot}/red/dns2"); - my $DNS2 = <DNS2>; - chomp($DNS2); - close DNS2; + + my @dns_servers = (); + foreach my $f ("${General::swroot}/red/dns1", "${General::swroot}/red/dns2") { + open(DNS, "<$f"); + my $dns_server = <DNS>; + close(DNS); + + chomp($dns_server); + if ($dns_server) { + push(@dns_servers, $dns_server); + } + } + my $dns_servers_str = join(", ", @dns_servers); print <<END; <tr> <td> - <b>$Lang::tr{'dns server'}</b> - </td> - <td align="center"> - $DNS1 + <b>$Lang::tr{'dns servers'}:</b> </td> <td align="center"> - $DNS2 + $dns_servers_str </td> + <td align="center"></td> </tr> </table> END diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 6d49f27..4518f60 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -718,7 +718,8 @@ 'dns proxy server' => 'DNS-Proxyserver', 'dns saved' => 'Erfolgreich gespeichert!', 'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!', -'dns server' => 'DNS Server', +'dns server' => 'DNS-Server', +'dns servers' => 'DNS-Server', 'dns title' => 'Domain Name System', 'dnsforward' => 'DNS-Weiterleitung', 'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index a5e4388..921e1b1 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -743,6 +743,7 @@ 'dns saved' => 'Successfully saved!', 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!', 'dns server' => 'DNS Server', +'dns servers' => 'DNS Servers', 'dns title' => 'Domain Name System', 'dnsforward' => 'DNS Forwarding', 'dnsforward add a new entry' => 'Add a new entry', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5e1ee0e6e688da9623c27e27574395fefe8a33e3
by git＠ipfire.org 19 Feb '14

19 Feb '14

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 5e1ee0e6e688da9623c27e27574395fefe8a33e3 (commit) via 2f65e28425ca2a446cfb1ab511ae1e1546a4031c (commit) via 3fb3a3b02188ac7e74bbbb882083f6aeba1923f0 (commit) via 1271a8b45eb8ed3970beabba33fd4b0519db3565 (commit) via bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4 (commit) via f8aa06792fde9b29e0c81c1ce2fb4490e9b645a8 (commit) via a636a76016fe214e840cce8856a4fc8a74fba8a7 (commit) via db3096173d9118718c6191c48f581f1c0076dc2a (commit) via 153cf6406ccff186696926d3ad84103a4b496ba8 (commit) via bc05155ac099925796a862e1a1cd1b50ff9e6b1d (commit) via 1235b1f144bc93676acf3e8703bb308a3c60629e (commit) via 5e4262245e8166717b7d44dedebbf1c903d03181 (commit) via 77fa792f93c8363d8199c02ec0b752639fe3ecec (commit) from b21d47c804407458aee20b5609ca99ec63f710f8 (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 5e1ee0e6e688da9623c27e27574395fefe8a33e3 Merge: 2f65e28 f8aa067 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 19 20:49:38 2014 +0100 Merge remote-tracking branch 'alfh/bugfix_htmlclean' into next commit 2f65e28425ca2a446cfb1ab511ae1e1546a4031c Merge: 3fb3a3b a636a76 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 19 20:48:12 2014 +0100 Merge remote-tracking branch 'alfh/bugfix_missing_swapvisibility' into next commit 3fb3a3b02188ac7e74bbbb882083f6aeba1923f0 Merge: 1271a8b db30961 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 19 20:47:54 2014 +0100 Merge remote-tracking branch 'alfh/bugfix_menu_touch' into next commit 1271a8b45eb8ed3970beabba33fd4b0519db3565 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 19 20:47:12 2014 +0100 core76: Add update accelerator script to updater. commit bbb3a931fa3b11a0d2374595cbe0d1c981e9b5e4 Merge: bc05155 1235b1f Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Feb 19 20:46:21 2014 +0100 Merge remote-tracking branch 'alfh/feature_updxlrator' into next commit f8aa06792fde9b29e0c81c1ce2fb4490e9b645a8 Author: Alf Høgemark <alf(a)i100.no> Date: Wed Feb 19 18:31:02 2014 +0100 cgi-bin: Add title attribute to input type image where missing Almost all of <input type="image"... has both an alt and a title attribute, but some are missing title, and when the icon is not very clear, it makes it harder to understand what the icon does. By adding title, the browser displays text when mouse pointer is over the icon. Also add missing quotes for alt and title attributes where needed. commit a636a76016fe214e840cce8856a4fc8a74fba8a7 Author: Alf Høgemark <alf(a)i100.no> Date: Wed Feb 19 18:05:55 2014 +0100 ipfire theme: Add missing swapVisibility javascript function qos.cgi and media.cgi depend on swapVisibility function, this is defined in each theme, but was missing from the new theme. Add the function, and implement it using jquery, since jquery is always present in the new theme. commit db3096173d9118718c6191c48f581f1c0076dc2a Author: Alf Høgemark <alf(a)i100.no> Date: Wed Feb 19 17:30:49 2014 +0100 webgui menus: Make top menu item clickable on mobile safari The menus in the new default theme does not work properly on ipad and I guess other devices using mobile safari. The reason is that <a> tags without href is not marked as clickable by ios, and therefore no css hover effect is applied. The fix is either to add a href="#" attribute or a onclick="return true;" atribute on the <a> tag. I prefer the href solution, since it is a no javascript solution. commit 153cf6406ccff186696926d3ad84103a4b496ba8 Author: Alf Høgemark <alf(a)i100.no> Date: Tue Feb 18 18:48:57 2014 +0100 cgi-bin: Use readonly="readonly" attribute on html input elements The proper way to mark readonly is to use readonly="readonly", not readonly="true", like it was done some places. commit bc05155ac099925796a862e1a1cd1b50ff9e6b1d Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Feb 18 15:16:08 2014 +0100 strongswan: Update to 5.1.2rc1. commit 1235b1f144bc93676acf3e8703bb308a3c60629e Author: Alf Høgemark <alf(a)i100.no> Date: Sat Feb 15 10:01:51 2014 +0100 updxlrator: Add support for tar.xz files commit 5e4262245e8166717b7d44dedebbf1c903d03181 Author: Alf Høgemark <alf(a)i100.no> Date: Wed Feb 5 20:02:44 2014 +0100 updxlrator: Handle colon in filenames in updatexlrator.cgi The updatexlrator.cgi is assuming that colon is not part of any filenames downloaded by updxlrator. Fix this by fixing regular expression used for listing pending download files, and by fixing regular expression used to listing files in maintenance view. The fix for listing in maintenance is not very nice, I just use ":separator:" as field separator instead of just ":", which was used earlier. This should make it very unlikely to collide with a part of the filename. Also make the files in download be sorted using lower case, like it is done for files in the vendor path. The problem can be reproduced by downloading http://mirror.us.leaseweb.net/archlinux/community/os/x86_64/ docker-1:0.7.6-1-x86_64.pkg.tar.xz, after pkg.tar.xz files support has been added to updxlrator. commit 77fa792f93c8363d8199c02ec0b752639fe3ecec Author: Alf Høgemark <alf(a)i100.no> Date: Wed Feb 5 19:03:35 2014 +0100 updxlrator: Add support for ArchLinux pkg.tar.xz files Add support for caching package files for ArchLinux in updxlrator, by adding pkg.tar.xz to the regular expression for Linux vendor. ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/strongswan | 106 +++++++++++++++++++++++++++ config/rootfiles/core/76/filelists/files | 1 + config/updxlrator/updxlrator | 4 +- html/cgi-bin/extrahd.cgi | 4 +- html/cgi-bin/fireinfo.cgi | 2 +- html/cgi-bin/fwhosts.cgi | 24 +++--- html/cgi-bin/gpl.cgi | 2 +- html/cgi-bin/ids.cgi | 2 +- html/cgi-bin/mdstat.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 6 +- html/cgi-bin/pakfire.cgi | 18 ++--- html/cgi-bin/proxy.cgi | 2 +- html/cgi-bin/qos.cgi | 26 +++---- html/cgi-bin/samba.cgi | 8 +- html/cgi-bin/tripwire.cgi | 8 +- html/cgi-bin/updatexlrator.cgi | 9 ++- html/cgi-bin/upnp.cgi | 2 +- html/html/themes/ipfire/include/functions.pl | 8 +- lfs/strongswan | 4 +- 19 files changed, 176 insertions(+), 62 deletions(-) Difference in files: diff --git a/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan index c33769f..f507495 100644 --- a/config/rootfiles/common/strongswan +++ b/config/rootfiles/common/strongswan @@ -10,6 +10,57 @@ etc/ipsec.d/private etc/ipsec.d/reqs etc/ipsec.secrets etc/strongswan.conf +etc/strongswan.d +etc/strongswan.d/charon +etc/strongswan.d/charon-logging.conf +etc/strongswan.d/charon.conf +etc/strongswan.d/charon/aes.conf +etc/strongswan.d/charon/attr.conf +etc/strongswan.d/charon/cmac.conf +etc/strongswan.d/charon/constraints.conf +etc/strongswan.d/charon/curl.conf +etc/strongswan.d/charon/des.conf +etc/strongswan.d/charon/dhcp.conf +etc/strongswan.d/charon/dnskey.conf +etc/strongswan.d/charon/eap-identity.conf +etc/strongswan.d/charon/eap-mschapv2.conf +etc/strongswan.d/charon/eap-peap.conf +etc/strongswan.d/charon/eap-radius.conf +etc/strongswan.d/charon/eap-tls.conf +etc/strongswan.d/charon/eap-ttls.conf +etc/strongswan.d/charon/farp.conf +etc/strongswan.d/charon/fips-prf.conf +etc/strongswan.d/charon/gmp.conf +etc/strongswan.d/charon/hmac.conf +etc/strongswan.d/charon/kernel-netlink.conf +etc/strongswan.d/charon/md5.conf +etc/strongswan.d/charon/nonce.conf +etc/strongswan.d/charon/openssl.conf +etc/strongswan.d/charon/padlock.conf +etc/strongswan.d/charon/pem.conf +etc/strongswan.d/charon/pgp.conf +etc/strongswan.d/charon/pkcs1.conf +etc/strongswan.d/charon/pkcs12.conf +etc/strongswan.d/charon/pkcs7.conf +etc/strongswan.d/charon/pkcs8.conf +etc/strongswan.d/charon/pubkey.conf +etc/strongswan.d/charon/random.conf +etc/strongswan.d/charon/rc2.conf +etc/strongswan.d/charon/resolve.conf +etc/strongswan.d/charon/revocation.conf +etc/strongswan.d/charon/sha1.conf +etc/strongswan.d/charon/sha2.conf +etc/strongswan.d/charon/socket-default.conf +etc/strongswan.d/charon/sshkey.conf +etc/strongswan.d/charon/stroke.conf +etc/strongswan.d/charon/unity.conf +etc/strongswan.d/charon/updown.conf +etc/strongswan.d/charon/x509.conf +etc/strongswan.d/charon/xauth-eap.conf +etc/strongswan.d/charon/xauth-generic.conf +etc/strongswan.d/charon/xcbc.conf +etc/strongswan.d/starter.conf +etc/strongswan.d/tools.conf usr/bin/pki #usr/lib/ipsec #usr/lib/ipsec/libcharon.a @@ -113,3 +164,58 @@ usr/sbin/ipsec #usr/share/man/man8/ipsec.8 #usr/share/man/man8/openac.8 #usr/share/man/man8/scepclient.8 +#usr/share/strongswan +#usr/share/strongswan/templates +#usr/share/strongswan/templates/config +#usr/share/strongswan/templates/config/plugins +#usr/share/strongswan/templates/config/plugins/aes.conf +#usr/share/strongswan/templates/config/plugins/attr.conf +#usr/share/strongswan/templates/config/plugins/cmac.conf +#usr/share/strongswan/templates/config/plugins/constraints.conf +#usr/share/strongswan/templates/config/plugins/curl.conf +#usr/share/strongswan/templates/config/plugins/des.conf +#usr/share/strongswan/templates/config/plugins/dhcp.conf +#usr/share/strongswan/templates/config/plugins/dnskey.conf +#usr/share/strongswan/templates/config/plugins/eap-identity.conf +#usr/share/strongswan/templates/config/plugins/eap-mschapv2.conf +#usr/share/strongswan/templates/config/plugins/eap-peap.conf +#usr/share/strongswan/templates/config/plugins/eap-radius.conf +#usr/share/strongswan/templates/config/plugins/eap-tls.conf +#usr/share/strongswan/templates/config/plugins/eap-ttls.conf +#usr/share/strongswan/templates/config/plugins/farp.conf +#usr/share/strongswan/templates/config/plugins/fips-prf.conf +#usr/share/strongswan/templates/config/plugins/gmp.conf +#usr/share/strongswan/templates/config/plugins/hmac.conf +#usr/share/strongswan/templates/config/plugins/kernel-netlink.conf +#usr/share/strongswan/templates/config/plugins/md5.conf +#usr/share/strongswan/templates/config/plugins/nonce.conf +#usr/share/strongswan/templates/config/plugins/openssl.conf +#usr/share/strongswan/templates/config/plugins/padlock.conf +#usr/share/strongswan/templates/config/plugins/pem.conf +#usr/share/strongswan/templates/config/plugins/pgp.conf +#usr/share/strongswan/templates/config/plugins/pkcs1.conf +#usr/share/strongswan/templates/config/plugins/pkcs12.conf +#usr/share/strongswan/templates/config/plugins/pkcs7.conf +#usr/share/strongswan/templates/config/plugins/pkcs8.conf +#usr/share/strongswan/templates/config/plugins/pubkey.conf +#usr/share/strongswan/templates/config/plugins/random.conf +#usr/share/strongswan/templates/config/plugins/rc2.conf +#usr/share/strongswan/templates/config/plugins/resolve.conf +#usr/share/strongswan/templates/config/plugins/revocation.conf +#usr/share/strongswan/templates/config/plugins/sha1.conf +#usr/share/strongswan/templates/config/plugins/sha2.conf +#usr/share/strongswan/templates/config/plugins/socket-default.conf +#usr/share/strongswan/templates/config/plugins/sshkey.conf +#usr/share/strongswan/templates/config/plugins/stroke.conf +#usr/share/strongswan/templates/config/plugins/unity.conf +#usr/share/strongswan/templates/config/plugins/updown.conf +#usr/share/strongswan/templates/config/plugins/x509.conf +#usr/share/strongswan/templates/config/plugins/xauth-eap.conf +#usr/share/strongswan/templates/config/plugins/xauth-generic.conf +#usr/share/strongswan/templates/config/plugins/xcbc.conf +#usr/share/strongswan/templates/config/strongswan.conf +#usr/share/strongswan/templates/config/strongswan.d +#usr/share/strongswan/templates/config/strongswan.d/charon-logging.conf +#usr/share/strongswan/templates/config/strongswan.d/charon.conf +#usr/share/strongswan/templates/config/strongswan.d/starter.conf +#usr/share/strongswan/templates/config/strongswan.d/tools.conf diff --git a/config/rootfiles/core/76/filelists/files b/config/rootfiles/core/76/filelists/files index a6f5e7c..fcd2804 100644 --- a/config/rootfiles/core/76/filelists/files +++ b/config/rootfiles/core/76/filelists/files @@ -21,6 +21,7 @@ srv/web/ipfire/html/themes/maniac usr/lib/firewall usr/local/bin/timezone-transition usr/local/bin/setddns.pl +usr/sbin/updxlrator var/ipfire/backup/bin/backup.pl var/ipfire/backup/exclude var/ipfire/backup/include diff --git a/config/updxlrator/updxlrator b/config/updxlrator/updxlrator index cdfce26..91ff8a9 100644 --- a/config/updxlrator/updxlrator +++ b/config/updxlrator/updxlrator @@ -108,8 +108,8 @@ while (<>) { # ----------------------------------------------------------- if ( - ($source_url =~ m@^[h|f]t?tp://[^?]+\.(deb|rpm)$@i) || - ($source_url =~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i) + ($source_url =~ m@^[h|f]t?tp://[^?]+\.(pkg\.tar\.xz|deb|rpm)$@i) || + ($source_url =~ m@^[h|f]t?tp://[^?]+/distfiles/[^?]+\.(tar\.gz|tar\.bz2|tar\.xz|tgz|zip|patch\.bz2|gz|docx|patch|pdf|exe)$@i) ) { $xlrator_url = &check_cache($source_url,$hostaddr,$username,"Linux",$mirror); diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi index 0bff591..5a6fbce 100644 --- a/html/cgi-bin/extrahd.cgi +++ b/html/cgi-bin/extrahd.cgi @@ -152,7 +152,7 @@ END <input type='hidden' name='FS' value='$deviceline[1]' /> <input type='hidden' name='PATH' value='$deviceline[2]' /> <input type='hidden' name='ACTION' value=$Lang::tr{'delete'} /> - <input type='image' alt=$Lang::tr{'delete'} src='/images/delete.gif' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form></td></tr> END ; @@ -224,7 +224,7 @@ END <input type='hidden' name='DEVICE' value='$partitionline[0]' /> <input type='hidden' name='UUID' value='$partitionline[2]' /> <input type='hidden' name='ACTION' value=$Lang::tr{'add'} /> - <input type='image' alt=$Lang::tr{'add'} src='/images/add.gif' /> + <input type='image' alt='$Lang::tr{'add'}' title='$Lang::tr{'add'}' src='/images/add.gif' /> </form></td></tr> END ; diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi index 5eec4ba..0060a11 100644 --- a/html/cgi-bin/fireinfo.cgi +++ b/html/cgi-bin/fireinfo.cgi @@ -156,7 +156,7 @@ print <<END; </tr> <tr> <td colspan='2'> - <textarea rows="25" cols="75" readonly="true">$profile</textarea> + <textarea rows="25" cols="75" readonly="readonly">$profile</textarea> </td> </tr> </table> diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi index 67e8dc8..efcdfb9 100644 --- a/html/cgi-bin/fwhosts.cgi +++ b/html/cgi-bin/fwhosts.cgi @@ -1492,7 +1492,7 @@ END my $netcount=&getnetcount($customnetwork{$key}[0]); print"<td width='20%' $col><form method='post'>$customnetwork{$key}[0]</td><td width='15%' align='center' $col>".&Header::colorize($colnet)."</td><td width='40%' $col>$customnetwork{$key}[3]</td><td align='center' $col>$netcount x</td>"; print<<END; - <td width='1%' $col><input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /> + <td width='1%' $col><input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /> <input type='hidden' name='ACTION' value='editnet'> <input type='hidden' name='HOSTNAME' value='$customnetwork{$key}[0]' /> <input type='hidden' name='IP' value='$customnetwork{$key}[1]' /> @@ -1502,7 +1502,7 @@ END END if($netcount == '0') { - print"<td width='1%' $col><form method='post'><input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} /><input type='hidden' name='ACTION' value='delnet' /><input type='hidden' name='key' value='$customnetwork{$key}[0]' /></td></form></tr>"; + print"<td width='1%' $col><form method='post'><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><input type='hidden' name='ACTION' value='delnet' /><input type='hidden' name='key' value='$customnetwork{$key}[0]' /></td></form></tr>"; }else{ print"<td $col></td></tr>"; } @@ -1600,7 +1600,7 @@ END $hostcount=&gethostcount($customhost{$key}[0]); print"<td width='20%' $col>$customhost{$key}[0]</td><td width='20%' align='center' $col ".&getcolor($ip).">".&Header::colorize($ip)."</td><td width='50%' align='left' $col>$customhost{$key}[3]</td><td align='center' $col>$hostcount x</td>"; print<<END; - <td width='1%' $col><form method='post'><input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /> + <td width='1%' $col><form method='post'><input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /> <input type='hidden' name='ACTION' value='edithost' /> <input type='hidden' name='HOSTNAME' value='$customhost{$key}[0]' /> <input type='hidden' name='IP' value='$ip' /> @@ -1610,7 +1610,7 @@ END END if($hostcount == '0') { - print"<td width='1%' $col><form method='post'><input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} /><input type='hidden' name='ACTION' value='delhost' /><input type='hidden' name='key' value='$customhost{$key}[0]' /></td></form></tr>"; + print"<td width='1%' $col><form method='post'><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><input type='hidden' name='ACTION' value='delhost' /><input type='hidden' name='key' value='$customhost{$key}[0]' /></td></form></tr>"; }else{ print"<td width='1%' $col></td></tr>"; } @@ -1677,9 +1677,9 @@ sub viewtablegrp print "<b>$Lang::tr{'used'}:</b> $netgrpcount x"; if($netgrpcount == '0') { - print"<form method='post' style='display:inline'><input type='image' src='/images/delete.gif' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} align='right' /><input type='hidden' name='grp_name' value='$grpname' ><input type='hidden' name='ACTION' value='delgrp'></form>"; + print"<form method='post' style='display:inline'><input type='image' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' align='right' /><input type='hidden' name='grp_name' value='$grpname' ><input type='hidden' name='ACTION' value='delgrp'></form>"; } - print"<form method='post' style='display:inline'><input type='image' src='/images/edit.gif' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} align='right' /><input type='hidden' name='grp_name' value='$grpname' ><input type='hidden' name='remark' value='$remark' ><input type='hidden' name='ACTION' value='editgrp'></form>"; + print"<form method='post' style='display:inline'><input type='image' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' align='right' /><input type='hidden' name='grp_name' value='$grpname' ><input type='hidden' name='remark' value='$remark' ><input type='hidden' name='ACTION' value='editgrp'></form>"; print"<table width='100%' cellspacing='0' class='tbl'><tr><th align='center'><b>$Lang::tr{'name'}</b></th><th align='center'><b>$Lang::tr{'fwhost ip_mac'}</b></th><th align='center' width='25%'><b>$Lang::tr{'fwhost type'}</th><th></th></tr>"; } my $col=''; @@ -1712,7 +1712,7 @@ sub viewtablegrp print"<td align='center' $col ".&getcolor($colip).">".&Header::colorize($ip)."</td><td align='center' $col>$customgrp{$key}[3]</td><td width='1%' $col><form method='post'>"; } if ($delflag > 0 && $ip ne ''){ - print"<input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} />"; + print"<input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' />"; #check if this group has only one entry foreach my $key2 (keys %hash) { if ($hash{$key2}<2 && $key2 eq $customgrp{$key}[0]){ @@ -1770,7 +1770,7 @@ END elsif($customservice{$key}[3] ne 'BLANK'){print $customservice{$key}[3];} print<<END; </td><td align='center' $col>$srvcount x</td> - <td width='1%' $col><form method='post'><input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /><input type='hidden' name='ACTION' value='editservice' /> + <td width='1%' $col><form method='post'><input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /><input type='hidden' name='ACTION' value='editservice' /> <input type='hidden' name='SRV_NAME' value='$customservice{$key}[0]' /> <input type='hidden' name='SRV_PORT' value='$customservice{$key}[1]' /> <input type='hidden' name='PROT' value='$customservice{$key}[2]' /> @@ -1778,7 +1778,7 @@ END END if ($srvcount eq '0') { - print"<td width='1%' $col><form method='post'><input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} /><input type='hidden' name='ACTION' value='delservice' /><input type='hidden' name='SRV_NAME' value='$customservice{$key}[0]'></td></tr></form>"; + print"<td width='1%' $col><form method='post'><input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' /><input type='hidden' name='ACTION' value='delservice' /><input type='hidden' name='SRV_NAME' value='$customservice{$key}[0]'></td></tr></form>"; }else{ print"<td $col></td></tr>"; } @@ -1844,9 +1844,9 @@ sub viewtableservicegrp print "  <b>$Lang::tr{'used'}:</b> $grpcount x"; if($grpcount == '0') { - print"<form method='post' style='display:inline'><input type='image' src='/images/delete.gif' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} align='right' /><input type='hidden' name='SRVGRP_NAME' value='$grpname' ><input type='hidden' name='ACTION' value='delservicegrp'></form>"; + print"<form method='post' style='display:inline'><input type='image' src='/images/delete.gif' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' align='right' /><input type='hidden' name='SRVGRP_NAME' value='$grpname' ><input type='hidden' name='ACTION' value='delservicegrp'></form>"; } - print"<form method='post' style='display:inline'><input type='image' src='/images/edit.gif' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} align='right' /><input type='hidden' name='SRVGRP_NAME' value='$grpname' ><input type='hidden' name='SRVGRP_REMARK' value='$remark' ><input type='hidden' name='ACTION' value='editservicegrp'></form>"; + print"<form method='post' style='display:inline'><input type='image' src='/images/edit.gif' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' align='right' /><input type='hidden' name='SRVGRP_NAME' value='$grpname' ><input type='hidden' name='SRVGRP_REMARK' value='$remark' ><input type='hidden' name='ACTION' value='editservicegrp'></form>"; print"<table width='100%' cellspacing='0' class='tbl'><tr><th align='center'><b>Name</b></th><th align='center'><b>$Lang::tr{'port'}</b></th><th align='center' width='25%'><b>$Lang::tr{'fwhost prot'}</th><th></th></tr>"; } if( $fwhostsettings{'SRVGRP_NAME'} eq $customservicegrp{$key}[0]) { @@ -1885,7 +1885,7 @@ sub viewtableservicegrp print"<td align='center' $col>$port</td><td align='center' $col>$protocol</td><td width='1%' $col><form method='post'>"; if ($delflag gt '0'){ if ($customservicegrp{$key}[2] ne $Lang::tr{'fwhost err emptytable'}){ - print"<input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'delete'} title=$Lang::tr{'delete'} />"; + print"<input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'delete'}' title=$Lang::tr{'delete'} />"; } #check if this group has only one entry foreach my $key2 (keys %hash) { diff --git a/html/cgi-bin/gpl.cgi b/html/cgi-bin/gpl.cgi index 7589054..5cfbebd 100644 --- a/html/cgi-bin/gpl.cgi +++ b/html/cgi-bin/gpl.cgi @@ -58,7 +58,7 @@ print <<END; END ; if ( -e "/usr/share/doc/licenses/GPLv3" ) { - print '<textarea rows=\'25\' cols=\'75\' readonly=\'true\'>'; + print '<textarea rows=\'25\' cols=\'75\' readonly=\'readonly\'>'; print `cat /usr/share/doc/licenses/GPLv3`; print '</textarea>'; } diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index bd3a9dc..55e2645 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -472,7 +472,7 @@ if ($return) { $Lang::tr{'snort working'} <tr><td colspan='2' align='center'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='image' alt='$Lang::tr{'reload'}' src='/images/view-refresh.png' /> + <input type='image' alt='$Lang::tr{'reload'}' title='$Lang::tr{'reload'}' src='/images/view-refresh.png' /> </form> <tr><td colspan='2' align='left'><pre> END diff --git a/html/cgi-bin/mdstat.cgi b/html/cgi-bin/mdstat.cgi index 35c7deb..e22856f 100644 --- a/html/cgi-bin/mdstat.cgi +++ b/html/cgi-bin/mdstat.cgi @@ -41,7 +41,7 @@ my %mainsettings = (); &Header::openbox('100%', 'left',"MD Raid State"); -print '<textarea rows="25" cols="80" readonly="true">'; +print '<textarea rows="25" cols="80" readonly="readonly">'; print `cat "/proc/mdstat"`; print '</textarea>'; diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 1ff2bf9..fa801a9 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -2488,7 +2488,7 @@ if ($cgiparams{'ACTION'} eq "edit"){ <table width='100%' border='0'> <tr><form method='post'> <td width='10%' nowrap='nowrap'>$Lang::tr{'ccd name'}:</td><td><input type='TEXT' name='ccdname' value='$cgiparams{'ccdname'}' /></td> - <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly /></td></tr> + <td width='8%'>$Lang::tr{'ccd subnet'}:</td><td><input type='TEXT' name='ccdsubnet' value='$cgiparams{'ccdsubnet'}' readonly='readonly' /></td></tr> <tr><td colspan='4' align='right'><hr><input type='submit' value='$Lang::tr{'save'}' /><input type='hidden' name='ACTION' value='editsave'/> <input type='hidden' name='ccdname' value='$cgiparams{'ccdname'}'/><input type='submit' value='$Lang::tr{'cancel'}' /> </td></tr> @@ -2548,7 +2548,7 @@ END print"<td>$ccdconf[0]</td><td align='center'>$ccdconf[1]</td><td align='center'>$ccdhosts/".(&ccdmaxclients($ccdconf[1])+1)."</td><td>"; print <<END <form method='post' /> - <input type='image' src='/images/edit.gif' align='middle' alt=$Lang::tr{'edit'} title=$Lang::tr{'edit'} /> + <input type='image' src='/images/edit.gif' align='middle' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' /> <input type='hidden' name='ACTION' value='edit'/> <input type='hidden' name='ccdname' value='$ccdconf[0]' /> <input type='hidden' name='ccdsubnet' value='$ccdconf[1]' /> @@ -2557,7 +2557,7 @@ print <<END <td><input type='hidden' name='ACTION' value='kill'/> <input type='hidden' name='number' value='$count' /> <input type='hidden' name='net' value='$ccdconf[0]' /> - <input type='image' src='/images/delete.gif' align='middle' alt=$Lang::tr{'remove'} title=$Lang::tr{'remove'} /></form></td></tr> + <input type='image' src='/images/delete.gif' align='middle' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' /></form></td></tr> END ; } diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index 5903d85..2a7ca84 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -81,12 +81,12 @@ END <input type='hidden' name='INSPAKS' value='$pakfiresettings{'INSPAKS'}' /> <input type='hidden' name='FORCE' value='on' /> <input type='hidden' name='ACTION' value='install' /> - <input type='image' alt='$Lang::tr{'install'}' src='/images/go-next.png' /> + <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/go-next.png' /> </form> <td align='left'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='' /> - <input type='image' alt='$Lang::tr{'abort'}' src='/images/dialog-error.png' /> + <input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' /> </form> </table> END @@ -121,12 +121,12 @@ END <input type='hidden' name='DELPAKS' value='$pakfiresettings{'DELPAKS'}' /> <input type='hidden' name='FORCE' value='on' /> <input type='hidden' name='ACTION' value='remove' /> - <input type='image' alt='$Lang::tr{'uninstall'}' src='/images/go-next.png' /> + <input type='image' alt='$Lang::tr{'uninstall'}' title='$Lang::tr{'uninstall'}' src='/images/go-next.png' /> </form> <td align='left'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='ACTION' value='' /> - <input type='image' alt='$Lang::tr{'abort'}' src='/images/dialog-error.png' /> + <input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' /> </form> </table> END @@ -184,12 +184,12 @@ if ($return) { print <<END; <table> <tr><td> - <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />  + <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' title='$Lang::tr{'aktiv'}' />  <td> $Lang::tr{'pakfire working'} <tr><td colspan='2' align='center'> <form method='post' action='$ENV{'SCRIPT_NAME'}'> - <input type='image' alt='$Lang::tr{'reload'}' src='/images/view-refresh.png' /> + <input type='image' alt='$Lang::tr{'reload'}' title='$Lang::tr{'reload'}' src='/images/view-refresh.png' /> </form> <tr><td colspan='2' align='left'><pre> END @@ -245,7 +245,7 @@ END </select> <br /> <input type='hidden' name='ACTION' value='upgrade' /> - <input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' /> + <input type='image' alt='$Lang::tr{'upgrade'}' title='$Lang::tr{'upgrade'}' src='/images/document-save.png' /> </form> <tr><td colspan="2">  @@ -262,7 +262,7 @@ print <<END; </select> <br /> <input type='hidden' name='ACTION' value='install' /> - <input type='image' alt='$Lang::tr{'install'}' src='/images/list-add.png' /> + <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/list-add.png' /> </form> <td align="center"> @@ -277,7 +277,7 @@ print <<END; </select> <br /> <input type='hidden' name='ACTION' value='remove' /> - <input type='image' alt='$Lang::tr{'remove'}' src='/images/list-remove.png' /> + <input type='image' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' src='/images/list-remove.png' /> </form> </table> END diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index c8f0dca..c4cff47 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -2236,7 +2236,7 @@ print <<END <td width='25%'><input type='text' name='NCSA_USERNAME' value='$proxysettings{'NCSA_USERNAME'}' size='12' END ; - if ($proxysettings{'ACTION'} eq $Lang::tr{'edit'}) { print " readonly "; } + if ($proxysettings{'ACTION'} eq $Lang::tr{'edit'}) { print " readonly='readonly' "; } print <<END /></td> <td width='25%' class='base'>$Lang::tr{'advproxy NCSA group'}:</td> diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi index 8b96731..f3539cd 100644 --- a/html/cgi-bin/qos.cgi +++ b/html/cgi-bin/qos.cgi @@ -1209,22 +1209,22 @@ sub showclasses { <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$classline[1]' /> <input type='hidden' name='ACTION' value='$Lang::tr{'qos add subclass'}' /> - <input type='image' alt='$Lang::tr{'add subclass'}' src='/images/addblue.gif' /> + <input type='image' alt='$Lang::tr{'add subclass'}' title='$Lang::tr{'add subclass'}' src='/images/addblue.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$classline[1]' /> <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' /> - <input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' /> + <input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$classline[1]' /> <input type='hidden' name='DOCLASS' value='$Lang::tr{'edit'}' /> - <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> + <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$classline[1]' /> <input type='hidden' name='DOCLASS' value='$Lang::tr{'delete'}' /> - <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> </td> @@ -1249,13 +1249,13 @@ END <input type='hidden' name='CLASS' value='$l7ruleline[0]' /> <input type='hidden' name='L7PROT' value='$l7ruleline[2]' /> <input type='hidden' name='DOLEVEL7' value='$Lang::tr{'edit'}' /> - <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> + <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$l7ruleline[0]' /> <input type='hidden' name='L7PROT' value='$l7ruleline[2]' /> <input type='hidden' name='DOLEVEL7' value='$Lang::tr{'delete'}' /> - <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> END @@ -1314,7 +1314,7 @@ END <input type='hidden' name='DIP' value='$portruleline[5]' /> <input type='hidden' name='DPORT' value='$portruleline[6]' /> <input type='hidden' name='DOPORT' value='$Lang::tr{'edit'}' /> - <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> + <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$portruleline[0]' /> @@ -1324,7 +1324,7 @@ END <input type='hidden' name='DIP' value='$portruleline[5]' /> <input type='hidden' name='DPORT' value='$portruleline[6]' /> <input type='hidden' name='DOPORT' value='$Lang::tr{'delete'}' /> - <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> END @@ -1372,14 +1372,14 @@ END <input type='hidden' name='DEV' value='$tosruleline[1]' /> <input type='hidden' name='TOS' value='$tosruleline[2]' /> <input type='hidden' name='DOTOS' value='$Lang::tr{'edit'}' /> - <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> + <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$tosruleline[0]' /> <input type='hidden' name='DEV' value='$tosruleline[1]' /> <input type='hidden' name='TOS' value='$tosruleline[2]' /> <input type='hidden' name='DOTOS' value='$Lang::tr{'delete'}' /> - <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> END @@ -1407,17 +1407,17 @@ END <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$subclassline[2]' /> <input type='hidden' name='ACTION' value='$Lang::tr{'Add Rule'}' /> - <input type='image' alt='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' /> + <input type='image' alt='$Lang::tr{'Add Rule'}' title='$Lang::tr{'Add Rule'}' src='/images/addgreen.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$subclassline[2]' /> <input type='hidden' name='DOSCLASS' value='$Lang::tr{'edit'}' /> - <input type='image' alt='$Lang::tr{'edit'}' src='/images/edit.gif' /> + <input type='image' alt='$Lang::tr{'edit'}' title='$Lang::tr{'edit'}' src='/images/edit.gif' /> </form> <td><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='hidden' name='CLASS' value='$subclassline[2]' /> <input type='hidden' name='DOSCLASS' value='$Lang::tr{'delete'}' /> - <input type='image' alt='$Lang::tr{'delete'}' src='/images/delete.gif' /> + <input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/delete.gif' /> </form> </table> END diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index d48edf8..bfa0b89 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -816,10 +816,10 @@ END <form method='post' action='$ENV{'SCRIPT_NAME'}#$Lang::tr{'accounting'}'> <table width='95%' cellspacing='0'> <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'change passwords'}</b></td></tr> - <tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' readonly /></td></tr> + <tr><td align='left'>$Lang::tr{'username'}</td><td><input type='text' name='USERNAME' value='$username' size='30' readonly='readonly' /></td></tr> <tr><td align='left'>$Lang::tr{'password'}</td><td><input type='password' name='PASSWORD' value='$password' size='30' /></td></tr> <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbchangepw' /> - <input type='image' alt=$Lang::tr{'save'} title=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr> + <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr> </table> </form> END @@ -844,7 +844,7 @@ END <tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambauser' size='30' /></td></tr> <tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr> <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbuseradd' /> - <input type='image' alt=$Lang::tr{'save'} title=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr> + <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr> </table> </form> END @@ -865,7 +865,7 @@ END <tr><td align='left'>$Lang::tr{'unix group'}</td><td><input type='text' name='GROUP' value='sambawks' size='30' /></td></tr> <tr><td align='left'>$Lang::tr{'unix shell'}</td><td><input type='text' name='SHELL' value='/bin/false' size='30' /></td></tr> <tr><td colspan='2' align='center'><input type='hidden' name='ACTION' value='smbpcadd' /> - <input type='image' title=$Lang::tr{'save'} alt=$Lang::tr{'save'} src='/images/media-floppy.png' /></td></tr> + <input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/media-floppy.png' /></td></tr> </table> </form> END diff --git a/html/cgi-bin/tripwire.cgi b/html/cgi-bin/tripwire.cgi index 170bd66..fb48a27 100644 --- a/html/cgi-bin/tripwire.cgi +++ b/html/cgi-bin/tripwire.cgi @@ -167,7 +167,7 @@ if ($tripwiresettings{'ACTION'} eq 'generatepolicypw') <tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'sitekey'}</td><td align='left'><input type='password' name='SITEKEY' value='$tripwiresettings{'SITEKEY'}' size="30" /></td></tr> <tr><td align='left' width='40%'><form method='post' action='$ENV{'SCRIPT_NAME'}'>$Lang::tr{'localkey'}</td><td align='left'><input type='password' name='LOCALKEY' value='$tripwiresettings{'LOCALKEY'}' size="30" /><br /><br /></td></tr> <tr><td align='right' width='50%'> - $Lang::tr{'ok'} <input type='image' alt='$Lang::tr{'ok'}' tilte='$Lang::tr{'ok'}' src='/images/edit-redo.png' /> + $Lang::tr{'ok'} <input type='image' alt='$Lang::tr{'ok'}' title='$Lang::tr{'ok'}' src='/images/edit-redo.png' /> <input type='hidden' name='ACTION' value='generatepolicyyes' /></form></td> <td align='left' width='50%'><form method='post' action='$ENV{'SCRIPT_NAME'}'> <input type='image' alt='$Lang::tr{'cancel'}' title='$Lang::tr{'cancel'}' src='/images/dialog-error.png' /> $Lang::tr{'cancel'} @@ -506,17 +506,17 @@ END #<tr><td colspan='3' align='left'><br /></td></tr> #END #; -#foreach my $cronjob (@cronjobs) {chomp $cronjob;my $time=$cronjob; $time=~s/\/etc\/fcron.daily\/tripwire//g;print"<form method='post' action='$ENV{'SCRIPT_NAME'}'><tr><td align='left' colspan='2'>$cronjob at $time daily</td><td><input type='hidden' name='ACTION' value='deletecron' /><input type='hidden' name='CRON' value='$time' /><input type='image' alt='delete cron' src='/images/user-trash.png' /></td></tr></form>";} +#foreach my $cronjob (@cronjobs) {chomp $cronjob;my $time=$cronjob; $time=~s/\/etc\/fcron.daily\/tripwire//g;print"<form method='post' action='$ENV{'SCRIPT_NAME'}'><tr><td align='left' colspan='2'>$cronjob at $time daily</td><td><input type='hidden' name='ACTION' value='deletecron' /><input type='hidden' name='CRON' value='$time' /><input type='image' alt='delete cron' title='delete cron' src='/images/user-trash.png' /></td></tr></form>";} #print <<END #</table> #<br /> #<table width='10%' cellspacing='0'> #<tr><td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'> # <input type='hidden' name='ACTION' value='addcron'/> -# <input type='image' alt='$Lang::tr{'add cron'}' src='/images/appointment-new.png' /></form></td> +# <input type='image' alt='$Lang::tr{'add cron'}' title='$Lang::tr{'add cron'}' src='/images/appointment-new.png' /></form></td> #<td align='center'><form method='post' action='$ENV{'SCRIPT_NAME'}'> # <input type='hidden' name='ACTION' value='croncaption' /> -# <input type='image' alt='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr> +# <input type='image' alt='$Lang::tr{'caption'}' title='$Lang::tr{'caption'}' src='/images/help-browser.png' /></form></td></tr> #</table> #END #; diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi index df77a86..6cd9668 100644 --- a/html/cgi-bin/updatexlrator.cgi +++ b/html/cgi-bin/updatexlrator.cgi @@ -517,7 +517,7 @@ END $id = 0; foreach $updatefile (@downloadfiles) { - $updatefile =~ s/.*://; + $updatefile =~ s/.*:download/download/; my $size_updatefile = 0; my $mtime = 0; if(-e "$repository/$updatefile") { @@ -971,7 +971,8 @@ foreach (@sources) { next if(/\.info$/); $updatefile = substr($_,rindex($_,"/")+1); - $updatefile .= ":download/$vendorid/$updatefile"; + $_ = $updatefile; tr/[A-Z]/[a-z]/; + $updatefile = "$_:separator:download/$vendorid/$updatefile"; $updatefile = " ".$updatefile; push(@repositoryfiles,$updatefile); } @@ -1002,7 +1003,7 @@ foreach (@sources) chomp($sourceurl); $updatefile = substr($sourceurl,rindex($sourceurl,'/')+1,length($sourceurl)); $_ = $updatefile; tr/[A-Z]/[a-z]/; - $updatefile = "$_:$vendorid/$uuid/$updatefile"; + $updatefile = "$_:separator:$vendorid/$uuid/$updatefile"; push(@repositoryfiles,$updatefile); } } @@ -1145,7 +1146,7 @@ END $id = 0; foreach $updatefile (@files) { - $updatefile =~ s/.*://; + $updatefile =~ s/.*:separator://; my $size_updatefile = 0; my $mtime = 0; if(-e "$repository/$updatefile") { diff --git a/html/cgi-bin/upnp.cgi b/html/cgi-bin/upnp.cgi index 2b03eff..ee341e1 100644 --- a/html/cgi-bin/upnp.cgi +++ b/html/cgi-bin/upnp.cgi @@ -164,7 +164,7 @@ print <<END <tr><td align='left'>Upstream in KB:</td><td><input type='text' name='UPSTREAM' value='$upnpsettings{'UPSTREAM'}' size="30" /></td></tr> <tr><td align='left' colspan='2'><br /></td></tr> <tr><td colspan='2' align='center'> <input type='hidden' name='ACTION' value=$Lang::tr{'save'} /> - <input type='image' alt=$Lang::tr{'save'} src='/images/floppy.gif' /></td></tr> +<input type='image' alt='$Lang::tr{'save'}' title='$Lang::tr{'save'}' src='/images/floppy.gif' /></td></tr> </table></form> END ; diff --git a/html/html/themes/ipfire/include/functions.pl b/html/html/themes/ipfire/include/functions.pl index 44ed9b7..f354a45 100644 --- a/html/html/themes/ipfire/include/functions.pl +++ b/html/html/themes/ipfire/include/functions.pl @@ -80,7 +80,7 @@ EOF foreach my $k1 ( sort keys %$menu ) { $link = getlink($menu->{$k1}); next if (!is_menu_visible($link) or $link eq ''); - print '<li class="has-sub "><a><span>'.$menu->{$k1}->{'caption'}.'</span></a>'; + print '<li class="has-sub "><a href="#"><span>'.$menu->{$k1}->{'caption'}.'</span></a>'; my $submenus = $menu->{$k1}->{'subMenu'}; &showsubmenu($submenus) if ($submenus); print "</li>"; @@ -128,6 +128,12 @@ print <<END; <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="/favicon.ico" /> <script type="text/javascript" src="/include/jquery.js"></script> + + <script language="javascript" type="text/javascript"> + function swapVisibility(id) { + \$('#' + id).toggle(); + } + </script> END foreach my $stylesheet (@stylesheets) { diff --git a/lfs/strongswan b/lfs/strongswan index 2c2c0d7..9ac94de 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.1.2dr3 +VER = 5.1.2rc1 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0a2aba6b0682cc01eb4f9bbeb94bc481 +$(DL_FILE)_MD5 = d0508e262f2ec45ab5428bb080bc1b31 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b21d47c804407458aee20b5609ca99ec63f710f8
by git＠ipfire.org 17 Feb '14

17 Feb '14

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 b21d47c804407458aee20b5609ca99ec63f710f8 (commit) from e670f6250e8233557a4dbe31a36121c32add8204 (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 b21d47c804407458aee20b5609ca99ec63f710f8 Author: Ersan Yildirim <yakazan(a)gmail.com> Date: Mon Feb 17 17:24:14 2014 +0100 firewall: Import Turkish translation. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.tr | 170 +++++++++--------------------------------------- langs/tr/cgi-bin/tr.pl | 171 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 202 insertions(+), 139 deletions(-) Difference in files: diff --git a/doc/language_issues.tr b/doc/language_issues.tr index b9a4261..620c787 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -224,6 +224,37 @@ WARNING: translation string unused: from email pw WARNING: translation string unused: from email server WARNING: translation string unused: from email user WARNING: translation string unused: from warn email bad +WARNING: translation string unused: fwdfw MODE1 +WARNING: translation string unused: fwdfw MODE2 +WARNING: translation string unused: fwdfw addrule +WARNING: translation string unused: fwdfw err prot_port1 +WARNING: translation string unused: fwdfw final_rule +WARNING: translation string unused: fwdfw from +WARNING: translation string unused: fwdfw ipsec network +WARNING: translation string unused: fwdfw man port +WARNING: translation string unused: fwdfw natport used +WARNING: translation string unused: fwdfw p2p txt +WARNING: translation string unused: fwdfw rule action +WARNING: translation string unused: fwdfw rules +WARNING: translation string unused: fwdfw std network +WARNING: translation string unused: fwdfw till +WARNING: translation string unused: fwdfw time +WARNING: translation string unused: fwdfw xt access +WARNING: translation string unused: fwhost addrule +WARNING: translation string unused: fwhost attention +WARNING: translation string unused: fwhost blue +WARNING: translation string unused: fwhost changeremark +WARNING: translation string unused: fwhost err addrgrp +WARNING: translation string unused: fwhost err hostorip +WARNING: translation string unused: fwhost err mac +WARNING: translation string unused: fwhost green +WARNING: translation string unused: fwhost hosts +WARNING: translation string unused: fwhost ipadr +WARNING: translation string unused: fwhost ipsec host +WARNING: translation string unused: fwhost orange +WARNING: translation string unused: fwhost reread +WARNING: translation string unused: fwhost reset +WARNING: translation string unused: fwhost wo subnet WARNING: translation string unused: g.dtm WARNING: translation string unused: g.lite WARNING: translation string unused: gen static key @@ -618,150 +649,11 @@ WARNING: untranslated string: encryption WARNING: untranslated string: entropy WARNING: untranslated string: firewall rules WARNING: untranslated string: first -WARNING: untranslated string: fw default drop -WARNING: untranslated string: fw settings -WARNING: untranslated string: fw settings color -WARNING: untranslated string: fw settings dropdown -WARNING: untranslated string: fw settings remark -WARNING: untranslated string: fw settings ruletable -WARNING: untranslated string: fwdfw ACCEPT -WARNING: untranslated string: fwdfw DROP -WARNING: untranslated string: fwdfw REJECT -WARNING: untranslated string: fwdfw action -WARNING: untranslated string: fwdfw additional -WARNING: untranslated string: fwdfw all icmp -WARNING: untranslated string: fwdfw change -WARNING: untranslated string: fwdfw copy -WARNING: untranslated string: fwdfw delete -WARNING: untranslated string: fwdfw dnat -WARNING: untranslated string: fwdfw dnat error WARNING: untranslated string: fwdfw dnat extport WARNING: untranslated string: fwdfw dnat nochoice -WARNING: untranslated string: fwdfw dnat porterr WARNING: untranslated string: fwdfw dnat porterr2 -WARNING: untranslated string: fwdfw edit -WARNING: untranslated string: fwdfw err nosrc -WARNING: untranslated string: fwdfw err nosrcip -WARNING: untranslated string: fwdfw err notgt -WARNING: untranslated string: fwdfw err notgtip -WARNING: untranslated string: fwdfw err prot_port -WARNING: untranslated string: fwdfw err remark -WARNING: untranslated string: fwdfw err ruleexists -WARNING: untranslated string: fwdfw err same -WARNING: untranslated string: fwdfw err samesub -WARNING: untranslated string: fwdfw err src_addr -WARNING: untranslated string: fwdfw err tgt_addr -WARNING: untranslated string: fwdfw err tgt_grp -WARNING: untranslated string: fwdfw err tgt_mac -WARNING: untranslated string: fwdfw err tgt_port -WARNING: untranslated string: fwdfw err time -WARNING: untranslated string: fwdfw external port nat -WARNING: untranslated string: fwdfw hint ip1 -WARNING: untranslated string: fwdfw hint ip2 WARNING: untranslated string: fwdfw hint mac -WARNING: untranslated string: fwdfw iface -WARNING: untranslated string: fwdfw log -WARNING: untranslated string: fwdfw log rule -WARNING: untranslated string: fwdfw menu -WARNING: untranslated string: fwdfw movedown -WARNING: untranslated string: fwdfw moveup -WARNING: untranslated string: fwdfw newrule -WARNING: untranslated string: fwdfw pol allow -WARNING: untranslated string: fwdfw pol block -WARNING: untranslated string: fwdfw pol text -WARNING: untranslated string: fwdfw pol text1 -WARNING: untranslated string: fwdfw pol title -WARNING: untranslated string: fwdfw prot41 -WARNING: untranslated string: fwdfw prot41 short -WARNING: untranslated string: fwdfw red -WARNING: untranslated string: fwdfw reread -WARNING: untranslated string: fwdfw rule activate -WARNING: untranslated string: fwdfw rulepos -WARNING: untranslated string: fwdfw snat -WARNING: untranslated string: fwdfw source -WARNING: untranslated string: fwdfw sourceip -WARNING: untranslated string: fwdfw target -WARNING: untranslated string: fwdfw targetip -WARNING: untranslated string: fwdfw timeframe -WARNING: untranslated string: fwdfw toggle -WARNING: untranslated string: fwdfw togglelog -WARNING: untranslated string: fwdfw use nat -WARNING: untranslated string: fwdfw use srcport -WARNING: untranslated string: fwdfw use srv -WARNING: untranslated string: fwdfw useless rule -WARNING: untranslated string: fwdfw wd_fri -WARNING: untranslated string: fwdfw wd_mon -WARNING: untranslated string: fwdfw wd_sat -WARNING: untranslated string: fwdfw wd_sun -WARNING: untranslated string: fwdfw wd_thu -WARNING: untranslated string: fwdfw wd_tue -WARNING: untranslated string: fwdfw wd_wed -WARNING: untranslated string: fwhost addgrp -WARNING: untranslated string: fwhost addgrpname -WARNING: untranslated string: fwhost addhost -WARNING: untranslated string: fwhost addnet -WARNING: untranslated string: fwhost addservice -WARNING: untranslated string: fwhost addservicegrp -WARNING: untranslated string: fwhost any -WARNING: untranslated string: fwhost back -WARNING: untranslated string: fwhost ccdhost -WARNING: untranslated string: fwhost ccdnet -WARNING: untranslated string: fwhost change -WARNING: untranslated string: fwhost cust addr -WARNING: untranslated string: fwhost cust grp -WARNING: untranslated string: fwhost cust net -WARNING: untranslated string: fwhost cust service -WARNING: untranslated string: fwhost cust srvgrp -WARNING: untranslated string: fwhost deleted -WARNING: untranslated string: fwhost empty -WARNING: untranslated string: fwhost err addr -WARNING: untranslated string: fwhost err empty -WARNING: untranslated string: fwhost err emptytable -WARNING: untranslated string: fwhost err groupempty -WARNING: untranslated string: fwhost err grpexist -WARNING: untranslated string: fwhost err hostexist WARNING: untranslated string: fwhost err hostip -WARNING: untranslated string: fwhost err ip -WARNING: untranslated string: fwhost err ipcheck -WARNING: untranslated string: fwhost err ipmac -WARNING: untranslated string: fwhost err ipwithsub -WARNING: untranslated string: fwhost err isccdhost -WARNING: untranslated string: fwhost err isccdiphost -WARNING: untranslated string: fwhost err isccdipnet -WARNING: untranslated string: fwhost err isccdnet -WARNING: untranslated string: fwhost err isingrp -WARNING: untranslated string: fwhost err maxservicetcp -WARNING: untranslated string: fwhost err maxserviceudp -WARNING: untranslated string: fwhost err name -WARNING: untranslated string: fwhost err name1 -WARNING: untranslated string: fwhost err net -WARNING: untranslated string: fwhost err netexist -WARNING: untranslated string: fwhost err partofnet -WARNING: untranslated string: fwhost err port -WARNING: untranslated string: fwhost err remark -WARNING: untranslated string: fwhost err srv exists -WARNING: untranslated string: fwhost err srvexist -WARNING: untranslated string: fwhost err sub32 -WARNING: untranslated string: fwhost hint -WARNING: untranslated string: fwhost icmptype -WARNING: untranslated string: fwhost ip_mac -WARNING: untranslated string: fwhost ipsec net -WARNING: untranslated string: fwhost menu -WARNING: untranslated string: fwhost netaddress -WARNING: untranslated string: fwhost newgrp -WARNING: untranslated string: fwhost newhost -WARNING: untranslated string: fwhost newnet -WARNING: untranslated string: fwhost newservice -WARNING: untranslated string: fwhost newservicegrp -WARNING: untranslated string: fwhost ovpn_n2n -WARNING: untranslated string: fwhost port -WARNING: untranslated string: fwhost prot -WARNING: untranslated string: fwhost services -WARNING: untranslated string: fwhost srv_name -WARNING: untranslated string: fwhost stdnet -WARNING: untranslated string: fwhost type -WARNING: untranslated string: fwhost used -WARNING: untranslated string: fwhost welcome WARNING: untranslated string: grouptype WARNING: untranslated string: integrity WARNING: untranslated string: invalid input for dpd delay diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 2589668..6bb470a 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -924,7 +924,178 @@ 'from email user' => 'Gönderen e-posta kullanıcısı', 'from warn email bad' => 'Gönderen e-posta adresi geçerli değil', 'fw blue' => 'MAVİ arabirim için güvenlik duvarı seçenekleri', +'fw default drop' => 'Güvenlik duvarı ilkesi', 'fw logging' => 'Güvenlik duvarı günlüğü', +'fw settings' => 'Düvenlik duvarı ayarları', +'fw settings color' => 'Kural tablosunda renkleri göster', +'fw settings dropdown' => 'Kural oluşturulan sitedeki tüm ağları göster', +'fw settings remark' => 'Kural tablosunda açıklamaları göster', +'fw settings ruletable' => 'Boş kural tablolarını göster', +'fwdfw ACCEPT' => 'KABUL ET', +'fwdfw DROP' => 'İPTAL ET', +'fwdfw MODE1' => 'Tüm paketleri iptal et', +'fwdfw MODE2' => 'Tüm paketleri kabul et', +'fwdfw REJECT' => 'REDDET', +'fwdfw action' => 'Eylem', +'fwdfw additional' => 'Ek ayarlar', +'fwdfw addrule' => 'Kural Ekle/Düzenle:', +'fwdfw all icmp' => 'Tüm ICMP türleri', +'fwdfw change' => 'Güncelle', +'fwdfw copy' => 'Kopyala', +'fwdfw delete' => 'Sil', +'fwdfw dnat' => 'Hedef NAT (Bağlantı noktası yönlendirme)', +'fwdfw dnat error' => 'DNAT için bir tek ana bilgisayar seçmeniz gerekir. Gruplara veya ağlara izin verilmez.', +'fwdfw dnat porterr' => 'NAT için tek bir bağlantı noktası veya bağlantı noktası aralığı (tcp/udp) seçmek zorundasınız', +'fwdfw edit' => 'Düzenle', +'fwdfw err nosrc' => 'Bir kaynak seçilmedi.', +'fwdfw err nosrcip' => 'Lütfen bir kaynak IP adresi belirtin.', +'fwdfw err notgt' => 'Bir hedef seçilmedi.', +'fwdfw err notgtip' => 'Lütfen bir hedef IP adresi belirtin.', +'fwdfw err prot_port' => 'Seçilen kuuralla kaynak veya hedef bağlantı noktasına izin verilmez', +'fwdfw err prot_port1' => 'TCP veya UDP kuralı için kaynak veya hedef bağlantı noktası kullanırken seçmek zorunda ', +'fwdfw err remark' => 'Açıklama içinde geçersiz karakterler.', +'fwdfw err ruleexists' => 'Bu kural zaten var.', +'fwdfw err same' => 'Kaynak ve hedef aynı.', +'fwdfw err samesub' => 'Kaynak ve hedef IP adresleri aynı alt ağdadır.', +'fwdfw err src_addr' => 'Geçersiz kaynak MAC/IP adresi.', +'fwdfw err tgt_addr' => 'Geçersiz hedef IP adresi.', +'fwdfw err tgt_grp' => 'Hedef hizmet grubu boş', +'fwdfw err tgt_mac' => 'MAC adresleri hedef olarak kullanılamaz.', +'fwdfw err tgt_port' => 'Geçersiz hedef bağlantı noktası.', +'fwdfw err time' => 'En az bir gün seçmeniz gerekir.', +'fwdfw external port nat' => 'Harici bağlantı noktası (NAT)', +'fwdfw final_rule' => 'Son kural: ', +'fwdfw from' => 'Kimden:', +'fwdfw hint ip1' => 'Son oluşturulan kurallar hiçbir zaman eşleşmemelidir çünkü kaynak ve hedefin alt ağları çakışabilir', +'fwdfw hint ip2' => 'Bu kuralın mantıklı olup olmadığını bir kez daha kontrol edin: ', +'fwdfw iface' => 'Arayüz', +'fwdfw ipsec network' => 'IPsec ağları:', +'fwdfw log' => 'Günlük', +'fwdfw log rule' => 'Günlük kuralı', +'fwdfw man port' => 'Bağlantı noktası:', +'fwdfw menu' => 'Güvenlik Duvarı Kuralları', +'fwdfw movedown' => 'Aşağı taşı', +'fwdfw moveup' => 'Yukarı taşı', +'fwdfw natport used' => 'NAPT için verilen bağlantı noktası başka bir DNAT kural tarafından zaten kullanılıyor.', +'fwdfw newrule' => 'Yeni kural', +'fwdfw p2p txt' => 'P2P ağlarına erişim izni Ver/Verme.', +'fwdfw pol allow' => 'İzin Verildi', +'fwdfw pol block' => 'Engellendi', +'fwdfw pol text' => 'Yerel ağlardan bağlantılar için varsayılan günvenlik duvarı davranışını ayarlar. Tüm yeni bağlantılara izin verebilir veya varsayılan olarak engelleyebilirsiniz. Yerel ağlar arasındaki bağlantılar ayrıca sonraki biçimde engellenir.', +'fwdfw pol text1' => 'Güvenlik duvarı tarafından başlatılan bağlantıları için varsayılan güvenlik duvarı davranışını ayarlar. +Dikkat! Kendinizi engelleyebilirsiniz.', +'fwdfw pol title' => 'Varsayılan güvenlik duvarı davranışı', +'fwdfw prot41' => 'IPv6 Kuşatması (Kural 41)', +'fwdfw prot41 short' => 'IPv6 Kuşatması', +'fwdfw red' => 'KIRMIZI', +'fwdfw reread' => 'Değişiklikleri uygula', +'fwdfw rule action' => 'Eylem kuralı:', +'fwdfw rule activate' => 'Kuralı etkinleştir', +'fwdfw rulepos' => 'Kural konumu', +'fwdfw rules' => 'Kurallar', +'fwdfw snat' => 'Kaynak NAT', +'fwdfw source' => 'Kaynak', +'fwdfw sourceip' => 'Kaynak adresi (MAC/IP adresi veya ağı):', +'fwdfw std network' => 'Standart ağlar:', +'fwdfw target' => 'Hedef', +'fwdfw targetip' => 'Hedef adresi (MAC/IP adresi veya ağ):', +'fwdfw till' => 'Son zaman:', +'fwdfw time' => 'Zaman Kısıtlamaları', +'fwdfw timeframe' => 'Zaman kısıtlamalarını kullan', +'fwdfw toggle' => 'Etkinleştirin veya devre dışı bırakın', +'fwdfw togglelog' => 'Günlüğü etkinleştirin veya devre dışı bırakın', +'fwdfw use nat' => 'Ağ Adresi Çevirisi kullanın (NAT)', +'fwdfw use srcport' => 'Kaynak bağlantı noktası:', +'fwdfw use srv' => 'Hedef bağlantı noktası:', +'fwdfw useless rule' => 'Bu kural geçersiz.', +'fwdfw wd_fri' => 'Cum', +'fwdfw wd_mon' => 'Pzt', +'fwdfw wd_sat' => 'Cmt', +'fwdfw wd_sun' => 'Paz', +'fwdfw wd_thu' => 'Per', +'fwdfw wd_tue' => 'Sal', +'fwdfw wd_wed' => 'Çar', +'fwdfw xt access' => 'Kayıt', +'fwhost addgrp' => 'Yeni ağ/ana bilgisayar grubu ekle:', +'fwhost addgrpname' => 'Grup adı:', +'fwhost addhost' => 'Yeni bir ana bilgisayar ekle:', +'fwhost addnet' => 'Yeni bir ağ ekle:', +'fwhost addrule' => 'Kural ekle/düzenle:', +'fwhost addservice' => 'Hizmet ekle:', +'fwhost addservicegrp' => 'Yeni bir hizmet grubu ekle:', +'fwhost any' => 'Herhangi', +'fwhost attention' => 'DİKKAT', +'fwhost back' => 'Geri', +'fwhost blue' => 'Mavi', +'fwhost ccdhost' => 'OpenVPN istemcileri:', +'fwhost ccdnet' => 'OpenVPN ağları:', +'fwhost change' => 'Değiştir', +'fwhost changeremark' => 'Sadece açıklamalar değiştirilmiş', +'fwhost cust addr' => 'Ana bilgisayarlar:', +'fwhost cust grp' => 'Ağ/Ana Bilgisayar Grupları:', +'fwhost cust net' => 'Ağlar:', +'fwhost cust service' => 'Hizmetler:', +'fwhost cust srvgrp' => 'Hizmet Grupları:', +'fwhost deleted' => 'Silindi', +'fwhost empty' => 'Tanımlı kurallar yok', +'fwhost err addr' => 'Geçersiz IP adresi veya alt ağ', +'fwhost err addrgrp' => 'Lütfen bir grup adı verin', +'fwhost err empty' => 'Lütfen tüm alanları doldurun', +'fwhost err emptytable' => 'Bu grupta hiçbir kayıt yok', +'fwhost err groupempty' => 'Seçilen grup boş', +'fwhost err grpexist' => 'Bu grup zaten var', +'fwhost err hostexist' => 'zaten aynı adı taşıyan bir ana bilgisayar var', +'fwhost err hostorip' => 'Geçersiz adı veya IP adresi', +'fwhost err ip' => 'Geçersiz IP adresi', +'fwhost err ipcheck' => 'Bu IP adresi zaten kullanılıyor', +'fwhost err ipmac' => 'Geçersiz IP/MAC adresi', +'fwhost err ipwithsub' => 'Lütfen sadece bir IP adresi verin (Alt ağ maskesi olmadan)', +'fwhost err isccdhost' => 'Bu ad zaten OpenVPN istemci bağlantısı tarafından kullanılıyor', +'fwhost err isccdiphost' => 'Bu IP adresi zaten bir OpenVPN istemci bağlantısı tarafından kullanılıyor', +'fwhost err isccdipnet' => 'Bu IP adresi zaten bir OpenVPN ağ bağlantısı tarafından kullanılıyor', +'fwhost err isccdnet' => 'Bu ad zaten OpenVPN ağı tarafından kullanılıyor', +'fwhost err isingrp' => 'Bu kayıt grupta zaten var', +'fwhost err mac' => 'Geçersiz MAC adresi', +'fwhost err maxservicetcp' => 'TCP hizmetlerinin en üst sayısı olan 15 değerine bu grupta ulaşıldı (bağlantı noktası aralıkları iki kez sayılır)', +'fwhost err maxserviceudp' => 'UDP hizmetlerinin en üst sayısı olan 15 değerine bu grupta ulaşıldı (bağlantı noktası aralıkları iki kez sayılır)', +'fwhost err name' => 'Geçersiz ad. İzin verilen karakterler: Büyük ve küçük harfler, rakamlar, boşluk ve tire.', +'fwhost err name1' => 'Boş ad.', +'fwhost err net' => 'Bu Ağ/IP adresi zaten var', +'fwhost err netexist' => 'Aynı adı taşıyan bir ağ zaten var', +'fwhost err partofnet' => 'Ağ mevcut bir ağın alt ağı olmalıdır.', +'fwhost err port' => 'Bağlantı noktası boş', +'fwhost err remark' => 'Geçersiz açıklama. İzin verilen karakterler: Büyük ve küçük harfler, rakamlar, boşluk, tire, parantez, noktalı virgül, boru ve nokta.', +'fwhost err srv exists' => 'Aynı adı taşıyan bir hizmet zaten var', +'fwhost err srvexist' => 'Bu hizmet grupta zaten var', +'fwhost err sub32' => 'Lütfen bir ana bilgisayar ekleyiniz bir ağ değil', +'fwhost green' => 'Yeşil', +'fwhost hint' => 'Not', +'fwhost hosts' => 'Güvenlik Duvarı Ana Bilgisayarları', +'fwhost icmptype' => 'ICMP türü:', +'fwhost ip_mac' => 'IP/MAC adresi', +'fwhost ipadr' => 'IP adresi:', +'fwhost ipsec host' => 'IPsec istemcileri:', +'fwhost ipsec net' => 'IPsec ağları:', +'fwhost menu' => 'Güvenlik Duvarı grupları', +'fwhost netaddress' => 'Ağ adresi', +'fwhost newgrp' => 'Ağ/Ana Bilgisayar Grupları', +'fwhost newhost' => 'Ana Bilgisayarlar', +'fwhost newnet' => 'Ağlar', +'fwhost newservice' => 'Hizmetler', +'fwhost newservicegrp' => 'Hizmet grupları', +'fwhost orange' => 'Turuncu', +'fwhost ovpn_n2n' => 'Ağdan-Ağa OpenVPN', +'fwhost port' => 'Bağlantı Noktası', +'fwhost prot' => 'Kural', +'fwhost reread' => 'Güvenlik duvarı kurallarının güncelleştirilmesi gerekiyor.', +'fwhost reset' => 'İptal', +'fwhost services' => 'Hizmetler:', +'fwhost srv_name' => 'Hizmet adı', +'fwhost stdnet' => 'Standart ağlar:', +'fwhost type' => 'Tür', +'fwhost used' => 'Kullanılan', +'fwhost welcome' => 'Burada tek ana bilgisayarı gruplandırabilirsiniz ağlar ve hizmetlerle birlikte daha hızlı ve yeni kurallar oluşturabilirsiniz.', +'fwhost wo subnet' => '(alt ağ olmadan)', 'g.dtm' => 'KALDIRILACAK', 'g.lite' => 'KALDIRILACAK', 'gateway' => 'Ağ Geçidi', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e670f6250e8233557a4dbe31a36121c32add8204
by git＠ipfire.org 17 Feb '14

17 Feb '14

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 e670f6250e8233557a4dbe31a36121c32add8204 (commit) from 5ee7500e597d88199b82195f1301712f9179466b (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 e670f6250e8233557a4dbe31a36121c32add8204 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Feb 17 16:40:14 2014 +0100 Update translations. ----------------------------------------------------------------------- Summary of changes: doc/language_issues.es | 2 ++ doc/language_issues.fr | 2 ++ doc/language_issues.nl | 2 ++ doc/language_issues.pl | 2 ++ doc/language_issues.ru | 2 ++ doc/language_issues.tr | 2 ++ doc/language_missings | 8 ++++++++ langs/de/cgi-bin/de.pl | 2 +- 8 files changed, 21 insertions(+), 1 deletion(-) Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index d0cd3a8..366af44 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -653,6 +653,7 @@ WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: firewall rules +WARNING: untranslated string: first WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -803,6 +804,7 @@ WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network +WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter diff --git a/doc/language_issues.fr b/doc/language_issues.fr index 1dca032..0560b2b 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -664,6 +664,7 @@ WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: firewall rules +WARNING: untranslated string: first WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -814,6 +815,7 @@ WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network +WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 75623b5..934c538 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -611,6 +611,7 @@ WARNING: untranslated string: drop outgoing WARNING: untranslated string: encryption WARNING: untranslated string: entropy WARNING: untranslated string: firewall rules +WARNING: untranslated string: first WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -761,6 +762,7 @@ WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network +WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter diff --git a/doc/language_issues.pl b/doc/language_issues.pl index d0cd3a8..366af44 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -653,6 +653,7 @@ WARNING: untranslated string: fireinfo why enable WARNING: untranslated string: fireinfo why read more WARNING: untranslated string: fireinfo your profile id WARNING: untranslated string: firewall rules +WARNING: untranslated string: first WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -803,6 +804,7 @@ WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network +WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter diff --git a/doc/language_issues.ru b/doc/language_issues.ru index c2b7bf3..dff15bb 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -648,6 +648,7 @@ WARNING: untranslated string: extrahd to WARNING: untranslated string: extrahd to root WARNING: untranslated string: extrahd you cant mount WARNING: untranslated string: firewall rules +WARNING: untranslated string: first WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -799,6 +800,7 @@ WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network +WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 9711f14..b9a4261 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -617,6 +617,7 @@ WARNING: untranslated string: drop outgoing WARNING: untranslated string: encryption WARNING: untranslated string: entropy WARNING: untranslated string: firewall rules +WARNING: untranslated string: first WARNING: untranslated string: fw default drop WARNING: untranslated string: fw settings WARNING: untranslated string: fw settings color @@ -767,6 +768,7 @@ WARNING: untranslated string: invalid input for dpd delay WARNING: untranslated string: invalid input for dpd timeout WARNING: untranslated string: ipsec WARNING: untranslated string: ipsec network +WARNING: untranslated string: last WARNING: untranslated string: least preferred WARNING: untranslated string: lifetime WARNING: untranslated string: mac filter diff --git a/doc/language_missings b/doc/language_missings index 677ae1d..1d57464 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -101,6 +101,7 @@ < fireinfo why read more < fireinfo your profile id < firewall rules +< first < forward firewall < fw default drop < fwdfw ACCEPT @@ -282,6 +283,7 @@ < ipsec < ipsec network < ipsec no connections +< last < least preferred < lifetime < mac filter @@ -541,6 +543,7 @@ < fireinfo why read more < fireinfo your profile id < firewall rules +< first < forward firewall < fw default drop < fwdfw ACCEPT @@ -722,6 +725,7 @@ < ipsec < ipsec network < ipsec no connections +< last < least preferred < lifetime < mac filter @@ -965,6 +969,7 @@ < extrahd unable to write < extrahd you cant mount < firewall rules +< first < forward firewall < fw default drop < fwdfw ACCEPT @@ -1146,6 +1151,7 @@ < ipsec < ipsec network < ipsec no connections +< last < least preferred < lifetime < mac filter @@ -1377,6 +1383,7 @@ < extrahd unable to write < extrahd you cant mount < firewall rules +< first < forward firewall < frequency < fw default drop @@ -1561,6 +1568,7 @@ < ipsec < ipsec network < ipsec no connections +< last < least preferred < lifetime < mac filter diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 71971e5..6d49f27 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -891,8 +891,8 @@ 'firewall rules' => 'Firewallregeln', 'firewallhits' => 'Firewalltreffer', 'firmware' => 'Firmware', -'first' => 'Erste', 'firmware upload' => 'Hochladen der Firmware/Treiber', +'first' => 'Erste', 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt', 'fixed ip lease modified' => 'Feste IP-Zuordnung geändert', 'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht', hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree tag, v2.15-beta2, created. 4c9ea85490de5459960f251b2db4dc3fc664477a
by git＠ipfire.org 16 Feb '14

16 Feb '14

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 tag, v2.15-beta2 has been created at 4c9ea85490de5459960f251b2db4dc3fc664477a (commit) - Log ----------------------------------------------------------------- commit 4c9ea85490de5459960f251b2db4dc3fc664477a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 08:47:31 2014 +0100 Set version to 2.15 beta2. ----------------------------------------------------------------------- hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b8e1d265670a5592c1a0fcfd8e1bf265434c72a9
by git＠ipfire.org 16 Feb '14

16 Feb '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via b8e1d265670a5592c1a0fcfd8e1bf265434c72a9 (commit) from 62d3a8e711a32d1b169b0e30270b33817c720fd5 (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 b8e1d265670a5592c1a0fcfd8e1bf265434c72a9 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sun Feb 16 12:22:31 2014 +0100 glibc: Update to 2.19. ----------------------------------------------------------------------- Summary of changes: glibc/glibc-stack_chk_fail.c | 321 ------------------- glibc/glibc.nm | 9 +- ...libc-2.10.1-hardened-configure-picdefault.patch | 29 -- .../glibc-2.10.1-hardened-inittls-nosysenter.patch | 273 ---------------- glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch | 349 --------------------- .../glibc-2.17-endless-loop-stdc-predef.h.patch | 58 ---- glibc/patches/glibc-fedora-elf-ORIGIN.patch | 98 ------ glibc/patches/glibc-fedora-gai-canonical.patch | 128 -------- glibc/patches/glibc-fedora-regcomp-sw11561.patch | 147 --------- 9 files changed, 4 insertions(+), 1408 deletions(-) delete mode 100644 glibc/glibc-stack_chk_fail.c delete mode 100644 glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch delete mode 100644 glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch delete mode 100644 glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch delete mode 100644 glibc/patches/glibc-2.17-endless-loop-stdc-predef.h.patch delete mode 100644 glibc/patches/glibc-fedora-elf-ORIGIN.patch delete mode 100644 glibc/patches/glibc-fedora-gai-canonical.patch delete mode 100644 glibc/patches/glibc-fedora-regcomp-sw11561.patch Difference in files: diff --git a/glibc/glibc-stack_chk_fail.c b/glibc/glibc-stack_chk_fail.c deleted file mode 100644 index 217bf1a..0000000 --- a/glibc/glibc-stack_chk_fail.c +++ /dev/null @@ -1,321 +0,0 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* Copyright (C) 2006-2007 Gentoo Foundation Inc. - * License terms as above. - * - * Hardened Gentoo SSP handler - * - * An SSP failure handler that does not use functions from the rest of - * glibc; it uses the INTERNAL_SYSCALL methods directly. This ensures - * no possibility of recursion into the handler. - * - * Direct all bug reports to http://bugs.gentoo.org/ - * - * Re-written from the glibc-2.3 Hardened Gentoo SSP handler - * by Kevin F. Quinn - <kevquinn[(a)]gentoo.org> - * - * The following people contributed to the glibc-2.3 Hardened - * Gentoo SSP handler, from which this implementation draws much: - * - * Ned Ludd - <solar[(a)]gentoo.org> - * Alexander Gabert - <pappy[(a)]gentoo.org> - * The PaX Team - <pageexec[(a)]freemail.hu> - * Peter S. Mazinger - <ps.m[(a)]gmx.net> - * Yoann Vandoorselaere - <yoann[(a)]prelude-ids.org> - * Robert Connolly - <robert[(a)]linuxfromscratch.org> - * Cory Visi <cory[(a)]visi.name> - * Mike Frysinger <vapier[(a)]gentoo.org> - */ - -#include <errno.h> -#include <stdlib.h> -#include <unistd.h> -#include <signal.h> - -#include <sys/types.h> - -#include <sysdep-cancel.h> -#include <sys/syscall.h> -#include <bp-checks.h> - -#include <kernel-features.h> - -#include <alloca.h> -/* from sysdeps */ -#include <socketcall.h> -/* for the stuff in bits/socket.h */ -#include <sys/socket.h> -#include <sys/un.h> - - -/* Sanity check on SYSCALL macro names - force compilation - * failure if the names used here do not exist - */ -#if !defined __NR_socketcall && !defined __NR_socket -# error Cannot do syscall socket or socketcall -#endif -#if !defined __NR_socketcall && !defined __NR_connect -# error Cannot do syscall connect or socketcall -#endif -#ifndef __NR_write -# error Cannot do syscall write -#endif -#ifndef __NR_close -# error Cannot do syscall close -#endif -#ifndef __NR_getpid -# error Cannot do syscall getpid -#endif -#ifndef __NR_kill -# error Cannot do syscall kill -#endif -#ifndef __NR_exit -# error Cannot do syscall exit -#endif -#ifdef SSP_SMASH_DUMPS_CORE -# define ENABLE_SSP_SMASH_DUMPS_CORE 1 -# if !defined _KERNEL_NSIG && !defined _NSIG -# error No _NSIG or _KERNEL_NSIG for rt_sigaction -# endif -# if !defined __NR_sigaction && !defined __NR_rt_sigaction -# error Cannot do syscall sigaction or rt_sigaction -# endif -/* Although rt_sigaction expects sizeof(sigset_t) - it expects the size - * of the _kernel_ sigset_t which is not the same as the user sigset_t. - * Most arches have this as _NSIG bits - mips has _KERNEL_NSIG bits for - * some reason. - */ -# ifdef _KERNEL_NSIG -# define _SSP_NSIG _KERNEL_NSIG -# else -# define _SSP_NSIG _NSIG -# endif -#else -# define _SSP_NSIG 0 -# define ENABLE_SSP_SMASH_DUMPS_CORE 0 -#endif - -/* Define DO_SIGACTION - default to newer rt signal interface but - * fallback to old as needed. - */ -#ifdef __NR_rt_sigaction -# define DO_SIGACTION(signum, act, oldact) \ - INLINE_SYSCALL(rt_sigaction, 4, signum, act, oldact, _SSP_NSIG/8) -#else -# define DO_SIGACTION(signum, act, oldact) \ - INLINE_SYSCALL(sigaction, 3, signum, act, oldact) -#endif - -/* Define DO_SOCKET/DO_CONNECT functions to deal with socketcall vs socket/connect */ -#if defined(__NR_socket) && defined(__NR_connect) -# define USE_OLD_SOCKETCALL 0 -#else -# define USE_OLD_SOCKETCALL 1 -#endif -/* stub out the __NR_'s so we can let gcc optimize away dead code */ -#ifndef __NR_socketcall -# define __NR_socketcall 0 -#endif -#ifndef __NR_socket -# define __NR_socket 0 -#endif -#ifndef __NR_connect -# define __NR_connect 0 -#endif -#define DO_SOCKET(result, domain, type, protocol) \ - do { \ - if (USE_OLD_SOCKETCALL) { \ - socketargs[0] = domain; \ - socketargs[1] = type; \ - socketargs[2] = protocol; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall, 2, SOCKOP_socket, socketargs); \ - } else \ - result = INLINE_SYSCALL(socket, 3, domain, type, protocol); \ - } while (0) -#define DO_CONNECT(result, sockfd, serv_addr, addrlen) \ - do { \ - if (USE_OLD_SOCKETCALL) { \ - socketargs[0] = sockfd; \ - socketargs[1] = (unsigned long int)serv_addr; \ - socketargs[2] = addrlen; \ - socketargs[3] = 0; \ - result = INLINE_SYSCALL(socketcall, 2, SOCKOP_connect, socketargs); \ - } else \ - result = INLINE_SYSCALL(connect, 3, sockfd, serv_addr, addrlen); \ - } while (0) - -#ifndef _PATH_LOG -# define _PATH_LOG "/dev/log" -#endif - -static const char path_log[] = _PATH_LOG; - -/* For building glibc with SSP switched on, define __progname to a - * constant if building for the run-time loader, to avoid pulling - * in more of libc.so into ld.so - */ -#ifdef IS_IN_rtld -static char *__progname = "<rtld>"; -#else -extern char *__progname; -#endif - - -/* Common handler code, used by stack_chk_fail and __stack_smash_handler - * Inlined to ensure no self-references to the handler within itself. - * Data static to avoid putting more than necessary on the stack, - * to aid core debugging. - */ -__attribute__ ((__noreturn__ , __always_inline__)) -static inline void -__hardened_gentoo_stack_chk_fail(char func[], int damaged) -{ -#define MESSAGE_BUFSIZ 256 - static pid_t pid; - static int plen, i; - static char message[MESSAGE_BUFSIZ]; - static const char msg_ssa[] = ": stack smashing attack"; - static const char msg_inf[] = " in function "; - static const char msg_ssd[] = "*** stack smashing detected ***: "; - static const char msg_terminated[] = " - terminated\n"; - static const char msg_report[] = "Report to http://bugs.gentoo.org/\n"; - static const char msg_unknown[] = "<unknown>"; - static int log_socket, connect_result; - static struct sockaddr_un sock; - static unsigned long int socketargs[4]; - - /* Build socket address - */ - sock.sun_family = AF_UNIX; - i = 0; - while ((path_log[i] != '\0') && (i<(sizeof(sock.sun_path)-1))) { - sock.sun_path[i] = path_log[i]; - i++; - } - sock.sun_path[i] = '\0'; - - /* Try SOCK_DGRAM connection to syslog */ - connect_result = -1; - DO_SOCKET(log_socket, AF_UNIX, SOCK_DGRAM, 0); - if (log_socket != -1) - DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); - if (connect_result == -1) { - if (log_socket != -1) - INLINE_SYSCALL(close, 1, log_socket); - /* Try SOCK_STREAM connection to syslog */ - DO_SOCKET(log_socket, AF_UNIX, SOCK_STREAM, 0); - if (log_socket != -1) - DO_CONNECT(connect_result, log_socket, &sock, sizeof(sock)); - } - - /* Build message. Messages are generated both in the old style and new style, - * so that log watchers that are configured for the old-style message continue - * to work. - */ -#define strconcat(str) \ - {i=0; while ((str[i] != '\0') && ((i+plen)<(MESSAGE_BUFSIZ-1))) \ - {\ - message[plen+i]=str[i];\ - i++;\ - }\ - plen+=i;} - - /* R.Henderson post-gcc-4 style message */ - plen = 0; - strconcat(msg_ssd); - if (__progname != (char *)0) - strconcat(__progname) - else - strconcat(msg_unknown); - strconcat(msg_terminated); - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - /* Dr. Etoh pre-gcc-4 style message */ - plen = 0; - if (__progname != (char *)0) - strconcat(__progname) - else - strconcat(msg_unknown); - strconcat(msg_ssa); - strconcat(msg_inf); - if (func != NULL) - strconcat(func) - else - strconcat(msg_unknown); - strconcat(msg_terminated); - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - /* Direct reports to bugs.gentoo.org */ - plen=0; - strconcat(msg_report); - message[plen++]='\0'; - - /* Write out error message to STDERR, to syslog if open */ - INLINE_SYSCALL(write, 3, STDERR_FILENO, message, plen); - if (connect_result != -1) - INLINE_SYSCALL(write, 3, log_socket, message, plen); - - if (log_socket != -1) - INLINE_SYSCALL(close, 1, log_socket); - - /* Suicide */ - pid = INLINE_SYSCALL(getpid, 0); - - if (ENABLE_SSP_SMASH_DUMPS_CORE) { - static struct sigaction default_abort_act; - /* Remove any user-supplied handler for SIGABRT, before using it */ - default_abort_act.sa_handler = SIG_DFL; - default_abort_act.sa_sigaction = NULL; - __sigfillset(&default_abort_act.sa_mask); - default_abort_act.sa_flags = 0; - if (DO_SIGACTION(SIGABRT, &default_abort_act, NULL) == 0) - INLINE_SYSCALL(kill, 2, pid, SIGABRT); - } - - /* Note; actions cannot be added to SIGKILL */ - INLINE_SYSCALL(kill, 2, pid, SIGKILL); - - /* In case the kill didn't work, exit anyway - * The loop prevents gcc thinking this routine returns - */ - while (1) - INLINE_SYSCALL(exit, 0); -} - -__attribute__ ((__noreturn__)) -void __stack_chk_fail(void) -{ - __hardened_gentoo_stack_chk_fail(NULL, 0); -} - -#ifdef ENABLE_OLD_SSP_COMPAT -__attribute__ ((__noreturn__)) -void __stack_smash_handler(char func[], int damaged) -{ - __hardened_gentoo_stack_chk_fail(func, damaged); -} -#endif diff --git a/glibc/glibc.nm b/glibc/glibc.nm index d85f4dd..90a55bc 100644 --- a/glibc/glibc.nm +++ b/glibc/glibc.nm @@ -4,8 +4,8 @@ ############################################################################### name = glibc -version = 2.17 -release = 4 +version = 2.19 +release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> groups = System/Base @@ -74,8 +74,6 @@ build # Build nscd with -fstack-protector-all, instead of -fstack-protector: sed -e "s/fstack-protector/&-all/" -i nscd/Makefile - cat %{DIR_SOURCE}/glibc-stack_chk_fail.c > debug/stack_chk_fail.c - # Use gnu hash style sed -i Makeconfig \ -e "s/-Wl,--hash-style=both/-Wl,--hash-style=gnu -Wl,-O1/" @@ -95,7 +93,8 @@ build --disable-werror \ --enable-bind-now \ --enable-obsolete-rpc \ - --with-bugurl=http://bugtracker.ipfire.org + --with-bugurl=http://bugtracker.ipfire.org \ + --enable-lock-elision if "%{DISTRO_ARCH}" == "armv5tel" # Disable hardware FP for ARM. diff --git a/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch b/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch deleted file mode 100644 index 19f2544..0000000 --- a/glibc/patches/glibc-2.10.1-hardened-configure-picdefault.patch +++ /dev/null @@ -1,29 +0,0 @@ -Prevent default-fPIE from confusing configure into thinking -PIC code is default. This causes glibc to build both PIC and -non-PIC code as normal, which on the hardened compiler generates -PIC and PIE. - -Patch by Kevin F. Quinn <kevquinn(a)gentoo.org> - ---- glibc-2.10.1/configure.in -+++ glibc-2.10.1/configure.in -@@ -2145,7 +2145,7 @@ - # error PIC is default. - #endif - EOF --if eval "${CC-cc} -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then -+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&AS_MESSAGE_LOG_FD 1>&AS_MESSAGE_LOG_FD"; then - libc_cv_pic_default=no - fi - rm -f conftest.*]) ---- glibc-2.10.1/configure -+++ glibc-2.10.1/configure -@@ -7698,7 +7698,7 @@ - # error PIC is default. - #endif - EOF --if eval "${CC-cc} -S conftest.c 2>&5 1>&5"; then -+if eval "${CC-cc} -fno-PIE -S conftest.c 2>&5 1>&5"; then - libc_cv_pic_default=no - fi - rm -f conftest.* diff --git a/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch b/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch deleted file mode 100644 index ce9c907..0000000 --- a/glibc/patches/glibc-2.10.1-hardened-inittls-nosysenter.patch +++ /dev/null @@ -1,273 +0,0 @@ -When building glibc PIE (which is not something upstream support), -several modifications are necessary to the glibc build process. - -First, any syscalls in PIEs must be of the PIC variant, otherwise -textrels ensue. Then, any syscalls made before the initialisation -of the TLS will fail on i386, as the sysenter variant on i386 uses -the TLS, giving rise to a chicken-and-egg situation. This patch -defines a PIC syscall variant that doesn't use sysenter, even when the sysenter -version is normally used, and uses the non-sysenter version for the brk -syscall that is performed by the TLS initialisation. Further, the TLS -initialisation is moved in this case prior to the initialisation of -dl_osversion, as that requires further syscalls. - -csu/libc-start.c: Move initial TLS initialization to before the -initialisation of dl_osversion, when INTERNAL_SYSCALL_NOSYSENTER is defined - -csu/libc-tls.c: Use the no-sysenter version of sbrk when -INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/sbrk.c: Define a no-sysenter version of sbrk, using the no-sysenter -version of brk - if INTERNAL_SYSCALL_NOSYSENTER is defined. - -misc/brk.c: Define a no-sysenter version of brk if -INTERNAL_SYSCALL_NOSYSENTER is defined. - -sysdeps/unix/sysv/linux/i386/sysdep.h: Define INTERNAL_SYSCALL_NOSYSENTER -Make INTERNAL_SYSCALL always use the PIC variant, even if not SHARED. - -Patch by Kevin F. Quinn <kevquinn(a)gentoo.org> - ---- glibc-2.10.1/csu/libc-start.c -+++ glibc-2.10.1/csu/libc-start.c -@@ -28,6 +28,7 @@ - extern int __libc_multiple_libcs; - - #include <tls.h> -+#include <sysdep.h> - #ifndef SHARED - # include <dl-osinfo.h> - extern void __pthread_initialize_minimal (void); -@@ -129,6 +130,11 @@ - # endif - _dl_aux_init (auxvec); - # endif -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ /* Do the initial TLS initialization before _dl_osversion, -+ since the latter uses the uname syscall. */ -+ __pthread_initialize_minimal (); -+# endif - # ifdef DL_SYSDEP_OSCHECK - if (!__libc_multiple_libcs) - { -@@ -138,10 +144,12 @@ - } - # endif - -+# ifndef INTERNAL_SYSCALL_NOSYSENTER - /* Initialize the thread library at least a bit since the libgcc - functions are using thread functions if these are available and - we need to setup errno. */ - __pthread_initialize_minimal (); -+# endif - - /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (); ---- glibc-2.10.1/csu/libc-tls.c -+++ glibc-2.10.1/csu/libc-tls.c -@@ -23,6 +23,7 @@ - #include <unistd.h> - #include <stdio.h> - #include <sys/param.h> -+#include <sysdep.h> - - - #ifdef SHARED -@@ -29,6 +30,9 @@ - #error makefile bug, this file is for static only - #endif - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+extern void *__sbrk_nosysenter (intptr_t __delta); -+#endif - extern ElfW(Phdr) *_dl_phdr; - extern size_t _dl_phnum; - -@@ -141,14 +145,26 @@ - - The initialized value of _dl_tls_static_size is provided by dl-open.c - to request some surplus that permits dynamic loading of modules with -- IE-model TLS. */ -+ IE-model TLS. -+ -+ Where the normal sbrk would use a syscall that needs the TLS (i386) -+ use the special non-sysenter version instead. */ - #if TLS_TCB_AT_TP - tcb_offset = roundup (memsz + GL(dl_tls_static_size), tcbalign); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + tcbsize + max_align); -+# else - tlsblock = __sbrk (tcb_offset + tcbsize + max_align); -+# endif - #elif TLS_DTV_AT_TP - tcb_offset = roundup (tcbsize, align ?: 1); -+# ifdef INTERNAL_SYSCALL_NOSYSENTER -+ tlsblock = __sbrk_nosysenter (tcb_offset + memsz + max_align -+ + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# else - tlsblock = __sbrk (tcb_offset + memsz + max_align - + TLS_PRE_TCB_SIZE + GL(dl_tls_static_size)); -+# endif - tlsblock += TLS_PRE_TCB_SIZE; - #else - /* In case a model with a different layout for the TCB and DTV ---- glibc-2.10.1/misc/sbrk.c -+++ glibc-2.10.1/misc/sbrk.c -@@ -18,6 +18,7 @@ - - #include <stdint.h> - #include <unistd.h> -+#include <sysdep.h> - - /* Defined in brk.c. */ - extern void *__curbrk; -@@ -29,6 +30,35 @@ - /* Extend the process's data space by INCREMENT. - If INCREMENT is negative, shrink data space by - INCREMENT. - Return start of new space allocated, or -1 for errors. */ -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ if the SYSENTER version requires the TLS (which it does on i386). -+ Obviously using the TLS before it is initialised is broken. */ -+extern int __brk_nosysenter (void *addr); -+void * -+__sbrk_nosysenter (intptr_t increment) -+{ -+ void *oldbrk; -+ -+ /* If this is not part of the dynamic library or the library is used -+ via dynamic loading in a statically linked program update -+ __curbrk from the kernel's brk value. That way two separate -+ instances of __brk and __sbrk can share the heap, returning -+ interleaved pieces of it. */ -+ if (__curbrk == NULL || __libc_multiple_libcs) -+ if (__brk_nosysenter (0) < 0) /* Initialize the break. */ -+ return (void *) -1; -+ -+ if (increment == 0) -+ return __curbrk; -+ -+ oldbrk = __curbrk; -+ if (__brk_nosysenter (oldbrk + increment) < 0) -+ return (void *) -1; -+ -+ return oldbrk; -+} -+#endif - void * - __sbrk (intptr_t increment) - { ---- glibc-2.10.1/sysdeps/unix/sysv/linux/i386/brk.c -+++ glibc-2.10.1/sysdeps/unix/sysv/linux/i386/brk.c -@@ -31,6 +31,30 @@ - linker. */ - weak_alias (__curbrk, ___brk_addr) - -+#ifdef INTERNAL_SYSCALL_NOSYSENTER -+/* This version is used by csu/libc-tls.c whem initialising the TLS -+ * if the SYSENTER version requires the TLS (which it does on i386). -+ * Obviously using the TLS before it is initialised is broken. */ -+int -+__brk_nosysenter (void *addr) -+{ -+ void *__unbounded newbrk; -+ -+ INTERNAL_SYSCALL_DECL (err); -+ newbrk = (void *__unbounded) INTERNAL_SYSCALL_NOSYSENTER (brk, err, 1, -+ __ptrvalue (addr)); -+ -+ __curbrk = newbrk; -+ -+ if (newbrk < addr) -+ { -+ __set_errno (ENOMEM); -+ return -1; -+ } -+ -+ return 0; -+} -+#endif - int - __brk (void *addr) - { ---- glibc-2.10.1/sysdeps/unix/sysv/linux/i386/sysdep.h -+++ glibc-2.10.1/sysdeps/unix/sysv/linux/i386/sysdep.h -@@ -187,7 +187,7 @@ - /* The original calling convention for system calls on Linux/i386 is - to use int $0x80. */ - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define ENTER_KERNEL call *%gs:SYSINFO_OFFSET - # else - # define ENTER_KERNEL call *_dl_sysinfo -@@ -358,7 +358,7 @@ - possible to use more than four parameters. */ - #undef INTERNAL_SYSCALL - #ifdef I386_USE_SYSENTER --# ifdef SHARED -+# if defined SHARED || defined __PIC__ - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ - register unsigned int resultvar; \ -@@ -384,6 +384,18 @@ - : "0" (name), "i" (offsetof (tcbhead_t, sysinfo)) \ - ASMFMT_##nr(args) : "memory", "cc"); \ - (int) resultvar; }) -+# define INTERNAL_SYSCALL_NOSYSENTER(name, err, nr, args...) \ -+ ({ \ -+ register unsigned int resultvar; \ -+ EXTRAVAR_##nr \ -+ asm volatile ( \ -+ LOADARGS_NOSYSENTER_##nr \ -+ "movl %1, %%eax\n\t" \ -+ "int $0x80\n\t" \ -+ RESTOREARGS_NOSYSENTER_##nr \ -+ : "=a" (resultvar) \ -+ : "i" (__NR_##name) ASMFMT_##nr(args) : "memory", "cc"); \ -+ (int) resultvar; }) - # else - # define INTERNAL_SYSCALL(name, err, nr, args...) \ - ({ \ -@@ -447,12 +459,20 @@ - - #define LOADARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define LOADARGS_1 \ - "bpushl .L__X'%k3, %k3\n\t" - # define LOADARGS_5 \ - "movl %%ebx, %4\n\t" \ - "movl %3, %%ebx\n\t" -+# define LOADARGS_NOSYSENTER_1 \ -+ "bpushl .L__X'%k2, %k2\n\t" -+# define LOADARGS_NOSYSENTER_2 LOADARGS_NOSYSENTER_1 -+# define LOADARGS_NOSYSENTER_3 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_4 LOADARGS_3 -+# define LOADARGS_NOSYSENTER_5 \ -+ "movl %%ebx, %3\n\t" \ -+ "movl %2, %%ebx\n\t" - # else - # define LOADARGS_1 \ - "bpushl .L__X'%k2, %k2\n\t" -@@ -474,11 +495,18 @@ - - #define RESTOREARGS_0 - #ifdef __PIC__ --# if defined I386_USE_SYSENTER && defined SHARED -+# if defined I386_USE_SYSENTER && ( defined SHARED || defined __PIC__ ) - # define RESTOREARGS_1 \ - "bpopl .L__X'%k3, %k3\n\t" - # define RESTOREARGS_5 \ - "movl %4, %%ebx" -+# define RESTOREARGS_NOSYSENTER_1 \ -+ "bpopl .L__X'%k2, %k2\n\t" -+# define RESTOREARGS_NOSYSENTER_2 RESTOREARGS_NOSYSENTER_1 -+# define RESTOREARGS_NOSYSENTER_3 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_4 RESTOREARGS_3 -+# define RESTOREARGS_NOSYSENTER_5 \ -+ "movl %3, %%ebx" - # else - # define RESTOREARGS_1 \ - "bpopl .L__X'%k2, %k2\n\t" diff --git a/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch b/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch deleted file mode 100644 index 5cbacbf..0000000 --- a/glibc/patches/glibc-2.10.1-strlcpy_strlcat-1.patch +++ /dev/null @@ -1,349 +0,0 @@ -diff -Naur glibc-2.7.orig/manual/strlcpy.3 glibc-2.7/manual/strlcpy.3 ---- glibc-2.7.orig/manual/strlcpy.3 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.7/manual/strlcpy.3 2008-01-19 23:13:56.000000000 +0000 -@@ -0,0 +1,186 @@ -+.\" $OpenBSD: strlcpy.3,v 1.18 2005/08/06 03:24:19 jaredy Exp $ -+.\" -+.\" Copyright (c) 1998, 2000 Todd C. Miller <Todd.Miller(a)courtesan.com> -+.\" -+.\" Permission to use, copy, modify, and distribute this software for any -+.\" purpose with or without fee is hereby granted, provided that the above -+.\" copyright notice and this permission notice appear in all copies. -+.\" -+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+.\" -+.Dd June 22, 1998 -+.Dt STRLCPY 3 -+.Os -+.Sh NAME -+.Nm strlcpy , -+.Nm strlcat -+.Nd size-bounded string copying and concatenation -+.Sh SYNOPSIS -+.Fd #include <string.h> -+.Ft size_t -+.Fn strlcpy "char *dst" "const char *src" "size_t size" -+.Ft size_t -+.Fn strlcat "char *dst" "const char *src" "size_t size" -+.Sh DESCRIPTION -+The -+.Fn strlcpy -+and -+.Fn strlcat -+functions copy and concatenate strings respectively. -+They are designed -+to be safer, more consistent, and less error prone replacements for -+.Xr strncpy 3 -+and -+.Xr strncat 3 . -+Unlike those functions, -+.Fn strlcpy -+and -+.Fn strlcat -+take the full size of the buffer (not just the length) and guarantee to -+NUL-terminate the result (as long as -+.Fa size -+is larger than 0 or, in the case of -+.Fn strlcat , -+as long as there is at least one byte free in -+.Fa dst ) . -+Note that a byte for the NUL should be included in -+.Fa size . -+Also note that -+.Fn strlcpy -+and -+.Fn strlcat -+only operate on true -+.Dq C -+strings. -+This means that for -+.Fn strlcpy -+.Fa src -+must be NUL-terminated and for -+.Fn strlcat -+both -+.Fa src -+and -+.Fa dst -+must be NUL-terminated. -+.Pp -+The -+.Fn strlcpy -+function copies up to -+.Fa size -+- 1 characters from the NUL-terminated string -+.Fa src -+to -+.Fa dst , -+NUL-terminating the result. -+.Pp -+The -+.Fn strlcat -+function appends the NUL-terminated string -+.Fa src -+to the end of -+.Fa dst . -+It will append at most -+.Fa size -+- strlen(dst) - 1 bytes, NUL-terminating the result. -+.Sh RETURN VALUES -+The -+.Fn strlcpy -+and -+.Fn strlcat -+functions return the total length of the string they tried to create. -+For -+.Fn strlcpy -+that means the length of -+.Fa src . -+For -+.Fn strlcat -+that means the initial length of -+.Fa dst -+plus -+the length of -+.Fa src . -+While this may seem somewhat confusing, it was done to make -+truncation detection simple. -+.Pp -+Note, however, that if -+.Fn strlcat -+traverses -+.Fa size -+characters without finding a NUL, the length of the string is considered -+to be -+.Fa size -+and the destination string will not be NUL-terminated (since there was -+no space for the NUL). -+This keeps -+.Fn strlcat -+from running off the end of a string. -+In practice this should not happen (as it means that either -+.Fa size -+is incorrect or that -+.Fa dst -+is not a proper -+.Dq C -+string). -+The check exists to prevent potential security problems in incorrect code. -+.Sh EXAMPLES -+The following code fragment illustrates the simple case: -+.Bd -literal -offset indent -+char *s, *p, buf[BUFSIZ]; -+ -+\&... -+ -+(void)strlcpy(buf, s, sizeof(buf)); -+(void)strlcat(buf, p, sizeof(buf)); -+.Ed -+.Pp -+To detect truncation, perhaps while building a pathname, something -+like the following might be used: -+.Bd -literal -offset indent -+char *dir, *file, pname[MAXPATHLEN]; -+ -+\&... -+ -+if (strlcpy(pname, dir, sizeof(pname)) >= sizeof(pname)) -+ goto toolong; -+if (strlcat(pname, file, sizeof(pname)) >= sizeof(pname)) -+ goto toolong; -+.Ed -+.Pp -+Since it is known how many characters were copied the first time, things -+can be sped up a bit by using a copy instead of an append: -+.Bd -literal -offset indent -+char *dir, *file, pname[MAXPATHLEN]; -+size_t n; -+ -+\&... -+ -+n = strlcpy(pname, dir, sizeof(pname)); -+if (n >= sizeof(pname)) -+ goto toolong; -+if (strlcpy(pname + n, file, sizeof(pname) - n) >= sizeof(pname) - n) -+ goto toolong; -+.Ed -+.Pp -+However, one may question the validity of such optimizations, as they -+defeat the whole purpose of -+.Fn strlcpy -+and -+.Fn strlcat . -+As a matter of fact, the first version of this manual page got it wrong. -+.Sh SEE ALSO -+.Xr snprintf 3 , -+.Xr strncat 3 , -+.Xr strncpy 3 -+.Sh HISTORY -+The -+.Fn strlcpy -+and -+.Fn strlcat -+functions first appeared in -+.Ox 2.4 . -diff -Naur glibc-2.7.orig/string/Makefile glibc-2.7/string/Makefile ---- glibc-2.7.orig/string/Makefile 2007-02-01 16:10:11.000000000 +0000 -+++ glibc-2.7/string/Makefile 2008-01-19 23:14:48.000000000 +0000 -@@ -40,7 +40,12 @@ - addsep replace) \ - envz basename \ - strcoll_l strxfrm_l string-inlines memrchr \ -- xpg-strerror strerror_l -+ xpg-strerror strerror_l strlcat strlcpy -+ -+# These routines will be omitted from the libc shared object. -+# Instead the static object files will be included in a special archive -+# linked against when the shared library will be used. -+static-only-routines = strlcat strlcpy - - # Gcc internally generates calls to unbounded memcpy and memset - # for -fbounded-pointer compiles. Glibc uses memchr for explicit checks. -diff -Naur glibc-2.7.orig/string/string.h glibc-2.7/string/string.h ---- glibc-2.7.orig/string/string.h 2007-09-15 02:35:08.000000000 +0000 -+++ glibc-2.7/string/string.h 2008-01-19 23:13:56.000000000 +0000 -@@ -354,6 +354,24 @@ - extern char *strsep (char **__restrict __stringp, - __const char *__restrict __delim) - __THROW __nonnull ((1, 2)); -+ -+/* -+ * Appends __src to string __dst of size __n (unlike strncat, __n is the -+ * full size of __dst, not space left). At most __n-1 characters -+ * will be copied. Always NUL terminates (unless __n <= strlen(__dst)). -+ * Returns strlen(__src) + MIN(__n, strlen(initial __dst)). -+ * If retval >= __n, truncation occurred. -+ */ -+extern size_t strlcat (char *__dst, __const char *__src, size_t __n) -+ __THROW __nonnull ((1, 2)); -+ -+/* -+ * Copy __src to string __dst of size __n. At most __n-1 characters -+ * will be copied. Always NUL terminates (unless __n == 0). -+ * Returns strlen(__src); if retval >= __n, truncation occurred. -+ */ -+extern size_t strlcpy (char *__dst, __const char *__src, size_t __n) -+ __THROW __nonnull ((1, 2)); - #endif - - #ifdef __USE_GNU -diff -Naur glibc-2.7.orig/string/strlcat.c glibc-2.7/string/strlcat.c ---- glibc-2.7.orig/string/strlcat.c 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.7/string/strlcat.c 2008-01-19 23:13:56.000000000 +0000 -@@ -0,0 +1,55 @@ -+/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ -+ -+/* -+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller(a)courtesan.com> -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include <sys/types.h> -+#include <string.h> -+ -+/* -+ * Appends src to string dst of size siz (unlike strncat, siz is the -+ * full size of dst, not space left). At most siz-1 characters -+ * will be copied. Always NUL terminates (unless siz <= strlen(dst)). -+ * Returns strlen(src) + MIN(siz, strlen(initial dst)). -+ * If retval >= siz, truncation occurred. -+ */ -+size_t -+strlcat(char *dst, const char *src, size_t siz) -+{ -+ char *d = dst; -+ const char *s = src; -+ size_t n = siz; -+ size_t dlen; -+ -+ /* Find the end of dst and adjust bytes left but don't go past end */ -+ while (n-- != 0 && *d != '\0') -+ d++; -+ dlen = d - dst; -+ n = siz - dlen; -+ -+ if (n == 0) -+ return(dlen + strlen(s)); -+ while (*s != '\0') { -+ if (n != 1) { -+ *d++ = *s; -+ n--; -+ } -+ s++; -+ } -+ *d = '\0'; -+ -+ return(dlen + (s - src)); /* count does not include NUL */ -+} -diff -Naur glibc-2.7.orig/string/strlcpy.c glibc-2.7/string/strlcpy.c ---- glibc-2.7.orig/string/strlcpy.c 1970-01-01 00:00:00.000000000 +0000 -+++ glibc-2.7/string/strlcpy.c 2008-01-19 23:13:56.000000000 +0000 -@@ -0,0 +1,51 @@ -+/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */ -+ -+/* -+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller(a)courtesan.com> -+ * -+ * Permission to use, copy, modify, and distribute this software for any -+ * purpose with or without fee is hereby granted, provided that the above -+ * copyright notice and this permission notice appear in all copies. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ -+ -+#include <sys/types.h> -+#include <string.h> -+ -+/* -+ * Copy src to string dst of size siz. At most siz-1 characters -+ * will be copied. Always NUL terminates (unless siz == 0). -+ * Returns strlen(src); if retval >= siz, truncation occurred. -+ */ -+size_t -+strlcpy(char *dst, const char *src, size_t siz) -+{ -+ char *d = dst; -+ const char *s = src; -+ size_t n = siz; -+ -+ /* Copy as many bytes as will fit */ -+ if (n != 0) { -+ while (--n != 0) { -+ if ((*d++ = *s++) == '\0') -+ break; -+ } -+ } -+ -+ /* Not enough room in dst, add NUL and traverse rest of src */ -+ if (n == 0) { -+ if (siz != 0) -+ *d = '\0'; /* NUL-terminate dst */ -+ while (*s++) -+ ; -+ } -+ -+ return(s - src - 1); /* count does not include NUL */ -+} diff --git a/glibc/patches/glibc-2.17-endless-loop-stdc-predef.h.patch b/glibc/patches/glibc-2.17-endless-loop-stdc-predef.h.patch deleted file mode 100644 index 4dc7ae1..0000000 --- a/glibc/patches/glibc-2.17-endless-loop-stdc-predef.h.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit d7e06450b9d730d7b62ba52f611585810fa902df -Author: Carlos O'Donell <carlos(a)redhat.com> -Date: Tue Jul 16 17:55:43 2013 -0400 - - BZ #15711: Avoid circular dependency for syscall.h - - The generated header is compiled with `-ffreestanding' to avoid any - circular dependencies against the installed implementation headers. - Such a dependency would require the implementation header to be - installed before the generated header could be built (See bug 15711). - In current practice the generated header dependencies do not include - any of the implementation headers removed by the use of `-ffreestanding'. - - --- - - 2013-07-15 Carlos O'Donell <carlos(a)redhat.com> - - [BZ #15711] - * sysdeps/unix/sysv/linux/Makefile ($(objpfx)bits/syscall%h): - Avoid system header dependency with -ffreestanding. - ($(objpfx)bits/syscall%d): Likewise. - -diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile -index f580635..94916a2 100644 ---- a/sysdeps/unix/sysv/linux/Makefile -+++ b/sysdeps/unix/sysv/linux/Makefile -@@ -50,6 +50,13 @@ tests += tst-clone - # be the condition for those options to use in a C #if condition. - # abi-includes may be defined to a list of headers to include - # in the generated header, if the default does not suffice. -+# -+# The generated header is compiled with `-ffreestanding' to avoid any -+# circular dependencies against the installed implementation headers. -+# Such a dependency would require the implementation header to be -+# installed before the generated header could be built (See bug 15711). -+# In current practice the generated header dependencies do not include -+# any of the implementation headers removed by the use of `-ffreestanding'. - - $(objpfx)bits/syscall%h $(objpfx)bits/syscall%d: ../sysdeps/unix/sysv/linux/sys/syscall.h - $(make-target-directory) -@@ -64,7 +71,7 @@ $(objpfx)bits/syscall%h $(objpfx)bits/syscall%d: ../sysdeps/unix/sysv/linux/sys/ - echo ''; \ - $(if $(abi-variants), \ - $(foreach v,$(abi-variants),\ -- $(CC) -E -MD -MP -MF $(@:.h=.d)-t$(v) -MT '$(@:.d=.h) $(@:.h=.d)' \ -+ $(CC) -ffreestanding -E -MD -MP -MF $(@:.h=.d)-t$(v) -MT '$(@:.d=.h) $(@:.h=.d)' \ - -x c $(sysincludes) $< $(abi-$(v)-options) \ - -D_LIBC -dM | \ - sed -n 's@^#define __NR_$[^ ]*$ .*$$@#define SYS_\1 __NR_\1@p' | \ -@@ -75,7 +82,7 @@ $(objpfx)bits/syscall%h $(objpfx)bits/syscall%d: ../sysdeps/unix/sysv/linux/sys/ - $(if $(abi-$(v)-condition),echo '#endif';) \ - rm -f $(@:.d=.h).new$(v); \ - ), \ -- $(CC) -E -MD -MP -MF $(@:.h=.d)-t$(v) -MT '$(@:.d=.h) $(@:.h=.d)' \ -+ $(CC) -ffreestanding -E -MD -MP -MF $(@:.h=.d)-t$(v) -MT '$(@:.d=.h) $(@:.h=.d)' \ - -x c $(sysincludes) $< \ - -D_LIBC -dM | \ - sed -n 's@^#define __NR_$[^ ]*$ .*$$@#define SYS_\1 __NR_\1@p' | \ diff --git a/glibc/patches/glibc-fedora-elf-ORIGIN.patch b/glibc/patches/glibc-fedora-elf-ORIGIN.patch deleted file mode 100644 index bfaff83..0000000 --- a/glibc/patches/glibc-fedora-elf-ORIGIN.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 207e77fd3f0a94acdf0557608dd4f10ce0e0f22f Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab(a)redhat.com> -Date: Mon, 9 May 2011 10:55:58 +0200 -Subject: [PATCH] Never leave $ORIGIN unexpanded - -* elf/dl-load.c (is_dst): Remove parameter secure, all callers -changed. Move check for valid use of $ORIGIN ... -(_dl_dst_substitute): ... here. Reset check_for_trusted when a -path element is skipped. - ---- - ChangeLog | 7 +++++++ - elf/dl-load.c | 34 ++++++++++++++++------------------ - 2 files changed, 23 insertions(+), 18 deletions(-) - -diff --git a/elf/dl-load.c b/elf/dl-load.c -index 18a83d2..6e16a9a 100644 ---- a/elf/dl-load.c -+++ b/elf/dl-load.c -@@ -249,8 +249,7 @@ is_trusted_path_normalize (const char *path, size_t len) - - - static size_t --is_dst (const char *start, const char *name, const char *str, -- int is_path, int secure) -+is_dst (const char *start, const char *name, const char *str, int is_path) - { - size_t len; - bool is_curly = false; -@@ -279,12 +278,6 @@ is_dst (const char *start, const char *name, const char *str, - && (!is_path || name[len] != ':')) - return 0; - -- if (__builtin_expect (secure, 0) -- && ((name[len] != '\0' && name[len] != '/' -- && (!is_path || name[len] != ':')) -- || (name != start + 1 && (!is_path || name[-2] != ':')))) -- return 0; -- - return len; - } - -@@ -299,13 +292,10 @@ _dl_dst_count (const char *name, int is_path) - { - size_t len; - -- /* $ORIGIN is not expanded for SUID/GUID programs (except if it -- is $ORIGIN alone) and it must always appear first in path. */ - ++name; -- if ((len = is_dst (start, name, "ORIGIN", is_path, -- INTUSE(__libc_enable_secure))) != 0 -- || (len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0 -- || (len = is_dst (start, name, "LIB", is_path, 0)) != 0) -+ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0 -+ || (len = is_dst (start, name, "PLATFORM", is_path)) != 0 -+ || (len = is_dst (start, name, "LIB", is_path)) != 0) - ++cnt; - - name = strchr (name + len, '$'); -@@ -338,9 +328,16 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, - size_t len; - - ++name; -- if ((len = is_dst (start, name, "ORIGIN", is_path, -- INTUSE(__libc_enable_secure))) != 0) -+ if ((len = is_dst (start, name, "ORIGIN", is_path)) != 0) - { -+ /* For SUID/GUID programs $ORIGIN must always appear -+ first in a path element. */ -+ if (__builtin_expect (INTUSE(__libc_enable_secure), 0) -+ && ((name[len] != '\0' && name[len] != '/' -+ && (!is_path || name[len] != ':')) -+ || (name != start + 1 && (!is_path || name[-2] != ':')))) -+ repl = (const char *) -1; -+ else - #ifndef SHARED - if (l == NULL) - repl = _dl_get_origin (); -@@ -351,9 +348,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, - check_for_trusted = (INTUSE(__libc_enable_secure) - && l->l_type == lt_executable); - } -- else if ((len = is_dst (start, name, "PLATFORM", is_path, 0)) != 0) -+ else if ((len = is_dst (start, name, "PLATFORM", is_path)) != 0) - repl = GLRO(dl_platform); -- else if ((len = is_dst (start, name, "LIB", is_path, 0)) != 0) -+ else if ((len = is_dst (start, name, "LIB", is_path)) != 0) - repl = DL_DST_LIB; - - if (repl != NULL && repl != (const char *) -1) -@@ -373,6 +370,7 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result, - element, but keep an empty element at the end. */ - if (wp == result && is_path && *name == ':' && name[1] != '\0') - ++name; -+ check_for_trusted = false; - } - else - /* No DST we recognize. */ diff --git a/glibc/patches/glibc-fedora-gai-canonical.patch b/glibc/patches/glibc-fedora-gai-canonical.patch deleted file mode 100644 index c058ecf..0000000 --- a/glibc/patches/glibc-fedora-gai-canonical.patch +++ /dev/null @@ -1,128 +0,0 @@ -From bf18f175afdb59cdcd1016995b351e2bbb1d6ba7 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab(a)redhat.com> -Date: Tue, 21 Jun 2011 17:28:57 +0200 -Subject: [PATCH] Don't use gethostbyaddr to determine canonical name - -* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use gethostbyaddr -to determine canonical name. - ---- - ChangeLog | 5 +++ - sysdeps/posix/getaddrinfo.c | 77 +++---------------------------------------- - 2 files changed, 10 insertions(+), 72 deletions(-) - ---- a/sysdeps/posix/getaddrinfo.c -+++ b/sysdeps/posix/getaddrinfo.c -@@ -565,8 +565,8 @@ gaih_inet (const char *name, const struct gaih_service *service, - - /* If we do not have to look for IPv6 addresses, use - the simple, old functions, which do not support -- IPv6 scope ids. */ -- if (req->ai_family == AF_INET) -+ IPv6 scope ids, nor retrieving the canonical name. */ -+ if (req->ai_family == AF_INET && (req->ai_flags & AI_CANONNAME) == 0) - { - /* Allocate additional room for struct host_data. */ - size_t tmpbuflen = (512 + MAX_NR_ALIASES * sizeof(char*) -@@ -1107,70 +1107,10 @@ gaih_inet (const char *name, const struct gaih_service *service, - /* Only the first entry gets the canonical name. */ - if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0) - { -- char *tmpbuf2 = NULL; -- bool malloc_tmpbuf2 = false; -- - if (canon == NULL) -- { -- struct hostent *h = NULL; -- int herrno; -- struct hostent th; -- /* Add room for struct host_data. */ -- size_t tmpbuf2len = (512 + (MAX_NR_ALIASES+MAX_NR_ADDRS+1) -- * sizeof(char*) + 16 * sizeof(char)); -- -- do -- { -- if (__libc_use_alloca (alloca_used + 2 * tmpbuf2len)) -- tmpbuf2 = extend_alloca_account (tmpbuf2, tmpbuf2len, -- tmpbuf2len * 2, -- alloca_used); -- else -- { -- char *newp = realloc (malloc_tmpbuf2 ? tmpbuf2 : NULL, -- 2 * tmpbuf2len); -- if (newp == NULL) -- { -- if (malloc_tmpbuf2) -- free (tmpbuf2); -- result = -EAI_MEMORY; -- goto free_and_return; -- } -- -- tmpbuf2 = newp; -- tmpbuf2len = 2 * tmpbuf2len; -- malloc_tmpbuf2 = true; -- } -- -- rc = __gethostbyaddr_r (at2->addr, -- ((at2->family == AF_INET6) -- ? sizeof (struct in6_addr) -- : sizeof (struct in_addr)), -- at2->family, &th, tmpbuf2, -- tmpbuf2len, &h, &herrno); -- } -- while (rc == ERANGE && herrno == NETDB_INTERNAL); -- -- if (rc != 0 && herrno == NETDB_INTERNAL) -- { -- if (malloc_tmpbuf2) -- free (tmpbuf2); -- -- __set_h_errno (herrno); -- result = -EAI_SYSTEM; -- goto free_and_return; -- } -- -- if (h != NULL) -- canon = h->h_name; -- else -- { -- assert (orig_name != NULL); -- /* If the canonical name cannot be determined, use -- the passed in string. */ -- canon = orig_name; -- } -- } -+ /* If the canonical name cannot be determined, use -+ the passed in string. */ -+ canon = orig_name; - - #ifdef HAVE_LIBIDN - if (req->ai_flags & AI_CANONIDN) -@@ -1185,9 +1125,6 @@ gaih_inet (const char *name, const struct gaih_service *service, - int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags); - if (rc != IDNA_SUCCESS) - { -- if (malloc_tmpbuf2) -- free (tmpbuf2); -- - if (rc == IDNA_MALLOC_ERROR) - result = -EAI_MEMORY; - else if (rc == IDNA_DLOPEN_ERROR) -@@ -1217,17 +1154,11 @@ gaih_inet (const char *name, const struct gaih_service *service, - canon = strdup (canon); - if (canon == NULL) - { -- if (malloc_tmpbuf2) -- free (tmpbuf2); -- - result = -EAI_MEMORY; - goto free_and_return; - } - } - } -- -- if (malloc_tmpbuf2) -- free (tmpbuf2); - } - - family = at2->family; diff --git a/glibc/patches/glibc-fedora-regcomp-sw11561.patch b/glibc/patches/glibc-fedora-regcomp-sw11561.patch deleted file mode 100644 index 0edc04f..0000000 --- a/glibc/patches/glibc-fedora-regcomp-sw11561.patch +++ /dev/null @@ -1,147 +0,0 @@ -From c1b97d6d896b1f22fdf5d28471ef7859ec840a57 Mon Sep 17 00:00:00 2001 -From: Andreas Schwab <schwab(a)redhat.com> -Date: Wed, 1 Sep 2010 17:26:15 +0200 -Subject: [PATCH] Fix handling of collating symbols in regexps - -[BZ #11561] -* posix/regcomp.c (parse_bracket_exp): When looking up collating -elements compare against the byte sequence of it, not its name. - ---- - ChangeLog | 4 +++ - posix/regcomp.c | 72 ++++++++++++++++++++---------------------------------- - 2 files changed, 31 insertions(+), 45 deletions(-) - ---- a/posix/regcomp.c -+++ b/posix/regcomp.c -@@ -2772,40 +2772,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, - - /* Local function for parse_bracket_exp used in _LIBC environement. - Seek the collating symbol entry correspondings to NAME. -- Return the index of the symbol in the SYMB_TABLE. */ -+ Return the index of the symbol in the SYMB_TABLE, -+ or -1 if not found. */ - - auto inline int32_t - __attribute ((always_inline)) -- seek_collating_symbol_entry (name, name_len) -- const unsigned char *name; -- size_t name_len; -+ seek_collating_symbol_entry (const unsigned char *name, size_t name_len) - { -- int32_t hash = elem_hash ((const char *) name, name_len); -- int32_t elem = hash % table_size; -- if (symb_table[2 * elem] != 0) -- { -- int32_t second = hash % (table_size - 2) + 1; -- -- do -- { -- /* First compare the hashing value. */ -- if (symb_table[2 * elem] == hash -- /* Compare the length of the name. */ -- && name_len == extra[symb_table[2 * elem + 1]] -- /* Compare the name. */ -- && memcmp (name, &extra[symb_table[2 * elem + 1] + 1], -- name_len) == 0) -- { -- /* Yep, this is the entry. */ -- break; -- } -+ int32_t elem; - -- /* Next entry. */ -- elem += second; -- } -- while (symb_table[2 * elem] != 0); -- } -- return elem; -+ for (elem = 0; elem < table_size; elem++) -+ if (symb_table[2 * elem] != 0) -+ { -+ int32_t idx = symb_table[2 * elem + 1]; -+ /* Skip the name of collating element name. */ -+ idx += 1 + extra[idx]; -+ if (/* Compare the length of the name. */ -+ name_len == extra[idx] -+ /* Compare the name. */ -+ && memcmp (name, &extra[idx + 1], name_len) == 0) -+ /* Yep, this is the entry. */ -+ return elem; -+ } -+ return -1; - } - - /* Local function for parse_bracket_exp used in _LIBC environment. -@@ -2814,8 +2803,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, - - auto inline unsigned int - __attribute ((always_inline)) -- lookup_collation_sequence_value (br_elem) -- bracket_elem_t *br_elem; -+ lookup_collation_sequence_value (bracket_elem_t *br_elem) - { - if (br_elem->type == SB_CHAR) - { -@@ -2843,7 +2831,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, - int32_t elem, idx; - elem = seek_collating_symbol_entry (br_elem->opr.name, - sym_name_len); -- if (symb_table[2 * elem] != 0) -+ if (elem != -1) - { - /* We found the entry. */ - idx = symb_table[2 * elem + 1]; -@@ -2861,7 +2849,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, - /* Return the collation sequence value. */ - return *(unsigned int *) (extra + idx); - } -- else if (symb_table[2 * elem] == 0 && sym_name_len == 1) -+ else if (sym_name_len == 1) - { - /* No valid character. Match it as a single byte - character. */ -@@ -2883,11 +2871,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, - - auto inline reg_errcode_t - __attribute ((always_inline)) -- build_range_exp (sbcset, mbcset, range_alloc, start_elem, end_elem) -- re_charset_t *mbcset; -- int *range_alloc; -- bitset_t sbcset; -- bracket_elem_t *start_elem, *end_elem; -+ build_range_exp (bitset_t sbcset, re_charset_t *mbcset, int *range_alloc, -+ bracket_elem_t *start_elem, bracket_elem_t *end_elem) - { - unsigned int ch; - uint32_t start_collseq; -@@ -2966,25 +2951,22 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, - - auto inline reg_errcode_t - __attribute ((always_inline)) -- build_collating_symbol (sbcset, mbcset, coll_sym_alloc, name) -- re_charset_t *mbcset; -- int *coll_sym_alloc; -- bitset_t sbcset; -- const unsigned char *name; -+ build_collating_symbol (bitset_t sbcset, re_charset_t *mbcset, -+ int *coll_sym_alloc, const unsigned char *name) - { - int32_t elem, idx; - size_t name_len = strlen ((const char *) name); - if (nrules != 0) - { - elem = seek_collating_symbol_entry (name, name_len); -- if (symb_table[2 * elem] != 0) -+ if (elem != -1) - { - /* We found the entry. */ - idx = symb_table[2 * elem + 1]; - /* Skip the name of collating element name. */ - idx += 1 + extra[idx]; - } -- else if (symb_table[2 * elem] == 0 && name_len == 1) -+ else if (name_len == 1) - { - /* No valid character, treat it as a normal - character. */ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4c9ea85490de5459960f251b2db4dc3fc664477a
by git＠ipfire.org 16 Feb '14

16 Feb '14

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 4c9ea85490de5459960f251b2db4dc3fc664477a (commit) from 8301720cae0839a964ef0b5803a909bd252b906b (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 4c9ea85490de5459960f251b2db4dc3fc664477a Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sun Feb 16 08:47:31 2014 +0100 Set version to 2.15 beta2. ----------------------------------------------------------------------- Summary of changes: make.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Difference in files: diff --git a/make.sh b/make.sh index 5d787a0..4481096 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # 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-2013 IPFire Team <info(a)ipfire.org>. # +# Copyright (C) 2007-2014 IPFire Team <info(a)ipfire.org>. # # # ############################################################################ # @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.15" # Version number -CORE="76-beta1" # Core Level (Filename) +CORE="76-beta2" # Core Level (Filename) PAKFIRE_CORE="76" # Core Level (PAKFIRE) GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN="www.ipfire.org" # Software slogan hooks/post-receive -- IPFire 2.x development tree

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM February 2014