IPFire-SCM November 2015

ipfire-scm@lists.ipfire.org

1 participants
27 discussions

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 1574f25557d0f1bf9729d61dde9f44f1806d8ede
by git＠ipfire.org 25 Nov '15

25 Nov '15

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 1574f25557d0f1bf9729d61dde9f44f1806d8ede (commit) from 56b9e4553e150d514a47de1af7fae2abc43bdd0f (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 1574f25557d0f1bf9729d61dde9f44f1806d8ede Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 25 12:47:29 2015 +0000 routing.cgi: Fix syntax error that caused an Internal Server Error Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: html/cgi-bin/routing.cgi | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) Difference in files: diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 2c60f67..7636d1e 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -118,10 +118,9 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) { } if ($settings{'ACTION'} eq $Lang::tr{'add'}) { - # Validate inputs - if (!&General::validipandmask($settings{'IP'}))){ - $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'}; + if (!&General::validipandmask($settings{'IP'})){ + $errormessage = $Lang::tr{'invalid ip'}." / ".$Lang::tr{'invalid netmask'}; }else{ #set networkip if not already correctly defined my($ip,$cidr) = split(/\//,$settings{'IP'}); hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e546449f6ac1203c397cd94e12a73640f35518cd
by git＠ipfire.org 23 Nov '15

23 Nov '15

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 e546449f6ac1203c397cd94e12a73640f35518cd (commit) via aaf67a64c3498ab8ed0a453d433807e4b014cb0a (commit) from a74ade6d9a854bd76bd7eecf59eb6954c87dffef (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 e546449f6ac1203c397cd94e12a73640f35518cd Author: Ersan Yildirim <ersan73(a)gmail.com> Date: Mon Nov 23 13:42:45 2015 +0000 Update Turkish translation Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit aaf67a64c3498ab8ed0a453d433807e4b014cb0a Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Mon Nov 23 13:42:08 2015 +0000 Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: doc/language_issues.es | 1 + doc/language_issues.fr | 1 + doc/language_issues.it | 1 + doc/language_issues.nl | 1 + doc/language_issues.pl | 1 + doc/language_issues.ru | 1 + doc/language_issues.tr | 60 ++++++++------------------------------------ doc/language_missings | 4 +++ langs/tr/cgi-bin/tr.pl | 65 ++++++++++++++++++++++++++++++++++++++++++++++-- src/installer/po/LINGUAS | 2 ++ src/setup/po/LINGUAS | 2 ++ 11 files changed, 88 insertions(+), 51 deletions(-) Difference in files: diff --git a/doc/language_issues.es b/doc/language_issues.es index 84298f4..02aaca6 100644 --- a/doc/language_issues.es +++ b/doc/language_issues.es @@ -674,6 +674,7 @@ WARNING: untranslated string: dhcp dns key name WARNING: untranslated string: dhcp dns update WARNING: untranslated string: dhcp dns update algo WARNING: untranslated string: dhcp dns update secret +WARNING: untranslated string: dl client arch insecure WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward diff --git a/doc/language_issues.fr b/doc/language_issues.fr index e9915c8..c201dd9 100644 --- a/doc/language_issues.fr +++ b/doc/language_issues.fr @@ -681,6 +681,7 @@ WARNING: untranslated string: dhcp dns key name WARNING: untranslated string: dhcp dns update WARNING: untranslated string: dhcp dns update algo WARNING: untranslated string: dhcp dns update secret +WARNING: untranslated string: dl client arch insecure WARNING: untranslated string: dnat address WARNING: untranslated string: dns address deleted txt WARNING: untranslated string: dns servers diff --git a/doc/language_issues.it b/doc/language_issues.it index 420a46c..156a359 100644 --- a/doc/language_issues.it +++ b/doc/language_issues.it @@ -680,6 +680,7 @@ WARNING: untranslated string: dhcp dns key name WARNING: untranslated string: dhcp dns update WARNING: untranslated string: dhcp dns update algo WARNING: untranslated string: dhcp dns update secret +WARNING: untranslated string: dl client arch insecure WARNING: untranslated string: email config WARNING: untranslated string: email empty field WARNING: untranslated string: email invalid diff --git a/doc/language_issues.nl b/doc/language_issues.nl index c876987..201d3e4 100644 --- a/doc/language_issues.nl +++ b/doc/language_issues.nl @@ -685,6 +685,7 @@ WARNING: untranslated string: dhcp dns key name WARNING: untranslated string: dhcp dns update WARNING: untranslated string: dhcp dns update algo WARNING: untranslated string: dhcp dns update secret +WARNING: untranslated string: dl client arch insecure WARNING: untranslated string: dns servers WARNING: untranslated string: dnssec aware WARNING: untranslated string: dnssec information diff --git a/doc/language_issues.pl b/doc/language_issues.pl index 84298f4..02aaca6 100644 --- a/doc/language_issues.pl +++ b/doc/language_issues.pl @@ -674,6 +674,7 @@ WARNING: untranslated string: dhcp dns key name WARNING: untranslated string: dhcp dns update WARNING: untranslated string: dhcp dns update algo WARNING: untranslated string: dhcp dns update secret +WARNING: untranslated string: dl client arch insecure WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward diff --git a/doc/language_issues.ru b/doc/language_issues.ru index a03f300..305fc60 100644 --- a/doc/language_issues.ru +++ b/doc/language_issues.ru @@ -676,6 +676,7 @@ WARNING: untranslated string: dhcp dns update WARNING: untranslated string: dhcp dns update algo WARNING: untranslated string: dhcp dns update secret WARNING: untranslated string: disk access per +WARNING: untranslated string: dl client arch insecure WARNING: untranslated string: dnat address WARNING: untranslated string: dns servers WARNING: untranslated string: dnsforward diff --git a/doc/language_issues.tr b/doc/language_issues.tr index 5d1ceb7..68e351c 100644 --- a/doc/language_issues.tr +++ b/doc/language_issues.tr @@ -93,6 +93,7 @@ WARNING: translation string unused: bewan adsl pci st WARNING: translation string unused: bewan adsl usb WARNING: translation string unused: bitrate WARNING: translation string unused: bleeding rules +WARNING: translation string unused: block WARNING: translation string unused: blue access use hint WARNING: translation string unused: blue interface WARNING: translation string unused: cache management @@ -187,7 +188,11 @@ WARNING: translation string unused: edit network WARNING: translation string unused: edit service WARNING: translation string unused: editor WARNING: translation string unused: eg +WARNING: translation string unused: email error WARNING: translation string unused: email server can not be empty +WARNING: translation string unused: email subject +WARNING: translation string unused: email success +WARNING: translation string unused: email text WARNING: translation string unused: enable javascript WARNING: translation string unused: enable wildcards WARNING: translation string unused: enabled on @@ -267,6 +272,7 @@ WARNING: translation string unused: fwhost Standard Network WARNING: translation string unused: fwhost attention WARNING: translation string unused: fwhost blue WARNING: translation string unused: fwhost changeremark +WARNING: translation string unused: fwhost cust geoip WARNING: translation string unused: fwhost err addrgrp WARNING: translation string unused: fwhost err hostorip WARNING: translation string unused: fwhost err mac @@ -284,6 +290,9 @@ WARNING: translation string unused: g.lite WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey +WARNING: translation string unused: geoipblock country code +WARNING: translation string unused: geoipblock country name +WARNING: translation string unused: geoipblock flag WARNING: translation string unused: green interface WARNING: translation string unused: gz with key WARNING: translation string unused: hint @@ -611,6 +620,8 @@ WARNING: translation string unused: transfer limits WARNING: translation string unused: transparent on WARNING: translation string unused: umount WARNING: translation string unused: umount removable media before to unplug +WARNING: translation string unused: unblock +WARNING: translation string unused: unblock all WARNING: translation string unused: unencrypted WARNING: translation string unused: update transcript WARNING: translation string unused: updates @@ -666,62 +677,13 @@ WARNING: translation string unused: year-graph WARNING: translation string unused: yearly firewallhits WARNING: untranslated string: Scan for Songs WARNING: untranslated string: bytes -WARNING: untranslated string: check all -WARNING: untranslated string: dhcp dns enable update -WARNING: untranslated string: dhcp dns key name -WARNING: untranslated string: dhcp dns update -WARNING: untranslated string: dhcp dns update algo -WARNING: untranslated string: dhcp dns update secret -WARNING: untranslated string: email config -WARNING: untranslated string: email empty field -WARNING: untranslated string: email invalid -WARNING: untranslated string: email invalid mailfqdn -WARNING: untranslated string: email invalid mailip -WARNING: untranslated string: email invalid mailport -WARNING: untranslated string: email mailaddr -WARNING: untranslated string: email mailpass -WARNING: untranslated string: email mailport -WARNING: untranslated string: email mailrcpt -WARNING: untranslated string: email mailsender -WARNING: untranslated string: email mailuser -WARNING: untranslated string: email settings -WARNING: untranslated string: email testmail -WARNING: untranslated string: email tls -WARNING: untranslated string: email usemail -WARNING: untranslated string: fwhost addgeoipgrp -WARNING: untranslated string: fwhost cust geoipgroup WARNING: untranslated string: fwhost cust geoipgrp -WARNING: untranslated string: fwhost cust geoiplocation WARNING: untranslated string: fwhost err hostip -WARNING: untranslated string: fwhost newgeoipgrp -WARNING: untranslated string: geoip -WARNING: untranslated string: geoipblock -WARNING: untranslated string: geoipblock block countries -WARNING: untranslated string: geoipblock configuration -WARNING: untranslated string: geoipblock country is allowed -WARNING: untranslated string: geoipblock country is blocked -WARNING: untranslated string: geoipblock enable feature WARNING: untranslated string: ike lifetime should be between 1 and 8 hours -WARNING: untranslated string: incoming compression in bytes per second -WARNING: untranslated string: incoming overhead in bytes per second WARNING: untranslated string: info messages -WARNING: untranslated string: invalid input for valid till days WARNING: untranslated string: no data -WARNING: untranslated string: none -WARNING: untranslated string: outgoing compression in bytes per second -WARNING: untranslated string: outgoing overhead in bytes per second -WARNING: untranslated string: ovpn add conf -WARNING: untranslated string: pptp netconfig -WARNING: untranslated string: pptp peer -WARNING: untranslated string: pptp route -WARNING: untranslated string: required field 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: search -WARNING: untranslated string: uncheck all -WARNING: untranslated string: vpn force mobike -WARNING: untranslated string: vpn statistic n2n -WARNING: untranslated string: vpn statistic rw WARNING: untranslated string: vpn statistics n2n diff --git a/doc/language_missings b/doc/language_missings index 9da0122..c490f2d 100644 --- a/doc/language_missings +++ b/doc/language_missings @@ -94,6 +94,7 @@ < dh key warn < dh key warn1 < dh parameter +< dl client arch insecure < dnat address < dns address deleted txt < dnsforward @@ -704,6 +705,7 @@ < dh key warn < dh key warn1 < dh parameter +< dl client arch insecure < dnat address < dnsforward < dnsforward add a new entry @@ -1295,6 +1297,7 @@ < dh key warn < dh key warn1 < dh parameter +< dl client arch insecure < dnat address < dnsforward < dnsforward add a new entry @@ -1875,6 +1878,7 @@ < dh key warn1 < dh parameter < disk access per +< dl client arch insecure < dnat address < dnsforward < dnsforward add a new entry diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl index 782bc00..3af2339 100644 --- a/langs/tr/cgi-bin/tr.pl +++ b/langs/tr/cgi-bin/tr.pl @@ -9,7 +9,7 @@ 'Async logging enabled' => 'Syslog dosyanın eşzamansız yazmasını aktifleştirin', 'Choose Rule' => 'Aşağıdaki kurallardan <u>birini</u> seçin.', 'Class' => 'Sınıf', -'Class was deleted' => 'with potential subclasses was deleted', +'Class was deleted' => 'Potansiyel alt sınıfları ile silindi', 'ConnSched action' => 'Eylem:', 'ConnSched add action' => 'Eylem ekle', 'ConnSched change profile title' => 'Profili değitirin:', @@ -435,6 +435,7 @@ 'bit' => 'Bit', 'bitrate' => 'Bit hızı', 'bleeding rules' => 'Bleeding Edge Snort Rules', +'block' => 'Engelle', 'blue' => 'MAVİ', 'blue access' => 'Mavi Erişim', 'blue access use hint' => 'Bu MAC ya da cihaz için bir IP adresi girmeniz gerekir. Ayrıca her ikiside girilebilir.', @@ -550,6 +551,7 @@ 'chain' => 'Zincir', 'change passwords' => 'Parola değiştir', 'change share' => 'paylaşım seçeneklerini düzenle', +'check all' => 'Tümünü seç', 'check for net traffic update' => 'Ağ-Trafik güncelleştirmeleri denetle', 'check vpn lr' => 'Kontrol', 'choose config' => 'Yapılandırmayı seçin', @@ -720,6 +722,11 @@ 'dhcp bootp pxe data' => 'Sabit kira için isteğe bağlı bootp pxe verileri girin', 'dhcp configuration' => 'DHCP yapılandırması', 'dhcp create fixed leases' => 'Sabit kiralama oluştur', +'dhcp dns enable update' => 'DNS güncelleştirmesini aktifleştir (RFC2136):', +'dhcp dns key name' => 'Anahtar adı:', +'dhcp dns update' => 'DNS güncelleme', +'dhcp dns update algo' => 'Algoritma:', +'dhcp dns update secret' => 'Gizli:', 'dhcp fixed lease err1' => 'Bu düzeltme için MAC adresini, ana bilgisayar adını veya her ikisinide girmeniz gerekir', 'dhcp fixed lease help1' => 'IP adresleri tam tanımlanmış alan adları (FQDN) şeklinde girilmelidir.', 'dhcp mode' => 'DHCP', @@ -749,6 +756,7 @@ 'display traffic at home' => 'Başlangıç sayfasının üzerinde hesaplanan trafiği göster', 'display webinterface effects' => 'Efektleri aktifleştir', 'dl client arch' => 'İstemci paketlerini indir (zip)', +'dl client arch insecure' => 'Güvenli olamayan istemci paketini indir (zip)', 'dmz' => 'AÇIK BÖLGE', 'dmz pinhole configuration' => 'Açık bölge yapılandırma', 'dmz pinhole rule added' => 'Açık bölge kuralı eklendi; Açık bölge yeniden başlatılıyor', @@ -857,7 +865,27 @@ 'edit share' => 'Paylaşımı düzenle', 'editor' => 'Düzenleyici', 'eg' => 'e.g.:', +'email config' => 'Ayarlar', +'email empty field' => 'Boş alan', +'email error' => 'HATA: Test e-posta gönderilemedi', +'email invalid' => 'Geçersiz alan', +'email invalid mailfqdn' => 'Geçersiz e-posta sunucu fqdn si', +'email invalid mailip' => 'Geçersiz posta sunucusu IP adresi', +'email invalid mailport' => 'Geçersiz posta sunucusu bağlantı noktası', +'email mailaddr' => 'Posta sunucu adresi', +'email mailpass' => 'Parola', +'email mailport' => 'Posta sunucu bağlantı noktası', +'email mailrcpt' => 'Posta alıcısı', +'email mailsender' => 'Posta göndericisi', +'email mailuser' => 'Kullanıcı adı', 'email server can not be empty' => 'E-posta sunucusu boş olamaz', +'email settings' => 'E-posta Hizmeti', +'email subject' => 'IPFire Test E-posta', +'email success' => 'Test e-posta başarıyla gönderildi', +'email testmail' => 'Test e-posta gönder', +'email text' => 'IpFire e-posta servisinden test e-posta.', +'email tls' => 'TLS kullan', +'email usemail' => 'Posta hizmetini aktifleştir', 'emailreportlevel' => 'E-posta rapor seviyesi', 'emerging rules' => 'Emergingthreats.net Topluluk Kuralları', 'empty' => 'Bu alan boş bırakılabilir', @@ -1094,6 +1122,7 @@ 'fwhost OpenVPN static host' => 'OpenVPN statik ana bilgisayar', 'fwhost OpenVPN static network' => 'OpenVPN statik ağ', 'fwhost Standard Network' => 'Standart ağ', +'fwhost addgeoipgrp' => 'Yeni GeoIP grubu ekle', 'fwhost addgrp' => 'Yeni ağ/ana bilgisayar grubu ekle:', 'fwhost addgrpname' => 'Grup adı:', 'fwhost addhost' => 'Yeni bir ana bilgisayar ekle:', @@ -1109,6 +1138,9 @@ 'fwhost change' => 'Değiştir', 'fwhost changeremark' => 'Sadece açıklamalar değiştirilmiş', 'fwhost cust addr' => 'Ana bilgisayarlar', +'fwhost cust geoip' => 'GeoIP Grupları', +'fwhost cust geoipgroup' => 'GeoIP Grupları', +'fwhost cust geoiplocation' => 'GeoIP Konumları', 'fwhost cust grp' => 'Ağ/Ana Bilgisayar Grupları:', 'fwhost cust net' => 'Ağlar', 'fwhost cust service' => 'Hizmetler:', @@ -1155,6 +1187,7 @@ 'fwhost ipsec net' => 'IPsec ağları:', 'fwhost menu' => 'Güvenlik Duvarı Grupları', 'fwhost netaddress' => 'Ağ adresi', +'fwhost newgeoipgrp' => 'GeoIP Grupları', 'fwhost newgrp' => 'Ağ/Ana Bilgisayar Grupları', 'fwhost newhost' => 'Ana Bilgisayarlar', 'fwhost newnet' => 'Ağlar', @@ -1191,6 +1224,16 @@ 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Yönetici ve sunucu sertifikalarının oluşturulması biraz zaman alır. Eski donanımlarda bu süre birkaç dakikayı bulabilir. Lütfen bekleyin.', 'genkey' => 'PSK oluştur', 'genre' => 'Tür', +'geoip' => 'GeoIP', +'geoipblock' => 'GeoIP Engelleme', +'geoipblock block countries' => 'Engellenen ülkeler', +'geoipblock configuration' => 'GeoIP Yapılandırması', +'geoipblock country code' => 'Ülke Kodu', +'geoipblock country is allowed' => 'Bu ülkeden gelen trafiğe izin ver', +'geoipblock country is blocked' => 'Bu ülkeden gelen trafiği engelle', +'geoipblock country name' => 'Ülke Adı', +'geoipblock enable feature' => 'GeoIP tabanlı engellemeyi aktifleştir:', +'geoipblock flag' => 'Bayrak', 'global settings' => 'Genel ayarlar', 'gpl i accept these terms and conditions' => 'Bu şartları kabul ediyorum', 'gpl license agreement' => 'Lisans Sözleşmesi', @@ -1270,7 +1313,9 @@ 'inactive' => 'Pasif', 'include logfiles' => 'Günlük dosyaları dahil', 'incoming' => 'gelen', +'incoming compression in bytes per second' => 'Gelen Sıkıştırma', 'incoming firewall access' => 'Gelen güvenlik duvarı bağlantısı', +'incoming overhead in bytes per second' => 'gelen ek yük', 'incoming traffic in bytes per second' => 'gelen trafik', 'incorrect password' => 'Yanlış parola', 'info' => 'Bilgi', @@ -1325,6 +1370,7 @@ 'invalid input for organization' => 'Kuruluş için geçersiz giriş.', 'invalid input for remote host/ip' => 'Ana bilgisayar/ip uzak giriş için geçersiz giriş.', 'invalid input for state or province' => 'Devlet veya il için geçersiz giriş.', +'invalid input for valid till days' => 'Geçerli kadar (gün) geçersiz girdi.', 'invalid ip' => 'Geçersiz IP adresi', 'invalid keep time' => 'Tutma zamanı geçerli bir sayı olmalıdır.', 'invalid key' => 'Geçersiz anahtar.', @@ -1625,6 +1671,7 @@ 'no modem selected' => 'Modem seçilmedi', 'no set selected' => 'Hiçbir ayar seçilmedi', 'no time limit' => 'sınırsız zaman', +'none' => 'hiçbiri', 'none found' => 'hiçbiri bulunamadı', 'nonetworkname' => 'Ağ adı girilmedi', 'noservicename' => 'Hizmet adı girilmedi', @@ -1695,6 +1742,7 @@ 'our donors' => 'Destekçimiz', 'out' => 'Dışarı', 'outgoing' => 'giden', +'outgoing compression in bytes per second' => 'Giden sıkıştırma', 'outgoing firewall' => 'Giden güvenlik duvarı', 'outgoing firewall access' => 'Giden güvenlik duvarı bağlantısı', 'outgoing firewall add ip group' => 'IP Adres Grubu Ekle', @@ -1717,9 +1765,11 @@ 'outgoing firewall reset' => 'Tümünü sıfırla', 'outgoing firewall view group' => 'Grup bilgileri', 'outgoing firewall warning' => 'Kaynak IP veya MAC seçildiğinde bunlar yok sayılır', +'outgoing overhead in bytes per second' => 'giden ek yük', 'outgoing traffic in bytes per second' => 'giden trafik', 'override mtu' => 'Varsayılan MTU seçeneğini geçersiz kıl', 'ovpn' => 'OpenVPN', +'ovpn add conf' => 'Ek yapılandırma', 'ovpn con stat' => 'OpenVPN Bağlantı İstatistiği', 'ovpn config' => 'OVPN-Yapılandırması', 'ovpn crypt options' => 'Şifreleme seçenekleri', @@ -1772,7 +1822,7 @@ 'ovpnstatus log' => 'OVPN-Durum-Günlük', 'ovpnsys log' => 'OVPN-Durum-Günlük', 'p2p block' => 'P2P Ağları', -'p2p block save notice' => 'Yaptığınız değişiklikleri uygulamak için güvenlik duvarı kural ayarlarını lütfen yeniden yükleyin.', +'p2p block save notice' => 'Yaptığınız değişiklikleri uygulamak için güvenlik duvarı kuralı ayarlarını lütfen yeniden yükleyin.', 'package failed to install' => 'Paket yüklenemedi.', 'pagerefresh' => 'Sayfa yenileniyor. Lütfen bekleyin.', 'pakfire accept all' => 'Tüm paketleri yüklemek istiyor musunuz?', @@ -1829,6 +1879,9 @@ 'ppp setup' => 'PPP kurulumu', 'pppoe' => 'PPPoE', 'pppoe settings' => 'Ek PPPoE ayarları:', +'pptp netconfig' => 'Ağ yapılandırma', +'pptp peer' => 'Denk', +'pptp route' => 'PPTP Yolu', 'pptp settings' => 'Ek PPTP ayarları:', 'pre-shared key is too short' => 'Ön paylaşımlı anahtar çok kısa.', 'prefered master' => 'Tercih edilen yönetici', @@ -1921,6 +1974,7 @@ 'reportlevel' => 'Seviye raporu', 'request' => 'Talep', 'requested data' => '1. Bağlantı Ayarları:', +'required field' => 'Gerekli alan', 'reserved dst port' => 'IPFire için ayrılmış hedef bağlantı noktası numarası:', 'reserved src port' => 'IPFire için ayrılmış kaynak bağlantı noktası numarası:', 'reset' => 'Sıfırla', @@ -1959,6 +2013,7 @@ 'save settings' => 'Ayarları kaydet', 'save-adv-options' => 'Gelişmiş Seçenekleri Kaydet', 'script name' => 'Komut adı:', +'search' => 'Ara', 'secondary dns' => 'İkincil DNS:', 'secondary ntp server' => 'İkincil NTP sunucusu', 'secondary wins server address' => 'İkincil WINS sunucu adresi', @@ -2248,6 +2303,9 @@ '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.', 'unable to contact' => 'Bağlantı Kurulamadı', +'unblock' => 'Engeli kaldır', +'unblock all' => 'Tüm engeli kaldır', +'uncheck all' => 'Tümünü bırak', 'unencrypted' => 'Şifresiz', 'uninstall' => 'Kaldır', 'unix charset' => 'UNIX karakterleri', @@ -2596,6 +2654,7 @@ 'vpn configuration main' => 'VPN yapılandırma - Ana', '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 incompatible use of defaultroute' => 'hostname=%defaultroute izin verilmiyor', 'vpn keyexchange' => 'Anahtar değişimi', 'vpn local id' => 'Yerel kimlik', @@ -2608,6 +2667,8 @@ '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 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.', 'waiting to synchronize clock' => 'Saat eşleştirmesi bekleniyor', diff --git a/src/installer/po/LINGUAS b/src/installer/po/LINGUAS index 8678850..6cba810 100644 --- a/src/installer/po/LINGUAS +++ b/src/installer/po/LINGUAS @@ -16,8 +16,10 @@ jv km_KH nl pl +pt pt_BR pt_PT +ro ro_RO ru rw diff --git a/src/setup/po/LINGUAS b/src/setup/po/LINGUAS index 8678850..6cba810 100644 --- a/src/setup/po/LINGUAS +++ b/src/setup/po/LINGUAS @@ -16,8 +16,10 @@ jv km_KH nl pl +pt pt_BR pt_PT +ro ro_RO ru rw hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. b57a0ea8deb6dd3b71761ffc05acc7eab28fb0c6
by git＠ipfire.org 22 Nov '15

22 Nov '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via b57a0ea8deb6dd3b71761ffc05acc7eab28fb0c6 (commit) via cf4b3e07dd9ff0565472e813840d0af1456e0785 (commit) from e1e700ca3ba4c91a0f521b5789ec54101e2b3440 (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 b57a0ea8deb6dd3b71761ffc05acc7eab28fb0c6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Nov 21 15:54:52 2015 +0000 gcc: Update to version 5.2 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit cf4b3e07dd9ff0565472e813840d0af1456e0785 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 5 00:18:26 2015 +0000 isl: Update to version 0.14.1 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: gcc/gcc.nm | 98 +++-- ...onfigure.patch => 01_all_gcc51_configure.patch} | 2 +- ...ile.in.patch => 03_all_gcc51_Makefile.in.patch} | 28 +- gcc/patches/04_all_gcc49_default_ssp.patch | 261 ----------- gcc/patches/05_all_gcc48_gcc.c.patch0 | 7 +- .../10_all_gcc49_default-fortify-source.patch | 29 -- ...11_all_gcc49_default-warn-format-security.patch | 43 -- .../12_all_gcc49_default-warn-trampolines.patch | 25 -- gcc/patches/24_all_gcc49_invoke.texi.patch0 | 20 +- gcc/patches/33_all_gcc48_config_rs6000.patch | 34 ++ ...g_i386.patch => 34_all_gcc51_config_i386.patch} | 8 +- ...fig_arm.patch => 35_all_gcc51_config_arm.patch} | 10 +- gcc/patches/36_all_gcc48_config_aarch64.patch | 35 ++ gcc/patches/36_all_gcc51_config_mips.patch | 43 ++ gcc/patches/37_all_gcc48_config_ia64.patch | 30 ++ gcc/patches/40_all_gcc49_config_esp.patch0 | 11 +- gcc/patches/53_all_libitm-no-fortify-source.patch | 27 -- gcc/patches/gcc49-aarch64-unwind-opt.patch0 | 338 --------------- gcc/patches/gcc49-cloog-dl.patch0 | 476 --------------------- gcc/patches/gcc49-cloog-dl2.patch0 | 74 ---- gcc/patches/gcc49-color-auto.patch0 | 46 -- gcc/patches/gcc49-pr38757.patch0 | 106 ----- isl/isl.nm | 5 +- 23 files changed, 263 insertions(+), 1493 deletions(-) rename gcc/patches/{01_all_gcc49_configure.patch => 01_all_gcc51_configure.patch} (99%) rename gcc/patches/{03_all_gcc49_Makefile.in.patch => 03_all_gcc51_Makefile.in.patch} (79%) delete mode 100644 gcc/patches/04_all_gcc49_default_ssp.patch delete mode 100644 gcc/patches/10_all_gcc49_default-fortify-source.patch delete mode 100644 gcc/patches/11_all_gcc49_default-warn-format-security.patch delete mode 100644 gcc/patches/12_all_gcc49_default-warn-trampolines.patch create mode 100644 gcc/patches/33_all_gcc48_config_rs6000.patch rename gcc/patches/{34_all_gcc48_config_i386.patch => 34_all_gcc51_config_i386.patch} (92%) rename gcc/patches/{35_all_gcc48_config_arm.patch => 35_all_gcc51_config_arm.patch} (75%) create mode 100644 gcc/patches/36_all_gcc48_config_aarch64.patch create mode 100644 gcc/patches/36_all_gcc51_config_mips.patch create mode 100644 gcc/patches/37_all_gcc48_config_ia64.patch delete mode 100644 gcc/patches/53_all_libitm-no-fortify-source.patch delete mode 100644 gcc/patches/gcc49-aarch64-unwind-opt.patch0 delete mode 100644 gcc/patches/gcc49-cloog-dl.patch0 delete mode 100644 gcc/patches/gcc49-cloog-dl2.patch0 delete mode 100644 gcc/patches/gcc49-color-auto.patch0 delete mode 100644 gcc/patches/gcc49-pr38757.patch0 Difference in files: diff --git a/gcc/gcc.nm b/gcc/gcc.nm index 11fecd5..30c020f 100644 --- a/gcc/gcc.nm +++ b/gcc/gcc.nm @@ -3,11 +3,11 @@ # Copyright (C) - IPFire Development Team <info(a)ipfire.org> # ############################################################################### -# Configure build to compile with cloog. -build_cloog = 1 +# Configure build to compile with graphite +build_graphite = 1 name = gcc -version = 4.9.3 +version = 5.2.0 release = 1 maintainer = Michael Tremer <michael.tremer(a)ipfire.org> @@ -23,7 +23,6 @@ end # This is the at least required version of binutils. binutils_version = 2.24 -cloog_version = 0.18.1 source_dl = http://ftp.gnu.org/gnu/gcc/%{thisapp}/ source_dl += ftp://gcc.gnu.org/pub/gcc/infrastructure/ @@ -41,17 +40,16 @@ build glibc-devel >= 2.16 gmp-devel libffi-devel - libmpc-devel + libmpc-devel >= 0.8.1 mpfr-devel perl texinfo zlib-devel end - # If cloog support is enabled, we require the devel packages for build. - if "%{build_cloog}" == "1" - requires += cloog-devel >= %{cloog_version} - requires += isl-devel + # If graphite support is enabled, we require the devel packages for build. + if "%{build_graphite}" == "1" + requires += isl-devel >= 0.14 end # Build libquadmath (only on x86). @@ -63,6 +61,9 @@ build # Build libtasn (only on x86_64). build_libtsan = 0 + # Build libubsan + build_libubsan = 0 + # Build libcilkrts (only x86) build_libcilkrts = 0 @@ -78,6 +79,7 @@ build build_libquadmath = 1 build_liblsan = 1 build_libtsan = 1 + build_libubsan = 1 build_libcilkrts = 1 end @@ -85,14 +87,12 @@ build configure_options = --with-arch=%{DISTRO_ARCH} --with-tune=generic build_libquadmath = 1 + build_libubsan = 1 build_libcilkrts = 1 end - if "%{DISTRO_ARCH}" == "armv5tel" - make_bootstrap = bootstrap - - configure_options += --disable-sjlj-exceptions - configure_options += --with-float=soft + if "%{DISTRO_ARCH}" == "aarch64" + build_libubsan = 1 end if "%{DISTRO_ARCH}" == "armv7hl" @@ -101,19 +101,27 @@ build configure_options += --disable-sjlj-exceptions configure_options += \ - --with-cpu=cortex-a8 \ --with-tune=cortex-a8 \ --with-arch=armv7-a \ --with-float=hard \ --with-fpu=vfpv3-d16 \ --with-abi=aapcs-linux + + build_libubsan = 1 end - if "%{build_cloog}" == "1" + if "%{DISTRO_ARCH}" == "armv5tel" + make_bootstrap = bootstrap + + configure_options += --disable-sjlj-exceptions + configure_options += --with-float=soft + + build_libubsan = 1 + end + + if "%{build_graphite}" == "1" configure_options += \ - --with-cloog=%{prefix} \ - --with-isl=%{prefix} \ - --enable-cloog-backend=isl + --with-isl end # CFLAGS for hardening. @@ -169,12 +177,16 @@ build #./contrib/gcc_update --touch end + export CC=gcc + export CXX=g++ + build cd %{DIR_SRC}/gcc-build # Modify CFLAGS CFLAGS="%{CFLAGS}" CFLAGS=$(echo ${CFLAGS} | sed -e 's/$-Wp,$\?-D_FORTIFY_SOURCE=[12]//g') + CFLAGS=$(echo ${CFLAGS} | sed -e 's/-Werror=format-security//g') CFLAGS=$(echo ${CFLAGS} | sed -e 's/-m64//g;s/-m32//g;s/-m31//g') CFLAGS=$(echo ${CFLAGS} | sed -e 's/-mfpmath=sse/-mfpmath=sse -msse2/g') CFLAGS=$(echo ${CFLAGS} | sed -e 's/-march=i.86//g') @@ -182,7 +194,7 @@ build CFLAGS=$(echo "${CFLAGS}" | sed -e 's/[[:blank:]]\+/ /g') CXXFLAGS=$(echo ${CFLAGS} | sed -e 's/ -Wall//g') CXXFLAGS=$(echo ${CXXFLAGS} | sed -e 's/ -fexceptions / /g') - CXXFLAGS=$(echo ${CXXFLAGS} | sed -e 's/ -Werror=format-security / -Wformat -Werror=format-security /g') + #CXXFLAGS=$(echo ${CXXFLAGS} | sed -e 's/ -Werror=format-security / -Wformat -Werror=format-security /g') case "${CFLAGS}" in *-fasynchronous-unwind-tables*) @@ -220,6 +232,7 @@ build --enable-plugin \ --enable-initfini-array \ --disable-libgcj \ + --enable-gnu-indirect-function \ %{configure_options} # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58012 @@ -291,7 +304,8 @@ build chmod 755 %{BUILDROOT}%{libdir}/libgomp.so.1.* # libstdc++ - ln -svf ../../../libstdc++.so.6.0.20 ${FULLPATH}/libstdc++.so + ln -svf ../../../libstdc++.so.6.0.21 ${FULLPATH}/libstdc++.so + mv -vf %{BUILDROOT}%{libdir}/lib{std,sup}c++.a ${FULLPATH} # libquadmath if [ "%{build_libquadmath}" = "1" ]; then @@ -317,8 +331,10 @@ build fi # libubsan - ln -svf ../../../libubsan.so.0.0.0 ${FULLPATH}/libubsan.so - chmod 755 %{BUILDROOT}%{libdir}/libubsan.so.* + if [ "%{build_libubsan}" = "1" ]; then + ln -svf ../../../libubsan.so.0.0.0 ${FULLPATH}/libubsan.so + chmod 755 %{BUILDROOT}%{libdir}/libubsan.so.* + fi # libcilkrts if [ "%{build_libcilkrts}" = "1" ]; then @@ -330,6 +346,8 @@ build keep_libraries %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libgcc.a %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libgcc_eh.a + %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libstdc++.a + %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libsupc++.a end end @@ -462,6 +480,20 @@ packages end end + package libstdc++-static + summary = Static libraries for the GNU standard C++ library + description = %{summary} + + requires + libstdc++-devel = %{thisver} + end + + files + %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libstdc++.a + %{libdir}/gcc/%{DISTRO_BUILDTARGET}/%{version}/libsupc++.a + end + end + package libgomp summary = GCC OpenMP v3.0 shared support library. description @@ -561,7 +593,7 @@ packages end files - %{libdir}/libasan.so.1* + %{libdir}/libasan.so.2* end end @@ -579,15 +611,17 @@ packages end end - package libubsan - summary = The Undefined Behavior Sanitizer runtime library - description - This package contains the Undefined Behavior Sanitizer library - which is used for -fsanitize=undefined instrumented programs. - end + if "%{build_libubsan}" == "1" + package libubsan + summary = The Undefined Behavior Sanitizer runtime library + description + This package contains the Undefined Behavior Sanitizer library + which is used for -fsanitize=undefined instrumented programs. + end - files - %{libdir}/libubsan.so.0* + files + %{libdir}/libubsan.so.0* + end end end diff --git a/gcc/patches/01_all_gcc49_configure.patch b/gcc/patches/01_all_gcc49_configure.patch deleted file mode 100644 index ab9aae0..0000000 --- a/gcc/patches/01_all_gcc49_configure.patch +++ /dev/null @@ -1,156 +0,0 @@ -2013-12-30 Magnus Granberg <zorry(a)gentoo.org> - - * gcc/configure.ac Add --enable-esp and define ENABLE_ESP. - Check if we support crtbeginP and define ENABLE_CRTBEGINP. - * gcc/configure Regenerated - - ---- a/gcc/configure.ac 2011-11-18 11:52:32.000000000 +0100 -+++ b/gcc/configure.ac 2012-10-02 17:39:15.649526241 +0200 -@@ -5130,6 +5237,55 @@ if test x"${LINKER_HASH_STYLE}" != x; th - [The linker hash style]) - fi - -+# -------------- -+# Esp checks -+# -------------- -+ -+# Check whether --enable-esp was given and target have the support. -+AC_ARG_ENABLE([esp], -+[AS_HELP_STRING([--enable-esp], -+ [Enable Stack protector and Position independent executable as -+ default if we have suppot for it when compiling -+ and link with -z now as default. -+ Linux targets supported i*86, x86_64, x32, -+ powerpc, powerpc64, ia64, arm and mips.])], -+ enable_esp=$enableval, -+ enable_esp=no) -+if test $enable_esp = yes ; then -+ AC_MSG_CHECKING(if $target support esp) -+ case "$target" in -+ i?86*-*-linux* | x86_64-*-linux* | powerpc*-*-linux* | mips-*-linux* | arm*-*-linux* | ia64-*-linux*) -+ enable_esp=yes -+ AC_DEFINE(ENABLE_ESP, 1, -+ [Define if your target support esp and you have enable it.]) -+ ;; -+ *) -+ enable_esp=no -+ ;; -+ esac -+AC_MSG_RESULT($enable_esp) -+fi -+AC_SUBST([enable_esp]) -+if test $enable_esp = yes ; then -+ AC_MSG_CHECKING(checking for crtbeginP.o support) -+ if test x$enable_esp = xyes ; then -+ case "$target" in -+ ia64*-*-linux*) -+ enable_crtbeginP=no ;; -+ *-*-linux*) -+ if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then -+ enable_crtbeginP=yes -+ AC_DEFINE(ENABLE_CRTBEGINP, 1, -+ [Define if your compiler will support crtbeginP.]) -+ fi -+ ;; -+ *) enable_crtbeginP=no ;; -+ esac -+ fi -+ AC_MSG_RESULT($enable_crtbeginP) -+fi -+AC_SUBST([enable_crtbeginP]) -+ - # Configure the subdirectories - # AC_CONFIG_SUBDIRS($subdirs) - ---- a/gcc/configure 2013-02-01 21:26:24.000000000 +0100 -+++ b/gcc/configure 2013-02-12 01:59:20.000000000 +0100 -@@ -600,6 +600,8 @@ - ac_subst_vars='LTLIBOBJS - LIBOBJS - PICFLAG -+enable_crtbeginP -+enable_esp - enable_host_shared - enable_plugin - pluginlibs -@@ -920,6 +922,7 @@ - enable_plugin - enable_libquadmath_support - with_linker_hash_style -+enable_esp - ' - ac_precious_vars='build_alias - host_alias -@@ -1633,6 +1636,11 @@ - --enable-plugin enable plugin support - --disable-libquadmath-support - disable libquadmath support for Fortran -+ --enable-esp Enable Stack protector and Position independent -+ executable as default if we have suppot for it when -+ compiling and link with -z now as default. -+ Linux targets supported i*86, x86_64, x32, -+ powerpc, powerpc64, ia64, arm and mips. - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -27419,6 +27427,59 @@ - - fi - -+# -------------- -+# Esp checks -+# -------------- -+ -+# Check whether --enable-esp was given and target have the support. -+# Check whether --enable-esp was given. -+if test "${enable_esp+set}" = set; then : -+ enableval=$enable_esp; enable_esp=$enableval -+else -+ enable_esp=no -+fi -+ -+if test $enable_esp = yes ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $target support esp" >&5 -+$as_echo_n "checking if $target support esp... " >&6; } -+ case "$target" in -+ i?86*-*-linux* | x86_64-*-linux* | powerpc*-*-linux* | mips*-*-linux* | arm*-*-linux* | ia64-*-linux*) -+ enable_esp=yes -+ -+$as_echo "#define ENABLE_ESP 1" >>confdefs.h -+ -+ ;; -+ *) -+ enable_esp=no -+ ;; -+ esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_esp" >&5 -+$as_echo "$enable_esp" >&6; } -+fi -+ -+if test $enable_esp = yes ; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for crtbeginP.o support" >&5 -+$as_echo_n "checking checking for crtbeginP.o support... " >&6; } -+ if test x$enable_esp = xyes ; then -+ case "$target" in -+ ia64*-*-linux*) -+ enable_crtbeginP=no ;; -+ *-*-linux*) -+ if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then -+ enable_crtbeginP=yes -+ -+$as_echo "#define ENABLE_CRTBEGINP 1" >>confdefs.h -+ -+ fi -+ ;; -+ *) enable_crtbeginP=no ;; -+ esac -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_crtbeginP" >&5 -+$as_echo "$enable_crtbeginP" >&6; } -+fi -+ -+ - # Configure the subdirectories - # AC_CONFIG_SUBDIRS($subdirs) - diff --git a/gcc/patches/01_all_gcc51_configure.patch b/gcc/patches/01_all_gcc51_configure.patch new file mode 100644 index 0000000..4f58ab9 --- /dev/null +++ b/gcc/patches/01_all_gcc51_configure.patch @@ -0,0 +1,156 @@ +2013-12-30 Magnus Granberg <zorry(a)gentoo.org> + + * gcc/configure.ac Add --enable-esp and define ENABLE_ESP. + Check if we support crtbeginP and define ENABLE_CRTBEGINP. + * gcc/configure Regenerated + + +--- a/gcc/configure.ac 2011-11-18 11:52:32.000000000 +0100 ++++ b/gcc/configure.ac 2012-10-02 17:39:15.649526241 +0200 +@@ -5130,6 +5237,55 @@ if test x"${LINKER_HASH_STYLE}" != x; th + [The linker hash style]) + fi + ++# -------------- ++# Esp checks ++# -------------- ++ ++# Check whether --enable-esp was given and target have the support. ++AC_ARG_ENABLE([esp], ++[AS_HELP_STRING([--enable-esp], ++ [Enable Stack protector and Position independent executable as ++ default if we have suppot for it when compiling ++ and link with -z now as default. ++ Linux targets supported i*86, x86_64, x32, ++ powerpc, powerpc64, ia64, arm and mips.])], ++ enable_esp=$enableval, ++ enable_esp=no) ++if test $enable_esp = yes ; then ++ AC_MSG_CHECKING(if $target support esp) ++ case "$target" in ++ i?86*-*-linux* | x86_64-*-linux* | powerpc*-*-linux* | mips-*-linux* | arm*-*-linux* | ia64-*-linux*) ++ enable_esp=yes ++ AC_DEFINE(ENABLE_ESP, 1, ++ [Define if your target support esp and you have enable it.]) ++ ;; ++ *) ++ enable_esp=no ++ ;; ++ esac ++AC_MSG_RESULT($enable_esp) ++fi ++AC_SUBST([enable_esp]) ++if test $enable_esp = yes ; then ++ AC_MSG_CHECKING(checking for crtbeginP.o support) ++ if test x$enable_esp = xyes ; then ++ case "$target" in ++ ia64*-*-linux*) ++ enable_crtbeginP=no ;; ++ *-*-linux*) ++ if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then ++ enable_crtbeginP=yes ++ AC_DEFINE(ENABLE_CRTBEGINP, 1, ++ [Define if your compiler will support crtbeginP.]) ++ fi ++ ;; ++ *) enable_crtbeginP=no ;; ++ esac ++ fi ++ AC_MSG_RESULT($enable_crtbeginP) ++fi ++AC_SUBST([enable_crtbeginP]) ++ + # Configure the subdirectories + # AC_CONFIG_SUBDIRS($subdirs) + +--- a/gcc/configure 2013-02-01 21:26:24.000000000 +0100 ++++ b/gcc/configure 2013-02-12 01:59:20.000000000 +0100 +@@ -600,6 +600,8 @@ + ac_subst_vars='LTLIBOBJS + LIBOBJS + PICFLAG ++enable_crtbeginP ++enable_esp + enable_host_shared + enable_plugin + pluginlibs +@@ -920,6 +922,7 @@ + enable_libquadmath_support + with_linker_hash_style + with_diagnostics_color ++enable_esp + ' + ac_precious_vars='build_alias + host_alias +@@ -1633,6 +1636,11 @@ + --enable-plugin enable plugin support + --disable-libquadmath-support + disable libquadmath support for Fortran ++ --enable-esp Enable Stack protector and Position independent ++ executable as default if we have suppot for it when ++ compiling and link with -z now as default. ++ Linux targets supported i*86, x86_64, x32, ++ powerpc, powerpc64, ia64, arm and mips. + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -27419,6 +27427,59 @@ + + fi + ++# -------------- ++# Esp checks ++# -------------- ++ ++# Check whether --enable-esp was given and target have the support. ++# Check whether --enable-esp was given. ++if test "${enable_esp+set}" = set; then : ++ enableval=$enable_esp; enable_esp=$enableval ++else ++ enable_esp=no ++fi ++ ++if test $enable_esp = yes ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $target support esp" >&5 ++$as_echo_n "checking if $target support esp... " >&6; } ++ case "$target" in ++ i?86*-*-linux* | x86_64-*-linux* | powerpc*-*-linux* | mips*-*-linux* | arm*-*-linux* | ia64-*-linux*) ++ enable_esp=yes ++ ++$as_echo "#define ENABLE_ESP 1" >>confdefs.h ++ ++ ;; ++ *) ++ enable_esp=no ++ ;; ++ esac ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_esp" >&5 ++$as_echo "$enable_esp" >&6; } ++fi ++ ++if test $enable_esp = yes ; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking for crtbeginP.o support" >&5 ++$as_echo_n "checking checking for crtbeginP.o support... " >&6; } ++ if test x$enable_esp = xyes ; then ++ case "$target" in ++ ia64*-*-linux*) ++ enable_crtbeginP=no ;; ++ *-*-linux*) ++ if test x$gcc_cv_ld_pie = xyes && test x$lt_cv_prog_compiler_static_works = xyes; then ++ enable_crtbeginP=yes ++ ++$as_echo "#define ENABLE_CRTBEGINP 1" >>confdefs.h ++ ++ fi ++ ;; ++ *) enable_crtbeginP=no ;; ++ esac ++ fi ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_crtbeginP" >&5 ++$as_echo "$enable_crtbeginP" >&6; } ++fi ++ ++ + # Configure the subdirectories + # AC_CONFIG_SUBDIRS($subdirs) + diff --git a/gcc/patches/03_all_gcc49_Makefile.in.patch b/gcc/patches/03_all_gcc49_Makefile.in.patch deleted file mode 100644 index bf53d3c..0000000 --- a/gcc/patches/03_all_gcc49_Makefile.in.patch +++ /dev/null @@ -1,96 +0,0 @@ -2012-01-17 Magnus Granberg <zorry(a)gentoo.org> - - * gcc/Makefile.in Add -fno-PIE. to ALL_CFLAGS and - ALL_CXXFLAGS if enable_esp yes. - Echo enable_esp and enable_crtbeginP to tmp-libgcc.mvars. - * libgcc/Makefile.in Add crtbeginP.o to EXTRA_PARTS if enable_crtbeginP yes - We add new file crtbeginP.o if enable_crtbeginP yes - Add -fno-PIE. to CRTSTUFF_CFLAGS. - ---- a/gcc/Makefile.in 2011-11-09 02:20:14.000000000 +0100 -+++ b/gcc/Makefile.in 2011-12-24 22:28:08.864804375 +0100 -@@ -247,6 +247,14 @@ LINKER_FLAGS = $(CFLAGS) - endif - endif - -+# We don't want to compile the compiler with -fPIE, it make PCH fail. -+enable_esp = @enable_esp@ -+ifeq ($(enable_esp),yes) -+ESP_NOPIE_CFLAGS = -fno-PIE -+else -+ESP_NOPIE_CFLAGS= -+endif -+ - # ------------------------------------------- - # Programs which operate on the build machine - # ------------------------------------------- -@@ -974,12 +982,13 @@ INTERNAL_CFLAGS = -DIN_GCC @CROSS@ - - # This is the variable actually used when we compile. If you change this, - # you probably want to update BUILD_CFLAGS in configure.ac --ALL_CFLAGS = $(T_CFLAGS) $(CFLAGS-$@) \ -+ALL_CFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) \ - $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ - - # The C++ version. --ALL_CXXFLAGS = $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) $(INTERNAL_CFLAGS) \ -- $(COVERAGE_FLAGS) $(NOEXCEPTION_FLAGS) $(WARN_CXXFLAGS) @DEFS@ -+ALL_CXXFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) \ -+ $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(NOEXCEPTION_FLAGS) \ -+ $(WARN_CXXFLAGS) @DEFS@ - - # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro - # puts -I options in CPPFLAGS, our include files in the srcdir will always -@@ -1814,6 +1823,8 @@ libgcc.mvars: config.status Makefile spe - echo GCC_CFLAGS = '$(GCC_CFLAGS)' >> tmp-libgcc.mvars - echo INHIBIT_LIBC_CFLAGS = '$(INHIBIT_LIBC_CFLAGS)' >> tmp-libgcc.mvars - echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars -+ echo enable_esp = '$(enable_esp)' >> tmp-libgcc.mvars -+ echo enable_crtbeginP = '@enable_crtbeginP@' >> tmp-libgcc.mvars - - mv tmp-libgcc.mvars libgcc.mvars - ---- a/libgcc/Makefile.in 2011-11-22 04:01:02.000000000 +0100 -+++ b/libgcc/Makefile.in 2011-12-25 15:18:22.449610631 +0100 -@@ -219,6 +219,17 @@ else - DECNUMINC = - endif - -+ifeq ($(enable_esp),yes) -+ESP_NOPIE_CFLAGS = -fno-PIE -+else -+ESP_NOPIE_CFLAGS= -+endif -+ -+# We add crtbeginP.o to the EXTRA_PARTS list if enable_crtbeginP = yes -+ifeq ($(enable_crtbeginP),yes) -+EXTRA_PARTS += crtbeginP.o -+endif -+ - # Options to use when compiling libgcc2.a. - # - LIBGCC2_DEBUG_CFLAGS = -g -@@ -279,7 +290,7 @@ INTERNAL_CFLAGS = $(CFLAGS) $(LIBGCC2_CF - CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ - -finhibit-size-directive -fno-inline -fno-exceptions \ - -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \ -- -fno-stack-protector \ -+ -fno-stack-protector $(ESP_NOPIE_CFLAGS) \ - $(INHIBIT_LIBC_CFLAGS) - - # Extra flags to use when compiling crt{begin,end}.o. -@@ -966,6 +977,13 @@ crtendS$(objext): $(srcdir)/crtstuff.c - # This is a version of crtbegin for -static links. - crtbeginT$(objext): $(srcdir)/crtstuff.c - $(crt_compile) $(CRTSTUFF_T_CFLAGS) -c $< -DCRT_BEGIN -DCRTSTUFFT_O -+ -+# This is a version of crtbegin for -static -fPIE links. -+ifeq ($(enable_crtbeginP),yes) -+crtbeginP$(objext): $(srcdir)/crtstuff.c -+ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \ -+ -c $< -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O -+endif - - ifeq ($(enable_vtable_verify),yes) - # These are used in vtable verification; see comments in source files for - \ No newline at end of file diff --git a/gcc/patches/03_all_gcc51_Makefile.in.patch b/gcc/patches/03_all_gcc51_Makefile.in.patch new file mode 100644 index 0000000..6aac099 --- /dev/null +++ b/gcc/patches/03_all_gcc51_Makefile.in.patch @@ -0,0 +1,106 @@ +2015-04-23 Magnus Granberg <zorry(a)gentoo.org> + + * gcc/Makefile.in Add -fno-PIE. to ALL_CFLAGS and + ALL_CXXFLAGS if enable_esp yes. + Echo enable_esp and enable_crtbeginP to tmp-libgcc.mvars. + * libgcc/Makefile.in Add crtbeginP.o to EXTRA_PARTS if enable_crtbeginP yes + We add new file crtbeginP.o if enable_crtbeginP yes + Add -fno-PIE. to CRTSTUFF_CFLAGS. + Disable -fstack-check + +--- a/gcc/Makefile.in 2011-11-09 02:20:14.000000000 +0100 ++++ b/gcc/Makefile.in 2011-12-24 22:28:08.864804375 +0100 +@@ -247,6 +247,14 @@ LINKER_FLAGS = $(CFLAGS) + endif + endif + ++# We don't want to compile the compiler with -fPIE, it make PCH fail. ++enable_esp = @enable_esp@ ++ifeq ($(enable_esp),yes) ++ESP_NOPIE_CFLAGS = -fno-PIE ++else ++ESP_NOPIE_CFLAGS= ++endif ++ + # ------------------------------------------- + # Programs which operate on the build machine + # ------------------------------------------- +@@ -974,12 +982,13 @@ INTERNAL_CFLAGS = -DIN_GCC @CROSS@ + + # This is the variable actually used when we compile. If you change this, + # you probably want to update BUILD_CFLAGS in configure.ac +-ALL_CFLAGS = $(T_CFLAGS) $(CFLAGS-$@) \ ++ALL_CFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) \ + $(CFLAGS) $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(WARN_CFLAGS) @DEFS@ + + # The C++ version. +-ALL_CXXFLAGS = $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) $(INTERNAL_CFLAGS) \ +- $(COVERAGE_FLAGS) $(NOEXCEPTION_FLAGS) $(WARN_CXXFLAGS) @DEFS@ ++ALL_CXXFLAGS = $(ESP_NOPIE_CFLAGS) $(T_CFLAGS) $(CFLAGS-$@) $(CXXFLAGS) \ ++ $(INTERNAL_CFLAGS) $(COVERAGE_FLAGS) $(NOEXCEPTION_FLAGS) \ ++ $(WARN_CXXFLAGS) @DEFS@ + + # Likewise. Put INCLUDES at the beginning: this way, if some autoconf macro + # puts -I options in CPPFLAGS, our include files in the srcdir will always +@@ -1814,6 +1823,8 @@ libgcc.mvars: config.status Makefile spe + echo GCC_CFLAGS = '$(GCC_CFLAGS)' >> tmp-libgcc.mvars + echo INHIBIT_LIBC_CFLAGS = '$(INHIBIT_LIBC_CFLAGS)' >> tmp-libgcc.mvars + echo TARGET_SYSTEM_ROOT = '$(TARGET_SYSTEM_ROOT)' >> tmp-libgcc.mvars ++ echo enable_esp = '$(enable_esp)' >> tmp-libgcc.mvars ++ echo enable_crtbeginP = '@enable_crtbeginP@' >> tmp-libgcc.mvars + + mv tmp-libgcc.mvars libgcc.mvars + +--- a/libgcc/Makefile.in 2011-11-22 04:01:02.000000000 +0100 ++++ b/libgcc/Makefile.in 2011-12-25 15:18:22.449610631 +0100 +@@ -219,6 +219,17 @@ else + DECNUMINC = + endif + ++ifeq ($(enable_esp),yes) ++ESP_NOPIE_CFLAGS = -fno-PIE ++else ++ESP_NOPIE_CFLAGS= ++endif ++ ++# We add crtbeginP.o to the EXTRA_PARTS list if enable_crtbeginP = yes ++ifeq ($(enable_crtbeginP),yes) ++EXTRA_PARTS += crtbeginP.o ++endif ++ + # Options to use when compiling libgcc2.a. + # + LIBGCC2_DEBUG_CFLAGS = -g +@@ -225,7 +225,7 @@ endif + LIBGCC2_DEBUG_CFLAGS = -g + LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(HOST_LIBGCC2_CFLAGS) \ + $(LIBGCC2_DEBUG_CFLAGS) -DIN_LIBGCC2 \ +- -fbuilding-libgcc -fno-stack-protector \ ++ -fbuilding-libgcc -fno-stack-protector -fstack-check=no \ + $(INHIBIT_LIBC_CFLAGS) + + # Additional options to use when compiling libgcc2.a. +@@ -279,7 +290,7 @@ INTERNAL_CFLAGS = $(CFLAGS) $(LIBGCC2_CF + -finhibit-size-directive -fno-inline -fno-exceptions \ + -fno-zero-initialized-in-bss -fno-toplevel-reorder -fno-tree-vectorize \ + -fbuilding-libgcc -fno-stack-protector $(FORCE_EXPLICIT_EH_REGISTRY) \ +- $(INHIBIT_LIBC_CFLAGS) ++ $(ESP_NOPIE_CFLAGS) -fstack-check=no $(INHIBIT_LIBC_CFLAGS) + + # Extra flags to use when compiling crt{begin,end}.o. + CRTSTUFF_T_CFLAGS = +@@ -966,6 +977,13 @@ crtendS$(objext): $(srcdir)/crtstuff.c + # This is a version of crtbegin for -static links. + crtbeginT$(objext): $(srcdir)/crtstuff.c + $(crt_compile) $(CRTSTUFF_T_CFLAGS) -c $< -DCRT_BEGIN -DCRTSTUFFT_O ++ ++# This is a version of crtbegin for -static -fPIE links. ++ifeq ($(enable_crtbeginP),yes) ++crtbeginP$(objext): $(srcdir)/crtstuff.c ++ $(crt_compile) $(CRTSTUFF_T_CFLAGS_S) \ ++ -c $< -DCRT_BEGIN -DCRTSTUFFT_O -DCRTSTUFFS_O ++endif + + ifeq ($(enable_vtable_verify),yes) + # These are used in vtable verification; see comments in source files for + \ No newline at end of file diff --git a/gcc/patches/04_all_gcc49_default_ssp.patch b/gcc/patches/04_all_gcc49_default_ssp.patch deleted file mode 100644 index 50e2645..0000000 --- a/gcc/patches/04_all_gcc49_default_ssp.patch +++ /dev/null @@ -1,261 +0,0 @@ -2014-04-27 Magnus Granberg <zorry(a)gentoo.org> - - Patch orig: Debian/Ubuntu - # 484714 - We Add -fstack-protector-strong as default and change - ssp-buffer-size - ---- a/configure.ac -+++ b/configure.ac -@@ -3238,6 +3238,9 @@ case $build in - esac ;; - esac - -+# Needed when we build with -fstack-protector as default. -+stage1_cflags="$stage1_cflags -fno-stack-protector" -+ - AC_SUBST(stage1_cflags) - - # Enable --enable-checking in stage1 of the compiler. ---- a/configure -+++ b/configure -@@ -14453,7 +14453,8 @@ case $build in - esac ;; - esac - -- -+# Needed when we build with -fstack-protector as default. -+stage1_cflags="$stage1_cflags -fno-stack-protector" - - # Enable --enable-checking in stage1 of the compiler. - # Check whether --enable-stage1-checking was given. ---- a/Makefile.in -+++ b/Makefile.in -@@ -362,7 +362,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ - - # Flags to pass to stage2 and later makes. They are defined - # here so that they can be overridden by Makefile fragments. --BOOT_CFLAGS= -g -O2 -+BOOT_CFLAGS= -g -O2 -fno-stack-protector - BOOT_LDFLAGS= - BOOT_ADAFLAGS= -gnatpg - -@@ -408,9 +408,9 @@ GNATMAKE = @GNATMAKE@ - - CFLAGS = @CFLAGS@ - LDFLAGS = @LDFLAGS@ --LIBCFLAGS = $(CFLAGS) -+LIBCFLAGS = $(CFLAGS) -fno-stack-protector - CXXFLAGS = @CXXFLAGS@ --LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -+LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates -fno-stack-protector - GOCFLAGS = $(CFLAGS) - - TFLAGS = ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -9239,6 +9251,11 @@ Like @option{-fstack-protector} but incl - be protected --- those that have local array definitions, or have - references to local frame addresses. - -+NOTE: In Gentoo GCC 4.9.0 and later versions this option is enabled by default -+for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector}, -+@option{-nostdlib}, @option{-ffreestanding}, @option{-fstack-protector}, -+@option{-fstack-protector-strong}or @option{-fstack-protector-all}are found. -+ - @item -fsection-anchors - @opindex fsection-anchors - Try to reduce the number of symbolic address calculations by using -@@ -9461,6 +9465,9 @@ - The minimum size of buffers (i.e.@: arrays) that receive stack smashing - protection when @option{-fstack-protection} is used. - -+NOTE: In Gentoo this is change from "8" to "4", to increase -+the number of functions protected by the stack protector. -+ - @item max-jump-thread-duplication-stmts - Maximum number of statements allowed in a block that needs to be - duplicated when threading jumps. ---- a/gcc/cp/lang-specs.h -+++ b/gcc/cp/lang-specs.h -@@ -46,7 +46,7 @@ along with GCC; see the file COPYING3. If not see - %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\ - cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\ - %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ -- %(cc1_options) %2\ -+ %(cc1_options) %(ssp_default) %2\ - %{!fsyntax-only:%{!fdump-ada-spec*:-o %g.s %{!o*:--output-pch=%i.gch}\ - %W{o*:--output-pch=%*}}%V}}}}", - CPLUSPLUS_CPP_SPEC, 0, 0}, -@@ -57,11 +57,11 @@ along with GCC; see the file COPYING3. If not see - %(cpp_options) %2 -o %{save-temps*:%b.ii} %{!save-temps*:%g.ii} \n}\ - cc1plus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.ii} %{!save-temps*:%g.ii}}\ - %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ -- %(cc1_options) %2\ -+ %(cc1_options) %(ssp_default) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", - CPLUSPLUS_CPP_SPEC, 0, 0}, - {".ii", "@c++-cpp-output", 0, 0, 0}, - {"@c++-cpp-output", - "%{!M:%{!MM:%{!E:\ -- cc1plus -fpreprocessed %i %(cc1_options) %2\ -+ cc1plus -fpreprocessed %i %(cc1_options) %(ssp_default) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ---- a/gcc/gcc.c -+++ b/gcc/gcc.c -@@ -651,6 +651,19 @@ proper position among the other output files. */ - #define LINK_GCC_C_SEQUENCE_SPEC "%G %L %G" - #endif - -+#ifndef SSP_DEFAULT_SPEC -+#if defined ( TARGET_LIBC_PROVIDES_SSP ) && defined ( EFAULT_SSP ) -+#define SSP_DEFAULT_SPEC "%{fno-stack-protector|fstack-protector| \ -+ fstack-protector-strong|fstack-protector-all| \ -+ ffreestanding|nostdlib:;:-fstack-protector-strong}" -+/* Add -fno-stack-protector for the use of gcc-specs-ssp. */ -+#define CC1_SSP_DEFAULT_SPEC "%{!fno-stack-protector:}" -+#else -+#define SSP_DEFAULT_SPEC "" -+#define CC1_SSP_DEFAULT_SPEC "" -+#endif -+#endif -+ - #ifndef LINK_SSP_SPEC - #ifdef TARGET_LIBC_PROVIDES_SSP - #define LINK_SSP_SPEC "%{fstack-protector:}" -@@ -771,7 +781,7 @@ proper position among the other output f - - static const char *asm_debug = ASM_DEBUG_SPEC; - static const char *cpp_spec = CPP_SPEC; --static const char *cc1_spec = CC1_SPEC; -+static const char *cc1_spec = CC1_SPEC CC1_SSP_DEFAULT_SPEC; - static const char *cc1plus_spec = CC1PLUS_SPEC; - static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC; - static const char *link_ssp_spec = LINK_SSP_SPEC; -@@ -777,6 +785,8 @@ static const char *cc1_spec = CC1_SPEC; - static const char *cc1plus_spec = CC1PLUS_SPEC; - static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC; - static const char *link_ssp_spec = LINK_SSP_SPEC; -+static const char *ssp_default_spec = SSP_DEFAULT_SPEC; -+static const char *cc1_ssp_default_spec = CC1_SSP_DEFAULT_SPEC; - static const char *asm_spec = ASM_SPEC; - static const char *asm_final_spec = ASM_FINAL_SPEC; - static const char *link_spec = LINK_SPEC; -@@ -835,7 +844,7 @@ static const char *cpp_unique_options = - static const char *cpp_options = - "%(cpp_unique_options) %1 %{m*} %{std*&ansi&trigraphs} %{W*&pedantic*} %{w}\ - %{f*} %{g*:%{!g0:%{g*} %{!fno-working-directory:-fworking-directory}}} %{O*}\ -- %{undef} %{save-temps*:-fpch-preprocess}"; -+ %{undef} %{save-temps*:-fpch-preprocess} %(ssp_default)"; - - /* This contains cpp options which are not passed when the preprocessor - output will be used by another program. */ -@@ -1015,9 +1024,9 @@ static const struct compiler default_compilers[] = - %{save-temps*|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \ - %(cpp_options) -o %{save-temps*:%b.i} %{!save-temps*:%g.i} \n\ - cc1 -fpreprocessed %{save-temps*:%b.i} %{!save-temps*:%g.i} \ -- %(cc1_options)}\ -+ %(cc1_options) %(ssp_default)}\ - %{!save-temps*:%{!traditional-cpp:%{!no-integrated-cpp:\ -- cc1 %(cpp_unique_options) %(cc1_options)}}}\ -+ cc1 %(cpp_unique_options) %(cc1_options) %(ssp_default)}}}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 1}, - {"-", - "%{!E:%e-E or -x required when input is from standard input}\ -@@ -1040,7 +1049,7 @@ static const struct compiler default_compilers[] = - %W{o*:--output-pch=%*}}%V}}}}}}", 0, 0, 0}, - {".i", "@cpp-output", 0, 0, 0}, - {"@cpp-output", -- "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, -+ "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %(ssp_default) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, - {".s", "@assembler", 0, 0, 0}, - {"@assembler", - "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0}, -@@ -1267,6 +1276,8 @@ static struct spec_list static_specs[] = - INIT_STATIC_SPEC ("cc1plus", &cc1plus_spec), - INIT_STATIC_SPEC ("link_gcc_c_sequence", &link_gcc_c_sequence_spec), - INIT_STATIC_SPEC ("link_ssp", &link_ssp_spec), -+ INIT_STATIC_SPEC ("ssp_default", &ssp_default_spec), -+ INIT_STATIC_SPEC ("cc1_ssp_default", &cc1_ssp_default_spec), - INIT_STATIC_SPEC ("endfile", &endfile_spec), - INIT_STATIC_SPEC ("link", &link_spec), - INIT_STATIC_SPEC ("lib", &lib_spec), ---- a/gcc/objc/lang-specs.h -+++ b/gcc/objc/lang-specs.h -@@ -29,9 +29,9 @@ along with GCC; see the file COPYING3. If not see - %{traditional|traditional-cpp:\ - %eGNU Objective C no longer supports traditional compilation}\ - %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\ -- cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\ -+ cc1obj -fpreprocessed %{save-temps*:%b.mi} %{!save-temps*:%g.mi} %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}}\ - %{!save-temps*:%{!no-integrated-cpp:\ -- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\ -+ cc1obj %(cpp_unique_options) %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}}}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, - {"@objective-c-header", - "%{E|M|MM:cc1obj -E %{traditional|traditional-cpp:-traditional-cpp}\ -@@ -40,18 +40,18 @@ along with GCC; see the file COPYING3. If not see - %{traditional|traditional-cpp:\ - %eGNU Objective C no longer supports traditional compilation}\ - %{save-temps*|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps*:%b.mi} %{!save-temps*:%g.mi} \n\ -- cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ -+ cc1obj -fpreprocessed %b.mi %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\ - -o %g.s %{!o*:--output-pch=%i.gch}\ - %W{o*:--output-pch=%*}%V}\ - %{!save-temps*:%{!no-integrated-cpp:\ -- cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ -+ cc1obj %(cpp_unique_options) %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\ - -o %g.s %{!o*:--output-pch=%i.gch}\ - %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0}, - {".mi", "@objective-c-cpp-output", 0, 0, 0}, - {"@objective-c-cpp-output", -- "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ -+ "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, - {"@objc-cpp-output", - "%nobjc-cpp-output is deprecated; please use objective-c-cpp-output instead\n\ -- %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\ -+ %{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ---- a/gcc/objcp/lang-specs.h -+++ b/gcc/objcp/lang-specs.h -@@ -36,7 +36,7 @@ along with GCC; see the file COPYING3. If not see - %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\ - cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\ - %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ -- %(cc1_options) %2\ -+ %(cc1_options) %(ssp_default) %2\ - -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}", - CPLUSPLUS_CPP_SPEC, 0, 0}, - {"@objective-c++", -@@ -46,16 +46,16 @@ along with GCC; see the file COPYING3. If not see - %(cpp_options) %2 -o %{save-temps*:%b.mii} %{!save-temps*:%g.mii} \n}\ - cc1objplus %{save-temps*|no-integrated-cpp:-fpreprocessed %{save-temps*:%b.mii} %{!save-temps*:%g.mii}}\ - %{!save-temps*:%{!no-integrated-cpp:%(cpp_unique_options)}}\ -- %(cc1_options) %2\ -+ %(cc1_options) %(ssp_default) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", - CPLUSPLUS_CPP_SPEC, 0, 0}, - {".mii", "@objective-c++-cpp-output", 0, 0, 0}, - {"@objective-c++-cpp-output", - "%{!M:%{!MM:%{!E:\ -- cc1objplus -fpreprocessed %i %(cc1_options) %2\ -+ cc1objplus -fpreprocessed %i %(cc1_options) %(ssp_default) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, - {"@objc++-cpp-output", - "%nobjc++-cpp-output is deprecated; please use objective-c++-cpp-output instead\n\ - %{!M:%{!MM:%{!E:\ -- cc1objplus -fpreprocessed %i %(cc1_options) %2\ -+ cc1objplus -fpreprocessed %i %(cc1_options) %(ssp_default) %2\ - %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0}, ---- a/gcc/params.def -+++ b/gcc/params.def -@@ -662,7 +662,7 @@ DEFPARAM (PARAM_INTEGER_SHARE_LIMIT, - DEFPARAM (PARAM_SSP_BUFFER_SIZE, - "ssp-buffer-size", - "The lower bound for a buffer to be considered for stack smashing protection", -- 8, 1, 0) -+ 4, 1, 0) - - /* When we thread through a block we have to make copies of the - statements within the block. Clearly for large blocks the code diff --git a/gcc/patches/05_all_gcc48_gcc.c.patch0 b/gcc/patches/05_all_gcc48_gcc.c.patch0 index ddfcafd..b08e7bd 100644 --- a/gcc/patches/05_all_gcc48_gcc.c.patch0 +++ b/gcc/patches/05_all_gcc48_gcc.c.patch0 @@ -13,12 +13,13 @@ #include "filenames.h" /* By default there is no special suffix for target executables. */ -@@ -822,7 +823,9 @@ +@@ -870,7 +870,9 @@ - static const char *asm_debug; + static const char *asm_debug = ASM_DEBUG_SPEC; static const char *cpp_spec = CPP_SPEC; +-static const char *cc1_spec = CC1_SPEC; +#ifndef ENABLE_ESP - static const char *cc1_spec = CC1_SPEC CC1_SSP_DEFAULT_SPEC; ++static const char *cc1_spec = CC1_SPEC CC1_SSP_DEFAULT_SPEC; +#endif static const char *cc1plus_spec = CC1PLUS_SPEC; static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC; diff --git a/gcc/patches/10_all_gcc49_default-fortify-source.patch b/gcc/patches/10_all_gcc49_default-fortify-source.patch deleted file mode 100644 index ad2f2b1..0000000 --- a/gcc/patches/10_all_gcc49_default-fortify-source.patch +++ /dev/null @@ -1,29 +0,0 @@ -Enable -D_FORTIFY_SOURCE=2 by default. - - ---- a/gcc/c-family/c-cppbuiltin.c -+++ b/gcc/c-family/c-cppbuiltin.c -@@ -951,6 +951,9 @@ c_cpp_builtins (cpp_reader *pfile) - builtin_define_with_value ("__REGISTER_PREFIX__", REGISTER_PREFIX, 0); - builtin_define_with_value ("__USER_LABEL_PREFIX__", user_label_prefix, 0); - -+ /* Fortify Source enabled by default w/optimization. */ -+ cpp_define (pfile, "_FORTIFY_SOURCE=((defined __OPTIMIZE__ && __OPTIMIZE__ > 0) ? 2 : 0)"); -+ - /* Misc. */ - if (flag_gnu89_inline) - cpp_define (pfile, "__GNUC_GNU_INLINE__"); ---- a/gcc/doc/gcc.info -+++ b/gcc/doc/gcc.info -@@ -6255,6 +6255,11 @@ find out the exact set of optimizations that are enabled at each level. - Please note the warning under '-fgcse' about invoking '-O2' on - programs that use computed gotos. - -+ NOTE: In Gentoo, `-D_FORTIFY_SOURCE=2' is set by default, and is -+ activated when `-O' is set to 2 or higher. This enables additional -+ compile-time and run-time checks for several libc functions. To disable, -+ specify either `-U_FORTIFY_SOURCE' or `-D_FORTIFY_SOURCE=0'. -+ - '-O3' - Optimize yet more. '-O3' turns on all optimizations specified by - '-O2' and also turns on the '-finline-functions', diff --git a/gcc/patches/11_all_gcc49_default-warn-format-security.patch b/gcc/patches/11_all_gcc49_default-warn-format-security.patch deleted file mode 100644 index ee6c7c4..0000000 --- a/gcc/patches/11_all_gcc49_default-warn-format-security.patch +++ /dev/null @@ -1,43 +0,0 @@ -Enable -Wformat and -Wformat-security by default. - - ---- a/gcc/c-family/c.opt -+++ b/gcc/c-family/c.opt -@@ -412,7 +412,7 @@ C ObjC C++ ObjC++ Var(warn_format_nonliteral) Warning LangEnabledBy(C ObjC C++ O - Warn about format strings that are not literals - - Wformat-security --C ObjC C++ ObjC++ Var(warn_format_security) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0) -+C ObjC C++ ObjC++ Var(warn_format_security) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wformat=, warn_format >= 2, 0) - Warn about possible security problems with format functions - - Wformat-y2k -@@ -424,7 +424,7 @@ C ObjC C++ ObjC++ Var(warn_format_zero_length) Warning LangEnabledBy(C ObjC C++ - Warn about zero-length formats - - Wformat= --C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) -+C ObjC C++ ObjC++ Joined RejectNegative UInteger Var(warn_format) Init(1) Warning LangEnabledBy(C ObjC C++ ObjC++,Wall, 1, 0) - Warn about printf/scanf/strftime/strfmon format string anomalies - - Wignored-qualifiers ---- a/gcc/doc/gcc.info -+++ b/gcc/doc/gcc.info -@@ -3451,6 +3451,8 @@ compiler warns that an unrecognized option is present. - '-Wno-format-contains-nul', '-Wno-format-extra-args', and - '-Wno-format-zero-length'. '-Wformat' is enabled by '-Wall'. - -+ This option is enabled by default in Gentoo. -+ - '-Wno-format-contains-nul' - If '-Wformat' is specified, do not warn about format strings - that contain NUL bytes. -@@ -3496,6 +3498,8 @@ compiler warns that an unrecognized option is present. - future warnings may be added to '-Wformat-security' that are - not included in '-Wformat-nonliteral'.) - -+ This option is enabled by default in Gentoo. -+ - '-Wformat-y2k' - If '-Wformat' is specified, also warn about 'strftime' formats - that may yield only a two-digit year. diff --git a/gcc/patches/12_all_gcc49_default-warn-trampolines.patch b/gcc/patches/12_all_gcc49_default-warn-trampolines.patch deleted file mode 100644 index 9ab4378..0000000 --- a/gcc/patches/12_all_gcc49_default-warn-trampolines.patch +++ /dev/null @@ -1,25 +0,0 @@ -Enable -Wtrampolines by default. - - ---- a/gcc/common.opt -+++ b/gcc/common.opt -@@ -648,7 +648,7 @@ Common Var(warn_system_headers) Warning - Do not suppress warnings from system headers - - Wtrampolines --Common Var(warn_trampolines) Warning -+Common Var(warn_trampolines) Init(1) Warning - Warn whenever a trampoline is generated - - Wtype-limits ---- a/gcc/doc/gcc.info -+++ b/gcc/doc/gcc.info -@@ -4021,6 +4021,8 @@ compiler warns that an unrecognized option is present. - and thus requires the stack to be made executable in order for the - program to work properly. - -+ This warning is enabled by default in Gentoo. -+ - '-Wfloat-equal' - Warn if floating-point values are used in equality comparisons. - diff --git a/gcc/patches/24_all_gcc49_invoke.texi.patch0 b/gcc/patches/24_all_gcc49_invoke.texi.patch0 index 856a4e5..cdda379 100644 --- a/gcc/patches/24_all_gcc49_invoke.texi.patch0 +++ b/gcc/patches/24_all_gcc49_invoke.texi.patch0 @@ -9,20 +9,20 @@ @opindex fstack-protector-all Like @option{-fstack-protector} except that all functions are protected. -+NOTE: NOTE: When --enable-esp this option is enabled by default -+for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector}, -+@option{-nostdlib}, @option{-ffreestanding}, @option{-fstack-protector}, -+@option{-fstack-protector-strong}or @option{-fstack-protector-all}are found. ++NOTE: When --enable-esp, this option is enabled by default ++for C, C++, ObjC, and ObjC++ if neither @option{-fno-stack-protector}, ++@option{-nostdlib}, @option{-ffreestanding}, @option{-fstack-protector}, ++@option{-fstack-protector-strong} or @option{-fstack-protector-all} are found. + @item -fstack-protector-strong @opindex fstack-protector-strong Like @option{-fstack-protector} but includes additional functions to @@ -7960,6 +7965,12 @@ - that were used to generate code (@option{-fpie}, @option{-fPIE}, - or model suboptions) when you specify this option. + used for compilation (@option{-fpie}, @option{-fPIE}, + or model suboptions) when you specify this linker option. -+NOTE: When --enable-esp this option is enabled by default -+for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE} ++NOTE: When --enable-esp, this option is enabled by default ++for C, C++, ObjC, and ObjC++ if neither @option{-fno-pie} or @option{-fno-PIE} +or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or +@option{-nostartfiles} or @option{-shared} or @option{-pg} or @option{-p} +are found. @@ -34,8 +34,8 @@ @code{__pie__} and @code{__PIE__}. The macros have the value 1 for @option{-fpie} and 2 for @option{-fPIE}. -+NOTE: When --enable-esp this option is enabled by default -+for C, C++, ObjC, ObjC++, if neither @option{-fno-pie} or @option{-fno-PIE} ++NOTE: When --enable-esp, this option is enabled by default ++for C, C++, ObjC, and ObjC++ if neither @option{-fno-pie} or @option{-fno-PIE} +or @option{-fno-pic} or @option{-fno-PIC} or @option{-nostdlib} or +@option{-nostartfiles} or @option{-shared} are found. + diff --git a/gcc/patches/33_all_gcc48_config_rs6000.patch b/gcc/patches/33_all_gcc48_config_rs6000.patch new file mode 100644 index 0000000..1d080cf --- /dev/null +++ b/gcc/patches/33_all_gcc48_config_rs6000.patch @@ -0,0 +1,34 @@ +2014-08-07 Magnus Granberg <zorry(a)gentoo.org> + + * gcc/config/rs6000/sysv4.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC. + (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. + +--- a/gcc/config/rs6000/sysv4.h 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/config/rs6000/sysv4.h 2013-03-26 01:30:33.257003189 +0100 +@@ -627,8 +627,13 @@ extern int fixuplabelno; + + #define LINK_OS_DEFAULT_SPEC "" + ++#ifdef ENABLE_ESP ++#define DRIVER_SELF_SPECS "%{mfpu=none: %<mfpu=* \ ++ %<msingle-float %<mdouble-float}", ESP_DRIVER_SELF_SPEC ++#else + #define DRIVER_SELF_SPECS "%{mfpu=none: %<mfpu=* \ + %<msingle-float %<mdouble-float}" ++#endif + + /* Override rs6000.h definition. */ + #undef CPP_SPEC +@@ -933,7 +938,11 @@ ncrtn.o%s" + { "cpp_os_openbsd", CPP_OS_OPENBSD_SPEC }, \ + { "cpp_os_default", CPP_OS_DEFAULT_SPEC }, \ + { "fbsd_dynamic_linker", FBSD_DYNAMIC_LINKER }, \ +- SUBSUBTARGET_EXTRA_SPECS ++ SUBSUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS ++ ++#ifndef ENABLE_ESP ++#define ESP_EXTRA_SPECS ++#endif + + #define SUBSUBTARGET_EXTRA_SPECS + diff --git a/gcc/patches/34_all_gcc48_config_i386.patch b/gcc/patches/34_all_gcc48_config_i386.patch deleted file mode 100644 index 9f0f7a3..0000000 --- a/gcc/patches/34_all_gcc48_config_i386.patch +++ /dev/null @@ -1,56 +0,0 @@ -2013-03-24 Magnus Granberg <zorry(a)gentoo.org> - - * gcc/config/i386/gnu-user-common.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC. - * gcc/config/i386/gnu-user.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. - * gcc/config/i386/i386.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. - ---- a/gcc/config/i386/gnu-user-common.h 2013-01-10 21:38:27.000000000 +0100 -+++ b/gcc/config/i386/gnu-user-common.h 2013-02-14 00:51:44.689637605 +0100 -@@ -70,3 +70,7 @@ along with GCC; see the file COPYING3. - - /* Static stack checking is supported by means of probes. */ - #define STACK_CHECK_STATIC_BUILTIN 1 -+ -+#ifdef ENABLE_ESP -+#define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPEC -+#endif ---- a/gcc/config/i386/gnu-user.h 2011-05-05 14:32:50.000000000 +0200 -+++ b/gcc/config/i386/gnu-user.h 2012-07-09 14:28:38.726289455 +0200 -@@ -93,9 +93,16 @@ along with GCC; see the file COPYING3. - "--32 %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" - - #undef SUBTARGET_EXTRA_SPECS -+#ifdef ENABLE_ESP - #define SUBTARGET_EXTRA_SPECS \ - { "link_emulation", GNU_USER_LINK_EMULATION },\ -- { "dynamic_linker", GNU_USER_DYNAMIC_LINKER } -+ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }, \ -+ ESP_EXTRA_SPECS -+#else -+#define SUBTARGET_EXTRA_SPECS \ -+ { "link_emulation", GNU_USER_LINK_EMULATION },\ -+ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER } -+#endif - - #undef LINK_SPEC - #define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ ---- a/gcc/config/i386/i386.h 2011-11-24 23:11:12.000000000 +0100 -+++ b/gcc/config/i386/i386.h 2012-07-09 14:21:24.575276517 +0200 -@@ -617,13 +617,16 @@ enum target_cpu_default - Do not define this macro if it does not need to do anything. */ - - #ifndef SUBTARGET_EXTRA_SPECS -+#ifdef ENABLE_ESP -+#define SUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS -+#else - #define SUBTARGET_EXTRA_SPECS - #endif -+#endif - - #define EXTRA_SPECS \ - { "cc1_cpu", CC1_CPU_SPEC }, \ - SUBTARGET_EXTRA_SPECS -- - - /* Set the value of FLT_EVAL_METHOD in float.h. When using only the - FPU, assume that the fpcw is set to extended precision; when using diff --git a/gcc/patches/34_all_gcc51_config_i386.patch b/gcc/patches/34_all_gcc51_config_i386.patch new file mode 100644 index 0000000..b57011d --- /dev/null +++ b/gcc/patches/34_all_gcc51_config_i386.patch @@ -0,0 +1,56 @@ +2015-04-23 Magnus Granberg <zorry(a)gentoo.org> + + * gcc/config/i386/gnu-user-common.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC. + * gcc/config/i386/gnu-user.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. + * gcc/config/i386/i386.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. + +--- a/gcc/config/i386/gnu-user-common.h 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/config/i386/gnu-user-common.h 2013-02-14 00:51:44.689637605 +0100 +@@ -70,3 +70,7 @@ along with GCC; see the file COPYING3. + #if HAVE_GAS_CFI_PERSONALITY_DIRECTIVE + #define TARGET_CAN_SPLIT_STACK + #endif ++ ++#ifdef ENABLE_ESP ++#define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPEC ++#endif +--- a/gcc/config/i386/gnu-user.h 2011-05-05 14:32:50.000000000 +0200 ++++ b/gcc/config/i386/gnu-user.h 2012-07-09 14:28:38.726289455 +0200 +@@ -93,9 +93,16 @@ along with GCC; see the file COPYING3. + "--32 %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}" + + #undef SUBTARGET_EXTRA_SPECS ++#ifdef ENABLE_ESP + #define SUBTARGET_EXTRA_SPECS \ + { "link_emulation", GNU_USER_LINK_EMULATION },\ +- { "dynamic_linker", GNU_USER_DYNAMIC_LINKER } ++ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER }, \ ++ ESP_EXTRA_SPECS ++#else ++#define SUBTARGET_EXTRA_SPECS \ ++ { "link_emulation", GNU_USER_LINK_EMULATION },\ ++ { "dynamic_linker", GNU_USER_DYNAMIC_LINKER } ++#endif + + #undef LINK_SPEC + #define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ +--- a/gcc/config/i386/i386.h 2011-11-24 23:11:12.000000000 +0100 ++++ b/gcc/config/i386/i386.h 2012-07-09 14:21:24.575276517 +0200 +@@ -617,13 +617,16 @@ enum target_cpu_default + Do not define this macro if it does not need to do anything. */ + + #ifndef SUBTARGET_EXTRA_SPECS ++#ifdef ENABLE_ESP ++#define SUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS ++#else + #define SUBTARGET_EXTRA_SPECS + #endif ++#endif + + #define EXTRA_SPECS \ + { "cc1_cpu", CC1_CPU_SPEC }, \ + SUBTARGET_EXTRA_SPECS +- + + /* Set the value of FLT_EVAL_METHOD in float.h. When using only the + FPU, assume that the fpcw is set to extended precision; when using diff --git a/gcc/patches/35_all_gcc48_config_arm.patch b/gcc/patches/35_all_gcc48_config_arm.patch deleted file mode 100644 index 5aecc6b..0000000 --- a/gcc/patches/35_all_gcc48_config_arm.patch +++ /dev/null @@ -1,35 +0,0 @@ -2013-06-03 Magnus Granberg <zorry(a)gentoo.org> - - * gcc/config/arm/arm.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC. - * gcc/config/arm/elf.h (SUBSUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. - ---- a/gcc/config/arm/arm.h 2013-01-15 17:17:28.000000000 +0100 -+++ b/gcc/config/arm/arm.h 2013-02-18 22:45:18.327284928 +0100 -@@ -2326,6 +2326,11 @@ extern const char *host_detect_local_cpu - # define MCPU_MTUNE_NATIVE_SPECS "" - #endif - --#define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS -- -+#ifdef ENABLE_ESP -+# define DRIVER_SELF_SPECS \ -+ MCPU_MTUNE_NATIVE_SPECS, \ -+ ESP_DRIVER_SELF_SPEC -+#else -+# define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS -+#endif - #endif /* ! GCC_ARM_H */ ---- a/gcc/config/arm/elf.h 2013-01-10 21:38:27.000000000 +0100 -+++ b/gcc/config/arm/elf.h 2013-05-19 02:15:49.595855825 +0200 -@@ -49,7 +49,11 @@ - #endif - - #undef SUBSUBTARGET_EXTRA_SPECS -+#ifdef ENABLE_ESP -+#define SUBSUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS -+#else - #define SUBSUBTARGET_EXTRA_SPECS -+#endif - - #ifndef ASM_SPEC - #define ASM_SPEC "\ diff --git a/gcc/patches/35_all_gcc51_config_arm.patch b/gcc/patches/35_all_gcc51_config_arm.patch new file mode 100644 index 0000000..815d74a --- /dev/null +++ b/gcc/patches/35_all_gcc51_config_arm.patch @@ -0,0 +1,37 @@ +2015-04-26 Magnus Granberg <zorry(a)gentoo.org> + + * gcc/config/arm/arm.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC. + * gcc/config/arm/elf.h (SUBSUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. + +--- a/gcc/config/arm/arm.h 2013-01-15 17:17:28.000000000 +0100 ++++ b/gcc/config/arm/arm.h 2013-02-18 22:45:18.327284928 +0100 +@@ -2326,6 +2326,14 @@ extern const char *host_detect_local_cpu + # define EXTRA_SPEC_FUNCTIONS BIG_LITTLE_CPU_SPEC_FUNCTIONS + #endif + +-#define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS ++#ifdef ENABLE_ESP ++# define DRIVER_SELF_SPECS \ ++ MCPU_MTUNE_NATIVE_SPECS, \ ++ ESP_DRIVER_SELF_SPEC ++/* https://bugs.gentoo.org/518598 */ ++# define ESP_NO_STACK_CHECK 1 ++#else ++# define DRIVER_SELF_SPECS MCPU_MTUNE_NATIVE_SPECS ++#endif + #define TARGET_SUPPORTS_WIDE_INT 1 + #endif /* ! GCC_ARM_H */ +--- a/gcc/config/arm/elf.h 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/config/arm/elf.h 2013-05-19 02:15:49.595855825 +0200 +@@ -49,7 +49,11 @@ + #endif + + #undef SUBSUBTARGET_EXTRA_SPECS ++#ifdef ENABLE_ESP ++#define SUBSUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS ++#else + #define SUBSUBTARGET_EXTRA_SPECS ++#endif + + #ifndef ASM_SPEC + #define ASM_SPEC "\ diff --git a/gcc/patches/36_all_gcc48_config_aarch64.patch b/gcc/patches/36_all_gcc48_config_aarch64.patch new file mode 100644 index 0000000..3433499 --- /dev/null +++ b/gcc/patches/36_all_gcc48_config_aarch64.patch @@ -0,0 +1,35 @@ +--- gcc-4.9.2/gcc/config/aarch64/aarch64.h.bak 2015-03-01 15:47:49.321036915 -0500 ++++ gcc-4.9.2/gcc/config/aarch64/aarch64.h 2015-03-01 16:52:33.890775022 -0500 +@@ -876,7 +876,13 @@ + + #define EXTRA_SPEC_FUNCTIONS BIG_LITTLE_CPU_SPEC_FUNCTIONS + ++#ifdef ENABLE_ESP ++#define EXTRA_SPECS \ ++ { "asm_cpu_spec", ASM_CPU_SPEC }, \ ++ ESP_EXTRA_SPECS ++#else + #define EXTRA_SPECS \ + { "asm_cpu_spec", ASM_CPU_SPEC } ++#endif + + #endif /* GCC_AARCH64_H */ +--- gcc-4.9.2/gcc/config/aarch64/aarch64-elf.h.bak 2015-03-01 15:51:14.111102418 -0500 ++++ gcc-4.9.2/gcc/config/aarch64/aarch64-elf.h 2015-03-01 17:22:34.924183682 -0500 +@@ -130,9 +130,16 @@ + /* Force the default endianness and ABI flags onto the command line + in order to make the other specs easier to write. */ + #undef DRIVER_SELF_SPECS ++#ifdef ENABLE_ESP ++#define DRIVER_SELF_SPECS \ ++ " %{!mbig-endian:%{!mlittle-endian:" ENDIAN_SPEC "}}" \ ++ " %{!mabi=*:" ABI_SPEC "}", \ ++ ESP_DRIVER_SELF_SPEC ++#else + #define DRIVER_SELF_SPECS \ + " %{!mbig-endian:%{!mlittle-endian:" ENDIAN_SPEC "}}" \ + " %{!mabi=*:" ABI_SPEC "}" ++#endif + + #ifdef HAVE_AS_MABI_OPTION + #define ASM_MABI_SPEC "%{mabi=*:-mabi=%*}" diff --git a/gcc/patches/36_all_gcc51_config_mips.patch b/gcc/patches/36_all_gcc51_config_mips.patch new file mode 100644 index 0000000..5646261 --- /dev/null +++ b/gcc/patches/36_all_gcc51_config_mips.patch @@ -0,0 +1,43 @@ +2013-04-01 Magnus Granberg <zorry(a)gentoo.org> + + * gcc/config/mips/gnu-user.h (DRIVER_SELF_SPECS): Add ESP_DRIVER_SELF_SPEC. + * gcc/config/mips/mips.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. + +--- a/gcc/config/mips/gnu-user.h 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/config/mips/gnu-user.h 2013-03-10 22:37:33.743176388 +0100 +@@ -125,9 +125,17 @@ extern const char *host_detect_local_cpu + "%{!mabi=*: -" MULTILIB_ABI_DEFAULT "}" + + #undef DRIVER_SELF_SPECS ++#ifdef ENABLE_ESP + #define DRIVER_SELF_SPECS \ + MIPS_ISA_LEVEL_SPEC, \ + BASE_DRIVER_SELF_SPECS, \ ++ ESP_DRIVER_SELF_SPEC, \ + LINUX_DRIVER_SELF_SPECS ++#else ++#define DRIVER_SELF_SPECS \ ++ MIPS_ISA_LEVEL_SPEC, \ ++ BASE_DRIVER_SELF_SPECS, \ ++ LINUX_DRIVER_SELF_SPECS ++#endif + + /* Similar to standard Linux, but adding -ffast-math support. */ + #undef GNU_USER_TARGET_MATHFILE_SPEC +--- a/gcc/config/mips/mips.h 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/config/mips/mips.h 2013-03-24 16:59:01.474513910 +0100 +@@ -1197,9 +1197,13 @@ struct mips_cpu_info { + SUBTARGET_EXTRA_SPECS + + #ifndef SUBTARGET_EXTRA_SPECS ++#ifdef ENABLE_ESP ++#define SUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS ++#else + #define SUBTARGET_EXTRA_SPECS + #endif +- ++#endif ++ + #define DBX_DEBUGGING_INFO 1 /* generate stabs (OSF/rose) */ + #define DWARF2_DEBUGGING_INFO 1 /* dwarf2 debugging info */ + diff --git a/gcc/patches/37_all_gcc48_config_ia64.patch b/gcc/patches/37_all_gcc48_config_ia64.patch new file mode 100644 index 0000000..ba71922 --- /dev/null +++ b/gcc/patches/37_all_gcc48_config_ia64.patch @@ -0,0 +1,30 @@ +2013-06-03 Magnus Granberg <zorry(a)gentoo.org> + + * gcc/config/ia64/linux.h Define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPEC. + * gcc/config/ia64/ia64.h (SUBTARGET_EXTRA_SPECS): Add ESP_EXTRA_SPECS. + +--- a/gcc/config/ia64/linux.h 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/config/ia64/linux.h 2013-03-16 22:50:10.363049291 +0100 +@@ -88,3 +88,7 @@ do { \ + + /* Define this to be nonzero if static stack checking is supported. */ + #define STACK_CHECK_STATIC_BUILTIN 1 ++ ++#ifdef ENABLE_ESP ++#define DRIVER_SELF_SPECS ESP_DRIVER_SELF_SPEC ++#endif +--- a/gcc/config/ia64/ia64.h 2013-01-10 21:38:27.000000000 +0100 ++++ b/gcc/config/ia64/ia64.h 2013-03-26 02:03:21.052061828 +0100 +@@ -41,8 +41,12 @@ do { \ + } while (0) + + #ifndef SUBTARGET_EXTRA_SPECS ++#ifdef ENABLE_ESP ++#define SUBTARGET_EXTRA_SPECS ESP_EXTRA_SPECS ++#else + #define SUBTARGET_EXTRA_SPECS + #endif ++#endif + + #define EXTRA_SPECS \ + { "asm_extra", ASM_EXTRA_SPEC }, \ diff --git a/gcc/patches/40_all_gcc49_config_esp.patch0 b/gcc/patches/40_all_gcc49_config_esp.patch0 index ec3482e..16cc2b4 100644 --- a/gcc/patches/40_all_gcc49_config_esp.patch0 +++ b/gcc/patches/40_all_gcc49_config_esp.patch0 @@ -5,7 +5,7 @@ --- gcc/config/esp.h 2010-04-09 16:14:00.000000000 +0200 +++ gcc/config/esp.h 2012-06-23 01:00:31.248348491 +0200 -@@ -0,0 +1,127 @@ +@@ -0,0 +1,132 @@ +/* License terms see GNU GENERAL PUBLIC LICENSE Version 3. + * Version 20140512.1 + * Magnus Granberg (Zorry) <zorry(a)gentoo.org> */ @@ -52,10 +52,15 @@ + /* This will add -fstack-protector-all if we don't have -nostdlib -nodefaultlibs -fno-stack-protector -fstack-protector + -fstack-protector-all and we have EFAULT_SSP or EFAULT_PIE_SSP defined. */ + #if defined ( EFAULT_SSP ) || defined ( EFAULT_PIE_SSP ) ++ #ifdef ESP_NO_STACK_CHECK ++ #define ESP_OPTIONS_STACK_CHECK_SPEC ++ #else ++ #define ESP_OPTIONS_STACK_CHECK_SPEC "%{fstack-check|fstack-check=*:;: -fstack-check}" ++ #endif + #define ESP_OPTIONS_SSP_SPEC \ + "%{nostdlib|ffreestanding|fno-stack-protector|fstack-protector| \ -+ fstack-protector-all|fstack-protector-strong:;:-fstack-protector-all} \ -+ %{fstack-check|fstack-check=*:;: -fstack-check}" ++ fstack-protector-all|fstack-protector-strong:;:-fstack-protector-all} " \ ++ ESP_OPTIONS_STACK_CHECK_SPEC + #else + #define ESP_OPTIONS_SSP_SPEC "" + #endif diff --git a/gcc/patches/53_all_libitm-no-fortify-source.patch b/gcc/patches/53_all_libitm-no-fortify-source.patch deleted file mode 100644 index 5ab15af..0000000 --- a/gcc/patches/53_all_libitm-no-fortify-source.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://bugs.gentoo.org/508852 -https://gcc.gnu.org/PR61164 - -2014-04-27 Magnus Granberg <zorry(a)gentoo.org> - - #508852 - * libitm/configure.tgt: Disable FORTIFY - ---- a/libitm/configure.tgt -+++ b/libitm/configure.tgt -@@ -43,6 +43,16 @@ if test "$gcc_cv_have_tls" = yes ; then - esac - fi - -+# FIXME: error: inlining failed in call to always_inline -+# ‘int vfprintf(FILE*, const char*, __va_list_tag*)’ -+# : function body can be overwritten at link time -+# Disable Fortify in libitm for now. #508852 -+case "${target}" in -+ *-*-linux*) -+ XCFLAGS="${XCFLAGS} -U_FORTIFY_SOURCE" -+ ;; -+esac -+ - # Map the target cpu to an ARCH sub-directory. At the same time, - # work out any special compilation flags as necessary. - case "${target_cpu}" in diff --git a/gcc/patches/gcc49-aarch64-unwind-opt.patch0 b/gcc/patches/gcc49-aarch64-unwind-opt.patch0 deleted file mode 100644 index 3ad55ab..0000000 --- a/gcc/patches/gcc49-aarch64-unwind-opt.patch0 +++ /dev/null @@ -1,338 +0,0 @@ -2014-08-08 Richard Henderson <rth(a)redhat.com> - - * config/aarch64/aarch64.c (aarch64_save_or_restore_fprs): Add - cfi_ops argument, for restore put REG_CFA_RESTORE notes into - *cfi_ops rather than on individual insns. Cleanup. - (aarch64_save_or_restore_callee_save_registers): Likewise. - (aarch64_expand_prologue): Adjust caller. - (aarch64_expand_epilogue): Likewise. Cleanup. Emit queued cfi_ops - on the stack restore insn. - ---- gcc/config/aarch64/aarch64.c.jj 2014-07-08 17:38:17.398231989 +0200 -+++ gcc/config/aarch64/aarch64.c 2014-08-13 10:02:45.599757706 +0200 -@@ -1810,8 +1810,7 @@ aarch64_register_saved_on_entry (int reg - - static void - aarch64_save_or_restore_fprs (int start_offset, int increment, -- bool restore, rtx base_rtx) -- -+ bool restore, rtx base_rtx, rtx *cfi_ops) - { - unsigned regno; - unsigned regno2; -@@ -1819,16 +1818,16 @@ aarch64_save_or_restore_fprs (int start_ - rtx (*gen_mem_ref)(enum machine_mode, rtx) - = (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM; - -- - for (regno = V0_REGNUM; regno <= V31_REGNUM; regno++) - { - if (aarch64_register_saved_on_entry (regno)) - { -- rtx mem; -+ rtx mem, reg1; - mem = gen_mem_ref (DFmode, - plus_constant (Pmode, - base_rtx, - start_offset)); -+ reg1 = gen_rtx_REG (DFmode, regno); - - for (regno2 = regno + 1; - regno2 <= V31_REGNUM -@@ -1840,56 +1839,51 @@ aarch64_save_or_restore_fprs (int start_ - if (regno2 <= V31_REGNUM && - aarch64_register_saved_on_entry (regno2)) - { -- rtx mem2; -+ rtx mem2, reg2; - /* Next highest register to be saved. */ - mem2 = gen_mem_ref (DFmode, - plus_constant - (Pmode, - base_rtx, - start_offset + increment)); -+ reg2 = gen_rtx_REG (DFmode, regno2); -+ - if (restore == false) - { -- insn = emit_insn -- ( gen_store_pairdf (mem, gen_rtx_REG (DFmode, regno), -- mem2, gen_rtx_REG (DFmode, regno2))); -- -+ insn = emit_insn (gen_store_pairdf (mem, reg1, mem2, reg2)); -+ /* The first part of a frame-related parallel insn -+ is always assumed to be relevant to the frame -+ calculations; subsequent parts, are only -+ frame-related if explicitly marked. */ -+ RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1; -+ RTX_FRAME_RELATED_P (insn) = 1; - } - else - { -- insn = emit_insn -- ( gen_load_pairdf (gen_rtx_REG (DFmode, regno), mem, -- gen_rtx_REG (DFmode, regno2), mem2)); -- -- add_reg_note (insn, REG_CFA_RESTORE, -- gen_rtx_REG (DFmode, regno)); -- add_reg_note (insn, REG_CFA_RESTORE, -- gen_rtx_REG (DFmode, regno2)); -+ emit_insn (gen_load_pairdf (reg1, mem, reg2, mem2)); -+ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg1, *cfi_ops); -+ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg2, *cfi_ops); - } - -- /* The first part of a frame-related parallel insn -- is always assumed to be relevant to the frame -- calculations; subsequent parts, are only -- frame-related if explicitly marked. */ -- RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1; - regno = regno2; - start_offset += increment * 2; - } - else - { - if (restore == false) -- insn = emit_move_insn (mem, gen_rtx_REG (DFmode, regno)); -+ { -+ insn = emit_move_insn (mem, reg1); -+ RTX_FRAME_RELATED_P (insn) = 1; -+ } - else - { -- insn = emit_move_insn (gen_rtx_REG (DFmode, regno), mem); -- add_reg_note (insn, REG_CFA_RESTORE, -- gen_rtx_REG (DImode, regno)); -+ emit_move_insn (reg1, mem); -+ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg1, *cfi_ops); - } - start_offset += increment; - } -- RTX_FRAME_RELATED_P (insn) = 1; - } - } -- - } - - -@@ -1897,13 +1891,14 @@ aarch64_save_or_restore_fprs (int start_ - restore's have to happen. */ - static void - aarch64_save_or_restore_callee_save_registers (HOST_WIDE_INT offset, -- bool restore) -+ bool restore, rtx *cfi_ops) - { - rtx insn; - rtx base_rtx = stack_pointer_rtx; - HOST_WIDE_INT start_offset = offset; - HOST_WIDE_INT increment = UNITS_PER_WORD; -- rtx (*gen_mem_ref)(enum machine_mode, rtx) = (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM; -+ rtx (*gen_mem_ref)(enum machine_mode, rtx) -+ = (frame_pointer_needed)? gen_frame_mem : gen_rtx_MEM; - unsigned limit = (frame_pointer_needed)? R28_REGNUM: R30_REGNUM; - unsigned regno; - unsigned regno2; -@@ -1912,11 +1907,13 @@ aarch64_save_or_restore_callee_save_regi - { - if (aarch64_register_saved_on_entry (regno)) - { -- rtx mem; -+ rtx mem, reg1; -+ - mem = gen_mem_ref (Pmode, - plus_constant (Pmode, - base_rtx, - start_offset)); -+ reg1 = gen_rtx_REG (DImode, regno); - - for (regno2 = regno + 1; - regno2 <= limit -@@ -1928,56 +1925,54 @@ aarch64_save_or_restore_callee_save_regi - if (regno2 <= limit && - aarch64_register_saved_on_entry (regno2)) - { -- rtx mem2; -+ rtx mem2, reg2; - /* Next highest register to be saved. */ - mem2 = gen_mem_ref (Pmode, - plus_constant - (Pmode, - base_rtx, - start_offset + increment)); -+ reg2 = gen_rtx_REG (DImode, regno2); -+ - if (restore == false) - { -- insn = emit_insn -- ( gen_store_pairdi (mem, gen_rtx_REG (DImode, regno), -- mem2, gen_rtx_REG (DImode, regno2))); -- -+ insn = emit_insn (gen_store_pairdi (mem, reg1, mem2, reg2)); -+ /* The first part of a frame-related parallel insn -+ is always assumed to be relevant to the frame -+ calculations; subsequent parts, are only -+ frame-related if explicitly marked. */ -+ RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1; -+ RTX_FRAME_RELATED_P (insn) = 1; - } - else - { -- insn = emit_insn -- ( gen_load_pairdi (gen_rtx_REG (DImode, regno), mem, -- gen_rtx_REG (DImode, regno2), mem2)); -- -- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno)); -- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno2)); -+ emit_insn (gen_load_pairdi (reg1, mem, reg2, mem2)); -+ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg1, *cfi_ops); -+ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg2, *cfi_ops); - } - -- /* The first part of a frame-related parallel insn -- is always assumed to be relevant to the frame -- calculations; subsequent parts, are only -- frame-related if explicitly marked. */ -- RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, -- 1)) = 1; - regno = regno2; - start_offset += increment * 2; - } - else - { - if (restore == false) -- insn = emit_move_insn (mem, gen_rtx_REG (DImode, regno)); -+ { -+ insn = emit_move_insn (mem, reg1); -+ RTX_FRAME_RELATED_P (insn) = 1; -+ } - else - { -- insn = emit_move_insn (gen_rtx_REG (DImode, regno), mem); -- add_reg_note (insn, REG_CFA_RESTORE, gen_rtx_REG (DImode, regno)); -+ emit_move_insn (reg1, mem); -+ *cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg1, *cfi_ops); - } - start_offset += increment; - } -- RTX_FRAME_RELATED_P (insn) = 1; - } - } - -- aarch64_save_or_restore_fprs (start_offset, increment, restore, base_rtx); -- -+ aarch64_save_or_restore_fprs (start_offset, increment, restore, -+ base_rtx, cfi_ops); - } - - /* AArch64 stack frames generated by this compiler look like: -@@ -2179,7 +2174,7 @@ aarch64_expand_prologue (void) - } - - aarch64_save_or_restore_callee_save_registers -- (fp_offset + cfun->machine->frame.hardfp_offset, 0); -+ (fp_offset + cfun->machine->frame.hardfp_offset, 0, NULL); - } - - /* when offset >= 512, -@@ -2248,15 +2243,18 @@ aarch64_expand_epilogue (bool for_sibcal - insn = emit_insn (gen_add3_insn (stack_pointer_rtx, - hard_frame_pointer_rtx, - GEN_INT (- fp_offset))); -+ /* CFA should be calculated from the value of SP from now on. */ -+ add_reg_note (insn, REG_CFA_ADJUST_CFA, -+ gen_rtx_SET (VOIDmode, stack_pointer_rtx, -+ plus_constant (Pmode, hard_frame_pointer_rtx, -+ -fp_offset))); - RTX_FRAME_RELATED_P (insn) = 1; -- /* As SP is set to (FP - fp_offset), according to the rules in -- dwarf2cfi.c:dwarf2out_frame_debug_expr, CFA should be calculated -- from the value of SP from now on. */ - cfa_reg = stack_pointer_rtx; - } - -+ rtx cfi_ops = NULL; - aarch64_save_or_restore_callee_save_registers -- (fp_offset + cfun->machine->frame.hardfp_offset, 1); -+ (fp_offset + cfun->machine->frame.hardfp_offset, 1, &cfi_ops); - - /* Restore the frame pointer and lr if the frame pointer is needed. */ - if (offset > 0) -@@ -2264,6 +2262,8 @@ aarch64_expand_epilogue (bool for_sibcal - if (frame_pointer_needed) - { - rtx mem_fp, mem_lr; -+ rtx reg_fp = hard_frame_pointer_rtx; -+ rtx reg_lr = gen_rtx_REG (DImode, LR_REGNUM); - - if (fp_offset) - { -@@ -2276,52 +2276,36 @@ aarch64_expand_epilogue (bool for_sibcal - stack_pointer_rtx, - fp_offset - + UNITS_PER_WORD)); -- insn = emit_insn (gen_load_pairdi (hard_frame_pointer_rtx, -- mem_fp, -- gen_rtx_REG (DImode, -- LR_REGNUM), -- mem_lr)); -+ emit_insn (gen_load_pairdi (reg_fp, mem_fp, reg_lr, mem_lr)); -+ -+ insn = emit_insn (gen_add2_insn (stack_pointer_rtx, -+ GEN_INT (offset))); - } - else - { - insn = emit_insn (gen_loadwb_pairdi_di -- (stack_pointer_rtx, -- stack_pointer_rtx, -- hard_frame_pointer_rtx, -- gen_rtx_REG (DImode, LR_REGNUM), -- GEN_INT (offset), -+ (stack_pointer_rtx, stack_pointer_rtx, -+ reg_fp, reg_lr, GEN_INT (offset), - GEN_INT (GET_MODE_SIZE (DImode) + offset))); -- RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 2)) = 1; -- add_reg_note (insn, REG_CFA_ADJUST_CFA, -- (gen_rtx_SET (Pmode, stack_pointer_rtx, -- plus_constant (Pmode, cfa_reg, -- offset)))); -- } -- -- /* The first part of a frame-related parallel insn -- is always assumed to be relevant to the frame -- calculations; subsequent parts, are only -- frame-related if explicitly marked. */ -- RTX_FRAME_RELATED_P (XVECEXP (PATTERN (insn), 0, 1)) = 1; -- RTX_FRAME_RELATED_P (insn) = 1; -- add_reg_note (insn, REG_CFA_RESTORE, hard_frame_pointer_rtx); -- add_reg_note (insn, REG_CFA_RESTORE, -- gen_rtx_REG (DImode, LR_REGNUM)); -- -- if (fp_offset) -- { -- insn = emit_insn (gen_add2_insn (stack_pointer_rtx, -- GEN_INT (offset))); -- RTX_FRAME_RELATED_P (insn) = 1; - } -+ cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg_fp, cfi_ops); -+ cfi_ops = alloc_reg_note (REG_CFA_RESTORE, reg_lr, cfi_ops); - } - else - { - insn = emit_insn (gen_add2_insn (stack_pointer_rtx, - GEN_INT (offset))); -- RTX_FRAME_RELATED_P (insn) = 1; - } -+ cfi_ops = alloc_reg_note (REG_CFA_ADJUST_CFA, -+ gen_rtx_SET (VOIDmode, stack_pointer_rtx, -+ plus_constant (Pmode, cfa_reg, -+ offset)), -+ cfi_ops); -+ REG_NOTES (insn) = cfi_ops; -+ RTX_FRAME_RELATED_P (insn) = 1; - } -+ else -+ gcc_assert (cfi_ops == NULL); - - /* Stack adjustment for exception handler. */ - if (crtl->calls_eh_return) diff --git a/gcc/patches/gcc49-cloog-dl.patch0 b/gcc/patches/gcc49-cloog-dl.patch0 deleted file mode 100644 index 8a72509..0000000 --- a/gcc/patches/gcc49-cloog-dl.patch0 +++ /dev/null @@ -1,476 +0,0 @@ ---- gcc/Makefile.in.jj 2012-12-13 17:09:20.000000000 +0100 -+++ gcc/Makefile.in 2012-12-14 11:45:22.585670055 +0100 -@@ -1006,7 +1006,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY) - # and the system's installed libraries. - LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \ - $(LIBIBERTY) $(LIBDECNUMBER) $(HOST_LIBS) --BACKENDLIBS = $(CLOOGLIBS) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ -+BACKENDLIBS = $(if $(CLOOGLIBS),-ldl) $(GMPLIBS) $(PLUGINLIBS) $(HOST_LIBS) \ - $(ZLIB) - # Any system libraries needed just for GNAT. - SYSLIBS = @GNAT_LIBEXC@ -@@ -2011,6 +2011,15 @@ $(out_object_file): $(out_file) - $(common_out_object_file): $(common_out_file) - $(COMPILE) $< - $(POSTCOMPILE) -+ -+graphite%.o : \ -+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) -+graphite.o : \ -+ ALL_CFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CFLAGS)) -+graphite%.o : \ -+ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) -+graphite.o : \ -+ ALL_CXXFLAGS := -O $(filter-out -fkeep-inline-functions, $(ALL_CXXFLAGS)) - # - # Generate header and source files from the machine description, - # and compile them. ---- gcc/graphite-poly.h.jj 2012-12-13 11:31:27.000000000 +0100 -+++ gcc/graphite-poly.h 2012-12-14 13:41:41.970800726 +0100 -@@ -22,6 +22,371 @@ along with GCC; see the file COPYING3. - #ifndef GCC_GRAPHITE_POLY_H - #define GCC_GRAPHITE_POLY_H - -+#include <isl/aff.h> -+#include <isl/schedule.h> -+#include <isl/ilp.h> -+#include <isl/flow.h> -+#include <isl/options.h> -+#include <cloog/isl/cloog.h> -+#include <dlfcn.h> -+#define DYNSYMS \ -+ DYNSYM (clast_pprint); \ -+ DYNSYM (cloog_clast_create_from_input); \ -+ DYNSYM (cloog_clast_free); \ -+ DYNSYM (cloog_domain_from_isl_set); \ -+ DYNSYM (cloog_input_alloc); \ -+ DYNSYM (cloog_isl_state_malloc); \ -+ DYNSYM (cloog_options_free); \ -+ DYNSYM (cloog_options_malloc); \ -+ DYNSYM (cloog_scattering_from_isl_map); \ -+ DYNSYM (cloog_state_free); \ -+ DYNSYM (cloog_union_domain_add_domain); \ -+ DYNSYM (cloog_union_domain_alloc); \ -+ DYNSYM (cloog_union_domain_set_name); \ -+ DYNSYM (isl_aff_add_coefficient_si); \ -+ DYNSYM (isl_aff_add_constant); \ -+ DYNSYM (isl_aff_free); \ -+ DYNSYM (isl_aff_get_coefficient); \ -+ DYNSYM (isl_aff_get_space); \ -+ DYNSYM (isl_aff_mod); \ -+ DYNSYM (isl_aff_set_coefficient_si); \ -+ DYNSYM (isl_aff_set_constant_si); \ -+ DYNSYM (isl_aff_zero_on_domain); \ -+ DYNSYM (isl_band_free); \ -+ DYNSYM (isl_band_get_children); \ -+ DYNSYM (isl_band_get_partial_schedule); \ -+ DYNSYM (isl_band_has_children); \ -+ DYNSYM (isl_band_list_free); \ -+ DYNSYM (isl_band_list_get_band); \ -+ DYNSYM (isl_band_list_get_ctx); \ -+ DYNSYM (isl_band_list_n_band); \ -+ DYNSYM (isl_band_member_is_zero_distance); \ -+ DYNSYM (isl_band_n_member); \ -+ DYNSYM (isl_basic_map_add_constraint); \ -+ DYNSYM (isl_basic_map_project_out); \ -+ DYNSYM (isl_basic_map_universe); \ -+ DYNSYM (isl_constraint_set_coefficient); \ -+ DYNSYM (isl_constraint_set_coefficient_si); \ -+ DYNSYM (isl_constraint_set_constant); \ -+ DYNSYM (isl_constraint_set_constant_si); \ -+ DYNSYM (isl_ctx_alloc); \ -+ DYNSYM (isl_ctx_free); \ -+ DYNSYM (isl_equality_alloc); \ -+ DYNSYM (isl_id_alloc); \ -+ DYNSYM (isl_id_copy); \ -+ DYNSYM (isl_id_free); \ -+ DYNSYM (isl_inequality_alloc); \ -+ DYNSYM (isl_local_space_copy); \ -+ DYNSYM (isl_local_space_free); \ -+ DYNSYM (isl_local_space_from_space); \ -+ DYNSYM (isl_local_space_range); \ -+ DYNSYM (isl_map_add_constraint); \ -+ DYNSYM (isl_map_add_dims); \ -+ DYNSYM (isl_map_align_params); \ -+ DYNSYM (isl_map_apply_range); \ -+ DYNSYM (isl_map_copy); \ -+ DYNSYM (isl_map_dim); \ -+ DYNSYM (isl_map_dump); \ -+ DYNSYM (isl_map_equate); \ -+ DYNSYM (isl_map_fix_si); \ -+ DYNSYM (isl_map_flat_product); \ -+ DYNSYM (isl_map_flat_range_product); \ -+ DYNSYM (isl_map_free); \ -+ DYNSYM (isl_map_from_basic_map); \ -+ DYNSYM (isl_map_from_pw_aff); \ -+ DYNSYM (isl_map_from_union_map); \ -+ DYNSYM (isl_map_get_ctx); \ -+ DYNSYM (isl_map_get_space); \ -+ DYNSYM (isl_map_get_tuple_id); \ -+ DYNSYM (isl_map_insert_dims); \ -+ DYNSYM (isl_map_intersect); \ -+ DYNSYM (isl_map_intersect_domain); \ -+ DYNSYM (isl_map_intersect_range); \ -+ DYNSYM (isl_map_is_empty); \ -+ DYNSYM (isl_map_lex_ge); \ -+ DYNSYM (isl_map_lex_le); \ -+ DYNSYM (isl_map_n_out); \ -+ DYNSYM (isl_map_range); \ -+ DYNSYM (isl_map_set_tuple_id); \ -+ DYNSYM (isl_map_universe); \ -+ DYNSYM (isl_options_set_on_error); \ -+ DYNSYM (isl_options_set_schedule_fuse); \ -+ DYNSYM (isl_options_set_schedule_max_constant_term); \ -+ DYNSYM (isl_options_set_schedule_maximize_band_depth); \ -+ DYNSYM (isl_printer_free); \ -+ DYNSYM (isl_printer_print_aff); \ -+ DYNSYM (isl_printer_print_constraint); \ -+ DYNSYM (isl_printer_print_map); \ -+ DYNSYM (isl_printer_print_set); \ -+ DYNSYM (isl_printer_to_file); \ -+ DYNSYM (isl_pw_aff_add); \ -+ DYNSYM (isl_pw_aff_alloc); \ -+ DYNSYM (isl_pw_aff_copy); \ -+ DYNSYM (isl_pw_aff_eq_set); \ -+ DYNSYM (isl_pw_aff_free); \ -+ DYNSYM (isl_pw_aff_from_aff); \ -+ DYNSYM (isl_pw_aff_ge_set); \ -+ DYNSYM (isl_pw_aff_gt_set); \ -+ DYNSYM (isl_pw_aff_is_cst); \ -+ DYNSYM (isl_pw_aff_le_set); \ -+ DYNSYM (isl_pw_aff_lt_set); \ -+ DYNSYM (isl_pw_aff_mod); \ -+ DYNSYM (isl_pw_aff_mul); \ -+ DYNSYM (isl_pw_aff_ne_set); \ -+ DYNSYM (isl_pw_aff_nonneg_set); \ -+ DYNSYM (isl_pw_aff_set_tuple_id); \ -+ DYNSYM (isl_pw_aff_sub); \ -+ DYNSYM (isl_pw_aff_zero_set); \ -+ DYNSYM (isl_schedule_free); \ -+ DYNSYM (isl_schedule_get_band_forest); \ -+ DYNSYM (isl_set_add_constraint); \ -+ DYNSYM (isl_set_add_dims); \ -+ DYNSYM (isl_set_apply); \ -+ DYNSYM (isl_set_coalesce); \ -+ DYNSYM (isl_set_copy); \ -+ DYNSYM (isl_set_dim); \ -+ DYNSYM (isl_set_fix_si); \ -+ DYNSYM (isl_set_free); \ -+ DYNSYM (isl_set_from_cloog_domain); \ -+ DYNSYM (isl_set_get_space); \ -+ DYNSYM (isl_set_get_tuple_id); \ -+ DYNSYM (isl_set_intersect); \ -+ DYNSYM (isl_set_is_empty); \ -+ DYNSYM (isl_set_max); \ -+ DYNSYM (isl_set_min); \ -+ DYNSYM (isl_set_n_dim); \ -+ DYNSYM (isl_set_nat_universe); \ -+ DYNSYM (isl_set_project_out); \ -+ DYNSYM (isl_set_set_tuple_id); \ -+ DYNSYM (isl_set_universe); \ -+ DYNSYM (isl_space_add_dims); \ -+ DYNSYM (isl_space_alloc); \ -+ DYNSYM (isl_space_copy); \ -+ DYNSYM (isl_space_dim); \ -+ DYNSYM (isl_space_domain); \ -+ DYNSYM (isl_space_find_dim_by_id); \ -+ DYNSYM (isl_space_free); \ -+ DYNSYM (isl_space_from_domain); \ -+ DYNSYM (isl_space_get_tuple_id); \ -+ DYNSYM (isl_space_params_alloc); \ -+ DYNSYM (isl_space_range); \ -+ DYNSYM (isl_space_set_alloc); \ -+ DYNSYM (isl_space_set_dim_id); \ -+ DYNSYM (isl_space_set_tuple_id); \ -+ DYNSYM (isl_union_map_add_map); \ -+ DYNSYM (isl_union_map_align_params); \ -+ DYNSYM (isl_union_map_apply_domain); \ -+ DYNSYM (isl_union_map_apply_range); \ -+ DYNSYM (isl_union_map_compute_flow); \ -+ DYNSYM (isl_union_map_copy); \ -+ DYNSYM (isl_union_map_empty); \ -+ DYNSYM (isl_union_map_flat_range_product); \ -+ DYNSYM (isl_union_map_foreach_map); \ -+ DYNSYM (isl_union_map_free); \ -+ DYNSYM (isl_union_map_from_map); \ -+ DYNSYM (isl_union_map_get_ctx); \ -+ DYNSYM (isl_union_map_get_space); \ -+ DYNSYM (isl_union_map_gist_domain); \ -+ DYNSYM (isl_union_map_gist_range); \ -+ DYNSYM (isl_union_map_intersect_domain); \ -+ DYNSYM (isl_union_map_is_empty); \ -+ DYNSYM (isl_union_map_subtract); \ -+ DYNSYM (isl_union_map_union); \ -+ DYNSYM (isl_union_set_add_set); \ -+ DYNSYM (isl_union_set_compute_schedule); \ -+ DYNSYM (isl_union_set_copy); \ -+ DYNSYM (isl_union_set_empty); \ -+ DYNSYM (isl_union_set_from_set); \ -+ DYNSYM (stmt_ass); \ -+ DYNSYM (stmt_block); \ -+ DYNSYM (stmt_for); \ -+ DYNSYM (stmt_guard); \ -+ DYNSYM (stmt_root); \ -+ DYNSYM (stmt_user); -+extern struct cloog_pointers_s__ -+{ -+ bool inited; -+ void *h; -+#define DYNSYM(x) __typeof (x) *p_##x -+ DYNSYMS -+#undef DYNSYM -+} cloog_pointers__; -+ -+#define cloog_block_alloc (*cloog_pointers__.p_cloog_block_alloc) -+#define clast_pprint (*cloog_pointers__.p_clast_pprint) -+#define cloog_clast_create_from_input (*cloog_pointers__.p_cloog_clast_create_from_input) -+#define cloog_clast_free (*cloog_pointers__.p_cloog_clast_free) -+#define cloog_domain_from_isl_set (*cloog_pointers__.p_cloog_domain_from_isl_set) -+#define cloog_input_alloc (*cloog_pointers__.p_cloog_input_alloc) -+#define cloog_isl_state_malloc (*cloog_pointers__.p_cloog_isl_state_malloc) -+#define cloog_options_free (*cloog_pointers__.p_cloog_options_free) -+#define cloog_options_malloc (*cloog_pointers__.p_cloog_options_malloc) -+#define cloog_scattering_from_isl_map (*cloog_pointers__.p_cloog_scattering_from_isl_map) -+#define cloog_state_free (*cloog_pointers__.p_cloog_state_free) -+#define cloog_union_domain_add_domain (*cloog_pointers__.p_cloog_union_domain_add_domain) -+#define cloog_union_domain_alloc (*cloog_pointers__.p_cloog_union_domain_alloc) -+#define cloog_union_domain_set_name (*cloog_pointers__.p_cloog_union_domain_set_name) -+#define isl_aff_add_coefficient_si (*cloog_pointers__.p_isl_aff_add_coefficient_si) -+#define isl_aff_add_constant (*cloog_pointers__.p_isl_aff_add_constant) -+#define isl_aff_free (*cloog_pointers__.p_isl_aff_free) -+#define isl_aff_get_coefficient (*cloog_pointers__.p_isl_aff_get_coefficient) -+#define isl_aff_get_space (*cloog_pointers__.p_isl_aff_get_space) -+#define isl_aff_mod (*cloog_pointers__.p_isl_aff_mod) -+#define isl_aff_set_coefficient_si (*cloog_pointers__.p_isl_aff_set_coefficient_si) -+#define isl_aff_set_constant_si (*cloog_pointers__.p_isl_aff_set_constant_si) -+#define isl_aff_zero_on_domain (*cloog_pointers__.p_isl_aff_zero_on_domain) -+#define isl_band_free (*cloog_pointers__.p_isl_band_free) -+#define isl_band_get_children (*cloog_pointers__.p_isl_band_get_children) -+#define isl_band_get_partial_schedule (*cloog_pointers__.p_isl_band_get_partial_schedule) -+#define isl_band_has_children (*cloog_pointers__.p_isl_band_has_children) -+#define isl_band_list_free (*cloog_pointers__.p_isl_band_list_free) -+#define isl_band_list_get_band (*cloog_pointers__.p_isl_band_list_get_band) -+#define isl_band_list_get_ctx (*cloog_pointers__.p_isl_band_list_get_ctx) -+#define isl_band_list_n_band (*cloog_pointers__.p_isl_band_list_n_band) -+#define isl_band_member_is_zero_distance (*cloog_pointers__.p_isl_band_member_is_zero_distance) -+#define isl_band_n_member (*cloog_pointers__.p_isl_band_n_member) -+#define isl_basic_map_add_constraint (*cloog_pointers__.p_isl_basic_map_add_constraint) -+#define isl_basic_map_project_out (*cloog_pointers__.p_isl_basic_map_project_out) -+#define isl_basic_map_universe (*cloog_pointers__.p_isl_basic_map_universe) -+#define isl_constraint_set_coefficient (*cloog_pointers__.p_isl_constraint_set_coefficient) -+#define isl_constraint_set_coefficient_si (*cloog_pointers__.p_isl_constraint_set_coefficient_si) -+#define isl_constraint_set_constant (*cloog_pointers__.p_isl_constraint_set_constant) -+#define isl_constraint_set_constant_si (*cloog_pointers__.p_isl_constraint_set_constant_si) -+#define isl_ctx_alloc (*cloog_pointers__.p_isl_ctx_alloc) -+#define isl_ctx_free (*cloog_pointers__.p_isl_ctx_free) -+#define isl_equality_alloc (*cloog_pointers__.p_isl_equality_alloc) -+#define isl_id_alloc (*cloog_pointers__.p_isl_id_alloc) -+#define isl_id_copy (*cloog_pointers__.p_isl_id_copy) -+#define isl_id_free (*cloog_pointers__.p_isl_id_free) -+#define isl_inequality_alloc (*cloog_pointers__.p_isl_inequality_alloc) -+#define isl_local_space_copy (*cloog_pointers__.p_isl_local_space_copy) -+#define isl_local_space_free (*cloog_pointers__.p_isl_local_space_free) -+#define isl_local_space_from_space (*cloog_pointers__.p_isl_local_space_from_space) -+#define isl_local_space_range (*cloog_pointers__.p_isl_local_space_range) -+#define isl_map_add_constraint (*cloog_pointers__.p_isl_map_add_constraint) -+#define isl_map_add_dims (*cloog_pointers__.p_isl_map_add_dims) -+#define isl_map_align_params (*cloog_pointers__.p_isl_map_align_params) -+#define isl_map_apply_range (*cloog_pointers__.p_isl_map_apply_range) -+#define isl_map_copy (*cloog_pointers__.p_isl_map_copy) -+#define isl_map_dim (*cloog_pointers__.p_isl_map_dim) -+#define isl_map_dump (*cloog_pointers__.p_isl_map_dump) -+#define isl_map_equate (*cloog_pointers__.p_isl_map_equate) -+#define isl_map_fix_si (*cloog_pointers__.p_isl_map_fix_si) -+#define isl_map_flat_product (*cloog_pointers__.p_isl_map_flat_product) -+#define isl_map_flat_range_product (*cloog_pointers__.p_isl_map_flat_range_product) -+#define isl_map_free (*cloog_pointers__.p_isl_map_free) -+#define isl_map_from_basic_map (*cloog_pointers__.p_isl_map_from_basic_map) -+#define isl_map_from_pw_aff (*cloog_pointers__.p_isl_map_from_pw_aff) -+#define isl_map_from_union_map (*cloog_pointers__.p_isl_map_from_union_map) -+#define isl_map_get_ctx (*cloog_pointers__.p_isl_map_get_ctx) -+#define isl_map_get_space (*cloog_pointers__.p_isl_map_get_space) -+#define isl_map_get_tuple_id (*cloog_pointers__.p_isl_map_get_tuple_id) -+#define isl_map_insert_dims (*cloog_pointers__.p_isl_map_insert_dims) -+#define isl_map_intersect (*cloog_pointers__.p_isl_map_intersect) -+#define isl_map_intersect_domain (*cloog_pointers__.p_isl_map_intersect_domain) -+#define isl_map_intersect_range (*cloog_pointers__.p_isl_map_intersect_range) -+#define isl_map_is_empty (*cloog_pointers__.p_isl_map_is_empty) -+#define isl_map_lex_ge (*cloog_pointers__.p_isl_map_lex_ge) -+#define isl_map_lex_le (*cloog_pointers__.p_isl_map_lex_le) -+#define isl_map_n_out (*cloog_pointers__.p_isl_map_n_out) -+#define isl_map_range (*cloog_pointers__.p_isl_map_range) -+#define isl_map_set_tuple_id (*cloog_pointers__.p_isl_map_set_tuple_id) -+#define isl_map_universe (*cloog_pointers__.p_isl_map_universe) -+#define isl_options_set_on_error (*cloog_pointers__.p_isl_options_set_on_error) -+#define isl_options_set_schedule_fuse (*cloog_pointers__.p_isl_options_set_schedule_fuse) -+#define isl_options_set_schedule_max_constant_term (*cloog_pointers__.p_isl_options_set_schedule_max_constant_term) -+#define isl_options_set_schedule_maximize_band_depth (*cloog_pointers__.p_isl_options_set_schedule_maximize_band_depth) -+#define isl_printer_free (*cloog_pointers__.p_isl_printer_free) -+#define isl_printer_print_aff (*cloog_pointers__.p_isl_printer_print_aff) -+#define isl_printer_print_constraint (*cloog_pointers__.p_isl_printer_print_constraint) -+#define isl_printer_print_map (*cloog_pointers__.p_isl_printer_print_map) -+#define isl_printer_print_set (*cloog_pointers__.p_isl_printer_print_set) -+#define isl_printer_to_file (*cloog_pointers__.p_isl_printer_to_file) -+#define isl_pw_aff_add (*cloog_pointers__.p_isl_pw_aff_add) -+#define isl_pw_aff_alloc (*cloog_pointers__.p_isl_pw_aff_alloc) -+#define isl_pw_aff_copy (*cloog_pointers__.p_isl_pw_aff_copy) -+#define isl_pw_aff_eq_set (*cloog_pointers__.p_isl_pw_aff_eq_set) -+#define isl_pw_aff_free (*cloog_pointers__.p_isl_pw_aff_free) -+#define isl_pw_aff_from_aff (*cloog_pointers__.p_isl_pw_aff_from_aff) -+#define isl_pw_aff_ge_set (*cloog_pointers__.p_isl_pw_aff_ge_set) -+#define isl_pw_aff_gt_set (*cloog_pointers__.p_isl_pw_aff_gt_set) -+#define isl_pw_aff_is_cst (*cloog_pointers__.p_isl_pw_aff_is_cst) -+#define isl_pw_aff_le_set (*cloog_pointers__.p_isl_pw_aff_le_set) -+#define isl_pw_aff_lt_set (*cloog_pointers__.p_isl_pw_aff_lt_set) -+#define isl_pw_aff_mod (*cloog_pointers__.p_isl_pw_aff_mod) -+#define isl_pw_aff_mul (*cloog_pointers__.p_isl_pw_aff_mul) -+#define isl_pw_aff_ne_set (*cloog_pointers__.p_isl_pw_aff_ne_set) -+#define isl_pw_aff_nonneg_set (*cloog_pointers__.p_isl_pw_aff_nonneg_set) -+#define isl_pw_aff_set_tuple_id (*cloog_pointers__.p_isl_pw_aff_set_tuple_id) -+#define isl_pw_aff_sub (*cloog_pointers__.p_isl_pw_aff_sub) -+#define isl_pw_aff_zero_set (*cloog_pointers__.p_isl_pw_aff_zero_set) -+#define isl_schedule_free (*cloog_pointers__.p_isl_schedule_free) -+#define isl_schedule_get_band_forest (*cloog_pointers__.p_isl_schedule_get_band_forest) -+#define isl_set_add_constraint (*cloog_pointers__.p_isl_set_add_constraint) -+#define isl_set_add_dims (*cloog_pointers__.p_isl_set_add_dims) -+#define isl_set_apply (*cloog_pointers__.p_isl_set_apply) -+#define isl_set_coalesce (*cloog_pointers__.p_isl_set_coalesce) -+#define isl_set_copy (*cloog_pointers__.p_isl_set_copy) -+#define isl_set_dim (*cloog_pointers__.p_isl_set_dim) -+#define isl_set_fix_si (*cloog_pointers__.p_isl_set_fix_si) -+#define isl_set_free (*cloog_pointers__.p_isl_set_free) -+#define isl_set_from_cloog_domain (*cloog_pointers__.p_isl_set_from_cloog_domain) -+#define isl_set_get_space (*cloog_pointers__.p_isl_set_get_space) -+#define isl_set_get_tuple_id (*cloog_pointers__.p_isl_set_get_tuple_id) -+#define isl_set_intersect (*cloog_pointers__.p_isl_set_intersect) -+#define isl_set_is_empty (*cloog_pointers__.p_isl_set_is_empty) -+#define isl_set_max (*cloog_pointers__.p_isl_set_max) -+#define isl_set_min (*cloog_pointers__.p_isl_set_min) -+#define isl_set_n_dim (*cloog_pointers__.p_isl_set_n_dim) -+#define isl_set_nat_universe (*cloog_pointers__.p_isl_set_nat_universe) -+#define isl_set_project_out (*cloog_pointers__.p_isl_set_project_out) -+#define isl_set_set_tuple_id (*cloog_pointers__.p_isl_set_set_tuple_id) -+#define isl_set_universe (*cloog_pointers__.p_isl_set_universe) -+#define isl_space_add_dims (*cloog_pointers__.p_isl_space_add_dims) -+#define isl_space_alloc (*cloog_pointers__.p_isl_space_alloc) -+#define isl_space_copy (*cloog_pointers__.p_isl_space_copy) -+#define isl_space_dim (*cloog_pointers__.p_isl_space_dim) -+#define isl_space_domain (*cloog_pointers__.p_isl_space_domain) -+#define isl_space_find_dim_by_id (*cloog_pointers__.p_isl_space_find_dim_by_id) -+#define isl_space_free (*cloog_pointers__.p_isl_space_free) -+#define isl_space_from_domain (*cloog_pointers__.p_isl_space_from_domain) -+#define isl_space_get_tuple_id (*cloog_pointers__.p_isl_space_get_tuple_id) -+#define isl_space_params_alloc (*cloog_pointers__.p_isl_space_params_alloc) -+#define isl_space_range (*cloog_pointers__.p_isl_space_range) -+#define isl_space_set_alloc (*cloog_pointers__.p_isl_space_set_alloc) -+#define isl_space_set_dim_id (*cloog_pointers__.p_isl_space_set_dim_id) -+#define isl_space_set_tuple_id (*cloog_pointers__.p_isl_space_set_tuple_id) -+#define isl_union_map_add_map (*cloog_pointers__.p_isl_union_map_add_map) -+#define isl_union_map_align_params (*cloog_pointers__.p_isl_union_map_align_params) -+#define isl_union_map_apply_domain (*cloog_pointers__.p_isl_union_map_apply_domain) -+#define isl_union_map_apply_range (*cloog_pointers__.p_isl_union_map_apply_range) -+#define isl_union_map_compute_flow (*cloog_pointers__.p_isl_union_map_compute_flow) -+#define isl_union_map_copy (*cloog_pointers__.p_isl_union_map_copy) -+#define isl_union_map_empty (*cloog_pointers__.p_isl_union_map_empty) -+#define isl_union_map_flat_range_product (*cloog_pointers__.p_isl_union_map_flat_range_product) -+#define isl_union_map_foreach_map (*cloog_pointers__.p_isl_union_map_foreach_map) -+#define isl_union_map_free (*cloog_pointers__.p_isl_union_map_free) -+#define isl_union_map_from_map (*cloog_pointers__.p_isl_union_map_from_map) -+#define isl_union_map_get_ctx (*cloog_pointers__.p_isl_union_map_get_ctx) -+#define isl_union_map_get_space (*cloog_pointers__.p_isl_union_map_get_space) -+#define isl_union_map_gist_domain (*cloog_pointers__.p_isl_union_map_gist_domain) -+#define isl_union_map_gist_range (*cloog_pointers__.p_isl_union_map_gist_range) -+#define isl_union_map_intersect_domain (*cloog_pointers__.p_isl_union_map_intersect_domain) -+#define isl_union_map_is_empty (*cloog_pointers__.p_isl_union_map_is_empty) -+#define isl_union_map_subtract (*cloog_pointers__.p_isl_union_map_subtract) -+#define isl_union_map_union (*cloog_pointers__.p_isl_union_map_union) -+#define isl_union_set_add_set (*cloog_pointers__.p_isl_union_set_add_set) -+#define isl_union_set_compute_schedule (*cloog_pointers__.p_isl_union_set_compute_schedule) -+#define isl_union_set_copy (*cloog_pointers__.p_isl_union_set_copy) -+#define isl_union_set_empty (*cloog_pointers__.p_isl_union_set_empty) -+#define isl_union_set_from_set (*cloog_pointers__.p_isl_union_set_from_set) -+#define stmt_ass (*cloog_pointers__.p_stmt_ass) -+#define stmt_block (*cloog_pointers__.p_stmt_block) -+#define stmt_for (*cloog_pointers__.p_stmt_for) -+#define stmt_guard (*cloog_pointers__.p_stmt_guard) -+#define stmt_root (*cloog_pointers__.p_stmt_root) -+#define stmt_user (*cloog_pointers__.p_stmt_user) -+ - typedef struct poly_dr *poly_dr_p; - - typedef struct poly_bb *poly_bb_p; ---- gcc/graphite.c.jj 2012-12-13 11:31:00.000000000 +0100 -+++ gcc/graphite.c 2012-12-14 13:40:44.155136961 +0100 -@@ -78,6 +78,34 @@ along with GCC; see the file COPYING3. - - CloogState *cloog_state; - -+__typeof (cloog_pointers__) cloog_pointers__; -+ -+static bool -+init_cloog_pointers (void) -+{ -+ void *h; -+ -+ if (cloog_pointers__.inited) -+ return cloog_pointers__.h != NULL; -+ h = dlopen ("libcloog-isl.so.4", RTLD_LAZY); -+ cloog_pointers__.h = h; -+ if (h == NULL) -+ return false; -+#define DYNSYM(x) \ -+ do \ -+ { \ -+ union { __typeof (cloog_pointers__.p_##x) p; void *q; } u; \ -+ u.q = dlsym (h, #x); \ -+ if (u.q == NULL) \ -+ return false; \ -+ cloog_pointers__.p_##x = u.p; \ -+ } \ -+ while (0) -+ DYNSYMS -+#undef DYNSYM -+ return true; -+} -+ - /* Print global statistics to FILE. */ - - static void -@@ -277,6 +305,15 @@ graphite_transform_loops (void) - if (parallelized_function_p (cfun->decl)) - return; - -+ if (number_of_loops (cfun) <= 1) -+ return; -+ -+ if (!init_cloog_pointers ()) -+ { -+ sorry ("Graphite loop optimizations cannot be used"); -+ return; -+ } -+ - ctx = isl_ctx_alloc (); - isl_options_set_on_error (ctx, ISL_ON_ERROR_ABORT); - if (!graphite_initialize (ctx)) ---- gcc/graphite-clast-to-gimple.c.jj 2012-12-13 11:31:27.000000000 +0100 -+++ gcc/graphite-clast-to-gimple.c 2012-12-14 13:27:47.196519858 +0100 -@@ -910,7 +910,7 @@ compute_bounds_for_loop (struct clast_fo - from STMT_FOR. */ - - static tree --type_for_clast_for (struct clast_for *stmt_for, ivs_params_p ip) -+type_for_clast_for (struct clast_for *stmt_fora, ivs_params_p ip) - { - mpz_t bound_one, bound_two; - tree lb_type, ub_type; -@@ -918,8 +918,8 @@ type_for_clast_for (struct clast_for *st - mpz_init (bound_one); - mpz_init (bound_two); - -- lb_type = type_for_clast_expr (stmt_for->LB, ip, bound_one, bound_two); -- ub_type = type_for_clast_expr (stmt_for->UB, ip, bound_one, bound_two); -+ lb_type = type_for_clast_expr (stmt_fora->LB, ip, bound_one, bound_two); -+ ub_type = type_for_clast_expr (stmt_fora->UB, ip, bound_one, bound_two); - - mpz_clear (bound_one); - mpz_clear (bound_two); diff --git a/gcc/patches/gcc49-cloog-dl2.patch0 b/gcc/patches/gcc49-cloog-dl2.patch0 deleted file mode 100644 index 2f647a3..0000000 --- a/gcc/patches/gcc49-cloog-dl2.patch0 +++ /dev/null @@ -1,74 +0,0 @@ -2011-04-04 Jakub Jelinek <jakub(a)redhat.com> - - * toplev.c (toplev_main_argv): New variable. - (toplev_main): Initialize it. - * graphite.c (init_cloog_pointers): Load libcloog-isl.so.4 from gcc's private - directory. - ---- gcc/toplev.c.jj 2008-12-09 23:59:10.000000000 +0100 -+++ gcc/toplev.c 2009-01-27 14:33:52.000000000 +0100 -@@ -107,6 +107,8 @@ static bool no_backend; - /* Length of line when printing switch values. */ - #define MAX_LINE 75 - -+const char **toplev_main_argv; -+ - /* Decoded options, and number of such options. */ - struct cl_decoded_option *save_decoded_options; - unsigned int save_decoded_options_count; -@@ -1909,6 +1911,8 @@ toplev_main (int argc, char **argv) - - expandargv (&argc, &argv); - -+ toplev_main_argv = CONST_CAST2 (const char **, char **, argv); -+ - /* Initialization of GCC's environment, and diagnostics. */ - general_init (argv[0]); - ---- gcc/graphite.c.jj 2010-12-01 10:24:32.000000000 -0500 -+++ gcc/graphite.c 2010-12-01 11:46:07.832118193 -0500 -@@ -72,11 +72,39 @@ __typeof (cloog_pointers__) cloog_pointe - static bool - init_cloog_pointers (void) - { -- void *h; -- -- if (cloog_pointers__.inited) -- return cloog_pointers__.h != NULL; -- h = dlopen ("libcloog-isl.so.4", RTLD_LAZY); -+ void *h = NULL; -+ extern const char **toplev_main_argv; -+ char *buf, *p; -+ size_t len; -+ -+ if (cloog_pointers__.inited) -+ return cloog_pointers__.h != NULL; -+ len = progname - toplev_main_argv[0]; -+ buf = XALLOCAVAR (char, len + sizeof "libcloog-isl.so.4"); -+ memcpy (buf, toplev_main_argv[0], len); -+ strcpy (buf + len, "libcloog-isl.so.4"); -+ len += sizeof "libcloog-isl.so.4"; -+ p = strstr (buf, "/libexec/"); -+ if (p != NULL) -+ { -+ while (1) -+ { -+ char *q = strstr (p + 8, "/libexec/"); -+ if (q == NULL) -+ break; -+ p = q; -+ } -+ memmove (p + 4, p + 8, len - (p + 8 - buf)); -+ h = dlopen (buf, RTLD_LAZY); -+ if (h == NULL) -+ { -+ len = progname - toplev_main_argv[0]; -+ memcpy (buf, toplev_main_argv[0], len); -+ strcpy (buf + len, "libcloog-isl.so.4"); -+ } -+ } -+ if (h == NULL) -+ h = dlopen (buf, RTLD_LAZY); - cloog_pointers__.h = h; - if (h == NULL) - return false; diff --git a/gcc/patches/gcc49-color-auto.patch0 b/gcc/patches/gcc49-color-auto.patch0 deleted file mode 100644 index a8cf938..0000000 --- a/gcc/patches/gcc49-color-auto.patch0 +++ /dev/null @@ -1,46 +0,0 @@ -2013-09-20 Jakub Jelinek <jakub(a)redhat.com> - - * common.opt (-fdiagnostics-color=): Default to auto. - * toplev.c (process_options): Always default to - -fdiagnostics-color=auto if no -f{,no-}diagnostics-color*. - * doc/invoke.texi (-fdiagnostics-color*): Adjust documentation - of the default. - ---- gcc/common.opt.jj 2013-09-18 12:06:53.000000000 +0200 -+++ gcc/common.opt 2013-09-20 10:00:00.935823900 +0200 -@@ -1037,7 +1037,7 @@ Common Alias(fdiagnostics-color=,always, - ; - - fdiagnostics-color= --Common Joined RejectNegative Var(flag_diagnostics_show_color) Enum(diagnostic_color_rule) Init(DIAGNOSTICS_COLOR_NO) -+Common Joined RejectNegative Var(flag_diagnostics_show_color) Enum(diagnostic_color_rule) Init(DIAGNOSTICS_COLOR_AUTO) - -fdiagnostics-color=[never|always|auto] Colorize diagnostics - - ; Required for these enum values. ---- gcc/toplev.c.jj 2013-09-09 11:32:39.000000000 +0200 -+++ gcc/toplev.c 2013-09-20 10:10:08.198721005 +0200 -@@ -1229,10 +1229,8 @@ process_options (void) - - maximum_field_alignment = initial_max_fld_align * BITS_PER_UNIT; - -- /* Default to -fdiagnostics-color=auto if GCC_COLORS is in the environment, -- otherwise default to -fdiagnostics-color=never. */ -- if (!global_options_set.x_flag_diagnostics_show_color -- && getenv ("GCC_COLORS")) -+ /* Default to -fdiagnostics-color=auto. */ -+ if (!global_options_set.x_flag_diagnostics_show_color) - pp_show_color (global_dc->printer) - = colorize_init (DIAGNOSTICS_COLOR_AUTO); - ---- gcc/doc/invoke.texi.jj 2013-09-18 12:06:50.000000000 +0200 -+++ gcc/doc/invoke.texi 2013-09-20 10:09:29.079904455 +0200 -@@ -3046,8 +3046,7 @@ a message which is too long to fit on a - @cindex highlight, color, colour - @vindex GCC_COLORS @r{environment variable} - Use color in diagnostics. @var{WHEN} is @samp{never}, @samp{always}, --or @samp{auto}. The default is @samp{never} if @env{GCC_COLORS} environment --variable isn't present in the environment, and @samp{auto} otherwise. -+or @samp{auto}. The default is @samp{auto}. - @samp{auto} means to use color only when the standard error is a terminal. - The forms @option{-fdiagnostics-color} and @option{-fno-diagnostics-color} are - aliases for @option{-fdiagnostics-color=always} and diff --git a/gcc/patches/gcc49-pr38757.patch0 b/gcc/patches/gcc49-pr38757.patch0 deleted file mode 100644 index 4206584..0000000 --- a/gcc/patches/gcc49-pr38757.patch0 +++ /dev/null @@ -1,106 +0,0 @@ -2009-03-18 Jakub Jelinek <jakub(a)redhat.com> - - PR debug/38757 - * langhooks.h (struct lang_hooks): Add source_language langhook. - * langhooks-def.h (LANG_HOOKS_SOURCE_LANGUAGE): Define to NULL. - (LANG_HOOKS_INITIALIZER): Add LANG_HOOKS_SOURCE_LANGUAGE. - * dwarf2out.c (add_prototyped_attribute): Add DW_AT_prototype - also for DW_LANG_{C,C99,ObjC}. - (gen_compile_unit_die): Use lang_hooks.source_language () to - determine if DW_LANG_C99 or DW_LANG_C89 should be returned. -c/ - * c-lang.c (c_source_language): New function. - (LANG_HOOKS_SOURCE_LANGUAGE): Define. - ---- gcc/langhooks.h.jj 2011-01-03 12:53:05.125745450 +0100 -+++ gcc/langhooks.h 2011-01-04 17:59:43.166744926 +0100 -@@ -467,6 +467,10 @@ struct lang_hooks - gimplification. */ - bool deep_unsharing; - -+ /* Return year of the source language standard version if the FE supports -+ multiple versions of the standard. */ -+ int (*source_language) (void); -+ - /* Whenever you add entries here, make sure you adjust langhooks-def.h - and langhooks.c accordingly. */ - }; ---- gcc/langhooks-def.h.jj 2011-01-03 12:53:05.000000000 +0100 -+++ gcc/langhooks-def.h 2011-01-04 18:00:44.858851030 +0100 -@@ -118,6 +118,7 @@ extern void lhd_omp_firstprivatize_type_ - #define LANG_HOOKS_BLOCK_MAY_FALLTHRU hook_bool_const_tree_true - #define LANG_HOOKS_EH_USE_CXA_END_CLEANUP false - #define LANG_HOOKS_DEEP_UNSHARING false -+#define LANG_HOOKS_SOURCE_LANGUAGE NULL - - /* Attribute hooks. */ - #define LANG_HOOKS_ATTRIBUTE_TABLE NULL -@@ -303,7 +304,8 @@ extern void lhd_end_section (void); - LANG_HOOKS_EH_PROTECT_CLEANUP_ACTIONS, \ - LANG_HOOKS_BLOCK_MAY_FALLTHRU, \ - LANG_HOOKS_EH_USE_CXA_END_CLEANUP, \ -- LANG_HOOKS_DEEP_UNSHARING \ -+ LANG_HOOKS_DEEP_UNSHARING, \ -+ LANG_HOOKS_SOURCE_LANGUAGE \ - } - - #endif /* GCC_LANG_HOOKS_DEF_H */ ---- gcc/c/c-lang.c.jj 2011-01-03 12:53:05.376056936 +0100 -+++ gcc/c/c-lang.c 2011-01-04 17:59:43.167743798 +0100 -@@ -36,6 +36,12 @@ along with GCC; see the file COPYING3. - - enum c_language_kind c_language = clk_c; - -+static int -+c_source_language (void) -+{ -+ return flag_isoc99 ? 1999 : 1989; -+} -+ - /* Lang hooks common to C and ObjC are declared in c-objc-common.h; - consequently, there should be very few hooks below. */ - -@@ -45,6 +51,8 @@ enum c_language_kind c_language = clk_c; - #define LANG_HOOKS_INIT c_objc_common_init - #undef LANG_HOOKS_INIT_TS - #define LANG_HOOKS_INIT_TS c_common_init_ts -+#undef LANG_HOOKS_SOURCE_LANGUAGE -+#define LANG_HOOKS_SOURCE_LANGUAGE c_source_language - - /* Each front end provides its own lang hook initializer. */ - struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; ---- gcc/dwarf2out.c.jj 2011-01-03 12:53:05.102056475 +0100 -+++ gcc/dwarf2out.c 2011-01-04 18:03:14.534151763 +0100 -@@ -16109,9 +16109,18 @@ add_bit_size_attribute (dw_die_ref die, - static inline void - add_prototyped_attribute (dw_die_ref die, tree func_type) - { -- if (get_AT_unsigned (comp_unit_die (), DW_AT_language) == DW_LANG_C89 -- && prototype_p (func_type)) -- add_AT_flag (die, DW_AT_prototyped, 1); -+ switch (get_AT_unsigned (comp_unit_die (), DW_AT_language)) -+ { -+ case DW_LANG_C: -+ case DW_LANG_C89: -+ case DW_LANG_C99: -+ case DW_LANG_ObjC: -+ if (prototype_p (func_type)) -+ add_AT_flag (die, DW_AT_prototyped, 1); -+ break; -+ default: -+ break; -+ } - } - - /* Add an 'abstract_origin' attribute below a given DIE. The DIE is found -@@ -18915,6 +18924,10 @@ gen_compile_unit_die (const char *filena - if (strcmp (language_string, "GNU Go") == 0) - language = DW_LANG_Go; - } -+ else if (strcmp (language_string, "GNU C") == 0 -+ && lang_hooks.source_language -+ && lang_hooks.source_language () >= 1999) -+ language = DW_LANG_C99; - } - /* Use a degraded Fortran setting in strict DWARF2 so is_fortran works. */ - else if (strcmp (language_string, "GNU Fortran") == 0) diff --git a/isl/isl.nm b/isl/isl.nm index 8c758ca..be80f99 100644 --- a/isl/isl.nm +++ b/isl/isl.nm @@ -4,7 +4,7 @@ ############################################################################### name = isl -version = 0.12.2 +version = 0.14.1 release = 1 groups = System/Libraries @@ -22,7 +22,7 @@ description end source_dl += http://isl.gforge.inria.fr/ -sources = %{thisapp}.tar.lzma +sources = %{thisapp}.tar.xz build requires @@ -30,6 +30,7 @@ build end test + export LD_LIBRARY_PATH=$(pwd)/.libs make check end hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a74ade6d9a854bd76bd7eecf59eb6954c87dffef
by git＠ipfire.org 21 Nov '15

21 Nov '15

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 a74ade6d9a854bd76bd7eecf59eb6954c87dffef (commit) from 0b075172af1ae899337e7f072fc8490ae57e5501 (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 a74ade6d9a854bd76bd7eecf59eb6954c87dffef Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Nov 21 14:27:04 2015 +0000 installer+setup: Update translations Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: src/installer/po/de.po | 19 ++++++------- src/installer/po/{jv.po => pt.po} | 4 +-- src/installer/po/{jv.po => ro.po} | 6 ++--- src/installer/po/tr.po | 6 ++--- src/setup/po/de.po | 11 ++++---- src/setup/po/{jv.po => pt.po} | 4 +-- src/setup/po/{jv.po => ro.po} | 6 ++--- src/setup/po/ru.po | 57 ++++++++++++++++++++------------------- src/setup/po/sq.po | 8 +++--- 9 files changed, 62 insertions(+), 59 deletions(-) copy src/installer/po/{jv.po => pt.po} (98%) copy src/installer/po/{jv.po => ro.po} (96%) copy src/setup/po/{jv.po => pt.po} (99%) copy src/setup/po/{jv.po => ro.po} (98%) Difference in files: diff --git a/src/installer/po/de.po b/src/installer/po/de.po index 93893d9..eab3da5 100644 --- a/src/installer/po/de.po +++ b/src/installer/po/de.po @@ -6,14 +6,15 @@ # Michael Tremer <michael.tremer(a)ipfire.org>, 2014 # Peter Cloudstone <rmg-mainz(a)web.de>, 2014 # Stefan Schantl <stefan.schantl(a)ipfire.org>, 2014 +# Sun Tiger, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-05 01:29+0000\n" -"PO-Revision-Date: 2014-11-07 15:02+0000\n" -"Last-Translator: Peter Cloudstone <rmg-mainz(a)web.de>\n" -"Language-Team: German (http://www.transifex.com/projects/p/ipfire/language/de/)\n" +"PO-Revision-Date: 2015-05-07 16:56+0000\n" +"Last-Translator: Sun Tiger\n" +"Language-Team: German (http://www.transifex.com/mstremer/ipfire/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -47,7 +48,7 @@ msgstr "Wählen Sie die gewünschte Sprache für den Installationsprozess aus." #: main.c:418 msgid "Unattended mode" -msgstr "Automatikmodus" +msgstr "Automatischer Modus" #: main.c:420 msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" @@ -134,7 +135,7 @@ msgstr "Lizenzvereinbarung" #: main.c:544 msgid "License not accepted!" -msgstr "Lizenz nicht akzeptiert!" +msgstr "Lizenz wurde nicht akzeptiert!" #: main.c:566 msgid "No hard disk found." @@ -170,7 +171,7 @@ msgstr "Das Installationsprogramm wird die folgende Festplatte nun vorbereiten: #: main.c:619 msgid "Disk Setup" -msgstr "Disk-Setup" +msgstr "Festplatten-Setup" #: main.c:620 main.c:630 msgid "Delete all data" @@ -254,7 +255,7 @@ msgstr "Die Dateisysteme konnten nicht erstellt werden." #: main.c:749 msgid "Unable to mount filesystems." -msgstr "Die Dateisysteme konnten nicht eingehangen werden." +msgstr "Die Dateisysteme konnten nicht eingehängt werden." #: main.c:760 msgid "Installing the system..." @@ -266,11 +267,11 @@ msgstr "Das System konnte nicht installiert werden." #: main.c:777 msgid "Installing the language cache..." -msgstr "Installiere den Sprachdateicache..." +msgstr "Installiere den Sprachdateizwischenspeicher..." #: main.c:778 msgid "Unable to install the language cache." -msgstr "Der Sprachdateicache konnte nicht erstellt werden." +msgstr "Der Sprachdateizwischenspeicher konnte nicht erstellt werden." #: main.c:783 msgid "Installing the bootloader..." diff --git a/src/installer/po/pt.po b/src/installer/po/pt.po new file mode 100644 index 0000000..8a93730 --- /dev/null +++ b/src/installer/po/pt.po @@ -0,0 +1,329 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR The IPFire Project (www.ipfire.org) +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: IPFire Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-11-05 01:29+0000\n" +"PO-Revision-Date: 2014-07-31 09:39+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Portuguese (http://www.transifex.com/mstremer/ipfire/language/pt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893 +msgid "OK" +msgstr "" + +#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670 +#: main.c:702 +msgid "Cancel" +msgstr "" + +#: main.c:176 +msgid "I accept this license" +msgstr "" + +#: main.c:384 +msgid "Warning: Unattended installation will start in 10 seconds..." +msgstr "" + +#: main.c:403 +msgid "Language selection" +msgstr "" + +#: main.c:403 +msgid "Select the language you wish to use for the installation." +msgstr "" + +#: main.c:418 +msgid "Unattended mode" +msgstr "" + +#: main.c:420 +msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" +msgstr "" + +#: main.c:426 +#, c-format +msgid "" +"Welcome to the %s installation program.\n" +"\n" +"Selecting Cancel on any of the following screens will reboot the computer." +msgstr "" + +#: main.c:428 +msgid "Start installation" +msgstr "" + +#: main.c:449 +#, c-format +msgid "The installer will now try downloading the installation image." +msgstr "" + +#: main.c:452 +#, c-format +msgid "" +"No source drive could be found.\n" +"\n" +"You can try downloading the required installation image." +msgstr "" + +#: main.c:456 +msgid "" +"Please make sure to connect your machine to a network and the installer will" +" try connect to acquire an IP address." +msgstr "" + +#: main.c:460 +msgid "Download installation image" +msgstr "" + +#: main.c:473 +msgid "Trying to start networking (DHCP)..." +msgstr "" + +#: main.c:484 +msgid "" +"Networking could not be started but is required to go on with the installation.\n" +"\n" +"Please connect your machine to a network with a DHCP server and retry." +msgstr "" + +#: main.c:487 main.c:516 +msgid "Retry" +msgstr "" + +#: main.c:501 +msgid "Downloading installation image..." +msgstr "" + +#: main.c:510 +#, c-format +msgid "MD5 checksum mismatch" +msgstr "" + +#: main.c:513 +#, c-format +msgid "" +"The installation image could not be downloaded.\n" +" Reason: %s\n" +"\n" +"%s" +msgstr "" + +#: main.c:528 +#, c-format +msgid "" +"Could not mount %s to %s:\n" +" %s\n" +msgstr "" + +#: main.c:543 +msgid "License Agreement" +msgstr "" + +#: main.c:544 +msgid "License not accepted!" +msgstr "" + +#: main.c:566 +msgid "No hard disk found." +msgstr "" + +#: main.c:587 +msgid "Disk Selection" +msgstr "" + +#: main.c:588 +msgid "" +"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n" +"\n" +"ALL DATA ON THE DISK WILL BE DESTROYED." +msgstr "" + +#: main.c:599 +msgid "" +"No disk has been selected.\n" +"\n" +"Please select one or more disks you want to install IPFire on." +msgstr "" + +#: main.c:617 +#, c-format +msgid "" +"The installation program will now prepare the chosen harddisk:\n" +"\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:619 +msgid "Disk Setup" +msgstr "" + +#: main.c:620 main.c:630 +msgid "Delete all data" +msgstr "" + +#: main.c:627 +#, c-format +msgid "" +"The installation program will now set up a RAID configuration on the selected harddisks:\n" +"\n" +" %s\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:629 +msgid "RAID Setup" +msgstr "" + +#: main.c:640 +msgid "Your disk configuration is currently not supported." +msgstr "" + +#: main.c:655 +msgid "Your harddisk is too small." +msgstr "" + +#: main.c:671 +msgid "" +"Your harddisk is very small, but you can continue without a swap partition." +msgstr "" + +#: main.c:684 +msgid "ext4 Filesystem" +msgstr "" + +#: main.c:685 +msgid "ext4 Filesystem without journal" +msgstr "" + +#: main.c:686 +msgid "XFS Filesystem" +msgstr "" + +#: main.c:687 +msgid "ReiserFS Filesystem" +msgstr "" + +#: main.c:701 +msgid "Filesystem Selection" +msgstr "" + +#: main.c:701 +msgid "Please choose your filesystem:" +msgstr "" + +#: main.c:712 +msgid "Building RAID..." +msgstr "" + +#: main.c:716 +msgid "Unable to build the RAID." +msgstr "" + +#: main.c:728 +msgid "Partitioning disk..." +msgstr "" + +#: main.c:732 +msgid "Unable to partition the disk." +msgstr "" + +#: main.c:739 +msgid "Creating filesystems..." +msgstr "" + +#: main.c:743 +msgid "Unable to create filesystems." +msgstr "" + +#: main.c:749 +msgid "Unable to mount filesystems." +msgstr "" + +#: main.c:760 +msgid "Installing the system..." +msgstr "" + +#: main.c:761 +msgid "Unable to install the system." +msgstr "" + +#: main.c:777 +msgid "Installing the language cache..." +msgstr "" + +#: main.c:778 +msgid "Unable to install the language cache." +msgstr "" + +#: main.c:783 +msgid "Installing the bootloader..." +msgstr "" + +#: main.c:790 +msgid "Unable to open /etc/default/grub for writing." +msgstr "" + +#: main.c:812 +msgid "Unable to install the bootloader." +msgstr "" + +#: main.c:826 +msgid "" +"A backup file has been found on the installation image.\n" +"\n" +"Do you want to restore the backup?" +msgstr "" + +#: main.c:827 +msgid "Yes" +msgstr "" + +#: main.c:827 +msgid "No" +msgstr "" + +#: main.c:834 +msgid "An error occured when the backup file was restored." +msgstr "" + +#: main.c:869 +msgid "Running post-install script..." +msgstr "" + +#: main.c:870 +msgid "Post-install script failed." +msgstr "" + +#: main.c:877 +#, c-format +msgid "" +"%s was successfully installed!\n" +"\n" +"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console." +msgstr "" + +#: main.c:882 +msgid "Congratulations!" +msgstr "" + +#: main.c:882 +msgid "Reboot" +msgstr "" + +#: main.c:893 +msgid "Setup has failed. Press Ok to reboot." +msgstr "" diff --git a/src/installer/po/ro.po b/src/installer/po/ro.po new file mode 100644 index 0000000..738650f --- /dev/null +++ b/src/installer/po/ro.po @@ -0,0 +1,329 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR The IPFire Project (www.ipfire.org) +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: IPFire Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-11-05 01:29+0000\n" +"PO-Revision-Date: 2014-07-31 09:39+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Romanian (http://www.transifex.com/mstremer/ipfire/language/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#: main.c:78 main.c:179 main.c:404 main.c:670 main.c:702 main.c:893 +msgid "OK" +msgstr "" + +#: main.c:79 main.c:460 main.c:487 main.c:516 main.c:620 main.c:630 main.c:670 +#: main.c:702 +msgid "Cancel" +msgstr "" + +#: main.c:176 +msgid "I accept this license" +msgstr "" + +#: main.c:384 +msgid "Warning: Unattended installation will start in 10 seconds..." +msgstr "" + +#: main.c:403 +msgid "Language selection" +msgstr "" + +#: main.c:403 +msgid "Select the language you wish to use for the installation." +msgstr "" + +#: main.c:418 +msgid "Unattended mode" +msgstr "" + +#: main.c:420 +msgid "<Tab>/<Alt-Tab> between elements | <Space> selects | <F12> next screen" +msgstr "" + +#: main.c:426 +#, c-format +msgid "" +"Welcome to the %s installation program.\n" +"\n" +"Selecting Cancel on any of the following screens will reboot the computer." +msgstr "" + +#: main.c:428 +msgid "Start installation" +msgstr "" + +#: main.c:449 +#, c-format +msgid "The installer will now try downloading the installation image." +msgstr "" + +#: main.c:452 +#, c-format +msgid "" +"No source drive could be found.\n" +"\n" +"You can try downloading the required installation image." +msgstr "" + +#: main.c:456 +msgid "" +"Please make sure to connect your machine to a network and the installer will" +" try connect to acquire an IP address." +msgstr "" + +#: main.c:460 +msgid "Download installation image" +msgstr "" + +#: main.c:473 +msgid "Trying to start networking (DHCP)..." +msgstr "" + +#: main.c:484 +msgid "" +"Networking could not be started but is required to go on with the installation.\n" +"\n" +"Please connect your machine to a network with a DHCP server and retry." +msgstr "" + +#: main.c:487 main.c:516 +msgid "Retry" +msgstr "" + +#: main.c:501 +msgid "Downloading installation image..." +msgstr "" + +#: main.c:510 +#, c-format +msgid "MD5 checksum mismatch" +msgstr "" + +#: main.c:513 +#, c-format +msgid "" +"The installation image could not be downloaded.\n" +" Reason: %s\n" +"\n" +"%s" +msgstr "" + +#: main.c:528 +#, c-format +msgid "" +"Could not mount %s to %s:\n" +" %s\n" +msgstr "" + +#: main.c:543 +msgid "License Agreement" +msgstr "" + +#: main.c:544 +msgid "License not accepted!" +msgstr "" + +#: main.c:566 +msgid "No hard disk found." +msgstr "" + +#: main.c:587 +msgid "Disk Selection" +msgstr "" + +#: main.c:588 +msgid "" +"Select the disk(s) you want to install IPFire on. First those will be partitioned, and then the partitions will have a filesystem put on them.\n" +"\n" +"ALL DATA ON THE DISK WILL BE DESTROYED." +msgstr "" + +#: main.c:599 +msgid "" +"No disk has been selected.\n" +"\n" +"Please select one or more disks you want to install IPFire on." +msgstr "" + +#: main.c:617 +#, c-format +msgid "" +"The installation program will now prepare the chosen harddisk:\n" +"\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:619 +msgid "Disk Setup" +msgstr "" + +#: main.c:620 main.c:630 +msgid "Delete all data" +msgstr "" + +#: main.c:627 +#, c-format +msgid "" +"The installation program will now set up a RAID configuration on the selected harddisks:\n" +"\n" +" %s\n" +" %s\n" +"\n" +"Do you agree to continue?" +msgstr "" + +#: main.c:629 +msgid "RAID Setup" +msgstr "" + +#: main.c:640 +msgid "Your disk configuration is currently not supported." +msgstr "" + +#: main.c:655 +msgid "Your harddisk is too small." +msgstr "" + +#: main.c:671 +msgid "" +"Your harddisk is very small, but you can continue without a swap partition." +msgstr "" + +#: main.c:684 +msgid "ext4 Filesystem" +msgstr "" + +#: main.c:685 +msgid "ext4 Filesystem without journal" +msgstr "" + +#: main.c:686 +msgid "XFS Filesystem" +msgstr "" + +#: main.c:687 +msgid "ReiserFS Filesystem" +msgstr "" + +#: main.c:701 +msgid "Filesystem Selection" +msgstr "" + +#: main.c:701 +msgid "Please choose your filesystem:" +msgstr "" + +#: main.c:712 +msgid "Building RAID..." +msgstr "" + +#: main.c:716 +msgid "Unable to build the RAID." +msgstr "" + +#: main.c:728 +msgid "Partitioning disk..." +msgstr "" + +#: main.c:732 +msgid "Unable to partition the disk." +msgstr "" + +#: main.c:739 +msgid "Creating filesystems..." +msgstr "" + +#: main.c:743 +msgid "Unable to create filesystems." +msgstr "" + +#: main.c:749 +msgid "Unable to mount filesystems." +msgstr "" + +#: main.c:760 +msgid "Installing the system..." +msgstr "" + +#: main.c:761 +msgid "Unable to install the system." +msgstr "" + +#: main.c:777 +msgid "Installing the language cache..." +msgstr "" + +#: main.c:778 +msgid "Unable to install the language cache." +msgstr "" + +#: main.c:783 +msgid "Installing the bootloader..." +msgstr "" + +#: main.c:790 +msgid "Unable to open /etc/default/grub for writing." +msgstr "" + +#: main.c:812 +msgid "Unable to install the bootloader." +msgstr "" + +#: main.c:826 +msgid "" +"A backup file has been found on the installation image.\n" +"\n" +"Do you want to restore the backup?" +msgstr "" + +#: main.c:827 +msgid "Yes" +msgstr "" + +#: main.c:827 +msgid "No" +msgstr "" + +#: main.c:834 +msgid "An error occured when the backup file was restored." +msgstr "" + +#: main.c:869 +msgid "Running post-install script..." +msgstr "" + +#: main.c:870 +msgid "Post-install script failed." +msgstr "" + +#: main.c:877 +#, c-format +msgid "" +"%s was successfully installed!\n" +"\n" +"Please remove any installation mediums from this system and hit the reboot button. Once the system has restarted you will be asked to setup networking and system passwords. After that, you should point your web browser at https://%s:444 (or what ever you name your %s) for the web configuration console." +msgstr "" + +#: main.c:882 +msgid "Congratulations!" +msgstr "" + +#: main.c:882 +msgid "Reboot" +msgstr "" + +#: main.c:893 +msgid "Setup has failed. Press Ok to reboot." +msgstr "" diff --git a/src/installer/po/tr.po b/src/installer/po/tr.po index e990bc3..ad65543 100644 --- a/src/installer/po/tr.po +++ b/src/installer/po/tr.po @@ -11,9 +11,9 @@ msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-05 01:29+0000\n" -"PO-Revision-Date: 2015-02-28 22:11+0000\n" +"PO-Revision-Date: 2015-04-23 16:07+0000\n" "Last-Translator: Ersan YILDIRIM <ersan73(a)gmail.com>\n" -"Language-Team: Turkish (http://www.transifex.com/projects/p/ipfire/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/mstremer/ipfire/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -59,7 +59,7 @@ msgid "" "Welcome to the %s installation program.\n" "\n" "Selecting Cancel on any of the following screens will reboot the computer." -msgstr "%s kurulum programına hoş geldiniz.\n\nSonraki ekranların herhangi birinde İptal seçeneğini seçtiğinizde bilgisayar yeniden başlatılac." +msgstr "%s kurulum programına hoş geldiniz.\n\nSonraki ekranların herhangi birinde İptal seçeneğini seçtiğinizde bilgisayar yeniden başlatılacak." #: main.c:428 msgid "Start installation" diff --git a/src/setup/po/de.po b/src/setup/po/de.po index 12333a6..021aecb 100644 --- a/src/setup/po/de.po +++ b/src/setup/po/de.po @@ -5,14 +5,15 @@ # Translators: # Michael Tremer <michael.tremer(a)ipfire.org>, 2014 # Stefan Schantl <stefan.schantl(a)ipfire.org>, 2014 +# Sun Tiger, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2014-08-24 19:39+0000\n" -"Last-Translator: Stefan Schantl <stefan.schantl(a)ipfire.org>\n" -"Language-Team: German (http://www.transifex.com/projects/p/ipfire/language/de/)\n" +"PO-Revision-Date: 2015-05-07 16:52+0000\n" +"Last-Translator: Sun Tiger\n" +"Language-Team: German (http://www.transifex.com/mstremer/ipfire/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -53,7 +54,7 @@ msgstr "Domänenname:" #: networking.c:442 networking.c:552 networking.c:603 networking.c:610 #: networking.c:713 timezone.c:63 msgid "Unable to open settings file" -msgstr "Settings-Datei konnte nicht geöffnet werden" +msgstr "Einstellungs-Datei konnte nicht geöffnet werden" #: dhcp.c:111 msgid "DHCP server configuration" @@ -320,7 +321,7 @@ msgstr "Identifizieren" #: netstuff.c:678 msgid "Device Identification" -msgstr "Device-Identifizierung" +msgstr "Geräteidentifizierung" #: netstuff.c:678 msgid "The lights on the selected port should flash now for 10 seconds..." diff --git a/src/setup/po/pt.po b/src/setup/po/pt.po new file mode 100644 index 0000000..bb9d285 --- /dev/null +++ b/src/setup/po/pt.po @@ -0,0 +1,584 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR The IPFire Project (www.ipfire.org) +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: IPFire Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-08-21 15:12+0000\n" +"PO-Revision-Date: 2014-08-12 10:08+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Portuguese (http://www.transifex.com/mstremer/ipfire/language/pt/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: pt\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: dhcp.c:50 +msgid "Start address:" +msgstr "" + +#: dhcp.c:51 +msgid "End address:" +msgstr "" + +#: dhcp.c:52 networking.c:717 +msgid "Primary DNS:" +msgstr "" + +#: dhcp.c:53 networking.c:723 +msgid "Secondary DNS:" +msgstr "" + +#: dhcp.c:54 +msgid "Default lease (mins):" +msgstr "" + +#: dhcp.c:55 +msgid "Max lease (mins):" +msgstr "" + +#: dhcp.c:56 +msgid "Domain name suffix:" +msgstr "" + +#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70 +#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704 +#: networking.c:134 networking.c:255 networking.c:291 networking.c:346 +#: networking.c:442 networking.c:552 networking.c:603 networking.c:610 +#: networking.c:713 timezone.c:63 +msgid "Unable to open settings file" +msgstr "" + +#: dhcp.c:111 +msgid "DHCP server configuration" +msgstr "" + +#: dhcp.c:116 +msgid "Configure the DHCP server by entering the settings information." +msgstr "" + +#: dhcp.c:125 +msgid "Enabled" +msgstr "" + +#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172 +#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163 +#: networking.c:269 networking.c:305 networking.c:409 networking.c:560 +#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89 +#: timezone.c:78 +msgid "OK" +msgstr "" + +#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158 +#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305 +#: networking.c:410 networking.c:560 networking.c:653 networking.c:746 +#: passwords.c:89 timezone.c:78 +msgid "Cancel" +msgstr "" + +#: dhcp.c:156 +msgid "" +"The following fields are invalid:\n" +"\n" +msgstr "" + +#: dhcp.c:159 +msgid "Start address" +msgstr "" + +#: dhcp.c:165 +msgid "End address" +msgstr "" + +#: dhcp.c:173 networking.c:755 +msgid "Primary DNS" +msgstr "" + +#: dhcp.c:182 networking.c:764 +msgid "Secondary DNS" +msgstr "" + +#: dhcp.c:189 +msgid "Default lease time" +msgstr "" + +#: dhcp.c:195 +msgid "Max. lease time" +msgstr "" + +#: domainname.c:42 main.c:70 +msgid "Domain name" +msgstr "" + +#: domainname.c:42 +msgid "Enter Domain name" +msgstr "" + +#: domainname.c:48 +msgid "Domain name cannot be empty." +msgstr "" + +#: domainname.c:50 +msgid "Domain name cannot contain spaces." +msgstr "" + +#: domainname.c:53 +msgid "Domain name may only contain letters, numbers, hyphens and periods." +msgstr "" + +#: hostname.c:46 main.c:69 +msgid "Hostname" +msgstr "" + +#: hostname.c:46 +msgid "Enter the machine's hostname." +msgstr "" + +#: hostname.c:53 +msgid "Hostname cannot be empty." +msgstr "" + +#: hostname.c:55 +msgid "Hostname cannot contain spaces." +msgstr "" + +#: hostname.c:58 +msgid "Hostname may only contain letters, numbers and hyphens." +msgstr "" + +#: keymap.c:84 main.c:67 +msgid "Keyboard mapping" +msgstr "" + +#: keymap.c:85 +msgid "Choose the type of keyboard you are using from the list below." +msgstr "" + +#: main.c:68 timezone.c:77 +msgid "Timezone" +msgstr "" + +#: main.c:71 networking.c:110 networking.c:115 networking.c:447 +msgid "Networking" +msgstr "" + +#: main.c:72 misc.c:147 +msgid "ISDN" +msgstr "" + +#: main.c:73 +msgid "'root' password" +msgstr "" + +#: main.c:74 +msgid "'admin' password" +msgstr "" + +#: main.c:90 +msgid " <Tab>/<Alt-Tab> between elements | <Space> selects" +msgstr "" + +#: main.c:97 +msgid "Section menu" +msgstr "" + +#: main.c:98 +msgid "Select the item you wish to configure." +msgstr "" + +#: main.c:99 +msgid "Quit" +msgstr "" + +#: main.c:172 +msgid "Setup is complete." +msgstr "" + +#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653 +msgid "Warning" +msgstr "" + +#: main.c:175 +msgid "" +"Initial setup was not entirely complete. You must ensure that Setup is " +"properly finished by running setup again at the shell." +msgstr "" + +#: misc.c:62 +#, c-format +msgid "Unable to write %s/main/hostname.conf" +msgstr "" + +#: misc.c:71 +msgid "Unable to open main hosts file." +msgstr "" + +#: misc.c:76 +msgid "Unable to write /etc/hosts." +msgstr "" + +#: misc.c:117 +msgid "Unable to write /etc/hosts.deny." +msgstr "" + +#: misc.c:125 +msgid "Unable to write /etc/hosts.allow." +msgstr "" + +#: misc.c:136 +msgid "Unable to set hostname." +msgstr "" + +#: misc.c:147 +msgid "Scanning and configuring ISDN devices." +msgstr "" + +#: misc.c:148 +msgid "Unable to scan for ISDN devices." +msgstr "" + +#: netstuff.c:86 +#, c-format +msgid "Interface - %s" +msgstr "" + +#: netstuff.c:91 +#, c-format +msgid "Enter the IP address information for the %s interface." +msgstr "" + +#: netstuff.c:103 +msgid "Static" +msgstr "" + +#: netstuff.c:104 +msgid "DHCP" +msgstr "" + +#: netstuff.c:105 +msgid "PPP DIALUP (PPPoE, modem, ATM ...)" +msgstr "" + +#: netstuff.c:113 +msgid "DHCP Hostname:" +msgstr "" + +#: netstuff.c:115 +msgid "Force DHCP MTU:" +msgstr "" + +#: netstuff.c:134 +msgid "IP address:" +msgstr "" + +#: netstuff.c:146 +msgid "Network mask:" +msgstr "" + +#: netstuff.c:173 networking.c:749 +msgid "The following fields are invalid:" +msgstr "" + +#: netstuff.c:183 +msgid "IP address" +msgstr "" + +#: netstuff.c:189 +msgid "Network mask" +msgstr "" + +#: netstuff.c:198 +msgid "DHCP hostname" +msgstr "" + +#: netstuff.c:396 netstuff.c:709 +msgid "Unset" +msgstr "" + +#: netstuff.c:669 +#, c-format +msgid "Please choose a networkcard for the following interface - %s." +msgstr "" + +#: netstuff.c:672 +msgid "Extended Network Menu" +msgstr "" + +#: netstuff.c:673 networking.c:520 +msgid "Select" +msgstr "" + +#: netstuff.c:673 +msgid "Identify" +msgstr "" + +#: netstuff.c:678 +msgid "Device Identification" +msgstr "" + +#: netstuff.c:678 +msgid "The lights on the selected port should flash now for 10 seconds..." +msgstr "" + +#: netstuff.c:679 +msgid "Identification is not supported by this interface." +msgstr "" + +#: netstuff.c:691 +msgid "There are no unassigned interfaces on your system." +msgstr "" + +#: netstuff.c:732 +#, c-format +msgid "Do you really want to remove the assigned %s interface?" +msgstr "" + +#: netstuff.c:755 +msgid "Select network driver" +msgstr "" + +#: netstuff.c:755 +msgid "Set additional module parameters" +msgstr "" + +#: netstuff.c:762 +msgid "Loading module..." +msgstr "" + +#: netstuff.c:777 +msgid "Unable to load driver module." +msgstr "" + +#: netstuff.c:780 +msgid "Module name cannot be blank." +msgstr "" + +#: networking.c:110 +msgid "Stopping network..." +msgstr "" + +#: networking.c:115 +msgid "Restarting network..." +msgstr "" + +#: networking.c:146 +msgid "No GREEN interface assigned." +msgstr "" + +#: networking.c:152 +msgid "Missing an IP address on GREEN." +msgstr "" + +#: networking.c:163 +msgid "Error" +msgstr "" + +#: networking.c:163 +msgid "Ignore" +msgstr "" + +#: networking.c:164 +msgid "No RED interface assigned." +msgstr "" + +#: networking.c:173 +msgid "Missing an IP address on RED." +msgstr "" + +#: networking.c:183 +msgid "No ORANGE interface assigned." +msgstr "" + +#: networking.c:189 +msgid "Missing an IP address on ORANGE." +msgstr "" + +#: networking.c:199 +msgid "No BLUE interface assigned." +msgstr "" + +#: networking.c:205 +msgid "Missing an IP address on BLUE." +msgstr "" + +#: networking.c:217 +msgid "Misssing DNS." +msgstr "" + +#: networking.c:224 +msgid "Missing Default Gateway." +msgstr "" + +#: networking.c:237 networking.c:304 +msgid "Network configuration type" +msgstr "" + +#: networking.c:238 networking.c:409 +msgid "Drivers and card assignments" +msgstr "" + +#: networking.c:239 networking.c:640 +msgid "Address settings" +msgstr "" + +#: networking.c:240 networking.c:743 +msgid "DNS and Gateway settings" +msgstr "" + +#: networking.c:260 +msgid "When configuration is complete, a network restart will be required." +msgstr "" + +#: networking.c:267 +#, c-format +msgid "" +"Current config: %s\n" +"\n" +"%s" +msgstr "" + +#: networking.c:268 +msgid "Network configuration menu" +msgstr "" + +#: networking.c:269 networking.c:520 networking.c:642 +msgid "Done" +msgstr "" + +#: networking.c:300 +#, c-format +msgid "" +"Select the network configuration for %s. The following configuration types " +"list those interfaces which have ethernet attached. If you change this " +"setting, a network restart will be required, and you will have to " +"reconfigure the network driver assignments." +msgstr "" + +#: networking.c:307 +#, c-format +msgid "" +"Not enough netcards for your choice.\n" +"\n" +"Needed: %d - Available: %d\n" +msgstr "" + +#: networking.c:359 +msgid "" +"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n" +"\n" +msgstr "" + +#: networking.c:408 +msgid "Do you wish to change these settings?" +msgstr "" + +#: networking.c:447 +msgid "Restarting non-local network..." +msgstr "" + +#: networking.c:464 +msgid "" +"Please choose the interface you wish to change.\n" +"\n" +msgstr "" + +#: networking.c:519 +msgid "Assigned Cards" +msgstr "" + +#: networking.c:520 +msgid "Remove" +msgstr "" + +#: networking.c:556 networking.c:649 +#, c-format +msgid "" +"If you change this IP address, and you are logged in remotely, your " +"connection to the %s machine will be broken, and you will have to reconnect " +"on the new IP. This is a risky operation, and should only be attempted if " +"you have physical access to the machine, should something go wrong." +msgstr "" + +#: networking.c:641 +msgid "Select the interface you wish to reconfigure." +msgstr "" + +#: networking.c:729 +msgid "Default gateway:" +msgstr "" + +#: networking.c:744 +msgid "" +"Enter the DNS and gateway information. These settings are used only with " +"Static IP (and DHCP if DNS set) on the RED interface." +msgstr "" + +#: networking.c:773 +msgid "Default gateway" +msgstr "" + +#: networking.c:780 +msgid "Secondary DNS specified without a Primary DNS" +msgstr "" + +#: passwords.c:33 +msgid "" +"Enter the 'root' user password. Login as this user for commandline access." +msgstr "" + +#: passwords.c:38 passwords.c:61 +msgid "Setting password" +msgstr "" + +#: passwords.c:38 +msgid "Setting 'root' password...." +msgstr "" + +#: passwords.c:39 +msgid "Problem setting 'root' password." +msgstr "" + +#: passwords.c:53 +#, c-format +msgid "" +"Enter %s 'admin' user password. This is the user to use for logging into the" +" %s web administration pages." +msgstr "" + +#: passwords.c:60 +#, c-format +msgid "Setting %s 'admin' user password..." +msgstr "" + +#: passwords.c:62 +#, c-format +msgid "Problem setting %s 'admin' user password." +msgstr "" + +#: passwords.c:76 +msgid "Password:" +msgstr "" + +#: passwords.c:77 +msgid "Again:" +msgstr "" + +#: passwords.c:95 +msgid "Password cannot be blank." +msgstr "" + +#: passwords.c:102 +msgid "Passwords do not match." +msgstr "" + +#: passwords.c:109 +msgid "Password cannot contain spaces." +msgstr "" + +#: timezone.c:77 +msgid "Choose the timezone you are in from the list below." +msgstr "" diff --git a/src/setup/po/ro.po b/src/setup/po/ro.po new file mode 100644 index 0000000..1c11ba2 --- /dev/null +++ b/src/setup/po/ro.po @@ -0,0 +1,584 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR The IPFire Project (www.ipfire.org) +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: IPFire Project\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-08-21 15:12+0000\n" +"PO-Revision-Date: 2014-08-12 10:08+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Romanian (http://www.transifex.com/mstremer/ipfire/language/ro/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ro\n" +"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" + +#: dhcp.c:50 +msgid "Start address:" +msgstr "" + +#: dhcp.c:51 +msgid "End address:" +msgstr "" + +#: dhcp.c:52 networking.c:717 +msgid "Primary DNS:" +msgstr "" + +#: dhcp.c:53 networking.c:723 +msgid "Secondary DNS:" +msgstr "" + +#: dhcp.c:54 +msgid "Default lease (mins):" +msgstr "" + +#: dhcp.c:55 +msgid "Max lease (mins):" +msgstr "" + +#: dhcp.c:56 +msgid "Domain name suffix:" +msgstr "" + +#: dhcp.c:86 dhcp.c:93 dhcp.c:101 domainname.c:34 hostname.c:37 keymap.c:70 +#: misc.c:40 misc.c:52 netstuff.c:377 netstuff.c:566 netstuff.c:704 +#: networking.c:134 networking.c:255 networking.c:291 networking.c:346 +#: networking.c:442 networking.c:552 networking.c:603 networking.c:610 +#: networking.c:713 timezone.c:63 +msgid "Unable to open settings file" +msgstr "" + +#: dhcp.c:111 +msgid "DHCP server configuration" +msgstr "" + +#: dhcp.c:116 +msgid "Configure the DHCP server by entering the settings information." +msgstr "" + +#: dhcp.c:125 +msgid "Enabled" +msgstr "" + +#: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172 +#: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163 +#: networking.c:269 networking.c:305 networking.c:409 networking.c:560 +#: networking.c:642 networking.c:653 networking.c:746 passwords.c:89 +#: timezone.c:78 +msgid "OK" +msgstr "" + +#: dhcp.c:143 domainname.c:43 hostname.c:47 keymap.c:86 netstuff.c:158 +#: netstuff.c:673 netstuff.c:733 netstuff.c:756 networking.c:305 +#: networking.c:410 networking.c:560 networking.c:653 networking.c:746 +#: passwords.c:89 timezone.c:78 +msgid "Cancel" +msgstr "" + +#: dhcp.c:156 +msgid "" +"The following fields are invalid:\n" +"\n" +msgstr "" + +#: dhcp.c:159 +msgid "Start address" +msgstr "" + +#: dhcp.c:165 +msgid "End address" +msgstr "" + +#: dhcp.c:173 networking.c:755 +msgid "Primary DNS" +msgstr "" + +#: dhcp.c:182 networking.c:764 +msgid "Secondary DNS" +msgstr "" + +#: dhcp.c:189 +msgid "Default lease time" +msgstr "" + +#: dhcp.c:195 +msgid "Max. lease time" +msgstr "" + +#: domainname.c:42 main.c:70 +msgid "Domain name" +msgstr "" + +#: domainname.c:42 +msgid "Enter Domain name" +msgstr "" + +#: domainname.c:48 +msgid "Domain name cannot be empty." +msgstr "" + +#: domainname.c:50 +msgid "Domain name cannot contain spaces." +msgstr "" + +#: domainname.c:53 +msgid "Domain name may only contain letters, numbers, hyphens and periods." +msgstr "" + +#: hostname.c:46 main.c:69 +msgid "Hostname" +msgstr "" + +#: hostname.c:46 +msgid "Enter the machine's hostname." +msgstr "" + +#: hostname.c:53 +msgid "Hostname cannot be empty." +msgstr "" + +#: hostname.c:55 +msgid "Hostname cannot contain spaces." +msgstr "" + +#: hostname.c:58 +msgid "Hostname may only contain letters, numbers and hyphens." +msgstr "" + +#: keymap.c:84 main.c:67 +msgid "Keyboard mapping" +msgstr "" + +#: keymap.c:85 +msgid "Choose the type of keyboard you are using from the list below." +msgstr "" + +#: main.c:68 timezone.c:77 +msgid "Timezone" +msgstr "" + +#: main.c:71 networking.c:110 networking.c:115 networking.c:447 +msgid "Networking" +msgstr "" + +#: main.c:72 misc.c:147 +msgid "ISDN" +msgstr "" + +#: main.c:73 +msgid "'root' password" +msgstr "" + +#: main.c:74 +msgid "'admin' password" +msgstr "" + +#: main.c:90 +msgid " <Tab>/<Alt-Tab> between elements | <Space> selects" +msgstr "" + +#: main.c:97 +msgid "Section menu" +msgstr "" + +#: main.c:98 +msgid "Select the item you wish to configure." +msgstr "" + +#: main.c:99 +msgid "Quit" +msgstr "" + +#: main.c:172 +msgid "Setup is complete." +msgstr "" + +#: main.c:174 netstuff.c:733 networking.c:560 networking.c:653 +msgid "Warning" +msgstr "" + +#: main.c:175 +msgid "" +"Initial setup was not entirely complete. You must ensure that Setup is " +"properly finished by running setup again at the shell." +msgstr "" + +#: misc.c:62 +#, c-format +msgid "Unable to write %s/main/hostname.conf" +msgstr "" + +#: misc.c:71 +msgid "Unable to open main hosts file." +msgstr "" + +#: misc.c:76 +msgid "Unable to write /etc/hosts." +msgstr "" + +#: misc.c:117 +msgid "Unable to write /etc/hosts.deny." +msgstr "" + +#: misc.c:125 +msgid "Unable to write /etc/hosts.allow." +msgstr "" + +#: misc.c:136 +msgid "Unable to set hostname." +msgstr "" + +#: misc.c:147 +msgid "Scanning and configuring ISDN devices." +msgstr "" + +#: misc.c:148 +msgid "Unable to scan for ISDN devices." +msgstr "" + +#: netstuff.c:86 +#, c-format +msgid "Interface - %s" +msgstr "" + +#: netstuff.c:91 +#, c-format +msgid "Enter the IP address information for the %s interface." +msgstr "" + +#: netstuff.c:103 +msgid "Static" +msgstr "" + +#: netstuff.c:104 +msgid "DHCP" +msgstr "" + +#: netstuff.c:105 +msgid "PPP DIALUP (PPPoE, modem, ATM ...)" +msgstr "" + +#: netstuff.c:113 +msgid "DHCP Hostname:" +msgstr "" + +#: netstuff.c:115 +msgid "Force DHCP MTU:" +msgstr "" + +#: netstuff.c:134 +msgid "IP address:" +msgstr "" + +#: netstuff.c:146 +msgid "Network mask:" +msgstr "" + +#: netstuff.c:173 networking.c:749 +msgid "The following fields are invalid:" +msgstr "" + +#: netstuff.c:183 +msgid "IP address" +msgstr "" + +#: netstuff.c:189 +msgid "Network mask" +msgstr "" + +#: netstuff.c:198 +msgid "DHCP hostname" +msgstr "" + +#: netstuff.c:396 netstuff.c:709 +msgid "Unset" +msgstr "" + +#: netstuff.c:669 +#, c-format +msgid "Please choose a networkcard for the following interface - %s." +msgstr "" + +#: netstuff.c:672 +msgid "Extended Network Menu" +msgstr "" + +#: netstuff.c:673 networking.c:520 +msgid "Select" +msgstr "" + +#: netstuff.c:673 +msgid "Identify" +msgstr "" + +#: netstuff.c:678 +msgid "Device Identification" +msgstr "" + +#: netstuff.c:678 +msgid "The lights on the selected port should flash now for 10 seconds..." +msgstr "" + +#: netstuff.c:679 +msgid "Identification is not supported by this interface." +msgstr "" + +#: netstuff.c:691 +msgid "There are no unassigned interfaces on your system." +msgstr "" + +#: netstuff.c:732 +#, c-format +msgid "Do you really want to remove the assigned %s interface?" +msgstr "" + +#: netstuff.c:755 +msgid "Select network driver" +msgstr "" + +#: netstuff.c:755 +msgid "Set additional module parameters" +msgstr "" + +#: netstuff.c:762 +msgid "Loading module..." +msgstr "" + +#: netstuff.c:777 +msgid "Unable to load driver module." +msgstr "" + +#: netstuff.c:780 +msgid "Module name cannot be blank." +msgstr "" + +#: networking.c:110 +msgid "Stopping network..." +msgstr "" + +#: networking.c:115 +msgid "Restarting network..." +msgstr "" + +#: networking.c:146 +msgid "No GREEN interface assigned." +msgstr "" + +#: networking.c:152 +msgid "Missing an IP address on GREEN." +msgstr "" + +#: networking.c:163 +msgid "Error" +msgstr "" + +#: networking.c:163 +msgid "Ignore" +msgstr "" + +#: networking.c:164 +msgid "No RED interface assigned." +msgstr "" + +#: networking.c:173 +msgid "Missing an IP address on RED." +msgstr "" + +#: networking.c:183 +msgid "No ORANGE interface assigned." +msgstr "" + +#: networking.c:189 +msgid "Missing an IP address on ORANGE." +msgstr "" + +#: networking.c:199 +msgid "No BLUE interface assigned." +msgstr "" + +#: networking.c:205 +msgid "Missing an IP address on BLUE." +msgstr "" + +#: networking.c:217 +msgid "Misssing DNS." +msgstr "" + +#: networking.c:224 +msgid "Missing Default Gateway." +msgstr "" + +#: networking.c:237 networking.c:304 +msgid "Network configuration type" +msgstr "" + +#: networking.c:238 networking.c:409 +msgid "Drivers and card assignments" +msgstr "" + +#: networking.c:239 networking.c:640 +msgid "Address settings" +msgstr "" + +#: networking.c:240 networking.c:743 +msgid "DNS and Gateway settings" +msgstr "" + +#: networking.c:260 +msgid "When configuration is complete, a network restart will be required." +msgstr "" + +#: networking.c:267 +#, c-format +msgid "" +"Current config: %s\n" +"\n" +"%s" +msgstr "" + +#: networking.c:268 +msgid "Network configuration menu" +msgstr "" + +#: networking.c:269 networking.c:520 networking.c:642 +msgid "Done" +msgstr "" + +#: networking.c:300 +#, c-format +msgid "" +"Select the network configuration for %s. The following configuration types " +"list those interfaces which have ethernet attached. If you change this " +"setting, a network restart will be required, and you will have to " +"reconfigure the network driver assignments." +msgstr "" + +#: networking.c:307 +#, c-format +msgid "" +"Not enough netcards for your choice.\n" +"\n" +"Needed: %d - Available: %d\n" +msgstr "" + +#: networking.c:359 +msgid "" +"Configure network drivers, and which interface each card is assigned to. The current configuration is as follows:\n" +"\n" +msgstr "" + +#: networking.c:408 +msgid "Do you wish to change these settings?" +msgstr "" + +#: networking.c:447 +msgid "Restarting non-local network..." +msgstr "" + +#: networking.c:464 +msgid "" +"Please choose the interface you wish to change.\n" +"\n" +msgstr "" + +#: networking.c:519 +msgid "Assigned Cards" +msgstr "" + +#: networking.c:520 +msgid "Remove" +msgstr "" + +#: networking.c:556 networking.c:649 +#, c-format +msgid "" +"If you change this IP address, and you are logged in remotely, your " +"connection to the %s machine will be broken, and you will have to reconnect " +"on the new IP. This is a risky operation, and should only be attempted if " +"you have physical access to the machine, should something go wrong." +msgstr "" + +#: networking.c:641 +msgid "Select the interface you wish to reconfigure." +msgstr "" + +#: networking.c:729 +msgid "Default gateway:" +msgstr "" + +#: networking.c:744 +msgid "" +"Enter the DNS and gateway information. These settings are used only with " +"Static IP (and DHCP if DNS set) on the RED interface." +msgstr "" + +#: networking.c:773 +msgid "Default gateway" +msgstr "" + +#: networking.c:780 +msgid "Secondary DNS specified without a Primary DNS" +msgstr "" + +#: passwords.c:33 +msgid "" +"Enter the 'root' user password. Login as this user for commandline access." +msgstr "" + +#: passwords.c:38 passwords.c:61 +msgid "Setting password" +msgstr "" + +#: passwords.c:38 +msgid "Setting 'root' password...." +msgstr "" + +#: passwords.c:39 +msgid "Problem setting 'root' password." +msgstr "" + +#: passwords.c:53 +#, c-format +msgid "" +"Enter %s 'admin' user password. This is the user to use for logging into the" +" %s web administration pages." +msgstr "" + +#: passwords.c:60 +#, c-format +msgid "Setting %s 'admin' user password..." +msgstr "" + +#: passwords.c:62 +#, c-format +msgid "Problem setting %s 'admin' user password." +msgstr "" + +#: passwords.c:76 +msgid "Password:" +msgstr "" + +#: passwords.c:77 +msgid "Again:" +msgstr "" + +#: passwords.c:95 +msgid "Password cannot be blank." +msgstr "" + +#: passwords.c:102 +msgid "Passwords do not match." +msgstr "" + +#: passwords.c:109 +msgid "Password cannot contain spaces." +msgstr "" + +#: timezone.c:77 +msgid "Choose the timezone you are in from the list below." +msgstr "" diff --git a/src/setup/po/ru.po b/src/setup/po/ru.po index 4869ecf..fc20907 100644 --- a/src/setup/po/ru.po +++ b/src/setup/po/ru.po @@ -6,19 +6,20 @@ # Andrei Skipin <skian2007(a)yandex.ru>, 2014 # ellviss <kpe1501(a)gmail.com>, 2015 # bubnov_pi <ipfire(a)bubnov.su>, 2014 +# Tim <evargrin(a)gmail.com>, 2015 msgid "" msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2015-02-17 19:30+0000\n" -"Last-Translator: ellviss <kpe1501(a)gmail.com>\n" -"Language-Team: Russian (http://www.transifex.com/projects/p/ipfire/language/ru/)\n" +"PO-Revision-Date: 2015-04-25 04:53+0000\n" +"Last-Translator: Tim <evargrin(a)gmail.com>\n" +"Language-Team: Russian (http://www.transifex.com/mstremer/ipfire/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #: dhcp.c:50 msgid "Start address:" @@ -214,11 +215,11 @@ msgstr "" #: misc.c:62 #, c-format msgid "Unable to write %s/main/hostname.conf" -msgstr "" +msgstr "Недоступна запись в %s/main/hostname.conf" #: misc.c:71 msgid "Unable to open main hosts file." -msgstr "" +msgstr "Не удаётся открыть основной hosts файл." #: misc.c:76 msgid "Unable to write /etc/hosts." @@ -234,7 +235,7 @@ msgstr "Недоступна запись в /etc/hosts.allow." #: misc.c:136 msgid "Unable to set hostname." -msgstr "" +msgstr "Не удается указать имя хоста." #: misc.c:147 msgid "Scanning and configuring ISDN devices." @@ -242,7 +243,7 @@ msgstr "Сканирование и конфигурирование ISDN уст #: misc.c:148 msgid "Unable to scan for ISDN devices." -msgstr "" +msgstr "Не удаётся просканировать ISDN устройства." #: netstuff.c:86 #, c-format @@ -252,7 +253,7 @@ msgstr "Интерфейс - %s" #: netstuff.c:91 #, c-format msgid "Enter the IP address information for the %s interface." -msgstr "" +msgstr "Укажите IP адрес для %s интерфейса." #: netstuff.c:103 msgid "Static" @@ -264,7 +265,7 @@ msgstr "DHCP-сервер" #: netstuff.c:105 msgid "PPP DIALUP (PPPoE, modem, ATM ...)" -msgstr "" +msgstr "PPP DIALUP (PPPoE, модем, ATM ...)" #: netstuff.c:113 msgid "DHCP Hostname:" @@ -272,7 +273,7 @@ msgstr "Имя хоста DHCP:" #: netstuff.c:115 msgid "Force DHCP MTU:" -msgstr "" +msgstr "Форсировать DHCP MTU:" #: netstuff.c:134 msgid "IP address:" @@ -284,7 +285,7 @@ msgstr "Сетевая маска:" #: netstuff.c:173 networking.c:749 msgid "The following fields are invalid:" -msgstr "" +msgstr "Следующие поля неверны:" #: netstuff.c:183 msgid "IP address" @@ -300,7 +301,7 @@ msgstr "Имя хоста DHCP" #: netstuff.c:396 netstuff.c:709 msgid "Unset" -msgstr "" +msgstr "Не установлено" #: netstuff.c:669 #, c-format @@ -317,11 +318,11 @@ msgstr "Выберите" #: netstuff.c:673 msgid "Identify" -msgstr "" +msgstr "Идентифицировать" #: netstuff.c:678 msgid "Device Identification" -msgstr "" +msgstr "Определение устройства" #: netstuff.c:678 msgid "The lights on the selected port should flash now for 10 seconds..." @@ -338,7 +339,7 @@ msgstr "" #: netstuff.c:732 #, c-format msgid "Do you really want to remove the assigned %s interface?" -msgstr "" +msgstr "Вы действительно хотите удалить назначенный %s интерфейс?" #: netstuff.c:755 msgid "Select network driver" @@ -346,7 +347,7 @@ msgstr "Выберите сетевой драйвер" #: netstuff.c:755 msgid "Set additional module parameters" -msgstr "" +msgstr "Указать дополнительные параметры модуля." #: netstuff.c:762 msgid "Loading module..." @@ -358,7 +359,7 @@ msgstr "Невозможно загрузить драйвер модуля." #: netstuff.c:780 msgid "Module name cannot be blank." -msgstr "" +msgstr "Имя модуля не может быть пустым." #: networking.c:110 msgid "Stopping network..." @@ -370,7 +371,7 @@ msgstr "Перезапуск сети..." #: networking.c:146 msgid "No GREEN interface assigned." -msgstr "" +msgstr "Не назначен ЗЕЛЁНЫЙ интерфейс." #: networking.c:152 msgid "Missing an IP address on GREEN." @@ -386,7 +387,7 @@ msgstr "Игнорировать" #: networking.c:164 msgid "No RED interface assigned." -msgstr "" +msgstr "Не указан КРАСНЫЙ интерфейс." #: networking.c:173 msgid "Missing an IP address on RED." @@ -394,7 +395,7 @@ msgstr "" #: networking.c:183 msgid "No ORANGE interface assigned." -msgstr "" +msgstr "Не указан ОРАНЖЕВЫЙ интерфейс." #: networking.c:189 msgid "Missing an IP address on ORANGE." @@ -402,7 +403,7 @@ msgstr "" #: networking.c:199 msgid "No BLUE interface assigned." -msgstr "" +msgstr "Не указан СИНИЙ интерфейс." #: networking.c:205 msgid "Missing an IP address on BLUE." @@ -418,11 +419,11 @@ msgstr "Отсутствует шлюз по умолчанию." #: networking.c:237 networking.c:304 msgid "Network configuration type" -msgstr "" +msgstr "Тип конфигурации сети" #: networking.c:238 networking.c:409 msgid "Drivers and card assignments" -msgstr "" +msgstr "Назначение карт и драйверов" #: networking.c:239 networking.c:640 msgid "Address settings" @@ -434,7 +435,7 @@ msgstr "Настройка DNS и Шлюза" #: networking.c:260 msgid "When configuration is complete, a network restart will be required." -msgstr "" +msgstr "Когда конфигурация завершиться, необходимо будет перезагрузить сеть." #: networking.c:267 #, c-format @@ -491,7 +492,7 @@ msgstr "" #: networking.c:519 msgid "Assigned Cards" -msgstr "" +msgstr "Назначение сетевых карт" #: networking.c:520 msgid "Remove" @@ -555,12 +556,12 @@ msgstr "" #: passwords.c:60 #, c-format msgid "Setting %s 'admin' user password..." -msgstr "" +msgstr "Укажите пароль %s для пользователя 'admin'..." #: passwords.c:62 #, c-format msgid "Problem setting %s 'admin' user password." -msgstr "" +msgstr "Проблема с указанием пароля %s для пользователя 'admin'." #: passwords.c:76 msgid "Password:" diff --git a/src/setup/po/sq.po b/src/setup/po/sq.po index 339dea1..9983002 100644 --- a/src/setup/po/sq.po +++ b/src/setup/po/sq.po @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: IPFire Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-08-21 15:12+0000\n" -"PO-Revision-Date: 2015-02-02 22:35+0000\n" +"PO-Revision-Date: 2015-06-22 10:58+0000\n" "Last-Translator: Ardit Dani <ardit.dani(a)gmail.com>\n" -"Language-Team: Albanian (http://www.transifex.com/projects/p/ipfire/language/sq/)\n" +"Language-Team: Albanian (http://www.transifex.com/mstremer/ipfire/language/sq/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -64,7 +64,7 @@ msgstr "" #: dhcp.c:125 msgid "Enabled" -msgstr "" +msgstr "Mundëso" #: dhcp.c:142 domainname.c:43 hostname.c:47 keymap.c:86 main.c:99 main.c:172 #: main.c:174 netstuff.c:157 netstuff.c:733 netstuff.c:756 networking.c:163 @@ -101,7 +101,7 @@ msgstr "" #: dhcp.c:182 networking.c:764 msgid "Secondary DNS" -msgstr "" +msgstr "DNS Dytësorë" #: dhcp.c:189 msgid "Default lease time" hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. e1e700ca3ba4c91a0f521b5789ec54101e2b3440
by git＠ipfire.org 21 Nov '15

21 Nov '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via e1e700ca3ba4c91a0f521b5789ec54101e2b3440 (commit) via 2c6969834a441f195c369f3e91931b43e410f5ab (commit) from 0abdfe9f201646d56c1150ea8604f3daf5c9d585 (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 e1e700ca3ba4c91a0f521b5789ec54101e2b3440 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Nov 21 13:02:49 2015 +0000 wget: Update to version 1.17 Fixes #10991 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 2c6969834a441f195c369f3e91931b43e410f5ab Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Sat Nov 21 12:54:12 2015 +0000 git: Update to version 2.6.3 Fixes #10982 Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: git/git.nm | 6 +++--- wget/wget.nm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) Difference in files: diff --git a/git/git.nm b/git/git.nm index 9c0b341..7635ccb 100644 --- a/git/git.nm +++ b/git/git.nm @@ -4,8 +4,8 @@ ############################################################################### name = git -version = 1.8.1 -release = 4 +version = 2.6.3 +release = 1 groups = Development/Tools url = http://git-scm.com/ @@ -18,7 +18,7 @@ description and full access to internals. end -source_dl = http://git-core.googlecode.com/files/ +source_dl = https://www.kernel.org/pub/software/scm/git/ build requires diff --git a/wget/wget.nm b/wget/wget.nm index 4c51337..d97d50d 100644 --- a/wget/wget.nm +++ b/wget/wget.nm @@ -4,7 +4,7 @@ ############################################################################### name = wget -version = 1.16.3 +version = 1.17 release = 1 groups = Applications/Internet hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0b075172af1ae899337e7f072fc8490ae57e5501
by git＠ipfire.org 19 Nov '15

19 Nov '15

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 0b075172af1ae899337e7f072fc8490ae57e5501 (commit) via 0cf6bacad2cafcacdee5810c2a4080cb19aa85ae (commit) via b00797e260bc84be15cea26a144f560244be4c6e (commit) via 915c88931a2c5c4cd34ece5dc754cb8da984d2e3 (commit) from 06988eaf4961be6c74a9aefb8203eb7b53157bd6 (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 0b075172af1ae899337e7f072fc8490ae57e5501 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 19 12:54:41 2015 +0000 core96: Ship changed files Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 0cf6bacad2cafcacdee5810c2a4080cb19aa85ae Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Mon Nov 16 12:01:07 2015 +0100 BUG10984: Fix portforwardconverter for upgrades before core 77 When upgrading from a post core-77 installation, the portforwarding rules seem to get broken. With this patch the sourceports and the subnetmasks from the rules are converted correctly. Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit b00797e260bc84be15cea26a144f560244be4c6e Author: Alexander Marx <alexander.marx(a)ipfire.org> Date: Thu Nov 19 11:09:49 2015 +0100 BUG10963: implement a better email verification We now check all allowed chars in the address before the @ sign. The domainpart after the '@' sign is just checked for valid chars, so that user@ipfire is valid, too Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 915c88931a2c5c4cd34ece5dc754cb8da984d2e3 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 19 12:52:31 2015 +0000 strongswan: Update to 5.3.4 Fixes a security vulnerability in the EAP-MSCHAPv2 plugin that is filed under CVE-2015-8023. https://www.strongswan.org/blog/2015/11/16/strongswan-vulnerability-%28cve-… Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/cfgroot/general-functions.pl | 29 +++++++++++++++------- config/firewall/convert-portfw | 29 +++++++++++++--------- config/rootfiles/core/96/filelists/files | 2 ++ .../96}/filelists/i586/strongswan-padlock | 0 .../{oldcore/95 => core/96}/filelists/strongswan | 0 lfs/strongswan | 4 +-- 6 files changed, 41 insertions(+), 23 deletions(-) copy config/rootfiles/{oldcore/95 => core/96}/filelists/i586/strongswan-padlock (100%) copy config/rootfiles/{oldcore/95 => core/96}/filelists/strongswan (100%) Difference in files: diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 2b5cd19..f3a2e47 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -655,7 +655,7 @@ sub validfqdn my @parts = split (/\./, $fqdn); # Split hostname at the '.' if (scalar(@parts) < 2) { # At least two parts should return 0;} # exist in a FQDN - # (i.e. hostname.domain) + # (i.e.hostname.domain) foreach $part (@parts) { # Each part should be at least one character in length # but no more than 63 characters @@ -747,14 +747,25 @@ sub ipcidr2msk { } sub validemail { - my $mail = shift; - return 0 if ( $mail !~ /^[0-9a-zA-Z\.\-\_]+\(a)[0-9a-zA-Z\.\-]+$/ ); - return 0 if ( $mail =~ /^[^0-9a-zA-Z]|[^0-9a-zA-Z]$/); - return 0 if ( $mail !~ /([0-9a-zA-Z]{1})\@./ ); - return 0 if ( $mail !~ /.\@([0-9a-zA-Z]{1})/ ); - return 0 if ( $mail =~ /.\.\-.|.\-\..|.\.\..|.\-\-./g ); - return 0 if ( $mail =~ /.\.\_.|.\-\_.|.\_\..|.\_\-.|.\_\_./g ); - return 0 if ( $mail !~ /\.([a-zA-Z]{2,4})$/ ); + my $address = shift; + my @parts = split( /\@/, $address ); + my $count=@parts; + + #check if we have one part before and after '@' + return 0 if ( $count != 2 ); + + #check if one of the parts starts or ends with a dot + return 0 if ( substr($parts[0],0,1) eq '.' ); + return 0 if ( substr($parts[0],-1,1) eq '.' ); + return 0 if ( substr($parts[1],0,1) eq '.' ); + return 0 if ( substr($parts[1],-1,1) eq '.' ); + + #check first addresspart (before '@' sign) + return 0 if ( $parts[0] !~ m/^[a-zA-Z0-9\.!\-\+#]+$/ ); + + #check second addresspart (after '@' sign) + return 0 if ( $parts[1] !~ m/^[a-zA-Z0-9\.\-]+$/ ); + return 1; } diff --git a/config/firewall/convert-portfw b/config/firewall/convert-portfw index 8660e7c..8383b5a 100755 --- a/config/firewall/convert-portfw +++ b/config/firewall/convert-portfw @@ -60,24 +60,24 @@ close(ALIAS); &write_rules; sub get_config { + my $baseipfireport; + my $basesource; print LOG "STEP 1: Get config from old portforward\n#########################################\n"; foreach my $line (@current){ - if($jump eq '1'){ - $jump=''; - $count++; - next; - } my $u=$count+1; ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark) = split(",",$line); ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1) = split(",",$current[$u]); - if ($flag1 eq '1'){ - $source=$source1; - $jump='1'; + if ($key == $key1 && $flag == '0'){ + $baseipfireport = $ipfireport; + } + if ($key == $key1 && $flag1 == '1'){ + $count++; + next; } my $now=localtime; chomp($remark); - print LOG "$now processing-> KEY: $key FLAG: $flag PROT: $prot FIREPORT: $ipfireport TARGET: $target TGTPORT: $targetport ACTIVE: $active ALIAS: $alias SOURCE: $source REM: $remark Doublerule: $jump\n"; - push (@values,$prot.",".$ipfireport.",".$target.",".$targetport.",".$active.",".$alias.",".$source.",".$remark); + print LOG "$now processing-> KEY: $key FLAG: $flag PROT: $prot FIREPORT: $baseipfireport TARGET: $target TGTPORT: $targetport ACTIVE: $active ALIAS: $alias SOURCE: $source REM: $remark Doublerule: $jump\n"; + push (@values,$prot.",".$baseipfireport.",".$target.",".$targetport.",".$active.",".$alias.",".$source.",".$remark); $count++; } } @@ -101,10 +101,15 @@ sub build_rules }else{ $src = 'src_addr'; my ($a,$b) = split("/",$source); - $src1 = $a."/32"; + if ($b != ''){ + $b = &General::iporsubtocidr($b); + }else{ + $b = "32"; + } + $src1 = $a."/".$b; } #get ipfire ip - if($alias eq '0.0.0.0'){ + if($alias eq '0.0.0.0' || $alias eq '0'){ $alias='Default IP'; }else{ foreach my $ali (@alias){ diff --git a/config/rootfiles/core/96/filelists/files b/config/rootfiles/core/96/filelists/files index 9e120af..9e64edc 100644 --- a/config/rootfiles/core/96/filelists/files +++ b/config/rootfiles/core/96/filelists/files @@ -2,3 +2,5 @@ etc/system-release etc/issue etc/rc.d/init.d/snort opt/pakfire/lib/functions.pl +usr/sbin/convert-portfw +var/ipfire/general-functions.pl diff --git a/config/rootfiles/core/96/filelists/i586/strongswan-padlock b/config/rootfiles/core/96/filelists/i586/strongswan-padlock new file mode 120000 index 0000000..2412824 --- /dev/null +++ b/config/rootfiles/core/96/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/96/filelists/strongswan b/config/rootfiles/core/96/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/96/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/lfs/strongswan b/lfs/strongswan index 2a181a3..566f1af 100644 --- a/lfs/strongswan +++ b/lfs/strongswan @@ -24,7 +24,7 @@ include Config -VER = 5.3.3 +VER = 5.3.4 THISAPP = strongswan-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 5a25f3d1c31a77ef44d14a2e7b3eaad0 +$(DL_FILE)_MD5 = 655a632a515c74a99f2e9cc337ab2f33 install : $(TARGET) hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 06988eaf4961be6c74a9aefb8203eb7b53157bd6
by git＠ipfire.org 18 Nov '15

18 Nov '15

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 06988eaf4961be6c74a9aefb8203eb7b53157bd6 (commit) via c77e962d565b1ae07c9b44e3c864c9bacc9f6b78 (commit) from e9fbc1cecf856ccc7f5f2b2c504aa4318e879a7d (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 06988eaf4961be6c74a9aefb8203eb7b53157bd6 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Wed Nov 18 17:31:32 2015 +0000 core96: Ship updated core initscript Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit c77e962d565b1ae07c9b44e3c864c9bacc9f6b78 Author: Stefan Schantl <stefan.schantl(a)ipfire.org> Date: Fri Oct 16 18:49:15 2015 +0200 snort: Also monitor assigned alias addresses on red. These changes will allow snort to also inspect the traffic for one or more configured alias addresses, which has not been done in the past. The current situation is, that snort if enabled on red, only inspects the traffic which is desired to the statically configured red address. If some alias addresses have been assigned to the red interface the traffic to these addresses will not be checked by snort and completely bypasses the IDS. There is no user interaction required, nor visible-effects or any backward-compatiblity required, only a restart of snort after the update process to protect all red addresses. To do this we will now check if, the RED interface has been set to STATIC (which is required to use the aliases function) and any aliases have been configured. In case of this, the modified code will add all enabled alias addresses to the HOMENET variable in which snort is storing all the monitored addresses. Fixes #10619. Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/core/96/filelists/files | 1 + src/initscripts/init.d/snort | 15 +++++++++++++++ 2 files changed, 16 insertions(+) Difference in files: diff --git a/config/rootfiles/core/96/filelists/files b/config/rootfiles/core/96/filelists/files index c9f5f4e..9e120af 100644 --- a/config/rootfiles/core/96/filelists/files +++ b/config/rootfiles/core/96/filelists/files @@ -1,3 +1,4 @@ etc/system-release etc/issue +etc/rc.d/init.d/snort opt/pakfire/lib/functions.pl diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort index e03c80f..58edf1e 100644 --- a/src/initscripts/init.d/snort +++ b/src/initscripts/init.d/snort @@ -20,6 +20,8 @@ PATH=/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/sbin:/usr/sbin; export PATH eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) eval $(/usr/local/bin/readhash /var/ipfire/snort/settings) +ALIASFILE="/var/ipfire/ethernet/aliases" + case "$1" in start) if [ "$BLUE_NETADDRESS" ]; then @@ -59,6 +61,19 @@ case "$1" in if [ "$LOCAL_IP" ]; then HOMENET+="$LOCAL_IP," fi + + # Check if the red device is set to static and + # any aliases have been configured. + if [ "${RED_TYPE}" == "STATIC" ] && [ -s "${ALIASFILE}" ]; then + # Read in aliases file. + while IFS="," read -r address mode remark; do + # Check if the alias is enabled. + [ "${mode}" = "on" ] || continue + + # Add alias to the list of HOMENET addresses. + HOMENET+="${address}," + done < "${ALIASFILE}" + fi fi HOMENET+="127.0.0.1" echo "ipvar HOME_NET [$HOMENET]" > /etc/snort/vars hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 0abdfe9f201646d56c1150ea8604f3daf5c9d585
by git＠ipfire.org 12 Nov '15

12 Nov '15

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree". The branch, master has been updated via 0abdfe9f201646d56c1150ea8604f3daf5c9d585 (commit) from 1c6d545816cd0ad5117bde16b8d78b4368c072d4 (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 0abdfe9f201646d56c1150ea8604f3daf5c9d585 Author: Michael Tremer <michael.tremer(a)ipfire.org> Date: Thu Nov 12 00:25:50 2015 +0000 dma: New package Fixes #10953 Fixes #10954 The dma-queue-flush.timer will execute the corresponding service file every hour to call dma and send out all mails. The dma-cleanup-spool.timer is used to periodly call the service file for cleaning up the DMA spooler directory. Both timer files will be enabled during installation of the dma package. Fixes #10955 This dma-cleanup-spool script cleans up the spool directory from DMA mail service after defined period of time. Otherwise the spool dir may be flooded. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org> Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: openssh/sshd-keygen => dma/dma-cleanup-spool | 39 +++++++-------- dma/dma.nm | 75 ++++++++++++++++++++++++++++ dma/systemd/dma-cleanup-spool.service | 5 ++ dma/systemd/dma-cleanup-spool.timer | 9 ++++ dma/systemd/dma-queue-flush.service | 10 ++++ dma/systemd/dma-queue-flush.timer | 9 ++++ 6 files changed, 127 insertions(+), 20 deletions(-) copy openssh/sshd-keygen => dma/dma-cleanup-spool (73%) create mode 100644 dma/dma.nm create mode 100644 dma/systemd/dma-cleanup-spool.service create mode 100644 dma/systemd/dma-cleanup-spool.timer create mode 100644 dma/systemd/dma-queue-flush.service create mode 100644 dma/systemd/dma-queue-flush.timer Difference in files: diff --git a/dma/dma-cleanup-spool b/dma/dma-cleanup-spool new file mode 100644 index 0000000..92af30c --- /dev/null +++ b/dma/dma-cleanup-spool @@ -0,0 +1,48 @@ +#!/bin/bash +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2015 Michael Tremer <michael.tremer(a)ipfire.org> # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see <http://www.gnu.org/licenses/>. # +# # +############################################################################### + +SPOOL_DIR="/var/spool/dma" + +find_messages() { + find "${SPOOL_DIR}" -type f -name "M*" -mtime +30 +} + +remove_message() { + local f_message="${1}" + local f_queue="${f_message/${SPOOL_DIR}\/M/${SPOOL_DIR}\/Q}" + + # If a message file and a queue file exist, delete both + [ -f "${f_message}" ] || return 1 + [ -f "${f_queue}" ] || return 1 + + rm -f "${f_message}" "${f_queue}" + return 0 +} + +main() { + for message in $(find_messages); do + remove_message "${message}" + done + + return 0 +} + +main || exit $? diff --git a/dma/dma.nm b/dma/dma.nm new file mode 100644 index 0000000..259421a --- /dev/null +++ b/dma/dma.nm @@ -0,0 +1,75 @@ +############################################################################### +# IPFire.org - An Open Source Firewall Solution # +# Copyright (C) - IPFire Development Team <info(a)ipfire.org> # +############################################################################### + +name = dma +version = 0.10 +release = 1 + +groups = Mail +url = https://github.com/corecode/dma +license = BSD +summary = DragonFly Mail Agent + +description + dma is a small Mail Transport Agent (MTA), designed for home and + office use. It accepts mails from locally installed Mail User Agents + (MUA) and delivers the mails either locally or to a remote destination. + + Remote delivery includes several features like TLS/SSL support and + SMTP authentication. +end + +build + requires + bison + flex + openssl-devel + end + + make_build_targets += PREFIX=%{prefix} + + # Workaround for #10952 + make_build_targets += LEX="flex -l" + + make_install_targets += PREFIX=%{prefix} \ + sendmail-link mailq-link install-spool-dirs install-etc + + install_cmds + install -m 755 %{DIR_SOURCE}/dma-cleanup-spool %{BUILDROOT}%{sbindir} + end +end + +packages + package %{name} + groups += Base + + script postin + systemctl daemon-reload >/dev/null 2>&1 || : + systemctl --no-reload enable dma-queue-flush.timer >/dev/null 2>&1 || : + systemctl --no-reload enable dma-cleanup-spool.timer >/dev/null 2>&1 || : + end + + script preun + systemctl --no-reload disable dma-queue-flush.timer >/dev/null 2>&1 || : + systemctl --no-reload disable dma-cleanup-spool.timer >/dev/null 2>&1 || : + systemctl stop dma-queue-flush.timer >/dev/null 2>&1 || : + systemctl stop dma-cleanup-spool.timer >/dev/null 2>&1 || : + systemctl stop dma-queue-flush.service >/dev/null 2>&1 || : + systemctl stop dma-cleanup-spool.service >/dev/null 2>&1 || : + end + + script postun + systemctl daemon-reload >/dev/null 2>&1 || : + end + + script postup + systemctl daemon-reload >/dev/null 2>&1 || : + end + end + + package %{name}-debuginfo + template DEBUGINFO + end +end diff --git a/dma/systemd/dma-cleanup-spool.service b/dma/systemd/dma-cleanup-spool.service new file mode 100644 index 0000000..96b5770 --- /dev/null +++ b/dma/systemd/dma-cleanup-spool.service @@ -0,0 +1,5 @@ +[Unit] +Description=Cleanup of the DMA mail spool directory + +[Service] +ExecStart=/usr/sbin/dma-cleanup-spool diff --git a/dma/systemd/dma-cleanup-spool.timer b/dma/systemd/dma-cleanup-spool.timer new file mode 100644 index 0000000..57cd716 --- /dev/null +++ b/dma/systemd/dma-cleanup-spool.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Periodly cleanup of the DMA mail spool directory + +[Timer] +OnCalendar=weekly +Persistent=true + +[Install] +WantedBy=multi-user.target diff --git a/dma/systemd/dma-queue-flush.service b/dma/systemd/dma-queue-flush.service new file mode 100644 index 0000000..9b48045 --- /dev/null +++ b/dma/systemd/dma-queue-flush.service @@ -0,0 +1,10 @@ +[Unit] +Description=Flushing of the DMA mail queue. +After=network-online.target +Requires=network-online.target +Wants=network-online.target + +[Service] +SendSIGKILL=false +TimeoutStopSec=0 +ExecStart=/usr/sbin/dma -q diff --git a/dma/systemd/dma-queue-flush.timer b/dma/systemd/dma-queue-flush.timer new file mode 100644 index 0000000..efa1728 --- /dev/null +++ b/dma/systemd/dma-queue-flush.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Periodly flushing of the DMA mail queue. + +[Timer] +OnCalendar=hourly +Persistent=true + +[Install] +WantedBy=multi-user.target hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. e9fbc1cecf856ccc7f5f2b2c504aa4318e879a7d
by git＠ipfire.org 11 Nov '15

11 Nov '15

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. dccbe309d2b568147c47a4d37c59b5686a7babbe
by git＠ipfire.org 11 Nov '15

11 Nov '15

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM November 2015