Merge branch 'next' into fifteen

Conflicts:
	doc/language_issues.tr

diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index 6be9a102a7598252cd358ee484d3f294bf4dd5e3..ae6d6eee6fc73d8bdb6ddb060830bcc8363e51f9 100644 (file)
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -1,8 +1,19 @@
-usr/lib/openvpn
-usr/lib/openvpn/openvpn-auth-pam.so
-usr/lib/openvpn/openvpn-down-root.so
+#usr/include/openvpn-plugin.h
+#usr/lib/openvpn
+#usr/lib/openvpn/plugins
+#usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.la
+usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so
+#usr/lib/openvpn/plugins/openvpn-plugin-down-root.la
+usr/lib/openvpn/plugins/openvpn-plugin-down-root.so
 usr/sbin/openvpn
 #usr/share/doc/openvpn
+#usr/share/doc/openvpn/COPYING
+#usr/share/doc/openvpn/COPYRIGHT.GPL
+#usr/share/doc/openvpn/README
+#usr/share/doc/openvpn/README.IPv6
+#usr/share/doc/openvpn/README.auth-pam
+#usr/share/doc/openvpn/README.down-root
+#usr/share/doc/openvpn/README.polarssl
 #usr/share/doc/openvpn/management-notes.txt
 #usr/share/man/man8/openvpn.8
 var/ipfire/ovpn

diff --git a/doc/language_issues.de b/doc/language_issues.de
index c36be8ae4e4781d168b5f50b5c5a0e68e6406b1b..4c6ef63aaf426705ab036d8c117336020e6fc7a9 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -187,6 +187,7 @@ WARNING: translation string unused: from email user
 WARNING: translation string unused: from warn email bad
 WARNING: translation string unused: fwdfw MODE1
 WARNING: translation string unused: fwdfw MODE2
+WARNING: translation string unused: fwdfw err prot_port1
 WARNING: translation string unused: fwdfw err tgt_port
 WARNING: translation string unused: fwdfw final_rule
 WARNING: translation string unused: fwdfw from

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 97da599200987ce0ee547f0bc41381fc26f0abf4..88a8f6e2b94ee1af30db9c5dee796d48960995b9 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -210,6 +210,7 @@ WARNING: translation string unused: from email user
 WARNING: translation string unused: from warn email bad
 WARNING: translation string unused: fwdfw MODE1
 WARNING: translation string unused: fwdfw MODE2
+WARNING: translation string unused: fwdfw err prot_port1
 WARNING: translation string unused: fwdfw err tgt_port
 WARNING: translation string unused: fwdfw final_rule
 WARNING: translation string unused: fwdfw from

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 163b9f2cb4134c8d8d10bb4f823b8175dc18569f..f735730a8e75afbee6d1ff7013d7ed199ed57a22 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -649,7 +649,6 @@ WARNING: untranslated string: fwdfw err nosrcip
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
-WARNING: untranslated string: fwdfw err prot_port1
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -733,6 +732,8 @@ WARNING: untranslated string: fwhost err isccdiphost
 WARNING: untranslated string: fwhost err isccdipnet
 WARNING: untranslated string: fwhost err isccdnet
 WARNING: untranslated string: fwhost err isingrp
+WARNING: untranslated string: fwhost err maxservicetcp
+WARNING: untranslated string: fwhost err maxserviceudp
 WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index d644104f2991808c84b955679880ae5f6b06f8b5..e33e653dc744294f5795f7a5b75ff89bcd8d1473 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -652,7 +652,6 @@ WARNING: untranslated string: fwdfw err nosrcip
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
-WARNING: untranslated string: fwdfw err prot_port1
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -736,6 +735,8 @@ WARNING: untranslated string: fwhost err isccdiphost
 WARNING: untranslated string: fwhost err isccdipnet
 WARNING: untranslated string: fwhost err isccdnet
 WARNING: untranslated string: fwhost err isingrp
