IPFire-SCM April 2018

ipfire-scm@lists.ipfire.org

1 participants
29 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1c28319e1e1742f444c8447bcbbdcdf30fc5b2b6
by git＠ipfire.org 19 Apr '18

19 Apr '18

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 1c28319e1e1742f444c8447bcbbdcdf30fc5b2b6 (commit) via 1d95329925a94b005a4f79ee71daac7ace8bb496 (commit) via d0d2e8c4adfd8619e4bf669aaddf3c7f7c4945ac (commit) from 4cd51e20ae17ee55e46708650055727cffe3443a (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 1c28319e1e1742f444c8447bcbbdcdf30fc5b2b6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 19 15:38:20 2018 +0100 squid-accounting: Do not make menu entry executable Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 1d95329925a94b005a4f79ee71daac7ace8bb496 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 19 15:37:58 2018 +0100 squid-accounting: Do not make translations executable Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit d0d2e8c4adfd8619e4bf669aaddf3c7f7c4945ac Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Apr 19 15:37:28 2018 +0100 squid-accounting: Install Turkish translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/squid-accounting | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) Difference in files: diff --git a/lfs/squid-accounting b/lfs/squid-accounting index ec89dce23..e71b2ac5d 100644 --- a/lfs/squid-accounting +++ b/lfs/squid-accounting @@ -54,9 +54,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 755 $(DIR_APP)/squid-accounting/accounting.cgi /srv/web/ipfire/cgi-bin/ install -v -m 755 $(DIR_APP)/squid-accounting/acct.pl /usr/local/bin/ install -v -m 644 $(DIR_APP)/squid-accounting/acct-lib.pl /var/ipfire/accounting/ - install -v -m 655 $(DIR_APP)/squid-accounting/acct.de.pl /var/ipfire/addon-lang/ - install -v -m 655 $(DIR_APP)/squid-accounting/acct.en.pl /var/ipfire/addon-lang/ - install -v -m 655 $(DIR_APP)/squid-accounting/EX-squid-accounting.menu /var/ipfire/menu.d/ + install -v -m 644 $(DIR_APP)/squid-accounting/acct.de.pl /var/ipfire/addon-lang/ + install -v -m 644 $(DIR_APP)/squid-accounting/acct.en.pl /var/ipfire/addon-lang/ + install -v -m 644 $(DIR_APP)/squid-accounting/acct.tr.pl /var/ipfire/addon-lang/ + install -v -m 644 $(DIR_APP)/squid-accounting/EX-squid-accounting.menu /var/ipfire/menu.d/ install -v -m 755 $(DIR_APP)/squid-accounting/dbinstall.pl /var/ipfire/accounting/ install -v -m 644 $(DIR_APP)/squid-accounting/config/backup/includes/squid-accounting \ /var/ipfire/backup/addons/includes/squid-accounting hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4cd51e20ae17ee55e46708650055727cffe3443a
by git＠ipfire.org 19 Apr '18

19 Apr '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bbaa7993bd99d0e31145f84277861fd8dbde3e34
by git＠ipfire.org 17 Apr '18

