Merge branch 'master' into next

diff --git a/config/rootfiles/common/i586/strongswan-padlock b/config/rootfiles/common/i586/strongswan-padlock
index 02aa457d31559086586f188971b2c516e1fba7cb..4ebfc75b9ab842ff7eac28f2fc3d4d1f3ab279b4 100644 (file)
--- a/config/rootfiles/common/i586/strongswan-padlock
+++ b/config/rootfiles/common/i586/strongswan-padlock
@@ -1 +1,2 @@
 usr/lib/ipsec/plugins/libstrongswan-padlock.so
+usr/lib/ipsec/plugins/libstrongswan-rdrand.so

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/config/rootfiles/common/strongswan b/config/rootfiles/common/strongswan
index 5d61ec17b4d0ba4ff5cc616f282e896265f5f846..d045c312c61c37f86c09878fbd766d49f56fe80e 100644 (file)
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -10,6 +10,7 @@ etc/ipsec.d/private
 etc/ipsec.d/reqs
 etc/ipsec.secrets
 etc/strongswan.conf
+usr/bin/pki
 #usr/lib/ipsec
 #usr/lib/ipsec/libcharon.a
 #usr/lib/ipsec/libcharon.la
@@ -74,6 +75,7 @@ usr/lib/ipsec/plugins/libstrongswan-sha2.so
 usr/lib/ipsec/plugins/libstrongswan-socket-default.so
 usr/lib/ipsec/plugins/libstrongswan-sshkey.so
 usr/lib/ipsec/plugins/libstrongswan-stroke.so
+usr/lib/ipsec/plugins/libstrongswan-unity.so
 usr/lib/ipsec/plugins/libstrongswan-updown.so
 usr/lib/ipsec/plugins/libstrongswan-x509.so
 usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
@@ -90,6 +92,17 @@ usr/libexec/ipsec/scepclient
 usr/libexec/ipsec/starter
 usr/libexec/ipsec/stroke
 usr/sbin/ipsec
+#usr/share/man/man1/pki---gen.1
+#usr/share/man/man1/pki---issue.1
+#usr/share/man/man1/pki---keyid.1
+#usr/share/man/man1/pki---pkcs7.1
+#usr/share/man/man1/pki---print.1
+#usr/share/man/man1/pki---pub.1
+#usr/share/man/man1/pki---req.1
+#usr/share/man/man1/pki---self.1
+#usr/share/man/man1/pki---signcrl.1
+#usr/share/man/man1/pki---verify.1
+#usr/share/man/man1/pki.1
 #usr/share/man/man5/ipsec.conf.5
 #usr/share/man/man5/ipsec.secrets.5
 #usr/share/man/man5/strongswan.conf.5

diff --git a/config/rootfiles/packages/check_mk_agent b/config/rootfiles/packages/check_mk_agent
index 073b483785453cf2baca0f0e1ab92d8c524de031..1d68f74d61d8ec90ab646c47e4321c5ce3340426 100644 (file)
--- a/config/rootfiles/packages/check_mk_agent
+++ b/config/rootfiles/packages/check_mk_agent
@@ -1,2 +1,3 @@
 usr/bin/check_mk_agent
+etc/xinetd.d/check_mk_agent
 usr/bin/waitmax

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index d58bcc300cdc2f816ea383453fbd379bc8e8657d..d1d655a8f19c694ea3a8cf3216eeecd2e4ff34f3 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -437,6 +437,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
@@ -512,13 +518,6 @@ WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: advproxy errmsg proxy ports equal
 WARNING: untranslated string: advproxy proxy port transparent
 WARNING: untranslated string: bytes
-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: least preferred
 WARNING: untranslated string: most preferred
 WARNING: untranslated string: new
@@ -527,82 +526,6 @@ 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: 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/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/check_mk_agent b/lfs/check_mk_agent
index c0f70d15549ac2aa27f714b1e85c579f091da44e..6e6d557d2cfb648150fa150e3a747a2d08b5c7db 100644 (file)
--- a/lfs/check_mk_agent
+++ b/lfs/check_mk_agent
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.2.0p3
+VER        = 1.2.2p2
 
 THISAPP    = check_mk_agent-$(VER)
 DL_FILE    = check_mk-${VER}.tar.gz
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2c0f27fe8b6e3455557ecb30954d8a79
+$(DL_FILE)_MD5 = caa0f7662b4d170b2b6db2516bd41a89
 
 install : $(TARGET)
 check : $(patsubst %,$(DIR_CHK)/%,$(objects))
@@ -78,6 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && tar xzf agents.tar.gz
        cd $(DIR_APP) && install -v -m 755 check_mk_agent.linux /usr/bin/check_mk_agent
+       -mkdir /etc/xinetd.d
+       cd $(DIR_APP) && install -v -m 755 xinetd.conf /etc/xinetd.d/check_mk_agent
        cd $(DIR_APP) && gcc $(CFLAGS) waitmax.c -o waitmax
        cd $(DIR_APP) && install -v -m 755 waitmax /usr/bin/waitmax
        @rm -rf $(DIR_APP)

diff --git a/lfs/nagios b/lfs/nagios
index 2bb2a41efdf6bd451c26618c779e40377ca79e44..a9cef536f750de9f8ff53ed4ca5a15056013a9e0 100644 (file)
--- a/lfs/nagios
+++ b/lfs/nagios
@@ -103,7 +103,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_SRC)/nagios-plugins* && ./configure --prefix=/usr \
                --libexecdir=/usr/lib/nagios \
                --with-nagios-user=nobody --with-nagios-group=nobody