+WARNING: untranslated string: fwhost err maxservicetcp
+WARNING: untranslated string: fwhost err maxserviceudp
 WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 0d6fafbb4d37be2be733352a12f009a9fd0db626..92ef57e38fdcaa5e532d3f59cc2ca7cbe9757634 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -598,7 +598,6 @@ WARNING: untranslated string: fwdfw err nosrcip
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
-WARNING: untranslated string: fwdfw err prot_port1
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -682,6 +681,8 @@ WARNING: untranslated string: fwhost err isccdiphost
 WARNING: untranslated string: fwhost err isccdipnet
 WARNING: untranslated string: fwhost err isccdnet
 WARNING: untranslated string: fwhost err isingrp
+WARNING: untranslated string: fwhost err maxservicetcp
+WARNING: untranslated string: fwhost err maxserviceudp
 WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 163b9f2cb4134c8d8d10bb4f823b8175dc18569f..f735730a8e75afbee6d1ff7013d7ed199ed57a22 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -649,7 +649,6 @@ WARNING: untranslated string: fwdfw err nosrcip
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
-WARNING: untranslated string: fwdfw err prot_port1
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -733,6 +732,8 @@ WARNING: untranslated string: fwhost err isccdiphost
 WARNING: untranslated string: fwhost err isccdipnet
 WARNING: untranslated string: fwhost err isccdnet
 WARNING: untranslated string: fwhost err isingrp
+WARNING: untranslated string: fwhost err maxservicetcp
+WARNING: untranslated string: fwhost err maxserviceudp
 WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 5f06c94b7ff4ea4f0bd275138451a31c1a05d37b..7e1a86dc33ca2a38ba6ca6522db1c67af71b5bb0 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -635,7 +635,6 @@ WARNING: untranslated string: fwdfw err nosrcip
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
-WARNING: untranslated string: fwdfw err prot_port1
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -719,6 +718,8 @@ WARNING: untranslated string: fwhost err isccdiphost
 WARNING: untranslated string: fwhost err isccdipnet
 WARNING: untranslated string: fwhost err isccdnet
 WARNING: untranslated string: fwhost err isingrp
+WARNING: untranslated string: fwhost err maxservicetcp
+WARNING: untranslated string: fwhost err maxserviceudp
 WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index ba02f89a7d3701eb9fb51ce956a212e1eaf946ce..fe1aed6b0ec656f534a8d83784a6943fecd48a1b 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -479,6 +479,12 @@ WARNING: translation string unused: to email adr
 WARNING: translation string unused: to install an update
 WARNING: translation string unused: to warn email bad
 WARNING: translation string unused: too long 80 char max
+WARNING: translation string unused: tor accounting period daily
+WARNING: translation string unused: tor accounting period monthly
+WARNING: translation string unused: tor accounting period weekly
+WARNING: translation string unused: tor bridge enabled
+WARNING: translation string unused: tor errmsg invalid node id
+WARNING: translation string unused: tor exit country
 WARNING: translation string unused: traffic back
 WARNING: translation string unused: traffic calc time
 WARNING: translation string unused: traffic calc time bad
@@ -557,13 +563,6 @@ WARNING: untranslated string: advproxy proxy port transparent
 WARNING: untranslated string: bytes
 WARNING: untranslated string: default ip
 WARNING: untranslated string: dnat address
-WARNING: untranslated string: dnsforward
-WARNING: untranslated string: dnsforward add a new entry
-WARNING: untranslated string: dnsforward configuration
-WARNING: untranslated string: dnsforward edit an entry
-WARNING: untranslated string: dnsforward entries
-WARNING: untranslated string: dnsforward forward_server
-WARNING: untranslated string: dnsforward zone
 WARNING: untranslated string: drop action
 WARNING: untranslated string: drop action1
 WARNING: untranslated string: drop action2
@@ -595,7 +594,6 @@ WARNING: untranslated string: fwdfw err nosrcip
 WARNING: untranslated string: fwdfw err notgt
 WARNING: untranslated string: fwdfw err notgtip
 WARNING: untranslated string: fwdfw err prot_port
-WARNING: untranslated string: fwdfw err prot_port1
 WARNING: untranslated string: fwdfw err remark
 WARNING: untranslated string: fwdfw err ruleexists
 WARNING: untranslated string: fwdfw err same
@@ -679,6 +677,8 @@ WARNING: untranslated string: fwhost err isccdiphost
 WARNING: untranslated string: fwhost err isccdipnet
 WARNING: untranslated string: fwhost err isccdnet
 WARNING: untranslated string: fwhost err isingrp