17 Apr '18

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 bbaa7993bd99d0e31145f84277861fd8dbde3e34 (commit) via 5990b2882b3fcae369bba4b9bc3915b1743415c1 (commit) from f8bb9b1578bccf3ae55f3d6f145866157846d248 (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 bbaa7993bd99d0e31145f84277861fd8dbde3e34 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 17 13:50:02 2018 +0100 wio: Translation files do not need to be executable Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 5990b2882b3fcae369bba4b9bc3915b1743415c1 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Tue Apr 17 13:49:41 2018 +0100 wio: Actually install Turkish translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/wio | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Difference in files: diff --git a/lfs/wio b/lfs/wio index 72b867d4a..4d5303e15 100644 --- a/lfs/wio +++ b/lfs/wio @@ -56,8 +56,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) install -v -m 644 $(DIR_APP)/wio/wio-graphs.pl /usr/lib/wio/ install -v -m 644 $(DIR_APP)/wio/wioips /var/log/wio/ install -v -m 644 $(DIR_APP)/wio/images/* /srv/web/ipfire/html/images/wio/ - install -v -m 655 $(DIR_APP)/wio/lang/wio.de.pl /var/ipfire/addon-lang/ - install -v -m 655 $(DIR_APP)/wio/lang/wio.en.pl /var/ipfire/addon-lang/ + install -v -m 644 $(DIR_APP)/wio/lang/wio.de.pl /var/ipfire/addon-lang/ + install -v -m 644 $(DIR_APP)/wio/lang/wio.en.pl /var/ipfire/addon-lang/ + install -v -m 644 $(DIR_APP)/wio/lang/wio.tr.pl /var/ipfire/addon-lang/ install -v -m 644 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/ install -v -m 644 $(DIR_APP)/wio/config/backup/includes/wio /var/ipfire/backup/addons/includes/wio hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. f8bb9b1578bccf3ae55f3d6f145866157846d248
by git＠ipfire.org 17 Apr '18

17 Apr '18

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 f8bb9b1578bccf3ae55f3d6f145866157846d248 (commit) from 2c1a6768d0117095b74089d96741f60771f70398 (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 f8bb9b1578bccf3ae55f3d6f145866157846d248 Author: Ersan Yildirim <ersan73(a)gmail.com> Date: Tue Apr 17 09:47:48 2018 +0100 Update Turkish translation and add translation for WIO and squid accounting Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/guardian/guardian.tr.pl | 53 +++++++--- config/rootfiles/packages/squid-accounting | 1 + config/rootfiles/packages/wio | 1 + doc/language_issues.de | 7 +- doc/language_issues.en | 7 +- doc/language_issues.es | 7 -- doc/language_issues.fr | 7 -- doc/language_issues.it | 7 +- doc/language_issues.nl | 7 +- doc/language_issues.pl | 7 -- doc/language_issues.ru | 7 -- doc/language_issues.tr | 119 +++++----------------- doc/language_missings | 109 -------------------- langs/tr/cgi-bin/tr.pl | 116 ++++++++++++++++++++- lfs/squid-accounting | 2 +- lfs/wio | 2 +- src/squid-accounting/acct.tr.pl | 134 ++++++++++++++++++++++++ src/wio/lang/wio.tr.pl | 157 +++++++++++++++++++++++++++++ 18 files changed, 495 insertions(+), 255 deletions(-) create mode 100644 src/squid-accounting/acct.tr.pl create mode 100644 src/wio/lang/wio.tr.pl Difference in files: diff --git a/config/guardian/guardian.tr.pl b/config/guardian/guardian.tr.pl index 701dc151c..cb64a358d 100644 --- a/config/guardian/guardian.tr.pl +++ b/config/guardian/guardian.tr.pl @@ -1,24 +1,45 @@ %tr = ( %tr, -'guardian alertfile' => 'Uyarı dosyası', -'guardian configuration' => 'Koruyucu Yapılandırması', -'guardian ignorefile' => 'Yoksayılan dosya', -'guardian interface' => 'Ara birim', +'guardian' => 'Koruyucu', +'guardian block a host' => 'Ana bilgisayarı engelle', +'guardian block httpd brute-force' => 'httpd kaba kuvvet algılama', +'guardian block owncloud brute-force' => 'Owncloud kaba kuvvet algılama', +'guardian block ssh brute-force' => 'SSH kaba kuvvet algılama', +'guardian blockcount' => 'Vurgu eşiği (Snort)', +'guardian blocked hosts' => 'Şu anda engellenen ana makineler', +'guardian blocking of this address is not allowed' => 'Verilen adresin engellenmesine izin verilmiyor.', +'guardian blocktime' => 'Engelleme zamanı (saniye)', +'guardian common settings' => 'Ortak ayarlar', +'guardian configuration' => 'Koruyucu yapılandırması', +'guardian daemon' => 'Artalan süreç', +'guardian empty input' => 'Boş giriş: Lütfen geçerli bir ana bilgisayar adresi veya alt ağ girin.', +'guardian enabled' => 'Koruyucuyu aktifleştir', +'guardian firewallaction' => 'Güvenlik duvarı eylemi', +'guardian ignored hosts' => 'Yok sayılan sunucular', +'guardian invalid address or subnet' => 'Geçersiz ana makine adresi veya alt ağ.', +'guardian invalid blockcount' => 'Geçersiz Engelleme Sayısı: Lütfen sıfırdan daha büyük bir doğal sayı girin.', +'guardian invalid blocktime' => 'Geçersiz Engelleme Zamanı: Lütfen sıfırdan daha büyük bir doğal sayı girin.', +'guardian invalid logfile' => 'Günlük dosyası için sağlanan yol geçerli değil.', +'guardian logfacility' => 'Günlük tesisi', 'guardian logfile' => 'Günlük dosyası', -'guardian loglevel_off' => 'Off', -'guardian loglevel_info' => 'Info', -'guardian loglevel_debug' => 'Debug', -'guardian logtarget_syslog' => 'Systemlog', -'guardian logtarget_file' => 'File', -'guardian logtarget_console' => 'Console', -'guardian priolevel_high' => '1 - High', -'guardian priolevel_medium' => '2 - Medium', -'guardian priolevel_low' => '3 - Low', -'guardian priolevel_very_low' => '4 - Very low', -'guardian timelimit' => 'Zaman sınırlaması', +'guardian loglevel' => 'Günlük seviyesi', +'guardian loglevel_off' => 'Kapalı', +'guardian loglevel_info' => 'Bilgi', +'guardian loglevel_debug' => 'Düzeltme', +'guardian logtarget_syslog' => 'Sistem günlüğü', +'guardian logtarget_file' => 'Dosya', +'guardian logtarget_console' => 'Konsol', +'guardian no entries' => 'Şu anda hiçbir kayıt bulunamadı.', +'guardian not running no hosts can be blocked' => 'Koruyucu çalışmıyor. Hiçbir ana makine engellenmeyecek.', +'guardian priolevel_high' => '1 - Yüksek', +'guardian priolevel_medium' => '2 - Orta', +'guardian priolevel_low' => '3 - Düşük', +'guardian priolevel_very_low' => '4 - Çok düşük', +'guardian priority level' => 'Öncelik seviyesi (Snort)', +'guardian service' => 'Koruyucu servisi', +'guardian watch snort alertfile' => 'Snort uyarı dosyası', ); #EOF - diff --git a/config/rootfiles/packages/squid-accounting b/config/rootfiles/packages/squid-accounting index 29d09a1e7..b3c34e212 100644 --- a/config/rootfiles/packages/squid-accounting +++ b/config/rootfiles/packages/squid-accounting @@ -9,6 +9,7 @@ var/ipfire/accounting/bill var/ipfire/accounting/dbinstall.pl var/ipfire/addon-lang/acct.de.pl var/ipfire/addon-lang/acct.en.pl +var/ipfire/addon-lang/acct.tr.pl var/ipfire/backup/addons/includes/squid-accounting var/ipfire/menu.d/EX-squid-accounting.menu var/log/accounting.log diff --git a/config/rootfiles/packages/wio b/config/rootfiles/packages/wio index f23866204..065d0be10 100644 --- a/config/rootfiles/packages/wio +++ b/config/rootfiles/packages/wio @@ -15,6 +15,7 @@ var/log/wio/wioips var/log/rrd/wio var/ipfire/addon-lang/wio.de.pl var/ipfire/addon-lang/wio.en.pl +var/ipfire/addon-lang/wio.tr.pl var/ipfire/menu.d/EX-wio.menu srv/web/ipfire/html/images/wio srv/web/ipfire/html/images/wio/add.png diff --git a/doc/language_issues.de b/doc/language_issues.de index 42aefd2e7..45a536238 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -468,6 +468,12 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 +WARNING: translation string unused: ovpn mtu-disc maybe +WARNING: translation string unused: ovpn mtu-disc no +WARNING: translation string unused: ovpn mtu-disc off +WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment +WARNING: translation string unused: ovpn mtu-disc yes WARNING: translation string unused: ovpn reneg sec WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_fragment @@ -687,7 +693,6 @@ WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits -WARNING: untranslated string: Captive menu WARNING: untranslated string: Scan for Songs WARNING: untranslated string: addons WARNING: untranslated string: bytes diff --git a/doc/language_issues.en b/doc/language_issues.en index 892965ba0..ce218c092 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -496,6 +496,12 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 +WARNING: translation string unused: ovpn mtu-disc maybe +WARNING: translation string unused: ovpn mtu-disc no +WARNING: translation string unused: ovpn mtu-disc off +WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment +WARNING: translation string unused: ovpn mtu-disc yes WARNING: translation string unused: ovpn reneg sec WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_mssfix @@ -725,7 +731,6 @@ WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Captive clients -WARNING: untranslated string: Captive menu WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes WARNING: untranslated string: captive diff --git a/doc/language_issues.es b/doc/language_issues.es index 3008a1340..a71988875 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -642,7 +642,6 @@ WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac -WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -1096,12 +1095,6 @@ WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc -WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 -WARNING: untranslated string: ovpn mtu-disc maybe -WARNING: untranslated string: ovpn mtu-disc no -WARNING: untranslated string: ovpn mtu-disc off -WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment -WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push diff --git a/doc/language_issues.fr b/doc/language_issues.fr index c4e7b7d8e..d15b92665 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -651,7 +651,6 @@ WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac -WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -1110,12 +1109,6 @@ WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc -WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 -WARNING: untranslated string: ovpn mtu-disc maybe -WARNING: untranslated string: ovpn mtu-disc no -WARNING: untranslated string: ovpn mtu-disc off -WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment -WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: p2p block diff --git a/doc/language_issues.it b/doc/language_issues.it index d7d11bad6..b5daf564e 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -468,6 +468,12 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 +WARNING: translation string unused: ovpn mtu-disc maybe +WARNING: translation string unused: ovpn mtu-disc no +WARNING: translation string unused: ovpn mtu-disc off +WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment +WARNING: translation string unused: ovpn mtu-disc yes WARNING: translation string unused: ovpn reneg sec WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_mssfix @@ -719,7 +725,6 @@ WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac -WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal diff --git a/doc/language_issues.nl b/doc/language_issues.nl index 51c63b9fa..0a31ec4d1 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -465,6 +465,12 @@ WARNING: translation string unused: ovpn config WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 +WARNING: translation string unused: ovpn mtu-disc maybe +WARNING: translation string unused: ovpn mtu-disc no +WARNING: translation string unused: ovpn mtu-disc off +WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment +WARNING: translation string unused: ovpn mtu-disc yes WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_fragment WARNING: translation string unused: ovpn_mssfix @@ -715,7 +721,6 @@ WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac -WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 3008a1340..a71988875 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -642,7 +642,6 @@ WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac -WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -1096,12 +1095,6 @@ WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc -WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 -WARNING: untranslated string: ovpn mtu-disc maybe -WARNING: untranslated string: ovpn mtu-disc no -WARNING: untranslated string: ovpn mtu-disc off -WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment -WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: ovpn routes push diff --git a/doc/language_issues.ru b/doc/language_issues.ru index e54d87a2b..4305cf566 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -644,7 +644,6 @@ WARNING: untranslated string: Captive generated coupon no WARNING: untranslated string: Captive issued coupons WARNING: untranslated string: Captive logo uploaded WARNING: untranslated string: Captive mac -WARNING: untranslated string: Captive menu WARNING: untranslated string: Captive nolimit WARNING: untranslated string: Captive please accept the terms and conditions WARNING: untranslated string: Captive portal @@ -1095,12 +1094,6 @@ WARNING: untranslated string: ovpn ha WARNING: untranslated string: ovpn hmac WARNING: untranslated string: ovpn mgmt in root range WARNING: untranslated string: ovpn mtu-disc -WARNING: untranslated string: ovpn mtu-disc and mtu not 1500 -WARNING: untranslated string: ovpn mtu-disc maybe -WARNING: untranslated string: ovpn mtu-disc no -WARNING: untranslated string: ovpn mtu-disc off -WARNING: untranslated string: ovpn mtu-disc with mssfix or fragment -WARNING: untranslated string: ovpn mtu-disc yes WARNING: untranslated string: ovpn no connections WARNING: untranslated string: ovpn port in root range WARNING: untranslated string: p2p block diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 75e7432bf..ce218c092 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -1,4 +1,26 @@ WARNING: translation string unused: Async logging enabled +WARNING: translation string unused: Captive 1day +WARNING: translation string unused: Captive 1month +WARNING: translation string unused: Captive 1week +WARNING: translation string unused: Captive activate +WARNING: translation string unused: Captive auth_lic +WARNING: translation string unused: Captive auth_vou +WARNING: translation string unused: Captive err doublevoucher +WARNING: translation string unused: Captive expire +WARNING: translation string unused: Captive heading terms +WARNING: translation string unused: Captive heading voucher +WARNING: translation string unused: Captive invalid coupon +WARNING: translation string unused: Captive invalid logosize +WARNING: translation string unused: Captive invalid_voucher +WARNING: translation string unused: Captive ip +WARNING: translation string unused: Captive logo_set +WARNING: translation string unused: Captive noexpiretime +WARNING: translation string unused: Captive nr +WARNING: translation string unused: Captive please enter a coupon code +WARNING: translation string unused: Captive time +WARNING: translation string unused: Captive voactive +WARNING: translation string unused: Captive voucher +WARNING: translation string unused: Captive vout WARNING: translation string unused: ConnSched scheduler WARNING: translation string unused: ConnSched select profile WARNING: translation string unused: HDD temperature @@ -228,8 +250,6 @@ WARNING: translation string unused: extrahd WARNING: translation string unused: extrahd unable to read WARNING: translation string unused: extrahd unable to write WARNING: translation string unused: filename -WARNING: translation string unused: firewall graphs -WARNING: translation string unused: firewall log viewer WARNING: translation string unused: firmware WARNING: translation string unused: firmware upload WARNING: translation string unused: force update @@ -476,6 +496,12 @@ WARNING: translation string unused: ovpn device WARNING: translation string unused: ovpn dl WARNING: translation string unused: ovpn engines WARNING: translation string unused: ovpn log +WARNING: translation string unused: ovpn mtu-disc and mtu not 1500 +WARNING: translation string unused: ovpn mtu-disc maybe +WARNING: translation string unused: ovpn mtu-disc no +WARNING: translation string unused: ovpn mtu-disc off +WARNING: translation string unused: ovpn mtu-disc with mssfix or fragment +WARNING: translation string unused: ovpn mtu-disc yes WARNING: translation string unused: ovpn reneg sec WARNING: translation string unused: ovpn_fastio WARNING: translation string unused: ovpn_mssfix @@ -699,65 +725,17 @@ WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week-graph WARNING: translation string unused: weekly firewallhits WARNING: translation string unused: wildcards -WARNING: translation string unused: wlanap access point WARNING: translation string unused: wlanap wlan services WARNING: translation string unused: xtaccess all error WARNING: translation string unused: xtaccess bad transfert WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits -WARNING: untranslated string: 24 hours -WARNING: untranslated string: Captive -WARNING: untranslated string: Captive ACTIVATE -WARNING: untranslated string: Captive GAIN ACCESS -WARNING: untranslated string: Captive WiFi coupon -WARNING: untranslated string: Captive activated -WARNING: untranslated string: Captive active on -WARNING: untranslated string: Captive agree tac -WARNING: untranslated string: Captive authentication -WARNING: untranslated string: Captive brand color -WARNING: untranslated string: Captive branding -WARNING: untranslated string: Captive client session expiry time WARNING: untranslated string: Captive clients -WARNING: untranslated string: Captive config -WARNING: untranslated string: Captive coupon -WARNING: untranslated string: Captive expiry time -WARNING: untranslated string: Captive export coupons -WARNING: untranslated string: Captive generate coupons -WARNING: untranslated string: Captive generated coupon no -WARNING: untranslated string: Captive issued coupons -WARNING: untranslated string: Captive logo uploaded -WARNING: untranslated string: Captive mac -WARNING: untranslated string: Captive menu -WARNING: untranslated string: Captive nolimit -WARNING: untranslated string: Captive please accept the terms and conditions -WARNING: untranslated string: Captive portal -WARNING: untranslated string: Captive portal coupons -WARNING: untranslated string: Captive terms -WARNING: untranslated string: Captive terms short -WARNING: untranslated string: Captive title -WARNING: untranslated string: Captive upload logo -WARNING: untranslated string: Captive upload logo recommendations -WARNING: untranslated string: Captive valid for -WARNING: untranslated string: Captive vouchervalid -WARNING: untranslated string: Captive wrong ext WARNING: untranslated string: Scan for Songs -WARNING: untranslated string: application layer gateways WARNING: untranslated string: bytes WARNING: untranslated string: captive -WARNING: untranslated string: dnssec disabled warning -WARNING: untranslated string: eight hours -WARNING: untranslated string: fifteen minutes -WARNING: untranslated string: firewall graph country -WARNING: untranslated string: firewall graph ip -WARNING: untranslated string: firewall graph port -WARNING: untranslated string: firewall log country -WARNING: untranslated string: firewall log ip -WARNING: untranslated string: firewall log port -WARNING: untranslated string: five minutes -WARNING: untranslated string: four hours WARNING: untranslated string: fwhost cust geoipgrp WARNING: untranslated string: fwhost err hostip -WARNING: untranslated string: guardian WARNING: untranslated string: guardian block a host WARNING: untranslated string: guardian block httpd brute-force WARNING: untranslated string: guardian block owncloud brute-force @@ -796,50 +774,9 @@ WARNING: untranslated string: guardian service WARNING: untranslated string: guardian watch snort alertfile WARNING: untranslated string: ike lifetime should be between 1 and 8 hours WARNING: untranslated string: info messages -WARNING: untranslated string: invalid input for inactivity timeout -WARNING: untranslated string: invalid logserver protocol -WARNING: untranslated string: log server protocol WARNING: untranslated string: no data -WARNING: untranslated string: one hour -WARNING: untranslated string: one month -WARNING: untranslated string: one week -WARNING: untranslated string: one year -WARNING: untranslated string: rdns WARNING: untranslated string: route config changed WARNING: untranslated string: routing config added WARNING: untranslated string: routing config changed WARNING: untranslated string: routing table -WARNING: untranslated string: tcp more reliable -WARNING: untranslated string: ten minutes -WARNING: untranslated string: thirty minutes -WARNING: untranslated string: twelve hours -WARNING: untranslated string: two weeks -WARNING: untranslated string: udp less overhead -WARNING: untranslated string: unlimited -WARNING: untranslated string: uplink bit rate -WARNING: untranslated string: vpn broken -WARNING: untranslated string: vpn connecting -WARNING: untranslated string: vpn inactivity timeout -WARNING: untranslated string: vpn on-demand -WARNING: untranslated string: vpn start action -WARNING: untranslated string: vpn start action route -WARNING: untranslated string: vpn start action start WARNING: untranslated string: vpn statistics n2n -WARNING: untranslated string: vpn weak -WARNING: untranslated string: wireless network -WARNING: untranslated string: wlan client anonymous identity -WARNING: untranslated string: wlan client auth auto -WARNING: untranslated string: wlan client auth peap -WARNING: untranslated string: wlan client auth ttls -WARNING: untranslated string: wlan client authentication settings -WARNING: untranslated string: wlan client eap authentication method -WARNING: untranslated string: wlan client eap phase2 method -WARNING: untranslated string: wlan client eap state -WARNING: untranslated string: wlan client encryption eap -WARNING: untranslated string: wlan client identity -WARNING: untranslated string: wlan client method -WARNING: untranslated string: wlan client password -WARNING: untranslated string: wlan client tls cipher -WARNING: untranslated string: wlan client tls version -WARNING: untranslated string: wlanap -WARNING: untranslated string: wlanap configuration diff --git a/doc/language_missings b/doc/language_missings index 218770f33..12929851d 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -3349,112 +3349,3 @@ ############################################################################ # Checking cgi-bin translations for language: tr # ############################################################################ -< 24 hours -< application layer gateways -< Captive -< Captive 1day -< Captive 1month -< Captive 1week -< Captive activate -< Captive ACTIVATE -< Captive activated -< Captive active on -< Captive agree tac -< Captive authentication -< Captive auth_lic -< Captive auth_vou -< Captive brand color -< Captive branding -< Captive client session expiry time -< Captive config -< Captive coupon -< Captive err doublevoucher -< Captive expire -< Captive expiry time -< Captive export coupons -< Captive GAIN ACCESS -< Captive generate coupons -< Captive generated coupon no -< Captive heading terms -< Captive heading voucher -< Captive invalid coupon -< Captive invalid logosize -< Captive invalid_voucher -< Captive ip -< Captive issued coupons -< Captive logo_set -< Captive logo uploaded -< Captive mac -< Captive noexpiretime -< Captive nolimit -< Captive nr -< Captive please accept the terms and conditions -< Captive please enter a coupon code -< Captive portal -< Captive portal coupons -< Captive terms -< Captive terms short -< Captive time -< Captive title -< Captive upload logo -< Captive upload logo recommendations -< Captive valid for -< Captive voactive -< Captive voucher -< Captive vouchervalid -< Captive vout -< Captive WiFi coupon -< Captive wrong ext -< dnssec disabled warning -< eight hours -< fifteen minutes -< firewall graph country -< firewall graph ip -< firewall graph port -< firewall log country -< firewall log ip -< firewall log port -< five minutes -< four hours -< guardian -< invalid input for inactivity timeout -< invalid logserver protocol -< log server protocol -< one hour -< one month -< one week -< one year -< rdns -< tcp more reliable -< ten minutes -< thirty minutes -< twelve hours -< two weeks -< udp less overhead -< unlimited -< uplink bit rate -< vpn broken -< vpn connecting -< vpn inactivity timeout -< vpn on-demand -< vpn start action -< vpn start action route -< vpn start action start -< vpn weak -< wireless network -< wlanap -< wlanap configuration -< wlan client anonymous identity -< wlan client auth auto -< wlan client authentication settings -< wlan client auth peap -< wlan client auth ttls -< wlan client eap authentication method -< wlan client eap phase2 method -< wlan client eap state -< wlan client encryption eap -< wlan client identity -< wlan client method -< wlan client password -< wlan client tls cipher -< wlan client tls version diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 9eb300006..6eb3a7e03 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -1,12 +1,67 @@ %tr = ( %tr, +'24 hours' => '24 Saat', 'Act as' => 'Görev:', 'Add Level7 rule' => 'Seviye7 kuralı ekle', 'Add Port Rule' => 'Bağlantı noktası kuralı ekle', 'Add Rule' => 'Kural ekle', 'Add a route' => 'Yol ekle', 'Async logging enabled' => 'Syslog dosyanın eşzamansız yazmasını aktifleştirin', +'Captive' => 'Giriş Portalı', +'Captive 1day' => '1 gün', +'Captive 1month' => '1 ay', +'Captive 1week' => '1 hafta', +'Captive ACTIVATE' => 'AKTİF', +'Captive GAIN ACCESS' => 'ERİŞİM AL', +'Captive WiFi coupon' => 'WiFi Kuponu', +'Captive activate' => 'Aktif', +'Captive activated' => 'Aktifleştirildi', +'Captive active on' => 'Aktifleştir', +'Captive agree tac' => 'Aşağıda şartlar ve koşulları kabul ediyorum.', +'Captive auth_lic' => 'Lisans', +'Captive auth_vou' => 'Makbuz', +'Captive authentication' => 'Erişim türü', +'Captive brand color' => 'Marka rengi', +'Captive branding' => 'Markalama', +'Captive client session expiry time' => 'Oturum bitiş zamanı', +'Captive config' => 'Ayarlar', +'Captive coupon' => 'Kupon', +'Captive err doublevoucher' => 'Bu kodla bir kupon zaten mevcut', +'Captive expire' => 'Süre Bitimi', +'Captive expiry time' => 'Son Kullanma Zamanı', +'Captive export coupons' => 'Kuponları Dışa Aktar', +'Captive generate coupons' => 'Kupon Oluştur', +'Captive generated coupon no' => 'Kupon sayısı', +'Captive heading terms' => 'Şartlar & Koşullar', +'Captive heading voucher' => 'Kupon veya Erişim Kodu', +'Captive invalid coupon' => 'Geçersiz kupon kodu girdiniz. Lütfen tekrar deneyin.', +'Captive invalid logosize' => 'Yüklenen resim dosyası en az 1280x400 çözünürlüğünde olmalı. 1920x800 pikselden daha büyük olmamalıdır.', +'Captive invalid_voucher' => 'Geçersiz kod. Lütfen tekrar deneyin.', +'Captive ip' => 'IP Adresi', +'Captive issued coupons' => 'Verilen Kuponlar', +'Captive logo uploaded' => 'Logo yüklendi', +'Captive logo_set' => 'Mevcut Logo', +'Captive mac' => 'MAC Adresi', +'Captive noexpiretime' => 'Geçerli bir bağlantı süresi aralığı verilmemiş', +'Captive nolimit' => 'Sınırsız', +'Captive nr' => 'Numara', +'Captive please accept the terms and conditions' => 'Lütfen şartları & koşulları kabul edin', +'Captive please enter a coupon code' => 'Lütfen bir kupon kodu girin', +'Captive portal' => 'IPFire Giriş Portalı', +'Captive portal coupons' => 'Giriş Portal Kuponları', +'Captive terms' => 'Şartlar & Koşullar', +'Captive terms short' => 'Ş&K', +'Captive time' => 'Aktifleştirme sonrası erişim süresi (saat)', +'Captive title' => 'Giriş sayfası başlığı', +'Captive upload logo' => 'Logo yükle', +'Captive upload logo recommendations' => '(PNG veya JPEG, tavsiye edilen 1280x720 piksel)', +'Captive valid for' => 'Geçerli:', +'Captive voactive' => 'Aktif Kuponlar', +'Captive voucher' => 'Kupon', +'Captive vouchervalid' => 'Bu kupon için izin verilen süre', +'Captive vout' => 'Verilen Kuponlar', +'Captive wrong ext' => 'Yüklenen dosya yanlış dosya türüne sahip', 'Choose Rule' => 'Aşağıdaki kurallardan <u>birini</u> seçin.', 'Class' => 'Sınıf', 'Class was deleted' => 'Potansiyel alt sınıfları ile silindi', @@ -369,6 +424,7 @@ 'and' => 've', 'ansi t1.483' => 'KALDIRILACAK', 'apcupsd' => 'APC-UPS durumu', +'application layer gateways' => 'Uygulama Katmanı Ağ Geçitleri', 'apply' => 'Şimdi uygula', 'april' => 'Nisan', 'archive not exist' => 'Yapılandırma arşivi yok', @@ -791,6 +847,7 @@ 'dnsforward forward_server' => 'Ad sunucusu', 'dnsforward zone' => 'Bölge', 'dnssec aware' => 'DNSSEC Farkındalığı', +'dnssec disabled warning' => 'UYARI: DNSSEC devre dışı bırakıldı', 'dnssec information' => 'DNSSEC Bilgisi', 'dnssec not supported' => 'DNSSEC desteklenmiyor', 'dnssec validating' => 'DNSSEC doğrulanıyor', @@ -865,6 +922,7 @@ 'edit share' => 'Paylaşımı düzenle', 'editor' => 'Düzenleyici', 'eg' => 'e.g.:', +'eight hours' => '8 Saat', 'email config' => 'Ayarlar', 'email empty field' => 'Boş alan', 'email error' => 'HATA: Test e-posta gönderilemedi', @@ -953,6 +1011,7 @@ 'false min bandwith' => 'Yanlış en az bant genişliği.', 'february' => 'Şubat', 'fetch ip from' => 'Harici sunucunun yardımıyla tahmini gerçek genel IP', +'fifteen minutes' => '15 Dakika', 'filename' => 'Dosya adı', 'filesystem full' => 'Dolu dosya sistemi', 'fireinfo ipfire version' => 'IPFire sürümü', @@ -973,11 +1032,15 @@ 'fireinfo why read more' => 'nedenleri hakkında bilgi için tıklayın.', 'fireinfo your profile id' => 'Profil kimliğiniz', 'firewall' => 'Güvenlik Duvarı', -'firewall graphs' => 'Güvenlik Duvarı Grafikleri', -'firewall hits' => 'Güvenlik duvarı için toplam kayıt:', -'firewall hits per' => 'güvenlik duvarı başına tıklama', +'firewall graph country' => 'Güvenlik Duvarı-Şeması (Ülke)', +'firewall graph ip' => 'Güvenlik Duvarı-Şeması (IP)', +'firewall graph port' => 'Güvenlik Duvarı-Şeması (Port)', +'firewall hits' => 'Toplam güvenlik duvarı sayısı', +'firewall hits per' => 'en fazla güvenlik duvarı sayısı', 'firewall log' => 'Güvenlik duvarı günlüğü', -'firewall log viewer' => 'Güvenlik Duvarı Günlük Görüntüleyicisi', +'firewall log country' => 'Güvenlik duvarı günlüğü (Ülke)', +'firewall log ip' => 'Güvenlik duvarı günlüğü (IP)', +'firewall log port' => 'Güvenlik duvarı günlüğü (Port)', 'firewall logs' => 'Güvenlik Duvarı Günlükleri', 'firewall logs country' => 'Fw-Günlük Grafikleri (Ülke)', 'firewall logs ip' => 'Gd-Günlük Grafikleri (IP)', @@ -987,6 +1050,7 @@ 'firmware' => 'Yazılım', 'firmware upload' => 'Yazılım/Sürücü Yükle', 'first' => 'İlk', +'five minutes' => '5 Dakika', 'fixed ip lease added' => 'Sabit IP kirası eklendi', 'fixed ip lease modified' => 'Sabit IP kirası güncellendi', 'fixed ip lease removed' => 'Sabit IP kirası kaldırıldı', @@ -997,6 +1061,7 @@ 'forwarding rule added' => 'Yönlendirme kuralı eklendi. Yeniden başlatmayı gönder.', 'forwarding rule removed' => 'Yönlendirme kuralı kaldırıldı. Yeniden başlatmayı gönder.', 'forwarding rule updated' => 'Yönlendirme kuralı güncellendi. Yeniden başlatmayı gönder.', +'four hours' => '4 Saat', 'free' => 'Boş', 'free memory' => 'boş bellek ', 'free swap' => 'boş takas alanı', @@ -1245,6 +1310,7 @@ 'green interface' => 'Yeşil Arabirim', 'grouptype' => 'Grup türü:', 'guaranteed bandwith' => 'Garantili bant genişliği', +'guardian' => 'Guardian', 'guest ok' => 'istemcilere erişim izni', 'gui settings' => 'GUI Ayarları', 'gz with key' => 'Sadece şifreli bir arşiv bu makinede geri yüklenebilir.', @@ -1355,6 +1421,7 @@ 'invalid input for esp keylife' => 'ESP anahtar ömrü için geçersiz giriş.', 'invalid input for hostname' => 'Ana bilgisayar adı için geçersiz giriş.', 'invalid input for ike lifetime' => 'IKE ömür boyu geçersiz giriş.', +'invalid input for inactivity timeout' => 'Hareketsizlik zaman aşımı için geçersiz giriş', 'invalid input for keepalive 1' => 'Ping komutunu canlı tutma için geçersiz giriş.', 'invalid input for keepalive 1:2' => '1:2 oranında, en az bir oranı canlı tutma kullanım için geçersiz giriş', 'invalid input for keepalive 2' => 'Ping komutunu yeniden başlatmada canlı tutmak için geçersiz giriş.', @@ -1371,6 +1438,7 @@ 'invalid loaded file' => 'Geçersiz yüklenen dosya.', 'invalid local-remote id' => 'Uzak ve yerel kimliği eşit olmadığında "@" işareti ile başlamamalıdır. Bu durum strongswan termonolojisinde leftid ve rightid de vardır.', 'invalid logserver address' => 'Geçersiz syslogd sunucu adresi', +'invalid logserver protocol' => 'Geçersiz syslogd sunucu protokolü', 'invalid mac address' => 'Geçersiz MAC adresi.', 'invalid max lease time' => 'Geçersiz en fazla kira süresi.', 'invalid maximum incoming size' => 'Geçersiz en fazla gelen boyut.', @@ -1458,6 +1526,7 @@ 'log level' => 'Günlük seviyesi', 'log lines per page' => 'Sayfa başına satır', 'log server address' => 'Syslog sunucusu:', +'log server protocol' => 'kural:', 'log settings' => 'Günlük Ayarları', 'log summaries' => 'Günlük özetleri', 'log summary' => 'Günlük Özetleri', @@ -1694,6 +1763,10 @@ 'ok' => 'TAMAM', 'older' => 'Eski', 'on' => 'üstünde', +'one hour' => 'Bir Saat', +'one month' => 'Bir Ay', +'one week' => 'Bir Hafta', +'one year' => 'Bir Yıl', 'online help en' => 'Çevrimiçi yardım (ingilizce)', 'only digits allowed in holdoff field' => 'Koruma süresi alanında sadece rakama izin verilir', 'only digits allowed in max retries field' => 'En fazla yeniden deneme alanında sadece rakama izin verilir.', @@ -1929,6 +2002,7 @@ 'quick playlist' => 'Hızlı Oynatıcı', 'ram' => 'RAM', 'random number generator daemon' => 'Rastgele sayı oluşturucu programı', +'rdns' => 'oDNS', 'read bytes' => 'okunan bayt', 'read list' => 'salt okunur bilgisayarlar ile liste', 'real address' => 'Gerçek Adres', @@ -2170,9 +2244,11 @@ 'system logs' => 'Sistem Günlükleri', 'system status information' => 'Sistem Durum Bilgisi', 'ta key' => 'TLS Kimlik Doğrulama Anahtarı', +'tcp more reliable' => 'TCP (daha güvenli)', 'telephone not set' => 'Telefon ayarlanmamış.', 'template' => 'Ön Ayar', 'template warning' => 'QoS kurmak için iki seçeneğiniz vardır. İlk olarak kaydet düğmesine basıp kendi sınıf ve kurallarınızı oluşturabilirsiniz. İkinci olarak ise ön ayar düğmesine basıp sınıf ve kurallar için bir şablonun kurulmasını sağlayın. ', +'ten minutes' => '10 Dakika', 'teovpn_fragment' => 'Bölümleme boyutu', 'test' => 'test', 'test email could not be sent' => 'Test e-posta gönderilemedi', @@ -2183,6 +2259,7 @@ 'there are updates' => 'Sisteminiz için kullanılabilir güncelleştirmeler var. Daha fazla bilgi için "güncelleme" bölümüne gidin.', 'there are updates available' => 'Sisteminiz için kullanılabilir güncelleştirmeler var. Kesinlikle en kısa zamanda bunları yüklemeniz gerekir.', 'there was no file upload' => 'Hiçbir dosya yüklenemedi.', +'thirty minutes' => '30 Dakika', 'this feature has been sponsored by' => 'Bu özelliklerin destekçisi', 'this is not a valid archive' => 'Bu, geçerli bir arşiv değil.', 'this is not an authorised update' => 'Bu yetkili bir güncelleştirme değil.', @@ -2292,7 +2369,10 @@ 'tripwirewarningkeys' => 'UYARI - Geşerli anahtar silinecektir. Bu durum yapılandırma ve veritabanını yeniden oluşturacaktır.', 'tripwirewarningpolicy' => 'UYARI - Kurallar oluşturulduktan sonra veri tabanı yeniden oluşturulacak. Bu nedenle site ve yerel anahtara ihtiyaç vardır.', 'tuesday' => 'Salı', +'twelve hours' => '12 Saat', +'two weeks' => 'İki Hafta', 'type' => 'Tür', +'udp less overhead' => 'UDP (daha az yük)', 'umount' => 'Ayır', 'umount removable media before to unplug' => 'Taşınabilir aygıtı çıkartmadan önce <b>Ayır</b> düğmesi ile sistemden ayırın', 'unable to alter profiles while red is active' => 'KIRMIZI aktifken profil değiştirilemez.', @@ -2307,6 +2387,7 @@ 'unix password sync' => 'Unix Parola Eşitleme', 'unix shell' => 'UNIX kabuğu', 'unknown' => 'BİLİNMEYEN', +'unlimited' => 'Sınırsız', 'unnamed' => 'Adsız', 'update' => 'Güncelle', 'update accelerator' => 'Güncelleme Hızlandırıcı', @@ -2391,6 +2472,7 @@ 'updxlrtr year' => 'Bir yıl', 'upgrade' => 'Yükselt', 'uplink' => 'Yükleme bağlantısı', +'uplink bit rate' => 'Yükleme bit hızı', 'uplink speed' => 'Yükleme hızı (kbit/san)', 'uplink std class' => 'Standart yükleme hızı sınıf', 'upload' => 'Yükle', @@ -2645,10 +2727,13 @@ 'vpn aggrmode' => 'IKE agresif yöntemde izin verildi. Eğer mümkünse kullanmayın (öpaylaşımlı anahtar açık olarak iletiliyor)!', 'vpn altname syntax' => 'Konu Alternatif İsim virgülle ayrılmış e-posta,dns,uri,rid ve ip objeleridir.<br/>e-posta: e-posta adresidir. Kullanımı e-posta:copy e-posta adresini sertifikadan çıkartarak kullanır.<br/>DNS: geçerli alan adı sunucusu.<br/>URI: geçerli bir URI.<br/>RID: kayıtlı nesne tanımlayıcı.<br/>IP: bir IP adresi.<br/>Not: karakter setleri sınırlı ve büyük/küçük harf duyarlıdır.<br/>Örnek:<br/><b>email:</b>ipcop(a)foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipcop.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/dizin/biryer', 'vpn auth-dn' => 'Eş uzak kimlik doğrulama alanında IPV4_ADDR, FQDN, USER_FQDN veya DER_ASN1_DN dizesi ile tanımla', +'vpn broken' => 'Kesik', 'vpn configuration main' => 'VPN yapılandırma - Ana', +'vpn connecting' => 'BAĞLANIYOR', 'vpn delayed start' => 'VPN başlamadan önce bekle (saniye)', 'vpn delayed start help' => 'Eğer gerekirse, bu gecikme Dinamik DNS güncelleştirmelerini düzgün yayılmasına olanak sağlamak için kullanılabilir. 60, KIRMIZI dinamik IP için ortak bir değerdir.', 'vpn force mobike' => 'MOBIKE kullanmaya zorla (sadece IKEv2)', +'vpn inactivity timeout' => 'Hareketsizlik Zaman Aşımı', 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute izin verilmiyor', 'vpn keyexchange' => 'Anahtar değişimi', 'vpn local id' => 'Yerel kimlik', @@ -2658,13 +2743,18 @@ 'vpn on blue' => 'MAVİ üzerindeki VPN', 'vpn on green' => 'YEŞİL üzerindeki VPN', 'vpn on orange' => 'TURUNCU üzerindeki VPN', +'vpn on-demand' => 'İSTEK_ÜZERİNE', 'vpn payload compression' => 'Yük sıkıştırma anlaşması', 'vpn red name' => 'KIRMIZI arabirim veya <%defaultroute> için gerçek IP veya FQDN', 'vpn remote id' => 'Uzak kimlik (ID)', +'vpn start action' => 'Hareketi Başlat', +'vpn start action route' => 'İstek Üzerine', +'vpn start action start' => 'Her Zaman', 'vpn statistic n2n' => 'Ağdan Ağa OpenVPN İstatistiği', 'vpn statistic rw' => 'Roadwarrior OpenVPN İstatistiği', 'vpn subjectaltname' => 'Alternatif konu adı', 'vpn watch' => 'Karşı eş IP değiştirdiğinde (dyndns) ağdan-ağa VPN bağlantısını yeniden başlat. Bu DPD ye yardımcı olur.', +'vpn weak' => 'Hafta', 'waiting to synchronize clock' => 'Saat eşleştirmesi bekleniyor', 'warn when traffic reaches' => 'Trafik x % değere ulaştığında uyar', 'warning messages' => 'Uyarı mesajı', @@ -2687,39 +2777,55 @@ 'wireless config added' => 'Kablosuz ağ yapılandırma eklendi', 'wireless config changed' => 'Kablosuz ağ yapılandırma değiştirildi', 'wireless configuration' => 'Kablosuz ağ ayarları', +'wireless network' => 'WiFi Ağı', 'wlan client' => 'Kablosuz istemci', 'wlan client advanced settings' => 'Gelişmiş ayarlar', 'wlan client and' => 've', +'wlan client anonymous identity' => 'Anonim Kimlik', +'wlan client auth auto' => 'Otomatik', +'wlan client auth peap' => 'PEAP', +'wlan client auth ttls' => 'TTLS', +'wlan client authentication settings' => 'Kimlik Doğrulama Ayarları', 'wlan client bssid' => 'BSSID', 'wlan client ccmp' => 'CCMP', 'wlan client configuration' => 'Kablosuz isdemci Yapılandırması', 'wlan client disconnected' => 'Bağlantı kesildi', 'wlan client duplicate ssid' => 'Yinelenen SSID', +'wlan client eap authentication method' => 'EAP Kimlik Doğrulama Yöntemi', +'wlan client eap phase2 method' => 'EAP Aşama 2 Yöntemi', +'wlan client eap state' => 'EAP Durumu', 'wlan client edit entry' => 'Kablosuz istemci yapılandırmasını düzenle', 'wlan client encryption' => 'Şifreleme', +'wlan client encryption eap' => 'EAP', 'wlan client encryption none' => 'Hiçbiri', 'wlan client encryption wep' => 'WEP', 'wlan client encryption wpa' => 'WPA', 'wlan client encryption wpa2' => 'WPA2', 'wlan client group cipher' => 'Grup şifreleme', 'wlan client group key algorithm' => 'GKA', +'wlan client identity' => 'Kimlik', 'wlan client invalid key length' => 'Geçersiz anahtar uzunluğu.', +'wlan client method' => 'Yöntem', 'wlan client new entry' => 'Yeni kablosuz istemci yapılandırması oluştur', 'wlan client new network' => 'Yeni ağ', 'wlan client pairwise cipher' => 'İkili şifreleme', 'wlan client pairwise key algorithm' => 'PKA', 'wlan client pairwise key group key' => 'İkili anahtar/grup anahtarı', +'wlan client password' => 'Parola', 'wlan client psk' => 'Önceden paylaşılan anahtar', 'wlan client ssid' => 'SSID', 'wlan client tkip' => 'TKIP', +'wlan client tls cipher' => 'TLS Şifresi', +'wlan client tls version' => 'TLS Sürümü', 'wlan client wpa mode' => 'WPA biçimi', 'wlan client wpa mode all' => 'Otomatik', 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP', 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP', 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP', 'wlan clients' => 'Kablosuz istemciler', -'wlanap access point' => 'Access Point', +'wlanap' => 'Erişim Noktası', 'wlanap channel' => 'Kanal', +'wlanap configuration' => 'Erişim Noktası Yapılandırması', 'wlanap country' => 'Ülke Kodu', 'wlanap debugging' => 'Hata ayıklama', 'wlanap del interface' => 'Seçilen arabirim kaldırılsın mı?', diff --git a/lfs/squid-accounting b/lfs/squid-accounting index 9bc75f0f1..ec89dce23 100644 --- a/lfs/squid-accounting +++ b/lfs/squid-accounting @@ -15,7 +15,7 @@ THISAPP = squid-accounting-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = squid-accounting -PAK_VER = 10 +PAK_VER = 11 DEPS = "perl-DBI perl-DBD-SQLite perl-File-ReadBackwards" diff --git a/lfs/wio b/lfs/wio index bb76c9e56..72b867d4a 100644 --- a/lfs/wio +++ b/lfs/wio @@ -15,7 +15,7 @@ THISAPP = wio-$(VER) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = wio -PAK_VER = 2 +PAK_VER = 3 ############################################################################### # Top-level Rules diff --git a/src/squid-accounting/acct.tr.pl b/src/squid-accounting/acct.tr.pl new file mode 100644 index 000000000..2a579b210 --- /dev/null +++ b/src/squid-accounting/acct.tr.pl @@ -0,0 +1,134 @@ +# Added for Squid accounting +%tr = ( +%tr, +'acct action' => 'Eylem', +'acct activate' => 'Aktif', +'acct addresses' => 'Adres yönetimi', +'acct bank' => 'Banka', +'acct bic' => 'BIC', +'acct billarchive' => 'Fatura arşivi', +'acct billgroup' => 'Fatura grupları', +'acct billgroupexists' => 'Bu ad zaten var olan bir fatura grubu adı', +'acct billtext1' => 'Fatura metni', +'acct billnr' => '(her zaman devlet fatura numarası)', +'acct billoverview' => 'Faturaya genel bakış', +'acct blz' => 'Banka kodu', +'acct ccmail' => 'E-Posta CC-Adresleri', +'acct currency' => 'Para birimi (EUR,USD)', +'acct traffic' => 'Trafik', +'acct amount' => 'Tutar', +'acct cent' => 'Fiyat/MB (örneğin 0.003)', +'acct cent1' => 'MB Fiyatı', +'acct city' => 'Şehir', +'acct config' => 'Yapılandırma', +'acct commit' => 'Temizle', +'acct company' => 'Şirket', +'acct companyexists' => 'Bu ad zaten var olan bir şirket adı', +'acct companytype' => 'Tür', +'acct customer' => 'Müşteri', +'acct cust empty' => 'Hiçbir müşteri adresi tanımlı değil', +'acct dbsize' => 'Veri tabanı boyutu', +'acct dbmaintenance' => 'Veri tabanı bakımı', +'acct delbefore' => 'Önce tüm girdileri silin', +'acct deladr' => 'Sil', +'acct edit' => 'Düzenle', +'acct edit_addr' => 'Ekle / Düzenle', +'acct email' => 'E-Posta', +'acct emptydb' => 'Veri tabanını temizle (tüm veriler)', +'acct emptydbtraf' => 'Veri tabanını temizle (sadece trafik verileri)', +'acct empty field' => 'Bu alan boş olmamalıdır: ', +'acct entries' => 'Kayıtlar', +'acct err custdel' => 'Bu adres silinemez. Bir fatura grubunda müşteri olarak tanımlanmaktadır - Fatura grubu', +'acct err hostdel' => 'Bu adres silinemez. Bir fatura grubunda kuruluş olarak tanımlanmaktadır - Fatura grubu', +'acct exst_cust_addr' => 'Müşteri adresleri', +'acct exst_host_addr' => 'Kuruluş adresleri', +'acct expert' => 'Onarım alanını aktifleştir', +'acct expdelbefore' => 'Sil', +'acct fax' => 'Fax', +'acct fix billpos' => 'Fatura grubunun sabit fatura konumları', +'acct gb' => 'GB', +'acct generated' => 'Oluşturuldu', +'acct hint billgrp' => 'Önce bir kuruluş veya müşteri adresi tanımlanmak zorunda', +'acct hint_hoster' => 'Sadece doldurulması gereken "kuruluş" türü', +'acct hrb' => 'HRB-No', +'acct hoster' => 'Kuruluş', +'acct hosts' => 'Genel Ana Bilgisayar', +'acct host empty' => 'Hiç bir kuruluş adresi tanımlı değil', +'acct host detail' => 'Sunucu Detayları', +'acct iban' => 'IBAN', +'acct inet' => 'Internet', +'acct interval' => 'Denetleme aralığı', +'acct invalid' => 'Geçersiz değer:', +'acct invalid billpos' => 'Sabit fatura pozisyonları için tüm alanları doldurmak zorundasınız', +'acct invalid mailip' => 'Posta sunucusunun IP adresi geçersiz', +'acct invalid mailfqdn' => 'Posta sunucusunun FQDN adresi geçersiz', +'acct invalid mailport' => 'Posta sunucusu için geçersiz bağlantı noktası', +'acct invalid png' => 'Geçersiz PNG dosyası', +'acct invalid pngsize' => 'Geçersiz PNG boyutu', +'acct kb' => 'KB', +'acct kto' => 'Hesap numarası', +'acct latestdb' => 'Son VT kaydı', +'acct logging' => 'Günlüğü aktifleştir (/var/log/accounting.log)', +'acct logo' => 'Gerçek logo', +'acct logo upload' => 'Logo Yükle (PNG, en fazla 400x150)', +'acct maintenance' => 'Bakım', +'acct mailaddr' => 'Posta sunucusu adresi', +'acct mailport' => 'Posta sunucusu bağlantı noktası', +'acct mailuser' => 'Kullanıcı adı', +'acct mailpass' => 'Parola', +'acct mailrcpt' => 'E-Posta alıcısı', +'acct mailsender' => 'E-Posta göndericisi', +'acct mailtxt' => 'Fatura e-postası için metin', +'acct mb' => 'MB', +'acct members' => 'Üyeler', +'acct menu' => 'Vekil Sunucu Muhasebesi', +'acct month' => 'Ay', +'acct multiuser' => 'Kullanıcı birden fazla grupta olabilir', +'acct mwst_name' => 'KDV', +'acct mwst' => 'Vergi oranı', +'acct name1' => 'Ad 1', +'acct name2' => 'Ad 2', +'acct nr' => 'RG-No.', +'acct oldestdb' => 'İlk VT kaydı', +'acct not optional' => 'Bu alanların doldurulması zorunludur', +'acct parameter' => 'Parametre', +'acct path' => 'Yol', +'acct pdf billtxt' => 'Fatura', +'acct pdf date' => 'Tarih', +'acct pdf zwsum' => 'Ara toplam', +'acct pdf page' => 'Sayfa', +'acct pdf prov' => 'Gönderen', +'acct pdf sum1' => 'Toplam', +'acct pdf price' => 'Fiyat', +'acct pdf time' => 'Muhasebe', +'acct plz' => 'Posta kodu', +'acct preview' => 'Fatura ön izlemesi', +'acct price pp' => 'Birim fiyatı', +'acct proxy_enable' => 'Lütfen ilkönce vekil sunucuyu aktifleştirin', +'acct pos' => 'Pos cihazı', +'acct sum total' => 'Toplam', +'acct name' => 'Açıklama', +'acct no data' => 'Mevcut veri yok', +'acct rrdsize' => 'Fatura dizinin boyutu', +'acct settings' => 'Muhasebe ayarları', +'acct skipurl' => 'Bu URL adreslerini atla (Intranet)', +'acct status' => 'Durum', +'acct str' => 'Sokak', +'acct str_nr' => 'No', +'acct subject' => 'Konu', +'acct sum' => 'Topla', +'acct task' => 'Görev', +'acct tb' => 'TB', +'acct tel' => 'Telefon', +'acct tls' => 'TLS kullan', +'acct traffic monthly' => 'Aylık veri hacmi', +'acct title' => 'Webproxy muhasebesi', +'acct usemail' => 'Posta ile faturaları gönder', +'acct usermulti' => 'zaten bu grup içinde', +'acct ustid' => 'USt-ID', +'acct edit settings' => 'Ayarları düzenle', +'acct value' => 'Değer', +'acct view' => 'Göster', +'acct year' => 'Yıl' +); +# End Squid accounting diff --git a/src/wio/lang/wio.tr.pl b/src/wio/lang/wio.tr.pl new file mode 100644 index 000000000..fb7137854 --- /dev/null +++ b/src/wio/lang/wio.tr.pl @@ -0,0 +1,157 @@ +%tr = (%tr, +'wio' => 'Kimler Çevrimiçi', +'wio stat' => 'Mevcut durum', +'wio checked' => 'Son kontrol', +'wio name' => 'Bilgisayar adı veya FQDN', +'wio ipadress' => 'IP adresi', +'wio image' => 'Durum', +'wio up' => 'Aktif', +'wio down' => 'Pasif', +'wio err' => 'Hata', +'wio warn' => 'Uayrı', +'wio_import_csv' => 'CSV dosyası', +'wio_import_hosts' => 'Ana bilgisayarı yapılandır (var/ipfire/main/hosts)', +'wio_import_data' => 'İçe aktarma ayarları ', +'wio_import_data1' => ' Düzelt', +'wio_import_data2' => ' İçe aktar', +'wio_import' => 'İçe Aktar', +'wio_import_info' => 'Mesaj', +'wio_import_file' => 'Ayarları içe aktar', +'wio_import_info_csv' => 'Alınacak yeni ayarlar yok!', +'wio settings' => 'Yapılandırma', +'wio enabled' => 'Aktif', +'wio min' => 'dakika', +'wio cron' => 'Kontrol için zaman aralığı', +'wio_ovpn_cron' => 'OpenVPN RW ve IPSec durum kontrolü için zaman aralığı', +'wio_save' => 'Kaydet', +'wio_error' => 'Hata mesajı', +'wio_info' => 'Mesaj', +'wio_back' => 'Geri', +'wio_use' => 'Bu ayarları içe aktar', +'wio_ip_error' => 'Geçersiz IP adresi', +'wio_host_error' => 'Geçersiz bilgisayar adı', +'wio_host_exists' => 'Bu bilgisayar adı zaten kullanılıyor', +'wio_host_empty' => 'Bu bilgisayar adı kayıtlı değil!', +'wio_ip_exists' => 'Bu IP adresi zaten kulllanılıyor.', +'wio_ip_empty' => 'Bu IP adresi kayıtlı değil!', +'wio_import_fixleases' => 'DHCP ayarları (var/ipfire/dhcp/fixleases)', +'wio_import_leases' => 'İçe aktarma ayarları', +'wio network' => 'Ağ', +'wio_refresh' => 'Şimdi tüm istemcileri güncelleştir', +'wio_fqdn_error' => 'Geçersiz Tam Etki Alanı Adı (FQDN)! Lütfen FQDN için özel karakter veya boşluk kullanmayın.', +'wio_edit' => 'Ayarları değiştir', +'wio_dyndns' => 'DynDNS', +'wio_dyndns_hosts' => 'DynDNS adı', +'wio_dyndns_refresh' => 'DynDNS Ana bilgisayar IP güncellemesi', +'wio_dyndns_on' => 'DynDNS ana bilgisayar aktif (pasifleştirmek için tıklayın)', +'wio_dyndns_off' => 'DynDNS ana bilgisayar pasif (aktifleştirmek için tıklayın)', +'wio_dyndns_info' => 'Görünüşe göre internet bağlantısı olan hiçbir kayıtlı IP bulunmamaktadır. İnternete sonraki bağlantıda DNS ana bilgisayar Ip adresi ile bağlantı gerçekleştiriliebilir.', +'wio_no_csv' => 'Dosya .cvs olmayan bir uzantıya sahip', +'wio_no_csv_error' => 'Lütfen dosya adlarında özel karakterler veya boşluk kullanmayın.', +'wio_no_file_selected' => 'Seçili dosya yok!', +'wio_import_infos' => 'İçe aktarma ayarları', +'wio_import_infos_csv' => 'NOT: Sadece "Bu ayarları içe aktar" işaretliyse içe aktarma kabul edilecektir. Çift Ip adresi veya ana bilgisayar adları ile veri kayıtları meydana gelirse yalnızca ilk veri kaydı içe aktarılacak ve diğer veri kayıtları (çift Ip adresleri veya ana bilgisayar adları ile) dikkate alınmayacaktır.', +'enable disable dyndns' => 'DynDNS ana bilgisayar adı aktif veya pasif', +'wio_msg' => 'İstemcilerin durumları incelenerek güncelleniyor ...', +'wio_lanname' => 'LAN bilgisayar adı', +'wio_wanname' => 'WAN bilgisayar adı', +'wio_wancheck' => 'Bağlı olduğu zaman', +'wio_sc_refresh' => 'Şimdi istemcileri güncelleştir', +'wio_edit_settings' => 'İstemci ekle', +'wio_edit_client' => 'İstemci düzenle', +'wio_graphs' => 'Grafiği göster', +'wio_no_graphs' => 'Henüz grafik yok', +'wio_graphs_stat' => 'Diyagram - ', +'wio_vpn_con' => 'VPN - Bağlantı(lar)', +'wio_wan_con' => 'WAN - Bağlantı', +'wio_clients' => 'İstemciler', +'wio click to disable' => 'Aktifleştirildi', +'wio click to enable' => 'Pasifleştirildi', +'wio_net_scan' => 'Ağ tarama', +'wio_net_scan_vl' => 'Tara', +'wio_net_scan_l' => 'ağdaki', +'wio_net_scan_r' => '', +'wio_net_scan_green' => 'yeşil', +'wio_net_scan_blue' => 'mavi', +'wio_net_scan_orange' => 'turuncu', +'wio_net_scan_run' => 'Tara', +'wio_sort_host' => 'Ana bilgisayar adlarına (FQDN) göre sırala', +'wio_sort_ip' => 'IP adreslerine göre sırala', +'wio_logging' => 'Günlüğü aktifleştir (/var/log/messages)', +'wio_no_image' => 'DURUMU YOK', +'wio_ovpn_con' => 'OpenVPN - Bağlantı(lar)', +'wio_ovpn_connected' => 'Bağlı olduğu zaman', +'wio_wan_up' => 'BAĞLI', +'wio_wan_down' => 'BAĞLI DEĞİL', +'wio_n2n' => 'Ağdan-Ağa Bağlantı', +'wio_rw' => 'Sunucudan-Ağa Bağlantı', +'wio_mailremark_enabled' => 'E-postaya istemciden açıklama ekle', +'wio_mail_online_on' => 'Çevrimiçi e-posta aktif (pasifleştirme için tıklayın)', +'wio_mail_online_off' => 'Çevrimiçi e-posta pasif (aktifleştirmek için tıklayın)', +'wio_mail_offline_on' => 'Çevrimdışı e-posta aktif (pasifleştirmek için tıklayın)', +'wio_mail_offline_off' => 'Çevrimdışı e-posta pasif (aktifleştirmek için tıklayın)', +'wio_mail_online' => 'Çevrimiçi e-postayı aktifleştir veya pasifleştir', +'wio_mail_offline' => 'Çevrimdışı e-postayı akitfleştir veya pasifleştir', +'wio_sendemail' => 'E-Posta Gönder', +'wio_hwaddress' => 'Fiziksel adres', +'wio_iface' => 'Arayüz', +'wio_client_enable' => 'Ana bilgisayar aktif', +'wio_ping_send' => 'Ping gönder', +'wio_link_open' => 'üzerinden bağlantıyı aç', +'enable disable client' => 'İstemcileri aktifleştir veya pasifleştir', +'wio_client_on' => 'İstemci aktif (pasifleştirmek için tıklayın)', +'wio_client_off' => 'İstemcisi pasif (aktifleştirmek için tıklayın)', +'wio_webinterface' => 'BAĞLANTI', +'wio_webinterface_link' => 'Bağlantıyı takip et', +'wio_ip' => 'Aktif IP adresine ping gönderin', +'wio_fqdn' => 'Aktif FQDN adresine ping gönderin', +'wio_ip_on' => 'Aktif IP adresine ping gönderin (FQDN aktifleştirmek için tıklayın)', +'wio_fqdn_on' => 'Aktif FQDN adresine ping gönderin (IP aktifleştirmek için tıklayın)', +'wio_client_add' => 'Kullanılan Ayarlar', +'wio_config' => 'İstemci(leri) yapılandır', +'wio_settings_msg' => 'Yapılandırma ayarları', +'wio_settings_msg_hint' => 'Eklentinin başlatılabilmesi için buradaki bazı seçeneklerin seçilmesi gerekir.', +'wio_sub' => 'WIO İstemci-Durup-Eposta', +'wio timeout' => 'Ping zaman aşımı', +'wio sec' => 'saniye', +'wio_add' => 'İstemci ekle', +'wio_no_add' => 'Mevcut istemci', +'wio_id' => '#', +'wio_online' => 'Çevrimiçi', +'wio_offline' => 'Çevrimdışı', +'wio_status' => 'WIO İstemci-Durum', +'wio_mail_style' => 'Kimler çevrimiçi istemci durumunu e-posta olarak gönder', +'wio_mail_smail' => 'Toplam e-posta', +'wio_mail_email' => 'Tek e-posta', +'wio_mail_ovpnrw' => 'OpenVPN RW ve IPSec durumu e-postasını aktifleştir', +'wio_edit_set' => 'Yapılandırma', +'wio_service' => 'Hizmetler', +'wio_dyndns_success' => 'esbit ve tescil edilen DynDNS IP!', +'wio_remove_all' => 'Tüm istemcileri sil', +'wio_remove_all_hint' => 'Tüm istemcileri silmek istediğinizden emin misizniz?', +'wio_remove_client' => 'İstemci sil', +'wio_remove_client_hint' => 'İstemciyi silmek istediğinize emin misiniz?', +'wio_arp_table_entries' => 'ARP-Tablosundan istemci ekleyin', +'wio_activ' => 'Aktif', +'wio_check' => 'Onayla', +'wio_common_name' => 'Uzak Ana Bilgisayar / IP', +'wio_msg_left' => 'Taranıyor', +'wio_msg_green' => 'yeşil', +'wio_msg_blue' => 'mavi', +'wio_msg_orange' => 'turuncu', +'wio_msg_center' => 'ağdaki', +'wio_msg_right' => 'incelenmektedir.', +'wio_msg_hint' => 'Lütfen bekleyin ...', +'wio_last_update' => 'Son güncelleme', +'wio_disable_hint' => 'Dikkat! Bu kontrolden sonra istemciler dahil tüm ayarlar sıfırlanır.!', +'wio_clientremark' => 'Açıklamaları göster', +'wio_already_running' => 'Bu kontrol zaten çalışıyor!', +'wio_error_function' => 'Bu özellik geçici olarak kullanılamıyor çünkü arka planda istemci durumları güncellenmektedir (aktif/pasif)', +'wio_shutdown' => 'Tüm istemciler "çevrimdışı" olduğunda kapat', +'wio_unknown_lan' => 'BİLİNMEYEN', +'wio_red_lan' => 'KIRMIZI', +'wio_search' => 'Yerel ağda aktif ana bilgisayarlar aranıyor...', +'wio_answer' => 'Cevap', +'wio_answer_time' => 'Tepki Süresi', +'wio_scriptruntime' => 'Komut Dosyası Yürütme Süresi', +); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 3509cd985fd5a92de5eb3e3b1bc153fcea2d3d31
by git＠ipfire.org 14 Apr '18

14 Apr '18

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, core120 has been updated via 3509cd985fd5a92de5eb3e3b1bc153fcea2d3d31 (commit) from 98ae3af84418c3f21b0a7365bb5bf780046642f4 (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 3509cd985fd5a92de5eb3e3b1bc153fcea2d3d31 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Sat Apr 14 16:14:31 2018 +0200 bump packages the old packages are linked against removed libs fixes: 11685 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: lfs/htop | 2 +- lfs/iptraf-ng | 2 +- lfs/lcd4linux | 2 +- lfs/nano | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/lfs/htop b/lfs/htop index 6fba6c0bb..fa5d862d7 100644 --- a/lfs/htop +++ b/lfs/htop @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = htop -PAK_VER = 10 +PAK_VER = 11 DEPS = "" diff --git a/lfs/iptraf-ng b/lfs/iptraf-ng index e962b2c5e..f76ff9f33 100644 --- a/lfs/iptraf-ng +++ b/lfs/iptraf-ng @@ -17,7 +17,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iptraf-ng -PAK_VER = 2 +PAK_VER = 3 DEPS = "" diff --git a/lfs/lcd4linux b/lfs/lcd4linux index 31bcf12e6..79e9d5a2e 100644 --- a/lfs/lcd4linux +++ b/lfs/lcd4linux @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/lcd4linux TARGET = $(DIR_INFO)/$(THISAPP) PROG = lcd4linux -PAK_VER = 5 +PAK_VER = 6 DEPS = "dpfhack libmpdclient" diff --git a/lfs/nano b/lfs/nano index 936b4778b..6269ea208 100644 --- a/lfs/nano +++ b/lfs/nano @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nano -PAK_VER = 19 +PAK_VER = 20 DEPS = "" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2c1a6768d0117095b74089d96741f60771f70398
by git＠ipfire.org 14 Apr '18

14 Apr '18

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ff2b65c193321fed8c0d92bd5d46366fefcdd9a0
by git＠ipfire.org 11 Apr '18

11 Apr '18

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 ff2b65c193321fed8c0d92bd5d46366fefcdd9a0 (commit) via 4217b4b6d84501ab437dfc0f2c8e711e8816e643 (commit) from c79cbc15941fb4f950fbb7aad6c98fd1344bf348 (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 ff2b65c193321fed8c0d92bd5d46366fefcdd9a0 Author: Wolfgang Apolinarski <wolfgang.apolinarski(a)ipfire.org> Date: Fri Apr 6 07:11:03 2018 +0200 Updated Apache 2.4 - Updated Apache from 2.4.29 to 2.4.33 - Updated Apr from 1.6.1 to 1.6.3 - Updated Apr-Util from 1.6.0 to 1.6.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 4217b4b6d84501ab437dfc0f2c8e711e8816e643 Author: Matthias Fischer <matthias.fischer(a)ipfire.org> Date: Fri Apr 6 13:48:19 2018 +0200 beep 1.3: Fixes for CVE-2018-0492 For details see: https://src.fedoraproject.org/cgit/rpms/beep.git https://cve.mitre.org/cgi-bin/cvename.cgi?name=2018-0492 Best, Matthias Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/apache2 | 5 + config/rootfiles/common/apr | 2 +- config/rootfiles/common/aprutil | 2 +- lfs/apache2 | 4 +- lfs/apr | 6 +- lfs/aprutil | 6 +- lfs/beep | 11 +- src/patches/beep/0001-Fixed-Makefile.patch | 44 ++++++++ .../beep/0002-Add-more-error-detection.patch | 44 ++++++++ ...-also-catch-SIGTERM-for-stopping-the-beep.patch | 32 ++++++ ...-install-more-user-and-packaging-friendly.patch | 85 +++++++++++++++ ...reserve-file-modification-time-on-install.patch | 32 ++++++ .../beep/0007-Fix-identation-if-brace-error.patch | 41 ++++++++ ...8-Apply-CVE-2018-0492-from-Debian-package.patch | 117 +++++++++++++++++++++ 14 files changed, 420 insertions(+), 11 deletions(-) create mode 100644 src/patches/beep/0001-Fixed-Makefile.patch create mode 100644 src/patches/beep/0002-Add-more-error-detection.patch create mode 100644 src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch create mode 100644 src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch create mode 100644 src/patches/beep/0006-Preserve-file-modification-time-on-install.patch create mode 100644 src/patches/beep/0007-Fix-identation-if-brace-error.patch create mode 100644 src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index b7d471fe9..d10c4f138 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -910,6 +910,8 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_macro.html #srv/web/ipfire/manual/mod/mod_macro.html.en #srv/web/ipfire/manual/mod/mod_macro.html.fr +#srv/web/ipfire/manual/mod/mod_md.html +#srv/web/ipfire/manual/mod/mod_md.html.en #srv/web/ipfire/manual/mod/mod_mime.html #srv/web/ipfire/manual/mod/mod_mime.html.en #srv/web/ipfire/manual/mod/mod_mime.html.fr @@ -968,6 +970,8 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mod_proxy_scgi.html #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.en #srv/web/ipfire/manual/mod/mod_proxy_scgi.html.fr +#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html +#srv/web/ipfire/manual/mod/mod_proxy_uwsgi.html.en #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html #srv/web/ipfire/manual/mod/mod_proxy_wstunnel.html.en #srv/web/ipfire/manual/mod/mod_ratelimit.html @@ -1609,6 +1613,7 @@ usr/lib/apache/mod_proxy_hcheck.so usr/lib/apache/mod_proxy_html.so usr/lib/apache/mod_proxy_http.so usr/lib/apache/mod_proxy_scgi.so +usr/lib/apache/mod_proxy_uwsgi.so usr/lib/apache/mod_proxy_wstunnel.so usr/lib/apache/mod_ratelimit.so usr/lib/apache/mod_reflector.so diff --git a/config/rootfiles/common/apr b/config/rootfiles/common/apr index c71ee01cc..dfde82400 100644 --- a/config/rootfiles/common/apr +++ b/config/rootfiles/common/apr @@ -44,7 +44,7 @@ usr/bin/apr-1-config #usr/lib/libapr-1.la #usr/lib/libapr-1.so usr/lib/libapr-1.so.0 -usr/lib/libapr-1.so.0.6.2 +usr/lib/libapr-1.so.0.6.3 #usr/lib/pkgconfig/apr-1.pc #usr/share/apr-1 #usr/share/apr-1/build diff --git a/config/rootfiles/common/aprutil b/config/rootfiles/common/aprutil index e9cf3e0da..8bc51ed00 100644 --- a/config/rootfiles/common/aprutil +++ b/config/rootfiles/common/aprutil @@ -43,5 +43,5 @@ usr/lib/apr-util-1/apr_crypto_openssl.so #usr/lib/libaprutil-1.la #usr/lib/libaprutil-1.so usr/lib/libaprutil-1.so.0 -usr/lib/libaprutil-1.so.0.6.0 +usr/lib/libaprutil-1.so.0.6.1 #usr/lib/pkgconfig/apr-util-1.pc diff --git a/lfs/apache2 b/lfs/apache2 index 28855fdc5..69b05341d 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@ include Config -VER = 2.4.29 +VER = 2.4.33 THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 0c599404ef6b69eee95bcd9fcd094407 +$(DL_FILE)_MD5 = 6ef469d3f16fffeb688bc6e0346823e5 install : $(TARGET) diff --git a/lfs/apr b/lfs/apr index 6f667cffc..47c21a325 100644 --- a/lfs/apr +++ b/lfs/apr @@ -25,11 +25,11 @@ include Config -VER = 1.6.2 +VER = 1.6.3 THISAPP = apr-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = http://archive.apache.org/dist/apr +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e81a851967c79b5ce9bfbc909e4bf735 +$(DL_FILE)_MD5 = 12f2a349483ad6f12db49ba01fbfdbfa install : $(TARGET) diff --git a/lfs/aprutil b/lfs/aprutil index c2f808422..29ec5df43 100644 --- a/lfs/aprutil +++ b/lfs/aprutil @@ -25,11 +25,11 @@ include Config -VER = 1.6.0 +VER = 1.6.1 THISAPP = apr-util-$(VER) DL_FILE = $(THISAPP).tar.bz2 -DL_FROM = http://archive.apache.org/dist/apr +DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 069a9a980776acab05212c5f37ef8368 +$(DL_FILE)_MD5 = 8ff5dc36fa39a2a3db1df196d3ed6086 install : $(TARGET) diff --git a/lfs/beep b/lfs/beep index 437677b73..c7d63134c 100644 --- a/lfs/beep +++ b/lfs/beep @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2018 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 # @@ -70,6 +70,15 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0001-Fixed-Makefile.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0002-Add-more-error-detection.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0006-Preserve-file-modification-time-on-install.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0007-Fix-identation-if-brace-error.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch + cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && install -m 0755 beep /usr/bin @rm -rf $(DIR_APP) diff --git a/src/patches/beep/0001-Fixed-Makefile.patch b/src/patches/beep/0001-Fixed-Makefile.patch new file mode 100644 index 000000000..6b35ab0a9 --- /dev/null +++ b/src/patches/beep/0001-Fixed-Makefile.patch @@ -0,0 +1,44 @@ +From 8b32b8b088be1f29e8bfea57a97b9bfaa76ec8ee Mon Sep 17 00:00:00 2001 +From: Chris Wong <chrisyco(a)gmail.com> +Date: Wed, 23 Nov 2011 10:39:53 +1300 +Subject: [PATCH] Fixed Makefile + +* Use /usr/share/man (see http://www.pathname.com/fhs/2.2/fhs-4.11.html#4.11.5) + +* Removed trailing spaces + +* Added optimization flag (must beep FAST!!!) +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index cc359c4..0f4f810 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,19 +1,19 @@ + CC=gcc +-FLAGS=-Wall ++FLAGS=-Wall -O2 + EXEC_NAME=beep + INSTALL_DIR=/usr/bin + MAN_FILE=beep.1.gz +-MAN_DIR=/usr/man/man1 ++MAN_DIR=/usr/share/man/man1 + + default : beep + +-clean : ++clean : + rm ${EXEC_NAME} + + beep : beep.c + ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c + +-install : ++install : + cp ${EXEC_NAME} ${INSTALL_DIR} + # rm -f /usr/man/man1/beep.1.bz2 + cp ${MAN_FILE} ${MAN_DIR} +-- +2.7.5 diff --git a/src/patches/beep/0002-Add-more-error-detection.patch b/src/patches/beep/0002-Add-more-error-detection.patch new file mode 100644 index 000000000..733af9b15 --- /dev/null +++ b/src/patches/beep/0002-Add-more-error-detection.patch @@ -0,0 +1,44 @@ +From d3aee6c489852108c91dc22abcacff364e9429f2 Mon Sep 17 00:00:00 2001 +From: Chris Wong <chrisyco(a)gmail.com> +Date: Wed, 23 Nov 2011 11:34:55 +1300 +Subject: [PATCH] Add more error detection + +--- + beep.c | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/beep.c b/beep.c +index 452fc08..14fac3e 100644 +--- a/beep.c ++++ b/beep.c +@@ -98,11 +98,11 @@ char *console_device = NULL; + + + void do_beep(int freq) { +- if (console_type == BEEP_TYPE_CONSOLE) { +- if(ioctl(console_fd, KIOCSOUND, freq != 0 +- ? (int)(CLOCK_TICK_RATE/freq) +- : freq) < 0) { +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ ++ int period = (freq != 0 ? (int)(CLOCK_TICK_RATE/freq) : freq); ++ ++ if(console_type == BEEP_TYPE_CONSOLE) { ++ if(ioctl(console_fd, KIOCSOUND, period) < 0) { ++ putchar('\a'); /* Output the only beep we can, in an effort to fall back on usefulness */ + perror("ioctl"); + } + } else { +@@ -113,7 +113,10 @@ void do_beep(int freq) { + e.code = SND_TONE; + e.value = freq; + +- write(console_fd, &e, sizeof(struct input_event)); ++ if(write(console_fd, &e, sizeof(struct input_event)) < 0) { ++ putchar('\a'); /* See above */ ++ perror("write"); ++ } + } + } + +-- +2.7.5 diff --git a/src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch b/src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch new file mode 100644 index 000000000..c11061e6a --- /dev/null +++ b/src/patches/beep/0004-also-catch-SIGTERM-for-stopping-the-beep.patch @@ -0,0 +1,32 @@ +From e1320c1da52ca92aa68b4224f9532982184fbe00 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=A9r=C3=B4me?= <jerome(a)jolimont.fr> +Date: Thu, 7 Feb 2013 12:54:53 +0100 +Subject: [PATCH] also catch SIGTERM for stopping the beep + +Signed-off-by: Gerfried Fuchs <rhonda(a)deb.at> +--- + beep.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/beep.c b/beep.c +index 452fc08..9cb63bf 100644 +--- a/beep.c ++++ b/beep.c +@@ -130,6 +130,7 @@ void handle_signal(int signum) { + + switch(signum) { + case SIGINT: ++ case SIGTERM: + if(console_fd >= 0) { + /* Kill the sound, quit gracefully */ + do_beep(0); +@@ -324,6 +325,7 @@ int main(int argc, char **argv) { + parms->next = NULL; + + signal(SIGINT, handle_signal); ++ signal(SIGTERM, handle_signal); + parse_command_line(argc, argv, parms); + + /* this outermost while loop handles the possibility that -n/--new has been +-- +2.7.5 diff --git a/src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch b/src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch new file mode 100644 index 000000000..9e2b481b3 --- /dev/null +++ b/src/patches/beep/0005-Make-build-install-more-user-and-packaging-friendly.patch @@ -0,0 +1,85 @@ +From 947a7e332908dcba1c7e523fbdc927d39ee6adb1 Mon Sep 17 00:00:00 2001 +From: Hans Ulrich Niedermann <hun(a)n-dimensional.de> +Date: Tue, 19 Nov 2013 23:40:50 +0100 +Subject: [PATCH] Make build/install more user and packaging friendly + +Make the build and install more user and packaging friendly +by introducing the following features in the Makefile: + + * Honor the $(CFLAGS) set when calling make. + + * Prefix all install locations with $(DESTDIR) for + easy package building. + + * Use GNU Makefile conventions for defining installation + directories. This means $(bindir) and $(man1dir) + instead of the former $(INSTALL_DIR) and $(MAN_DIR). + + * Use install(1) for installing files and directories + so that permissions can be set properly. + + * Stop "make clean" failing when it has nothing to do. + + * Add 'uninstall' make target. + + * Make 'install' target build executable if necessary. +--- + Makefile | 40 +++++++++++++++++++++++++++++----------- + 1 file changed, 29 insertions(+), 11 deletions(-) + +diff --git a/Makefile b/Makefile +index 0f4f810..942a7a5 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,19 +1,37 @@ + CC=gcc + FLAGS=-Wall -O2 ++ ++INSTALL=install ++ + EXEC_NAME=beep +-INSTALL_DIR=/usr/bin + MAN_FILE=beep.1.gz +-MAN_DIR=/usr/share/man/man1 + +-default : beep ++# Use GNU makefile conventions for directory names with one notable ++# exception: prefix is not /usr/local in order to keep the default ++# installation location for beep. ++prefix=/usr ++exec_prefix=$(prefix) ++bindir=$(exec_prefix)/bin ++datarootdir=$(prefix)/share ++mandir=$(datarootdir)/man ++man1dir=$(mandir)/man1 ++ ++.PHONY: all ++all: $(EXEC_NAME) ++ ++.PHONY: clean ++clean: ++ rm -f $(EXEC_NAME) + +-clean : +- rm ${EXEC_NAME} ++$(EXEC_NAME): beep.c ++ $(CC) $(FLAGS) $(CFLAGS) -o $(EXEC_NAME) beep.c + +-beep : beep.c +- ${CC} ${FLAGS} -o ${EXEC_NAME} beep.c ++install: all ++ $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir) ++ $(INSTALL) -m 0755 $(EXEC_NAME) $(DESTDIR)$(bindir)/ ++ $(INSTALL) -m 0755 -d $(DESTDIR)$(man1dir) ++ $(INSTALL) -m 0644 $(MAN_FILE) $(DESTDIR)$(man1dir)/ + +-install : +- cp ${EXEC_NAME} ${INSTALL_DIR} +- # rm -f /usr/man/man1/beep.1.bz2 +- cp ${MAN_FILE} ${MAN_DIR} ++uninstall: ++ rm -f $(DESTDIR)$(bindir)/$(EXEC_NAME) ++ rm -f $(DESTDIR)$(man1dir)/$(MAN_FILE) +-- +2.7.5 + diff --git a/src/patches/beep/0006-Preserve-file-modification-time-on-install.patch b/src/patches/beep/0006-Preserve-file-modification-time-on-install.patch new file mode 100644 index 000000000..fe844e6f1 --- /dev/null +++ b/src/patches/beep/0006-Preserve-file-modification-time-on-install.patch @@ -0,0 +1,32 @@ +From 4622dd15dc12dab47a0381a8a7188f0f0421e01d Mon Sep 17 00:00:00 2001 +From: Hans Ulrich Niedermann <hun(a)n-dimensional.de> +Date: Wed, 20 Nov 2013 00:00:54 +0100 +Subject: [PATCH] Preserve file modification time on install + +Add -p option to install(1) invocation in order to preserve +the timestamps of the files being installed. +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 942a7a5..290b8a4 100644 +--- a/Makefile ++++ b/Makefile +@@ -27,10 +27,10 @@ $(EXEC_NAME): beep.c + $(CC) $(FLAGS) $(CFLAGS) -o $(EXEC_NAME) beep.c + + install: all +- $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir) +- $(INSTALL) -m 0755 $(EXEC_NAME) $(DESTDIR)$(bindir)/ +- $(INSTALL) -m 0755 -d $(DESTDIR)$(man1dir) +- $(INSTALL) -m 0644 $(MAN_FILE) $(DESTDIR)$(man1dir)/ ++ $(INSTALL) -m 0755 -d $(DESTDIR)$(bindir) ++ $(INSTALL) -m 0755 -p $(EXEC_NAME) $(DESTDIR)$(bindir)/ ++ $(INSTALL) -m 0755 -d $(DESTDIR)$(man1dir) ++ $(INSTALL) -m 0644 -p $(MAN_FILE) $(DESTDIR)$(man1dir)/ + + uninstall: + rm -f $(DESTDIR)$(bindir)/$(EXEC_NAME) +-- +2.7.5 diff --git a/src/patches/beep/0007-Fix-identation-if-brace-error.patch b/src/patches/beep/0007-Fix-identation-if-brace-error.patch new file mode 100644 index 000000000..30ec41406 --- /dev/null +++ b/src/patches/beep/0007-Fix-identation-if-brace-error.patch @@ -0,0 +1,41 @@ +From 35ba84dccb8fc8dc43cb3f575904a33ffa27e7b7 Mon Sep 17 00:00:00 2001 +From: Hans Ulrich Niedermann <hun(a)n-dimensional.de> +Date: Tue, 3 Apr 2018 19:11:07 +0200 +Subject: [PATCH] Fix indentation/if brace error + +As beep.c is not Python, the code blocks must be defined by +using braces instead of just indenting them differently. + +Once we do that, the outcome of multiple -f parameters will +actually match what the warning message documents beep does: +Only the last -f value will be used. + +Many projects proscribe using braces everywhere, but this +change keeps the beep.c coding style of using braces only +when absolutely necessary. + +This issue was discovered by compiling with gcc 6. +--- + beep.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/beep.c b/beep.c +index 7da2e70..d46adc8 100644 +--- a/beep.c ++++ b/beep.c +@@ -194,11 +194,12 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { + if(!sscanf(optarg, "%f", &argfreq) || (argfreq >= 20000 /* ack! */) || + (argfreq <= 0)) + usage_bail(argv[0]); +- else ++ else { + if (result->freq != 0) + fprintf(stderr, "WARNING: multiple -f values given, only last " + "one is used.\n"); + result->freq = argfreq; ++ } + break; + case 'l' : /* length */ + if(!sscanf(optarg, "%d", &argval) || (argval < 0)) +-- +2.7.5 diff --git a/src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch b/src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch new file mode 100644 index 000000000..ac1f0b514 --- /dev/null +++ b/src/patches/beep/0008-Apply-CVE-2018-0492-from-Debian-package.patch @@ -0,0 +1,117 @@ +From 3b67473e16aaf2f83cb8ac18c13c9183a8e3c7b2 Mon Sep 17 00:00:00 2001 +From: Hans Ulrich Niedermann <hun(a)n-dimensional.de> +Date: Tue, 3 Apr 2018 18:37:33 +0200 +Subject: [PATCH] Apply CVE-2018-0492.patch from Debian package + +--- + beep.c | 53 ++++++++++++++++++++++++----------------------------- + 1 file changed, 24 insertions(+), 29 deletions(-) + +diff --git a/beep.c b/beep.c +index d46adc8..f6781e8 100644 +--- a/beep.c ++++ b/beep.c +@@ -109,6 +109,7 @@ void do_beep(int freq) { + /* BEEP_TYPE_EVDEV */ + struct input_event e; + ++ memset(&e, 0, sizeof(e)); + e.type = EV_SND; + e.code = SND_TONE; + e.value = freq; +@@ -124,10 +125,6 @@ void do_beep(int freq) { + /* If we get interrupted, it would be nice to not leave the speaker beeping in + perpetuity. */ + void handle_signal(int signum) { +- +- if(console_device) +- free(console_device); +- + switch(signum) { + case SIGINT: + case SIGTERM: +@@ -258,7 +255,7 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { + result->verbose = 1; + break; + case 'e' : /* also --device */ +- console_device = strdup(optarg); ++ console_device = optarg; + break; + case 'h' : /* notice that this is also --help */ + default : +@@ -277,26 +274,6 @@ void play_beep(beep_parms_t parms) { + "%d delay after) @ %.2f Hz\n", + parms.reps, parms.length, parms.delay, parms.end_delay, parms.freq); + +- /* try to snag the console */ +- if(console_device) +- console_fd = open(console_device, O_WRONLY); +- else +- if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) +- console_fd = open("/dev/vc/0", O_WRONLY); +- +- if(console_fd == -1) { +- fprintf(stderr, "Could not open %s for writing\n", +- console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); +- printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ +- perror("open"); +- exit(1); +- } +- +- if (ioctl(console_fd, EVIOCGSND(0)) != -1) +- console_type = BEEP_TYPE_EVDEV; +- else +- console_type = BEEP_TYPE_CONSOLE; +- + /* Beep */ + for (i = 0; i < parms.reps; i++) { /* start beep */ + do_beep(parms.freq); +@@ -306,8 +283,6 @@ void play_beep(beep_parms_t parms) { + if(parms.end_delay || (i+1 < parms.reps)) + usleep(1000*parms.delay); /* wait... */ + } /* repeat. */ +- +- close(console_fd); + } + + +@@ -329,6 +304,26 @@ int main(int argc, char **argv) { + signal(SIGTERM, handle_signal); + parse_command_line(argc, argv, parms); + ++ /* try to snag the console */ ++ if(console_device) ++ console_fd = open(console_device, O_WRONLY); ++ else ++ if((console_fd = open("/dev/tty0", O_WRONLY)) == -1) ++ console_fd = open("/dev/vc/0", O_WRONLY); ++ ++ if(console_fd == -1) { ++ fprintf(stderr, "Could not open %s for writing\n", ++ console_device != NULL ? console_device : "/dev/tty0 or /dev/vc/0"); ++ printf("\a"); /* Output the only beep we can, in an effort to fall back on usefulness */ ++ perror("open"); ++ exit(1); ++ } ++ ++ if (ioctl(console_fd, EVIOCGSND(0)) != -1) ++ console_type = BEEP_TYPE_EVDEV; ++ else ++ console_type = BEEP_TYPE_CONSOLE; ++ + /* this outermost while loop handles the possibility that -n/--new has been + used, i.e. that we have multiple beeps specified. Each iteration will + play, then free() one parms instance. */ +@@ -366,8 +361,8 @@ int main(int argc, char **argv) { + parms = next; + } + +- if(console_device) +- free(console_device); ++ close(console_fd); ++ console_fd = -1; + + return EXIT_SUCCESS; + } +-- +2.7.5 hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, core120, updated. 98ae3af84418c3f21b0a7365bb5bf780046642f4
by git＠ipfire.org 09 Apr '18

09 Apr '18

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, core120 has been updated via 98ae3af84418c3f21b0a7365bb5bf780046642f4 (commit) via c79cbc15941fb4f950fbb7aad6c98fd1344bf348 (commit) via f5b2d0a14a5e109948bc0d024ffcba63cffcab48 (commit) from a554acea163fa51e0a9e5081003e4148ffdfc24b (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 98ae3af84418c3f21b0a7365bb5bf780046642f4 Merge: a554acea1 c79cbc159 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Mon Apr 9 22:25:53 2018 +0200 Merge branch 'master' into core120 ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/120/update.sh | 12 +++++ html/cgi-bin/ovpnmain.cgi | 101 ------------------------------------ 2 files changed, 12 insertions(+), 101 deletions(-) Difference in files: diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh index 459262c86..1ba9df96f 100644 --- a/config/rootfiles/core/120/update.sh +++ b/config/rootfiles/core/120/update.sh @@ -58,6 +58,9 @@ if [ -e /var/ipfire/ovpn/server.conf ]; then sed -i -e 's/script-security 3 system/script-security 3/' \ -e '/status .*/ a ncp-disable' /var/ipfire/ovpn/server.conf + # Disable Path MTU discovery settings + sed -e "/^mtu-disc/d" -i /var/ipfire/ovpn/server.conf + # Update the OpenVPN CRL openssl ca -gencrl -keyfile /var/ipfire/ovpn/ca/cakey.pem \ -cert /var/ipfire/ovpn/ca/cacert.pem \ @@ -67,6 +70,15 @@ if [ -e /var/ipfire/ovpn/server.conf ]; then /usr/local/bin/openvpnctrl -s fi +# Update OpenVPN N2N configurations +/usr/local/bin/openvpnctrl -kn2n + +for file in /var/ipfire/ovpn/n2nconf/*/*.conf; do + sed -e "/^mtu-disc/d" -i ${file} +done + +/usr/local/bin/openvpnctrl -sn2n + # Start services /etc/init.d/apache restart /etc/init.d/unbound restart diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index ff3d05509..94e723ba2 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -92,7 +92,6 @@ $cgiparams{'ROUTES_PUSH'} = ''; $cgiparams{'DCOMPLZO'} = 'off'; $cgiparams{'MSSFIX'} = ''; $cgiparams{'number'} = ''; -$cgiparams{'PMTU_DISCOVERY'} = ''; $cgiparams{'DCIPHER'} = ''; $cgiparams{'DAUTH'} = ''; $cgiparams{'TLSAUTH'} = ''; @@ -234,10 +233,6 @@ sub writeserverconf { { print CONF "tun-mtu 1500\n"; } elsif ($sovpnsettings{'FRAGMENT'} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') { print CONF "tun-mtu 1500\n"; } - elsif (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) - { print CONF "tun-mtu 1500\n"; } else { print CONF "tun-mtu $sovpnsettings{'DMTU'}\n"; } @@ -277,13 +272,6 @@ sub writeserverconf { print CONF "fragment $sovpnsettings{'FRAGMENT'}\n"; } - # Check if a valid operating mode has been choosen and use it. - if (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) { - print CONF "mtu-disc $sovpnsettings{'PMTU_DISCOVERY'}\n"; - } - if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) { print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n"; } @@ -755,7 +743,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'}; $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'}; $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'}; - $vpnsettings{'PMTU_DISCOVERY'} = $cgiparams{'PMTU_DISCOVERY'}; $vpnsettings{'DAUTH'} = $cgiparams{'DAUTH'}; $vpnsettings{'TLSAUTH'} = $cgiparams{'TLSAUTH'}; my @temp=(); @@ -777,16 +764,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'}; } - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - - if (($cgiparams{'MSSFIX'} eq 'on') || ($cgiparams{'FRAGMENT'} ne '')) { - $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; - goto ADV_ERROR; - } - } - if ($cgiparams{'DHCP_DOMAIN'} ne ''){ unless (&General::validdomainname($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) { $errormessage = $Lang::tr{'invalid input for dhcp domain'}; @@ -952,16 +929,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; }; } - # Check if a valid operating mode has been choosen and use it. - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) { - if($cgiparams{'MTU'} eq '1500') { - print SERVERCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n"; - } - } - } print SERVERCONF "# Auth. Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; @@ -1058,16 +1025,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; }; } - # Check if a valid operating mode has been choosen and use it. - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) { - if ($cgiparams{'MTU'} eq '1500') { - print CLIENTCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n"; - } - } - } # Check host certificate if X509 is RFC3280 compliant. # If not, old --ns-cert-type directive will be used. # If appropriate key usage extension exists, new --remote-cert-tls directive will be used. @@ -2279,10 +2236,6 @@ else { print CLIENTCONF "tun-mtu 1500\r\n"; } elsif ($vpnsettings{MSSFIX} eq 'on') { print CLIENTCONF "tun-mtu 1500\r\n"; } - elsif (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) - { print CLIENTCONF "tun-mtu 1500\r\n"; } else { print CLIENTCONF "tun-mtu $vpnsettings{'DMTU'}\r\n"; } @@ -2382,15 +2335,6 @@ else print CLIENTCONF "fragment $vpnsettings{'FRAGMENT'}\r\n"; } - # Check if a valid operating mode has been choosen and use it. - if (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) { - if(($vpnsettings{MSSFIX} ne 'on') || ($vpnsettings{FRAGMENT} eq '')) { - print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\r\n"; - } - } - if ($include_certs) { print CLIENTCONF "\r\n"; @@ -2668,9 +2612,6 @@ ADV_ERROR: if ($cgiparams{'LOG_VERB'} eq '') { $cgiparams{'LOG_VERB'} = '3'; } - if ($cgiparams{'PMTU_DISCOVERY'} eq '') { - $cgiparams{'PMTU_DISCOVERY'} = 'off'; - } if ($cgiparams{'DAUTH'} eq '') { $cgiparams{'DAUTH'} = 'SHA512'; } @@ -2689,7 +2630,6 @@ ADV_ERROR: $checked{'MSSFIX'}{'off'} = ''; $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; - $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; $selected{'LOG_VERB'}{'0'} = ''; $selected{'LOG_VERB'}{'1'} = ''; $selected{'LOG_VERB'}{'2'} = ''; @@ -2812,14 +2752,6 @@ print <<END; <td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' size='10' /></td> <td><input type='TEXT' name='KEEPALIVE_2' value='$cgiparams{'KEEPALIVE_2'}' size='10' /></td> </tr> - - <tr> - <td class='base'>$Lang::tr{'ovpn mtu-disc'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'}</td> - </tr> </table> <hr size='1'> @@ -3650,7 +3582,6 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'CCD_DNS1'} = $confighash{$cgiparams{'KEY'}}[35]; $cgiparams{'CCD_DNS2'} = $confighash{$cgiparams{'KEY'}}[36]; $cgiparams{'CCD_WINS'} = $confighash{$cgiparams{'KEY'}}[37]; - $cgiparams{'PMTU_DISCOVERY'} = $confighash{$cgiparams{'KEY'}}[38]; $cgiparams{'DAUTH'} = $confighash{$cgiparams{'KEY'}}[39]; $cgiparams{'DCIPHER'} = $confighash{$cgiparams{'KEY'}}[40]; $cgiparams{'TLSAUTH'} = $confighash{$cgiparams{'KEY'}}[41]; @@ -3919,22 +3850,6 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } - if ($cgiparams{'PMTU_DISCOVERY'} ne 'off') { - if (($cgiparams{'FRAGMENT'} ne '') || ($cgiparams{'MSSFIX'} eq 'on')) { - $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; - } - } - - if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') && ($cgiparams{'MTU'} ne '1500')) { - $errormessage = $Lang::tr{'ovpn mtu-disc and mtu not 1500'}; - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; - } - if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix local subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -4378,7 +4293,6 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[35] = $cgiparams{'CCD_DNS1'}; $confighash{$key}[36] = $cgiparams{'CCD_DNS2'}; $confighash{$key}[37] = $cgiparams{'CCD_WINS'}; - $confighash{$key}[38] = $cgiparams{'PMTU_DISCOVERY'}; $confighash{$key}[39] = $cgiparams{'DAUTH'}; $confighash{$key}[40] = $cgiparams{'DCIPHER'}; @@ -4494,7 +4408,6 @@ if ($cgiparams{'TYPE'} eq 'net') { ### $cgiparams{'MSSFIX'} = 'on'; $cgiparams{'FRAGMENT'} = '1300'; - $cgiparams{'PMTU_DISCOVERY'} = 'off'; $cgiparams{'DAUTH'} = 'SHA512'; ### # m.a.d n2n end @@ -4556,11 +4469,6 @@ if ($cgiparams{'TYPE'} eq 'net') { $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; - if ($cgiparams{'PMTU_DISCOVERY'} eq '') { - $cgiparams{'PMTU_DISCOVERY'} = 'off'; - } - $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; - $selected{'DCIPHER'}{'AES-256-GCM'} = ''; $selected{'DCIPHER'}{'AES-192-GCM'} = ''; $selected{'DCIPHER'}{'AES-128-GCM'} = ''; @@ -4721,15 +4629,6 @@ if ($cgiparams{'TYPE'} eq 'net') { <td><input type='checkbox' name='COMPLZO' $checked{'COMPLZO'}{'on'} /></td> </tr> - <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}</td> - <td colspan='3'> - <input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'} - <input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'} - <input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'} - <input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'} - </td> - </tr> - <tr><td colspan=4><hr /></td></tr><tr> <tr> <td class'base'><b>$Lang::tr{'ovpn crypt options'}:</b></td> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. c79cbc15941fb4f950fbb7aad6c98fd1344bf348
by git＠ipfire.org 09 Apr '18

09 Apr '18

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, master has been updated via c79cbc15941fb4f950fbb7aad6c98fd1344bf348 (commit) via f5b2d0a14a5e109948bc0d024ffcba63cffcab48 (commit) from d6d058a56b0ccb6cb96e06aedf66d19648ad58ec (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 c79cbc15941fb4f950fbb7aad6c98fd1344bf348 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 9 11:36:46 2018 +0100 core120: Update OepnVPN configurations for PMTU changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f5b2d0a14a5e109948bc0d024ffcba63cffcab48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 9 11:32:07 2018 +0100 OpenVPN: Drop Path MTU discovery settings These have to be dropped since the entire system does not support Path MTU discovery any more. This should not have any disadvantage on any tunnels since PMTU didn't really work in the first place. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/120/update.sh | 12 +++++ html/cgi-bin/ovpnmain.cgi | 101 ------------------------------------ 2 files changed, 12 insertions(+), 101 deletions(-) Difference in files: diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh index 0744f3a7f..e4ee15b52 100644 --- a/config/rootfiles/core/120/update.sh +++ b/config/rootfiles/core/120/update.sh @@ -58,6 +58,9 @@ if [ -e /var/ipfire/ovpn/server.conf ]; then sed -i -e 's/script-security 3 system/script-security 3/' \ -e '/status .*/ a ncp-disable' /var/ipfire/ovpn/server.conf + # Disable Path MTU discovery settings + sed -e "/^mtu-disc/d" -i /var/ipfire/ovpn/server.conf + # Update the OpenVPN CRL openssl ca -gencrl -keyfile /var/ipfire/ovpn/ca/cakey.pem \ -cert /var/ipfire/ovpn/ca/cacert.pem \ @@ -67,6 +70,15 @@ if [ -e /var/ipfire/ovpn/server.conf ]; then /usr/local/bin/openvpnctrl -s fi +# Update OpenVPN N2N configurations +/usr/local/bin/openvpnctrl -kn2n + +for file in /var/ipfire/ovpn/n2nconf/*/*.conf; do + sed -e "/^mtu-disc/d" -i ${file} +done + +/usr/local/bin/openvpnctrl -sn2n + # Start services /etc/init.d/apache restart /etc/init.d/unbound restart diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index ff3d05509..94e723ba2 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -92,7 +92,6 @@ $cgiparams{'ROUTES_PUSH'} = ''; $cgiparams{'DCOMPLZO'} = 'off'; $cgiparams{'MSSFIX'} = ''; $cgiparams{'number'} = ''; -$cgiparams{'PMTU_DISCOVERY'} = ''; $cgiparams{'DCIPHER'} = ''; $cgiparams{'DAUTH'} = ''; $cgiparams{'TLSAUTH'} = ''; @@ -234,10 +233,6 @@ sub writeserverconf { { print CONF "tun-mtu 1500\n"; } elsif ($sovpnsettings{'FRAGMENT'} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') { print CONF "tun-mtu 1500\n"; } - elsif (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) - { print CONF "tun-mtu 1500\n"; } else { print CONF "tun-mtu $sovpnsettings{'DMTU'}\n"; } @@ -277,13 +272,6 @@ sub writeserverconf { print CONF "fragment $sovpnsettings{'FRAGMENT'}\n"; } - # Check if a valid operating mode has been choosen and use it. - if (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) { - print CONF "mtu-disc $sovpnsettings{'PMTU_DISCOVERY'}\n"; - } - if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) { print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n"; } @@ -755,7 +743,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'}; $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'}; $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'}; - $vpnsettings{'PMTU_DISCOVERY'} = $cgiparams{'PMTU_DISCOVERY'}; $vpnsettings{'DAUTH'} = $cgiparams{'DAUTH'}; $vpnsettings{'TLSAUTH'} = $cgiparams{'TLSAUTH'}; my @temp=(); @@ -777,16 +764,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'}; } - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - - if (($cgiparams{'MSSFIX'} eq 'on') || ($cgiparams{'FRAGMENT'} ne '')) { - $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; - goto ADV_ERROR; - } - } - if ($cgiparams{'DHCP_DOMAIN'} ne ''){ unless (&General::validdomainname($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) { $errormessage = $Lang::tr{'invalid input for dhcp domain'}; @@ -952,16 +929,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; }; } - # Check if a valid operating mode has been choosen and use it. - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) { - if($cgiparams{'MTU'} eq '1500') { - print SERVERCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n"; - } - } - } print SERVERCONF "# Auth. Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; @@ -1058,16 +1025,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; }; } - # Check if a valid operating mode has been choosen and use it. - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) { - if ($cgiparams{'MTU'} eq '1500') { - print CLIENTCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n"; - } - } - } # Check host certificate if X509 is RFC3280 compliant. # If not, old --ns-cert-type directive will be used. # If appropriate key usage extension exists, new --remote-cert-tls directive will be used. @@ -2279,10 +2236,6 @@ else { print CLIENTCONF "tun-mtu 1500\r\n"; } elsif ($vpnsettings{MSSFIX} eq 'on') { print CLIENTCONF "tun-mtu 1500\r\n"; } - elsif (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) - { print CLIENTCONF "tun-mtu 1500\r\n"; } else { print CLIENTCONF "tun-mtu $vpnsettings{'DMTU'}\r\n"; } @@ -2382,15 +2335,6 @@ else print CLIENTCONF "fragment $vpnsettings{'FRAGMENT'}\r\n"; } - # Check if a valid operating mode has been choosen and use it. - if (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) { - if(($vpnsettings{MSSFIX} ne 'on') || ($vpnsettings{FRAGMENT} eq '')) { - print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\r\n"; - } - } - if ($include_certs) { print CLIENTCONF "\r\n"; @@ -2668,9 +2612,6 @@ ADV_ERROR: if ($cgiparams{'LOG_VERB'} eq '') { $cgiparams{'LOG_VERB'} = '3'; } - if ($cgiparams{'PMTU_DISCOVERY'} eq '') { - $cgiparams{'PMTU_DISCOVERY'} = 'off'; - } if ($cgiparams{'DAUTH'} eq '') { $cgiparams{'DAUTH'} = 'SHA512'; } @@ -2689,7 +2630,6 @@ ADV_ERROR: $checked{'MSSFIX'}{'off'} = ''; $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; - $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; $selected{'LOG_VERB'}{'0'} = ''; $selected{'LOG_VERB'}{'1'} = ''; $selected{'LOG_VERB'}{'2'} = ''; @@ -2812,14 +2752,6 @@ print <<END; <td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' size='10' /></td> <td><input type='TEXT' name='KEEPALIVE_2' value='$cgiparams{'KEEPALIVE_2'}' size='10' /></td> </tr> - - <tr> - <td class='base'>$Lang::tr{'ovpn mtu-disc'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'}</td> - </tr> </table> <hr size='1'> @@ -3650,7 +3582,6 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'CCD_DNS1'} = $confighash{$cgiparams{'KEY'}}[35]; $cgiparams{'CCD_DNS2'} = $confighash{$cgiparams{'KEY'}}[36]; $cgiparams{'CCD_WINS'} = $confighash{$cgiparams{'KEY'}}[37]; - $cgiparams{'PMTU_DISCOVERY'} = $confighash{$cgiparams{'KEY'}}[38]; $cgiparams{'DAUTH'} = $confighash{$cgiparams{'KEY'}}[39]; $cgiparams{'DCIPHER'} = $confighash{$cgiparams{'KEY'}}[40]; $cgiparams{'TLSAUTH'} = $confighash{$cgiparams{'KEY'}}[41]; @@ -3919,22 +3850,6 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } - if ($cgiparams{'PMTU_DISCOVERY'} ne 'off') { - if (($cgiparams{'FRAGMENT'} ne '') || ($cgiparams{'MSSFIX'} eq 'on')) { - $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; - } - } - - if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') && ($cgiparams{'MTU'} ne '1500')) { - $errormessage = $Lang::tr{'ovpn mtu-disc and mtu not 1500'}; - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; - } - if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix local subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -4378,7 +4293,6 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[35] = $cgiparams{'CCD_DNS1'}; $confighash{$key}[36] = $cgiparams{'CCD_DNS2'}; $confighash{$key}[37] = $cgiparams{'CCD_WINS'}; - $confighash{$key}[38] = $cgiparams{'PMTU_DISCOVERY'}; $confighash{$key}[39] = $cgiparams{'DAUTH'}; $confighash{$key}[40] = $cgiparams{'DCIPHER'}; @@ -4494,7 +4408,6 @@ if ($cgiparams{'TYPE'} eq 'net') { ### $cgiparams{'MSSFIX'} = 'on'; $cgiparams{'FRAGMENT'} = '1300'; - $cgiparams{'PMTU_DISCOVERY'} = 'off'; $cgiparams{'DAUTH'} = 'SHA512'; ### # m.a.d n2n end @@ -4556,11 +4469,6 @@ if ($cgiparams{'TYPE'} eq 'net') { $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; - if ($cgiparams{'PMTU_DISCOVERY'} eq '') { - $cgiparams{'PMTU_DISCOVERY'} = 'off'; - } - $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; - $selected{'DCIPHER'}{'AES-256-GCM'} = ''; $selected{'DCIPHER'}{'AES-192-GCM'} = ''; $selected{'DCIPHER'}{'AES-128-GCM'} = ''; @@ -4721,15 +4629,6 @@ if ($cgiparams{'TYPE'} eq 'net') { <td><input type='checkbox' name='COMPLZO' $checked{'COMPLZO'}{'on'} /></td> </tr> - <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}</td> - <td colspan='3'> - <input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'} - <input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'} - <input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'} - <input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'} - </td> - </tr> - <tr><td colspan=4><hr /></td></tr><tr> <tr> <td class'base'><b>$Lang::tr{'ovpn crypt options'}:</b></td> hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c79cbc15941fb4f950fbb7aad6c98fd1344bf348
by git＠ipfire.org 09 Apr '18

09 Apr '18

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 c79cbc15941fb4f950fbb7aad6c98fd1344bf348 (commit) via f5b2d0a14a5e109948bc0d024ffcba63cffcab48 (commit) from d6d058a56b0ccb6cb96e06aedf66d19648ad58ec (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 c79cbc15941fb4f950fbb7aad6c98fd1344bf348 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 9 11:36:46 2018 +0100 core120: Update OepnVPN configurations for PMTU changes Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit f5b2d0a14a5e109948bc0d024ffcba63cffcab48 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Apr 9 11:32:07 2018 +0100 OpenVPN: Drop Path MTU discovery settings These have to be dropped since the entire system does not support Path MTU discovery any more. This should not have any disadvantage on any tunnels since PMTU didn't really work in the first place. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/120/update.sh | 12 +++++ html/cgi-bin/ovpnmain.cgi | 101 ------------------------------------ 2 files changed, 12 insertions(+), 101 deletions(-) Difference in files: diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh index 0744f3a7f..e4ee15b52 100644 --- a/config/rootfiles/core/120/update.sh +++ b/config/rootfiles/core/120/update.sh @@ -58,6 +58,9 @@ if [ -e /var/ipfire/ovpn/server.conf ]; then sed -i -e 's/script-security 3 system/script-security 3/' \ -e '/status .*/ a ncp-disable' /var/ipfire/ovpn/server.conf + # Disable Path MTU discovery settings + sed -e "/^mtu-disc/d" -i /var/ipfire/ovpn/server.conf + # Update the OpenVPN CRL openssl ca -gencrl -keyfile /var/ipfire/ovpn/ca/cakey.pem \ -cert /var/ipfire/ovpn/ca/cacert.pem \ @@ -67,6 +70,15 @@ if [ -e /var/ipfire/ovpn/server.conf ]; then /usr/local/bin/openvpnctrl -s fi +# Update OpenVPN N2N configurations +/usr/local/bin/openvpnctrl -kn2n + +for file in /var/ipfire/ovpn/n2nconf/*/*.conf; do + sed -e "/^mtu-disc/d" -i ${file} +done + +/usr/local/bin/openvpnctrl -sn2n + # Start services /etc/init.d/apache restart /etc/init.d/unbound restart diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index ff3d05509..94e723ba2 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -92,7 +92,6 @@ $cgiparams{'ROUTES_PUSH'} = ''; $cgiparams{'DCOMPLZO'} = 'off'; $cgiparams{'MSSFIX'} = ''; $cgiparams{'number'} = ''; -$cgiparams{'PMTU_DISCOVERY'} = ''; $cgiparams{'DCIPHER'} = ''; $cgiparams{'DAUTH'} = ''; $cgiparams{'TLSAUTH'} = ''; @@ -234,10 +233,6 @@ sub writeserverconf { { print CONF "tun-mtu 1500\n"; } elsif ($sovpnsettings{'FRAGMENT'} ne '' && $sovpnsettings{'DPROTOCOL'} ne 'tcp') { print CONF "tun-mtu 1500\n"; } - elsif (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) - { print CONF "tun-mtu 1500\n"; } else { print CONF "tun-mtu $sovpnsettings{'DMTU'}\n"; } @@ -277,13 +272,6 @@ sub writeserverconf { print CONF "fragment $sovpnsettings{'FRAGMENT'}\n"; } - # Check if a valid operating mode has been choosen and use it. - if (($sovpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($sovpnsettings{'PMTU_DISCOVERY'} eq 'no' )) { - print CONF "mtu-disc $sovpnsettings{'PMTU_DISCOVERY'}\n"; - } - if ($sovpnsettings{KEEPALIVE_1} > 0 && $sovpnsettings{KEEPALIVE_2} > 0) { print CONF "keepalive $sovpnsettings{'KEEPALIVE_1'} $sovpnsettings{'KEEPALIVE_2'}\n"; } @@ -755,7 +743,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'DHCP_DNS'} = $cgiparams{'DHCP_DNS'}; $vpnsettings{'DHCP_WINS'} = $cgiparams{'DHCP_WINS'}; $vpnsettings{'ROUTES_PUSH'} = $cgiparams{'ROUTES_PUSH'}; - $vpnsettings{'PMTU_DISCOVERY'} = $cgiparams{'PMTU_DISCOVERY'}; $vpnsettings{'DAUTH'} = $cgiparams{'DAUTH'}; $vpnsettings{'TLSAUTH'} = $cgiparams{'TLSAUTH'}; my @temp=(); @@ -777,16 +764,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) { $vpnsettings{'MSSFIX'} = $cgiparams{'MSSFIX'}; } - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - - if (($cgiparams{'MSSFIX'} eq 'on') || ($cgiparams{'FRAGMENT'} ne '')) { - $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; - goto ADV_ERROR; - } - } - if ($cgiparams{'DHCP_DOMAIN'} ne ''){ unless (&General::validdomainname($cgiparams{'DHCP_DOMAIN'}) || &General::validip($cgiparams{'DHCP_DOMAIN'})) { $errormessage = $Lang::tr{'invalid input for dhcp domain'}; @@ -952,16 +929,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'MSSFIX'} eq 'on') {print SERVERCONF "mssfix\n"; }; } - # Check if a valid operating mode has been choosen and use it. - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) { - if($cgiparams{'MTU'} eq '1500') { - print SERVERCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n"; - } - } - } print SERVERCONF "# Auth. Server\n"; print SERVERCONF "tls-server\n"; print SERVERCONF "ca ${General::swroot}/ovpn/ca/cacert.pem\n"; @@ -1058,16 +1025,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}"){mkdir "${General if ($cgiparams{'MSSFIX'} eq 'on') {print CLIENTCONF "mssfix\n"; }; } - # Check if a valid operating mode has been choosen and use it. - if (($cgiparams{'PMTU_DISCOVERY'} eq 'yes') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'maybe') || - ($cgiparams{'PMTU_DISCOVERY'} eq 'no' )) { - if(($cgiparams{'MSSFIX'} ne 'on') || ($cgiparams{'FRAGMENT'} eq '')) { - if ($cgiparams{'MTU'} eq '1500') { - print CLIENTCONF "mtu-disc $cgiparams{'PMTU_DISCOVERY'}\n"; - } - } - } # Check host certificate if X509 is RFC3280 compliant. # If not, old --ns-cert-type directive will be used. # If appropriate key usage extension exists, new --remote-cert-tls directive will be used. @@ -2279,10 +2236,6 @@ else { print CLIENTCONF "tun-mtu 1500\r\n"; } elsif ($vpnsettings{MSSFIX} eq 'on') { print CLIENTCONF "tun-mtu 1500\r\n"; } - elsif (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) - { print CLIENTCONF "tun-mtu 1500\r\n"; } else { print CLIENTCONF "tun-mtu $vpnsettings{'DMTU'}\r\n"; } @@ -2382,15 +2335,6 @@ else print CLIENTCONF "fragment $vpnsettings{'FRAGMENT'}\r\n"; } - # Check if a valid operating mode has been choosen and use it. - if (($vpnsettings{'PMTU_DISCOVERY'} eq 'yes') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'maybe') || - ($vpnsettings{'PMTU_DISCOVERY'} eq 'no' )) { - if(($vpnsettings{MSSFIX} ne 'on') || ($vpnsettings{FRAGMENT} eq '')) { - print CLIENTCONF "mtu-disc $vpnsettings{'PMTU_DISCOVERY'}\r\n"; - } - } - if ($include_certs) { print CLIENTCONF "\r\n"; @@ -2668,9 +2612,6 @@ ADV_ERROR: if ($cgiparams{'LOG_VERB'} eq '') { $cgiparams{'LOG_VERB'} = '3'; } - if ($cgiparams{'PMTU_DISCOVERY'} eq '') { - $cgiparams{'PMTU_DISCOVERY'} = 'off'; - } if ($cgiparams{'DAUTH'} eq '') { $cgiparams{'DAUTH'} = 'SHA512'; } @@ -2689,7 +2630,6 @@ ADV_ERROR: $checked{'MSSFIX'}{'off'} = ''; $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; - $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; $selected{'LOG_VERB'}{'0'} = ''; $selected{'LOG_VERB'}{'1'} = ''; $selected{'LOG_VERB'}{'2'} = ''; @@ -2812,14 +2752,6 @@ print <<END; <td><input type='TEXT' name='KEEPALIVE_1' value='$cgiparams{'KEEPALIVE_1'}' size='10' /></td> <td><input type='TEXT' name='KEEPALIVE_2' value='$cgiparams{'KEEPALIVE_2'}' size='10' /></td> </tr> - - <tr> - <td class='base'>$Lang::tr{'ovpn mtu-disc'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'}</td> - <td><input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'}</td> - </tr> </table> <hr size='1'> @@ -3650,7 +3582,6 @@ if ($confighash{$cgiparams{'KEY'}}) { $cgiparams{'CCD_DNS1'} = $confighash{$cgiparams{'KEY'}}[35]; $cgiparams{'CCD_DNS2'} = $confighash{$cgiparams{'KEY'}}[36]; $cgiparams{'CCD_WINS'} = $confighash{$cgiparams{'KEY'}}[37]; - $cgiparams{'PMTU_DISCOVERY'} = $confighash{$cgiparams{'KEY'}}[38]; $cgiparams{'DAUTH'} = $confighash{$cgiparams{'KEY'}}[39]; $cgiparams{'DCIPHER'} = $confighash{$cgiparams{'KEY'}}[40]; $cgiparams{'TLSAUTH'} = $confighash{$cgiparams{'KEY'}}[41]; @@ -3919,22 +3850,6 @@ if ($cgiparams{'TYPE'} eq 'net') { goto VPNCONF_ERROR; } - if ($cgiparams{'PMTU_DISCOVERY'} ne 'off') { - if (($cgiparams{'FRAGMENT'} ne '') || ($cgiparams{'MSSFIX'} eq 'on')) { - $errormessage = $Lang::tr{'ovpn mtu-disc with mssfix or fragment'}; - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; - } - } - - if (($cgiparams{'PMTU_DISCOVERY'} ne 'off') && ($cgiparams{'MTU'} ne '1500')) { - $errormessage = $Lang::tr{'ovpn mtu-disc and mtu not 1500'}; - unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; - rmdir ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}") || die "Removing Directory fail: $!"; - goto VPNCONF_ERROR; - } - if ( &validdotmask ($cgiparams{'LOCAL_SUBNET'})) { $errormessage = $Lang::tr{'openvpn prefix local subnet'}; unlink ("${General::swroot}/ovpn/n2nconf/$cgiparams{'NAME'}/$cgiparams{'NAME'}.conf") or die "Removing Configfile fail: $!"; @@ -4378,7 +4293,6 @@ if ($cgiparams{'TYPE'} eq 'net') { $confighash{$key}[35] = $cgiparams{'CCD_DNS1'}; $confighash{$key}[36] = $cgiparams{'CCD_DNS2'}; $confighash{$key}[37] = $cgiparams{'CCD_WINS'}; - $confighash{$key}[38] = $cgiparams{'PMTU_DISCOVERY'}; $confighash{$key}[39] = $cgiparams{'DAUTH'}; $confighash{$key}[40] = $cgiparams{'DCIPHER'}; @@ -4494,7 +4408,6 @@ if ($cgiparams{'TYPE'} eq 'net') { ### $cgiparams{'MSSFIX'} = 'on'; $cgiparams{'FRAGMENT'} = '1300'; - $cgiparams{'PMTU_DISCOVERY'} = 'off'; $cgiparams{'DAUTH'} = 'SHA512'; ### # m.a.d n2n end @@ -4556,11 +4469,6 @@ if ($cgiparams{'TYPE'} eq 'net') { $checked{'MSSFIX'}{'on'} = ''; $checked{'MSSFIX'}{$cgiparams{'MSSFIX'}} = 'CHECKED'; - if ($cgiparams{'PMTU_DISCOVERY'} eq '') { - $cgiparams{'PMTU_DISCOVERY'} = 'off'; - } - $checked{'PMTU_DISCOVERY'}{$cgiparams{'PMTU_DISCOVERY'}} = 'checked=\'checked\''; - $selected{'DCIPHER'}{'AES-256-GCM'} = ''; $selected{'DCIPHER'}{'AES-192-GCM'} = ''; $selected{'DCIPHER'}{'AES-128-GCM'} = ''; @@ -4721,15 +4629,6 @@ if ($cgiparams{'TYPE'} eq 'net') { <td><input type='checkbox' name='COMPLZO' $checked{'COMPLZO'}{'on'} /></td> </tr> - <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'ovpn mtu-disc'}</td> - <td colspan='3'> - <input type='radio' name='PMTU_DISCOVERY' value='yes' $checked{'PMTU_DISCOVERY'}{'yes'} /> $Lang::tr{'ovpn mtu-disc yes'} - <input type='radio' name='PMTU_DISCOVERY' value='maybe' $checked{'PMTU_DISCOVERY'}{'maybe'} /> $Lang::tr{'ovpn mtu-disc maybe'} - <input type='radio' name='PMTU_DISCOVERY' value='no' $checked{'PMTU_DISCOVERY'}{'no'} /> $Lang::tr{'ovpn mtu-disc no'} - <input type='radio' name='PMTU_DISCOVERY' value='off' $checked{'PMTU_DISCOVERY'}{'off'} /> $Lang::tr{'ovpn mtu-disc off'} - </td> - </tr> - <tr><td colspan=4><hr /></td></tr><tr> <tr> <td class'base'><b>$Lang::tr{'ovpn crypt options'}:</b></td> 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 April 2018