-       cd $(DIR_SRC)/nagios-plugins* && make $(MAKETUNING)
+       cd $(DIR_SRC)/nagios-plugins* && make
        cd $(DIR_SRC)/nagios-plugins* && make install
        chown -R nobody:nobody /var/nagios
        ln -s /etc/init.d/nagios /etc/rc.d/rc3.d/S67nagios

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/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/lfs/strongswan b/lfs/strongswan
index 4701f34782c6961306841ddde5e72ca9d1d76802..c7abf7a4d3837d3c4fbc48fa418399fe74eeb928 100644 (file)
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.1.0
+VER        = 5.1.1
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -33,9 +33,13 @@ DIR_APP    = $(DIR_SRC)/strongswan-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ifeq "$(MACHINE)" "i586"
-       PADLOCK = --enable-padlock
+       CONFIGURE_OPTIONS = \
+               --enable-padlock \
+               --enable-rdrand
 else
-       PADLOCK = --disable-padlock
+       CONFIGURE_OPTIONS = \
+               --disable-padlock \
+               --disable-rdrand
 endif
 
 ###############################################################################
@@ -46,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c1cd0a3ba9960f590cae28c8470800e8
+$(DL_FILE)_MD5 = e3af3d493d22286be3cd794533a8966a
 
 install : $(TARGET)
 
@@ -78,6 +82,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-4.5.3_ipfire.patch
+       cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/strongswan-5.1.1-delay-dpd.patch
 
        cd $(DIR_APP) && [ -x "configure" ] || ./autogen.sh
        cd $(DIR_APP) && ./configure \
@@ -92,9 +97,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-eap-peap \
                --enable-eap-mschapv2 \
                --enable-eap-identity \
-               $(PADLOCK)
+               --enable-unity \
+               $(CONFIGURE_OPTIONS)
 
-       cd $(DIR_APP) && make $(MAKETUNING) LDFLAGS="-lrt"
+       cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
        # Remove all library files we don't want or need.

diff --git a/src/paks/check_mk_agent/install.sh b/src/paks/check_mk_agent/install.sh
index 682363b5c7e9037200c075d9e576a2d00e5c801c..6aed752a8ff3cf3df0f463ab623d104d2cac2eb1 100644 (file)
--- a/src/paks/check_mk_agent/install.sh
+++ b/src/paks/check_mk_agent/install.sh
@@ -24,3 +24,13 @@
 . /opt/pakfire/lib/functions.sh
 extract_files
 restore_backup ${NAME}
+
+mkdir -p /usr/lib/check_mk_agent/plugins
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+   if [[ -x /etc/init.d/xinetd ]]
+   then
+      /etc/init.d/xinetd restart
+   fi
+fi

diff --git a/src/paks/check_mk_agent/uninstall.sh b/src/paks/check_mk_agent/uninstall.sh
index 66f4344eb1786eac3c513b706ffb80f00efa02be..3a0860afeb82b8725380cc6fb5a67f98b9e3481b 100644 (file)
--- a/src/paks/check_mk_agent/uninstall.sh
+++ b/src/paks/check_mk_agent/uninstall.sh
@@ -24,3 +24,11 @@
 . /opt/pakfire/lib/functions.sh
 make_backup ${NAME}
 remove_files
+
+if [[ -x /usr/sbin/xinetd ]];
+then
+   if [[ -x /etc/init.d/xinetd ]]
+   then
+      /etc/init.d/xinetd restart
+   fi
+fi

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])
+

diff --git a/src/patches/strongswan-5.1.1-delay-dpd.patch b/src/patches/strongswan-5.1.1-delay-dpd.patch
new file mode 100644 (file)
index 0000000..db3d664
--- /dev/null
+++ b/src/patches/strongswan-5.1.1-delay-dpd.patch
@@ -0,0 +1,35 @@
+From b76e96e2ef4d56c863b36c8d3c39e3c2efcf4a7c Mon Sep 17 00:00:00 2001
+From: Martin Willi <martin@revosec.ch>
+Date: Fri, 1 Nov 2013 11:28:53 +0100
+Subject: [PATCH] ike: Don't immediately DPD after deferred DELETEs following IKE_SA rekeying
+
+Some peers seem to defer DELETEs a few seconds after rekeying the IKE_SA, which
+is perfectly valid. For short(er) DPD delays, this leads to the situation where
+we send a DPD request during set_state(), but the IKE_SA has no hosts set yet.
+Avoid that DPD by resetting the INBOUND timestamp during set_state().
+---
+ src/libcharon/sa/ike_sa.c |    8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c
+index 0282087..d482f8b 100644
+--- a/src/libcharon/sa/ike_sa.c
++++ b/src/libcharon/sa/ike_sa.c
+@@ -687,6 +687,14 @@ METHOD(ike_sa_t, set_state, void,
+                                       DBG1(DBG_IKE, "maximum IKE_SA lifetime %ds", t);
+                               }
+                               trigger_dpd = this->peer_cfg->get_dpd(this->peer_cfg);
++                              if (trigger_dpd)
++                              {
++                                      /* Some peers delay the DELETE after rekeying an IKE_SA.
++                                       * If this delay is longer than our DPD delay, we would
++                                       * send a DPD request here. The IKE_SA is not ready to do
++                                       * so yet, so prevent that. */
++                                      this->stats[STAT_INBOUND] = this->stats[STAT_ESTABLISHED];
++                              }
+                       }
+                       break;
+               }
+-- 
+1.7.4.1
+