+WARNING: untranslated string: fwhost err maxservicetcp
+WARNING: untranslated string: fwhost err maxserviceudp
 WARNING: untranslated string: fwhost err name
 WARNING: untranslated string: fwhost err name1
 WARNING: untranslated string: fwhost err net
@@ -723,82 +723,6 @@ WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: snat new source ip address
-WARNING: untranslated string: tor
-WARNING: untranslated string: tor accounting
-WARNING: untranslated string: tor accounting bytes
-WARNING: untranslated string: tor accounting bytes left
-WARNING: untranslated string: tor accounting interval
-WARNING: untranslated string: tor accounting limit
-WARNING: untranslated string: tor accounting period
-WARNING: untranslated string: tor acls
-WARNING: untranslated string: tor allowed subnets
-WARNING: untranslated string: tor bandwidth burst
-WARNING: untranslated string: tor bandwidth rate
-WARNING: untranslated string: tor bandwidth settings
-WARNING: untranslated string: tor bandwidth unlimited
-WARNING: untranslated string: tor common settings
-WARNING: untranslated string: tor configuration
-WARNING: untranslated string: tor connected relays
-WARNING: untranslated string: tor contact info
-WARNING: untranslated string: tor daemon
 WARNING: untranslated string: tor directory port
-WARNING: untranslated string: tor enabled
-WARNING: untranslated string: tor errmsg invalid accounting limit
 WARNING: untranslated string: tor errmsg invalid directory port
-WARNING: untranslated string: tor errmsg invalid ip or mask
-WARNING: untranslated string: tor errmsg invalid relay address
-WARNING: untranslated string: tor errmsg invalid relay name
-WARNING: untranslated string: tor errmsg invalid relay port
-WARNING: untranslated string: tor errmsg invalid socks port
-WARNING: untranslated string: tor exit country any
-WARNING: untranslated string: tor exit nodes
-WARNING: untranslated string: tor relay address
-WARNING: untranslated string: tor relay configuration
-WARNING: untranslated string: tor relay enabled
-WARNING: untranslated string: tor relay external address
-WARNING: untranslated string: tor relay fingerprint
-WARNING: untranslated string: tor relay mode
-WARNING: untranslated string: tor relay mode bridge
-WARNING: untranslated string: tor relay mode exit
-WARNING: untranslated string: tor relay mode private bridge
-WARNING: untranslated string: tor relay mode relay
-WARNING: untranslated string: tor relay nickname
-WARNING: untranslated string: tor relay port
-WARNING: untranslated string: tor service
-WARNING: untranslated string: tor socks port
-WARNING: untranslated string: tor stats
-WARNING: untranslated string: tor traffic limit hard
-WARNING: untranslated string: tor traffic limit soft
-WARNING: untranslated string: tor traffic read written
-WARNING: untranslated string: tor use exit nodes
 WARNING: untranslated string: urlfilter redirect template
-WARNING: untranslated string: wlan client
-WARNING: untranslated string: wlan client advanced settings
-WARNING: untranslated string: wlan client and
-WARNING: untranslated string: wlan client bssid
-WARNING: untranslated string: wlan client ccmp
-WARNING: untranslated string: wlan client configuration
-WARNING: untranslated string: wlan client disconnected
-WARNING: untranslated string: wlan client duplicate ssid
-WARNING: untranslated string: wlan client edit entry
-WARNING: untranslated string: wlan client encryption
-WARNING: untranslated string: wlan client encryption none
-WARNING: untranslated string: wlan client encryption wep
-WARNING: untranslated string: wlan client encryption wpa
-WARNING: untranslated string: wlan client encryption wpa2
-WARNING: untranslated string: wlan client group cipher
-WARNING: untranslated string: wlan client group key algorithm
-WARNING: untranslated string: wlan client invalid key length
-WARNING: untranslated string: wlan client new entry
-WARNING: untranslated string: wlan client new network
-WARNING: untranslated string: wlan client pairwise cipher
-WARNING: untranslated string: wlan client pairwise key algorithm
-WARNING: untranslated string: wlan client pairwise key group key
-WARNING: untranslated string: wlan client psk
-WARNING: untranslated string: wlan client ssid
-WARNING: untranslated string: wlan client tkip
-WARNING: untranslated string: wlan client wpa mode
-WARNING: untranslated string: wlan client wpa mode all
-WARNING: untranslated string: wlan client wpa mode ccmp ccmp
-WARNING: untranslated string: wlan client wpa mode ccmp tkip
-WARNING: untranslated string: wlan client wpa mode tkip tkip

diff --git a/doc/language_missings b/doc/language_missings
index be8ec626ac679aab680f3d07005f8b88063f1455..8a751f05cabf6cd62c4dcb88b4beb013071fbe1d 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -219,6 +219,8 @@
 < fwhost err isccdnet
 < fwhost err isingrp
 < fwhost err mac
+< fwhost err maxservicetcp
+< fwhost err maxserviceudp
 < fwhost err name
 < fwhost err name1
 < fwhost err net
@@ -629,6 +631,8 @@
 < fwhost err isccdnet
 < fwhost err isingrp
 < fwhost err mac
+< fwhost err maxservicetcp
+< fwhost err maxserviceudp
 < fwhost err name
 < fwhost err name1
 < fwhost err net
@@ -1023,6 +1027,8 @@
 < fwhost err isccdnet
 < fwhost err isingrp
 < fwhost err mac
+< fwhost err maxservicetcp
+< fwhost err maxserviceudp
 < fwhost err name
 < fwhost err name1
 < fwhost err net
@@ -1406,6 +1412,8 @@
 < fwhost err isccdnet
 < fwhost err isingrp
 < fwhost err mac
+< fwhost err maxservicetcp
+< fwhost err maxserviceudp
 < fwhost err name
 < fwhost err name1
 < fwhost err net

diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6dd900ffda0faaab1aa0bdae295a29de497b3429..acb4f979a76709b30bb4707188e3b9c5d4cee3dd 100644 (file)
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -391,7 +391,7 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
                }
        }
        if (!($proxysettings{'FILEDESCRIPTORS'} =~ /^\d+/) ||
-               ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 65536))
+               ($proxysettings{'FILEDESCRIPTORS'} < 1) || ($proxysettings{'FILEDESCRIPTORS'} > 1048576))
        {
                $errormessage = $Lang::tr{'proxy errmsg filedescriptors'};
                goto ERROR;

diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 9888121a5ecca7dd5a393f210b594bc8748396f3..25896680d37d6e975c8601923cde76ca765892fa 100644 (file)
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -737,6 +737,13 @@
 'dns saved txt' => 'Girilen iki DNS sunucu adresi başarılı bir şekilde kaydedildi.<br />Değişikliklerin aktifleştirielebilmesi için yeniden başlatın!',
 'dns server' => 'DNS Sunucusu',
 'dns title' => 'Etki Alanı Ad Sistemi',
+'dnsforward' => 'DNS yönlendirmesi',
+'dnsforward add a new entry' => 'Yeni bir kayıt ekle:',
+'dnsforward configuration' => 'İleri DNS yapılandırması',
+'dnsforward edit an entry' => 'Varolan bir kaydı düzenle:',
+'dnsforward entries' => 'Güncel kayıtlar:',
+'dnsforward forward_server' => 'Ad sunucusu',
+'dnsforward zone' => 'Bölge',
 'do not log this port list' => 'Otorumdan hemen önce bu bağlantı noktaları listesini bırak (günlük boyutunu küçültür)',
 'dod' => 'Çevirmeli Bağlantı Üzerinden Talep',
 'dod for dns' => 'DNS için çevirmeli bağlantı üzerinden talep:',
@@ -751,7 +758,7 @@
 'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif',
 'donation-text' => '<strong>IPFire</strong> boş zamanlarında gönüllüer tarafından geliştirlmektedir. Bu projeyi ayakta tutmak için eğer bize destek olmak isterseniz küçük bir bağıştan mutluluk duyarız.',
 'done' => 'Yap',
-'dos charset' => 'DOS Karakter',
+'dos charset' => 'DOS Karakterleri',
 'down and up speed' => 'Gönderme hızı düştüğünde <i>Kaydet</i> düğmesine basın.',
 'downlink speed' => 'İndirme bağlantı hızı (kbit/san)',
 'downlink std class' => 'Standart indirme bağlantısı sınıfı',
@@ -1586,9 +1593,9 @@
 'reload' => 'yeniden yükle',
 'remark' => 'Açıklama',
 'remark title' => 'Açıklama:',
-'remote access' => 'Uzaktan erişim',
-'remote announce' => 'Uzaktan Duyuru',
-'remote browse sync' => 'Remote Browse Sync',
+'remote access' => 'Uzak erişim',
+'remote announce' => 'Uzak duyuru',
+'remote browse sync' => 'Uzak tarayıcı eşitlemesi',
 'remote host/ip' => 'Uzak ana bilgisayar/IP',
 'remote logging' => 'Uzak günlük',
 'remote subnet' => 'Uzak alt ağ:',
@@ -1824,6 +1831,58 @@
 'tone' => 'Ses',
 'tone dial' => 'Sesli çevirme:',
 'too long 80 char max' => ' çok uzun, izin verilen en fazla 80 karakterdir',
+'tor' => 'Tor',
+'tor accounting' => 'Hesap',
+'tor accounting bytes' => 'Trafik (okuma/yazma)',
+'tor accounting bytes left' => 'left',
+'tor accounting interval' => 'Aralık (UTC)',
+'tor accounting limit' => 'Hesap sınırı (MB)',
+'tor accounting period' => 'Hesap dönemi',
+'tor accounting period daily' => 'günlük',
+'tor accounting period monthly' => 'aylık',
+'tor accounting period weekly' => 'haftalık',
+'tor acls' => 'Erişim Kontrolü',
+'tor allowed subnets' => 'İzin verilen alt ağlar (her satırda bir tane)',
+'tor bandwidth burst' => 'En büyük ayırma',
+'tor bandwidth rate' => 'En büyük oran',
+'tor bandwidth settings' => 'Bant Genişliği Ayarları',
+'tor bandwidth unlimited' => 'sınırsız',
+'tor bridge enabled' => 'Tor köprüsünü etkinleştir',
+'tor common settings' => 'Genel Ayarlar',
+'tor configuration' => 'Tor Yapılandırması',
+'tor connected relays' => 'Bağlı aktarımlar',
+'tor contact info' => 'İletişim Bilgileri',
+'tor daemon' => 'Artalan süreci',
+'tor enabled' => 'Tor Aktif',
+'tor errmsg invalid accounting limit' => 'Geçersiz hesap sınırı',
+'tor errmsg invalid ip or mask' => 'Geçersiz IP alt ağı',
+'tor errmsg invalid node id' => 'Geçersiz düğüm kimliği (ID)',
+'tor errmsg invalid relay address' => 'Geçersiz aktarma adresi',
+'tor errmsg invalid relay name' => 'Geçersiz aktarma takma adı',
+'tor errmsg invalid relay port' => 'Geçersiz aktarma bağlantı noktası',
+'tor errmsg invalid socks port' => 'Geçersiz SOCKS bağlantı noktası',
+'tor exit country' => 'Ülçe çıkışı',
+'tor exit country any' => 'Herhangi bir ülke',
+'tor exit nodes' => 'Çıkış Düğümleri',
+'tor relay address' => 'Aktarma adresleri',
+'tor relay configuration' => 'Tor Aktarma Yapılandırması',
+'tor relay enabled' => 'Tor Aktarma Aktif',
+'tor relay external address' => 'Aktarım dış adresi',
+'tor relay fingerprint' => 'Aktarım parmak izi',
+'tor relay mode' => 'Aktarım biçimi',
+'tor relay mode bridge' => 'Köprü',
+'tor relay mode exit' => 'Çıkış-Düğümü',
+'tor relay mode private bridge' => 'Özel köprü',
+'tor relay mode relay' => 'Sadece aktarım',
+'tor relay nickname' => 'Aktarım takma adı',
+'tor relay port' => 'Aktarım bağlantı noktası',
+'tor service' => 'Tor Servisi',
+'tor socks port' => 'SOCKS bağlantı noktası',
+'tor stats' => 'İstatistik',
+'tor traffic limit hard' => 'Trafik sınırına ulaşıldı.',
+'tor traffic limit soft' => 'Trafik sınırına neredeyse ulaşıldı. Yeni herhangi bir bağlantı kabul edilmiyor.',
+'tor traffic read written' => 'Toplam tarfik (okuma/yazma)',
+'tor use exit nodes' => 'Sadece bu çıkış düğümlerini kullanın (her satıra bir tane)',
 'total connection time' => 'Toplam bağlantı süresi',
 'total hits for log section' => 'Günlük bölümü için toplam kayıt',
 'traffic back' => 'Geri',
@@ -1933,7 +1992,7 @@
 'updxlrtr save and restart' => 'Kaydet ve Yeniden Başlat',
 'updxlrtr source' => 'Kaynak',
 'updxlrtr source checkup' => 'Kaynak kontrolü',
-'updxlrtr source checkup schedule' => 'Kaynak kontrolü programı',
+'updxlrtr source checkup schedule' => 'Kaynak kontrol zamanı',
 'updxlrtr sources' => 'Kaynaklar',
 'updxlrtr standard view' => 'Standart görünüm',
 'updxlrtr statistics' => 'İstatistik',
@@ -2066,7 +2125,7 @@
 'urlfilter hourly' => 'Saatlik',
 'urlfilter import blacklist' => 'Kara listeyi al',
 'urlfilter import text' => 'Önceden kaydedilmiş *.tar.gz uzantılı kara liste düzenleyici dosyasını yüklemek için aşağıdan seçin',
-'urlfilter install blacklist' => 'Kara listeyi kur',
+'urlfilter install blacklist' => 'Kara listeye yükle',
 'urlfilter install information' => 'Yeni kara liste otomatik olarak oluşturulup veritabanları için derlenecektir. Kara liste boyutuna bağlı olarak güncelleme işlemi birkaç dakika zaman alabilir. URL filtreyi yeniden başlatmadan önce bu görevin muhakkak bitirilmesini bekleyin.',
 'urlfilter invalid content' => 'Dosya squidGuard uyumlu kara liste değil',
 'urlfilter invalid import file' => 'Dosya geçerli URL filtre kara liste düzenleyicisi dosyası değil',
@@ -2247,6 +2306,36 @@
 '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ı',
+'wlan client' => 'Kablosuz istemci',
+'wlan client advanced settings' => 'Gelişmiş ayarlar',
+'wlan client and' => 've',
+'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 edit entry' => 'Kablosuz istemci yapılandırmasını düzenle',
+'wlan client encryption' => 'Şifreleme',
+'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 invalid key length' => 'Geçersiz anahtar uzunluğu.',
+'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 psk' => 'Önceden paylaşılan anahtar',
+'wlan client ssid' => 'SSID',
+'wlan client tkip' => 'TKIP',
+'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',
 'wlanap access point' => 'Erişim Noktası',
 'wlanap channel' => 'Kanal',
 'wlanap country' => 'Ülke Kodu',

diff --git a/lfs/openvpn b/lfs/openvpn
index e57aa30bacf2d190c339c5f012af213c0ef78373..87daf07ebfaf291067bdfbbec661b3401dd416e1 100644 (file)
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2013  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.2.2
+VER        = 2.3.2
 
 THISAPP    = openvpn-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c5181e27b7945fa6276d21873329c5c7
+$(DL_FILE)_MD5 = 06e5f93dbf13f2c19647ca15ffc23ac1
 
 install : $(TARGET)
 
@@ -73,16 +73,16 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/var/ipfire/ovpn \
+               --enable-iproute2 \
                --enable-password-save \
-               --enable-pthread
+               --enable-plugins \
+               --enable-plugin-auth-pam \
+               --enable-plugin-down-root
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        cd $(DIR_APP) && cp -Rvf $(DIR_SRC)/config/ovpn /var/ipfire
-       -mkdir -pv /usr/lib/openvpn
-       cd $(DIR_APP)/plugin/auth-pam && make
-       cp -pvf $(DIR_APP)/plugin/auth-pam/openvpn-auth-pam.so /usr/lib/openvpn
-       cd $(DIR_APP)/plugin/down-root && make
-       cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn
+       -mkdir -vp /usr/lib/openvpn/plugins
        -mkdir -vp /var/ipfire/ovpn/ca
        -mkdir -vp /var/ipfire/ovpn/ccd
        -mkdir -vp /var/ipfire/ovpn/crls

diff --git a/lfs/samba b/lfs/samba
index aa635d150c2cb4ba4192fd1ce7f8ced955d78cec..7917dbfae7b16d0b3d1ee4ed02f74735eb94e7ce 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.6.20
+VER        = 3.6.21
 
 THISAPP    = samba-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 54
+PAK_VER    = 55
 
 DEPS       = "cups"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3f1b60c681845ce6828a1abe5aacf671
+$(DL_FILE)_MD5 = faa67c625508dc495c082357913ccea6
 
 install : $(TARGET)
 

diff --git a/lfs/squid b/lfs/squid
index a341857f76c0130d978d7c50e094f39e06bd486b..d3bff48b7ddfb9051b1022e2b022ae66919dd405 100644 (file)
--- a/lfs/squid
+++ b/lfs/squid
@@ -72,7 +72,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid-3.3.10-optional-ssl-options.patch
+       cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/squid-3.3.10-set-rlimit-fds.patch
 
+       cd $(DIR_APP) && ./bootstrap.sh
        cd $(DIR_APP) && ./configure \
                --prefix=/usr \
                --sysconfdir=/etc/squid \
@@ -104,8 +106,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-eui \
                --with-pthreads \
                --with-dl \
-               --with-maxfd="65536" \
-               --with-filedescriptors=65536 \
+               --with-filedescriptors=$$(( 16384 * 64 )) \
                --with-large-files \
                --with-aio \
                --enable-async-io=8 \

diff --git a/src/patches/squid-3.3.10-set-rlimit-fds.patch b/src/patches/squid-3.3.10-set-rlimit-fds.patch
new file mode 100644 (file)
index 0000000..a80ce73
--- /dev/null
+++ b/src/patches/squid-3.3.10-set-rlimit-fds.patch
@@ -0,0 +1,51 @@
+http://bazaar.launchpad.net/~squid/squid/3-trunk/revision/13144
+
+    Committer: Amos Jeffries
+    Date: 2013-11-23 01:28:52 UTC
+    Revision ID: squid3@treenet.co.nz-20131123012852-zpe8hamjrs5vy42w
+
+http://bugs.squid-cache.org/show_bug.cgi?id=3970
+Bug 3970: max_filedescriptors disabled due to missing setrlimit
+
+=== modified file 'configure.ac'
+--- configure.ac       2013-11-16 13:19:28 +0000
++++ configure.ac       2013-11-23 01:28:52 +0000
+@@ -2534,7 +2534,6 @@
+     ;;
+ esac
+ 
+-
+ dnl --with-maxfd present for compatibility with Squid-2.
+ dnl undocumented in ./configure --help  to encourage using the Squid-3 directive
+ AC_ARG_WITH(maxfd,,
+@@ -2542,6 +2541,7 @@
+   case ${withval} in
+     [[0-9]]*)
+       squid_filedescriptors_num=$withval
++      AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)])
+       ;;
+     *)
+       AC_MSG_ERROR(--with-maxfd expects a numeric argument)
+@@ -2556,6 +2556,7 @@
+   case ${withval} in
+     [[0-9]]*)
+       squid_filedescriptors_num=$withval
++      AC_MSG_NOTICE([forcing default of $squid_filedescriptors_num filedescriptors (user-forced)])
+       ;;
+     *)
+       AC_MSG_ERROR(--with-filedescriptors expects a numeric argument)
+@@ -2564,10 +2565,9 @@
+ ])
+ 
+ SQUID_CHECK_DEFAULT_FD_SETSIZE
+-if test "x$squid_filedescriptors_num" = "x"; then
+-  SQUID_CHECK_MAXFD
+-else
+-  AC_MSG_NOTICE([forcing use of $squid_filedescriptors_num filedescriptors (user-forced)])
++SQUID_CHECK_MAXFD
++if test "x$squid_filedescriptors_num" != "x"; then
++  AC_MSG_NOTICE([Default number of fieldescriptors: $squid_filedescriptors_num])
+ fi
+ if test "$squid_filedescriptors_num" -lt 512 ; then
+     AC_MSG_WARN([$squid_filedescriptors_num may not be enough filedescriptors if your])
+